BOINC / boinc

html/inc/host.inc

Spacing +22 added lines, -22 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);
@@ -259,15 +259,15 @@ 
 // "[vbox|5.0.0|1|1]", where now two additional flags give information about
 // hardware virtualization support. Older clients may have the old-style
 // serialnum in the DB despite the server being upgraded.
-function vbox_desc($x){
-    if (preg_match("/\[vbox\|(.*?)(\|([01])\|([01]))?\]/",$x,$matches)){
+function vbox_desc($x) {
+    if (preg_match("/\[vbox\|(.*?)(\|([01])\|([01]))?\]/", $x, $matches)) {
         $desc = "Virtualbox (".$matches[1].") ".tra("installed");
-        if (sizeof($matches)>2){
-            if ($matches[3]=="1" and $matches[4]=="1") {
+        if (sizeof($matches) > 2) {
+            if ($matches[3] == "1" and $matches[4] == "1") {
                 return $desc.tra(", CPU has hardware virtualization support and it is enabled");
-            } elseif ($matches[3]=="1" and $matches[4]=="0") {
+            } elseif ($matches[3] == "1" and $matches[4] == "0") {
                 return $desc.tra(", CPU has hardware virtualization support but it is disabled");
-            } elseif ($matches[3]=="0") {
+            } elseif ($matches[3] == "0") {
                 return $desc.tra(", CPU does not have hardware virtualization support");
             }
         } else {
@@ -281,7 +281,7 @@ 
 // Given string of the form [BOINC|vers][type|model|count|RAM|driver-vers][vbox|vers],
 // return a human-readable version of the GPU info
 //
-function gpu_desc($x, $detail=true) {
+function gpu_desc($x, $detail = true) {
     $descs = explode("]", $x);
     array_pop($descs);
     $str = "";
@@ -293,7 +293,7 @@ 
         if ($d[0] == "vbox") continue;
         if (count($d) < 5) 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") {
@@ -500,14 +500,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;
 }
@@ -596,7 +596,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;
 
@@ -689,7 +689,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";
 }
 
@@ -763,7 +763,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;
@@ -786,7 +786,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");
     $any_product_name = false;
@@ -798,9 +798,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;
@@ -809,7 +809,7 @@ 
     }
     end_table();
 
-    if ($old_hosts>0) {
+    if ($old_hosts > 0) {
         more_or_less($sort, $rev, $show_all);
     }
 
@@ -829,6 +829,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/inc/db_ops.inc

Spacing +105 added lines, -105 removed lines

@@ -42,27 +42,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);
 }
 
@@ -100,7 +100,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
@@ -110,38 +110,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>";
     start_table('table-striped');
     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";
     }
@@ -156,7 +156,7 @@ 
     echo "<h2>Description of <b>$table</b> table fields:</h2>\n";
     start_table();
     echo "<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 "</tr>";
@@ -175,10 +175,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>
@@ -202,11 +202,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;
     }
 }
 
@@ -307,7 +307,7 @@ 
         if (isset($_GET[$name])) {
             $value = $_GET[$name];
         } else {
-            $value=null;
+            $value = null;
         }
         if (isset($_GET[$order])) {
              $order = $_GET[$order];
@@ -348,7 +348,7 @@ 
     }
 
     function get_url($base = "db_action.php") {
-        $s = $base . "?table=$this->table$this->urlquery";
+        $s = $base."?table=$this->table$this->urlquery";
         return $s;
     }
 
@@ -363,7 +363,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');
@@ -384,7 +384,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 {
@@ -397,13 +397,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);
@@ -411,8 +411,8 @@ 
 }
 
 function admin_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;
 
@@ -420,20 +420,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';
@@ -508,7 +508,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)";
@@ -567,20 +567,20 @@ 
 
     start_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>";
     start_table('table-striped');
     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", '')
         );
     }
     end_table();
@@ -590,11 +590,11 @@ 
     start_table('table-striped');
     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", '')
         );
     }
@@ -604,18 +604,18 @@ 
     echo "<td>";
     start_table('table-striped');
     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"));
     }
     end_table();
     start_table('table-striped');
     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"));
     }
@@ -627,7 +627,7 @@ 
     echo "<td>";
     start_table('table-striped');
     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;
@@ -646,9 +646,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";
@@ -659,7 +659,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;
@@ -673,7 +673,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;
@@ -687,7 +687,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;
@@ -724,7 +724,7 @@ 
 }
 
 function table_title($table) {
-    switch($table) {
+    switch ($table) {
     case "platform": return "Platforms";
     case "app": return "Applications";
     case "app_version": return "Application Versions";
@@ -744,7 +744,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();
 }
 
@@ -756,8 +756,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();
 }
 
@@ -765,9 +765,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);
@@ -901,7 +901,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");
@@ -953,10 +953,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("Application version number", $wu->app_version_num);
     row("Batch", $wu->batch);
     $x = number_format($wu->rsc_fpops_est/1e9, 2);
@@ -969,12 +969,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, true));
     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."]");
@@ -984,7 +984,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);
@@ -1062,7 +1062,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
@@ -1089,18 +1089,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);
@@ -1117,16 +1117,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>"
@@ -1174,23 +1174,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?wu_id=$result->workunitid>".credit_str($result->granted_credit)."</a>";
     $delete_state = file_delete_state_str($result->file_delete_state);
 
@@ -1218,7 +1218,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);
@@ -1233,7 +1233,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);
@@ -1284,7 +1284,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>";
@@ -1323,10 +1323,10 @@ 
 function admin_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>");
@@ -1369,7 +1369,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.")";
     }
 }
 

html/inc/result.inc

Spacing +26 added lines, -26 removed lines

@@ -53,9 +53,9 @@ 
     return $platforms[$id];
 }
 
-function anon_platform_string($result, $rsc_name=null) {
+function anon_platform_string($result, $rsc_name = null) {
     $app = get_app($result->appid);
-    $n = $app->user_friendly_name."<br>".  tra("Anonymous platform");
+    $n = $app->user_friendly_name."<br>".tra("Anonymous platform");
     if ($rsc_name) {
         $n .= " ($rsc_name)";
     }
@@ -97,7 +97,7 @@ 
         return $string_to_show;
     }
     if ($result->server_state <> RESULT_SERVER_STATE_OVER) return "---";
-    switch($result->outcome) {
+    switch ($result->outcome) {
     case RESULT_OUTCOME_SUCCESS:
         switch ($result->validate_state) {
         case VALIDATE_STATE_INIT:
@@ -212,7 +212,7 @@ 
             ) {
                 return tra("Not started by deadline - canceled");
             }
-            switch($result->client_state) {
+            switch ($result->client_state) {
             case RESULT_FILES_DOWNLOADING: return tra("Error while downloading");
             case RESULT_FILES_DOWNLOADED:
             case RESULT_COMPUTE_ERROR: return tra("Error while computing");
@@ -231,7 +231,7 @@ 
 }
 
 function result_server_state_string($result) {
-    switch($result->server_state) {
+    switch ($result->server_state) {
     case RESULT_SERVER_STATE_INACTIVE: return tra("Inactive");
     case RESULT_SERVER_STATE_UNSENT: return tra("Unsent");
     case RESULT_SERVER_STATE_IN_PROGRESS: return tra("In progress");
@@ -241,7 +241,7 @@ 
 }
 
 function result_outcome_string($result) {
-    switch($result->outcome) {
+    switch ($result->outcome) {
     case RESULT_OUTCOME_INIT: return "---";
     case RESULT_OUTCOME_SUCCESS: return tra("Success");
     case RESULT_OUTCOME_COULDNT_SEND: return tra("Couldn't send");
@@ -259,7 +259,7 @@ 
 }
 
 function result_client_state_string($result) {
-    switch($result->client_state) {
+    switch ($result->client_state) {
     case RESULT_NEW: return tra("New");
     case RESULT_FILES_DOWNLOADING: return tra("Downloading");
     case RESULT_FILES_DOWNLOADED: return tra("Processing");
@@ -277,7 +277,7 @@ 
 }
 
 function validate_state_str($result) {
-    switch($result->validate_state) {
+    switch ($result->validate_state) {
     case VALIDATE_STATE_INIT: return tra("Initial");
     case VALIDATE_STATE_VALID: return tra("Valid");
     case VALIDATE_STATE_INVALID:
@@ -293,7 +293,7 @@ 
 }
 
 function assimilate_state_str($s) {
-    switch($s) {
+    switch ($s) {
     case ASSIMILATE_INIT: return "Initial";
     case ASSIMILATE_READY: return "Ready to assimilate";
     case ASSIMILATE_DONE: return "Assimilated";
@@ -302,7 +302,7 @@ 
 }
 
 function file_delete_state_str($s) {
-    switch($s) {
+    switch ($s) {
     case FILE_DELETE_INIT: return "Initial";
     case FILE_DELETE_READY: return "Ready to delete";
     case FILE_DELETE_DONE: return "Deleted";
@@ -314,7 +314,7 @@ 
 // convert WU error bitmask to str.
 // If $color, add HTML red color
 //
-function wu_error_mask_str($s, $color=false) {
+function wu_error_mask_str($s, $color = false) {
     $x = "";
     if ($s & WU_ERROR_COULDNT_SEND_RESULT) {
         $x = $x." ".tra("Couldn't send result");
@@ -428,10 +428,10 @@ 
     if ($result->received_time) {
         $r = time_str($result->received_time);
     } else if ($result->report_deadline) {
-        if ($result->report_deadline>time()) {
-            $r = "<font color='#33cc33'>" . time_str($result->report_deadline) . "</font>";
+        if ($result->report_deadline > time()) {
+            $r = "<font color='#33cc33'>".time_str($result->report_deadline)."</font>";
         } else {
-            $r = "<font color='#ff3333'>" . time_str($result->report_deadline) . "</font>";
+            $r = "<font color='#ff3333'>".time_str($result->report_deadline)."</font>";
         }
     } else {
         $r = "---";
@@ -492,7 +492,7 @@ 
 // @param Integer $dec A signed integer
 //
 function int2hex($dec) {
-    return "0x".strtoupper(substr(sprintf("%08x",$dec), -8));
+    return "0x".strtoupper(substr(sprintf("%08x", $dec), -8));
 }
 
 // Decode a windows error number into semi-human-readable,
@@ -502,9 +502,9 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function windows_error_code_str($x){
-    $h=int2hex($x);
-    switch($h){
+function windows_error_code_str($x) {
+    $h = int2hex($x);
+    switch ($h) {
     case "0xC0000005": return "STATUS_ACCESS_VIOLATION";
     case "0xC000001D": return "STATUS_ILLEGAL_INSTRUCTION";
     case "0xC0000094": return "STATUS_INTEGER_DIVIDE_BY_ZERO";
@@ -525,10 +525,10 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function error_code_str($x){
+function error_code_str($x) {
     // severe Windows error numbers are always large negative integers
-    if ($x<-400) return windows_error_code_str($x);
-    switch($x){
+    if ($x < -400) return windows_error_code_str($x);
+    switch ($x) {
     case 0: return "";
     case 192: return "EXIT_STATEFILE_WRITE";
     case 193: return "EXIT_SIGNAL";
@@ -689,7 +689,7 @@ 
     return $x." (".int2hex($x).") ".error_code_str($x);
 }
 
-function show_result($result, $show_outfile_links=false) {
+function show_result($result, $show_outfile_links = false) {
     start_table();
     row2(tra("Name"), $result->name);
     row2(tra("Workunit"), "<a href=\"workunit.php?wuid=$result->workunitid\">$result->workunitid</a>");
@@ -740,7 +740,7 @@ 
     echo "<h3>".tra("Stderr output")."</h3> <pre>"
         .htmlspecialchars(
             $result->stderr_out,
-            ENT_QUOTES | (defined('ENT_SUBSTITUTE')?ENT_SUBSTITUTE:0),
+            ENT_QUOTES|(defined('ENT_SUBSTITUTE') ?ENT_SUBSTITUTE:0),
             'utf-8'
         )
         ."</pre>"
@@ -755,7 +755,7 @@ 
 
     $apps = BoincApp::enum('deprecated=0 ORDER BY user_friendly_name');
 
-    for ($i=0; $i<NSTATES; $i++) {
+    for ($i = 0; $i < NSTATES; $i++) {
         $state_count[$i] = 0;
     }
     foreach ($apps as $app) {
@@ -798,7 +798,7 @@ 
         $x .= "<a href=$url>".tra("Next")." ".$info->results_per_page."</a>";
     }
     $x .= "<br>".tra("State").": ";
-    for ($i=0; $i<NSTATES; $i++) {
+    for ($i = 0; $i < NSTATES; $i++) {
         if ($i) $x .= " &middot; ";
         if ($info->state == $i) {
             $x .= $state_name[$i];
@@ -843,6 +843,6 @@ 
     return $x;
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/inc/prefs_util.inc

Spacing +28 added lines, -28 removed lines

@@ -42,9 +42,9 @@ 
 }
 
 abstract class PREF {
-    public $desc;       // short description
-    public $tooltip;    // longer description, shown as tooltip
-    public $tag;        // the pref's primary XML tag
+    public $desc; // short description
+    public $tooltip; // longer description, shown as tooltip
+    public $tag; // the pref's primary XML tag
     function __construct($desc, $tooltip, $tag) {
         $this->desc = $desc;
         $this->tooltip = $tooltip;
@@ -122,15 +122,15 @@ 
 
 class PREF_BOOL extends PREF {
     public $default;
-    public $invert;     // show to user in opposite sense
-    function __construct($desc, $tooltip, $tag, $default, $invert=false) {
+    public $invert; // show to user in opposite sense
+    function __construct($desc, $tooltip, $tag, $default, $invert = false) {
         $this->default = $default;
         $this->invert = $invert;
         parent::__construct($desc, $tooltip, $tag);
     }
     function show_value($prefs) {
         $tag = $this->tag;
-        $v = $this->invert?!$prefs->$tag:$prefs->$tag;
+        $v = $this->invert ? !$prefs->$tag : $prefs->$tag;
         echo "<td>".readonly_checkbox($v)."</td>";
     }
     function show_form($prefs, $error) {
@@ -142,7 +142,7 @@ 
         }
         echo "<td ".VALUE_ATTRS.">"
             ."<input type=checkbox name=$this->tag "
-            . ($checked?"checked":"")
+            . ($checked ? "checked" : "")
             ."></td>
         ";
     }
@@ -155,7 +155,7 @@ 
     function xml_string($prefs) {
         $tag = $this->tag;
         return "<$tag>"
-            .($prefs->$tag?"1":"0")
+            .($prefs->$tag ? "1" : "0")
             ."</$tag>\n";
     }
     function xml_parse(&$prefs, $name, $text) {
@@ -175,9 +175,9 @@ 
     public $consent_type_id; // the consent_type_id from the consent_type table
     public $consent_name; // the consent_name to configure
     public $default;
-    public $invert;     // show to user in opposite sense
+    public $invert; // show to user in opposite sense
 
-    function __construct($desc, $tooltip, $tag, $consent_type_id, $consent_name, $default, $invert=false) {
+    function __construct($desc, $tooltip, $tag, $consent_type_id, $consent_name, $default, $invert = false) {
         $this->consent_type_id = $consent_type_id;
         $this->consent_name = $consent_name;
         $this->default = $default;
@@ -240,7 +240,7 @@ 
         } else {
             $value = false;
         }
-        echo "<td>" . readonly_checkbox($value) . "</td>";
+        echo "<td>".readonly_checkbox($value)."</td>";
     }
     function show_form($user, $error) {
         $consent_type_id = $this->consent_type_id;
@@ -257,7 +257,7 @@ 
         }
         echo "<td ".VALUE_ATTRS.">"
             ."<input type=checkbox name=$this->tag "
-            . ($checked?"checked":"")
+            . ($checked ? "checked" : "")
             ."></td>
         ";
     }
@@ -276,7 +276,7 @@ 
             "userid=$user->id AND consent_type_id='$consent_type_id$'"
         );
 
-        if ((($cr) and ($cr->consent_flag!=$flag)) or (!$cr)) {
+        if ((($cr) and ($cr->consent_flag != $flag)) or (!$cr)) {
             $rc = consent_to_a_policy(
                 $user, $consent_type_id, $flag, 0, 'Webform', time()
             );
@@ -316,7 +316,7 @@ 
         // this is the value if they check the box
     public $scale;
 
-    function __construct($suffix, $min, $max, $default, $scale=1, $default2=0) {
+    function __construct($suffix, $min, $max, $default, $scale = 1, $default2 = 0) {
         $this->suffix = " $suffix";
         $this->min = $min;
         $this->max = $max;
@@ -335,7 +335,7 @@ 
         $v .= "$this->suffix ";
         return $v;
     }
-    function form_str($tag, $v, $had_error, $disabled=false, $id=null) {
+    function form_str($tag, $v, $had_error, $disabled = false, $id = null) {
         if (is_numeric($v)) {
             $v /= $this->scale;
             if (!$had_error && ($v < $this->min || $v > $this->max)) {
@@ -343,7 +343,7 @@ 
             }
         }
         if ($disabled) $v = "";
-        $i = $id?"id=\"$id\"":"";
+        $i = $id ? "id=\"$id\"" : "";
         return '<input type="text" size="5" class="form-control input-sm" name="'.$tag.'" value="'.$v."\" $disabled $i> &nbsp; $this->suffix ";
     }
     function form_convert($in, &$out, &$error) {
@@ -466,8 +466,8 @@ 
         $text_id = $this->tag;
         $default = $this->num_spec->get_default();
         $val = $prefs->$tag;
-        $c = $val?"checked":"";
-        $d = $val?"":"disabled";
+        $c = $val ? "checked" : "";
+        $d = $val ? "" : "disabled";
         echo "<td $attrs>"
             ."<input type=checkbox id=$checkbox_id onClick=\"checkbox_clicked('$checkbox_id', '$text_id', $default)\" $c> &nbsp;"
             .$this->num_spec->form_str($tag, $prefs->$tag, $had_error, $d, $text_id)
@@ -580,8 +580,8 @@ 
 function hour_select($x, $name, $id, $d) {
     $s = "";
     $s .= "<select class=\"selectbox form-control input-sm\" name=$name id=$id $d>\n";
-    for ($i=0; $i<24; $i++) {
-        $sel = ($x == $i)?"selected":"";
+    for ($i = 0; $i < 24; $i++) {
+        $sel = ($x == $i) ? "selected" : "";
         $s .= "<option value=$i $sel> $i:00";
     }
     $s .= "</select>\n";
@@ -682,7 +682,7 @@ 
 
 // row_defs - Display a value for all 4 venues in one row
 //
-function row_defs($pre, $item, $post, $type, $prefs, $tooltip=null) {
+function row_defs($pre, $item, $post, $type, $prefs, $tooltip = null) {
     $gen = $prefs->$item;
     $hom  = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--";
     $schl = (isset($prefs->school) && isset($prefs->school->$item)) ? $prefs->school->$item : "--";
@@ -694,10 +694,10 @@ 
         echo "<tr>";
     }
     echo "<td ".NAME_ATTRS.">$pre</td>";
-    row_field($gen,  $type);
-    row_field($hom,  $type);
+    row_field($gen, $type);
+    row_field($hom, $type);
     row_field($schl, $type);
-    row_field($wrk,  $type);
+    row_field($wrk, $type);
     echo "<td align=left>$post</td></tr>\n";
 }
 
@@ -707,16 +707,16 @@ 
 function row_field($value, $type) {
     echo "<td>";
     $type = $value === "--" ? "--" : $type;
-    switch($type) {
+    switch ($type) {
     case "yesno":
-        echo $value ?tra("yes"):tra("no");
+        echo $value ?tra("yes") : tra("no");
         break;
     case "noyes":
-        echo $value ?tra("no"):tra("yes");
+        echo $value ?tra("no") : tra("yes");
         break;
     case "limit":
         $x = max_bytes_display_mode($value);
-        $y = "$x " . BYTE_ABBR;
+        $y = "$x ".BYTE_ABBR;
         echo $x ? "$y" : tra("no limit");
         break;
     case "minutes":

html/ops/dbinfo.php

Spacing +52 added lines, -52 removed lines

@@ -41,7 +41,7 @@ 
 
 
 // returns formatted data size
-function size_format($size){
+function size_format($size) {
 	$retval = 0;
 
 	$KB = 1024;
@@ -52,13 +52,13 @@ 
     if ($size < $KB) {
 	    $retval = $size;
     } elseif (($size > $KB) && ($size < $MB)) {
-		$retval = sprintf("%.0fK", ($size / $KB));
-    } elseif ( ($size >= $MB) && ($size < $GB)) {
-		$retval = sprintf("%.2fMB", ($size / $MB));
-    } elseif ( ($size >= $GB) && ($size < $TB)) {
-		$retval = sprintf("%.2fGB", ($size / $GB));
-	} elseif ( $size >= $TB ) {
-		$retval = sprintf("%.2fTB", ($size / $TB));
+		$retval = sprintf("%.0fK", ($size/$KB));
+    } elseif (($size >= $MB) && ($size < $GB)) {
+		$retval = sprintf("%.2fMB", ($size/$MB));
+    } elseif (($size >= $GB) && ($size < $TB)) {
+		$retval = sprintf("%.2fGB", ($size/$GB));
+	} elseif ($size >= $TB) {
+		$retval = sprintf("%.2fTB", ($size/$TB));
 	}
 	return $retval;
 }
@@ -89,9 +89,9 @@ 
         if ($myarr['Comment'] == 'VIEW') continue;
 
 		// sum grand totals
-		$total  =  $myarr["Data_length"] + $myarr["Index_length"];
+		$total = $myarr["Data_length"] + $myarr["Index_length"];
 		$gindex += $myarr["Index_length"];
-        $gdata  += $myarr["Data_length"];
+        $gdata += $myarr["Data_length"];
 		$grows  += $myarr["Rows"];
 		$gtotal += $total;
 
@@ -105,7 +105,7 @@ 
         );
 		$i++;
 	}
-    $db_rec[$i] = new DB_REC ("Total", $gdata, $gindex, $gtotal, $grows, "" );
+    $db_rec[$i] = new DB_REC("Total", $gdata, $gindex, $gtotal, $grows, "");
 	return $db_rec;
 }
 
@@ -126,25 +126,25 @@ 
 	echo "<th>Avg. Size per Row</th>";
 	echo "</tr>";
 
-	for ($i = 0; $i < sizeof($db_rec)-1; $i++){
+	for ($i = 0; $i < sizeof($db_rec) - 1; $i++) {
 		echo "<tr>";
-		echo "<td align=left valign=top class=fieldname>" . $db_rec[$i]->name . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->data_size)  . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->index_size) . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->total_size) . "</td>";
-        echo "<td align=left valign=top class=fieldname>" . number_format($db_rec[$i]->rows)     . "</td>";
-        echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->size_per_row) . "</td>";
+		echo "<td align=left valign=top class=fieldname>".$db_rec[$i]->name."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->data_size)."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->index_size)."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->total_size)."</td>";
+        echo "<td align=left valign=top class=fieldname>".number_format($db_rec[$i]->rows)."</td>";
+        echo "<td align=left valign=top class=fieldname>".size_format($db_rec[$i]->size_per_row)."</td>";
 		echo "</tr>";
 	}
 
 	// Last record is just a summary
-	$i = sizeof($db_rec)-1;
+	$i = sizeof($db_rec) - 1;
 	echo "<tr>";
-    echo "<th align=left>" . $db_rec[$i]->name . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->data_size)  . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->index_size) . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->total_size) . "</th>";
-    echo "<th align=left>" . number_format($db_rec[$i]->rows)     . "</th>";
+    echo "<th align=left>".$db_rec[$i]->name."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->data_size)."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->index_size)."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->total_size)."</th>";
+    echo "<th align=left>".number_format($db_rec[$i]->rows)."</th>";
     echo "<th align=left></th>";
 	echo "</tr>";
     echo "</table>";
@@ -156,28 +156,28 @@ 
 	$file_list = array();
     $file_sort = array();
 
-	$sort =  get_str("sort", true);
+	$sort = get_str("sort", true);
 	$r = get_str("r", true);
 
 	if (empty($sort)) $sort = "name";
 	// check for allowed keys
-	if ((strcmp($sort, "name")!=0) &&
-		(strcmp($sort, "data_size")!=0) &&
-		(strcmp($sort, "index_size")!=0) &&
-		(strcmp($sort, "total_size")!=0)  &&
-		(strcmp($sort, "rows")!=0) &&
-		(strcmp($sort, "size_per_row")!=0)
+	if ((strcmp($sort, "name") != 0) &&
+		(strcmp($sort, "data_size") != 0) &&
+		(strcmp($sort, "index_size") != 0) &&
+		(strcmp($sort, "total_size") != 0) &&
+		(strcmp($sort, "rows") != 0) &&
+		(strcmp($sort, "size_per_row") != 0)
     ) {
 		$sort = "name";
     }
-	if (empty($r)) $r=0;
+	if (empty($r)) $r = 0;
 
-	for ($i=0; $i < sizeof($db_rec)-1; $i++){
+	for ($i = 0; $i < sizeof($db_rec) - 1; $i++) {
 		$file_details["name"]         = $db_rec[$i]->name;
 		$file_details["data_size"]    = $db_rec[$i]->data_size;
 		$file_details["index_size"]   = $db_rec[$i]->index_size;
 		$file_details["total_size"]   = $db_rec[$i]->total_size;
-	    $file_details["rows"]         = $db_rec[$i]->rows;
+	    $file_details["rows"] = $db_rec[$i]->rows;
 		$file_details["size_per_row"] = $db_rec[$i]->size_per_row;
 
 		$file_list[$i] = $file_details;
@@ -197,35 +197,35 @@ 
 	echo "</tr>";
 
 	echo "<tr>";
-	echo "<th><a href='dbinfo.php?sort=name&r=" . (!$r) . "'>Table </a></th>";
-	echo "<th><a href='dbinfo.php?sort=data_size&r=" . (!$r) . "'>Data Size</a></th>";
-	echo "<th><a href='dbinfo.php?sort=index_size&r=" . (!$r) . "'>Index Size</a></th>";
-	echo "<th><a href='dbinfo.php?sort=total_size&r=" . (!$r) . "'>Total Size</a></th>";
-	echo "<th><a href='dbinfo.php?sort=rows&r=" . (!$r) . "'>Total Rows</a></th>";
-	echo "<th><a href='dbinfo.php?sort=size_per_row&r=" . (!$r) . "'>Avg. Size per Row</a></th>";
+	echo "<th><a href='dbinfo.php?sort=name&r=".(!$r)."'>Table </a></th>";
+	echo "<th><a href='dbinfo.php?sort=data_size&r=".(!$r)."'>Data Size</a></th>";
+	echo "<th><a href='dbinfo.php?sort=index_size&r=".(!$r)."'>Index Size</a></th>";
+	echo "<th><a href='dbinfo.php?sort=total_size&r=".(!$r)."'>Total Size</a></th>";
+	echo "<th><a href='dbinfo.php?sort=rows&r=".(!$r)."'>Total Rows</a></th>";
+	echo "<th><a href='dbinfo.php?sort=size_per_row&r=".(!$r)."'>Avg. Size per Row</a></th>";
 	echo "</tr>";
 
     foreach ($file_sort as $key=>$value) {
 		$value = $file_list[$key];
 
 		echo "<tr>";
-		echo "<td align=left valign=top class=fieldname>" . $value["name"] . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($value["data_size"])  . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($value["index_size"]) . "</td>";
-		echo "<td align=left valign=top class=fieldname>" . size_format($value["total_size"]) . "</td>";
-        echo "<td align=left valign=top class=fieldname>" . number_format($value["rows"])     . "</td>";
-        echo "<td align=left valign=top class=fieldname>" . size_format($value["size_per_row"]) . "</td>";
+		echo "<td align=left valign=top class=fieldname>".$value["name"]."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($value["data_size"])."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($value["index_size"])."</td>";
+		echo "<td align=left valign=top class=fieldname>".size_format($value["total_size"])."</td>";
+        echo "<td align=left valign=top class=fieldname>".number_format($value["rows"])."</td>";
+        echo "<td align=left valign=top class=fieldname>".size_format($value["size_per_row"])."</td>";
 		echo "</tr>";
 	}
 
 	// Last record is a summary
-	$i = sizeof($db_rec)-1;
+	$i = sizeof($db_rec) - 1;
 	echo "<tr>";
-    echo "<th align=left>" . $db_rec[$i]->name . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->data_size)  . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->index_size) . "</th>";
-    echo "<th align=left>" . size_format($db_rec[$i]->total_size) . "</th>";
-    echo "<th align=left>" . number_format($db_rec[$i]->rows)     . "</th>";
+    echo "<th align=left>".$db_rec[$i]->name."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->data_size)."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->index_size)."</th>";
+    echo "<th align=left>".size_format($db_rec[$i]->total_size)."</th>";
+    echo "<th align=left>".number_format($db_rec[$i]->rows)."</th>";
     echo "<th align=left></th>";
 	echo "</tr>";
 

html/inc/email.inc

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 
 // send an email, using PHPMailer or not.
 //
-function send_email($user, $subject, $body, $body_html=null, $email_addr=null) {
+function send_email($user, $subject, $body, $body_html = null, $email_addr = null) {
     if (!$email_addr) {
         $email_addr = $user->email_addr;
     }
@@ -63,17 +63,17 @@ 
             return true;
         }
     } else {
-        $headers ="";
+        $headers = "";
         if (defined('EMAIL_FROM') && defined('EMAIL_FROM_NAME')) {
             $headers = "From: ".EMAIL_FROM_NAME." <".EMAIL_FROM.">";
         } else if (defined('EMAIL_FROM')) {
-            $headers = "From: ". EMAIL_FROM;
+            $headers = "From: ".EMAIL_FROM;
         }
         if ($body_html) {
             $body = "<html><body>\n";
             $body .= $body_html;
             $body .= "\n</body></html>\n";
-            $headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";
+            $headers .= 'Content-type: text/html; charset=UTF-8'."\r\n";
         }
         return mail($email_addr, $subject, $body, $headers);
     }
@@ -148,7 +148,7 @@ 
     if (defined("USE_STOPFORUMSPAM") && USE_STOPFORUMSPAM && array_key_exists('REMOTE_ADDR', $_SERVER)) {
         $ip = $_SERVER['REMOTE_ADDR'];
         // For obviously private IPs check just the email against SFS, otherwise check both IP and email
-        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE|FILTER_FLAG_NO_RES_RANGE)) {
             $x = @file_get_contents("https://www.stopforumspam.com/api?ip=".$ip."&email=".$addr);
         } else {
             $x = @file_get_contents("https://www.stopforumspam.com/api?email=".$addr);
@@ -159,7 +159,7 @@ 
     }
     $pattern = '/^([^@]+)@([^@\.]+)\.([^@]{2,})$/';
     $match = preg_match($pattern, $addr);
-    return (bool) $match;
+    return (bool)$match;
 }
 
 function send_confirm_delete_email($user) {
@@ -187,7 +187,7 @@ 
     return md5($key.'oogabooga');
 }
 
-function opt_out_url($user, $page="opt_out.php") {
+function opt_out_url($user, $page = "opt_out.php") {
     return sprintf("%s%s?code=%s&userid=%d",
         secure_url_base(),
         $page,

html/user/submit.php

Spacing +7 added lines, -7 removed lines

@@ -365,11 +365,11 @@ 
 function progress_bar($batch, $wus, $width) {
     $w_success = $width*$batch->fraction_done;
     $w_fail = $width*$batch->nerror_jobs/$batch->njobs;
-    $nsuccess = $batch->njobs * $batch->fraction_done;
+    $nsuccess = $batch->njobs*$batch->fraction_done;
     $nsent = wus_nsent($wus);
     $nprog = $nsent - $nsuccess - $batch->nerror_jobs;
     $w_prog = $width*$nprog/$batch->njobs;
-    $nunsent = $batch->njobs-$nsent;
+    $nunsent = $batch->njobs - $nsent;
     $w_unsent = $width*$nunsent/$batch->njobs;
     $x = '<table height=20><tr>';
     if ($w_fail) {
@@ -407,7 +407,7 @@ 
     page_head("Batch $batch_id");
     start_table();
     row2("name", $batch->name);
-    row2("application", $app?$app->name:'---');
+    row2("application", $app ? $app->name : '---');
     row2("state", batch_state_string($batch->state));
     //row2("# jobs", $batch->njobs);
     //row2("# error jobs", $batch->nerror_jobs);
@@ -454,7 +454,7 @@ 
         "Canonical instance<br><small>click to see result page on BOINC server</smallp>",
         "Download Results"
     );
-    foreach($wus as $wu) {
+    foreach ($wus as $wu) {
         $resultid = $wu->canonical_resultid;
         if ($resultid) {
             $x = "<a href=result.php?resultid=$resultid>$resultid</a>";
@@ -465,7 +465,7 @@ 
             $text = "---";
             if ($batch->state == BATCH_STATE_COMPLETE) {
                 $y = '<font color="red">failed</font>';
-            }   else {
+            } else {
                 $y = "in progress";
             }
         }
@@ -530,7 +530,7 @@ 
     $results = BoincResult::enum("workunitid=$wuid");
     $upload_dir = parse_config(get_config(), "<upload_dir>");
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
-    foreach($results as $result) {
+    foreach ($results as $result) {
         echo "<tr>
             <td><a href=result.php?resultid=$result->id>$result->id &middot; $result->name </a></td>
             <td>".state_string($result)."</td>
@@ -540,7 +540,7 @@ 
         if ($result->server_state == 5) {
             $phys_names = get_outfile_names($result);
             $log_names = get_outfile_log_names($result);
-            for ($i=0; $i<count($phys_names); $i++) {
+            for ($i = 0; $i < count($phys_names); $i++) {
                 $url = sprintf(
                     'get_output2.php?cmd=result&result_id=%d&file_num=%d',
                     $result->id, $i

html/user/lammps.php

Spacing +74 added lines, -74 removed lines

@@ -17,7 +17,7 @@ 
 
 display_errors();
 
-$debug=0;
+$debug = 0;
 
 // test a LAMMPS job
 //
@@ -30,17 +30,17 @@ 
 // output: success flag, CPU time per step, est. disk usage per job
 //
 function terminate_job($p) {
-    $pstatus=proc_get_status($p);
-    $ppid=$pstatus['pid'];
-    $ret=`ps -o pid --no-heading --ppid $ppid`;
+    $pstatus = proc_get_status($p);
+    $ppid = $pstatus['pid'];
+    $ret = `ps -o pid --no-heading --ppid $ppid`;
     //echo "parent pid is $ppid\nterninate it\n";
      proc_terminate($p);
     // echo "child process is $ret\n";
-    $pids=preg_split('/\s+/',$ret);
-    foreach($pids as $pid){
-        if(is_numeric($pid)){
-            if($GLOBALS["debug"])echo "killing child process $pid\n";
-            posix_kill($pid,9);
+    $pids = preg_split('/\s+/', $ret);
+    foreach ($pids as $pid) {
+        if (is_numeric($pid)) {
+            if ($GLOBALS["debug"])echo "killing child process $pid\n";
+            posix_kill($pid, 9);
         }
     }
 }
@@ -51,23 +51,23 @@ 
     $descs = array();
     $pipes = array();
     $options = file("cmd_variables");
-    $options[0] = chop($options[0],"\n");
+    $options[0] = chop($options[0], "\n");
     $cmd = "../lmp_linux ".$options[0]."&>output";
     if ($GLOBALS["debug"]) echo $cmd."<br>";
     system("unzip pot_files >/dev/null");
     $stime = time();
     $p = proc_open("$cmd", $descs, $pipes);
     while (1) {
-        $ctime=time();
-        if($ctime-$stime >=2 and ! file_exists("log.1")){
-           if($GLOBALS["debug"]) echo "time out "."<br>";
+        $ctime = time();
+        if ($ctime - $stime >= 2 and !file_exists("log.1")) {
+           if ($GLOBALS["debug"]) echo "time out "."<br>";
            terminate_job($p);
            break;
         }
         if (file_exists("log.1")) {
             list($avg_cpu, $test_steps) = calc_step_cpu("log.1");
             if ($avg_cpu != 0) {
-                if($GLOBALS["debug"])echo "avg_cpu is ".$avg_cpu."<br>";
+                if ($GLOBALS["debug"])echo "avg_cpu is ".$avg_cpu."<br>";
                 terminate_job($p);
                 $test_result = 1;
                 break;
@@ -86,32 +86,32 @@ 
 }
 
 function get_total_steps($cmd_file) {
-    $fd = fopen($cmd_file,"r");
+    $fd = fopen($cmd_file, "r");
     if (!$fd) {
         echo "can not open file $cmd_file\n";
         exit(-1);
     }
     $this_loopno = 1;
     $this_looprun = 1;
-    $total_steps=1;
+    $total_steps = 1;
     while (!feof($fd)) {
-        $line = fgets($fd,4096);
+        $line = fgets($fd, 4096);
         if (preg_match("/loopnumber\s+\d+/", $line, $matches)
             && preg_match("/\d+/", $matches[0], $no)
         ) {
-            $this_loopno=$no[0];
+            $this_loopno = $no[0];
         }
         if (preg_match("/looprun\s+\d+/", $line, $matches)
             and preg_match("/\d+/", $matches[0], $no)
         ) {
-            $this_looprun=$no[0];
-            if($this_loopno*$this_looprun>$total_steps)$total_steps=$this_loopno*$this_looprun;
+            $this_looprun = $no[0];
+            if ($this_loopno*$this_looprun > $total_steps)$total_steps = $this_loopno*$this_looprun;
         }
 
     }
     fclose($fd);
     //$total_steps = $loopno*$looprun;
-     if($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>";
+     if ($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>";
     return $total_steps;
 }
 
@@ -129,8 +129,8 @@ 
     }
     $count = 0;
     while (!feof($fd)) {
-        $line = fgets($fd,4096);
-        if (preg_match('/^Step\s+CPU/',$line)) {
+        $line = fgets($fd, 4096);
+        if (preg_match('/^Step\s+CPU/', $line)) {
             //echo $line."\n";
             $start = 1;
             continue;
@@ -139,24 +139,24 @@ 
         $arr = preg_split("/\s+/", $line);
         //print_r($arr);
 
-        if (count($arr) <=6 || !is_numeric($arr[1])) {
+        if (count($arr) <= 6 || !is_numeric($arr[1])) {
             continue;
         }
         $step = (int)$arr[1];
         $cpu = (float)$arr[2];
         //echo "step=".$step." cpu=".$cpu."\n";
-        if ($cpu==0) {
-           $count=0;
+        if ($cpu == 0) {
+           $count = 0;
            $start_step = $step;
         } else {
-            $count+=1;
-            if($GLOBALS["debug"])echo "step=".$step." cpu=".$cpu."count=".$count."<br>";
-           if($count >= 10) {
+            $count += 1;
+            if ($GLOBALS["debug"])echo "step=".$step." cpu=".$cpu."count=".$count."<br>";
+           if ($count >= 10) {
                 $end_step = $step;
-                $steps = $end_step-$start_step;
+                $steps = $end_step - $start_step;
                 $avg_cpu = $cpu/$steps;
                 #$avg_cpu = $cpu/$count;
-                if ($GLOBALS["debug"]){
+                if ($GLOBALS["debug"]) {
                     echo "test steps is ".$steps."<br>";
                     echo "avg_cpu is ".$avg_cpu."<br>";
                 }
@@ -165,56 +165,56 @@ 
             }
         }
     }
-    return array($avg_cpu,$test_steps);
+    return array($avg_cpu, $test_steps);
 }
 
-function calc_est_size($lammps_script, $structure_file, $cmd_file,$test_steps){
+function calc_est_size($lammps_script, $structure_file, $cmd_file, $test_steps) {
     $dump_types = 0;
-    $fd = fopen($lammps_script,"r");
-    if (!$fd){
+    $fd = fopen($lammps_script, "r");
+    if (!$fd) {
         echo "can not open file $lammps_script\n";
         exit(-1);
     }
-    while (!feof($fd)){
+    while (!feof($fd)) {
         $line = fgets($fd, 4096);
         //if (preg_match("/^\s*dump/", $line)
         //    and preg_match_all("/dump\S+\.\w{3}/", $line, $matches, PREG_PATTERN_ORDER))
 
-        if(preg_match("/^\s*dump\s+(\d)\s+/", $line,$matches))
+        if (preg_match("/^\s*dump\s+(\d)\s+/", $line, $matches))
         {
-             if($GLOBALS["debug"]){print "matches=";print_r($matches);}
+             if ($GLOBALS["debug"]) {print "matches="; print_r($matches); }
 
-            $dump_types=(int)$matches[1];
+            $dump_types = (int)$matches[1];
             break;
         }
     }
     fclose($fd);
-    if($GLOBALS["debug"])print "dump_types= ".$dump_types."<br>";
+    if ($GLOBALS["debug"])print "dump_types= ".$dump_types."<br>";
 
     $structure_file_size = filesize($structure_file);
-    $fd = fopen($cmd_file,"r");
-    if (!$fd){
+    $fd = fopen($cmd_file, "r");
+    if (!$fd) {
         echo "can not open file $cmd_file\n";
         exit(-1);
     }
-     if($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>";
-
-    $loopno=1;
-    $looprun=1;
-    while (!feof($fd)){
-        $line = fgets($fd,4096);
-        if(preg_match("/loopnumber\s+\d+/", $line, $matches)){
-            if(preg_match("/\d+/", $matches[0], $no)){
+     if ($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>";
+
+    $loopno = 1;
+    $looprun = 1;
+    while (!feof($fd)) {
+        $line = fgets($fd, 4096);
+        if (preg_match("/loopnumber\s+\d+/", $line, $matches)) {
+            if (preg_match("/\d+/", $matches[0], $no)) {
                 //$loopno=$no[0];
-                if($no[0]>$loopno)$loopno=$no[0];
+                if ($no[0] > $loopno)$loopno = $no[0];
             }
         }
         if (preg_match("/looprun\s+\d+/", $line, $matches) and preg_match("/\d+/", $matches[0], $no)) {
-            if($no[0]>$looprun)$looprun=$no[0];
+            if ($no[0] > $looprun)$looprun = $no[0];
         }
     }
     fclose($fd);
-    if($GLOBALS["debug"]){
+    if ($GLOBALS["debug"]) {
          print "max loopno(number of loops to run)=".$loopno."<br>";
          print "max looprun(steps for each loop)=".$looprun."<br>";
     }
@@ -225,12 +225,12 @@ 
     $dump_files = glob("dump1*");
     $test_dump_file = $dump_files[0];
     $test_dump_size = filesize($test_dump_file);
-    $dump_size1 = $test_dump_size+0.5*$test_dump_size*ceil(($looprun-$test_steps)/$test_steps);
+    $dump_size1 = $test_dump_size + 0.5*$test_dump_size*ceil(($looprun - $test_steps)/$test_steps);
     $dump_size = $loopno*$dump_size1*$dump_types;
     $app_fixed_size = 5e7;
-    $est_size = $log_size+$dump_size+$app_fixed_size;
+    $est_size = $log_size + $dump_size + $app_fixed_size;
 
-    if($GLOBALS["debug"]){
+    if ($GLOBALS["debug"]) {
         print "test_steps=".$test_steps."<br>";
         print "test_log_size=".$test_log_size."<br>";
         print "log_size1=".$log_size1."<br>";
@@ -321,7 +321,7 @@ 
     if ($njobs < $nhosts) {
         return $flops_per_job/$median_flops;
     } else {
-        $k = (int)(($njobs+$nhosts-1)/$nhosts);
+        $k = (int)(($njobs + $nhosts - 1)/$nhosts);
         return $k*$flops_per_job/$median_flops;
     }
 }
@@ -361,27 +361,27 @@ 
     if ($GLOBALS["debug"]) {
         print "est_cpu_time is ".$est_cpu_time."<br>";
     }
-    if ($error==0) {
-        $err_msgs=file("output");
-        $err="Your test job <strong>failed</strong>
+    if ($error == 0) {
+        $err_msgs = file("output");
+        $err = "Your test job <strong>failed</strong>
             <br>Please refer to the following Error Message:<br><p>
         ";
-        foreach($err_msgs as $line){
-             $err=$err.$line."<br>";
+        foreach ($err_msgs as $line) {
+             $err = $err.$line."<br>";
         }
-        $err=$err." <p>
+        $err = $err." <p>
             <a href=sandbox.php><strong> File_Sandbox </strong></a>
         ";
         error_page($err);
     }
 
     system("rm *");
-    $info->rsc_fpops_est = $est_cpu_time * 1.5e9;
-    $info->rsc_fpops_bound = $info->rsc_fpops_est * 20;
+    $info->rsc_fpops_est = $est_cpu_time*1.5e9;
+    $info->rsc_fpops_bound = $info->rsc_fpops_est*20;
 
-    if ($disk==0){
-        $info->rsc_disk_bound=1000000;
-    } else{
+    if ($disk == 0) {
+        $info->rsc_disk_bound = 1000000;
+    } else {
         $info->rsc_disk_bound = $disk;
     }
 
@@ -392,7 +392,7 @@ 
     //
     $njobs = count(file($cmdline_file_path));
     $secs_est = estimated_makespan($njobs, $info->rsc_fpops_est);
-     if($GLOBALS["debug"])echo "secs_est is $secs_est\n";
+     if ($GLOBALS["debug"])echo "secs_est is $secs_est\n";
     //assume the server's flops is 1.5G and the average client's flops is 1G
     $hrs_est = number_format($secs_est*1.5/60, 2);
     //$hrs_est = number_format($secs_est, 2);
@@ -416,8 +416,8 @@ 
 }
 
 function submit_job($app, $batch_id, $info, $cmdline, $i) {
-    $client_disk=$info->rsc_disk_bound*2;
-    if($client_disk<500000000) $client_disk=500000000;
+    $client_disk = $info->rsc_disk_bound*2;
+    if ($client_disk < 500000000) $client_disk = 500000000;
     $cmd = "cd ../..; ./bin/create_work --appname $app->name --batch $batch_id --rsc_fpops_est $info->rsc_fpops_est --rsc_fpops_bound $info->rsc_fpops_bound --rsc_disk_bound $client_disk";
     if ($cmdline) {
         $cmd .= " --command_line \"$cmdline\"";
@@ -441,9 +441,9 @@ 
     $x = file_get_contents("$tmpfile");
     $info = unserialize($x);
 
-    $njobs=0;
+    $njobs = 0;
     $cmdlines = file($info->cmdline_file_path);
-    foreach ($cmdlines as $cmdline){
+    foreach ($cmdlines as $cmdline) {
         if (preg_match("/^\s*-var/", $cmdline)) {
             $njobs++;
         }
@@ -459,7 +459,7 @@ 
 
     $i = 0;
     foreach ($cmdlines as $cmdline) {
-        if (preg_match("/^\s*-var/", $cmdline)){
+        if (preg_match("/^\s*-var/", $cmdline)) {
             submit_job($app, $batch_id, $info, $cmdline, $i);
             $i++;
         }

html/user/tree_threader.php

Spacing +8 added lines, -8 removed lines

@@ -18,7 +18,7 @@ 
 display_errors();
 
 $app_name = "treeThreader";
-$log = fopen("/tmp/tt_job.log","a+");
+$log = fopen("/tmp/tt_job.log", "a+");
 
 function error($s) {
     echo "<error>\n<message>$s</message>\n</error>\n";
@@ -26,14 +26,14 @@ 
 }
 
 function handle_submit($r, $user, $app) {
-    global $app_name,$log;
+    global $app_name, $log;
 
-    $timestamp = date("Y-m-d H:i",time());
+    $timestamp = date("Y-m-d H:i", time());
 	// read the list of template filenames
 	//
 	$files = file("../../tree_threader_template_files");
 	if ($files === false) {
-        fwrite($log,"$timestamp\ttemplate file tree_threader_template_files\n");
+        fwrite($log, "$timestamp\ttemplate file tree_threader_template_files\n");
         error("no templates file");
 
     }
@@ -90,7 +90,7 @@ 
 //
 function handle_get_output($r, $batch) {
     global $log;
-    $timestamp = date("Y-m-d H:i",time());
+    $timestamp = date("Y-m-d H:i", time());
 	$wus = BoincWorkUnit::enum("batch=$batch->id");
 	$outdir = "/tmp/treeThreader_result_".$batch->id;
     @mkdir($outdir);
@@ -129,14 +129,14 @@ 
 		error("can't zip output files");
 	}
 	$fname = "treeThreader_result_".$batch->id.".zip";
-    $treeThreader_dir="treeThreaderResult";
-    if(!is_dir("../../download/$treeThreader_dir"))mkdir("../../download/$treeThreader_dir");
+    $treeThreader_dir = "treeThreaderResult";
+    if (!is_dir("../../download/$treeThreader_dir"))mkdir("../../download/$treeThreader_dir");
 	@symlink("/tmp/$fname", "../../download/$treeThreader_dir/$fname");
     system("rm -fr $outdir");
     $config = simplexml_load_string(file_get_contents("../../config.xml"));
     $download_url = trim((string)$config->config->download_url);
 	echo "<tt_reply>\n<url>$download_url/$treeThreader_dir/$fname</url>\n</tt_reply>\n";
-    $log_msg="$timestamp\tuser $batch->user_id downloads results for batch $batch->id : $download_url/$treeThreader_dir/$fname\n";
+    $log_msg = "$timestamp\tuser $batch->user_id downloads results for batch $batch->id : $download_url/$treeThreader_dir/$fname\n";
     fwrite($log, $log_msg);
 }