BOINC / boinc

html/inc/prefs.inc

Spacing +16 added lines, -16 removed lines

@@ -108,7 +108,7 @@ 
         new NUM_SPEC(tra("% of the CPUs"), 1, 100, 0)
     ),
     new PREF_NUM(
-        tra("Use at most") ."<br><font size=-2>Requires BOINC 7.20.3+</font>",
+        tra("Use at most")."<br><font size=-2>Requires BOINC 7.20.3+</font>",
         // xgettext:no-php-format
         tra("Suspend/resume computing every few seconds to reduce CPU temperature and energy usage. Example: 75% means compute for 3 seconds, wait for 1 second, and repeat."),
         "niu_cpu_usage_limit",
@@ -295,9 +295,9 @@ 
     $dp->disk_max_used_pct = parse_config($config, "<default_disk_max_used_pct>");
     $dp->disk_min_free_gb = parse_config($config, "<default_disk_min_free_gb>");
     // set some defaults if not found
-    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0;  // no limit
+    if (!$dp->disk_max_used_gb) $dp->disk_max_used_gb = 0; // no limit
     if (!$dp->disk_max_used_pct) $dp->disk_max_used_pct = 90; // 90 percent
-    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1;   // 1 GB
+    if (!$dp->disk_min_free_gb) $dp->disk_min_free_gb = 1; // 1 GB
     // set mininimum free space scheduler allows
     // - depends on which scheduler is running
     $dp->new_sched_flag = 1;
@@ -323,7 +323,7 @@ 
     global $text;
     global $venue_name;
 
-    switch($name) {
+    switch ($name) {
     case "venue":
         if (array_key_exists("name", $attrs)) {
             $venue_name = $attrs["name"];
@@ -373,7 +373,7 @@ 
             return;
         }
     }
-    switch($name) {
+    switch ($name) {
     case "venue":
         $top_parse_result->$venue_name = $parse_result;
         $parse_result = $top_parse_result;
@@ -547,7 +547,7 @@ 
     }
 }
 
-function print_prefs_display_global($user, $columns=false) {
+function print_prefs_display_global($user, $columns = false) {
     $global_prefs = prefs_parse_global($user->global_prefs);
 
     echo tra("These settings apply to all computers using this account except")
@@ -557,7 +557,7 @@ 
         .tra("Android devices")
         ."</ul>
     ";
-    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=". (int)!$columns .">".tra("(Switch view)")."</a></font>";
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=global&cols=".(int)!$columns.">".tra("(Switch view)")."</a></font>";
     if ($columns) {
         echo "<h3>".tra("Combined preferences").$switch_link."</h3>";
         start_table();
@@ -594,9 +594,9 @@ 
 // otherwise false
 //
 function print_prefs_form(
-    $action, $subset, $venue, $user, $prefs, $cols, $error=false,
-    $project_error=false
-){
+    $action, $subset, $venue, $user, $prefs, $cols, $error = false,
+    $project_error = false
+) {
     if ($action == "add") {
         $script = "add_venue.php";
         $submit_value = tra("Add preferences");
@@ -636,7 +636,7 @@ 
 //
 // Functions to display preference subsets as forms
 //
-function prefs_form_global($user, $prefs, $error=false) {
+function prefs_form_global($user, $prefs, $error = false) {
     global $in_use_prefs;
     global $not_in_use_prefs;
     global $job_prefs;
@@ -673,9 +673,9 @@ 
 //
 function prefs_form_radio_buttons($name, $yesno) {
     $rb = tra("yes")." <input type=radio name=$name value=yes "
-        .($yesno?"checked":"")
+        .($yesno ? "checked" : "")
         ."> ".tra("no")." <input type=radio name=$name value=no "
-        .($yesno?"":"checked")
+        .($yesno ? "" : "checked")
         .">\n";
     return $rb;
 }
@@ -694,12 +694,12 @@ 
 }
 function venue_show($user) {
     $venue = $user->venue;
-    if ($venue =='') $venue = '---';
+    if ($venue == '') $venue = '---';
     tooltip_row2(VENUE_TOOLTIP, VENUE_DESC, $venue);
 }
 
 function venue_form($user) {
-    $n=$h=$w=$s=$m='';
+    $n = $h = $w = $s = $m = '';
     if ($user->venue == '') $n = 'selected';
     if ($user->venue == 'home') $h = 'selected';
     if ($user->venue == 'work') $w = 'selected';
@@ -757,7 +757,7 @@ 
 //
 // convert prefs from structure to XML
 //
-function global_prefs_make_xml($prefs, $primary=true) {
+function global_prefs_make_xml($prefs, $primary = true) {
     global $in_use_prefs;
     global $not_in_use_prefs;
     global $job_prefs;

html/inc/boinc_db.inc

Spacing +16 added lines, -16 removed lines

@@ -208,11 +208,11 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'user', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('user', 'BoincUser', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'user', 'BoincUser', $fields, $where_clause, $order_clause
@@ -261,7 +261,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'team', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('team', 'BoincTeam', $where_clause, $order_clause);
     }
@@ -286,7 +286,7 @@ 
         $db = BoincDb::get();
         return $db->max('team', $field);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'team', 'BoincTeam', $fields, $where_clause, $order_clause
@@ -322,11 +322,11 @@ 
         $db = BoincDb::get();
         return $db->delete($this, 'host');
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('host', 'BoincHost', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'host', 'BoincHost', $fields, $where_clause, $order_clause
@@ -445,7 +445,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'app', $clause);
     }
-    static function sum($field, $clause=null) {
+    static function sum($field, $clause = null) {
         $db = BoincDb::get();
         return $db->sum('app', $field, $clause);
     }
@@ -501,11 +501,11 @@ 
         $db = BoincDb::get();
         return $db->insert('profile', $clause);
     }
-    static function enum($where_clause=null, $order_clause=null) {
+    static function enum($where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('profile', 'BoincProfile', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause=null, $order_clause=null) {
+    static function enum_fields($fields, $where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields('profile', 'BoincProfile', $fields, $where_clause, $order_clause);
     }
@@ -889,12 +889,12 @@ 
         return $db->enum('consent', 'BoincConsent', $where_clause);
     }
 
-    static function insert ($clause) {
+    static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('consent', $clause);
     }
 
-    static function update ($clause) {
+    static function update($clause) {
         $db = BoincDb::get();
         return $db->update_aux('consent', $clause);
     }
@@ -918,17 +918,17 @@ 
         return $db->lookup('consent_type', 'BoincConsentType', $clause);
     }
 
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('consent_type', 'BoincConsentType', $where_clause, $order_clause);
     }
 
-    static function insert ($clause) {
+    static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('consent_type', $clause);
     }
 
-    static function update ($clause) {
+    static function update($clause) {
         $db = BoincDb::get();
         return $db->update_aux('consent_type', $clause);
     }
@@ -953,7 +953,7 @@ 
         return $db->lookup('latest_consent', 'BoincLatestConsent', $clause);
     }
 
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('latest_consent', 'BoincLatestConsent', $where_clause, $order_clause);
     }
@@ -964,7 +964,7 @@ 
 // apply this to any user-supplied strings used in queries
 //
 function boinc_real_escape_string($x) {
-    if (version_compare(phpversion(),"4.3.0")>=0) {
+    if (version_compare(phpversion(), "4.3.0") >= 0) {
         return BoincDb::escape_string($x);
     } else {
         $x = str_replace("'", "\'", $x);

html/inc/cache.inc

Spacing +29 added lines, -29 removed lines

@@ -32,8 +32,8 @@ 
         mkdir("../cache", 0770);
         chmod("../cache", 0770);
     }
-    for ($i=0;$i<256;$i++) {
-        $j=sprintf("%02x",$i);
+    for ($i = 0; $i < 256; $i++) {
+        $j = sprintf("%02x", $i);
         if (!@filemtime("../cache/$j")) {
             mkdir("../cache/$j", 0770);
             chmod("../cache/$j", 0770);
@@ -41,7 +41,7 @@ 
     }
 }
 
-function get_path($params, $phpfile=null) {
+function get_path($params, $phpfile = null) {
     if (!@filemtime("../cache/00")) make_cache_dirs();
     if ($phpfile) {
         $z = $phpfile;
@@ -51,7 +51,7 @@ 
     }
 
     // add a layer of subdirectories for reducing file lookup time
-    $sz = substr(md5($z."_".urlencode($params)),1,2);
+    $sz = substr(md5($z."_".urlencode($params)), 1, 2);
     $path = "../cache/".$sz."/".$z;
     if ($params) {
         $path = $path."_".urlencode($params);
@@ -60,14 +60,14 @@ 
 }
 
 function disk_usage($dir) {
-    $usage=0;
-    if ($handle=@opendir($dir)) {
-        while ($file=readdir($handle)) {
+    $usage = 0;
+    if ($handle = @opendir($dir)) {
+        while ($file = readdir($handle)) {
             if (($file != ".") && ($file != "..")) {
                 if (@is_dir($dir."/".$file)) {
-                    $usage+=disk_usage($dir."/".$file);
+                    $usage += disk_usage($dir."/".$file);
                 } else {
-                    $usage+=@filesize($dir."/".$file);
+                    $usage += @filesize($dir."/".$file);
                 }
             }
         }
@@ -81,8 +81,8 @@ 
     if (!chdir($dir)) {
         return;
     }
-    if ($handle=@opendir(".")) {
-        while ($file=readdir($handle)) {
+    if ($handle = @opendir(".")) {
+        while ($file = readdir($handle)) {
             if ($file == ".") continue;
             if ($file == "..") continue;
 
@@ -93,7 +93,7 @@ 
             if (@is_dir($file)) {
                 clean_cache($max_age, $file);
             } else {
-                if ((time()-@filemtime($file))>$max_age) {
+                if ((time() - @filemtime($file)) > $max_age) {
                     //echo "unlinking ".getcwd()."/$file\n";
                     @unlink($file);
                 }
@@ -107,8 +107,8 @@ 
 
 // check cache size every once in a while, purge if too big
 //
-function cache_check_diskspace(){
-    if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
+function cache_check_diskspace() {
+    if ((rand()%CACHE_SIZE_CHECK_FREQ)) return;
     if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
     $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL,
         USER_PROFILE_TTL, TOP_PAGES_TTL, INDEX_PAGE_TTL
@@ -116,7 +116,7 @@ 
     clean_cache($x, "../cache");
 }
 
-function cache_need_to_regenerate($path, $max_age){
+function cache_need_to_regenerate($path, $max_age) {
     $regenerate = false;
     $request = apache_request_headers();
 
@@ -128,7 +128,7 @@ 
         // and touch the cached copy so other processes
         // don't regenerate at the same time
         //
-        if ($lastmodified<time()-$max_age) {
+        if ($lastmodified < time() - $max_age) {
             $regenerate = true;
             @touch($path);
         }
@@ -139,7 +139,7 @@ 
 }
 
 // Returns cached data or false if nothing was found
-function get_cached_data($max_age, $params=""){
+function get_cached_data($max_age, $params = "") {
     global $no_cache;
 
     if ($no_cache) return;
@@ -155,7 +155,7 @@ 
             }
         } else {
             cache_check_diskspace();
-            $regenerate=cache_need_to_regenerate($path, $max_age);
+            $regenerate = cache_need_to_regenerate($path, $max_age);
             if (!$regenerate) {
                 return file_get_contents($path);
             }
@@ -165,7 +165,7 @@ 
 }
 
 // DEPRECATED
-function start_cache($max_age, $params=""){
+function start_cache($max_age, $params = "") {
     global $no_cache, $caching, $memcache;
 
     if ($no_cache) return;
@@ -188,15 +188,15 @@ 
             $regenerate = cache_need_to_regenerate($path, $max_age);
         }
         //Is the stored version too old, do we need to regenerate it?
-        if ($regenerate){
+        if ($regenerate) {
             // If cached version is too old (or non-existent)
             // generate the page and write to cache
             //
             ob_start();
             ob_implicit_flush(0);
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-            Header("Expires: " . gmdate("D, d M Y H:i:s",time()+$max_age) . " GMT");
-            Header("Cache-Control: public, max-age=" . $max_age);
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+            Header("Expires: ".gmdate("D, d M Y H:i:s", time() + $max_age)." GMT");
+            Header("Cache-Control: public, max-age=".$max_age);
 
             // allow the calling page to see cache period
             //
@@ -208,9 +208,9 @@ 
             if (strstr($params, "format=xml")) {
                 header('Content-type: text/xml');
             }
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s",$lastmodified) . " GMT");
-            Header("Expires: " . gmdate("D, d M Y H:i:s",$lastmodified+$max_age) . " GMT");
-            Header("Cache-Control: public, max-age=" . $max_age );
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastmodified)." GMT");
+            Header("Expires: ".gmdate("D, d M Y H:i:s", $lastmodified + $max_age)." GMT");
+            Header("Cache-Control: public, max-age=".$max_age);
             if ($cache && $cache->content) {
                 echo $cache->content;
                 exit;
@@ -228,7 +228,7 @@ 
 
 // write output buffer both to client and to cache
 // DEPRECATED
-function end_cache($max_age,$params=""){
+function end_cache($max_age, $params = "") {
     global $no_cache;
     if ($no_cache) return;
 
@@ -253,7 +253,7 @@ 
     }
 }
 
-function set_cached_data($max_age, $data, $params=""){
+function set_cached_data($max_age, $data, $params = "") {
     // for the benefit of hackers
     if (strstr($params, "..")) {
         return "bad params";
@@ -294,7 +294,7 @@ 
             self::$instance->setOption(Memcached::OPT_PREFIX_KEY, MEMCACHE_PREFIX);
         }
         $servers = explode('|', MEMCACHE_SERVERS);
-        foreach($servers as &$server) {
+        foreach ($servers as &$server) {
             list($ip, $port) = explode(':', $server);
             if (!$port) { $port = 11211; }
             $server = array($ip, $port);

html/inc/forum_banishment_vote.inc

Spacing +26 added lines, -26 removed lines

@@ -26,7 +26,7 @@ 
 db_init();
 
 function current_tally($voteid) {
-    $query="select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid;
+    $query = "select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     echo "<b>Current Tally</b>    Ayes: ".$foobar->ayes." Nays: ".$foobar->nays."<p>";
@@ -35,8 +35,8 @@ 
 
 function vote_is_in_progress($userid) {
     // check whether a vote is already ongoing
-    $now=time();
-    $query="select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now;
+    $now = time();
+    $query = "select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now;
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to read banishment_vote table 1.<p>";
@@ -51,56 +51,56 @@ 
     return $foobar->count;
 }
 
-function start_vote($config,$logged_in_user,$user,$category,$reason) {
-    $now=time();
-    $fin=$now+21600;
+function start_vote($config, $logged_in_user, $user, $category, $reason) {
+    $now = time();
+    $fin = $now + 21600;
 
 
-    if ( vote_is_in_progress($user->id) !=0 ) {
+    if (vote_is_in_progress($user->id) != 0) {
         echo "A banishment vote is already underway for this user.<p>";
         return 0;
     }
-    $query="insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")";
+    $query = "insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_vote table.<p>";
         return 0;
     }
 
-    $voteid=_mysql_insert_id();
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (". $voteid .",". $logged_in_user->id .",". $now .",1)";
+    $voteid = _mysql_insert_id();
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",1)";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";
         return 0;
     }
 
-    $query="update forum_preferences set banished_until=".$fin." where userid=".$user->id;
+    $query = "update forum_preferences set banished_until=".$fin." where userid=".$user->id;
     $result = _mysql_query($query);
 
     echo "Banishment vote started.<p><p>";
     current_tally($voteid);
-    return send_banish_vote_email($user, 86400*14, $reason, $now+21600);
+    return send_banish_vote_email($user, 86400*14, $reason, $now + 21600);
 }
 
-function vote_yes($config,$logged_in_user,$user) {
-    $now=time();
+function vote_yes($config, $logged_in_user, $user) {
+    $now = time();
     // Check that a vote is underway.
-    if (vote_is_in_progress($user->id)<1) {
+    if (vote_is_in_progress($user->id) < 1) {
         echo "No banishment vote is underway for this user.<p><p>";
         return 0;
     }
     // Find the voteid
-    $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
+    $query = "select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table.<p>";
         return 0;
     }
-    $voteid=$foobar->voteid;
+    $voteid = $foobar->voteid;
     // Check whether mod has voted already.
-    $query="select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
+    $query = "select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
@@ -113,7 +113,7 @@ 
         return 0;
     }
     // insert the vote
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",1)";
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",1)";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";
@@ -124,24 +124,24 @@ 
     return 1;
 }
 
-function vote_no($config,$logged_in_user,$user) {
+function vote_no($config, $logged_in_user, $user) {
     // Check that a vote is underway.
-    $now=time();
-    if (vote_is_in_progress($user->id)<1) {
+    $now = time();
+    if (vote_is_in_progress($user->id) < 1) {
         echo "No banishment vote is underway for this user.<p>";
         return 0;
     }
     // Find the voteid
-    $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
+    $query = "select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table.<p>";
         return 0;
     }
-    $voteid=$foobar->voteid;
+    $voteid = $foobar->voteid;
     // Check whether mod has voted already.
-    $query="select count(id) as count from banishment_votes where voteid=".$voteid ." and modid=".$logged_in_user->id;
+    $query = "select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
@@ -154,7 +154,7 @@ 
         return 0;
     }
     // insert the vote
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",0)";
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",0)";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";

html/user/forum_search_action.php

Spacing +24 added lines, -24 removed lines

@@ -31,10 +31,10 @@ 
 // Optionally filters by forum, user, time, or hidden if specified.
 //
 function search_thread_titles(
-    $keyword_list, $forum="", $user="", $time="", $limit=200,
-    $sort_style=CREATE_TIME_NEW, $show_hidden = false
-){
-    $search_string="%";
+    $keyword_list, $forum = "", $user = "", $time = "", $limit = 200,
+    $sort_style = CREATE_TIME_NEW, $show_hidden = false
+) {
+    $search_string = "%";
     foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
@@ -51,7 +51,7 @@ 
     if (!$show_hidden) {
         $query .= " and thread.hidden = 0";
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case MODIFIED_NEW:
         $query .= ' ORDER BY timestamp DESC';
         break;
@@ -84,11 +84,11 @@ 
 //
 function search_post_content(
     $keyword_list, $forum, $user, $time, $limit, $sort_style, $show_hidden
-){
+) {
     $db = BoincDb::get();
 
-    $search_string="%";
-    foreach ($keyword_list as $key => $word){
+    $search_string = "%";
+    foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
     $optional_join = "";
@@ -100,20 +100,20 @@ 
     }
     $query = "select post.* from ".$db->db_name.".post".$optional_join." where content like '".$search_string."'";
     if ($forum) {
-        $query.=" and forum = $forum->id";
+        $query .= " and forum = $forum->id";
     }
     if ($user) {
-        $query.=" and post.user = $user->id ";
+        $query .= " and post.user = $user->id ";
     }
     if ($time) {
-        $query.=" and post.timestamp > $time";
+        $query .= " and post.timestamp > $time";
     }
     if (!$show_hidden) {
         $query .= " AND post.hidden = 0";
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case VIEWS_MOST:
-        $query.= ' ORDER BY views DESC';
+        $query .= ' ORDER BY views DESC';
         break;
     case CREATE_TIME_NEW:
         $query .= ' ORDER by post.timestamp desc';
@@ -128,13 +128,13 @@ 
         $query .= ' ORDER BY post.timestamp DESC';
         break;
     }
-    $query.= " limit $limit";
+    $query .= " limit $limit";
     return BoincPost::enum_general($query);
 }
 
 $logged_in_user = get_logged_in_user(false);
 BoincForumPrefs::lookup($logged_in_user);
-if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)){
+if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)) {
     $show_hidden_posts = true;
 } else {
     $show_hidden_posts = false;
@@ -147,7 +147,7 @@ 
 $search_max_time = post_int("search_max_time");
 $search_forum = post_int("search_forum");
 $search_sort = post_int("search_sort");
-$search_list = explode(" ",$search_keywords);
+$search_list = explode(" ", $search_keywords);
 if ($search_max_time) {
     $min_timestamp = time() - ($search_max_time*3600*24);
 } else {
@@ -156,7 +156,7 @@ 
 
 $limit = 100;
 
-if ($search_forum==-1){
+if ($search_forum == -1) {
     $forum = null;
 } else if ($search_forum) {
     $forum = BoincForum::lookup_id($search_forum);
@@ -173,10 +173,10 @@ 
 
 // Display the threads while we search for posts
 //
-if (count($threads)){
-    echo "<h3>" . tra("Thread titles matching your query:") . "</h3>";
+if (count($threads)) {
+    echo "<h3>".tra("Thread titles matching your query:")."</h3>";
     show_thread_and_context_header();
-    foreach ($threads as $thread){
+    foreach ($threads as $thread) {
         if ($thread->hidden) continue;
         show_thread_and_context($thread, $logged_in_user);
     }
@@ -192,8 +192,8 @@ 
     $show_hidden_posts
 );
 
-if (count($posts)){
-    echo "<h3>" . tra("Messages matching your query:") . "</h3>";
+if (count($posts)) {
+    echo "<h3>".tra("Messages matching your query:")."</h3>";
     start_table();
     $n = 1;
     $options = get_output_options($logged_in_user);
@@ -215,7 +215,7 @@ 
     end_table();
 }
 
-if (!count($threads) && !count($posts)){
+if (!count($threads) && !count($posts)) {
     echo "<p>".tra("Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).")."</p>
     <p>"
     .tra("You can also %1 try the same search on Google. %2",
@@ -226,5 +226,5 @@ 
 echo "<p><a href=\"forum_search.php\">".tra("Perform another search")."</a></p>";
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/user/download_network.php

Spacing +4 added lines, -4 removed lines

@@ -25,17 +25,17 @@
 page_head(tra("Download BOINC add-on software"));
 echo "
     <p>" .
-    tra("You can download applications in several categories.") ."
+    tra("You can download applications in several categories.")."
     <ul>
     <li>".
-    tra("These applications are not endorsed by %1 and you use them at your own risk.", PROJECT) ."
+    tra("These applications are not endorsed by %1 and you use them at your own risk.", PROJECT)."
     <li>" .
     tra("We do not provide instructions for installing these applications.
 However, the author may have provided some help on installing or uninstalling the application.
 If this is not enough you should contact the author.").
     tra("Instructions for installing and running BOINC are %1 here %2.", "<a href=https://boinc.berkeley.edu/download.php>", "</a>")
-    . "<li>" .
-    tra("This list is managed centrally at %1 the BOINC website %2.", "<a href=\"https://boinc.berkeley.edu/addons.php\">", "</a>") ."
+    . "<li>".
+    tra("This list is managed centrally at %1 the BOINC website %2.", "<a href=\"https://boinc.berkeley.edu/addons.php\">", "</a>")."
     </ul>
 ";
 

html/user/edit_forum_preferences_form.php

Spacing +19 added lines, -19 removed lines

@@ -38,9 +38,9 @@ 
 // ------------ Notification -----------
 
 row1(tra("Notifications"));
-$ch0 = $user->prefs->pm_notification==0?"checked":"";
-$ch1 = $user->prefs->pm_notification==1?"checked":"";
-$ch2 = $user->prefs->pm_notification==2?"checked":"";
+$ch0 = $user->prefs->pm_notification == 0 ? "checked" : "";
+$ch1 = $user->prefs->pm_notification == 1 ? "checked" : "";
+$ch2 = $user->prefs->pm_notification == 2 ? "checked" : "";
 row2(
     tra("How should we notify you of new private messages, friend requests, posts in subscribed threads, and other events?"),
     "<input type=radio name=pm_notification value=0 $ch0> ".tra("On my Account page (no email)")."
@@ -53,8 +53,8 @@ 
 // ------------ Forum identity -----------
 
 $select_0 = $select_1 = $select_2 = "";
-if (strlen($user->prefs->avatar)){
-    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") { // Gravatar
+if (strlen($user->prefs->avatar)) {
+    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18) == "//www.gravatar.com") { // Gravatar
         $select_1 = "checked=\"true\"";
     } else {
         $select_2 = "checked=\"true\"";
@@ -73,15 +73,15 @@ 
     <input type=\"radio\" id=\"avatar_select_2\" name=\"avatar_select\" value=\"2\" ".$select_2.">
         <label for=\"avatar_select_2\">".tra("Use this uploaded avatar:")."</label> <input type=\"file\" name=\"picture\">"
 );
-if (strlen($user->prefs->avatar)){
+if (strlen($user->prefs->avatar)) {
     row2(tra("Avatar preview")."<br><p class=\"text-muted\">".tra("This is how your avatar will look")."</p>",
     "<img src=\"".$user->prefs->avatar."\" width=\"100\" height=\"100\">");
 }
 
-$signature_by_default = $user->prefs->no_signature_by_default==false?"checked=\"checked\"":"";
+$signature_by_default = $user->prefs->no_signature_by_default == false ? "checked=\"checked\"" : "";
 
-$signature=$user->prefs->signature;
-$maxlen=250;
+$signature = $user->prefs->signature;
+$maxlen = 250;
 row2(
     tra("Signature for message board posts")
     .bbcode_info()
@@ -92,7 +92,7 @@ 
     textarea_with_counter("signature", 250, $signature)
     ."<br><input type=\"checkbox\" name=\"signature_by_default\" ".$signature_by_default."> ".tra("Attach signature by default")
 );
-if ($user->prefs->signature!=""){
+if ($user->prefs->signature != "") {
     row2(tra("Signature preview").
         "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>",
         output_transform($user->prefs->signature)
@@ -101,13 +101,13 @@ 
 
 // ------------ Message display  -----------
 
-$forum_hide_avatars = $user->prefs->hide_avatars?"checked=\"checked\"":"";
-$forum_hide_signatures = $user->prefs->hide_signatures?"checked=\"checked\"":"";
-$forum_link_popup = $user->prefs->link_popup?"checked=\"checked\"":"";
-$forum_image_as_link = $user->prefs->images_as_links?"checked=\"checked\"":"";
-$forum_jump_to_unread = $user->prefs->jump_to_unread?"checked=\"checked\"":"";
-$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts?"checked=\"checked\"":"";
-$forum_highlight_special = $user->prefs->highlight_special?"checked=\"checked\"":"";
+$forum_hide_avatars = $user->prefs->hide_avatars ? "checked=\"checked\"" : "";
+$forum_hide_signatures = $user->prefs->hide_signatures ? "checked=\"checked\"" : "";
+$forum_link_popup = $user->prefs->link_popup ? "checked=\"checked\"" : "";
+$forum_image_as_link = $user->prefs->images_as_links ? "checked=\"checked\"" : "";
+$forum_jump_to_unread = $user->prefs->jump_to_unread ? "checked=\"checked\"" : "";
+$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts ? "checked=\"checked\"" : "";
+$forum_highlight_special = $user->prefs->highlight_special ? "checked=\"checked\"" : "";
 
 $forum_minimum_wrap_postcount = intval($user->prefs->minimum_wrap_postcount);
 $forum_display_wrap_postcount = intval($user->prefs->display_wrap_postcount);
@@ -138,7 +138,7 @@ 
 
 $filtered_userlist = get_ignored_list($user);
 $forum_filtered_userlist = "";
-for ($i=0; $i<sizeof($filtered_userlist); $i++){
+for ($i = 0; $i < sizeof($filtered_userlist); $i++) {
     $id = (int)$filtered_userlist[$i];
     if ($id) {
         $filtered_user = BoincUser::lookup_id($id);
@@ -168,5 +168,5 @@ 
 end_table();
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/user/forum_search.php

Spacing +11 added lines, -11 removed lines

@@ -56,18 +56,18 @@ 
     </select>");
 
 $forumid = null;
-if (get_str("forumid",true)){
+if (get_str("forumid", true)) {
     $forumid = get_str("forumid");
 }
-$forumlist="<option value=\"-1\">".tra("All")."</option>";
+$forumlist = "<option value=\"-1\">".tra("All")."</option>";
 $categories = BoincCategory::enum();
 foreach ($categories as $category) {
     $forums = BoincForum::enum("parent_type=0 and category=$category->id");
     foreach ($forums as $forum) {
-        if ($forum->id==$forumid){
-            $forumlist.="<option selected value=\"".$forum->id."\">".$forum->title."</option>";
+        if ($forum->id == $forumid) {
+            $forumlist .= "<option selected value=\"".$forum->id."\">".$forum->title."</option>";
         } else {
-            $forumlist.="<option value=\"".$forum->id."\">".$forum->title."</option>";
+            $forumlist .= "<option value=\"".$forum->id."\">".$forum->title."</option>";
         }
     }
 }
@@ -76,22 +76,22 @@ 
     '<select class="form-control" name="search_forum">'.$forumlist.'</select');
 
 $sortlist = null;
-foreach ($thread_sort_styles as $id => $style){
-    if ($id == CREATE_TIME_NEW){
-        $sortlist.="<option selected value=\"".$id."\">".$style."</option>";
+foreach ($thread_sort_styles as $id => $style) {
+    if ($id == CREATE_TIME_NEW) {
+        $sortlist .= "<option selected value=\"".$id."\">".$style."</option>";
     } else {
-        $sortlist.="<option value=\"".$id."\">".$style."</option>";
+        $sortlist .= "<option value=\"".$id."\">".$style."</option>";
     }
 }
 row2(tra("Sort by"),
     '<select class="form-control" name="search_sort">'.$sortlist.'</select');
 
 row1("&nbsp;");
-row2("","<input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Start the search")."\">");
+row2("", "<input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Start the search")."\">");
 echo "</form>";
 end_table();
 
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/user/forum_moderate_post.php

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
 start_table();
 
 $get_reason = true;
-if (get_str('action')=="hide") {
+if (get_str('action') == "hide") {
     //display input that selects reason
     echo "<input type=hidden name=action value=hide>";
     row1(tra("Hide post"));
@@ -66,12 +66,12 @@ 
             )
         )
     );
-} elseif (get_str('action')=="move") {
+} elseif (get_str('action') == "move") {
     row1(tra("Move post"));
     echo "<input type=hidden name=action value=move>";
     row2(tra("Destination thread ID:"), "<input name=\"threadid\">");
     // TODO: display where to move the post as a dropdown instead of having to get ID
-} elseif (get_str('action')=="banish_user") {
+} elseif (get_str('action') == "banish_user") {
     $userid = get_int('userid');
     $user = BoincUser::lookup_id($userid);
     BoincForumPrefs::lookup($user);
@@ -79,7 +79,7 @@ 
         error_page("no user found");
     }
     $x = $user->prefs->banished_until;
-    if ($x>time()) {
+    if ($x > time()) {
         error_page(tra("User is already banished"));
     }
     row1(tra("Banish user"));
@@ -97,7 +97,7 @@ 
     echo "<input type=\"hidden\" name=\"id\" value=\"".$postid."\">\n";
     echo "<input type=\"hidden\" name=\"userid\" value=\"".$userid."\">\n";
     echo "<input type=\"hidden\" name=\"confirmed\" value=\"yes\">\n";
-} elseif (get_str('action')=="delete") {
+} elseif (get_str('action') == "delete") {
     echo "<input type=hidden name=action value=delete>";
     row2(
         "Are you sure want to delete this post?  This cannot be undone.",