BOINC / boinc

html/inc/sandbox.inc

Spacing +11 added lines, -11 removed lines

@@ -61,7 +61,7 @@ 
     foreach ($files as $file) {
         $path = "$dir/$file";
         [$err, $file_size, $file_md5] = sandbox_parse_link_file($path);
-        if (!$err){
+        if (!$err) {
             if (strcmp($md5, $file_md5) == 0) {
                 $exist = true;
                 $elf = $file;
@@ -124,7 +124,7 @@ 
     }
     $files = sandbox_file_names($user);
     foreach ($files as $f) {
-        if ($regexp && !preg_match("/$regexp/",$f)) continue;
+        if ($regexp && !preg_match("/$regexp/", $f)) continue;
         $x .= "<option value=\"$f\">$f</option>\n";
     }
     $x .= "</select>\n";
@@ -154,7 +154,7 @@ 
 // TODO: this is a kludge.
 // Should we use the job_file and batch_file_assoc tables instead?
 //
-function sandbox_file_in_use($user, $file){
+function sandbox_file_in_use($user, $file) {
     $ufiles = array();
 
     $pbatches = BoincBatch::enum(
@@ -164,16 +164,16 @@ 
     );
     if (!$pbatches) return false;
 
-    foreach ($pbatches as $batch){
-        $wus = BoincWorkUnit::enum("batch = $batch->id limit 1" );
-        if ($wus == null){
+    foreach ($pbatches as $batch) {
+        $wus = BoincWorkUnit::enum("batch = $batch->id limit 1");
+        if ($wus == null) {
             continue;
         }
-        foreach($wus as $wu){
+        foreach ($wus as $wu) {
             $x = "<in>".$wu->xml_doc."</in>";
             $x = simplexml_load_string($x);
             global $fanout;
-            foreach($x->workunit->file_ref as $fr){
+            foreach ($x->workunit->file_ref as $fr) {
                 $pname = (string)$fr->file_name;
                 $ufiles[] = $pname;
             }
@@ -182,10 +182,10 @@ 
     $dir = sandbox_dir($user);
     $path = $dir."/".$file;
     list($err, $size, $md5) = sandbox_parse_link_file($path);
-    if (!$err){
+    if (!$err) {
         $f = sandbox_file_name($user, $md5);
-        foreach($ufiles as $uf) {
-            if (strcmp($f,$uf) == 0){
+        foreach ($ufiles as $uf) {
+            if (strcmp($f, $uf) == 0) {
                 return true;
             }
         }

Braces +8 added lines, -8 removed lines

@@ -61,7 +61,7 @@ 
     foreach ($files as $file) {
         $path = "$dir/$file";
         [$err, $file_size, $file_md5] = sandbox_parse_link_file($path);
-        if (!$err){
+        if (!$err) {
             if (strcmp($md5, $file_md5) == 0) {
                 $exist = true;
                 $elf = $file;
@@ -154,7 +154,7 @@ 
 // TODO: this is a kludge.
 // Should we use the job_file and batch_file_assoc tables instead?
 //
-function sandbox_file_in_use($user, $file){
+function sandbox_file_in_use($user, $file) {
     $ufiles = array();
 
     $pbatches = BoincBatch::enum(
@@ -164,16 +164,16 @@ 
     );
     if (!$pbatches) return false;
 
-    foreach ($pbatches as $batch){
+    foreach ($pbatches as $batch) {
         $wus = BoincWorkUnit::enum("batch = $batch->id limit 1" );
-        if ($wus == null){
+        if ($wus == null) {
             continue;
         }
-        foreach($wus as $wu){
+        foreach($wus as $wu) {
             $x = "<in>".$wu->xml_doc."</in>";
             $x = simplexml_load_string($x);
             global $fanout;
-            foreach($x->workunit->file_ref as $fr){
+            foreach($x->workunit->file_ref as $fr) {
                 $pname = (string)$fr->file_name;
                 $ufiles[] = $pname;
             }
@@ -182,10 +182,10 @@ 
     $dir = sandbox_dir($user);
     $path = $dir."/".$file;
     list($err, $size, $md5) = sandbox_parse_link_file($path);
-    if (!$err){
+    if (!$err) {
         $f = sandbox_file_name($user, $md5);
         foreach($ufiles as $uf) {
-            if (strcmp($f,$uf) == 0){
+            if (strcmp($f,$uf) == 0) {
                 return true;
             }
         }

html/user/submit_rpc_handler.php

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

html/user/job_file.php

Spacing +10 added lines, -10 removed lines

@@ -79,7 +79,7 @@ 
 require_once("../inc/submit_util.inc");
 
 function upload_error_description($errno) {
-    switch($errno) {
+    switch ($errno) {
         case UPLOAD_ERR_INI_SIZE:
             return "The uploaded file exceeds upload_max_filesize of php.ini."; break;
         case UPLOAD_ERR_FORM_SIZE:
@@ -105,13 +105,13 @@ 
     $delete_time = (int)$r->delete_time;
     $batch_id = (int)$r->batch_id;
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
-    $phys_names= array();
-    foreach($r->phys_name as $f) {
+    $phys_names = array();
+    foreach ($r->phys_name as $f) {
         $phys_names[] = (string)$f;
     }
     $i = 0;
-    foreach($phys_names as $fname) {
-        $path = dir_hier_path($fname, project_dir() . "/download", $fanout);
+    foreach ($phys_names as $fname) {
+        $path = dir_hier_path($fname, project_dir()."/download", $fanout);
 
         // if the job_file record is there,
         // update the delete time first to avoid race condition
@@ -218,11 +218,11 @@ 
     foreach ($_FILES as $f) {
         $tmp_name = $f['tmp_name'];
         $fname = $phys_names[$i];
-        $path = dir_hier_path($fname, project_dir() . "/download", $fanout);
+        $path = dir_hier_path($fname, project_dir()."/download", $fanout);
 
         // see if file is in download hierarchy
         //
-        switch(check_download_file($tmp_name, $path)) {
+        switch (check_download_file($tmp_name, $path)) {
         case 0:
             // file is already there
             // note: check_download_file() generates .md5 in cases 1 and 2
@@ -277,10 +277,10 @@ 
 if ($request_log) {
     $request_log_dir = parse_config(get_config(), "<log_dir>");
     if ($request_log_dir) {
-        $request_log = $request_log_dir . "/" . $request_log;
+        $request_log = $request_log_dir."/".$request_log;
     }
     if ($file = fopen($request_log, "a+")) {
-        fwrite($file, "\n<job_file date=\"" . date(DATE_ATOM) . "\">\n" . $_POST['request'] . "\n</job_file>\n");
+        fwrite($file, "\n<job_file date=\"".date(DATE_ATOM)."\">\n".$_POST['request']."\n</job_file>\n");
         fclose($file);
     }
 }
@@ -292,7 +292,7 @@ 
     xml_error(-1, "can't parse request message: $req", __FILE__, __LINE__);
 }
 
-switch($r->getName()) {
+switch ($r->getName()) {
 case 'query_files':
     query_files($r);
     break;