BOINC / boinc

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 +31 added lines, -31 removed lines

@@ -58,7 +58,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;
@@ -84,7 +84,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;
@@ -94,9 +94,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);
@@ -141,7 +141,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");
@@ -202,7 +202,7 @@ 
 // stage all the files
 //
 function stage_files(&$jobs) {
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         foreach ($job->input_files as $file) {
             if ($file->mode != "remote") {
                 $file->name = stage_file($file);
@@ -215,7 +215,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
 ) {
@@ -225,7 +225,7 @@ 
     // one line per job
     //
     $x = "";
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         if ($job->name) {
             $x .= " --wu_name $job->name";
         }
@@ -260,7 +260,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 ";
@@ -296,7 +296,7 @@ 
 
     // send stdin/stderr to a temp file
     $cmd .= sprintf(' >%s 2>&1',
-        "/tmp/create_work_" . getmypid() . ".err"
+        "/tmp/create_work_".getmypid().".err"
     );
 
     $h = popen($cmd, "w");
@@ -369,7 +369,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;
@@ -420,16 +420,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 {
@@ -437,7 +437,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");
@@ -515,15 +515,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(
@@ -613,7 +613,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);
 }
@@ -820,7 +820,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>
@@ -864,7 +864,7 @@ 
     } else {
         $results = BoincResult::enum("workunitid=$job_id");
         foreach ($results as $r) {
-            switch($r->outcome) {
+            switch ($r->outcome) {
             case 1:
             case 3:
             case 6:
@@ -979,8 +979,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");
@@ -992,7 +992,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>
     ";
@@ -1059,9 +1059,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);
     }
 }

html/user/get_project_config.php

Braces +2 added lines, -2 removed lines

@@ -28,10 +28,10 @@
 //
 function show_platforms() {
     $xmlFragment = unserialize(get_cached_data(3600, "project_config_platform_xml"));
-    if ($xmlFragment==false){
+    if ($xmlFragment==false) {
         $platforms = BoincDB::get()->enum_fields("platform, DBNAME.app_version, DBNAME.app", "BoincPlatform", "platform.name, platform.user_friendly_name, plan_class", "app_version.platformid = platform.id and app_version.appid = app.id and app_version.deprecated=0 and app.deprecated=0 group by platform.name, plan_class", "");
         $xmlFragment = "    <platforms>";
-        foreach ($platforms as $platform){
+        foreach ($platforms as $platform) {
             $xmlFragment .= "
             <platform>
                 <platform_name>$platform->name</platform_name>

Indentation +4 added lines, -4 removed lines

@@ -86,11 +86,11 @@ 
 }
 
 if ($disable_account_creation || defined('INVITE_CODES')) {
-	echo "    <account_creation_disabled/>\n";
+    echo "    <account_creation_disabled/>\n";
 }
 
 if (defined('INVITE_CODES')) {
-	echo "    <invite_code_required/>\n";
+    echo "    <invite_code_required/>\n";
 }
 
 echo "    <min_passwd_length>$min_passwd_length</min_passwd_length>\n";
@@ -113,9 +113,9 @@ 
 // the terms_of_use.txt file in the project base directory.
 //
 if (defined('TERMSOFUSE_FILE')) {
-  $tou_file = TERMSOFUSE_FILE;
+    $tou_file = TERMSOFUSE_FILE;
 } else {
-  $tou_file =  "../../terms_of_use.txt";
+    $tou_file =  "../../terms_of_use.txt";
 }
 if (file_exists($tou_file)) {
     $terms_of_use = trim(file_get_contents($tou_file));

Spacing +3 added lines, -3 removed lines

@@ -30,10 +30,10 @@ 
 //
 function show_platforms() {
     $xmlFragment = unserialize(get_cached_data(3600, "project_config_platform_xml"));
-    if ($xmlFragment==false){
+    if ($xmlFragment == false) {
         $platforms = BoincDB::get()->enum_fields("platform, DBNAME.app_version, DBNAME.app", "BoincPlatform", "platform.name, platform.user_friendly_name, plan_class", "app_version.platformid = platform.id and app_version.appid = app.id and app_version.deprecated=0 and app.deprecated=0 group by platform.name, plan_class", "");
         $xmlFragment = "    <platforms>";
-        foreach ($platforms as $platform){
+        foreach ($platforms as $platform) {
             $xmlFragment .= "
             <platform>
                 <platform_name>$platform->name</platform_name>
@@ -115,7 +115,7 @@ 
 if (defined('TERMSOFUSE_FILE')) {
   $tou_file = TERMSOFUSE_FILE;
 } else {
-  $tou_file =  "../../terms_of_use.txt";
+  $tou_file = "../../terms_of_use.txt";
 }
 if (file_exists($tou_file)) {
     $terms_of_use = trim(file_get_contents($tou_file));

html/user/forum_search.php

Braces +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
     </select>");
 
 $forumid = null;
-if (get_str("forumid",true)){
+if (get_str("forumid",true)) {
     $forumid = get_str("forumid");
 }
 $forumlist="<option value=\"-1\">".tra("All")."</option>";
@@ -64,7 +64,7 @@ 
 foreach ($categories as $category) {
     $forums = BoincForum::enum("parent_type=0 and category=$category->id");
     foreach ($forums as $forum) {
-        if ($forum->id==$forumid){
+        if ($forum->id==$forumid) {
             $forumlist.="<option selected value=\"".$forum->id."\">".$forum->title."</option>";
         } else {
             $forumlist.="<option value=\"".$forum->id."\">".$forum->title."</option>";
@@ -76,8 +76,8 @@ 
     '<select class="form-control" name="search_forum">'.$forumlist.'</select');
 
 $sortlist = null;
-foreach ($thread_sort_styles as $id => $style){
-    if ($id == CREATE_TIME_NEW){
+foreach ($thread_sort_styles as $id => $style) {
+    if ($id == CREATE_TIME_NEW) {
         $sortlist.="<option selected value=\"".$id."\">".$style."</option>";
     } else {
         $sortlist.="<option value=\"".$id."\">".$style."</option>";

Spacing +11 added lines, -11 removed lines

@@ -56,18 +56,18 @@ 
     </select>");
 
 $forumid = null;
-if (get_str("forumid",true)){
+if (get_str("forumid", true)) {
     $forumid = get_str("forumid");
 }
-$forumlist="<option value=\"-1\">".tra("All")."</option>";
+$forumlist = "<option value=\"-1\">".tra("All")."</option>";
 $categories = BoincCategory::enum();
 foreach ($categories as $category) {
     $forums = BoincForum::enum("parent_type=0 and category=$category->id");
     foreach ($forums as $forum) {
-        if ($forum->id==$forumid){
-            $forumlist.="<option selected value=\"".$forum->id."\">".$forum->title."</option>";
+        if ($forum->id == $forumid) {
+            $forumlist .= "<option selected value=\"".$forum->id."\">".$forum->title."</option>";
         } else {
-            $forumlist.="<option value=\"".$forum->id."\">".$forum->title."</option>";
+            $forumlist .= "<option value=\"".$forum->id."\">".$forum->title."</option>";
         }
     }
 }
@@ -76,22 +76,22 @@ 
     '<select class="form-control" name="search_forum">'.$forumlist.'</select');
 
 $sortlist = null;
-foreach ($thread_sort_styles as $id => $style){
-    if ($id == CREATE_TIME_NEW){
-        $sortlist.="<option selected value=\"".$id."\">".$style."</option>";
+foreach ($thread_sort_styles as $id => $style) {
+    if ($id == CREATE_TIME_NEW) {
+        $sortlist .= "<option selected value=\"".$id."\">".$style."</option>";
     } else {
-        $sortlist.="<option value=\"".$id."\">".$style."</option>";
+        $sortlist .= "<option value=\"".$id."\">".$style."</option>";
     }
 }
 row2(tra("Sort by"),
     '<select class="form-control" name="search_sort">'.$sortlist.'</select');
 
 row1("&nbsp;");
-row2("","<input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Start the search")."\">");
+row2("", "<input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Start the search")."\">");
 echo "</form>";
 end_table();
 
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/user/create_account_form.php

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

@@ -57,7 +57,7 @@
     $team = BoincTeam::lookup_id($teamid);
     $user = BoincUser::lookup_id($team->userid);
     if (!$user) {
-        error_page("Team $team->name has no founder");
+        error_page("team $team->name has no founder");
         $teamid = 0;
     } else {
         echo "<b>".tra("This account will belong to the team %1 and will have the project preferences of its founder.", "<a href=\"team_display.php?teamid=$team->id\">$team->name</a>")."</b><p>";

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
     }
 }
 
-form_start("create_account_action.php","post");
+form_start("create_account_action.php", "post");
 create_account_form($teamid, $next_url);
 global $recaptcha_public_key;
 if ($recaptcha_public_key) {
@@ -77,5 +77,5 @@ 
 
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/user/forum_edit.php

Braces +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
         $now = time();
         $post->update("signature=$add_signature, content='$content', modified=$now");
     
-        if ($can_edit_title){
+        if ($can_edit_title) {
             $title = trim($title);
             $title = sanitize_tags($title);
             $title = BoincDb::escape_string($title);

Spacing +9 added lines, -9 removed lines

@@ -44,7 +44,7 @@ 
 
 $post_owner = BoincUser::lookup_id($post->user);
 if (($logged_in_user->id != $post_owner->id) || (can_reply($thread, $forum, $logged_in_user) == false)) {
-    error_page (tra("You are not authorized to edit this post."));
+    error_page(tra("You are not authorized to edit this post."));
 }
 
 $thread_owner = BoincUser::lookup_id($thread->owner);
@@ -53,13 +53,13 @@ 
 // (ie. not a response to another post)
 // allow the user to modify the thread title
 //
-$can_edit_title = ($post->parent_post==0 && $thread_owner->id==$logged_in_user->id && !is_banished($logged_in_user));
+$can_edit_title = ($post->parent_post == 0 && $thread_owner->id == $logged_in_user->id && !is_banished($logged_in_user));
 
 $content = post_str("content", true);
 $title = post_str("title", true);
 $preview = post_str("preview", true);
 
-if (post_str('submit',true) && (!$preview)) {
+if (post_str('submit', true) && (!$preview)) {
     if (POST_MAX_LINKS
         && link_count($content) > POST_MAX_LINKS
         && !is_moderator($logged_in_user, $forum)
@@ -68,7 +68,7 @@ 
     }
     check_tokens($logged_in_user->authenticator);
     
-    $add_signature = (post_str('add_signature', true) == "1")?1:0;
+    $add_signature = (post_str('add_signature', true) == "1") ? 1 : 0;
     $content = substr($content, 0, 64000);
     $content = trim($content);
     if (strlen($content)) {
@@ -76,7 +76,7 @@ 
         $now = time();
         $post->update("signature=$add_signature, content='$content', modified=$now");
     
-        if ($can_edit_title){
+        if ($can_edit_title) {
             $title = trim($title);
             $title = sanitize_tags($title);
             $title = BoincDb::escape_string($title);
@@ -89,7 +89,7 @@ 
     }
 }
 
-page_head(tra("Edit post"),'','','', $bbcode_js);
+page_head(tra("Edit post"), '', '', '', $bbcode_js);
 
 show_forum_header($logged_in_user);
 switch ($forum->parent_type) {
@@ -144,9 +144,9 @@ 
 }
 
 if ($post->signature) {
-    $enable_signature="checked=\"true\"";
+    $enable_signature = "checked=\"true\"";
 } else {
-    $enable_signature="";
+    $enable_signature = "";
 }
 row2("", "<input id=\"add_signature\" name=\"add_signature\" value=\"1\" ".$enable_signature." type=\"checkbox\">
     <label for=\"add_signature\">".tra("Add my signature to this post")."</label>");
@@ -159,5 +159,5 @@ 
 
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/db_ops.inc

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

@@ -399,7 +399,7 @@ 
         $x = (int)$y;
     }
     if (0<=$x && $x<=9) {
-        return FALSE;
+        return false;
     } else {
         return "$x ".error_code_str($x);
     }
@@ -891,7 +891,7 @@ 
     row("Domain name", $host->domain_name);
     $x = $host->timezone/3600;
     if ($x >= 0) $x="+$x";
-    row("Local Standard Time", "UTC $x hours");
+    row("Local Standard Time", "utc $x hours");
     row("Number of CPUs", $host->p_ncpus);
     row("CPU", "$host->p_vendor $host->p_model");
     row("GFLOPS", number_format($host->p_fpops/1e9, 2));

Indentation +5 added lines, -5 removed lines

@@ -310,9 +310,9 @@ 
             $value=null;
         }
         if (isset($_GET[$order])) {
-             $order = $_GET[$order];
+                $order = $_GET[$order];
         } else {
-             $order = null;
+                $order = null;
         }
         if ($value) {
             if ($order == 'asc') {
@@ -580,7 +580,7 @@ 
         $res = new StdClass;
         $res->server_state = $ss;
         row2(result_server_state_string($res),
-             link_results("$server_state[$ss]",  $urlquery,"server_state=$ss", '')
+                link_results("$server_state[$ss]",  $urlquery,"server_state=$ss", '')
         );
     }
     end_table();
@@ -1056,8 +1056,8 @@ 
 
 function validate_color($validate_state) {
     switch ($validate_state) {
-   case 1: return '33cc33'; // valid, green
-   case 2: return 'ffa500'; // invalid result, orange
+    case 1: return '33cc33'; // valid, green
+    case 2: return 'ffa500'; // invalid result, orange
     }
     return '';
 }

Braces +8 added lines, -6 removed lines

@@ -98,7 +98,9 @@ 
     if (!isset($types)) {
         $types = array();
         $constants = get_defined_constants(true);
-        foreach ($constants['mysqli'] as $c => $n) if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1];
+        foreach ($constants['mysqli'] as $c => $n) {
+            if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1];
+        }
     }
     return array_key_exists($type_id, $types)? strtolower($types[$type_id]) : "unknown";
 }
@@ -381,13 +383,13 @@ 
 
 
 function link_results($n, $mq, $query, $clauses) {
-    if ($n == '0') { // intentional compare by string
+    if ($n == '0') {
+// intentional compare by string
         return "0";
     } else {
         if(strlen($clauses)) {
             return "<a href=\"db_action.php?table=result&query=$mq&$query&clauses=".urlencode($clauses)."&sort_by=mod_time&detail=low\">$n</a>";
-        }
-        else {
+        } else {
             return "<a href=\"db_action.php?table=result&query=$mq&$query&sort_by=mod_time&detail=low\">$n</a>";
         }
 
@@ -397,7 +399,7 @@ 
 // 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) {
@@ -1176,7 +1178,7 @@ 
         // 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)  {
+        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) {

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/cache.inc

Braces +7 added lines, -7 removed lines

@@ -107,7 +107,7 @@ 
 
 // check cache size every once in a while, purge if too big
 //
-function cache_check_diskspace(){
+function cache_check_diskspace() {
     if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
     if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
     $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL,
@@ -116,7 +116,7 @@ 
     clean_cache($x, "../cache");
 }
 
-function cache_need_to_regenerate($path, $max_age){
+function cache_need_to_regenerate($path, $max_age) {
     $regenerate = false;
     $request = apache_request_headers();
 
@@ -139,7 +139,7 @@ 
 }
 
 // Returns cached data or false if nothing was found
-function get_cached_data($max_age, $params=""){
+function get_cached_data($max_age, $params="") {
     global $no_cache;
 
     if ($no_cache) return;
@@ -165,7 +165,7 @@ 
 }
 
 // DEPRECATED
-function start_cache($max_age, $params=""){
+function start_cache($max_age, $params="") {
     global $no_cache, $caching, $memcache;
 
     if ($no_cache) return;
@@ -188,7 +188,7 @@ 
             $regenerate = cache_need_to_regenerate($path, $max_age);
         }
         //Is the stored version too old, do we need to regenerate it?
-        if ($regenerate){
+        if ($regenerate) {
             // If cached version is too old (or non-existent)
             // generate the page and write to cache
             //
@@ -228,7 +228,7 @@ 
 
 // write output buffer both to client and to cache
 // DEPRECATED
-function end_cache($max_age,$params=""){
+function end_cache($max_age,$params="") {
     global $no_cache;
     if ($no_cache) return;
 
@@ -253,7 +253,7 @@ 
     }
 }
 
-function set_cached_data($max_age, $data, $params=""){
+function set_cached_data($max_age, $data, $params="") {
     // for the benefit of hackers
     if (strstr($params, "..")) {
         return "bad params";

Indentation +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
                 }
             }
         }
-       @closedir($handle);
+        @closedir($handle);
     }
     chdir($start_dir);
 }

Spacing +29 added lines, -29 removed lines

@@ -32,8 +32,8 @@ 
         mkdir("../cache", 0770);
         chmod("../cache", 0770);
     }
-    for ($i=0;$i<256;$i++) {
-        $j=sprintf("%02x",$i);
+    for ($i = 0; $i < 256; $i++) {
+        $j = sprintf("%02x", $i);
         if (!@filemtime("../cache/$j")) {
             mkdir("../cache/$j", 0770);
             chmod("../cache/$j", 0770);
@@ -41,7 +41,7 @@ 
     }
 }
 
-function get_path($params, $phpfile=null) {
+function get_path($params, $phpfile = null) {
     if (!@filemtime("../cache/00")) make_cache_dirs();
     if ($phpfile) {
         $z = $phpfile;
@@ -51,7 +51,7 @@ 
     }
 
     // add a layer of subdirectories for reducing file lookup time
-    $sz = substr(md5($z."_".urlencode($params)),1,2);
+    $sz = substr(md5($z."_".urlencode($params)), 1, 2);
     $path = "../cache/".$sz."/".$z;
     if ($params) {
         $path = $path."_".urlencode($params);
@@ -60,14 +60,14 @@ 
 }
 
 function disk_usage($dir) {
-    $usage=0;
-    if ($handle=@opendir($dir)) {
-        while ($file=readdir($handle)) {
+    $usage = 0;
+    if ($handle = @opendir($dir)) {
+        while ($file = readdir($handle)) {
             if (($file != ".") && ($file != "..")) {
                 if (@is_dir($dir."/".$file)) {
-                    $usage+=disk_usage($dir."/".$file);
+                    $usage += disk_usage($dir."/".$file);
                 } else {
-                    $usage+=@filesize($dir."/".$file);
+                    $usage += @filesize($dir."/".$file);
                 }
             }
         }
@@ -81,8 +81,8 @@ 
     if (!chdir($dir)) {
         return;
     }
-    if ($handle=@opendir(".")) {
-        while ($file=readdir($handle)) {
+    if ($handle = @opendir(".")) {
+        while ($file = readdir($handle)) {
             if ($file == ".") continue;
             if ($file == "..") continue;
 
@@ -93,7 +93,7 @@ 
             if (@is_dir($file)) {
                 clean_cache($max_age, $file);
             } else {
-                if ((time()-@filemtime($file))>$max_age) {
+                if ((time() - @filemtime($file)) > $max_age) {
                     //echo "unlinking ".getcwd()."/$file\n";
                     @unlink($file);
                 }
@@ -107,8 +107,8 @@ 
 
 // check cache size every once in a while, purge if too big
 //
-function cache_check_diskspace(){
-    if ((rand() % CACHE_SIZE_CHECK_FREQ)) return;
+function cache_check_diskspace() {
+    if ((rand()%CACHE_SIZE_CHECK_FREQ)) return;
     if (disk_usage("../cache") < MAX_CACHE_USAGE) return;
     $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL,
         USER_PROFILE_TTL, TOP_PAGES_TTL, INDEX_PAGE_TTL
@@ -116,7 +116,7 @@ 
     clean_cache($x, "../cache");
 }
 
-function cache_need_to_regenerate($path, $max_age){
+function cache_need_to_regenerate($path, $max_age) {
     $regenerate = false;
     $request = apache_request_headers();
 
@@ -128,7 +128,7 @@ 
         // and touch the cached copy so other processes
         // don't regenerate at the same time
         //
-        if ($lastmodified<time()-$max_age) {
+        if ($lastmodified < time() - $max_age) {
             $regenerate = true;
             @touch($path);
         }
@@ -139,7 +139,7 @@ 
 }
 
 // Returns cached data or false if nothing was found
-function get_cached_data($max_age, $params=""){
+function get_cached_data($max_age, $params = "") {
     global $no_cache;
 
     if ($no_cache) return;
@@ -155,7 +155,7 @@ 
             }
         } else {
             cache_check_diskspace();
-            $regenerate=cache_need_to_regenerate($path, $max_age);
+            $regenerate = cache_need_to_regenerate($path, $max_age);
             if (!$regenerate) {
                 return file_get_contents($path);
             }
@@ -165,7 +165,7 @@ 
 }
 
 // DEPRECATED
-function start_cache($max_age, $params=""){
+function start_cache($max_age, $params = "") {
     global $no_cache, $caching, $memcache;
 
     if ($no_cache) return;
@@ -188,15 +188,15 @@ 
             $regenerate = cache_need_to_regenerate($path, $max_age);
         }
         //Is the stored version too old, do we need to regenerate it?
-        if ($regenerate){
+        if ($regenerate) {
             // If cached version is too old (or non-existent)
             // generate the page and write to cache
             //
             ob_start();
             ob_implicit_flush(0);
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-            Header("Expires: " . gmdate("D, d M Y H:i:s",time()+$max_age) . " GMT");
-            Header("Cache-Control: public, max-age=" . $max_age);
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+            Header("Expires: ".gmdate("D, d M Y H:i:s", time() + $max_age)." GMT");
+            Header("Cache-Control: public, max-age=".$max_age);
 
             // allow the calling page to see cache period
             //
@@ -208,9 +208,9 @@ 
             if (strstr($params, "format=xml")) {
                 header('Content-type: text/xml');
             }
-            Header("Last-Modified: " . gmdate("D, d M Y H:i:s",$lastmodified) . " GMT");
-            Header("Expires: " . gmdate("D, d M Y H:i:s",$lastmodified+$max_age) . " GMT");
-            Header("Cache-Control: public, max-age=" . $max_age );
+            Header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastmodified)." GMT");
+            Header("Expires: ".gmdate("D, d M Y H:i:s", $lastmodified + $max_age)." GMT");
+            Header("Cache-Control: public, max-age=".$max_age);
             if ($cache && $cache->content) {
                 echo $cache->content;
                 exit;
@@ -228,7 +228,7 @@ 
 
 // write output buffer both to client and to cache
 // DEPRECATED
-function end_cache($max_age,$params=""){
+function end_cache($max_age, $params = "") {
     global $no_cache;
     if ($no_cache) return;
 
@@ -253,7 +253,7 @@ 
     }
 }
 
-function set_cached_data($max_age, $data, $params=""){
+function set_cached_data($max_age, $data, $params = "") {
     // for the benefit of hackers
     if (strstr($params, "..")) {
         return "bad params";
@@ -294,7 +294,7 @@ 
             self::$instance->setOption(Memcached::OPT_PREFIX_KEY, MEMCACHE_PREFIX);
         }
         $servers = explode('|', MEMCACHE_SERVERS);
-        foreach($servers as &$server) {
+        foreach ($servers as &$server) {
             list($ip, $port) = explode(':', $server);
             if (!$port) { $port = 11211; }
             $server = array($ip, $port);

html/inc/text_transform.inc

Braces +5 added lines, -4 removed lines

@@ -272,7 +272,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -283,7 +283,7 @@ 
     $i=0;
     $linkpos=true;
     $out = "";
-    while (true){
+    while (true) {
         //Find a link
         //
         $linkpos=strpos($text, "<a ", $i);
@@ -300,7 +300,7 @@ 
 
 // Converts image tags to links to the images.
 
-function image_as_link($text){
+function image_as_link($text) {
     /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
@@ -318,7 +318,8 @@ 
     foreach ($search as $key => $value) {
         $replace[$key] = "<span class=\"mark\">".$value."</span>";
     }
-    if (substr(phpversion(), 0, 1) > 4) {   // PHP 4.x doesn't support str_ireplace
+    if (substr(phpversion(), 0, 1) > 4) {
+// PHP 4.x doesn't support str_ireplace
         return str_ireplace($search, $replace, $text);
     } else {
         return str_replace($search, $replace, $text);

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

@@ -62,7 +62,7 @@
 // Do the actual transformation of the text.
 // TODO: Make this part of the above class.
 
-function output_transform($text, $options = NULL) {
+function output_transform($text, $options = null) {
     // Options is a output_options object, defined above
     if (!$options) {
         $options = new output_options; // Defaults in the class definition

Spacing +27 added lines, -27 removed lines

@@ -26,13 +26,13 @@ 
 require_once('../inc/sanitize_html.inc');
 
 class output_options {
-    var $bb2html;            // BBCode as HTML? (on)
-    var $images_as_links;    // Images as hyperlinks? (off)
-    var $link_popup;        // Links in new windows? (off)
-    var $nl2br;                // Convert newlines to <br>'s? (on)
-    var $htmlitems;            // Convert special chars to HTML entities? (on)
-    var $htmlscrub;            // Scrub "bad" HTML tags? (off)
-    var $highlight_terms;// Array of terms to be highlighted (off)
+    var $bb2html; // BBCode as HTML? (on)
+    var $images_as_links; // Images as hyperlinks? (off)
+    var $link_popup; // Links in new windows? (off)
+    var $nl2br; // Convert newlines to <br>'s? (on)
+    var $htmlitems; // Convert special chars to HTML entities? (on)
+    var $htmlscrub; // Scrub "bad" HTML tags? (off)
+    var $highlight_terms; // Array of terms to be highlighted (off)
 
     // Constructor - set the defaults.
 
@@ -68,7 +68,7 @@ 
         $options = new output_options; // Defaults in the class definition
     }
     if ($options->htmlitems) {
-        $text = htmlspecialchars($text, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE);
+        $text = htmlspecialchars($text, ENT_COMPAT|ENT_HTML401|ENT_SUBSTITUTE);
     }
     if (is_array($options->highlight_terms)) {
         $text = highlight_terms($text, $options->highlight_terms);
@@ -109,7 +109,7 @@ 
     if ($export) {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -119,7 +119,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -130,7 +130,7 @@ 
     } else {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -140,7 +140,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -151,7 +151,7 @@ 
     }
 }
 
-function bb2html($text, $export=false) {
+function bb2html($text, $export = false) {
     $urlregex = "(?:\"?)(?:(http\:\/\/)?)([^\[\"<\ ]+)(?:\"?)";
     // NOTE:
     // This matches https:// too; I don't understand why.
@@ -171,7 +171,7 @@ 
 
     $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
     // List of allowable tags
-    $bbtags = array (
+    $bbtags = array(
         "@\[b\](.*?)\[/b\]@is",
         "@\[i\](.*?)\[/i\]@is",
         "@\[u\](.*?)\[/u\]@is",
@@ -200,7 +200,7 @@ 
 
     // What the above tags are turned in to
     if ($export) {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -227,7 +227,7 @@ 
             "<a href=\"https://github.com/BOINC/boinc/wiki/\\1\">\\1</a>",
         );
     } else {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -259,7 +259,7 @@ 
     $lasttext = "";
     $i = 0;
     // $i<1000 to prevent DoS
-    while ($text != $lasttext && $i<1000) {
+    while ($text != $lasttext && $i < 1000) {
         $lasttext = $text;
         $text = replace_pre_code($text, $export);
         $text = preg_replace($bbtags, $htmltags, $text);
@@ -274,7 +274,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -282,19 +282,19 @@ 
 //
 function externalize_links($text) {
     // TODO:  Convert this to PCRE
-    $i=0;
-    $linkpos=true;
+    $i = 0;
+    $linkpos = true;
     $out = "";
-    while (true){
+    while (true) {
         //Find a link
         //
-        $linkpos=strpos($text, "<a ", $i);
-        if ($linkpos===false) break;
+        $linkpos = strpos($text, "<a ", $i);
+        if ($linkpos === false) break;
 
         //Replace with target='_new'
         //
-        $out .= substr($text, $i, $linkpos-$i)."<a target=\"_new\" ";
-        $i = $linkpos+3;
+        $out .= substr($text, $i, $linkpos - $i)."<a target=\"_new\" ";
+        $i = $linkpos + 3;
     }
     $out .= substr($text, $i);
     return $out;
@@ -302,7 +302,7 @@ 
 
 // Converts image tags to links to the images.
 
-function image_as_link($text){
+function image_as_link($text) {
     /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
@@ -327,5 +327,5 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>