BOINC / boinc

html/inc/bolt_snap.inc

Doc Comments +6 added lines

@@ -45,6 +45,9 @@ 
     return "../bolt_snap/compare_snapshot_$x";
 }
 
+/**
+ * @param null|integer $dur
+ */
 function write_compare_snapshot($course_id, $select_name, $xset_name, $dur) {
     $now = time();
     $start = $now - $dur*86400;
@@ -127,6 +130,9 @@ 
     return "../bolt_snap/map_snapshot_".$course_id;
 }
 
+/**
+ * @param null|integer $dur
+ */
 function write_map_snapshot($course_id, $dur) {
     $now = time();
     $start = $now - $dur*86400;

Braces +6 added lines, -2 removed lines

@@ -116,7 +116,9 @@ 
 function read_compare_snapshot($course_id, $select_name, $xset_name) {
     $filename = compare_snapshot_filename($course_id, $select_name, $xset_name);
     $f = @fopen($filename, "r");
-    if (!$f) return null;
+    if (!$f) {
+        return null;
+    }
     $x = fread($f, filesize($filename));
     fclose($f);
     return unserialize($x);
@@ -220,7 +222,9 @@ 
 function read_map_snapshot($course_id) {
     $filename = map_snapshot_filename($course_id);
     $f = @fopen($filename, "r");
-    if (!$f) return null;
+    if (!$f) {
+        return null;
+    }
     $x = fread($f, filesize($filename));
     fclose($f);
     return unserialize($x);

html/inc/bolt_util_ops.inc

Doc Comments +21 added lines

@@ -23,6 +23,9 @@ 
 
 // get names of units of a given type
 
+/**
+ * @param string $type
+ */
 function units_of_type($unit, $type) {
     $names = array();
     if (get_class($unit) == $type) {
@@ -118,6 +121,10 @@ 
 
 //////////// graph drawing
 
+/**
+ * @param integer $n
+ * @param integer $width
+ */
 function compare_bar($title, $n, $width, $lo, $hi) {
     $x1 = $width*$lo;
     $x2 = $width*($hi-$lo);
@@ -137,6 +144,9 @@ 
     ";
 }
 
+/**
+ * @param integer $width
+ */
 function compare_bar_insuff($title, $width) {
     return "
         <tr>
@@ -150,6 +160,10 @@ 
     ";
 }
 
+/**
+ * @param integer[] $x
+ * @param integer $width
+ */
 function outcome_graph($x, $width) {
     $n = $x[0]+$x[1]+$x[2];
     if (!$n) return empty_cell();
@@ -182,6 +196,9 @@ 
     return $s;
 }
 
+/**
+ * @param integer $w
+ */
 function time_graph($t, $w) {
     if ($t == 0) return "<td>---</td>";
     $x = (log10($t)+2)*$w/4;
@@ -193,6 +210,10 @@ 
     </td>";
 }
 
+/**
+ * @param integer $t
+ * @param integer $w
+ */
 function score_graph($t, $w) {
     if ($t == 0) return "<td>---</td>";
     $x = $t*$w;

Spacing +9 added lines, -9 removed lines

@@ -89,10 +89,10 @@ 
         $n++;
         $delta = $x - $m;
         $m += $delta/$n;
-        $m2 += $delta*($x-$m);
+        $m2 += $delta*($x - $m);
     }
     $mean = $m;
-    $stdev = sqrt($m2/($n-1));
+    $stdev = sqrt($m2/($n - 1));
 }
 
 // approximate the 90% confidence interval for the mean of an array
@@ -103,13 +103,13 @@ 
 
     // I'm too lazy to compute the t distribution
     $t_90 = 1.7;
-    $d = $t_90 * $stdev / sqrt($n);
+    $d = $t_90*$stdev/sqrt($n);
     $lo = $mean - $d;
     $hi = $mean + $d;
 }
 
 function test_stats() {
-    $a = array(1,1,1,1,0,1,1,1,3, 1, 1, 1, 1);
+    $a = array(1, 1, 1, 1, 0, 1, 1, 1, 3, 1, 1, 1, 1);
     mean_stdev($a, $mean, $stdev);
     echo "mean: $mean stdev: $stdev\n";
     conf_int_90($a, $lo, $hi);
@@ -120,7 +120,7 @@ 
 
 function compare_bar($title, $n, $width, $lo, $hi) {
     $x1 = $width*$lo;
-    $x2 = $width*($hi-$lo);
+    $x2 = $width*($hi - $lo);
     $a1 = number_format($lo*100);
     $a2 = number_format($hi*100);
     return "
@@ -151,12 +151,12 @@ 
 }
 
 function outcome_graph($x, $width) {
-    $n = $x[0]+$x[1]+$x[2];
+    $n = $x[0] + $x[1] + $x[2];
     if (!$n) return empty_cell();
     $x0 = $width*$x[1]/$n;
     $x1 = $width*$x[0]/$n;
     $x2 = $width*$x[2]/$n;
-    if ($x[1]/$n>0.05) {
+    if ($x[1]/$n > 0.05) {
         $t0 = number_format(100*$x[1]/$n)."%";
     } else {
         $t0 = "";
@@ -184,7 +184,7 @@ 
 
 function time_graph($t, $w) {
     if ($t == 0) return "<td>---</td>";
-    $x = (log10($t)+2)*$w/4;
+    $x = (log10($t) + 2)*$w/4;
     $t = number_format($t, 1);
     return "<td>
         <table class=bolt_bar><tr>
@@ -196,7 +196,7 @@ 
 function score_graph($t, $w) {
     if ($t == 0) return "<td>---</td>";
     $x = $t*$w;
-    $y = (1-$t)*$w;
+    $y = (1 - $t)*$w;
     $t = number_format($t*100);
     $s = "<td>
         <table class=bolt_bar><tr>

Braces +15 added lines, -5 removed lines

@@ -66,11 +66,15 @@ 
 // Find a unit of given name
 //
 function lookup_unit($top_unit, $name) {
-    if ($top_unit->name == $name) return $top_unit;
+    if ($top_unit->name == $name) {
+        return $top_unit;
+    }
     if (is_subclass_of($top_unit, "BoltSet")) {
         foreach ($top_unit->units as $child) {
             $u = lookup_unit($child, $name);
-            if ($u) return $u;
+            if ($u) {
+                return $u;
+            }
         }
     }
     return null;
@@ -152,7 +156,9 @@ 
 
 function outcome_graph($x, $width) {
     $n = $x[0]+$x[1]+$x[2];
-    if (!$n) return empty_cell();
+    if (!$n) {
+        return empty_cell();
+    }
     $x0 = $width*$x[1]/$n;
     $x1 = $width*$x[0]/$n;
     $x2 = $width*$x[2]/$n;
@@ -183,7 +189,9 @@ 
 }
 
 function time_graph($t, $w) {
-    if ($t == 0) return "<td>---</td>";
+    if ($t == 0) {
+        return "<td>---</td>";
+    }
     $x = (log10($t)+2)*$w/4;
     $t = number_format($t, 1);
     return "<td>
@@ -194,7 +202,9 @@ 
 }
 
 function score_graph($t, $w) {
-    if ($t == 0) return "<td>---</td>";
+    if ($t == 0) {
+        return "<td>---</td>";
+    }
     $x = $t*$w;
     $y = (1-$t)*$w;
     $t = number_format($t*100);

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 {