BOINC / boinc

html/inc/bolt_xset.inc

Doc Comments +9 added lines

@@ -22,6 +22,9 @@ 
     public $weight;
     public $callback;
 
+    /**
+     * @param null|BoltRefresh $refresh
+     */
     function __construct(
         $name, $units, $number, $repeats, $refresh, $attrs, $callback, $weight
     ) {
@@ -156,10 +159,16 @@ 
 define('REPEAT', 2);
 define('NEXT', 4);
 
+/**
+ * @param integer $f
+ */
 function repeat($s, $u, $f) {
     return new BoltRepeat($s, $u, $f);
 }
 
+/**
+ * @param integer[] $a
+ */
 function refresh($a) {
     return new BoltRefresh($a);
 }

Spacing +6 added lines, -6 removed lines

@@ -52,7 +52,7 @@ 
         $nshown = $state_rec['nshown'];
         $state_rec['scores'][$nshown] = $score;
         $iter->state[$this->name] = $state_rec;
-        $is_last = ($nshown+1 == $this->ntoshow);
+        $is_last = ($nshown + 1 == $this->ntoshow);
         if (!$is_last) {
             return false;
         }
@@ -62,15 +62,15 @@ 
         //   - optionally create or update bolt_refresh record
         //
         $total_score = 0;
-        for ($i=0; $i<$nshown+1; $i++) {
+        for ($i = 0; $i < $nshown + 1; $i++) {
             $total_score += $state_rec['scores'][$i];
         }
-        $avg_score = $total_score/($nshown+1);
+        $avg_score = $total_score/($nshown + 1);
 
         $repeat = null;
         $least = 2;
         foreach ($this->repeats as $r) {
-            if ($avg_score < $r->score && $r->score<$least) {
+            if ($avg_score < $r->score && $r->score < $least) {
                 $repeat = $r;
                 $least = $r->score;
             }
@@ -134,7 +134,7 @@ 
     }
 }
 
-class BoltRefresh{
+class BoltRefresh {
     public $intervals;
     function __construct($i) {
         $this->intervals = $i;
@@ -191,7 +191,7 @@ 
             } else if (get_class($arg) == "BoltRepeat") {
                 $repeats[] = $arg;
             } else if (get_class($arg) == "BoltRefresh") {
-                $refresh= $arg;
+                $refresh = $arg;
             } else {
                 echo "Can't include object of type ".get_class($arg)." within an exercise set.";
             }

Braces +3 added lines, -1 removed lines

@@ -200,7 +200,9 @@
         }
     }
 
-    if ($number == 0) $number = count($units);
+    if ($number == 0) {
+        $number = count($units);
+    }
     return new BoltExerciseSet(
         $name, $units, $number, $repeats, $refresh, $attrs, $callback, $weight
     );

html/inc/bossa.inc

Doc Comments +3 added lines

@@ -38,6 +38,9 @@
     return $job->insert($clause);
 }
 
+/**
+ * @param string $name
+ */
 function bossa_batch_create($appid, $name, $calibration) {
     $now = time();
     $c = $calibration?"1":"0";

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
 function bossa_batch_create($appid, $name, $calibration) {
     $now = time();
-    $c = $calibration?"1":"0";
+    $c = $calibration ? "1" : "0";
     return BossaBatch::insert("(create_time, app_id, name, calibration) values ($now, $appid, '$name', $c)");
 }
 

Braces +6 added lines, -2 removed lines

@@ -47,13 +47,17 @@
 function bossa_app_lookup($name) {
     $name = BoincDb::escape_string($name);
     $app = BossaApp::lookup("short_name='$name'");
-    if (!$app) return 0;
+    if (!$app) {
+        return 0;
+    }
     return $app->id;
 }
 
 function bossa_lookup_job($instid, &$job, &$inst, &$user) {
     $inst = BossaJobInst::lookup_id($instid);
-    if (!$inst) return false;
+    if (!$inst) {
+        return false;
+    }
     $job = BossaJob::lookup_id($inst->job_id);
     $user = BoincUser::lookup_id($inst->user_id);
     BossaUser::lookup($user);

html/inc/cache.inc

Doc Comments +17 added lines

@@ -59,6 +59,9 @@ 
     return $path;
 }
 
+/**
+ * @param string $dir
+ */
 function disk_usage($dir) {
     $usage=0;
     if ($handle=@opendir($dir)) {
@@ -76,6 +79,10 @@ 
     return $usage;
 }
 
+/**
+ * @param integer $max_age
+ * @param string $dir
+ */
 function clean_cache($max_age, $dir) {
     $start_dir = getcwd();
     if (!chdir($dir)) {
@@ -116,6 +123,9 @@ 
     clean_cache($x, "../cache");
 }
 
+/**
+ * @param string $path
+ */
 function cache_need_to_regenerate($path, $max_age){
     $regenerate = false;
     $request = apache_request_headers();
@@ -139,6 +149,9 @@ 
 }
 
 // Returns cached data or false if nothing was found
+/**
+ * @param integer $max_age
+ */
 function get_cached_data($max_age, $params=""){
     global $no_cache;
 
@@ -253,6 +266,10 @@ 
     }
 }
 
+/**
+ * @param integer $max_age
+ * @param string $data
+ */
 function set_cached_data($max_age, $data, $params=""){
     // for the benefit of hackers
     if (strstr($params, "..")) {

Indentation +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
                 }
             }
         }
-       @closedir($handle);
+        @closedir($handle);
     }
     chdir($start_dir);
 } 

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);

Braces +24 added lines, -8 removed lines

@@ -42,7 +42,9 @@ 
 }
 
 function get_path($params, $phpfile=null) {
-    if (!@filemtime("../cache/00")) make_cache_dirs();
+    if (!@filemtime("../cache/00")) {
+        make_cache_dirs();
+    }
     if ($phpfile) {
         $z = $phpfile;
     } else {
@@ -83,8 +85,12 @@ 
     }
     if ($handle=@opendir(".")) {
         while ($file=readdir($handle)) {
-            if ($file == ".") continue;
-            if ($file == "..") continue;
+            if ($file == ".") {
+                continue;
+            }
+            if ($file == "..") {
+                continue;
+            }
 
             // don't let hackers trick us into deleting other files!
             if (strstr($file, "..")) {
@@ -108,8 +114,12 @@ 
 // check cache size every once in a while, purge if too big
 //
 function cache_check_diskspace(){
-    if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
-    if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
+    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
     );
@@ -142,7 +152,9 @@ 
 function get_cached_data($max_age, $params=""){
     global $no_cache;
 
-    if ($no_cache) return;
+    if ($no_cache) {
+        return;
+    }
 
     $path = get_path($params);
     if ($max_age) {
@@ -168,7 +180,9 @@ 
 function start_cache($max_age, $params=""){
     global $no_cache, $caching, $memcache;
 
-    if ($no_cache) return;
+    if ($no_cache) {
+        return;
+    }
     $caching = true;
 
     if ($max_age) {
@@ -230,7 +244,9 @@ 
 // DEPRECATED
 function end_cache($max_age,$params=""){
     global $no_cache;
-    if ($no_cache) return;
+    if ($no_cache) {
+        return;
+    }
 
     // for the benefit of hackers
     if (strstr($params, "..")) {

html/inc/cert.inc

Doc Comments +3 added lines

@@ -37,6 +37,9 @@
     $ops = number_format($ops, 2);
 }
 
+/**
+ * @param boolean $bolden
+ */
 function credit_string($credit, $bolden) {
     $cobbs = number_format($credit, 0);
 

Spacing +3 added lines, -3 removed lines

@@ -43,10 +43,10 @@
     credit_to_ops($credit, $ops, $unit);
       
     if ($bolden) {
-        $lbold="[[";
-        $rbold="]]";
+        $lbold = "[[";
+        $rbold = "]]";
     } else {
-        $lbold="";        $rbold="";
+        $lbold = ""; $rbold = "";
     } 
     return " $lbold$cobbs Cobblestones$rbold of computation ($ops $unit floating-point operations)";
 }

html/inc/db.inc

Doc Comments +8 added lines

@@ -69,6 +69,10 @@ 
     function _mysql_fetch_row($r) {
         return mysqli_fetch_row($r);
     }
+
+    /**
+     * @param resource $r
+     */
     function _mysql_fetch_assoc($r) {
         return mysqli_fetch_assoc($r);
     }
@@ -132,6 +136,10 @@ 
     function _mysql_fetch_row($r) {
         return mysql_fetch_row($r);
     }
+
+    /**
+     * @param resource $r
+     */
     function _mysql_fetch_assoc($r) {
         return mysql_fetch_assoc($r);
     }

Switch Indentation +8 added lines, -8 removed lines

@@ -86,14 +86,14 @@
     function _mysql_field_attrs($r, $i) {
         $x = mysqli_fetch_field_direct($r, $i);
         switch ($x->type) {
-            case 1: $x->type = 'tinyint'; break;
-            case 2: $x->type = 'smallint'; break;
-            case 3: $x->type = 'int'; break;
-            case 5: $x->type = 'double'; break;
-            case 7: $x->type = 'timestamp'; break;
-            case 252: $x->type = 'blob'; break;
-            case 253: $x->type = 'varchar'; break;
-            case 254: $x->type = 'char'; break;
+        case 1: $x->type = 'tinyint'; break;
+        case 2: $x->type = 'smallint'; break;
+        case 3: $x->type = 'int'; break;
+        case 5: $x->type = 'double'; break;
+        case 7: $x->type = 'timestamp'; break;
+        case 252: $x->type = 'blob'; break;
+        case 253: $x->type = 'varchar'; break;
+        case 254: $x->type = 'char'; break;
         }
         return $x;
     }

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
     function _mysql_connect($host, $user, $pass, $dbname) {
         global $mysqli;
         $x = explode(":", $host);
-        if (sizeof($x)>1) {
+        if (sizeof($x) > 1) {
             $host = $x[0];
             $port = $x[1];
         } else {
@@ -162,7 +162,7 @@ 
     }
 }
 
-function db_init_aux($try_replica=false) {
+function db_init_aux($try_replica = false) {
     $config = get_config();
     $user = parse_config($config, "<db_user>");
     $pass = parse_config($config, "<db_passwd>");

Braces +12 added lines, -4 removed lines

@@ -111,7 +111,9 @@ 
 } else {
     function _mysql_connect($host, $user, $pass, $db_name) {
         $link = mysql_pconnect($host, $user, $pass);
-        if (!$link) return null;
+        if (!$link) {
+            return null;
+        }
         if (!mysql_select_db($db_name, $link)) {
             return null;
         }
@@ -173,11 +175,17 @@ 
         if ($x) {
             $host = $x;
             $x = parse_config($config, "<replica_db_user>");
-            if ($x) $user = $x;
+            if ($x) {
+                $user = $x;
+            }
             $x = parse_config($config, "<replica_db_passwd>");
-            if ($x) $pass = $x;
+            if ($x) {
+                $pass = $x;
+            }
             $x = parse_config($config, "<replica_db_name>");
-            if ($x) $db_name = $x;
+            if ($x) {
+                $db_name = $x;
+            }
         }
     }
     if ($host == null) {

html/inc/db_conn.inc

Doc Comments +50 added lines

@@ -26,6 +26,9 @@ 
     var $db_name;
     var $readonly;
 
+    /**
+     * @param boolean $readonly
+     */
     function init_conn($user, $passwd, $host, $name, $readonly) {
         if (MYSQLI) {
             $x = explode(":", $host);
@@ -112,6 +115,10 @@ 
         return $this->lookup_fields($table, $classname, "*", $clause);
     }
 
+    /**
+     * @param string $table
+     * @param string $classname
+     */
     function lookup_id($id, $table, $classname) {
         $id = (int)$id;
         return $this->lookup($table, $classname, "id=$id");
@@ -146,28 +153,51 @@ 
         return $this->enum_general($classname,$query);
     }
 
+    /**
+     * @param string $table
+     * @param string $classname
+     */
     function enum($table, $classname, $where_clause=null, $order_clause=null) {
         return self::enum_fields(
             $table, $classname, '*', $where_clause, $order_clause
         );
     }
 
+    /**
+     * @param string $table
+     */
     function update($obj, $table, $clause) {
         $query = "update DBNAME.$table set $clause where id=$obj->id";
         return $this->do_query($query);
     }
+
+    /**
+     * @param string $table
+     */
     function update_aux($table, $clause) {
         $query = "update DBNAME.$table set $clause";
         return $this->do_query($query);
     }
+
+    /**
+     * @param string $table
+     */
     function insert($table, $clause) {
         $query = "insert into DBNAME.$table $clause";
         return $this->do_query($query);
     }
+
+    /**
+     * @param string $table
+     */
     function delete($obj, $table) {
         $query = "delete from DBNAME.$table where id=$obj->id";
         return $this->do_query($query);
     }
+
+    /**
+     * @param string $table
+     */
     function delete_aux($table, $clause) {
         $query = "delete from DBNAME.$table where $clause";
         return $this->do_query($query);
@@ -179,6 +209,10 @@ 
             return mysql_insert_id($this->db_conn);
         }
     }
+
+    /**
+     * @param string $field
+     */
     function get_int($query, $field) {
         $result = $this->do_query($query);
         if (!$result) error_page("database error on query $query");
@@ -209,14 +243,26 @@ 
         $query = "select count(*) as total from DBNAME.$table where $clause";
         return $this->get_int($query, 'total');
     }
+
+    /**
+     * @param string $table
+     */
     function sum($table, $field, $clause="") {
         $query = "select sum($field) as total from DBNAME.$table $clause";
         return $this->get_double($query, 'total');
     }
+
+    /**
+     * @param string $table
+     */
     function max($table, $field, $clause="") {
         $query = "select max($field) as total from DBNAME.$table $clause";
         return $this->get_double($query, 'total');
     }
+
+    /**
+     * @param string $table
+     */
     function percentile($table, $field, $clause, $pct) {
         $n = $this->count($table, $clause);
         if (!$n) return false;
@@ -224,6 +270,10 @@ 
         $query = "select $field from DBNAME.$table where $clause order by $field limit $m,1";
         return $this->get_double($query, $field);
     }
+
+    /**
+     * @param string $table
+     */
     function replace($table, $clause) {
         $query = "replace into DBNAME.$table set $clause";
         return $this->do_query($query);

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
     function init_conn($user, $passwd, $host, $name, $readonly) {
         if (MYSQLI) {
             $x = explode(":", $host);
-            if (sizeof($x)>1) {
+            if (sizeof($x) > 1) {
                 $host = $x[0];
                 $port = $x[1];
             } else {
@@ -143,10 +143,10 @@ 
             $where_clause = "where $where_clause";
         }
         $query = "select $fields from DBNAME.$table $where_clause $order_clause";
-        return $this->enum_general($classname,$query);
+        return $this->enum_general($classname, $query);
     }
 
-    function enum($table, $classname, $where_clause=null, $order_clause=null) {
+    function enum($table, $classname, $where_clause = null, $order_clause = null) {
         return self::enum_fields(
             $table, $classname, '*', $where_clause, $order_clause
         );
@@ -205,15 +205,15 @@ 
         if ($x) return (double)$x->$field;
         return false;
     }
-    function count($table, $clause="TRUE") {
+    function count($table, $clause = "TRUE") {
         $query = "select count(*) as total from DBNAME.$table where $clause";
         return $this->get_int($query, 'total');
     }
-    function sum($table, $field, $clause="") {
+    function sum($table, $field, $clause = "") {
         $query = "select sum($field) as total from DBNAME.$table $clause";
         return $this->get_double($query, 'total');
     }
-    function max($table, $field, $clause="") {
+    function max($table, $field, $clause = "") {
         $query = "select max($field) as total from DBNAME.$table $clause";
         return $this->get_double($query, 'total');
     }

Braces +24 added lines, -8 removed lines

@@ -119,7 +119,9 @@ 
 
     function enum_general($classname, $query) {
         $result = $this->do_query($query);
-        if (!$result) return null;
+        if (!$result) {
+            return null;
+        }
         $x = array();
         if (MYSQLI) {
             while ($obj = $result->fetch_object($classname)) {
@@ -181,7 +183,9 @@ 
     }
     function get_int($query, $field) {
         $result = $this->do_query($query);
-        if (!$result) error_page("database error on query $query");
+        if (!$result) {
+            error_page("database error on query $query");
+        }
         if (MYSQLI) {
             $x = $result->fetch_object("StdClass");
             $result->free();
@@ -189,12 +193,16 @@ 
             $x = mysql_fetch_object($result);
             mysql_free_result($result);
         }
-        if ($x) return $x->$field;
+        if ($x) {
+            return $x->$field;
+        }
         return false;
     }
     function get_double($query, $field) {
         $result = $this->do_query($query);
-        if (!$result) error_page("database error on query $query");
+        if (!$result) {
+            error_page("database error on query $query");
+        }
         if (MYSQLI) {
             $x = $result->fetch_object("StdClass");
             $result->free();
@@ -202,7 +210,9 @@ 
             $x = mysql_fetch_object($result);
             mysql_free_result($result);
         }
-        if ($x) return (double)$x->$field;
+        if ($x) {
+            return (double)$x->$field;
+        }
         return false;
     }
     function count($table, $clause="TRUE") {
@@ -219,7 +229,9 @@ 
     }
     function percentile($table, $field, $clause, $pct) {
         $n = $this->count($table, $clause);
-        if (!$n) return false;
+        if (!$n) {
+            return false;
+        }
         $m = (int)($n*$pct/100);
         $query = "select $field from DBNAME.$table where $clause order by $field limit $m,1";
         return $this->get_double($query, $field);
@@ -251,10 +263,14 @@ 
     }
     function table_exists($table_name) {
         $result = $this->do_query("show tables from DBNAME like '$table_name'");
-        if (!$result) error_page("database error on query $query");
+        if (!$result) {
+            error_page("database error on query $query");
+        }
         $t = _mysql_fetch_array($result);
         _mysql_free_result($result);
-        if ($t[0] == "$table_name") return true;
+        if ($t[0] == "$table_name") {
+            return true;
+        }
         return false;
     }
 }

html/inc/db_ops.inc

Doc Comments +26 added lines

@@ -103,6 +103,9 @@ 
 
 // Function prints a description of $table 
 //
+/**
+ * @param integer $which
+ */
 function print_describe_table_onecol($table, $which, $columns) {
     $db = BoincDb::get(true);
     $result = $db->do_query("SELECT * from $table LIMIT 1");
@@ -262,6 +265,10 @@ 
             $this->urlquery .= "&clauses=$clause";
         }
     }
+
+    /**
+     * @param string $name
+     */
     function addeq($name) {
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
@@ -273,6 +280,10 @@ 
             $this->urlquery .= "&$name=".urlencode($value);
         }
     }
+
+    /**
+     * @param string $name
+     */
     function addeq_not_CHOOSE_ALL($name) {
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
@@ -287,6 +298,10 @@ 
             $this->urlquery .= "&$name=".urlencode($value);
         }
     }
+
+    /**
+     * @param string $name
+     */
     function addgt($name) {
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
@@ -298,6 +313,11 @@ 
             $this->urlquery .= "&$name=".urlencode($value);
         }
     }
+
+    /**
+     * @param string $name
+     * @param string $order
+     */
     function addsort($name, $order) {
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
@@ -375,6 +395,9 @@ 
 }
 
 
+/**
+ * @param string $mq
+ */
 function link_results($n, $mq, $query, $clauses) {
     if ($n == '0') { // intentional compare by string
         return "0";
@@ -824,6 +847,9 @@ 
     return number_format($x/86400, 2)." days";
 }
 
+/**
+ * @param integer $x
+ */
 function resource_name($x) {
     switch ($x) {
     case 2: return "CPU";

Indentation +5 added lines, -5 removed lines

@@ -305,9 +305,9 @@ 
             $value=null;
         }
         if (isset($_GET[$order])) {
-             $order = $_GET[$order];
+                $order = $_GET[$order];
         } else {
-             $order = null;
+                $order = null;
         }
         if (strlen($value)) {
             if ($order == 'asc') {
@@ -575,7 +575,7 @@ 
         $res = new StdClass;
         $res->server_state = $ss;
         row2(result_server_state_string($res),
-             link_results("$server_state[$ss]",  $urlquery,"server_state=$ss", '')
+                link_results("$server_state[$ss]",  $urlquery,"server_state=$ss", '')
         );
     }
     echo "</table></td>";
@@ -1026,8 +1026,8 @@ 
 
 function validate_color($validate_state) {
     switch ($validate_state) {
-   case 1: return '33cc33'; // valid, green
-   case 2: return 'ffa500'; // invalid result, orange
+    case 1: return '33cc33'; // valid, green
+    case 2: return 'ffa500'; // invalid result, orange
     }
     return '';
 }

Spacing +106 added lines, -106 removed lines

@@ -40,27 +40,27 @@ 
 // @return String A user readable DateTime-String in UTC
 // @param Integer $x The mysql-Timestamp to convert
 function mysqltime_str($x) {
-    if(strpos($x,"-")==4) {
+    if (strpos($x, "-") == 4) {
         // Syntax of supplied mysql-timestamp is YYYY-MM-DD HH:MM:SS
-        $year = substr($x,0,4);
-        $month = substr($x,5,2);
-        $day = substr($x,8,2);
-        $hour = substr($x,11,2);
-        $minute = substr($x,14,2);
-        $second = substr($x,17,2);
+        $year = substr($x, 0, 4);
+        $month = substr($x, 5, 2);
+        $day = substr($x, 8, 2);
+        $hour = substr($x, 11, 2);
+        $minute = substr($x, 14, 2);
+        $second = substr($x, 17, 2);
     } else {
         // Syntax of supplied mysql-timestamp is YYYYMMDDHHMMSS
-        $year = substr($x,0,4);
-        $month = substr($x,4,2);
-        $day = substr($x,6,2);
-        $hour = substr($x,8,2);
-        $minute = substr($x,10,2);
-        $second = substr($x,12,2);
+        $year = substr($x, 0, 4);
+        $month = substr($x, 4, 2);
+        $day = substr($x, 6, 2);
+        $hour = substr($x, 8, 2);
+        $minute = substr($x, 10, 2);
+        $second = substr($x, 12, 2);
     
     }
     //make a Unix-Timestamp
     // echo "Time string is " . "$x";
-    $time = mktime($hour,$minute,$second,$month,$day,$year);
+    $time = mktime($hour, $minute, $second, $month, $day, $year);
     return time_str($time);
 }
 
@@ -98,7 +98,7 @@ 
         $constants = get_defined_constants(true);
         foreach ($constants['mysqli'] as $c => $n) if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1];
     }
-    return array_key_exists($type_id, $types)? strtolower($types[$type_id]) : "unknown";
+    return array_key_exists($type_id, $types) ? strtolower($types[$type_id]) : "unknown";
 }
 
 // Function prints a description of $table 
@@ -108,38 +108,38 @@ 
     $result = $db->do_query("SELECT * from $table LIMIT 1");
     $fields = $result->field_count;
 
-    $avgnum=(int)($fields/$columns);
-    if ($avgnum*$columns<$fields) {
+    $avgnum = (int)($fields/$columns);
+    if ($avgnum*$columns < $fields) {
         $avgnum++;
     }
 
-    $actualcolumns=0;
-    while ($avgnum*$actualcolumns<$fields) {
+    $actualcolumns = 0;
+    while ($avgnum*$actualcolumns < $fields) {
         $actualcolumns++;
     }
 
-    if ($which>$actualcolumns) {
+    if ($which > $actualcolumns) {
         return 0;
     }
 
-    $bot=($which-1)*$avgnum;
-    $top=$which*$avgnum;
+    $bot = ($which - 1)*$avgnum;
+    $top = $which*$avgnum;
 
-    $width=100.0/$actualcolumns;
+    $width = 100.0/$actualcolumns;
 
     //  echo "<td><table border='2' width=\"$width%\">\n";
     echo "<td><table border=\"1\" width=\"100%\">\n";
     echo "<tr><th align=\"left\">NAME</th><th align=\"left\">Type</th><th align=\"left\">Bytes</th>\n";
-    for ($count=$bot; $count<$top; $count++) {
-        if ($count<$fields) {
+    for ($count = $bot; $count < $top; $count++) {
+        if ($count < $fields) {
             $x = $result->fetch_field_direct($count);
             $name = $x->name;
             $type = mysql_fieldtype_str($x->type);
             $length = $x->length;
         } else {
-            $name="<br/> ";
-            $type="<br/>";
-            $length="<br/>";
+            $name = "<br/> ";
+            $type = "<br/>";
+            $length = "<br/>";
         }
         echo "\t<tr><td><b>$name</b></td><td>$type</td><td>$length</td></tr>\n";
     }
@@ -152,7 +152,7 @@ 
     // Number of columns for showing table description
     echo "<h2>Description of <b>$table</b> table fields:</h2>\n";
     echo "<table border=\"0\" width=\"100%\">\n\t<tr>";
-    for ($i=1; $i<=$how_many_columns; $i++) {
+    for ($i = 1; $i <= $how_many_columns; $i++) {
         print_describe_table_onecol($table, $i, $how_many_columns);
     }
     echo "\t</tr>\n</table>\n";
@@ -170,10 +170,10 @@ 
 }
 
 function print_query_field() {
-    $currenttime=time();
-    $hourago=$currenttime-3600;
-    $dayago=$currenttime-24*3600;
-    $weekago=$currenttime-7*24*3600;
+    $currenttime = time();
+    $hourago = $currenttime - 3600;
+    $dayago = $currenttime - 24*3600;
+    $weekago = $currenttime - 7*24*3600;
     echo "
         <tr>
         <td align=\"right\">Additional clauses</td>
@@ -197,11 +197,11 @@ 
     }
 }
 
-function append_sql_query($original,$addition,$first) {
+function append_sql_query($original, $addition, $first) {
     if ($first == 1) {
-        return $original . " where " . $addition;
+        return $original." where ".$addition;
     } else {
-        return $original . " and " . $addition;
+        return $original." and ".$addition;
     }
 }
 
@@ -302,7 +302,7 @@ 
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
         } else {
-            $value=null;
+            $value = null;
         }
         if (isset($_GET[$order])) {
              $order = $_GET[$order];
@@ -343,7 +343,7 @@ 
     }
 
     function get_url($base = "db_action.php") {
-        $s = $base . "?table=$this->table$this->urlquery";
+        $s = $base."?table=$this->table$this->urlquery";
         return $s;
     }
 
@@ -358,7 +358,7 @@ 
         $this->addeq('app_version_id');
         $this->addeq('exit_status');
         if (isset($_GET['nsecs'])) {
-            $_GET['mod_time'] = date("YmdHis",time() - $_GET['nsecs']);
+            $_GET['mod_time'] = date("YmdHis", time() - $_GET['nsecs']);
         }
         $this->addgt('mod_time');
         $this->addeq_not_CHOOSE_ALL('server_state');
@@ -379,7 +379,7 @@ 
     if ($n == '0') { // intentional compare by string
         return "0";
     } else {
-        if(strlen($clauses)) {
+        if (strlen($clauses)) {
             return "<a href=\"db_action.php?table=result&query=$mq&$query&clauses=".urlencode($clauses)."&sort_by=mod_time&detail=low\">$n</a>";
         }
         else {
@@ -392,13 +392,13 @@ 
 // Determines if in stderr_out is an error reported and prints as human readable String
 // @return String A human readable string if error otherwise FALSE
 // @param String $stderr_out the stderr_out value to parse
-function stderr_error_string($stderr_out){
+function stderr_error_string($stderr_out) {
     $y = parse_element($stderr_out, "<error_code>");
     $x = 0;
     if ($y) {
         $x = (int)$y;
     }
-    if (0<=$x && $x<=9) {
+    if (0 <= $x && $x <= 9) {
         return FALSE;
     } else {
         return "$x ".error_code_str($x);
@@ -407,8 +407,8 @@ 
 
 function show_result_summary() {
 
-    $ntotal =0;     // TODO: how to count $result?
-    $nvalid = 0;    // for SUCCESS results
+    $ntotal = 0; // TODO: how to count $result?
+    $nvalid = 0; // for SUCCESS results
     $ninvalid = 0;
     $nfile_deleted = 0;
 
@@ -416,20 +416,20 @@ 
     $outcome = array();
     $client_state = array();
 
-    for ($ss=1; $ss<6; $ss++) {
+    for ($ss = 1; $ss < 6; $ss++) {
         $server_state[$ss] = 0;
     }
-    for ($ro=0; $ro<8; $ro++) {
+    for ($ro = 0; $ro < 8; $ro++) {
         $outcome[$ro] = 0;
     }
-    for ($cs=1; $cs<7; $cs++) {
+    for ($cs = 1; $cs < 7; $cs++) {
         $client_state[$cs] = 0;
     }
-    for ($fds=0; $fds<4; $fds++) {
+    for ($fds = 0; $fds < 4; $fds++) {
         $delete_state[$fds] = 0;
     }
-    for ($vs=0; $vs<NVALIDATE_STATES; $vs++) {
-        $validate_state[$vs]=0;
+    for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) {
+        $validate_state[$vs] = 0;
     }
 
     $_GET['table'] = 'result';
@@ -504,7 +504,7 @@ 
         //
         $delay = parse_config(get_config(), "<delete_delay_hours>");
         if ($delay) {
-            $start2 = $start - $delay*3600;;
+            $start2 = $start - $delay*3600; ;
             $main_query .= " and ((file_delete_state>1 and mod_time>FROM_UNIXTIME($start2)) or (mod_time>FROM_UNIXTIME($start)))";
         } else {
             $main_query .= " and mod_time > FROM_UNIXTIME($start)";
@@ -563,19 +563,19 @@ 
 
     echo "<table>";
     echo "<tr valign=\"top\">";
-    echo "<td><h2>" . link_results("$ntotal results", $urlquery, '', '') . "</h2></td>";
-    echo "<td><h2>" . link_results("'Over' results", $urlquery, "server_state=5", '') . "</h2></td>";
-    echo "<td><h2>" . link_results("'Success' results", $urlquery, "outcome=1", '') . "</h2></td>";
-    echo "<td><h2>" . link_results("'Client error' results", $urlquery, "outcome=3", '') . "</h2></td>";
+    echo "<td><h2>".link_results("$ntotal results", $urlquery, '', '')."</h2></td>";
+    echo "<td><h2>".link_results("'Over' results", $urlquery, "server_state=5", '')."</h2></td>";
+    echo "<td><h2>".link_results("'Success' results", $urlquery, "outcome=1", '')."</h2></td>";
+    echo "<td><h2>".link_results("'Client error' results", $urlquery, "outcome=3", '')."</h2></td>";
     echo "</tr>";
     echo "<tr valign=\"top\">";
     echo "<td><table border=2 cellpadding=4>\n";
     echo "<tr><th>Server state</th><th># results</th></tr>\n";
-    for ($ss=1; $ss<6; $ss++) {
+    for ($ss = 1; $ss < 6; $ss++) {
         $res = new StdClass;
         $res->server_state = $ss;
         row2(result_server_state_string($res),
-             link_results("$server_state[$ss]",  $urlquery,"server_state=$ss", '')
+             link_results("$server_state[$ss]", $urlquery, "server_state=$ss", '')
         );
     }
     echo "</table></td>";
@@ -583,11 +583,11 @@ 
     echo "<td><table border=2 cellpadding=4>\n";
     echo "<tr><th>Outcome</th><th># results</th></tr>\n";
 
-    for ($ro=0; $ro<8; $ro++) {
+    for ($ro = 0; $ro < 8; $ro++) {
         $res = new StdClass;
         $res->outcome = $ro;
         $res->exit_status = 0;
-        c_row2($outcome[$ro]?outcome_color($ro):'', result_outcome_string($res),
+        c_row2($outcome[$ro] ? outcome_color($ro) : '', result_outcome_string($res),
             link_results("$outcome[$ro]", $urlquery, "outcome=$ro", '')
         );
     }
@@ -595,18 +595,18 @@ 
 
     echo "<td><table border=2 cellpadding=4>\n";
     echo "<tr><th>Validate state</th><th># results</th></tr>\n";
-    for ($vs=0; $vs<NVALIDATE_STATES; $vs++) {
+    for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) {
         $res = new StdClass;
         $res->validate_state = $vs;
         $res->exit_status = 0;
-        c_row2($validate_state[$vs]?validate_color($vs):'', validate_state_str($res),
+        c_row2($validate_state[$vs] ? validate_color($vs) : '', validate_state_str($res),
         link_results("$validate_state[$vs]", $urlquery, "validate_state=$vs", "outcome=1"));
     }
     echo "</table>";
     echo "<table border=2 cellpadding=4>\n";
     echo "<tr><th>File Delete state</th><th># results</th></tr>\n";
   
-    for ($fds=0; $fds<4; $fds++) {
+    for ($fds = 0; $fds < 4; $fds++) {
         row2(file_delete_state_str($fds),
         link_results("$file_delete[$fds]", $urlquery, "outcome=1", "file_delete_state=$fds"));
     }
@@ -616,7 +616,7 @@ 
 
     echo "<td><table border=2 cellpadding=4>\n";
     echo "<tr><th>Client state</th><th># results</th></tr>\n";
-    for ($cs=1; $cs<7; $cs++) {
+    for ($cs = 1; $cs < 7; $cs++) {
         $res = new StdClass;
         $res->client_state = $cs;
         $res->exit_status = 0;
@@ -634,9 +634,9 @@ 
         <select name=\"server_state\">
         <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option>
     ";
-    for ($i=1; $i<6; $i++) {
+    for ($i = 1; $i < 6; $i++) {
         $res = new StdClass;
-        $res->server_state=$i;
+        $res->server_state = $i;
         echo "<option value=\"$i\"> "."[$i]&nbsp;&nbsp;".'   '.result_server_state_string($res)."</option>\n";
     }
     echo "</select>\n";
@@ -647,7 +647,7 @@ 
         <select name=\"outcome\">
         <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option>
     ";
-    for ($i=0; $i<8; $i++) {
+    for ($i = 0; $i < 8; $i++) {
         $res = new StdClass;
         $res->outcome = $i;
         $res->exit_status = 0;
@@ -661,7 +661,7 @@ 
         <select name=\"validate_state\">
         <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option>
         ";
-    for ($vs=0; $vs<NVALIDATE_STATES; $vs++) {
+    for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) {
         $res = new StdClass;
         $res->validate_state = $vs;
         $res->exit_status = 0;
@@ -675,7 +675,7 @@ 
         <select name=\"client_state\">
         <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option>
     ";
-    for ($i=0; $i<7; $i++) {
+    for ($i = 0; $i < 7; $i++) {
         $res = new StdClass;
         $res->client_state = $i;
         $res->exit_status = 0;
@@ -712,7 +712,7 @@ 
 }
 
 function table_title($table) {
-    switch($table) {
+    switch ($table) {
     case "platform": return "Platforms";
     case "app": return "Applications";
     case "app_version": return "Application Versions";
@@ -732,7 +732,7 @@ 
     row("Created", time_str($platform->create_time));
     row("Name", $platform->name);
     row("User friendly name", $platform->user_friendly_name);
-    row("","<a href=\"db_action.php?table=app_version&platformid=$platform->id\">App versions for this platform</a>");
+    row("", "<a href=\"db_action.php?table=app_version&platformid=$platform->id\">App versions for this platform</a>");
     end_table();
 }
 
@@ -744,8 +744,8 @@ 
     row("User-friendly name", $app->user_friendly_name);
     row("Deprecated", $app->deprecated);
     row("Homogeneous redundancy", $app->homogeneous_redundancy);
-    row("","<a href=\"db_action.php?table=app_version&appid=$app->id\">App Versions for this application</a>");
-    row("","<a href=\"db_action.php?table=workunit&appid=$app->id&detail=low\">Workunits for this application</a>");
+    row("", "<a href=\"db_action.php?table=app_version&appid=$app->id\">App Versions for this application</a>");
+    row("", "<a href=\"db_action.php?table=workunit&appid=$app->id&detail=low\">Workunits for this application</a>");
     end_table();
 }
 
@@ -753,9 +753,9 @@ 
     start_table();
     row("ID", $app_version->id);
     row("Created", time_str($app_version->create_time));
-    row("Application", "<a href=\"db_action.php?table=app&id=$app_version->appid\">" . app_name_by_id($app_version->appid) . "</a>");
+    row("Application", "<a href=\"db_action.php?table=app&id=$app_version->appid\">".app_name_by_id($app_version->appid)."</a>");
     row("Version num", $app_version->version_num);
-    row("Platform", "<a href=\"db_action.php?table=platform&id=$app_version->platformid\">" . platform_name_by_id($app_version->platformid) . "</a>" );
+    row("Platform", "<a href=\"db_action.php?table=platform&id=$app_version->platformid\">".platform_name_by_id($app_version->platformid)."</a>");
     row("Plan Class", $app_version->plan_class);
     row("XML doc", "<pre>".htmlspecialchars($app_version->xml_doc)."</pre>");
     row("min_core_version", $app_version->min_core_version);
@@ -890,7 +890,7 @@ 
     row("External IP address", "$host->external_ip_addr<br>");
     row("Domain name", $host->domain_name);
     $x = $host->timezone/3600;
-    if ($x >= 0) $x="+$x";
+    if ($x >= 0) $x = "+$x";
     row("Local Standard Time", "UTC $x hours");
     row("Number of CPUs", $host->p_ncpus);
     row("CPU", "$host->p_vendor $host->p_model");
@@ -938,10 +938,10 @@ 
     start_table();
     row("Created", time_str($wu->create_time));
     row("Transition Time", time_str($wu->transition_time));
-    row("Last time modified",mysqltime_str($wu->mod_time));
+    row("Last time modified", mysqltime_str($wu->mod_time));
     row("Name", $wu->name);
     row("XML doc", "<pre>".htmlspecialchars($wu->xml_doc)."</pre>");
-    row("Application", "<a href=\"db_action.php?table=app&id=$wu->appid\">" . app_name_by_id($wu->appid) . " [".$wu->appid."]</a>");
+    row("Application", "<a href=\"db_action.php?table=app&id=$wu->appid\">".app_name_by_id($wu->appid)." [".$wu->appid."]</a>");
     row("Batch", $wu->batch);
     $x = number_format($wu->rsc_fpops_est/1e9, 2);
     row("Estimated FP Operations", "$x GFLOPS");
@@ -953,12 +953,12 @@ 
     $x = $wu->rsc_disk_bound/(1024*1024);
     $y = number_format($x, 2);
     row("Max Disk Usage", "$y MB");
-    row("Need validate?", ($wu->need_validate?"yes [":"no [").$wu->need_validate."]");
+    row("Need validate?", ($wu->need_validate ? "yes [" : "no [").$wu->need_validate."]");
     row("Canonical resultid",
             "<a href=\"db_action.php?table=result&id=$wu->canonical_resultid\">".$wu->canonical_resultid."</a>");
     row("Canonical credit", $wu->canonical_credit);
     //row("Timeout check time", time_str($wu->timeout_check_time));
-    row("Delay bound", "$wu->delay_bound" . " =  " . time_diff($wu->delay_bound) );
+    row("Delay bound", "$wu->delay_bound"." =  ".time_diff($wu->delay_bound));
     row("Error mask", wu_error_mask_str($wu->error_mask));
     row("File delete state", file_delete_state_str($wu->file_delete_state)." [".$wu->file_delete_state."]");
     row("Assimilation state", assimilate_state_str($wu->assimilate_state)." [".$wu->assimilate_state."]");
@@ -968,7 +968,7 @@ 
     row("max error results", $wu->max_error_results);
     row("max total results", $wu->max_total_results);
     row("max success results", $wu->max_success_results);
-    row("result template file",$wu->result_template_file);
+    row("result template file", $wu->result_template_file);
     row("hr_class", $wu->hr_class);
     row("opaque", $wu->opaque);
     row("Priority", $wu->priority);
@@ -998,7 +998,7 @@ 
         $cr = "none";
     }
     $wu_link = "<a href=\"db_action.php?table=workunit&id=".$wu->id."&detail=high\">".$wu->id."</a>";
-    $cr = $cr. " <a href=\"db_action.php?table=result&workunitid=$wu->id&detail=low\">all</a>";
+    $cr = $cr." <a href=\"db_action.php?table=result&workunitid=$wu->id&detail=low\">all</a>";
     $e = wu_error_mask_str($wu->error_mask);
     $f = file_delete_state_str($wu->file_delete_state);
     $a = assimilate_state_str($wu->assimilate_state);
@@ -1033,7 +1033,7 @@ 
 }
 
 function outcome_color($outcome) {
-    switch($outcome) {
+    switch ($outcome) {
     case 0: return '9900cc'; // "Init", purple 
     case 1: return '33cc33'; // "Success", green
     case 3: return 'ff3333'; // "Client error", red
@@ -1060,18 +1060,18 @@ 
     row("Sent", time_str($result->sent_time));
     row("Report deadline", time_str($result->report_deadline));
     row("Received", time_str($result->received_time));
-    row("Last time modified",mysqltime_str($result->mod_time));
+    row("Last time modified", mysqltime_str($result->mod_time));
     row("Name", $result->name);
-    row("Workunit", "<a href=\"db_action.php?table=workunit&id=$result->workunitid\">" . wu_name_by_id($result->workunitid) . "</a> [$result->workunitid]" );
+    row("Workunit", "<a href=\"db_action.php?table=workunit&id=$result->workunitid\">".wu_name_by_id($result->workunitid)."</a> [$result->workunitid]");
     row("Server state", result_server_state_string($result)." [$result->server_state]");
     row("Outcome", result_outcome_string($result)." [$result->outcome]");
     row("Client state", result_client_state_string($result)." [$result->client_state]");
     row("Exit status", exit_status_string($result->exit_status));
-    row("Host ID", "<a href=\"db_action.php?table=host&id=$result->hostid\">" . host_name_by_id($result->hostid) . "</a> [$result->hostid]");
-    row("User ID", "<a href=\"db_action.php?table=user&id=$result->userid\">" . user_name_by_id($result->userid) . "</a> [$result->userid]");
+    row("Host ID", "<a href=\"db_action.php?table=host&id=$result->hostid\">".host_name_by_id($result->hostid)."</a> [$result->hostid]");
+    row("User ID", "<a href=\"db_action.php?table=user&id=$result->userid\">".user_name_by_id($result->userid)."</a> [$result->userid]");
     row("CPU time", $result->cpu_time);
     row("Elapsed time", $result->elapsed_time);
-    if($error=stderr_error_string($result->stderr_out)) {
+    if ($error = stderr_error_string($result->stderr_out)) {
         row("error in stderr out", $error);
     }
     row("Batch", $result->batch);
@@ -1088,16 +1088,16 @@ 
     row("App version", $x1.app_version_string($result).$x2);
     row("App version ID", $result->app_version_id);
     row("Estimated GFLOPS", number_format($result->flops_estimate/1e9, 2));
-    row("Random",$result->random);
-    row("Opaque",$result->opaque);
-    row("Teamid",$result->teamid);
-    row("Priority",$result->priority);
+    row("Random", $result->random);
+    row("Opaque", $result->opaque);
+    row("Teamid", $result->teamid);
+    row("Priority", $result->priority);
     row("XML doc in", "<pre>".htmlspecialchars($result->xml_doc_in)."</pre>");
     row("XML doc out", "<pre>".htmlspecialchars($result->xml_doc_out)."</pre>");
     row("stderr out", "<pre>"
         .htmlspecialchars(
             $result->stderr_out,
-            ENT_QUOTES | (defined('ENT_SUBSTITUTE')?ENT_SUBSTITUTE:0),
+            ENT_QUOTES|(defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0),
             'utf-8'
         )
         ."</pre>"
@@ -1145,23 +1145,23 @@ 
     } else {
         // result has not been received yet, so show report deadline either
         // in green if in the future or in red if in the past.
-        $timenow=time();
-        if ($result->report_deadline==0)  {
+        $timenow = time();
+        if ($result->report_deadline == 0) {
             // not sent -- show create time in purple 
-            $received = "<font color=\"9900cc\">". time_str($result->create_time) . "</font>";
-        } else if ($result->report_deadline>=$timenow) {
+            $received = "<font color=\"9900cc\">".time_str($result->create_time)."</font>";
+        } else if ($result->report_deadline >= $timenow) {
             // overdue -- show deadline in red
-            $received = "<font color=\"#33cc33\">". time_str($result->report_deadline) . "</font>";
+            $received = "<font color=\"#33cc33\">".time_str($result->report_deadline)."</font>";
         } else {
             // in progress and not overdue -- show deadline in green
-            $received = "<font color=\"#ff3333\">". time_str($result->report_deadline) . "</font>";
+            $received = "<font color=\"#ff3333\">".time_str($result->report_deadline)."</font>";
         }
     }
     $version = app_version_string($result)." (<a href=\"db_action.php?table=app_version&id=$result->app_version_id\">$result->app_version_id</a>)";
     $outcome_color = outcome_color($result->outcome);
     $validate_color = validate_color($result->validate_state);
     $host_user = host_user_link($result->hostid);
-    $cpu_hours = sprintf("%.1f",$result->cpu_time / 3600);
+    $cpu_hours = sprintf("%.1f", $result->cpu_time/3600);
     $granted_credit = "<a href=credit.php?resultid=$result->id>".credit_str($result->granted_credit)."</a>";
     $delete_state = file_delete_state_str($result->file_delete_state);
 
@@ -1189,7 +1189,7 @@ 
     row("ID", $user->id);
     row("Created", time_str($user->create_time));
     row("Name", $user->name);
-    if(!in_rops()) {
+    if (!in_rops()) {
         row("Authenticator", $user->authenticator);
     }
     row("Email address", $user->email_addr);
@@ -1202,7 +1202,7 @@ 
     row("Default venue", $user->venue);
     row("Hosts", "<a href=\"db_action.php?table=host&userid=$user->id&detail=low\">click</a>");
     row("Cross project ID", $user->cross_project_id);
-    if(!in_rops()) {
+    if (!in_rops()) {
         row("Password Hash", $user->passwd_hash);
     }
     row("Donated", $user->donated);
@@ -1253,7 +1253,7 @@ 
     echo "</table></td>";
     echo "<td><table border=\"2\">\n";
     echo "<tr><th>User</th><th># posts</th></tr>\n";
-    for ($p=1; $p<=10; $p++) {
+    for ($p = 1; $p <= 10; $p++) {
         row2_plain(user_links_ops($top10poster[$p]), $top10poster[$p]->posts);
     }
     echo "</table></td>";
@@ -1292,10 +1292,10 @@ 
 function show_team($team) {
     start_table();
     row("ID", $team->id);
-    row("Team Founder", "<a href=\"db_action.php?table=user&id=$team->userid\">" . user_name_by_id($team->userid) . "</a>");
+    row("Team Founder", "<a href=\"db_action.php?table=user&id=$team->userid\">".user_name_by_id($team->userid)."</a>");
     row("Name", $team->name);
-    row("Name (HTML Formatted)", "<pre>" . htmlspecialchars($team->name_html) . "</pre>" );
-    row("Url", "<a href=\"http://$team->url\">" . $team->url . "</a>");
+    row("Name (HTML Formatted)", "<pre>".htmlspecialchars($team->name_html)."</pre>");
+    row("Url", "<a href=\"http://$team->url\">".$team->url."</a>");
     row("Type", team_type_string($team->type));
     row("Description", $team->description);
     row("", "<a href=\"db_action.php?table=user&teamid=$team->id\">List All Members</a>");
@@ -1338,7 +1338,7 @@ 
     if (!strlen($host->domain_name) && !strlen($host->last_ip_addr)) {
         return "(blank)";
     } else {
-        return $host->domain_name . " (" . $host->last_ip_addr . ")";
+        return $host->domain_name." (".$host->last_ip_addr.")";
     }
 }
 

Braces +49 added lines, -18 removed lines

@@ -96,7 +96,9 @@ 
     if (!isset($types)) {
         $types = array();
         $constants = get_defined_constants(true);
-        foreach ($constants['mysqli'] as $c => $n) if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1];
+        foreach ($constants['mysqli'] as $c => $n) {
+            if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1];
+        }
     }
     return array_key_exists($type_id, $types)? strtolower($types[$type_id]) : "unknown";
 }
@@ -324,7 +326,9 @@ 
         $count_query = "select count(*) as cnt from $this->table $this->query";
         $db = BoincDb::get(true);
         $result = $db->do_query($count_query);
-        if (!$result) return 0;
+        if (!$result) {
+            return 0;
+        }
         $res = $result->fetch_object();
         $result->free();
         return $res->cnt;
@@ -366,7 +370,9 @@ 
         $this->addeq_not_CHOOSE_ALL('client_state');
         $this->addeq_not_CHOOSE_ALL('validate_state');
         $clauses = get_str("clauses", true);
-        if (strstr($clauses, ";")) error_page("bad clause");
+        if (strstr($clauses, ";")) {
+            error_page("bad clause");
+        }
         if ($clauses) {
             $this->addclause($clauses);
         }
@@ -381,8 +387,7 @@ 
     } else {
         if(strlen($clauses)) {
             return "<a href=\"db_action.php?table=result&query=$mq&$query&clauses=".urlencode($clauses)."&sort_by=mod_time&detail=low\">$n</a>";
-        }
-        else {
+        } else {
             return "<a href=\"db_action.php?table=result&query=$mq&$query&sort_by=mod_time&detail=low\">$n</a>";
         }
         
@@ -839,10 +844,14 @@ 
         $version_info = resource_name($avid%1000000);
     } else {
         $av = BoincAppVersion::lookup("id=$avid");
-        if (!$av) return "Missing app version $avid";
+        if (!$av) {
+            return "Missing app version $avid";
+        }
         $appid = $av->appid;
         $platform = BoincPlatform::lookup_id($av->platformid);
-        if (!$platform) return "Missing platform $av->platformid";
+        if (!$platform) {
+            return "Missing platform $av->platformid";
+        }
         $platform_name = $platform->user_friendly_name;
         $version_info = "$av->version_num $av->plan_class
             <br>PFC: $av->pfc_avg ($av->pfc_n)
@@ -850,7 +859,9 @@ 
         ";
     }
     $app = BoincApp::lookup_id($appid);
-    if (!$app) return "Missing app $appid";
+    if (!$app) {
+        return "Missing app $appid";
+    }
     return "$app->user_friendly_name
         <br>$platform_name
         <br>$version_info
@@ -890,7 +901,9 @@ 
     row("External IP address", "$host->external_ip_addr<br>");
     row("Domain name", $host->domain_name);
     $x = $host->timezone/3600;
-    if ($x >= 0) $x="+$x";
+    if ($x >= 0) {
+        $x="+$x";
+    }
     row("Local Standard Time", "UTC $x hours");
     row("Number of CPUs", $host->p_ncpus);
     row("CPU", "$host->p_vendor $host->p_model");
@@ -1014,13 +1027,19 @@ 
 }
 
 function host_user_link($hostid) {
-    if (!$hostid) return '---';
+    if (!$hostid) {
+        return '---';
+    }
 
     $h = "<a href=\"db_action.php?table=host&id=$hostid\">$hostid</a>";
     $host = BoincHost::enum_fields("userid", "id=".$hostid, "limit 1");
-    if (!$host) return $h;
+    if (!$host) {
+        return $h;
+    }
     $user = BoincUser::enum_fields("id, name", "id=".$host[0]->userid, "limit 1");
-    if (!$user) return $h;
+    if (!$user) {
+        return $h;
+    }
     return "$h<br><small>(<a href=\"db_action.php?table=user&id=".$user[0]->id."\">".$user[0]->name."</a>)</small>";
 }
 
@@ -1304,37 +1323,49 @@ 
 
 function team_name_by_id($teamid) {
     $team = BoincTeam::lookup_id($teamid);
-    if (!$team) return "No team";
+    if (!$team) {
+        return "No team";
+    }
     return $team->name;
 }
 
 function user_name_by_id($user_id) {
     $user = BoincUser::lookup_id($user_id);
-    if (!$user) return "No user";
+    if (!$user) {
+        return "No user";
+    }
     return $user->name;
 }
 
 function app_name_by_id($appid) {
     $app = BoincApp::lookup_id($appid);
-    if (!$app) return "No app";
+    if (!$app) {
+        return "No app";
+    }
     return $app->name;
 }
 
 function wu_name_by_id($workunitid) {
     $wu = BoincWorkunit::lookup_id($workunitid);
-    if (!$wu) return "Missing workunit";
+    if (!$wu) {
+        return "Missing workunit";
+    }
     return $wu->name;
 }
 
 function platform_name_by_id($platformid) {
     $plat = BoincPlatform::lookup_id($platformid);
-    if (!$plat) return "Missing platform";
+    if (!$plat) {
+        return "Missing platform";
+    }
     return $plat->name;
 }
 
 function host_name_by_id($hostid) {
     $host = BoincHost::lookup_id($hostid);
-    if (!$host) return "No host";
+    if (!$host) {
+        return "No host";
+    }
     if (!strlen($host->domain_name) && !strlen($host->last_ip_addr)) {
         return "(blank)";
     } else {

html/inc/dir_hier.inc

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
     return "$dirpath/$filename";
 }
 
+/**
+ * @param string $base
+ */
 function dir_hier_url($filename, $base, $fanout) {
     $dir = filename_hash($filename, $fanout);
     return "$base/$dir/$filename";

html/inc/forum.inc

Doc Comments +15 added lines

@@ -208,6 +208,9 @@ 
 // (to accommodate long [pre] lines)
 // and the left column (author info) has fixed size
 //
+/**
+ * @param string[] $headings
+ */
 function start_forum_table($headings) {
     $a = array();
     foreach ($headings as $h) {
@@ -488,6 +491,9 @@ 
 // Display an individual post.
 // Generates a table row with two cells: author and message
 //
+/**
+ * @param integer $controls
+ */
 function show_post(
     $post, $thread, $forum, $logged_in_user, $latest_viewed,
     $controls=FORUM_CONTROLS, $filter=true
@@ -852,6 +858,9 @@ 
 // These take care of counts and timestamps.
 // Don't do these things directly - use these functions
 //
+/**
+ * @param integer $parent_id
+ */
 function create_post($content, $parent_id, $user, $forum, $thread, $signature) {
     $content = substr($content, 0, 64000);
     $content = BoincDb::escape_string($content);
@@ -1084,6 +1093,9 @@ 
 // $sort_style - string (checked by switch statement)
 // $show_hidden - bool (not directly passed to SQL)
 //
+/**
+ * @param boolean $show_hidden
+ */
 function get_thread_posts($threadid, $sort_style, $show_hidden) {
     $sql = "thread=$threadid";
     if (!$show_hidden) {
@@ -1109,6 +1121,9 @@ 
 // Show links for post moderation actions;
 // logged in user has moderation rights.
 //
+/**
+ * @param string $config
+ */
 function show_post_moderation_links(
     $config, $logged_in_user, $post, $forum, $tokens
 ){

Indentation +3 added lines, -3 removed lines

@@ -780,9 +780,9 @@ 
 
 function post_rules() {
     if (function_exists("project_forum_post_rules")) {
-      $project_rules=project_forum_post_rules();
+        $project_rules=project_forum_post_rules();
     } else {
-      $project_rules="";
+        $project_rules="";
     }
     return tra("
         <ul>
@@ -1218,7 +1218,7 @@ 
     }
     if ($thread->hidden) {
         error_page(
-           tra("Can't post to a hidden thread.")
+            tra("Can't post to a hidden thread.")
         );
     }
 

Spacing +79 added lines, -79 removed lines

@@ -50,12 +50,12 @@ 
 define('THREAD_SOLVED', 1);
 
 define('AVATAR_WIDTH', 100);
-define('AVATAR_HEIGHT',100);
+define('AVATAR_HEIGHT', 100);
 
 define('ST_NEW_TIME', 1209600); //3600*24*14 - 14 days
 define('ST_NEW', 'New member');
 
-define('MAXIMUM_EDIT_TIME',3600);
+define('MAXIMUM_EDIT_TIME', 3600);
     // allow edits of forums posts up till one hour after posting.
 
 define('MAX_FORUM_LOGGING_TIME', 2419200); //3600*24*28 - 28 days
@@ -73,24 +73,24 @@ 
 define('IMAGE_HIDDEN', 'img/hidden.png');
 define('IMAGE_STICKY_LOCKED', 'img/sticky_locked_post.png');
 define('IMAGE_POST', 'img/post.png');
-define('NEW_IMAGE_HEIGHT','15');
+define('NEW_IMAGE_HEIGHT', '15');
 define('EMPHASIZE_IMAGE', 'img/emphasized_post.png');
-define('EMPHASIZE_IMAGE_HEIGHT','15');
+define('EMPHASIZE_IMAGE_HEIGHT', '15');
 define('FILTER_IMAGE', 'img/filtered_post.png');
-define('FILTER_IMAGE_HEIGHT','15');
+define('FILTER_IMAGE_HEIGHT', '15');
 define('RATE_POSITIVE_IMAGE', 'img/rate_positive.png');
-define('RATE_POSITIVE_IMAGE_HEIGHT','9');
+define('RATE_POSITIVE_IMAGE_HEIGHT', '9');
 define('RATE_NEGATIVE_IMAGE', 'img/rate_negative.png');
-define('RATE_NEGATIVE_IMAGE_HEIGHT','9');
+define('RATE_NEGATIVE_IMAGE_HEIGHT', '9');
 define('REPORT_POST_IMAGE', 'img/report_post.png');
-define('REPORT_POST_IMAGE_HEIGHT','9');
+define('REPORT_POST_IMAGE_HEIGHT', '9');
 
-define ('SOLUTION', 'This answered my question');
-define ('SUFFERER', 'I also have this question');
-define ('OFF_TOPIC', 'Off-topic');
+define('SOLUTION', 'This answered my question');
+define('SUFFERER', 'I also have this question');
+define('OFF_TOPIC', 'Off-topic');
 
-define ('DEFAULT_LOW_RATING_THRESHOLD', -25);
-define ('DEFAULT_HIGH_RATING_THRESHOLD', 5);
+define('DEFAULT_LOW_RATING_THRESHOLD', -25);
+define('DEFAULT_HIGH_RATING_THRESHOLD', 5);
 
 // A list of what kind of special users exist
 define('S_MODERATOR', 0);
@@ -148,15 +148,15 @@ 
 
 // Output the forum/thread title.
 //
-function show_forum_title($category, $forum, $thread, $link_thread=false) {
+function show_forum_title($category, $forum, $thread, $link_thread = false) {
     if ($category) {
         $is_helpdesk = $category->is_helpdesk;
     } else {
         $is_helpdesk = false;
     }
 
-    $where = $is_helpdesk?tra("Questions and Answers"):tra("Message boards");
-    $top_url = $is_helpdesk?"forum_help_desk.php":"forum_index.php";
+    $where = $is_helpdesk ? tra("Questions and Answers") : tra("Message boards");
+    $top_url = $is_helpdesk ? "forum_help_desk.php" : "forum_index.php";
 
     if (!$forum && !$thread) {
         echo "<span class=\"title\">$where</span>\n";
@@ -184,7 +184,7 @@ 
     }
 }
 
-function show_team_forum_title($forum, $thread=null, $link_thread=false) {
+function show_team_forum_title($forum, $thread = null, $link_thread = false) {
     $team = BoincTeam::lookup_id($forum->category);
     echo "<span class=title>
         <a href=\"forum_index.php\">".tra("Message boards")."</a> :
@@ -219,12 +219,12 @@ 
 }
 
 function page_link($url, $page_num, $items_per_page, $text) {
-    return " <a href=\"$url&amp;start=" . $page_num*$items_per_page . "\">$text</a> ";
+    return " <a href=\"$url&amp;start=".$page_num*$items_per_page."\">$text</a> ";
 }
 
 // return a string for navigating pages
 //
-function page_links($url, $nitems, $items_per_page, $start){
+function page_links($url, $nitems, $items_per_page, $start) {
     // How many pages to potentially show before and after this one:
     $preshow = 3;
     $postshow = 3;
@@ -232,14 +232,14 @@ 
     $x = "";
     
     if ($nitems <= $items_per_page) return "";
-    $npages = ceil($nitems / $items_per_page);
-    $curpage = ceil($start / $items_per_page);
+    $npages = ceil($nitems/$items_per_page);
+    $curpage = ceil($start/$items_per_page);
 
     // If this is not the first page, display "previous"
     //
-    if ($curpage > 0){
+    if ($curpage > 0) {
         $x .= page_link(
-            $url, $curpage-1, $items_per_page,
+            $url, $curpage - 1, $items_per_page,
             tra("Previous")." &middot; "
         );
     }
@@ -254,8 +254,8 @@ 
     }
     // Display a list of pages surrounding this one
     //
-    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
-        $page_str = (string)($i+1);
+    for ($i = $curpage - $preshow; $i <= $curpage + $postshow; $i++) {
+        $page_str = (string)($i + 1);
         if ($i < 0) continue;
         if ($i >= $npages) break;
 
@@ -264,20 +264,20 @@ 
         } else {
             $x .= page_link($url, $i, $items_per_page, $page_str);
         }
-        if ($i == $npages-1) break;
-        if ($i == $curpage+$postshow) break;
+        if ($i == $npages - 1) break;
+        if ($i == $curpage + $postshow) break;
         $x .= " &middot; ";
     }
 
-    if ($curpage + $postshow < $npages-1) {
+    if ($curpage + $postshow < $npages - 1) {
         $x .= " . . . ";
-        $x .= page_link($url, $npages-1, $items_per_page, $npages);
+        $x .= page_link($url, $npages - 1, $items_per_page, $npages);
     }
     // If there is a next page
     //
-    if ($curpage < $npages-1){
+    if ($curpage < $npages - 1) {
         $x .= page_link(
-            $url, $curpage+1, $items_per_page,
+            $url, $curpage + 1, $items_per_page,
             " &middot; ".tra("Next")
         );
     }
@@ -298,7 +298,7 @@ 
 function cleanup_title($title) {
     $x = sanitize_tags(bb2html($title));
     $x = trim($x);
-    if (strlen($x)==0) return "(no title)";
+    if (strlen($x) == 0) return "(no title)";
     else return $x;
 }
 
@@ -360,7 +360,7 @@ 
             $i = 0;
             foreach ($posts as $post) {
                 if ($post->id == $postid) {
-                    $start = $i - ($i % $num_to_show);
+                    $start = $i - ($i%$num_to_show);
                     $jump_to_post = $post;
                     break;
                 }
@@ -387,7 +387,7 @@ 
             // if jump to post, figure out what page to show
             //
             if ($jump_to_post) {
-                $start = $ibest - ($ibest % $num_to_show);
+                $start = $ibest - ($ibest%$num_to_show);
             } else {
                 $start = $default_start;
             }
@@ -490,7 +490,7 @@ 
 //
 function show_post(
     $post, $thread, $forum, $logged_in_user, $latest_viewed,
-    $controls=FORUM_CONTROLS, $filter=true
+    $controls = FORUM_CONTROLS, $filter = true
 ) {
     global $country_to_iso3166_2;
 
@@ -502,7 +502,7 @@ 
 
     // If the user no longer exists, skip the post
     //
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -518,9 +518,9 @@ 
     // check whether the poster is on the list of people to ignore
     //
     $ignore_poster = false;
-    if ($logged_in_user){
+    if ($logged_in_user) {
         $tokens = url_tokens($logged_in_user->authenticator);
-        if (is_ignoring($logged_in_user, $user)){
+        if (is_ignoring($logged_in_user, $user)) {
             $ignore_poster = true;
         }
     }
@@ -534,8 +534,8 @@ 
             if (is_moderator($logged_in_user, $forum)) {
                 $can_edit = true;
             } else if (can_reply($thread, $forum, $logged_in_user)) {
-                $time_limit = $post->timestamp+MAXIMUM_EDIT_TIME;
-                $can_edit = time()<$time_limit;
+                $time_limit = $post->timestamp + MAXIMUM_EDIT_TIME;
+                $can_edit = time() < $time_limit;
             } else {
                 $can_edit = false;
             }
@@ -545,24 +545,24 @@ 
     // Print the special user lines, if any
     //
     global $special_user_bitfield;
-    $fstatus="";
+    $fstatus = "";
     $keys = array_keys($special_user_bitfield);
     $is_posted_by_special = false;
-    for ($i=0; $i<sizeof($special_user_bitfield);$i++) {
+    for ($i = 0; $i < sizeof($special_user_bitfield); $i++) {
         if ($user->prefs && $user->prefs->privilege($keys[$i])) {
-            $fstatus.=$special_user_bitfield[$keys[$i]]."<br>";
+            $fstatus .= $special_user_bitfield[$keys[$i]]."<br>";
             $is_posted_by_special = true;
         }
     }
     
     // Highlight special users if set in prefs;
     //
-    if ($logged_in_user && $logged_in_user->prefs){
+    if ($logged_in_user && $logged_in_user->prefs) {
         $highlight = $logged_in_user->prefs->highlight_special && $is_posted_by_special;
     } else {
         $highlight = $is_posted_by_special;
     }
-    $class = $highlight?' style="border-left: 5px solid LightGreen" ':'';
+    $class = $highlight ? ' style="border-left: 5px solid LightGreen" ' : '';
 
     // row and start of author col
     //
@@ -574,12 +574,12 @@ 
 
     echo user_links($user, 0);
     echo "<br>";
-    if ($user->create_time > time()-ST_NEW_TIME) $fstatus.=ST_NEW."<br>";
+    if ($user->create_time > time() - ST_NEW_TIME) $fstatus .= ST_NEW."<br>";
     echo "<span class=\"small\">";
     if ($fstatus) echo "$fstatus";
 
-    if (!$filter || !$ignore_poster){
-        if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
+    if (!$filter || !$ignore_poster) {
+        if ($user->prefs && $user->prefs->avatar != "" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars == false))) {
             echo "<img width=\"".AVATAR_WIDTH."\" height=\"".AVATAR_HEIGHT."\" src=\"".avatar_url($user->prefs->avatar)."\" alt=\"Avatar\"><br>";
         }
     }
@@ -587,14 +587,14 @@ 
     
     $url = "pm.php?action=new&amp;userid=".$user->id;
     $name = $user->name;
-    show_button($url, tra("Send message"), tra("Send %1 a private message",$name));
+    show_button($url, tra("Send message"), tra("Send %1 a private message", $name));
     echo '<br>'.tra("Joined: %1", gmdate('j M y', $user->create_time)), "<br>";
 
     if (!isset($user->nposts)) {
         $user->nposts = BoincPost::count("user=$user->id");
     }
     
-    if (function_exists('project_forum_user_info')){
+    if (function_exists('project_forum_user_info')) {
         project_forum_user_info($user);
     } else {
         echo tra("Posts: %1", $user->nposts)."<br>";
@@ -603,8 +603,8 @@ 
         //
         //echo "ID: ".$user->id."<br>";
         if (!no_computing()) {
-            echo tra("Credit: %1", number_format($user->total_credit)) ."<br>";
-            echo tra("RAC: %1",    number_format($user->expavg_credit))."<br>";
+            echo tra("Credit: %1", number_format($user->total_credit))."<br>";
+            echo tra("RAC: %1", number_format($user->expavg_credit))."<br>";
         }
 
         // to use this feature:
@@ -633,7 +633,7 @@ 
         echo "<form action=\"forum_rate.php?post=", $post->id, "\" method=\"post\">";
     }
 
-    if ($logged_in_user && $post->timestamp>$latest_viewed){
+    if ($logged_in_user && $post->timestamp > $latest_viewed) {
         show_image(NEW_IMAGE, tra("You haven't read this message yet"), tra("Unread"), NEW_IMAGE_HEIGHT);
     }
 
@@ -653,8 +653,8 @@ 
     if ($post->modified) {
         echo "<br>".tra("Last modified: %1", pretty_time_Str($post->modified));
     }
-    if ($ignore_poster && $filter){
-        echo "<br>".tra("This post is not shown because the sender is on your 'ignore' list.  Click %1here%2 to view this post","<a href=\"?id=".$thread->id."&amp;filter=false#".$post->id."\">","</a>");
+    if ($ignore_poster && $filter) {
+        echo "<br>".tra("This post is not shown because the sender is on your 'ignore' list.  Click %1here%2 to view this post", "<a href=\"?id=".$thread->id."&amp;filter=false#".$post->id."\">", "</a>");
     }
     if ($controls == FORUM_CONTROLS) {
         echo "</form>\n";
@@ -663,7 +663,7 @@ 
         <p>
     ";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         $posttext = $post->content;
 
         // If the creator of this post has a signature and
@@ -671,7 +671,7 @@ 
         // user has signatures enabled: show it
         //
         $posttext = output_transform($posttext, $options);
-        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)){
+        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)) {
             $sig = output_transform($user->prefs->signature, $options);
             $posttext .= "<hr>$sig\n";
         }
@@ -705,10 +705,10 @@ 
         }
         if (($controls == FORUM_CONTROLS) && (can_reply($thread, $forum, $logged_in_user))) {
             echo "&nbsp;&nbsp;&nbsp;&nbsp;";
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "&amp;no_quote=1#input";
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."&amp;no_quote=1#input";
             // "Reply" is used as a verb
             show_button($url, tra("Reply"), tra("Post a reply to this message"));
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "#input";
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."#input";
             // "Quote" is used as a verb
             show_button($url, tra("Quote"), tra("Post a reply by quoting this message"));
         }
@@ -780,9 +780,9 @@ 
 
 function post_rules() {
     if (function_exists("project_forum_post_rules")) {
-      $project_rules=project_forum_post_rules();
+      $project_rules = project_forum_post_rules();
     } else {
-      $project_rules="";
+      $project_rules = "";
     }
     return tra("
         <ul>
@@ -803,7 +803,7 @@ 
     ";
 }
 
-function post_warning($forum=null) {
+function post_warning($forum = null) {
     $x = "<br><br>
         <table><tr><td align=left>
     ";
@@ -856,7 +856,7 @@ 
     $content = substr($content, 0, 64000);
     $content = BoincDb::escape_string($content);
     $now = time();
-    $sig = $signature?1:0;
+    $sig = $signature ? 1 : 0;
     $id = BoincPost::insert("(thread, user, timestamp, content, modified, parent_post, score, votes, signature, hidden) values ($thread->id, $user->id, $now, '$content', 0, $parent_id, 0, 0, $sig, 0)");
     if (!$id) return null;
 
@@ -873,7 +873,7 @@ 
 //
 function update_thread_timestamp($thread) {
     $posts = BoincPost::enum("thread=$thread->id and hidden=0 order by timestamp desc limit 1");
-    if (count($posts)>0) {
+    if (count($posts) > 0) {
         $post = $posts[0];
         $thread->update("timestamp=$post->timestamp");
     }
@@ -881,7 +881,7 @@ 
 
 function update_forum_timestamp($forum) {
     $threads = BoincThread::enum("forum=$forum->id and hidden=0 order by timestamp desc limit 1");
-    if (count($threads)>0) {
+    if (count($threads) > 0) {
         $thread = $threads[0];
         $forum->update("timestamp=$thread->timestamp");
     }
@@ -896,7 +896,7 @@ 
     if (is_news_forum($forum) && !$export) {
         $status = 1;
     }
-    $id  = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
+    $id = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
     if (!$id) return null;
     $thread = BoincThread::lookup_id($id);
     create_post($content, 0, $user, $forum, $thread, $signature);
@@ -1021,22 +1021,22 @@ 
 // $sticky - bool (not directly passed to SQL)
 //
 function get_forum_threads(
-    $forumID, $start=-1, $nRec=-1, $sort_style=MODIFIED_NEW,
+    $forumID, $start = -1, $nRec = -1, $sort_style = MODIFIED_NEW,
     $show_hidden = 0, $sticky = 1
 ) {
     //if (! (is_numeric($forumID) && is_numeric($min) && is_numeric($nRec))) {
     //    return NULL;  // Something is wrong here.
     //}
         
-    $sql = 'forum = ' . $forumID ;
+    $sql = 'forum = '.$forumID;
     $stickysql = "";
-    if ($sticky){
+    if ($sticky) {
         $stickysql = "sticky DESC, ";
     }
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case MODIFIED_NEW:
         $sql .= ' ORDER BY '.$stickysql.'timestamp DESC';
         break;
@@ -1089,7 +1089,7 @@ 
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case CREATE_TIME_NEW:
         $sql .= ' ORDER BY timestamp desc';
         break;
@@ -1111,7 +1111,7 @@ 
 //
 function show_post_moderation_links(
     $config, $logged_in_user, $post, $forum, $tokens
-){
+) {
     $moderators_allowed_to_ban = parse_bool($config, "moderators_allowed_to_ban"); 
     $moderators_vote_to_ban = parse_bool($config, "moderators_vote_to_ban");
 
@@ -1198,14 +1198,14 @@ 
     // We do not tell the (ab)user how much this is -
     // no need to make it easy for them to break the system.
     //
-    if ($user->total_credit<$forum->post_min_total_credit || $user->expavg_credit<$forum->post_min_expavg_credit) {
+    if ($user->total_credit < $forum->post_min_total_credit || $user->expavg_credit < $forum->post_min_expavg_credit) {
         error_page(tra("To create a new thread in %1 you must have a certain level of average credit. This is to protect against abuse of the system.", $forum->title));
     }
 
     // If the user is posting faster than forum regulations allow
     // Tell the user to wait a while before creating any more posts
     //
-    if (time()-$user->prefs->last_post <$forum->post_min_interval) {
+    if (time() - $user->prefs->last_post < $forum->post_min_interval) {
         error_page(tra("You cannot create threads right now. Please wait before trying again. This is to protect against abuse of the system."));
     }
 }
@@ -1233,7 +1233,7 @@ 
 
 function is_moderator($user, $forum) {
     if (!$user) return false;
-    $type = $forum?$forum->parent_type:0;
+    $type = $forum ? $forum->parent_type : 0;
     switch ($type) {
     case 0:
         if ($user->prefs->privilege(S_MODERATOR)) return true;
@@ -1270,7 +1270,7 @@ 
     if (!is_forum_visible_to_user($thread_forum, $user)) return;
     $owner = BoincUser::lookup_id($thread->owner);
     echo "<tr><td>\n";
-    switch($thread_forum->parent_type) {
+    switch ($thread_forum->parent_type) {
     case 0:
         $category = BoincCategory::lookup_id($thread_forum->category);
         show_forum_title($category, $thread_forum, $thread, true);
@@ -1280,7 +1280,7 @@ 
         break;
     }
     echo '
-        </td><td class="numbers">'.($thread->replies+1).'</td>
+        </td><td class="numbers">'.($thread->replies + 1).'</td>
         <td>'.user_links($owner).'</td>
         <td class="numbers">'.$thread->views.'</td>
         <td class="lastpost">'.time_diff_str($thread->timestamp, time()).'</td>
@@ -1314,13 +1314,13 @@ 
 
 function subscribed_post_web_line($notify) {
     $thread = BoincThread::lookup_id($notify->opaque);
-    return tra("New posts in the thread %1","<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
+    return tra("New posts in the thread %1", "<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
 }
 
 function subscribe_rss($notify, &$title, &$msg, &$url) {
     $thread = BoincThread::lookup_id($notify->opaque);
     $title = tra("New posts in subscribed thread");
-    $msg = tra("There are new posts in the thread '%1'",$thread->title);
+    $msg = tra("There are new posts in the thread '%1'", $thread->title);
     $url = secure_url_base()."forum_thread.php?id=$thread->id";
 }
 

Braces +126 added lines, -43 removed lines

@@ -231,7 +231,9 @@ 
 
     $x = "";
     
-    if ($nitems <= $items_per_page) return "";
+    if ($nitems <= $items_per_page) {
+        return "";
+    }
     $npages = ceil($nitems / $items_per_page);
     $curpage = ceil($start / $items_per_page);
 
@@ -256,16 +258,24 @@ 
     //
     for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
         $page_str = (string)($i+1);
-        if ($i < 0) continue;
-        if ($i >= $npages) break;
+        if ($i < 0) {
+            continue;
+        }
+        if ($i >= $npages) {
+            break;
+        }
 
         if ($i == $curpage) {
             $x .= "<b>$page_str</b>";
         } else {
             $x .= page_link($url, $i, $items_per_page, $page_str);
         }
-        if ($i == $npages-1) break;
-        if ($i == $curpage+$postshow) break;
+        if ($i == $npages-1) {
+            break;
+        }
+        if ($i == $curpage+$postshow) {
+            break;
+        }
         $x .= " &middot; ";
     }
 
@@ -286,10 +296,16 @@ 
 }
 
 function thread_is_unread($user, $thread) {
-    if (!$user) return false;
-    if ($thread->timestamp <= $user->prefs->mark_as_read_timestamp) return false;
+    if (!$user) {
+        return false;
+    }
+    if ($thread->timestamp <= $user->prefs->mark_as_read_timestamp) {
+        return false;
+    }
     $log = BoincForumLogging::lookup($user->id, $thread->id);
-    if ($log && ($thread->timestamp <= $log->timestamp)) return false;
+    if ($log && ($thread->timestamp <= $log->timestamp)) {
+        return false;
+    }
     return true;
 }
 
@@ -298,13 +314,18 @@ 
 function cleanup_title($title) {
     $x = sanitize_tags(bb2html($title));
     $x = trim($x);
-    if (strlen($x)==0) return "(no title)";
-    else return $x;
-}
+    if (strlen($x)==0) {
+        return "(no title)";
+    } else {
+        return $x;
+    }
+    }
 
 function can_reply($thread, $forum, $user) {
     if ($thread->locked) {
-        if (!is_moderator($user, $forum)) return false;
+        if (!is_moderator($user, $forum)) {
+            return false;
+        }
     }
     return true;
 }
@@ -343,7 +364,9 @@ 
         // show the last page
         //
         $nposts = sizeof($posts);
-        if ($nposts) $nposts -= 1;
+        if ($nposts) {
+            $nposts -= 1;
+        }
         $page = (int)($nposts/$num_to_show);
         $default_start = $page*$num_to_show;
     } else {
@@ -574,9 +597,13 @@ 
 
     echo user_links($user, 0);
     echo "<br>";
-    if ($user->create_time > time()-ST_NEW_TIME) $fstatus.=ST_NEW."<br>";
+    if ($user->create_time > time()-ST_NEW_TIME) {
+        $fstatus.=ST_NEW."<br>";
+    }
     echo "<span class=\"small\">";
-    if ($fstatus) echo "$fstatus";
+    if ($fstatus) {
+        echo "$fstatus";
+    }
 
     if (!$filter || !$ignore_poster){
         if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
@@ -638,7 +665,9 @@ 
     }
 
     echo " <a href=\"forum_thread.php?id=".$thread->id."&amp;postid=$post->id\">".tra("Message %1", $post->id)."</a> - ";
-    if ($post->hidden) echo "<font color=red>[".tra("hidden")."] </font>";
+    if ($post->hidden) {
+        echo "<font color=red>[".tra("hidden")."] </font>";
+    }
     echo tra("Posted: %1", pretty_time_str($post->timestamp)), " ";
 
     if ($post->parent_post) {
@@ -840,7 +869,9 @@ 
 function notify_subscribers($thread, $user) {
     $subs = BoincSubscription::enum("threadid=$thread->id");
     foreach ($subs as $sub) {
-        if ($user && ($user->id == $sub->userid)) continue;
+        if ($user && ($user->id == $sub->userid)) {
+            continue;
+        }
         $user2 = BoincUser::lookup_id($sub->userid);
         if ($user2) {
             notify_subscriber($thread, $user2);
@@ -858,7 +889,9 @@ 
     $now = time();
     $sig = $signature?1:0;
     $id = BoincPost::insert("(thread, user, timestamp, content, modified, parent_post, score, votes, signature, hidden) values ($thread->id, $user->id, $now, '$content', 0, $parent_id, 0, 0, $sig, 0)");
-    if (!$id) return null;
+    if (!$id) {
+        return null;
+    }
 
     notify_subscribers($thread, $user);
 
@@ -897,7 +930,9 @@ 
         $status = 1;
     }
     $id  = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
-    if (!$id) return null;
+    if (!$id) {
+        return null;
+    }
     $thread = BoincThread::lookup_id($id);
     create_post($content, 0, $user, $forum, $thread, $signature);
     $forum->update("threads=threads+1");
@@ -906,7 +941,9 @@ 
 
 function hide_post($post, $thread, $forum) {
     $ret = $post->update("hidden=1");
-    if (!$ret) return $ret;
+    if (!$ret) {
+        return $ret;
+    }
     $thread->update("replies=if(replies>0, replies-1, 0)");
     $forum->update("posts=if(posts>0, posts-1, 0)");
     update_thread_timestamp($thread);
@@ -916,7 +953,9 @@ 
 
 function unhide_post($post, $thread, $forum) {
     $ret = $post->update("hidden=0");
-    if (!$ret) return $ret;
+    if (!$ret) {
+        return $ret;
+    }
     $thread->update("replies=replies+1");
     $forum->update("posts=posts+1");
     update_thread_timestamp($thread);
@@ -968,7 +1007,9 @@ 
         BoincSubscription::delete($s->userid, $s->threadid);
     }
     $p = BoincForumPrefs::lookup_userid($user->id);
-    if ($p) $p->delete();
+    if ($p) {
+        $p->delete();
+    }
     BoincForumLogging::delete_aux("userid=$user->id");
 }
 
@@ -989,7 +1030,9 @@ 
 
 function hide_thread($thread, $forum) {
     $ret = $thread->update("hidden=1");
-    if (!$ret) return $ret;
+    if (!$ret) {
+        return $ret;
+    }
     $forum->update("threads=if(threads>0, threads-1, 0)");
     $forum->update("posts=posts-$thread->replies-1");
     update_forum_timestamp($forum);
@@ -998,7 +1041,9 @@ 
 
 function unhide_thread($thread, $forum) {
     $ret = $thread->update("hidden=0");
-    if (!$ret) return $ret;
+    if (!$ret) {
+        return $ret;
+    }
     $forum->update("threads=threads+1, posts=posts+$thread->replies+1");
     update_forum_timestamp($forum);
     return true;
@@ -1160,15 +1205,25 @@ 
 // - delete threads and posts
 //
 function is_admin($user) {
-    if (!$user) return false;
-    if ($user->prefs->privilege(S_SCIENTIST)) return true;
-    if ($user->prefs->privilege(S_DEV)) return true;
-    if ($user->prefs->privilege(S_ADMIN)) return true;
+    if (!$user) {
+        return false;
+    }
+    if ($user->prefs->privilege(S_SCIENTIST)) {
+        return true;
+    }
+    if ($user->prefs->privilege(S_DEV)) {
+        return true;
+    }
+    if ($user->prefs->privilege(S_ADMIN)) {
+        return true;
+    }
     return false;
 }
 
 function user_can_create_thread($user, $forum) {
-    if (!$user) return false;
+    if (!$user) {
+        return false;
+    }
     if ($forum->is_dev_blog && !is_admin($user)) {
         return false;
     }
@@ -1176,15 +1231,21 @@ 
 }
 
 function check_post_access($user, $forum) {
-    if (is_admin($user)) return;
+    if (is_admin($user)) {
+        return;
+    }
 
     switch ($forum->parent_type) {
     case 0:
-        if ($user->prefs->privilege(S_MODERATOR)) return;
+        if ($user->prefs->privilege(S_MODERATOR)) {
+            return;
+        }
         break;
     case 1:
         $team = BoincTeam::lookup_id($forum->category);
-        if (is_team_admin($user, $team)) return;
+        if (is_team_admin($user, $team)) {
+            return;
+        }
 
         // non-team-members can't post
         //
@@ -1232,17 +1293,29 @@ 
 // - hide/unhide/move threads and posts
 
 function is_moderator($user, $forum) {
-    if (!$user) return false;
+    if (!$user) {
+        return false;
+    }
     $type = $forum?$forum->parent_type:0;
     switch ($type) {
     case 0:
-        if ($user->prefs->privilege(S_MODERATOR)) return true;
-        if ($user->prefs->privilege(S_ADMIN)) return true;
-        if ($user->prefs->privilege(S_DEV)) return true;
-        if ($user->prefs->privilege(S_SCIENTIST)) return true;
+        if ($user->prefs->privilege(S_MODERATOR)) {
+            return true;
+        }
+        if ($user->prefs->privilege(S_ADMIN)) {
+            return true;
+        }
+        if ($user->prefs->privilege(S_DEV)) {
+            return true;
+        }
+        if ($user->prefs->privilege(S_SCIENTIST)) {
+            return true;
+        }
         break;
     case 1:
-        if ($user->prefs->privilege(S_ADMIN)) return true;
+        if ($user->prefs->privilege(S_ADMIN)) {
+            return true;
+        }
         $team = BoincTeam::lookup_id($forum->category);
         return is_team_admin($user, $team);
         break;
@@ -1266,8 +1339,12 @@ 
 //
 function show_thread_and_context($thread, $user) {
     $thread_forum = BoincForum::lookup_id($thread->forum);
-    if (!$thread_forum) return;
-    if (!is_forum_visible_to_user($thread_forum, $user)) return;
+    if (!$thread_forum) {
+        return;
+    }
+    if (!is_forum_visible_to_user($thread_forum, $user)) {
+        return;
+    }
     $owner = BoincUser::lookup_id($thread->owner);
     echo "<tr><td>\n";
     switch($thread_forum->parent_type) {
@@ -1292,7 +1369,9 @@ 
 //
 function is_subscribed($thread, $subs) {
     foreach ($subs as $sub) {
-        if ($sub->threadid == $thread->id) return true;
+        if ($sub->threadid == $thread->id) {
+            return true;
+        }
     }
     return false;
 }
@@ -1300,8 +1379,12 @@ 
 function is_forum_visible_to_user($forum, $user) {
     if ($forum->parent_type == 1) {
         if (parse_config(get_config(), "<team_forums_members_only>")) {
-            if (!$user) return false;
-            if ($user->teamid != $forum->category) return false;
+            if (!$user) {
+                return false;
+            }
+            if ($user->teamid != $forum->category) {
+                return false;
+            }
         }
     }
     return true;