BOINC / boinc

html/ops/manage_user.php

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

@@ -141,7 +141,7 @@
     global $special_user_bitfield;
     $Nbf = sizeof($special_user_bitfield);
 
-    admin_page_head("Management $user->name");
+    admin_page_head("management $user->name");
 
     if (!defined("POST_REPORT_EMAILS")) {
         echo "<p><font color='RED'>

Spacing +24 added lines, -24 removed lines

@@ -39,8 +39,8 @@ 
 
 // Delete a user if they have no credit, results, or posts
 //
-function possibly_delete_user($user){
-    if ($user->total_credit > 0.0){
+function possibly_delete_user($user) {
+    if ($user->total_credit > 0.0) {
         admin_error_page("Cannot delete user: User has credit.");
     }
 
@@ -56,7 +56,7 @@ 
         admin_error_page("Cannot delete user: User has forum posts.");
     }
 
-    if ($user->teamid){
+    if ($user->teamid) {
         user_quit_team($user);
     }
     delete_user($user);
@@ -67,8 +67,8 @@ 
 function handle_special_user($user) {
     global $special_user_bitfield;
     $Nbf = sizeof($special_user_bitfield);
-    $bits="";
-    for ($i=0; $i<$Nbf; $i++) {
+    $bits = "";
+    for ($i = 0; $i < $Nbf; $i++) {
         $key = "special_user_$i";
         if (array_key_exists($key, $_POST) && $_POST[$key]) {
             $bits .= "1";
@@ -94,35 +94,35 @@ 
         );
     } else {
         if (is_numeric($dt)) {
-            $t = $dt>0 ? time()+$dt : 0;
+            $t = $dt > 0 ? time() + $dt : 0;
             $q = "UPDATE forum_preferences SET banished_until=$t WHERE userid=$user->id";
             _mysql_query($q);
 
             // put a timestamp in wiki to trigger re-validation of credentials
 
-            if (function_exists('touch_wiki_user')){
+            if (function_exists('touch_wiki_user')) {
                 touch_wiki_user($user);
             }
 
             // Send suspension e-mail to user and administrators
 
-            if ($dt>0) {
-                $subject = PROJECT." posting privileges suspended for ". $user->name;
+            if ($dt > 0) {
+                $subject = PROJECT." posting privileges suspended for ".$user->name;
                 $body = "
-Forum posting privileges for the " .PROJECT. " user \"".$user->name."\"
-have been suspended for " .time_diff($dt). " by ".$g_logged_in_user->name.".
+Forum posting privileges for the " .PROJECT." user \"".$user->name."\"
+have been suspended for " .time_diff($dt)." by ".$g_logged_in_user->name.".
 The reason given was:
 
 $reason
 
-The suspension will end at " .time_str($t)."\n";
+The suspension will end at ".time_str($t)."\n";
             } else {
-                $subject = PROJECT." user ". $user->name. " unsuspended";
+                $subject = PROJECT." user ".$user->name." unsuspended";
                 $body = "
-Forum posting privileges for the " .PROJECT. " user \"".$user->name."\"
+Forum posting privileges for the " .PROJECT." user \"".$user->name."\"
 have been restored by ".$g_logged_in_user->name."\n";
                 if ($reason) {
-                    $body.="The reason given was:\n\n   $reason\n";
+                    $body .= "The reason given was:\n\n   $reason\n";
                 }
             }
 
@@ -186,13 +186,13 @@ 
     row1("Special User Status");
 
     echo "<tr>\n";
-    for ($i=0; $i<$Nbf; $i++) {
+    for ($i = 0; $i < $Nbf; $i++) {
         $bit = substr($user->prefs->special_user, $i, 1);
         echo "<tr><td><input type='checkbox'' name='special_user_".$i."' value='1'";
         if ($bit == 1) {
             echo " checked='checked'";
         }
-        echo ">". $special_user_bitfield[$i] ."</td></tr>\n";
+        echo ">".$special_user_bitfield[$i]."</td></tr>\n";
     }
     echo "</tr>";
 
@@ -217,10 +217,10 @@ 
     if ($user->prefs->banished_until) {
         $dt = $user->prefs->banished_until - time();
         if ($dt > 0) {
-            $x = " Suspended until " . time_str($user->prefs->banished_until)
-                ."<br/> (Expires in " . time_diff($dt) .")" ;
+            $x = " Suspended until ".time_str($user->prefs->banished_until)
+                ."<br/> (Expires in ".time_diff($dt).")";
         } else {
-            $x = " last suspended " . time_str($user->prefs->banished_until);
+            $x = " last suspended ".time_str($user->prefs->banished_until);
         }
         row1($x);
     } else {
@@ -238,11 +238,11 @@ 
     ";
     echo "
         <input type='radio' name='suspend_for' value='172800'> 48 hours  <br/>
-        <input type='radio' name='suspend_for' value='",86400*7,"'> 1 week  <br/>
-        <input type='radio' name='suspend_for' value='",86400*14,"'> 2 weeks  <br/>
+        <input type='radio' name='suspend_for' value='",86400*7, "'> 1 week  <br/>
+        <input type='radio' name='suspend_for' value='",86400*14, "'> 2 weeks  <br/>
     ";
 
-    if ($dt>0) {
+    if ($dt > 0) {
         echo "
             <input type='radio' name='suspend_for' value='-1'>  <b>unsuspend</b>   <br/>";
     }
@@ -306,6 +306,6 @@ 
 
 show_manage_user_form($user);
 
-$cvs_version_tracker[]=        //Generated automatically - do not edit
+$cvs_version_tracker[] = //Generated automatically - do not edit
     "\$Id$";
 ?>

Braces +4 added lines, -4 removed lines

@@ -39,8 +39,8 @@ 
 
 // Delete a user if they have no credit, results, or posts
 //
-function possibly_delete_user($user){
-    if ($user->total_credit > 0.0){
+function possibly_delete_user($user) {
+    if ($user->total_credit > 0.0) {
         admin_error_page("Cannot delete user: User has credit.");
     }
 
@@ -56,7 +56,7 @@ 
         admin_error_page("Cannot delete user: User has forum posts.");
     }
 
-    if ($user->teamid){
+    if ($user->teamid) {
         user_quit_team($user);
     }
     delete_user($user);
@@ -100,7 +100,7 @@ 
 
             // put a timestamp in wiki to trigger re-validation of credentials
 
-            if (function_exists('touch_wiki_user')){
+            if (function_exists('touch_wiki_user')) {
                 touch_wiki_user($user);
             }
 

html/ops/manage_apps.php

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

@@ -49,7 +49,7 @@
     $n = post_str("fraction_done_exact", true)?1:0;
     $app->update("fraction_done_exact=$n");
 
-    echo "Application $id updated.
+    echo "application $id updated.
         <p>
         You must restart the project for this to take effect.
     ";

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,7 @@ 
     $app = BoincApp::lookup_id($id);
     if (!$app) admin_error_page("no such app");
 
-    $n = post_str("deprecated", true)?1:0;
+    $n = post_str("deprecated", true) ? 1 : 0;
     $app->update("deprecated=$n");
 
     $n = post_num("weight");
@@ -37,16 +37,16 @@ 
     $n = post_int("target_nresults");
     $app->update("target_nresults=$n");
 
-    $n = post_str("homogeneous_app_version", true)?1:0;
+    $n = post_str("homogeneous_app_version", true) ? 1 : 0;
     $app->update("homogeneous_app_version=$n");
 
-    $n = post_str("non_cpu_intensive", true)?1:0;
+    $n = post_str("non_cpu_intensive", true) ? 1 : 0;
     $app->update("non_cpu_intensive=$n");
 
-    $n = post_str("beta", true)?1:0;
+    $n = post_str("beta", true) ? 1 : 0;
     $app->update("beta=$n");
 
-    $n = post_str("fraction_done_exact", true)?1:0;
+    $n = post_str("fraction_done_exact", true) ? 1 : 0;
     $app->update("fraction_done_exact=$n");
 
     echo "Application $id updated.
@@ -58,7 +58,7 @@ 
 function add_app() {
     $name = BoincDb::escape_string(post_str('add_name'));
     $user_friendly_name = BoincDb::escape_string(post_str('add_user_friendly_name'));
-    if (empty($name) || empty($user_friendly_name) ) {
+    if (empty($name) || empty($user_friendly_name)) {
         admin_error_page(
             "To add a new application please supply both a brief name and a longer 'user-friendly' name.</font></p>"
         );
@@ -81,11 +81,11 @@ 
         <h2>Edit applications</h2>
     ";
 
-    $app_clause="deprecated=0";
-    $action_url="manage_apps.php";
-    if($all) {
+    $app_clause = "deprecated=0";
+    $action_url = "manage_apps.php";
+    if ($all) {
         $app_clause = "";
-        $action_url="manage_apps.php?all=1";
+        $action_url = "manage_apps.php?all=1";
         echo "<a href=\"manage_apps.php\">Don't show deprecated applications</a>";
     } else {
         echo "<a href=\"manage_apps.php?all=1\">Show deprecated applications</a>";
@@ -117,8 +117,8 @@ 
     $apps = BoincApp::enum($app_clause);
     foreach ($apps as $app) {
         // grey-out deprecated versions
-        $f1=$f2='';
-        if ($app->deprecated==1) {
+        $f1 = $f2 = '';
+        if ($app->deprecated == 1) {
             $f1 = "<font color='GREY'>";
             $f2 = "</font>";
         }
@@ -128,7 +128,7 @@ 
 
         echo "  <TD align='left'>$f1<a href=app_details.php?appid=$app->id>$app->name</a><br> $app->user_friendly_name $f2</TD>\n";
 
-        echo "  <TD align='center'>$f1 " .date_str($app->create_time)."$f2</TD>\n";
+        echo "  <TD align='center'>$f1 ".date_str($app->create_time)."$f2</TD>\n";
 
         $v = $app->weight;
         echo "  <TD align='center'>
@@ -151,7 +151,7 @@ 
         ";
 
         $v = '';
-        if ($app->homogeneous_app_version) $v=' CHECKED ';
+        if ($app->homogeneous_app_version) $v = ' CHECKED ';
         echo "  <TD align='center'>
             <input name='homogeneous_app_version' type='checkbox' $v></TD>
         ";

html/ops/build_po.php

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

@@ -36,7 +36,7 @@
 "X-Poedit-SourceCharset: utf-8\\n"
 
 
-HDR;
+hdr;
 
 $out = fopen("en.po", "w");
 

html/user/forum_post.php

Braces +4 added lines, -4 removed lines

@@ -53,10 +53,10 @@ 
 $preview = post_str("preview", true);
 $warning = null;
 
-if ($content && $title && (!$preview)){
-    if (post_str('add_signature', true) == "add_it"){
+if ($content && $title && (!$preview)) {
+    if (post_str('add_signature', true) == "add_it") {
         $add_signature = true;    // set a flag and concatenate later
-    }  else {
+    } else {
         $add_signature = false;
     }
     check_tokens($logged_in_user->authenticator);
@@ -111,7 +111,7 @@ 
     $submit_help = "<br /><font color=\"red\">".tra("Remember to add a title")."</font>";
 }
 
-if ($force_title && $title){
+if ($force_title && $title) {
     row2(tra("Title"), htmlspecialchars($title)."<input type=\"hidden\" name=\"title\" value=\"".htmlspecialchars($title)."\">");
 } else {
     row2(tra("Title").$submit_help,

Spacing +12 added lines, -12 removed lines

@@ -56,10 +56,10 @@ 
 $preview = post_str("preview", true);
 $warning = null;
 
-if ($content && $title && (!$preview)){
-    if (post_str('add_signature', true) == "add_it"){
-        $add_signature = true;    // set a flag and concatenate later
-    }  else {
+if ($content && $title && (!$preview)) {
+    if (post_str('add_signature', true) == "add_it") {
+        $add_signature = true; // set a flag and concatenate later
+    } else {
         $add_signature = false;
     }
     check_tokens($logged_in_user->authenticator);
@@ -71,14 +71,14 @@ 
             $title, $content, $logged_in_user, $forum, $add_signature, $export
         );
         if ($thread) {
-            header('Location: forum_thread.php?id=' . $thread->id);
+            header('Location: forum_thread.php?id='.$thread->id);
         } else {
             error_page("Can't create thread.  $forum_error");
         }
     }
 }
 
-page_head(tra("Create new thread"),'','','', $bbcode_js);
+page_head(tra("Create new thread"), '', '', '', $bbcode_js);
 show_forum_header($logged_in_user);
 
 if ($warning) {
@@ -119,12 +119,12 @@ 
     $submit_help = "<br /><font color=\"red\">".tra("Remember to add a title")."</font>";
 }
 
-if ($force_title && $title){
+if ($force_title && $title) {
     row2(tra("Title"), htmlspecialchars($title)."<input type=\"hidden\" name=\"title\" value=\"".htmlspecialchars($title)."\">");
 } else {
     row2(tra("Title").$submit_help,
         sprintf('<input type="text" class="form-control" name="title" value="%s">',
-            $title?htmlspecialchars($title):''
+            $title ?htmlspecialchars($title) : ''
         )
     );
 }
@@ -134,14 +134,14 @@ 
 echo $bbcode_html;
 end_table();
 echo sprintf('<textarea class="form-control" name="content" rows="12" cols="80">%s</textarea>',
-    $content?htmlspecialchars($content):''
+    $content ?htmlspecialchars($content) : ''
 );
 echo "</td></tr>";
 
 if (!$logged_in_user->prefs->no_signature_by_default) {
-    $enable_signature="checked=\"true\"";
+    $enable_signature = "checked=\"true\"";
 } else {
-    $enable_signature="";
+    $enable_signature = "";
 }
 
 if (is_news_forum($forum)) {
@@ -157,5 +157,5 @@ 
 
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";
+$cvs_version_tracker[] = "\$Id$";
 ?>

html/user/server_status.php

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

@@ -251,7 +251,7 @@
         $pid = file_get_contents($path);
         if ($pid) {
             $pid = trim($pid);
-            $out = Array();
+            $out = array();
             exec("ps -ww $pid", $out);
             foreach ($out as $y) {
                 if (strstr($y, (string)$pid)) return 1;

Spacing +9 added lines, -9 removed lines

@@ -180,7 +180,7 @@ 
             $avg = round($app->info->avg, 2);
             $min = round($app->info->min, 2);
             $max = round($app->info->max, 2);
-            $x = $max?"$avg ($min - $max)":"---";
+            $x = $max ? "$avg ($min - $max)" : "---";
             $u = $app->info->users;
         } else {
             $x = '---';
@@ -273,7 +273,7 @@ 
         $cmd = trim($cmd);
         $x = explode(" ", $cmd);
         $prog = $x[0];
-        $pidname = $prog . '.pid';
+        $pidname = $prog.'.pid';
     }
     $path = "../../pid_$host/$pidname";
     if (is_file($path)) {
@@ -314,12 +314,12 @@ 
     }
     $master_host = $u["host"];
     if ($config->www_host) {
-        $web_host = trim((string) $config->www_host);
+        $web_host = trim((string)$config->www_host);
     } else {
         $web_host = $main_host;
     }
     if ($config->sched_host) {
-        $sched_host = trim((string) $config->sched_host);
+        $sched_host = trim((string)$config->sched_host);
     } else {
         $sched_host = $main_host;
     }
@@ -329,7 +329,7 @@ 
 
     // the upload and download servers are sort of daemons too
     //
-    $url = trim((string) $config->download_url);
+    $url = trim((string)$config->download_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
@@ -341,14 +341,14 @@ 
     } else {
         $have_remote = true;
     }
-    $url = trim((string) $config->upload_url);
+    $url = trim((string)$config->upload_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
         $y = new StdClass;
         $y->cmd = "Upload server";
         $y->host = $h;
-        $y->status = !file_exists("../../stop_upload");;
+        $y->status = !file_exists("../../stop_upload"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -360,7 +360,7 @@ 
         $y = new StdClass;
         $y->cmd = "Scheduler";
         $y->host = $sched_host;
-        $y->status = !file_exists("../../stop_sched");;
+        $y->status = !file_exists("../../stop_sched"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -376,7 +376,7 @@ 
             $disabled_daemons[] = $x;
             continue;
         }
-        $host = $d->host?(string)$d->host:$main_host;
+        $host = $d->host ? (string)$d->host : $main_host;
         if ($host != $web_host) {
             $have_remote = true;
             continue;

html/user/submit.php

Braces +1 added lines, -1 removed lines

@@ -369,7 +369,7 @@
             $text = "---";
             if ($batch->state == BATCH_STATE_COMPLETE) {
                 $y = '<font color="red">failed</font>';
-            }   else {
+            } else {
                 $y = "in progress";
             }
         }

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

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

@@ -404,7 +404,7 @@ 
     $wus = BoincWorkunit::enum("batch = $batch->id");
     $batch = get_batch_params($batch, $wus);
 
-    page_head("Batch $batch_id");
+    page_head("batch $batch_id");
     start_table();
     row2("name", $batch->name);
     row2("application", $app?$app->name:'---');
@@ -489,7 +489,7 @@ 
     $wu = BoincWorkunit::lookup_id($wuid);
     if (!$wu) error_page("no such job");
 
-    page_head("Job $wuid");
+    page_head("job $wuid");
 
     echo "
         <a href=workunit.php?wuid=$wuid>Workunit details</a> &middot;

html/user/forum_reply.php

Braces +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
     $parent_post_id = 0;
 }
 
-if ($filter != "false"){
+if ($filter != "false") {
     $filter = true;
 } else {
     $filter = false;
@@ -65,10 +65,10 @@ 
 }
 
 $warning = null;
-if ($content && (!$preview)){
-    if (post_str('add_signature',true)=="add_it"){
+if ($content && (!$preview)) {
+    if (post_str('add_signature',true)=="add_it") {
         $add_signature=true;    // set a flag and concatenate later
-    }  else {
+    } else {
         $add_signature=false;
     }
     check_tokens($logged_in_user->authenticator);

Spacing +13 added lines, -13 removed lines

@@ -53,7 +53,7 @@ 
     $parent_post_id = 0;
 }
 
-if ($filter != "false"){
+if ($filter != "false") {
     $filter = true;
 } else {
     $filter = false;
@@ -68,11 +68,11 @@ 
 }
 
 $warning = null;
-if ($content && (!$preview)){
-    if (post_str('add_signature',true)=="add_it"){
-        $add_signature=true;    // set a flag and concatenate later
-    }  else {
-        $add_signature=false;
+if ($content && (!$preview)) {
+    if (post_str('add_signature', true) == "add_it") {
+        $add_signature = true; // set a flag and concatenate later
+    } else {
+        $add_signature = false;
     }
     check_tokens($logged_in_user->authenticator);
     if (!akismet_check($logged_in_user, $content)) {
@@ -91,7 +91,7 @@ 
     }
 }
 
-page_head(tra("Post to thread"),'','','', $bbcode_js);
+page_head(tra("Post to thread"), '', '', '', $bbcode_js);
 
 show_forum_header($logged_in_user);
 
@@ -145,7 +145,7 @@ 
     $x1 = tra("Message:").bbcode_info().post_warning();
     $x2 = "";
     if ($parent_post) {
-        $x2 .=" ".tra("reply to %1 Message ID %2:", "<a href=#".$parent_post->id.">", " ".$parent_post->id."</a>");
+        $x2 .= " ".tra("reply to %1 Message ID %2:", "<a href=#".$parent_post->id.">", " ".$parent_post->id."</a>");
     }
     $x2 .= "<form action=forum_reply.php?thread=".$thread->id;
 
@@ -156,7 +156,7 @@ 
     $x2 .= " method=\"post\" name=\"post\" onsubmit=\"return checkForm(this)\">\n";
     $x2 .= form_tokens($logged_in_user->authenticator);
     $x2 .= start_table_str().$bbcode_html.end_table_str()."<textarea class=\"form-control\" name=\"content\" rows=\"18\">";
-    $no_quote = get_int("no_quote", true)==1;
+    $no_quote = get_int("no_quote", true) == 1;
     if ($preview) {
         $x2 .= htmlspecialchars($content);
     } else if (!$no_quote) {
@@ -165,9 +165,9 @@ 
         }
     }
     if (!$logged_in_user->prefs->no_signature_by_default) {
-        $enable_signature='checked="true"';
+        $enable_signature = 'checked="true"';
     } else {
-        $enable_signature="";
+        $enable_signature = "";
     }
     $x2 .= sprintf('</textarea><p> </p>
         <input class="btn btn-sm" %s type="submit" name="preview" value="%s">
@@ -191,11 +191,11 @@ 
     return sprintf(
         'In reply to %s\'s message of %s:
         [quote]%s[/quote]',
-        $user?$user->name:'unknown user',
+        $user ? $user->name : 'unknown user',
         date_str($post->timestamp),
         htmlspecialchars($post->content)
     );
 }
 
-$cvs_version_tracker[]="\$Id$";
+$cvs_version_tracker[] = "\$Id$";
 ?>

html/user/submit_status.php

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

@@ -32,7 +32,7 @@
     if (!$batch || $batch->user_id != $user->id) {
         error_page("no batch");
     }
-    page_head("Batch $batch->id");
+    page_head("batch $batch->id");
     $results = BoincResult::enum("batch=$batch->id order by workunitid");
     result_table_start(true, true, null);
     foreach ($results as $result) {

html/user/submit_rpc_handler.php

Braces +2 added lines, -1 removed lines

@@ -691,7 +691,8 @@
         <id>$result->id</id>
         <state>".state_string($result)."</state>
 ";
-        if ($result->server_state == 5) {   // over?
+        if ($result->server_state == 5) {
+// over?
             $paths = get_outfile_paths($result);
             foreach($paths as $path) {
                 if (is_file($path)) {

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

@@ -595,7 +595,7 @@
 // return a batch specified by the command, using either ID or name
 //
 function get_batch($r) {
-    $batch = NULL;
+    $batch = null;
     if (!empty($r->batch_id)) {
         $batch_id = (int)($r->batch_id);
         $batch = BoincBatch::lookup_id($batch_id);

Switch Indentation +18 added lines, -18 removed lines

@@ -1049,24 +1049,24 @@
 log_write("----- Handling RPC; command ".$r->getName());
 
 switch ($r->getName()) {
-    case 'abort_batch': handle_abort_batch($r); break;
-    case 'abort_jobs': handle_abort_jobs($r); break;
-    case 'create_batch': create_batch($r); break;
-    case 'estimate_batch': estimate_batch($r); break;
-    case 'get_templates': get_templates($r); break;
-    case 'ping': ping($r); break;
-    case 'query_batch': query_batch($r); break;
-    case 'query_batch2': query_batch2($r); break;
-    case 'query_batches': query_batches($r); break;
-    case 'query_job': query_job($r); break;
-    case 'query_completed_job': query_completed_job($r); break;
-    case 'retire_batch': handle_retire_batch($r); break;
-    case 'set_expire_time': handle_set_expire_time($r); break;
-    case 'submit_batch': submit_batch($r); break;
-    default:
-        log_write("bad command");
-        xml_error(-1, "bad command: ".$r->getName());
-        break;
+case 'abort_batch': handle_abort_batch($r); break;
+case 'abort_jobs': handle_abort_jobs($r); break;
+case 'create_batch': create_batch($r); break;
+case 'estimate_batch': estimate_batch($r); break;
+case 'get_templates': get_templates($r); break;
+case 'ping': ping($r); break;
+case 'query_batch': query_batch($r); break;
+case 'query_batch2': query_batch2($r); break;
+case 'query_batches': query_batches($r); break;
+case 'query_job': query_job($r); break;
+case 'query_completed_job': query_completed_job($r); break;
+case 'retire_batch': handle_retire_batch($r); break;
+case 'set_expire_time': handle_set_expire_time($r); break;
+case 'submit_batch': submit_batch($r); break;
+default:
+    log_write("bad command");
+    xml_error(-1, "bad command: ".$r->getName());
+    break;
 }
 
 log_write("RPC done");

Spacing +30 added lines, -30 removed lines

@@ -59,7 +59,7 @@ 
     if ($template) {
         $t = (double)$template->workunit->rsc_fpops_est;
     }
-    foreach($r->batch->job as $job) {
+    foreach ($r->batch->job as $job) {
         $y = (double)$job->rsc_fpops_est;
         if ($y) {
             $x += $y;
@@ -85,7 +85,7 @@ 
 function est_elapsed_time($r, $template) {
     // crude estimate: batch FLOPs / project FLOPS
     //
-    return batch_flop_count($r, $template) / project_flops();
+    return batch_flop_count($r, $template)/project_flops();
 }
 
 // if batch-level input template filename was given, read it;
@@ -95,9 +95,9 @@ 
 //
 function read_input_template($app, $r) {
     if ((isset($r->batch)) && (isset($r->batch->workunit_template_file)) && ($r->batch->workunit_template_file)) {
-        $path = project_dir() . "/templates/".$r->batch->workunit_template_file;
+        $path = project_dir()."/templates/".$r->batch->workunit_template_file;
     } else {
-        $path = project_dir() . "/templates/$app->name"."_in";
+        $path = project_dir()."/templates/$app->name"."_in";
     }
     if (file_exists($path)) {
         $x = simplexml_load_file($path);
@@ -142,7 +142,7 @@ 
 function validate_batch($jobs, $template) {
     $i = 0;
     $n = count($template->file_info);
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         $m = count($job->input_files);
         if ($n != $m) {
             log_write("wrong # of input files for job $i: need $n, got $m");
@@ -211,7 +211,7 @@ 
 // stage all the files
 //
 function stage_files(&$jobs, $user) {
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         foreach ($job->input_files as $file) {
             if ($file->mode != "remote") {
                 $file->name = stage_file($file, $user);
@@ -224,7 +224,7 @@ 
 //
 function submit_jobs(
     $jobs, $job_params, $app, $batch_id, $priority, $app_version_num,
-    $input_template_filename,        // batch-level; can also specify per job
+    $input_template_filename, // batch-level; can also specify per job
     $output_template_filename,
     $user
 ) {
@@ -234,7 +234,7 @@ 
     // one line per job
     //
     $x = "";
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         if ($job->name) {
             $x .= " --wu_name $job->name";
         }
@@ -269,7 +269,7 @@ 
         $x .= "\n";
     }
 
-    $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id";
+    $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id";
 
     if ($user->seti_id) {
         $cmd .= " --target_user $user->id ";
@@ -377,7 +377,7 @@ 
 //
 function xml_get_jobs($r) {
     $jobs = array();
-    foreach($r->batch->job as $j) {
+    foreach ($r->batch->job as $j) {
         $job = new StdClass;
         $job->input_files = array();
         $job->command_line = (string)$j->command_line;
@@ -428,16 +428,16 @@ 
 //
 function logical_end_time($r, $jobs, $user, $app) {
     $total_flops = 0;
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         //print_r($job);
         if ($job->rsc_fpops_est) {
             $total_flops += $job->rsc_fpops_est;
         } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) {
-            $total_flops += (double) $job->input_template->workunit->rsc_fpops_est;
+            $total_flops += (double)$job->input_template->workunit->rsc_fpops_est;
         } else if ($r->batch->job_params->rsc_fpops_est) {
-            $total_flops += (double) $r->batch->job_params->rsc_fpops_est;
+            $total_flops += (double)$r->batch->job_params->rsc_fpops_est;
         } else {
-            $x = (double) $template->workunit->rsc_fpops_est;
+            $x = (double)$template->workunit->rsc_fpops_est;
             if ($x) {
                 $total_flops += $x;
             } else {
@@ -445,7 +445,7 @@ 
             }
         }
     }
-    $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
+    $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
     $x = exec($cmd);
     if (!is_numeric($x) || (double)$x == 0) {
         xml_error(-1, "$cmd returned $x");
@@ -530,15 +530,15 @@ 
     }
 
     $job_params = new StdClass;
-    $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound;
-    $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est;
-    $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound;
-    $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound;
-    $job_params->delay_bound = (double) $r->batch->job_params->delay_bound;
+    $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound;
+    $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est;
+    $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound;
+    $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound;
+    $job_params->delay_bound = (double)$r->batch->job_params->delay_bound;
         // could add quorum-related stuff
 
-    $input_template_filename = (string) $r->batch->input_template_filename;
-    $output_template_filename = (string) $r->batch->output_template_filename;
+    $input_template_filename = (string)$r->batch->input_template_filename;
+    $output_template_filename = (string)$r->batch->output_template_filename;
         // possibly empty
 
     submit_jobs(
@@ -631,7 +631,7 @@ 
 }
 
 function n_outfiles($wu) {
-    $path = project_dir() . "/$wu->output_template_filename";
+    $path = project_dir()."/$wu->output_template_filename";
     $r = simplexml_load_file($path);
     return count($r->file_info);
 }
@@ -838,7 +838,7 @@ 
 ";
         if ($result->server_state == 5) {   // over?
             $paths = get_outfile_paths($result);
-            foreach($paths as $path) {
+            foreach ($paths as $path) {
                 if (is_file($path)) {
                     $size = filesize($path);
                     echo "        <outfile>
@@ -882,7 +882,7 @@ 
     } else {
         $results = BoincResult::enum("workunitid=$job_id");
         foreach ($results as $r) {
-            switch($r->outcome) {
+            switch ($r->outcome) {
             case 1:
             case 3:
             case 6:
@@ -997,8 +997,8 @@ 
     }
 
     list($user, $user_submit) = check_remote_submit_permissions($r, $app);
-    $in = file_get_contents(project_dir() . "/templates/".$app->name."_in");
-    $out = file_get_contents(project_dir() . "/templates/".$app->name."_out");
+    $in = file_get_contents(project_dir()."/templates/".$app->name."_in");
+    $out = file_get_contents(project_dir()."/templates/".$app->name."_out");
     if ($in === false || $out === false) {
         log_write("template file missing");
         xml_error(-1, "template file missing");
@@ -1010,7 +1010,7 @@ 
 
 function ping($r) {
     xml_start_tag("ping");
-    BoincDb::get();     // errors out if DB down or web disabled
+    BoincDb::get(); // errors out if DB down or web disabled
     echo "<success>1</success>
         </ping>
     ";
@@ -1077,9 +1077,9 @@ 
 $request_log = parse_config(get_config(), "<remote_submit_request_log>");
 if ($request_log) {
     $log_dir = parse_config(get_config(), "<log_dir>");
-    $request_log = $log_dir . "/" . $request_log;
+    $request_log = $log_dir."/".$request_log;
     if ($file = fopen($request_log, "a")) {
-        fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $_POST['request'] . "\n</submit_rpc_handler>\n");
+        fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$_POST['request']."\n</submit_rpc_handler>\n");
         fclose($file);
     }
 }