BOINC / boinc

html/user/cert_team.php

Spacing +4 added lines, -4 removed lines

@@ -27,10 +27,10 @@ 
 if (DISABLE_TEAMS) error_page("Teams are disabled");
 
 $border = get_str("border", true);
-if ($border=="no") {
-    $border=0;
+if ($border == "no") {
+    $border = 0;
 } else {
-    $border=8;
+    $border = 8;
 }
 
 // Make sure user_id is in the URL so that share functions work
@@ -39,7 +39,7 @@ 
 if (!$user_id) {
     $user = get_logged_in_user();
     Header(sprintf('Location: %s/cert_team.php?user_id=%d%s',
-        url_base(), $user->id, $border==0?'&border=no':''
+        url_base(), $user->id, $border == 0 ? '&border=no' : ''
     ));
     exit;
 }

html/user/cert1.php

Spacing +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@ 
 require_once("../inc/cert.inc");
 
 $border = get_str("border", true);
-if ($border=="no") {
-    $border=0;
+if ($border == "no") {
+    $border = 0;
 } else {
-    $border=8;
+    $border = 8;
 }
 
 // Make sure user_id is in the URL so that share functions work
@@ -36,7 +36,7 @@ 
 if (!$user_id) {
     $user = get_logged_in_user();
     Header(sprintf('Location: %s/cert1.php?user_id=%d%s',
-        url_base(), $user->id, $border==0?'&border=no':''
+        url_base(), $user->id, $border == 0 ? '&border=no' : ''
     ));
     exit;
 }

html/user/cert_all.php

Spacing +5 added lines, -5 removed lines

@@ -25,10 +25,10 @@ 
 require_once("../inc/user.inc");
 
 $border = get_str("border", true);
-if ($border=="no") {
-    $border=0;
+if ($border == "no") {
+    $border = 0;
 } else {
-    $border=8;
+    $border = 8;
 }
 
 // Make sure user_id is in the URL so that share functions work
@@ -37,7 +37,7 @@ 
 if (!$user_id) {
     $user = get_logged_in_user();
     Header(sprintf('Location: %s/cert_all.php?user_id=%d%s',
-        url_base(), $user->id, $border==0?'&border=no':''
+        url_base(), $user->id, $border == 0 ? '&border=no' : ''
     ));
     exit;
 }
@@ -91,7 +91,7 @@ 
     <tr><th align=left>Project</th><th align=left>Cobblestones</th><th align=left>Joined</th></tr>
 ";
 foreach ($user->projects as $p) {
-    if ($p->total_credit<100) continue;
+    if ($p->total_credit < 100) continue;
     show_proj($p);
 }
 echo "

html/inc/delete_account.inc

Spacing +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
 if (!defined("DELETE_DELAY")) define("DELETE_DELAY", 2);
 
 function is_delete_account_token_valid($userid, $token) {
-    if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT) ) {
+    if (!is_valid_token($userid, $token, TOKEN_TYPE_DELETE_ACCOUNT)) {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         return false;
     }
@@ -126,7 +126,7 @@ 
 //
 function is_over_but_not_validated($res) {
     if ($res->server_state == RESULT_SERVER_STATE_OVER && $res->outcome == RESULT_OUTCOME_SUCCESS &&
-            ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE) ) {
+            ($res->validate_state == VALIDATE_STATE_INIT || $res->validate_state == VALIDATE_STATE_INCONCLUSIVE)) {
         return true;
     }
     return false;
@@ -144,8 +144,8 @@ 
 //
 function cancel_results_for_user($user) {
     $ress = BoincResult::enum("userid = $user->id");
-    $cancel_clause="server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID;
-    $set_id_clause="hostid=0, userid=0";
+    $cancel_clause = "server_state=".RESULT_SERVER_STATE_OVER.", outcome=".RESULT_OUTCOME_CLIENT_DETACHED.", validate_state=".VALIDATE_STATE_INVALID;
+    $set_id_clause = "hostid=0, userid=0";
     foreach ($ress as $res) {
         if (is_in_progress($res) || is_over_but_not_validated($res)) {
             $res->update($cancel_clause.", ".$set_id_clause);
@@ -168,12 +168,12 @@ 
 
     // delete remote submit user
     //
-    delete_remote_submit_user($user);  // from submit_util.inc
+    delete_remote_submit_user($user); // from submit_util.inc
 
     // remove user's team records
     //
-    user_erase_team_owner($user);      // from team.inc
-    user_quit_team($user);        // from team.inc
+    user_erase_team_owner($user); // from team.inc
+    user_quit_team($user); // from team.inc
     user_erase_team_delta($user); // from team.inc
 
     // Items that do not have logic elsewhere
@@ -200,6 +200,6 @@ 
     BoincTeamAdmin::delete("userid=$user->id");
 
     // final action
-    delete_user($user);  //from user_util.inc
+    delete_user($user); //from user_util.inc
     return 0;
 }

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

html/inc/common_defs.inc

Spacing +57 added lines, -57 removed lines

@@ -27,74 +27,74 @@
 define('BATCH_STATE_RETIRED', 4);
 
 define('ANON_PLATFORM_UNKNOWN', -1);
-define('ANON_PLATFORM_CPU',     -2);
-define('ANON_PLATFORM_NVIDIA',  -3);
-define('ANON_PLATFORM_ATI',     -4);
-define('ANON_PLATFORM_INTEL_GPU',   -5);
-define('ANON_PLATFORM_APPLE_GPU',   -6);
+define('ANON_PLATFORM_CPU', -2);
+define('ANON_PLATFORM_NVIDIA', -3);
+define('ANON_PLATFORM_ATI', -4);
+define('ANON_PLATFORM_INTEL_GPU', -5);
+define('ANON_PLATFORM_APPLE_GPU', -6);
 
-define('RESULT_SERVER_STATE_INACTIVE',       1);
-define('RESULT_SERVER_STATE_UNSENT',         2);
-define('RESULT_SERVER_STATE_IN_PROGRESS',    4);
-define('RESULT_SERVER_STATE_OVER',           5);
+define('RESULT_SERVER_STATE_INACTIVE', 1);
+define('RESULT_SERVER_STATE_UNSENT', 2);
+define('RESULT_SERVER_STATE_IN_PROGRESS', 4);
+define('RESULT_SERVER_STATE_OVER', 5);
 
-define('RESULT_OUTCOME_INIT',             0);
-define('RESULT_OUTCOME_SUCCESS',          1);
-define('RESULT_OUTCOME_COULDNT_SEND',     2);
-define('RESULT_OUTCOME_CLIENT_ERROR',     3);
-define('RESULT_OUTCOME_NO_REPLY',         4);
-define('RESULT_OUTCOME_DIDNT_NEED',       5);
-define('RESULT_OUTCOME_VALIDATE_ERROR',   6);
-define('RESULT_OUTCOME_CLIENT_DETACHED',  7);
+define('RESULT_OUTCOME_INIT', 0);
+define('RESULT_OUTCOME_SUCCESS', 1);
+define('RESULT_OUTCOME_COULDNT_SEND', 2);
+define('RESULT_OUTCOME_CLIENT_ERROR', 3);
+define('RESULT_OUTCOME_NO_REPLY', 4);
+define('RESULT_OUTCOME_DIDNT_NEED', 5);
+define('RESULT_OUTCOME_VALIDATE_ERROR', 6);
+define('RESULT_OUTCOME_CLIENT_DETACHED', 7);
 
-define('VALIDATE_STATE_INIT',        0);
-define('VALIDATE_STATE_VALID',       1);
-define('VALIDATE_STATE_INVALID',     2);
-define('VALIDATE_STATE_NO_CHECK',    3);
-define('VALIDATE_STATE_INCONCLUSIVE',4);
-define('VALIDATE_STATE_TOO_LATE',    5);
+define('VALIDATE_STATE_INIT', 0);
+define('VALIDATE_STATE_VALID', 1);
+define('VALIDATE_STATE_INVALID', 2);
+define('VALIDATE_STATE_NO_CHECK', 3);
+define('VALIDATE_STATE_INCONCLUSIVE', 4);
+define('VALIDATE_STATE_TOO_LATE', 5);
 
-define('WU_ERROR_COULDNT_SEND_RESULT',           1);
-define('WU_ERROR_TOO_MANY_ERROR_RESULTS',        2);
-define('WU_ERROR_TOO_MANY_SUCCESS_RESULTS',      4);
-define('WU_ERROR_TOO_MANY_TOTAL_RESULTS',        8);
-define('WU_ERROR_CANCELLED',                     16);
-define('WU_ERROR_NO_CANONICAL_RESULT',           32);
+define('WU_ERROR_COULDNT_SEND_RESULT', 1);
+define('WU_ERROR_TOO_MANY_ERROR_RESULTS', 2);
+define('WU_ERROR_TOO_MANY_SUCCESS_RESULTS', 4);
+define('WU_ERROR_TOO_MANY_TOTAL_RESULTS', 8);
+define('WU_ERROR_CANCELLED', 16);
+define('WU_ERROR_NO_CANONICAL_RESULT', 32);
 
-define('FILE_DELETE_INIT',       0);
-define('FILE_DELETE_READY',      1);
-define('FILE_DELETE_DONE',       2);
-define('FILE_DELETE_ERROR',      3);
+define('FILE_DELETE_INIT', 0);
+define('FILE_DELETE_READY', 1);
+define('FILE_DELETE_DONE', 2);
+define('FILE_DELETE_ERROR', 3);
 
-define('ASSIMILATE_INIT',       0);
-define('ASSIMILATE_READY',      1);
-define('ASSIMILATE_DONE',       2);
+define('ASSIMILATE_INIT', 0);
+define('ASSIMILATE_READY', 1);
+define('ASSIMILATE_DONE', 2);
 
 // from lib/common_defs.h
 //
-define('RESULT_NEW',                 0);
-define('RESULT_FILES_DOWNLOADING',   1);
-define('RESULT_FILES_DOWNLOADED',    2);
-define('RESULT_COMPUTE_ERROR',       3);
-define('RESULT_FILES_UPLOADING',     4);
-define('RESULT_FILES_UPLOADED',      5);
-define('RESULT_ABORTED',             6);
-define('RESULT_UPLOAD_FAILED',       7);
+define('RESULT_NEW', 0);
+define('RESULT_FILES_DOWNLOADING', 1);
+define('RESULT_FILES_DOWNLOADED', 2);
+define('RESULT_COMPUTE_ERROR', 3);
+define('RESULT_FILES_UPLOADING', 4);
+define('RESULT_FILES_UPLOADED', 5);
+define('RESULT_ABORTED', 6);
+define('RESULT_UPLOAD_FAILED', 7);
 
 // from lib/error_numbers.h
 // returned by some web RPCs
 //
-define('ERR_XML_PARSE',               -112);
-define('ERR_DB_NOT_FOUND',            -136);
-define('ERR_DB_NOT_UNIQUE',           -137);
-define('ERR_DB_CANT_CONNECT',         -138);
-define('ERR_PROJECT_DOWN',            -183);
-define('ERR_BAD_USER_NAME',           -188);
-define('ERR_NO_OPTION',               -191);
-define('ERR_BAD_EMAIL_ADDR',          -205);
-define('ERR_BAD_PASSWD',              -206);
-define('ERR_ACCT_CREATION_DISABLED',  -208);
-define('ERR_ATTACH_FAIL_INIT',        -209);
-define('ERR_ATTACH_FAIL_DOWNLOAD',    -210);
-define('ERR_ACCT_REQUIRE_CONSENT',    -242);
+define('ERR_XML_PARSE', -112);
+define('ERR_DB_NOT_FOUND', -136);
+define('ERR_DB_NOT_UNIQUE', -137);
+define('ERR_DB_CANT_CONNECT', -138);
+define('ERR_PROJECT_DOWN', -183);
+define('ERR_BAD_USER_NAME', -188);
+define('ERR_NO_OPTION', -191);
+define('ERR_BAD_EMAIL_ADDR', -205);
+define('ERR_BAD_PASSWD', -206);
+define('ERR_ACCT_CREATION_DISABLED', -208);
+define('ERR_ATTACH_FAIL_INIT', -209);
+define('ERR_ATTACH_FAIL_DOWNLOAD', -210);
+define('ERR_ACCT_REQUIRE_CONSENT', -242);
 ?>