BOINC / boinc

html/ops/batch_accel.php

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
                         break;
                     }
                     $age = $now - $r->sent_time;
-                    if ($age<$batch->expire_time) {
+                    if ($age < $batch->expire_time) {
                         $make_another_result = false;
                         break;
                     }
@@ -72,7 +72,7 @@ 
             if ($make_another_result) {
                 echo "creating another instance for WU $wu->id\n";
                 $query[] = sprintf(
-                    'target_nresults=%d', $wu->target_nresults+1
+                    'target_nresults=%d', $wu->target_nresults + 1
                 );
                 $query[] = sprintf(
                     'transition_time=%f', $now

html/ops/batch_stats.php

Spacing +5 added lines, -5 removed lines

@@ -126,7 +126,7 @@ 
     BoincHost::update_aux("error_rate=0");
     $ltts = [];
     foreach ($hosts as $id=>$x) {
-        $avg = $x->ntt_sum / $x->ntt_n;
+        $avg = $x->ntt_sum/$x->ntt_n;
         if ($avg < 1) {
             $ltts[] = $id;
         }
@@ -150,7 +150,7 @@ 
             $nfast = 0;
             foreach ($hlist as $id=>$count) {
                 $x = $hosts[$id];
-                $avg = $x->ntt_sum / $x->ntt_n;
+                $avg = $x->ntt_sum/$x->ntt_n;
                 if ($avg < 1) {
                     $nfast++;
                 }
@@ -165,7 +165,7 @@ 
         }
 
         $app->update(
-            sprintf('n_size_classes=%d', $accel?1:0)
+            sprintf('n_size_classes=%d', $accel ? 1 : 0)
         );
     }
 }
@@ -186,14 +186,14 @@ 
     foreach ($as as $a) {
         $apps[$a->id] = [];
     }
-    $start = time()-30*86400;
+    $start = time() - 30*86400;
     $batches = BoincBatch::enum(
         sprintf(
             'create_time>%d and state in (%d, %d)',
             $start, BATCH_STATE_IN_PROGRESS, BATCH_STATE_COMPLETE
         )
     );
-    foreach($batches as $batch) {
+    foreach ($batches as $batch) {
         do_batch($batch);
     }
     update_db();

html/user/submit_stats.php

Spacing +6 added lines, -6 removed lines

@@ -238,18 +238,18 @@ 
     }
     $n = 100;
     $count = [];
-    for ($i=0; $i<$n; $i++) {
+    for ($i = 0; $i < $n; $i++) {
         $count[$i] = 0;
     }
     $range = $max - $min;
     foreach ($x as $f) {
-        $d = intval($n*($f-$min)/$range);
-        if ($d >= $n) $d = $n-1;
+        $d = intval($n*($f - $min)/$range);
+        if ($d >= $n) $d = $n - 1;
         $count[$d] += 1;
     }
     $data = [];
-    for ($i=0; $i<$n; $i++) {
-        $data[] = [$min+($i*$range)/$n, $count[$i]];
+    for ($i = 0; $i < $n; $i++) {
+        $data[] = [$min + ($i*$range)/$n, $count[$i]];
     }
     if ($flops) {
         graph($data, 'runtime', 'Job runtime (hours)', 'job count');
@@ -314,7 +314,7 @@ 
 
 $batch = BoincBatch::lookup_id(get_int('batch_id'));
 if (!$batch) error_page('no batch');
-switch(get_str('action')) {
+switch (get_str('action')) {
 case 'err_host':
     err_host($batch);
     break;

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -217,7 +217,7 @@ 
             )
         );
     } else {
-        page_head("Batch $batch->id turnaround times");
+        page_head("batch $batch->id turnaround times");
         echo "<p>Turnaround times of completed jobs.<p>";
         $results = BoincResult::enum_fields(
             '(received_time-sent_time)/3600 as val',
@@ -265,7 +265,7 @@ 
 }
 
 function batch_graphs($batch) {
-    page_head("Batch $batch->id job times");
+    page_head("batch $batch->id job times");
     echo "
         <script type=\"text/javascript\" src=\"https://www.gstatic.com/charts/loader.js\"></script>
     ";
@@ -295,7 +295,7 @@ 
         }
     }
     arsort($x);
-    page_head("Batch $batch->id: completed jobs grouped by host");
+    page_head("batch $batch->id: completed jobs grouped by host");
     text_start();
     start_table();
     table_header('Host', 'OS', '# jobs');

html/inc/db_conn.inc

Spacing +9 added lines, -9 removed lines

@@ -22,12 +22,12 @@ 
 // Intended to be subclassed (e.g., BoincDb, BossaDb)
 //
 class DbConn {
-    var $db_conn;       // a mysqli object
-    var $db_name;       // the DB name
+    var $db_conn; // a mysqli object
+    var $db_name; // the DB name
 
     function init_conn($user, $passwd, $host, $name) {
         $x = explode(":", $host);
-        if (sizeof($x)>1) {
+        if (sizeof($x) > 1) {
             $host = $x[0];
             $port = $x[1];
         } else {
@@ -35,7 +35,7 @@ 
         }
         try {
             $this->db_conn = @new mysqli($host, $user, $passwd, $name, $port);
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
         if (mysqli_connect_error()) {
@@ -136,7 +136,7 @@ 
         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
         );
@@ -146,7 +146,7 @@ 
         $query = "update DBNAME.$table set $clause where id=$obj->id";
         return $this->do_query($query);
     }
-    function update_aux($table, $clause, $where='') {
+    function update_aux($table, $clause, $where = '') {
         if ($where) $where = " where $where";
         $query = "update DBNAME.$table set $clause $where";
         return $this->do_query($query);
@@ -182,15 +182,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');
     }

html/inc/util_basic.inc

Spacing +7 added lines, -7 removed lines

@@ -56,10 +56,10 @@ 
     return file_exists("$d/stop_sched");
 }
 
-function xml_error($num=-1, $msg=null, $file=null, $line=null) {
+function xml_error($num = -1, $msg = null, $file = null, $line = null) {
     global $xml_outer_tag;
     if (!$msg) {
-        switch($num) {
+        switch ($num) {
         case -112: $msg = "Invalid XML"; break;
         case -136: $msg = "Not found"; break;
         case -137: $msg = "Name or email address is not unique"; break;
@@ -104,7 +104,7 @@ 
 // If it's a single-tag element, and it's present, just return the tag
 //
 function parse_element($xml, $tag) {
-    $closetag = "</" . substr($tag,1);
+    $closetag = "</".substr($tag, 1);
     $x = strstr($xml, $tag);
     if ($x) {
         if (strstr($tag, "/>")) return $tag;
@@ -120,8 +120,8 @@ 
 
 function parse_next_element($xml, $tag, &$cursor) {
     $element = null;
-    $closetag = "</" . substr($tag,1);
-    $pos = substr($xml,$cursor);
+    $closetag = "</".substr($tag, 1);
+    $pos = substr($xml, $cursor);
     $x = strstr($pos, $tag);
     if ($x) {
         if (strstr($tag, "/>")) return $tag;
@@ -203,7 +203,7 @@ 
 
 function time_str($x) {
     if ($x == 0) return "---";
-    return gmdate('j M Y, G:i:s', (int)$x) . " UTC";
+    return gmdate('j M Y, G:i:s', (int)$x)." UTC";
 }
 
 function local_time_str($x) {
@@ -241,7 +241,7 @@ 
 // ALSO: allow spaces.
 //
 function is_valid_filename($x) {
-    if (strlen($x)>255) return false;
+    if (strlen($x) > 255) return false;
     // \w means A-Za-z0-9_
     return preg_match('/^[\w\-. ]+$/', $x);
 }

html/inc/host.inc

Spacing +21 added lines, -21 removed lines

@@ -32,12 +32,12 @@ 
 
 function sched_log_name($x) {
     if ($x == 0) return "NO_SUCH_LOG";
-    return gmdate('Y-m-d_H/Y-m-d_H:i', $x) . ".txt";
+    return gmdate('Y-m-d_H/Y-m-d_H:i', $x).".txt";
 }
 
 function sched_log_link($x) {
     if (file_exists("sched_logs")) {
-        return "<a href=\"../sched_logs/" . sched_log_name($x) . "\">" . time_str($x) . "</a>";
+        return "<a href=\"../sched_logs/".sched_log_name($x)."\">".time_str($x)."</a>";
     } else {
         return time_str($x);
     }
@@ -45,7 +45,7 @@ 
 
 function location_form($host) {
     $none = "selected";
-    $h=$w=$s=$m="";
+    $h = $w = $s = $m = "";
     if ($host->venue == "home") $h = "selected";
     if ($host->venue == "work") $w = "selected";
     if ($host->venue == "school") $s = "selected";
@@ -99,7 +99,7 @@ 
             row2(tra("Product name"), $host->product_name);
         }
         $x = $host->timezone/3600;
-        if ($x >= 0) $x="+$x";
+        if ($x >= 0) $x = "+$x";
         row2(tra("Local Standard Time"), tra("UTC %1 hours", $x));
     } else {
         $owner = BoincUser::lookup_id($host->userid);
@@ -185,7 +185,7 @@ 
         }
         if (BATCH_ACCEL) {
             row2('Low turnaround time?',
-                $host->error_rate?'yes':'no'
+                $host->error_rate ? 'yes' : 'no'
             );
         }
     }
@@ -298,20 +298,20 @@ 
 // Older clients may have the old-style serialnum in the DB
 // despite the server being upgraded.
 //
-function vbox_desc($parsed_ser){
+function vbox_desc($parsed_ser) {
     if (empty($parsed_ser['vbox'])) return '---';
     $f = $parsed_ser['vbox'];
     $desc = sprintf('Virtualbox (%s) %s',
         $f[1], tra("installed")
     );
-    if (sizeof($f)<=2){
+    if (sizeof($f) <= 2) {
         return $desc;
     }
-    if ($f[2]=="1" and $f[3]=="1") {
+    if ($f[2] == "1" and $f[3] == "1") {
         return $desc.tra(", CPU has hardware virtualization support and it is enabled");
-    } elseif ($f[2]=="1" and $f[3]=="0") {
+    } elseif ($f[2] == "1" and $f[3] == "0") {
         return $desc.tra(", CPU has hardware virtualization support but it is disabled");
-    } elseif ($f[2]=="0") {
+    } elseif ($f[2] == "0") {
         return $desc.tra(", CPU does not have hardware virtualization support");
     }
     return $desc;
@@ -336,13 +336,13 @@ 
 
 // return a human-readable version of the GPU info
 //
-function gpu_desc($parsed_ser, $detail=true) {
+function gpu_desc($parsed_ser, $detail = true) {
     $str = "";
     foreach ($parsed_ser as $d) {
         if (!is_gpu_type($d[0])) continue;
         if (count($d) < 4) continue;
         if ($str) $str .= "<p>";
-        if ($d[2]!="" && $d[2]!="1") $str .= "[".$d[2]."] ";
+        if ($d[2] != "" && $d[2] != "1") $str .= "[".$d[2]."] ";
         if ($d[0] == "CUDA") {
             $str .= "NVIDIA";
         } else if ($d[0] == "CAL") {
@@ -548,14 +548,14 @@ 
     if ($pos1 === false) return $x;
     $pos2 = strpos($model, ']');
     if ($pos2 === false) return $x;
-    $a = substr($model, $pos1+1, $pos2-$pos1-1);
+    $a = substr($model, $pos1 + 1, $pos2 - $pos1 - 1);
     $y = explode(" ", $a);
     if (count($y) == 0) return $x;
     if ($y[0] == "Family") {
         $x->info = $a;
     } else {
         $x->arch = $y[0];
-        $x->info = substr($a, strlen($y[0])+1);
+        $x->info = substr($a, strlen($y[0]) + 1);
     }
     return $x;
 }
@@ -644,7 +644,7 @@ 
     $avg_time = 0;
 
     $results = BoincResult::enum("hostid=$hostid order by received_time");
-    foreach($results as $result) {
+    foreach ($results as $result) {
         if ($result->granted_credit <= 0) continue;
         $total += $result->granted_credit;
 
@@ -737,7 +737,7 @@ 
 
 function link_url($sort, $rev, $show_all) {
     global $userid;
-    $x = $userid ? "&userid=$userid":"";
+    $x = $userid ? "&userid=$userid" : "";
     return "hosts_user.php?sort=$sort&rev=$rev&show_all=$show_all$x";
 }
 
@@ -811,7 +811,7 @@ 
 }
 
 function show_user_hosts($userid, $private, $show_all, $sort, $rev) {
-    $desc = false;  // whether the sort order's default is decreasing
+    $desc = false; // whether the sort order's default is decreasing
     switch ($sort) {
     case "total_credit": $sort_clause = "total_credit"; $desc = true; break;
     case "expavg_credit": $sort_clause = "expavg_credit"; $desc = true; break;
@@ -834,7 +834,7 @@ 
     more_or_less($sort, $rev, $show_all);
 
     $now = time();
-    $old_hosts=0;
+    $old_hosts = 0;
     $i = 1;
     $hosts = BoincHost::enum("userid=$userid order by $sort_clause limit 100");
     $any_product_name = false;
@@ -846,9 +846,9 @@ 
     }
     user_host_table_start($private, $sort, $rev, $show_all, $any_product_name);
     foreach ($hosts as $host) {
-        $is_old=false;
+        $is_old = false;
         if (($now - $host->rpc_time) > 30*86400) {
-            $is_old=true;
+            $is_old = true;
             $old_hosts++;
         }
         if (!$show_all && $is_old) continue;
@@ -857,7 +857,7 @@ 
     }
     end_table();
 
-    if ($old_hosts>0) {
+    if ($old_hosts > 0) {
         more_or_less($sort, $rev, $show_all);
     }
 

html/inc/util.inc

Spacing +76 added lines, -76 removed lines

@@ -30,7 +30,7 @@ 
 require_once("../inc/bootstrap.inc");
 
 function master_url() {
-    return parse_config(get_config() , "<master_url>");
+    return parse_config(get_config(), "<master_url>");
 }
 function recaptcha_public_key() {
     return parse_config(get_config(), "<recaptcha_public_key>");
@@ -42,10 +42,10 @@ 
 // Set parameters to defaults if not defined in config.xml
 
 $x = parse_config(get_config(), "<user_country>");
-define('USER_COUNTRY', ($x===null)?1:(int)$x);
+define('USER_COUNTRY', ($x === null) ? 1 : (int)$x);
 
 $x = parse_config(get_config(), "<user_url>");
-define('USER_URL', ($x===null)?1:(int)$x);
+define('USER_URL', ($x === null) ? 1 : (int)$x);
 
 // Set parameters to defaults if not defined in project.inc
 
@@ -155,10 +155,10 @@ 
 }
 
 function url_base() {
-    return is_https()?secure_url_base():URL_BASE;
+    return is_https() ?secure_url_base() : URL_BASE;
 }
 
-function send_cookie($name, $value, $permanent, $ops=false) {
+function send_cookie($name, $value, $permanent, $ops = false) {
     // the following allows independent login for projects on the same server
     //
     $url = parse_url(master_url());
@@ -167,28 +167,28 @@ 
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    $expire = $permanent?time()+3600*24*365:0;
+    $expire = $permanent ?time() + 3600*24*365 : 0;
     setcookie($name, $value, $expire, $path,
         '',
-        is_https(),     // if this page is secure, make cookie secure
+        is_https(), // if this page is secure, make cookie secure
         true            // httponly; no JS access
     );
 }
 
-function clear_cookie($name, $ops=false) {
+function clear_cookie($name, $ops = false) {
     $url = parse_url(master_url());
     $path = $url['path'];
     if ($ops) {
         $path = substr($path, 0, -1);
         $path .= "_ops/";
     }
-    setcookie($name, '', time()-3600, $path);
+    setcookie($name, '', time() - 3600, $path);
 }
 
 $g_logged_in_user = null;
 $got_logged_in_user = false;
 
-function get_logged_in_user($must_be_logged_in=true) {
+function get_logged_in_user($must_be_logged_in = true) {
     global $g_logged_in_user, $got_logged_in_user;
     if ($got_logged_in_user) {
         // this could have been called earlier with $must_be_logged_in false
@@ -214,7 +214,7 @@ 
             $next_url = $_SERVER['REQUEST_URI'];
             $n = strrpos($next_url, "/");
             if ($n) {
-                $next_url = substr($next_url, $n+1);
+                $next_url = substr($next_url, $n + 1);
             }
         }
         $next_url = urlencode($next_url);
@@ -225,7 +225,7 @@ 
     return $g_logged_in_user;
 }
 
-function show_login_info($prefix="") {
+function show_login_info($prefix = "") {
     $user = get_logged_in_user(false);
     if ($user) {
         $url_tokens = url_tokens($user->authenticator);
@@ -235,7 +235,7 @@ 
     }
 }
 
-$cache_control_extra="";
+$cache_control_extra = "";
 $is_login_page = false;
 
 // Call this to start pages.
@@ -247,11 +247,11 @@ 
 // with an existing web framework can more easily do so.
 // To do so, define page_head() in html/project/project.inc
 //
-if (!function_exists("page_head")){
+if (!function_exists("page_head")) {
 function page_head(
     $title,
         // page title. Put in <title>, used as title for browser tab.
-    $body_attrs=null,
+    $body_attrs = null,
         // <body XXXX>
         // e.g. Javascript to put focus in an input field
         // (onload="document.form.foo.focus()")
@@ -260,10 +260,10 @@ 
         // if set, include schedulers.txt.
         // also pass to project_banner() in case you want a different
         // header for your main page.
-    $url_prefix="",
+    $url_prefix = "",
         // prepend this to links.
         // Use for web pages not in the top directory
-    $head_extra=null
+    $head_extra = null
         // extra stuff to put in <head>. E.g.:
         // reCAPTCHA code (create_profile.php)
         // bbcode javascript (forums)
@@ -285,7 +285,7 @@ 
         header("Content-type: text/html; charset=utf-8");
         header("Expires: Mon, 26 Jul 1997 05:00:00 UTC");
             // Date in the past
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC");
             // always modified
         header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0");
             // for HTTP/1.1
@@ -308,11 +308,11 @@ 
     if ($head_extra) {
         echo "\n$head_extra\n";
     }
-    if ($is_main && (!defined('NO_COMPUTING')||!NO_COMPUTING)) {
+    if ($is_main && (!defined('NO_COMPUTING') || !NO_COMPUTING)) {
         readfile("schedulers.txt");
     }
 
-    $t = $title?$title:PROJECT;
+    $t = $title ? $title : PROJECT;
     echo "<title>$t</title>\n";
     echo '
         <meta charset="utf-8">
@@ -368,7 +368,7 @@ 
     echo '<div class="container-fluid">
     ';
 
-    switch($title) {    //kludge
+    switch ($title) {    //kludge
     case tra("Log in"):
     case tra("Create an account"):
     case tra("Server status page"):
@@ -383,13 +383,13 @@ 
 
 // See the comments for page_head()
 //
-if (!function_exists("page_tail")){
+if (!function_exists("page_tail")) {
 function page_tail(
-    $show_date=false,
+    $show_date = false,
         // true for pages that are generated periodically rather than on the fly
-    $url_prefix="",
+    $url_prefix = "",
         // use for pages not at top level
-    $is_main=false
+    $is_main = false
         // passed to project_footer;
 ) {
     echo "<br>\n";
@@ -423,37 +423,37 @@ 
 // convert time interval in seconds to a string of the form
 // 'D days h hours m min s sec'.
 
-function time_diff($x, $res=3) {
+function time_diff($x, $res = 3) {
     $x = (int)$x;
     $days    = (int)($x/86400);
-    $hours   = (int)(($x-$days*86400)/3600);
-    $minutes = (int)(($x-$days*86400-$hours*3600)/60);
-    $seconds = $x % 60;
+    $hours   = (int)(($x - $days*86400)/3600);
+    $minutes = (int)(($x - $days*86400 - $hours*3600)/60);
+    $seconds = $x%60;
 
     $s = "";
     if ($days) {
         $s .= "$days ".tra("days")." ";
     }
-    if ($res>0 && ($hours || strlen($s))) {
+    if ($res > 0 && ($hours || strlen($s))) {
         $s .= "$hours ".tra("hours")." ";
     }
-    if ($res>1 && ($minutes || strlen($s))) {
+    if ($res > 1 && ($minutes || strlen($s))) {
         $s .= "$minutes ".tra("min")." ";
     }
-    if ($res>2) {
+    if ($res > 2) {
         $s .= "$seconds ".tra("sec")." ";
     }
     return $s;
 }
 
-function start_table_str($class="", $style="") {
-    $s = $style?'style="'.$style.'"':'';
+function start_table_str($class = "", $style = "") {
+    $s = $style ? 'style="'.$style.'"' : '';
     return '<div class="table">
       <table '.$s.' width="100%" class="table table-condensed '.$class.'" >
     ';
 }
 
-function start_table($class="", $style="") {
+function start_table($class = "", $style = "") {
     echo start_table_str($class, $style);
 }
 
@@ -498,7 +498,7 @@ 
     echo "</tr>\n";
 }
 
-function row1($x, $ncols=2, $class="heading") {
+function row1($x, $ncols = 2, $class = "heading") {
     if ($class == "heading") {
         echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n";
     } else {
@@ -512,10 +512,10 @@ 
 
 // a table row with 2 columns, with the left on right-aligned
 
-function row2($x, $y, $show_error=false, $lwidth='40%') {
-    if ($x==="") $x="<br>";
-    if ($y==="") $y="<br>";
-    $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS;
+function row2($x, $y, $show_error = false, $lwidth = '40%') {
+    if ($x === "") $x = "<br>";
+    if ($y === "") $y = "<br>";
+    $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
     echo "<tr>
         <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td>
         <td $attrs >$y</td>
@@ -526,7 +526,7 @@ 
 // output the first part of row2();
 // then write the content, followed by </td></tr>
 
-function row2_init($x, $lwidth='40%') {
+function row2_init($x, $lwidth = '40%') {
     echo sprintf('<tr>
         <td width="%s" %s>%s</td>
         <td %s>',
@@ -542,31 +542,31 @@ 
     echo "<tr><td>$string</td></tr>";
 }
 
-function row_array($x, $attrs=null) {
+function row_array($x, $attrs = null) {
     echo "<tr>\n";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<td $a>$h</td>\n";
         $i++;
     }
     echo "</tr>\n";
 }
 
-define ('ALIGN_RIGHT', 'style="text-align:right;"');
+define('ALIGN_RIGHT', 'style="text-align:right;"');
 
-function row_heading_array($x, $attrs=null, $class='bg-primary') {
+function row_heading_array($x, $attrs = null, $class = 'bg-primary') {
     echo "<tr>";
     $i = 0;
     foreach ($x as $h) {
-        $a = $attrs?$attrs[$i]:"";
+        $a = $attrs ? $attrs[$i] : "";
         echo "<th $a class=\"$class\">$h</th>";
         $i++;
     }
     echo "</tr>\n";
 }
 
-function row_heading($x, $class='bg-primary') {
+function row_heading($x, $class = 'bg-primary') {
     echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr>
         ', $class, $x
     );
@@ -626,7 +626,7 @@ 
 // If $ellipsis is true, then an ellipsis is added to any sentence which
 // is cut short.
 
-function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) {
+function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) {
     $words = explode($delimiter, $sentence);
     $total_chars = 0;
     $trunc = false;
@@ -709,8 +709,8 @@ 
 
 // returns null if the arg is optional and missing
 //
-function get_int($name, $optional=false) {
-    $x=null;
+function get_int($name, $optional = false) {
+    $x = null;
     if (isset($_GET[$name])) $x = $_GET[$name];
     if (!is_numeric($x)) {
         if ($optional) {
@@ -729,7 +729,7 @@ 
 
 // returns null if the arg is optional and missing
 //
-function post_num($name, $optional=false) {
+function post_num($name, $optional = false) {
     $x = null;
     if (isset($_POST[$name])) $x = $_POST[$name];
     if (!is_numeric($x)) {
@@ -744,7 +744,7 @@ 
 
 // returns null if the arg is optional and missing
 //
-function post_int($name, $optional=false) {
+function post_int($name, $optional = false) {
     $x = post_num($name, $optional);
     if (is_null($x)) return null;
     $y = (int)$x;
@@ -762,7 +762,7 @@ 
     }
 }
 
-function get_str($name, $optional=false) {
+function get_str($name, $optional = false) {
     if (isset($_GET[$name])) {
         $x = $_GET[$name];
     } else {
@@ -774,7 +774,7 @@ 
     return undo_magic_quotes($x);
 }
 
-function post_str($name, $optional=false) {
+function post_str($name, $optional = false) {
     if (isset($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -786,7 +786,7 @@ 
     return undo_magic_quotes($x);
 }
 
-function post_arr($name, $optional=false) {
+function post_arr($name, $optional = false) {
     if (isset($_POST[$name]) && is_array($_POST[$name])) {
         $x = $_POST[$name];
     } else {
@@ -802,7 +802,7 @@ 
     // the mb_* functions are not included by default
     // return (mb_detect_encoding($passwd) -= 'ASCII');
 
-    for ($i=0; $i<strlen($str); $i++) {
+    for ($i = 0; $i < strlen($str); $i++) {
         $c = ord(substr($str, $i));
         if ($c < 32 || $c > 127) return false;
     }
@@ -826,7 +826,7 @@ 
     $number = str_replace(',', '.', $number); // replace the german decimal separator
     // if no value was entered and this is ok
     //
-    if ($number=='' && !$low) return true;
+    if ($number == '' && !$low) return true;
 
     // the supplied value contains alphabetic characters
     //
@@ -843,7 +843,7 @@ 
 
 // Generate a "select" element from an array of values
 //
-function select_from_array($name, $array, $selection=null, $width=240) {
+function select_from_array($name, $array, $selection = null, $width = 240) {
     $out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"';
 
     foreach ($array as $key => $value) {
@@ -868,12 +868,12 @@ 
     return $str;
 }
 
-function strip_bbcode($string){
-    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string);
+function strip_bbcode($string) {
+    return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string);
 }
 
 function current_url() {
-    $url = is_https()?'https':'http';
+    $url = is_https() ? 'https' : 'http';
     $url .= "://";
     $url .= $_SERVER['SERVER_NAME'];
     $url .= ":".$_SERVER['SERVER_PORT'];
@@ -891,7 +891,7 @@ 
 // the colors for bootstrap's btn-success are almost illegible;
 // the green is too light.  Use a darker green.
 //
-function button_style($color='green', $font_size=null) {
+function button_style($color = 'green', $font_size = null) {
     $fs = '';
     if ($font_size) {
         $fs = sprintf('; font-size:%dpx', $font_size);
@@ -910,7 +910,7 @@ 
 // class: class of the button, e.g. btn
 // extra: Additional text in href tag
 //
-function button_text($url, $text, $desc=null, $class=null, $extra='') {
+function button_text($url, $text, $desc = null, $class = null, $extra = '') {
     if (!$desc) {
         $desc = $text;
     }
@@ -925,23 +925,23 @@ 
     );
 }
 
-function button_text_small($url, $text, $desc=null) {
+function button_text_small($url, $text, $desc = null) {
     return button_text($url, $text, $desc, "btn btn-xs", button_style());
 }
 
-function show_button($url, $text, $desc=null, $class=null, $extra=null) {
+function show_button($url, $text, $desc = null, $class = null, $extra = null) {
     echo button_text($url, $text, $desc, $class, $extra);
 }
 
 // for places with a bunch of buttons, like forum posts
 //
-function show_button_small($url, $text, $desc=null) {
+function show_button_small($url, $text, $desc = null) {
     echo button_text_small($url, $text, $desc);
 }
 
 // used for showing icons
 //
-function show_image($src, $title, $alt, $height=null) {
+function show_image($src, $title, $alt, $height = null) {
     $h = "";
     if ($height) {
         $h = "height=\"$height\"";
@@ -978,7 +978,7 @@ 
 // tries instead to connect to <replica_db_host> if tag exists.
 // DEPRECATED - use boinc_db.inc
 //
-function db_init($try_replica=false) {
+function db_init($try_replica = false) {
     check_web_stopped();
     $retval = db_init_aux($try_replica);
     if ($retval == 1) {
@@ -1054,7 +1054,7 @@ 
 // Check this to avoid XSS vulnerability
 //
 function sanitize_sort_by($x) {
-    switch($x) {
+    switch ($x) {
     case 'expavg_credit':
     case 'total_credit':
         return;
@@ -1072,7 +1072,7 @@ 
 }
 
 function do_download($path) {
-    $name=basename($path);
+    $name = basename($path);
     header('Content-Description: File Transfer');
     header('Content-Type: application/octet-stream');
     header('Content-Disposition: attachment; filename='.$name);
@@ -1080,7 +1080,7 @@ 
     header('Expires: 0');
     header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
     header('Pragma: public');
-    header('Content-Length: ' . filesize($path));
+    header('Content-Length: '.filesize($path));
     flush();
     readfile($path);
 }
@@ -1129,10 +1129,10 @@ 
 // Otherwise return 0.
 // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)"
 //
-function boinc_client_version(){
+function boinc_client_version() {
     if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0;
     $x = $_SERVER['HTTP_USER_AGENT'];
-    $e =  "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
+    $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/";
     if (preg_match($e, $x, $matches)) {
         return $matches[1]*10000 + $matches[2]*100 + $matches[3];
     }
@@ -1161,7 +1161,7 @@ 
     $rem_name = $name."_remaining";
     return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\"
         onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea>
-        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
+        <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining")
     ;
 }
 
@@ -1191,7 +1191,7 @@ 
 // use the following around text with long lines,
 // to limit the width and make it more readable.
 //
-function text_start($width=640) {
+function text_start($width = 640) {
     echo sprintf("<div style=\"max-width: %dpx;\">\n", $width);
 }
 function text_end() {
@@ -1217,7 +1217,7 @@ 
 }
 
 function cert_filename() {
-    return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php";
+    return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php";
 }
 
 // if user hasn't validated their email addr, tell them to

html/inc/boinc_db.inc

Spacing +24 added lines, -24 removed lines

@@ -44,8 +44,8 @@ 
 // close() closes the connection.
 
 class BoincDb {
-    static $instance;       // a DbConn object, or null
-    static $dbnum;          // which replica we're connected to
+    static $instance; // a DbConn object, or null
+    static $dbnum; // which replica we're connected to
 
     // connect to DB $dbnum (0, 1, ...)
     // If the requested DB doesn't exist or connection fails, connect to DB 0.
@@ -56,7 +56,7 @@ 
         self::$instance = null;
         $config = get_config();
         if ($dbnum) {
-            $r = $dbnum==1?'':strval($dbnum);
+            $r = $dbnum == 1 ? '' : strval($dbnum);
             $host = parse_config($config, sprintf('<replica%s_db_host>', $r));
             $name = parse_config($config, sprintf('<replica%s_db_name>', $r));
             $user = parse_config($config, sprintf('<replica%s_db_user>', $r));
@@ -204,11 +204,11 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'user', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('user', 'BoincUser', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'user', 'BoincUser', $fields, $where_clause, $order_clause
@@ -258,7 +258,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'team', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('team', 'BoincTeam', $where_clause, $order_clause);
     }
@@ -283,7 +283,7 @@ 
         $db = BoincDb::get();
         return $db->max('team', $field);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'team', 'BoincTeam', $fields, $where_clause, $order_clause
@@ -317,7 +317,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'host', $clause);
     }
-    static function update_aux($clause, $where='') {
+    static function update_aux($clause, $where = '') {
         $db = BoincDb::get();
         return $db->update_aux('host', $clause, $where);
     }
@@ -325,11 +325,11 @@ 
         $db = BoincDb::get();
         return $db->delete($this, 'host');
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('host', 'BoincHost', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'host', 'BoincHost', $fields, $where_clause, $order_clause
@@ -366,7 +366,7 @@ 
         $db = BoincDb::get();
         return $db->enum('result', 'BoincResult', $where_clause);
     }
-	static function enum_fields($fields, $where_clause, $order_clause=null) {
+	static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
 		return $db->enum_fields(
             'result', 'BoincResult', $fields, $where_clause, $order_clause
@@ -376,7 +376,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'result', $clause);
     }
-    static function update_aux($clause, $where='') {
+    static function update_aux($clause, $where = '') {
         $db = BoincDb::get();
         return $db->update_aux('result', $clause, $where);
     }
@@ -415,7 +415,7 @@ 
         $db = BoincDb::get();
         return $db->enum('workunit', 'BoincWorkunit', $where_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields('workunit', 'BoincWorkunit', $fields, $where_clause, $order_clause);
     }
@@ -423,7 +423,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'workunit', $clause);
     }
-    static function update_aux($clause, $where='') {
+    static function update_aux($clause, $where = '') {
         $db = BoincDb::get();
         return $db->update_aux('workunit', $clause, $where);
     }
@@ -457,7 +457,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'app', $clause);
     }
-    static function sum($field, $clause=null) {
+    static function sum($field, $clause = null) {
         $db = BoincDb::get();
         return $db->sum('app', $field, $clause);
     }
@@ -515,11 +515,11 @@ 
         $db = BoincDb::get();
         return $db->insert('profile', $clause);
     }
-    static function enum($where_clause=null, $order_clause=null) {
+    static function enum($where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('profile', 'BoincProfile', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause=null, $order_clause=null) {
+    static function enum_fields($fields, $where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields('profile', 'BoincProfile', $fields, $where_clause, $order_clause);
     }
@@ -914,12 +914,12 @@ 
         return $db->enum('consent', 'BoincConsent', $where_clause);
     }
 
-    static function insert ($clause) {
+    static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('consent', $clause);
     }
 
-    static function update ($clause) {
+    static function update($clause) {
         $db = BoincDb::get();
         return $db->update_aux('consent', $clause);
     }
@@ -944,17 +944,17 @@ 
         return $db->lookup('consent_type', 'BoincConsentType', $clause);
     }
 
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('consent_type', 'BoincConsentType', $where_clause, $order_clause);
     }
 
-    static function insert ($clause) {
+    static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('consent_type', $clause);
     }
 
-    static function update ($clause) {
+    static function update($clause) {
         $db = BoincDb::get();
         return $db->update_aux('consent_type', $clause);
     }
@@ -980,7 +980,7 @@ 
         return $db->lookup('latest_consent', 'BoincLatestConsent', $clause);
     }
 
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('latest_consent', 'BoincLatestConsent', $where_clause, $order_clause);
     }
@@ -991,7 +991,7 @@ 
 // apply this to any user-supplied strings used in queries
 //
 function boinc_real_escape_string($x) {
-    if (version_compare(phpversion(),"4.3.0")>=0) {
+    if (version_compare(phpversion(), "4.3.0") >= 0) {
         return BoincDb::escape_string($x);
     } else {
         $x = str_replace("'", "\'", $x);