BOINC / boinc

html/user/host_edit_action.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 require_once("../inc/util.inc");
 require_once("../inc/host.inc");
 
+/**
+ * @param string $msg
+ */
 function fail($msg) {
     echo "Error: $msg";
     page_tail();

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 $nhosts = get_int("nhosts");
 $hostid = get_int("id_0");
 $latest_host = get_host($hostid, $user);
-for ($i=1; $i<$nhosts; $i++) {
+for ($i = 1; $i < $nhosts; $i++) {
     $var = "id_$i";
     $hostid = get_int($var, true);
     if (!$hostid) continue;

Braces +3 added lines, -1 removed lines

@@ -44,7 +44,9 @@
 for ($i=1; $i<$nhosts; $i++) {
     $var = "id_$i";
     $hostid = get_int($var, true);
-    if (!$hostid) continue;
+    if (!$hostid) {
+        continue;
+    }
     $host = get_host($hostid, $user);
     if ($host->create_time > $latest_host->create_time) {
         $error = merge_hosts($latest_host, $host);

html/user/lammps.php

Doc Comments +26 added lines

@@ -30,6 +30,9 @@ 
 //
 // output: success flag, CPU time per step, est. disk usage per job
 //
+/**
+ * @param resource $p
+ */
 function terminate_job($p) {
     $pstatus=proc_get_status($p);
     $ppid=$pstatus['pid'];
@@ -86,6 +89,9 @@ 
     return array($test_result, $total_cpu, $disk_space);
 }
 
+/**
+ * @param string $cmd_file
+ */
 function get_total_steps($cmd_file) {
     $fd = fopen($cmd_file,"r");
     if (!$fd) {
@@ -116,6 +122,9 @@ 
     return $total_steps;
 }
 
+/**
+ * @param string $filename
+ */
 function calc_step_cpu($filename) {
     $fd = fopen("$filename", "r");
     $start_line = "Step CPU ";
@@ -169,6 +178,11 @@ 
     return array($avg_cpu,$test_steps);
 }
 
+/**
+ * @param string $lammps_script
+ * @param string $structure_file
+ * @param string $cmd_file
+ */
 function calc_est_size($lammps_script, $structure_file, $cmd_file,$test_steps){
     $dump_types = 0;
     $fd = fopen($lammps_script,"r");
@@ -280,6 +294,11 @@ 
 
 // verify that an input file exists in sandbox, and return its physical path
 //
+/**
+ * @param string $name
+ *
+ * @return string
+ */
 function get_file_path($user, $name) {
     $fname = get_str($name);
 
@@ -308,6 +327,10 @@ 
 //
 // Note: these are both extremely optimistic estimates
 //
+/**
+ * @param integer $njobs
+ * @param double $flops_per_job
+ */
 function estimated_makespan($njobs, $flops_per_job) {
     $nhosts = BoincHost::count("expavg_credit > 1");
     if ($nhosts < 10) {
@@ -416,6 +439,9 @@ 
     page_tail();
 }
 
+/**
+ * @param integer $i
+ */
 function submit_job($app, $batch_id, $info, $cmdline, $i) {
     $client_disk=$info->rsc_disk_bound*2;
     if($client_disk<500000000) $client_disk=500000000;

Indentation +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
     $ppid=$pstatus['pid'];
     $ret=`ps -o pid --no-heading --ppid $ppid`;
     //echo "parent pid is $ppid\nterninate it\n";
-     proc_terminate($p);
+        proc_terminate($p);
     // echo "child process is $ret\n";
     $pids=preg_split('/\s+/',$ret);
     foreach($pids as $pid){
@@ -61,9 +61,9 @@ 
     while (1) {
         $ctime=time();
         if($ctime-$stime >=2 and ! file_exists("log.1")){
-           if($GLOBALS["debug"]) echo "time out "."<br>";
-           terminate_job($p);
-           break;
+            if($GLOBALS["debug"]) echo "time out "."<br>";
+            terminate_job($p);
+            break;
         } 
         if (file_exists("log.1")) {
             list($avg_cpu, $test_steps) = calc_step_cpu("log.1");
@@ -112,7 +112,7 @@ 
     }
     fclose($fd);
     //$total_steps = $loopno*$looprun;
-     if($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>";
+        if($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>";
     return $total_steps;
 }
 
@@ -147,12 +147,12 @@ 
         $cpu = (float)$arr[2];
         //echo "step=".$step." cpu=".$cpu."\n";
         if ($cpu==0) {
-           $count=0;
-           $start_step = $step;
+            $count=0;
+            $start_step = $step;
         } else {
             $count+=1;
             if($GLOBALS["debug"])echo "step=".$step." cpu=".$cpu."count=".$count."<br>";
-           if($count >= 10) {
+            if($count >= 10) {
                 $end_step = $step;
                 $steps = $end_step-$start_step;
                 $avg_cpu = $cpu/$steps;
@@ -183,7 +183,7 @@ 
         
         if(preg_match("/^\s*dump\s+(\d)\s+/", $line,$matches))
         {        
-             if($GLOBALS["debug"]){print "matches=";print_r($matches);}
+                if($GLOBALS["debug"]){print "matches=";print_r($matches);}
 
             $dump_types=(int)$matches[1];
             break;
@@ -198,7 +198,7 @@ 
         echo "can not open file $cmd_file\n";
         exit(-1);
     }
-     if($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>";
+        if($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>";
    
     $loopno=1;
     $looprun=1;
@@ -216,8 +216,8 @@ 
     }
     fclose($fd);
     if($GLOBALS["debug"]){
-         print "max loopno(number of loops to run)=".$loopno."<br>";
-         print "max looprun(steps for each loop)=".$looprun."<br>";
+            print "max loopno(number of loops to run)=".$loopno."<br>";
+            print "max looprun(steps for each loop)=".$looprun."<br>";
     }
     //$est_size = $loopno*$structure_file_size*0.8*$dump_types;
     $test_log_size = filesize("log.1");
@@ -368,7 +368,7 @@ 
             <br>Please refer to the following Error Message:<br><p>
         ";
         foreach($err_msgs as $line){
-             $err=$err.$line."<br>";
+                $err=$err.$line."<br>";
         }
         $err=$err." <p>
             <a href=sandbox.php><strong> File_Sandbox </strong></a>
@@ -393,7 +393,7 @@ 
     //
     $njobs = count(file($cmdline_file_path));
     $secs_est = estimated_makespan($njobs, $info->rsc_fpops_est);
-     if($GLOBALS["debug"])echo "secs_est is $secs_est\n";
+        if($GLOBALS["debug"])echo "secs_est is $secs_est\n";
     //assume the server's flops is 1.5G and the average client's flops is 1G
     $hrs_est = number_format($secs_est*1.5/60, 2);
     //$hrs_est = number_format($secs_est, 2);

Spacing +73 added lines, -73 removed lines

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

Braces +54 added lines, -18 removed lines

@@ -40,7 +40,9 @@ 
     $pids=preg_split('/\s+/',$ret);
     foreach($pids as $pid){
         if(is_numeric($pid)){
-            if($GLOBALS["debug"])echo "killing child process $pid\n";
+            if($GLOBALS["debug"]) {
+                echo "killing child process $pid\n";
+            }
             posix_kill($pid,9);
         }
     }
@@ -54,21 +56,27 @@ 
     $options = file("cmd_variables");
     $options[0] = chop($options[0],"\n");
     $cmd = "../lmp_linux ".$options[0]."&>output";
-    if ($GLOBALS["debug"]) echo $cmd."<br>";
+    if ($GLOBALS["debug"]) {
+        echo $cmd."<br>";
+    }
     system("unzip pot_files >/dev/null");
     $stime = time();
     $p = proc_open("$cmd", $descs, $pipes);
     while (1) {
         $ctime=time();
         if($ctime-$stime >=2 and ! file_exists("log.1")){
-           if($GLOBALS["debug"]) echo "time out "."<br>";
+           if($GLOBALS["debug"]) {
+               echo "time out "."<br>";
+           }
            terminate_job($p);
            break;
         } 
         if (file_exists("log.1")) {
             list($avg_cpu, $test_steps) = calc_step_cpu("log.1");
             if ($avg_cpu != 0) {
-                if($GLOBALS["debug"])echo "avg_cpu is ".$avg_cpu."<br>";
+                if($GLOBALS["debug"]) {
+                    echo "avg_cpu is ".$avg_cpu."<br>";
+                }
                 terminate_job($p);
                 $test_result = 1;
                 break;
@@ -106,13 +114,17 @@ 
             and preg_match("/\d+/", $matches[0], $no)
         ) {
             $this_looprun=$no[0];
-            if($this_loopno*$this_looprun>$total_steps)$total_steps=$this_loopno*$this_looprun;
+            if($this_loopno*$this_looprun>$total_steps) {
+                $total_steps=$this_loopno*$this_looprun;
+            }
         }
 
     }
     fclose($fd);
     //$total_steps = $loopno*$looprun;
-     if($GLOBALS["debug"])print "total_steps = ".$total_steps."<br>";
+     if($GLOBALS["debug"]) {
+         print "total_steps = ".$total_steps."<br>";
+     }
     return $total_steps;
 }
 
@@ -136,7 +148,9 @@ 
             $start = 1;
             continue;
         }
-        if (!$start) continue;
+        if (!$start) {
+            continue;
+        }
         $arr = preg_split("/\s+/", $line);
         //print_r($arr);
 
@@ -151,7 +165,9 @@ 
            $start_step = $step;
         } else {
             $count+=1;
-            if($GLOBALS["debug"])echo "step=".$step." cpu=".$cpu."count=".$count."<br>";
+            if($GLOBALS["debug"]) {
+                echo "step=".$step." cpu=".$cpu."count=".$count."<br>";
+            }
            if($count >= 10) {
                 $end_step = $step;
                 $steps = $end_step-$start_step;
@@ -190,7 +206,9 @@ 
         }
     }
     fclose($fd);
-    if($GLOBALS["debug"])print "dump_types= ".$dump_types."<br>";
+    if($GLOBALS["debug"]) {
+        print "dump_types= ".$dump_types."<br>";
+    }
 
     $structure_file_size = filesize($structure_file);
     $fd = fopen($cmd_file,"r");
@@ -198,7 +216,9 @@ 
         echo "can not open file $cmd_file\n";
         exit(-1);
     }
-     if($GLOBALS["debug"]) print "structure_file_size=".$structure_file_size."<br>";
+     if($GLOBALS["debug"]) {
+         print "structure_file_size=".$structure_file_size."<br>";
+     }
    
     $loopno=1;
     $looprun=1;
@@ -207,11 +227,15 @@ 
         if(preg_match("/loopnumber\s+\d+/", $line, $matches)){
             if(preg_match("/\d+/", $matches[0], $no)){
                 //$loopno=$no[0];
-                if($no[0]>$loopno)$loopno=$no[0];
+                if($no[0]>$loopno) {
+                    $loopno=$no[0];
+                }
             }
         }
         if (preg_match("/looprun\s+\d+/", $line, $matches) and preg_match("/\d+/", $matches[0], $no)) {
-            if($no[0]>$looprun)$looprun=$no[0];
+            if($no[0]>$looprun) {
+                $looprun=$no[0];
+            }
         }
     }
     fclose($fd);
@@ -287,14 +311,18 @@ 
     //
     $sbdir = sandbox_dir($user);
     list($error, $size, $md5) = sandbox_parse_link_file("$sbdir/$fname");
-    if ($error) error_page("no $name file");
+    if ($error) {
+        error_page("no $name file");
+    }
 
     return sandbox_physical_path($user, $md5);
 }
 
 function project_flops() {
     $x = BoincUser::sum("expavg_credit");
-    if ($x == 0) $x = 200;
+    if ($x == 0) {
+        $x = 200;
+    }
     $y = 1e9*$x/200;
     return $y;
 }
@@ -393,7 +421,9 @@ 
     //
     $njobs = count(file($cmdline_file_path));
     $secs_est = estimated_makespan($njobs, $info->rsc_fpops_est);
-     if($GLOBALS["debug"])echo "secs_est is $secs_est\n";
+     if($GLOBALS["debug"]) {
+         echo "secs_est is $secs_est\n";
+     }
     //assume the server's flops is 1.5G and the average client's flops is 1G
     $hrs_est = number_format($secs_est*1.5/60, 2);
     //$hrs_est = number_format($secs_est, 2);
@@ -418,7 +448,9 @@ 
 
 function submit_job($app, $batch_id, $info, $cmdline, $i) {
     $client_disk=$info->rsc_disk_bound*2;
-    if($client_disk<500000000) $client_disk=500000000;
+    if($client_disk<500000000) {
+        $client_disk=500000000;
+    }
     $cmd = "cd ../..; ./bin/create_work --appname $app->name --batch $batch_id --rsc_fpops_est $info->rsc_fpops_est --rsc_fpops_bound $info->rsc_fpops_bound --rsc_disk_bound $client_disk";
     if ($cmdline) {
         $cmd .= " --command_line \"$cmdline\"";
@@ -469,9 +501,13 @@ 
 
 $user = get_logged_in_user();
 $user_submit = BoincUserSubmit::lookup_userid($user->id);
-if (!$user_submit) error_page("no submit access");
+if (!$user_submit) {
+    error_page("no submit access");
+}
 $app = BoincApp::lookup("name='lammps'");
-if (!$app) error_page("no lammps app");
+if (!$app) {
+    error_page("no lammps app");
+}
 
 if (!$user_submit->submit_all) {
     $usa = BoincUserSubmitApp::lookup("user_id=$user->id and app_id=$app->id");

html/user/openid.php

Doc Comments +11 added lines, -1 removed lines

@@ -315,6 +315,11 @@ 
     /**
      * Helper function used to scan for <meta>/<link> tags and extract information
      * from them
+     * @param string $tag
+     * @param string $attrName
+     * @param string $attrValue
+     * @param string $valueName
+     * @return string
      */
     protected function htmlTag($content, $tag, $attrName, $attrValue, $valueName)
     {
@@ -531,6 +536,9 @@ 
         return $params;
     }
 
+    /**
+     * @param boolean $immediate
+     */
     protected function authUrl_v1($immediate)
     {
 	$returnUrl = $this->returnUrl;
@@ -552,6 +560,9 @@ 
                                , array('query' => http_build_query($params, '', '&')));
     }
 
+    /**
+     * @param boolean $immediate
+     */
     protected function authUrl_v2($immediate)
     {
         $params = array(
@@ -587,7 +598,6 @@ 
     /**
      * Returns authentication url. Usually, you want to redirect your user to it.
      * @return String The authentication url.
-     * @param String $select_identifier Whether to request OP to select identity for an user in OpenID 2. Does not affect OpenID 1.
      * @throws ErrorException
      */
     function authUrl($immediate = false)

Indentation +19 added lines, -19 removed lines

@@ -47,11 +47,11 @@ 
 class LightOpenID
 {
     public $returnUrl
-         , $required = array()
-         , $optional = array()
-         , $verify_peer = null
-         , $capath = null
-         , $cainfo = null;
+            , $required = array()
+            , $optional = array()
+            , $verify_peer = null
+            , $capath = null
+            , $cainfo = null;
     private $identity, $claimed_id;
     protected $server, $version, $trustRoot, $aliases, $identifier_select = false
             , $ax = false, $sreg = false, $data, $setup_url = null;
@@ -261,8 +261,8 @@ 
                         $parsed_url = parse_url($this->claimed_id);
                         $this->identity =
                         $this->claimed_id = $parsed_url['scheme'] . '://'
-                                          . $parsed_url['host']
-                                          . $headers[$name];
+                                            . $parsed_url['host']
+                                            . $headers[$name];
                     }
                 }
             }
@@ -301,14 +301,14 @@ 
 
         $url = $parts + $url;
         $url = $url['scheme'] . '://'
-             . (empty($url['username'])?''
+                . (empty($url['username'])?''
                  :(empty($url['password'])? "{$url['username']}@"
                  :"{$url['username']}:{$url['password']}@"))
-             . $url['host']
-             . (empty($url['port'])?'':":{$url['port']}")
-             . (empty($url['path'])?'':$url['path'])
-             . (empty($url['query'])?'':"?{$url['query']}")
-             . (empty($url['fragment'])?'':"#{$url['fragment']}");
+                . $url['host']
+                . (empty($url['port'])?'':":{$url['port']}")
+                . (empty($url['path'])?'':$url['path'])
+                . (empty($url['query'])?'':"?{$url['query']}")
+                . (empty($url['fragment'])?'':"#{$url['fragment']}");
         return $url;
     }
 
@@ -533,7 +533,7 @@ 
 
     protected function authUrl_v1($immediate)
     {
-	$returnUrl = $this->returnUrl;
+    $returnUrl = $this->returnUrl;
         # If we have an openid.delegate that is different from our claimed id,
         # we need to somehow preserve the claimed id between requests.
         # The simplest way is to just send it along with the return_to url.
@@ -549,7 +549,7 @@ 
             ) + $this->sregParams();
 
         return $this->build_url(parse_url($this->server)
-                               , array('query' => http_build_query($params, '', '&')));
+                                , array('query' => http_build_query($params, '', '&')));
     }
 
     protected function authUrl_v2($immediate)
@@ -574,14 +574,14 @@ 
 
         if ($this->identifier_select) {
             $params['openid.identity'] = $params['openid.claimed_id']
-                 = 'http://specs.openid.net/auth/2.0/identifier_select';
+                    = 'http://specs.openid.net/auth/2.0/identifier_select';
         } else {
             $params['openid.identity'] = $this->identity;
             $params['openid.claimed_id'] = $this->claimed_id;
         }
 
         return $this->build_url(parse_url($this->server)
-                               , array('query' => http_build_query($params, '', '&')));
+                                , array('query' => http_build_query($params, '', '&')));
     }
 
     /**
@@ -638,7 +638,7 @@ 
             # If it's an OpenID 1 provider, and we've got claimed_id,
             # we have to append it to the returnUrl, like authUrl_v1 does.
             $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
-                             .  'openid.claimed_id=' . $this->claimed_id;
+                                .  'openid.claimed_id=' . $this->claimed_id;
         }
 
         if ($this->data['openid_return_to'] != $this->returnUrl) {
@@ -707,7 +707,7 @@ 
                 continue;
             }
             $key = substr($this->data['openid_' . $alias . '_type_' . $key],
-                          strlen('http://axschema.org/'));
+                            strlen('http://axschema.org/'));
             $attributes[$key] = $value;
         }
         return $attributes;

Spacing +64 added lines, -64 removed lines

@@ -69,13 +69,13 @@ 
 
     function __construct()
     {
-        $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
+        $this->trustRoot = (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'];
         $uri = rtrim(preg_replace('#((?<=\?)|&)openid\.[^&]+#', '', $_SERVER['REQUEST_URI']), '?');
-        $this->returnUrl = $this->trustRoot . $uri;
+        $this->returnUrl = $this->trustRoot.$uri;
 
         $this->data = $_POST + $_GET; # OPs may send data as POST or GET.
 
-        if(!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
+        if (!function_exists('curl_init') && !in_array('https', stream_get_wrappers())) {
             throw new ErrorException('You must have either https wrappers or curl enabled.');
         }
     }
@@ -84,7 +84,7 @@ 
     {
         switch ($name) {
         case 'identity':
-            if (strlen($value = trim((String) $value))) {
+            if (strlen($value = trim((String)$value))) {
                 if (preg_match('#^xri:/*#i', $value, $m)) {
                     $value = substr($value, strlen($m[0]));
                 } elseif (!preg_match('/^(?:[=@+\$!\(]|https?:)/i', $value)) {
@@ -139,23 +139,23 @@ 
         return !!gethostbynamel($server);
     }
 
-    protected function request_curl($url, $method='GET', $params=array())
+    protected function request_curl($url, $method = 'GET', $params = array())
     {
         $params = http_build_query($params, '', '&');
-        $curl = curl_init($url . ($method == 'GET' && $params ? '?' . $params : ''));
+        $curl = curl_init($url.($method == 'GET' && $params ? '?'.$params : ''));
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($curl, CURLOPT_HEADER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curl, CURLOPT_HTTPHEADER, array('Accept: application/xrds+xml, */*'));
 
-        if($this->verify_peer !== null) {
+        if ($this->verify_peer !== null) {
             curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verify_peer);
-            if($this->capath) {
+            if ($this->capath) {
                 curl_setopt($curl, CURLOPT_CAPATH, $this->capath);
             }
 
-            if($this->cainfo) {
+            if ($this->cainfo) {
                 curl_setopt($curl, CURLOPT_CAINFO, $this->cainfo);
             }
         }
@@ -171,17 +171,17 @@ 
         }
         $response = curl_exec($curl);
 
-        if($method == 'HEAD') {
+        if ($method == 'HEAD') {
             $headers = array();
-            foreach(explode("\n", $response) as $header) {
-                $pos = strpos($header,':');
+            foreach (explode("\n", $response) as $header) {
+                $pos = strpos($header, ':');
                 $name = strtolower(trim(substr($header, 0, $pos)));
-                $headers[$name] = trim(substr($header, $pos+1));
+                $headers[$name] = trim(substr($header, $pos + 1));
             }
 
             # Updating claimed_id in case of redirections.
             $effective_url = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
-            if($effective_url != $url) {
+            if ($effective_url != $url) {
                 $this->identity = $this->claimed_id = $effective_url;
             }
 
@@ -195,14 +195,14 @@ 
         return $response;
     }
 
-    protected function request_streams($url, $method='GET', $params=array())
+    protected function request_streams($url, $method = 'GET', $params = array())
     {
-        if(!$this->hostExists($url)) {
+        if (!$this->hostExists($url)) {
             throw new ErrorException('Invalid request.');
         }
 
         $params = http_build_query($params, '', '&');
-        switch($method) {
+        switch ($method) {
         case 'GET':
             $opts = array(
                 'http' => array(
@@ -211,7 +211,7 @@ 
                     'ignore_errors' => true,
                 )
             );
-            $url = $url . ($params ? '?' . $params : '');
+            $url = $url.($params ? '?'.$params : '');
             break;
         case 'POST':
             $opts = array(
@@ -236,31 +236,31 @@ 
                 ))
             );
 
-            $url = $url . ($params ? '?' . $params : '');
-            $headers_tmp = get_headers ($url);
-            if(!$headers_tmp) {
+            $url = $url.($params ? '?'.$params : '');
+            $headers_tmp = get_headers($url);
+            if (!$headers_tmp) {
                 return array();
             }
 
             # Parsing headers.
             $headers = array();
-            foreach($headers_tmp as $header) {
-                $pos = strpos($header,':');
+            foreach ($headers_tmp as $header) {
+                $pos = strpos($header, ':');
                 $name = strtolower(trim(substr($header, 0, $pos)));
-                $headers[$name] = trim(substr($header, $pos+1));
+                $headers[$name] = trim(substr($header, $pos + 1));
 
                 # Following possible redirections. The point is just to have
                 # claimed_id change with them, because get_headers() will
                 # follow redirections automatically.
                 # We ignore redirections with relative paths.
                 # If any known provider uses them, file a bug report.
-                if($name == 'location') {
-                    if(strpos($headers[$name], 'http') === 0) {
+                if ($name == 'location') {
+                    if (strpos($headers[$name], 'http') === 0) {
                         $this->identity = $this->claimed_id = $headers[$name];
-                    } elseif($headers[$name][0] == '/') {
+                    } elseif ($headers[$name][0] == '/') {
                         $parsed_url = parse_url($this->claimed_id);
                         $this->identity =
-                        $this->claimed_id = $parsed_url['scheme'] . '://'
+                        $this->claimed_id = $parsed_url['scheme'].'://'
                                           . $parsed_url['host']
                                           . $headers[$name];
                     }
@@ -272,7 +272,7 @@ 
             return $headers;
         }
 
-        if($this->verify_peer) {
+        if ($this->verify_peer) {
             $opts += array('ssl' => array(
                 'verify_peer' => true,
                 'capath'      => $this->capath,
@@ -280,14 +280,14 @@ 
             ));
         }
 
-        $context = stream_context_create ($opts);
+        $context = stream_context_create($opts);
 
         return file_get_contents($url, false, $context);
     }
 
-    protected function request($url, $method='GET', $params=array())
+    protected function request($url, $method = 'GET', $params = array())
     {
-        if(function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
+        if (function_exists('curl_init') && !ini_get('safe_mode') && !ini_get('open_basedir')) {
             return $this->request_curl($url, $method, $params);
         }
         return $this->request_streams($url, $method, $params);
@@ -296,19 +296,19 @@ 
     protected function build_url($url, $parts)
     {
         if (isset($url['query'], $parts['query'])) {
-            $parts['query'] = $url['query'] . '&' . $parts['query'];
+            $parts['query'] = $url['query'].'&'.$parts['query'];
         }
 
         $url = $parts + $url;
-        $url = $url['scheme'] . '://'
-             . (empty($url['username'])?''
-                 :(empty($url['password'])? "{$url['username']}@"
+        $url = $url['scheme'].'://'
+             . (empty($url['username']) ? ''
+                 :(empty($url['password']) ? "{$url['username']}@"
                  :"{$url['username']}:{$url['password']}@"))
              . $url['host']
-             . (empty($url['port'])?'':":{$url['port']}")
-             . (empty($url['path'])?'':$url['path'])
-             . (empty($url['query'])?'':"?{$url['query']}")
-             . (empty($url['fragment'])?'':"#{$url['fragment']}");
+             . (empty($url['port']) ? '' : ":{$url['port']}")
+             . (empty($url['path']) ? '' : $url['path'])
+             . (empty($url['query']) ? '' : "?{$url['query']}")
+             . (empty($url['fragment']) ? '' : "#{$url['fragment']}");
         return $url;
     }
 
@@ -322,7 +322,7 @@ 
         preg_match_all("#<{$tag}[^>]*$valueName=['\"](.+?)['\"][^>]*$attrName=['\"].*?$attrValue.*?['\"][^>]*/?>#i", $content, $matches2);
 
         $result = array_merge($matches1[1], $matches2[1]);
-        return empty($result)?false:$result[0];
+        return empty($result) ? false : $result[0];
     }
 
     /**
@@ -348,7 +348,7 @@ 
         $yadis = true;
 
         # We'll jump a maximum of 5 times, to avoid endless redirections.
-        for ($i = 0; $i < 5; $i ++) {
+        for ($i = 0; $i < 5; $i++) {
             if ($yadis) {
                 $headers = $this->request($url, 'HEAD');
 
@@ -370,12 +370,12 @@ 
                     $content = $this->request($url, 'GET');
 
                     preg_match_all('#<Service.*?>(.*?)</Service>#s', $content, $m);
-                    foreach($m[1] as $content) {
-                        $content = ' ' . $content; # The space is added, so that strpos doesn't return 0.
+                    foreach ($m[1] as $content) {
+                        $content = ' '.$content; # The space is added, so that strpos doesn't return 0.
 
                         # OpenID 2
                         $ns = preg_quote('http://specs.openid.net/auth/2.0/');
-                        if(preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
+                        if (preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
                             if ($type[1] == 'server') $this->identifier_select = true;
 
                             preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
@@ -384,7 +384,7 @@ 
                                 return false;
                             }
                             # Does the server advertise support for either AX or SREG?
-                            $this->ax   = (bool) strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>');
+                            $this->ax   = (bool)strpos($content, '<Type>http://openid.net/srv/ax/1.0</Type>');
                             $this->sreg = strpos($content, '<Type>http://openid.net/sreg/1.0</Type>')
                                        || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
 
@@ -498,33 +498,33 @@ 
         if ($this->required || $this->optional) {
             $params['openid.ns.ax'] = 'http://openid.net/srv/ax/1.0';
             $params['openid.ax.mode'] = 'fetch_request';
-            $this->aliases  = array();
+            $this->aliases = array();
             $counts   = array();
             $required = array();
             $optional = array();
-            foreach (array('required','optional') as $type) {
+            foreach (array('required', 'optional') as $type) {
                 foreach ($this->$type as $alias => $field) {
                     if (is_int($alias)) $alias = strtr($field, '/', '_');
-                    $this->aliases[$alias] = 'http://axschema.org/' . $field;
+                    $this->aliases[$alias] = 'http://axschema.org/'.$field;
                     if (empty($counts[$alias])) $counts[$alias] = 0;
                     $counts[$alias] += 1;
                     ${$type}[] = $alias;
                 }
             }
             foreach ($this->aliases as $alias => $ns) {
-                $params['openid.ax.type.' . $alias] = $ns;
+                $params['openid.ax.type.'.$alias] = $ns;
             }
             foreach ($counts as $alias => $count) {
                 if ($count == 1) continue;
-                $params['openid.ax.count.' . $alias] = $count;
+                $params['openid.ax.count.'.$alias] = $count;
             }
 
             # Don't send empty ax.requied and ax.if_available.
             # Google and possibly other providers refuse to support ax when one of these is empty.
-            if($required) {
+            if ($required) {
                 $params['openid.ax.required'] = implode(',', $required);
             }
-            if($optional) {
+            if ($optional) {
                 $params['openid.ax.if_available'] = implode(',', $optional);
             }
         }
@@ -537,8 +537,8 @@ 
         # If we have an openid.delegate that is different from our claimed id,
         # we need to somehow preserve the claimed id between requests.
         # The simplest way is to just send it along with the return_to url.
-        if($this->identity != $this->claimed_id) {
-            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?') . 'openid.claimed_id=' . $this->claimed_id;
+        if ($this->identity != $this->claimed_id) {
+            $returnUrl .= (strpos($returnUrl, '?') ? '&' : '?').'openid.claimed_id='.$this->claimed_id;
         }
 
         $params = array(
@@ -612,15 +612,15 @@ 
         # by presenting user_setup_url (for 1.1) or reporting
         # mode 'setup_needed' (for 2.0). Also catching all modes other than
         # id_res, in order to avoid throwing errors.
-        if(isset($this->data['openid_user_setup_url'])) {
+        if (isset($this->data['openid_user_setup_url'])) {
             $this->setup_url = $this->data['openid_user_setup_url'];
             return false;
         }
-        if($this->mode != 'id_res') {
+        if ($this->mode != 'id_res') {
             return false;
         }
 
-        $this->claimed_id = isset($this->data['openid_claimed_id'])?$this->data['openid_claimed_id']:$this->data['openid_identity'];
+        $this->claimed_id = isset($this->data['openid_claimed_id']) ? $this->data['openid_claimed_id'] : $this->data['openid_identity'];
         $params = array(
             'openid.assoc_handle' => $this->data['openid_assoc_handle'],
             'openid.signed'       => $this->data['openid_signed'],
@@ -638,7 +638,7 @@ 
             # If it's an OpenID 1 provider, and we've got claimed_id,
             # we have to append it to the returnUrl, like authUrl_v1 does.
             $this->returnUrl .= (strpos($this->returnUrl, '?') ? '&' : '?')
-                             .  'openid.claimed_id=' . $this->claimed_id;
+                             .  'openid.claimed_id='.$this->claimed_id;
         }
 
         if ($this->data['openid_return_to'] != $this->returnUrl) {
@@ -656,8 +656,8 @@ 
             # In such case, validation would fail, since we'd send different data than OP
             # wants to verify. stripslashes() should solve that problem, but we can't
             # use it when magic_quotes is off.
-            $value = $this->data['openid_' . str_replace('.','_',$item)];
-            $params['openid.' . $item] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
+            $value = $this->data['openid_'.str_replace('.', '_', $item)];
+            $params['openid.'.$item] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
 
         }
 
@@ -695,18 +695,18 @@ 
 
         $attributes = array();
         foreach ($this->data as $key => $value) {
-            $keyMatch = 'openid_' . $alias . '_value_';
+            $keyMatch = 'openid_'.$alias.'_value_';
             if (substr($key, 0, strlen($keyMatch)) != $keyMatch) {
                 continue;
             }
             $key = substr($key, strlen($keyMatch));
-            if (!isset($this->data['openid_' . $alias . '_type_' . $key])) {
+            if (!isset($this->data['openid_'.$alias.'_type_'.$key])) {
                 # OP is breaking the spec by returning a field without
                 # associated ns. This shouldn't happen, but it's better
                 # to check, than cause an E_NOTICE.
                 continue;
             }
-            $key = substr($this->data['openid_' . $alias . '_type_' . $key],
+            $key = substr($this->data['openid_'.$alias.'_type_'.$key],
                           strlen('http://axschema.org/'));
             $attributes[$key] = $value;
         }

Braces +39 added lines, -13 removed lines

@@ -333,7 +333,9 @@ 
      */
     function discover($url)
     {
-        if (!$url) throw new ErrorException('No identity supplied.');
+        if (!$url) {
+            throw new ErrorException('No identity supplied.');
+        }
         # Use xri.net proxy to resolve i-name identities
         if (!preg_match('#^https?:#', $url)) {
             $url = "https://xri.net/$url";
@@ -376,7 +378,9 @@ 
                         # OpenID 2
                         $ns = preg_quote('http://specs.openid.net/auth/2.0/');
                         if(preg_match('#<Type>\s*'.$ns.'(server|signon)\s*</Type>#s', $content, $type)) {
-                            if ($type[1] == 'server') $this->identifier_select = true;
+                            if ($type[1] == 'server') {
+                                $this->identifier_select = true;
+                            }
 
                             preg_match('#<URI.*?>(.*)</URI>#', $content, $server);
                             preg_match('#<(Local|Canonical)ID>(.*)</\1ID>#', $content, $delegate);
@@ -389,7 +393,9 @@ 
                                        || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
 
                             $server = $server[1];
-                            if (isset($delegate[2])) $this->identity = trim($delegate[2]);
+                            if (isset($delegate[2])) {
+                                $this->identity = trim($delegate[2]);
+                            }
                             $this->version = 2;
 
                             $this->server = $server;
@@ -410,7 +416,9 @@ 
                                        || strpos($content, '<Type>http://openid.net/extensions/sreg/1.1</Type>');
 
                             $server = $server[1];
-                            if (isset($delegate[1])) $this->identity = $delegate[1];
+                            if (isset($delegate[1])) {
+                                $this->identity = $delegate[1];
+                            }
                             $this->version = 1;
 
                             $this->server = $server;
@@ -424,7 +432,9 @@ 
                     $content = null;
                     break;
                 }
-                if ($next) continue;
+                if ($next) {
+                    continue;
+                }
 
                 # There are no relevant information in headers, so we search the body.
                 $content = $this->request($url, 'GET');
@@ -435,7 +445,9 @@ 
                 }
             }
 
-            if (!$content) $content = $this->request($url, 'GET');
+            if (!$content) {
+                $content = $this->request($url, 'GET');
+            }
 
             # At this point, the YADIS Discovery has failed, so we'll switch
             # to openid2 HTML discovery, then fallback to openid 1.1 discovery.
@@ -475,7 +487,9 @@ 
         if ($this->required) {
             $params['openid.sreg.required'] = array();
             foreach ($this->required as $required) {
-                if (!isset(self::$ax_to_sreg[$required])) continue;
+                if (!isset(self::$ax_to_sreg[$required])) {
+                    continue;
+                }
                 $params['openid.sreg.required'][] = self::$ax_to_sreg[$required];
             }
             $params['openid.sreg.required'] = implode(',', $params['openid.sreg.required']);
@@ -484,7 +498,9 @@ 
         if ($this->optional) {
             $params['openid.sreg.optional'] = array();
             foreach ($this->optional as $optional) {
-                if (!isset(self::$ax_to_sreg[$optional])) continue;
+                if (!isset(self::$ax_to_sreg[$optional])) {
+                    continue;
+                }
                 $params['openid.sreg.optional'][] = self::$ax_to_sreg[$optional];
             }
             $params['openid.sreg.optional'] = implode(',', $params['openid.sreg.optional']);
@@ -504,9 +520,13 @@ 
             $optional = array();
             foreach (array('required','optional') as $type) {
                 foreach ($this->$type as $alias => $field) {
-                    if (is_int($alias)) $alias = strtr($field, '/', '_');
+                    if (is_int($alias)) {
+                        $alias = strtr($field, '/', '_');
+                    }
                     $this->aliases[$alias] = 'http://axschema.org/' . $field;
-                    if (empty($counts[$alias])) $counts[$alias] = 0;
+                    if (empty($counts[$alias])) {
+                        $counts[$alias] = 0;
+                    }
                     $counts[$alias] += 1;
                     ${$type}[] = $alias;
                 }
@@ -515,7 +535,9 @@ 
                 $params['openid.ax.type.' . $alias] = $ns;
             }
             foreach ($counts as $alias => $count) {
-                if ($count == 1) continue;
+                if ($count == 1) {
+                    continue;
+                }
                 $params['openid.ax.count.' . $alias] = $count;
             }
 
@@ -592,8 +614,12 @@ 
      */
     function authUrl($immediate = false)
     {
-        if ($this->setup_url && !$immediate) return $this->setup_url;
-        if (!$this->server) $this->discover($this->identity);
+        if ($this->setup_url && !$immediate) {
+            return $this->setup_url;
+        }
+        if (!$this->server) {
+            $this->discover($this->identity);
+        }
 
         if ($this->version == 2) {
             return $this->authUrl_v2($immediate);

html/user/per_app_list.php

Doc Comments +9 added lines

@@ -29,6 +29,9 @@ 
 // return a column title (Average or Total),
 // hyperlinked if this is not the current sort column
 //
+/**
+ * @param integer $i
+ */
 function col_title($is_team, $app, $appid, $is_total, $i) {
     $x = $i?"Total":"Average";
     if ($app->id == $appid && ($is_total?$i:!$i)) {
@@ -62,6 +65,9 @@ 
 
 // show a user or team, with their credit for each app
 //
+/**
+ * @param integer $i
+ */
 function show_row($item, $apps, $is_team, $i) {
     if ($is_team) {
         $team = BoincTeam::lookup_id($item->teamid);
@@ -96,6 +102,9 @@ 
     echo "</tr>\n";
 }
 
+/**
+ * @param string $appid
+ */
 function show_list($is_team, $appid, $is_total) {
     $x = $is_team?"teams":"participants";
     page_head("Top $x by application");

Spacing +6 added lines, -6 removed lines

@@ -30,8 +30,8 @@ 
 // hyperlinked if this is not the current sort column
 //
 function col_title($is_team, $app, $appid, $is_total, $i) {
-    $x = $i?"Total":"Average";
-    if ($app->id == $appid && ($is_total?$i:!$i)) {
+    $x = $i ? "Total" : "Average";
+    if ($app->id == $appid && ($is_total ? $i : !$i)) {
         return $x;
     } else {
         return "<a href=per_app_list.php?appid=$app->id&is_team=$is_team&is_total=$i>$x</a>";
@@ -51,7 +51,7 @@ 
     echo "<tr>";
     echo "<th>Rank</th><th>Name</th>\n";
     foreach ($apps as $app) {
-        for ($i=0; $i<2; $i++) {
+        for ($i = 0; $i < 2; $i++) {
             $x = col_title($is_team, $app, $appid, $is_total, $i);
             echo "<th>$x</th>\n";
         }
@@ -70,7 +70,7 @@ 
     } else {
         $user = BoincUser::lookup_id($item->userid);
         if (!$user) return;
-        $x= "<td>".user_links($user, BADGE_HEIGHT_MEDIUM)."</td>\n";
+        $x = "<td>".user_links($user, BADGE_HEIGHT_MEDIUM)."</td>\n";
     }
     echo "<tr>";
     echo "<td>$i</td>\n";
@@ -97,7 +97,7 @@ 
 }
 
 function show_list($is_team, $appid, $is_total) {
-    $x = $is_team?"teams":"participants";
+    $x = $is_team ? "teams" : "participants";
     page_head("Top $x by application");
     $apps = BoincApp::enum("deprecated=0");
     if (!$appid) {
@@ -105,7 +105,7 @@ 
     }
     start_table('table-striped');
     show_header($is_team, $apps, $appid, $is_total);
-    $x = $is_total?"total":"expavg";
+    $x = $is_total ? "total" : "expavg";
     if ($is_team) {
         $items = BoincCreditTeam::enum("appid=$appid order by $x desc");
     } else {

Braces +6 added lines, -2 removed lines

@@ -65,11 +65,15 @@
 function show_row($item, $apps, $is_team, $i) {
     if ($is_team) {
         $team = BoincTeam::lookup_id($item->teamid);
-        if (!$team) return;
+        if (!$team) {
+            return;
+        }
         $x = "<td>".team_links($team)."</td>\n";
     } else {
         $user = BoincUser::lookup_id($item->userid);
-        if (!$user) return;
+        if (!$user) {
+            return;
+        }
         $x= "<td>".user_links($user, BADGE_HEIGHT_MEDIUM)."</td>\n";
     }
     echo "<tr>";

html/user/server_status.php

Doc Comments +17 added lines

@@ -88,17 +88,26 @@ 
 ";
 }
 
+/**
+ * @param string $name
+ */
 function item_xml($name, $val) {
     if (!$val) $val = 0;
     echo "   <$name>$val</$name>\n";
 }
 
+/**
+ * @param string $name
+ */
 function item_html($name, $val) {
     $name = tra($name);
     echo "<tr><td>$name</td><td>$val</td></tr>\n";
     //echo "<tr><td align=right>$name</td><td align=right>$val</td></tr>\n";
 }
 
+/**
+ * @param stdClass $x
+ */
 function show_status_html($x) {
     page_head(tra("Project status"));
     $j = $x->jobs;
@@ -190,6 +199,9 @@ 
     page_tail();
 }
 
+/**
+ * @param stdClass $x
+ */
 function show_status_xml($x) {
     xml_header();
     echo "<server_status>\n<daemon_status>\n";
@@ -239,6 +251,11 @@ 
 ";
 }
 
+/**
+ * @param string $cmd
+ * @param string $pidname
+ * @param string $host
+ */
 function local_daemon_running($cmd, $pidname, $host) {
     if (!$pidname) {
         $cmd = trim($cmd);

Spacing +9 added lines, -9 removed lines

@@ -171,7 +171,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;
         echo "<tr>
             <td>$app->user_friendly_name</td>
@@ -244,7 +244,7 @@ 
         $cmd = trim($cmd);
         $x = explode(" ", $cmd);
         $prog = $x[0];
-        $pidname = $prog . '.pid';
+        $pidname = $prog.'.pid';
     }
     $path = "../../pid_$host/$pidname";
     if (is_file($path)) {
@@ -285,12 +285,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;
     }
@@ -300,7 +300,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) {
@@ -312,14 +312,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;
@@ -331,7 +331,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;
@@ -347,7 +347,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;

Braces +12 added lines, -4 removed lines

@@ -89,7 +89,9 @@ 
 }
 
 function item_xml($name, $val) {
-    if (!$val) $val = 0;
+    if (!$val) {
+        $val = 0;
+    }
     echo "   <$name>$val</$name>\n";
 }
 
@@ -254,7 +256,9 @@ 
             $out = Array();
             exec("ps -ww $pid", $out);
             foreach ($out as $y) {
-                if (strstr($y, (string)$pid)) return 1;
+                if (strstr($y, (string)$pid)) {
+                    return 1;
+                }
             }
         }
     }
@@ -342,7 +346,9 @@ 
             $x = new StdClass;
             $x->cmd = (string)$d->cmd;
             $x->host = (string)$d->host;
-            if (!$x->host) $x->host = $main_host;
+            if (!$x->host) {
+                $x->host = $main_host;
+            }
             $x->status = -1;
             $disabled_daemons[] = $x;
             continue;
@@ -429,7 +435,9 @@ 
 
     $s->cached_time = time();
     $e = set_cached_data(STATUS_PAGE_TTL, serialize($s), "job_status");
-    if ($e) echo "set_cached_data(): $e\n";
+    if ($e) {
+        echo "set_cached_data(): $e\n";
+    }
     return $s;
 }
 

html/user/show_coproc.php

Doc Comments +3 added lines

@@ -25,6 +25,9 @@
 
 check_get_args(array("mode"));
 
+/**
+ * @param string $mode
+ */
 function filename($mode) {
     switch ($mode) {
     case 'host': return "cuda_hosts.dat";

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
         echo $x;
         break;
     }
-    echo "</td><td align=right>".format_credit_large($y->credit),"</td><td align=right>$y->nresults</td></tr>\n";
+    echo "</td><td align=right>".format_credit_large($y->credit), "</td><td align=right>$y->nresults</td></tr>\n";
 }
 
 $mode = get_str('mode', true);

html/user/submit.php

Doc Comments +9 added lines

@@ -37,6 +37,9 @@ 
     return $n;
 }
 
+/**
+ * @param integer $state
+ */
 function show_all_link($batches, $state, $limit, $user, $app) {
     $n = state_count($batches, $state);
     if ($n > $limit) {
@@ -269,6 +272,9 @@ 
     page_tail();
 }
 
+/**
+ * @param null|integer $app_id
+ */
 function check_admin_access($user, $app_id) {
     $user_submit = BoincUserSubmit::lookup_userid($user->id);
     if (!$user_submit) error_page("no access");
@@ -523,6 +529,9 @@ 
     page_tail();
 }
 
+/**
+ * @param null|integer $state
+ */
 function show_batches_in_state($batches, $state) {
     switch ($state) {
     case BATCH_STATE_IN_PROGRESS:

Spacing +5 added lines, -5 removed lines

@@ -323,7 +323,7 @@ 
     }
     row2("GFLOP/hours, estimated", number_format(credit_to_gflop_hours($batch->credit_estimate), 2));
     row2("GFLOP/hours, actual", number_format(credit_to_gflop_hours($batch->credit_canonical), 2));
-    row2("Output File Size (MB)", number_format(batch_output_file_size($batch->id)/1e6,2));
+    row2("Output File Size (MB)", number_format(batch_output_file_size($batch->id)/1e6, 2));
     end_table();
     if (batch_output_file_size($batch->id) <= 1e8) {
         $url = boinc_get_output_files_url($user, $batch_id);
@@ -357,9 +357,9 @@ 
         "Canonical instance<br><p class=\"text-muted\">click to see result page on BOINC server</p>",
         "Download Results"
     );
-    foreach($wus as $wu) {
+    foreach ($wus as $wu) {
         $resultid = $wu->canonical_resultid;
-        $durl = boinc_get_wu_output_files_url($user,$wu->id);
+        $durl = boinc_get_wu_output_files_url($user, $wu->id);
         if ($resultid) {
             $x = "<a href=result.php?resultid=$resultid>$resultid</a>";
             $y = '<font color="green">completed</font>';
@@ -369,7 +369,7 @@ 
             $text = "---";
             if ($batch->state == BATCH_STATE_COMPLETE) {
                 $y = '<font color="red">failed</font>';
-            }   else {
+            } else {
                 $y = "in progress";
             }
         }
@@ -434,7 +434,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>

Braces +71 added lines, -25 removed lines

@@ -32,7 +32,9 @@ 
 function state_count($batches, $state) {
     $n = 0;
     foreach ($batches as $batch) {
-        if ($batch->state == $state) $n++;
+        if ($batch->state == $state) {
+            $n++;
+        }
     }
     return $n;
 }
@@ -40,10 +42,16 @@ 
 function show_all_link($batches, $state, $limit, $user, $app) {
     $n = state_count($batches, $state);
     if ($n > $limit) {
-        if ($user) $userid = $user->id;
-        else $userid = 0;
-        if ($app) $appid = $app->id;
-        else $appid = 0;
+        if ($user) {
+            $userid = $user->id;
+        } else {
+            $userid = 0;
+        }
+        if ($app) {
+            $appid = $app->id;
+        } else {
+            $appid = 0;
+        }
 
         echo "Showing the most recent $limit of $n batches.
             <a href=submit.php?action=show_all&state=$state&userid=$userid&appid=$appid>Show all $n</a>
@@ -56,8 +64,12 @@ 
     $first = true;
     $n = 0;
     foreach ($batches as $batch) {
-        if ($batch->state != BATCH_STATE_IN_PROGRESS) continue;
-        if ($limit && $n == $limit) break;
+        if ($batch->state != BATCH_STATE_IN_PROGRESS) {
+            continue;
+        }
+        if ($limit && $n == $limit) {
+            break;
+        }
         $n++;
         if ($first) {
             $first = false;
@@ -100,8 +112,12 @@ 
     $first = true;
     $n = 0;
     foreach ($batches as $batch) {
-        if ($batch->state != BATCH_STATE_COMPLETE) continue;
-        if ($limit && $n == $limit) break;
+        if ($batch->state != BATCH_STATE_COMPLETE) {
+            continue;
+        }
+        if ($limit && $n == $limit) {
+            break;
+        }
         $n++;
         if ($first) {
             $first = false;
@@ -132,8 +148,12 @@ 
     $first = true;
     $n = 0;
     foreach ($batches as $batch) {
-        if ($batch->state != BATCH_STATE_ABORTED) continue;
-        if ($limit && $n == $limit) break;
+        if ($batch->state != BATCH_STATE_ABORTED) {
+            continue;
+        }
+        if ($limit && $n == $limit) {
+            break;
+        }
         $n++;
         if ($first) {
             $first = false;
@@ -212,7 +232,9 @@ 
         foreach ($submit_urls as $appname=>$submit_url) {
             $appname = BoincDb::escape_string($appname);
             $app = BoincApp::lookup("name='$appname'");
-            if (!$app) error_page("bad submit_url name: $appname");
+            if (!$app) {
+                error_page("bad submit_url name: $appname");
+            }
             $usa = BoincUserSubmitApp::lookup("user_id=$user->id and app_id=$app->id");
             if ($usa || $user_submit->submit_all) {
                 echo "<li> <a href=$submit_url> $app->user_friendly_name </a>";
@@ -271,14 +293,20 @@ 
 
 function check_admin_access($user, $app_id) {
     $user_submit = BoincUserSubmit::lookup_userid($user->id);
-    if (!$user_submit) error_page("no access");
+    if (!$user_submit) {
+        error_page("no access");
+    }
     if ($app_id) {
         if (!$user_submit->manage_all) {
             $usa = BoincUserSubmitApp::lookup("user_id = $user->id and app_id=$app_id");
-            if (!$usa) error_page("no access");
+            if (!$usa) {
+                error_page("no access");
+            }
         }
     } else {
-        if (!$user_submit->manage_all) error_page("no access");
+        if (!$user_submit->manage_all) {
+            error_page("no access");
+        }
     }
 }
 
@@ -287,7 +315,9 @@ 
     check_admin_access($user, $app_id);
     if ($app_id) {
         $app = BoincApp::lookup_id($app_id);
-        if (!$app) error_page("no such app");
+        if (!$app) {
+            error_page("no such app");
+        }
         page_head("Administer batches for $app->user_friendly_name");
         $batches = BoincBatch::enum("app_id = $app_id order by id desc");
         show_batches($batches, PAGE_SIZE, null, $app);
@@ -369,7 +399,7 @@ 
             $text = "---";
             if ($batch->state == BATCH_STATE_COMPLETE) {
                 $y = '<font color="red">failed</font>';
-            }   else {
+            } else {
                 $y = "in progress";
             }
         }
@@ -391,7 +421,9 @@ 
 function handle_query_job($user) {
     $wuid = get_int('wuid');
     $wu = BoincWorkunit::lookup_id($wuid);
-    if (!$wu) error_page("no such job");
+    if (!$wu) {
+        error_page("no such job");
+    }
 
     page_head("Job $wuid");
 
@@ -477,18 +509,26 @@ 
 }
 
 function check_access($user, $batch) {
-    if ($user->id == $batch->user_id) return;
+    if ($user->id == $batch->user_id) {
+        return;
+    }
     $user_submit = BoincUserSubmit::lookup_userid($user->id);
-    if ($user_submit->manage_all) return;
+    if ($user_submit->manage_all) {
+        return;
+    }
     $usa = BoincUserSubmitApp::lookup("user_id=$user->id and app_id=$batch->app_id");
-    if ($usa->manage) return;
+    if ($usa->manage) {
+        return;
+    }
     error_page("no access");
 }
 
 function handle_abort_batch($user) {
     $batch_id = get_int('batch_id');
     $batch = BoincBatch::lookup_id($batch_id);
-    if (!$batch) error_page("no such batch");
+    if (!$batch) {
+        error_page("no such batch");
+    }
     check_access($user, $batch);
     abort_batch($batch);
     page_head("Batch aborted");
@@ -515,7 +555,9 @@ 
 function handle_retire_batch($user) {
     $batch_id = get_int('batch_id');
     $batch = BoincBatch::lookup_id($batch_id);
-    if (!$batch) error_page("no such batch");
+    if (!$batch) {
+        error_page("no such batch");
+    }
     check_access($user, $batch);
     retire_batch($batch);
     page_head("Batch retired");
@@ -548,7 +590,9 @@ 
     if ($userid) {
         // user looking at their own batches
         //
-        if ($userid != $user->id) error_page("wrong user");
+        if ($userid != $user->id) {
+            error_page("wrong user");
+        }
         $batches = BoincBatch::enum("user_id = $user->id and state=$state order by id desc");
         fill_in_app_and_user_names($batches);
         show_batches_in_state($batches, $state);
@@ -558,7 +602,9 @@ 
         check_admin_access($user, $appid);
         if ($appid) {
             $app = BoincApp::lookup_id($appid);
-            if (!$app) error_page("no such app");
+            if (!$app) {
+                error_page("no such app");
+            }
             $batches = BoincBatch::enum("app_id = $appid and state=$state order by id desc");
         } else {
             $batches = BoincBatch::enum("state=$state order by id desc");

html/user/submit_rpc_handler.php

Doc Comments +25 added lines

@@ -30,6 +30,9 @@ 
 ini_set('display_errors', true);
 ini_set('display_startup_errors', true);
 
+/**
+ * @param string $name
+ */
 function get_wu($name) {
     $name = BoincDb::escape_string($name);
     $wu = BoincWorkunit::lookup("name='$name'");
@@ -37,6 +40,9 @@ 
     return $wu;
 }
 
+/**
+ * @param string $name
+ */
 function get_submit_app($name) {
     $name = BoincDb::escape_string($name);
     $app = BoincApp::lookup("name='$name'");
@@ -76,6 +82,9 @@ 
     return $y;
 }
 
+/**
+ * @param SimpleXMLElement|null $template
+ */
 function est_elapsed_time($r, $template) {
     // crude estimate: batch FLOPs / project FLOPS
     //
@@ -122,6 +131,9 @@ 
     ";
 }
 
+/**
+ * @param SimpleXMLElement $template
+ */
 function validate_batch($jobs, $template) {
     $i = 0;
     $n = count($template->file_info);
@@ -191,6 +203,10 @@ 
 
 // submit a list of jobs with a single create_work command.
 //
+/**
+ * @param SimpleXMLElement|null $template
+ * @param double $priority
+ */
 function submit_jobs(
     $jobs, $template, $app, $batch_id, $priority,
     $result_template_file,      // batch-level; can also specify per job
@@ -267,6 +283,9 @@ 
 // Check whether the template is already in our map.
 // If not, write it to a temp file.
 //
+/**
+ * @param stdClass $job
+ */
 function make_wu_template($job) {
     global $wu_templates;
     if (!array_key_exists($job->wu_template, $wu_templates)) {
@@ -283,6 +302,9 @@ 
 // A little different because these have to exist for life of job.
 // Store them in templates/tmp/, with content-based filenames
 //
+/**
+ * @param stdClass $job
+ */
 function make_result_template($job) {
     global $result_templates;
     if (!array_key_exists($job->result_template, $result_templates)) {
@@ -468,6 +490,9 @@ 
     ";
 }
 
+/**
+ * @param integer $get_cpu_time
+ */
 function print_batch_params($batch, $get_cpu_time) {
     $app = BoincApp::lookup_id($batch->app_id);
     if (!$app) $app->name = "none";

Spacing +22 added lines, -22 removed lines

@@ -54,7 +54,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;
@@ -79,14 +79,14 @@ 
 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();
 }
 
 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);
@@ -125,7 +125,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) {
             xml_error(-1, "BOINC server: wrong # of input files for job $i: need $n, got $m");
@@ -180,7 +180,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);
@@ -193,7 +193,7 @@ 
 //
 function submit_jobs(
     $jobs, $template, $app, $batch_id, $priority,
-    $result_template_file,      // batch-level; can also specify per job
+    $result_template_file, // batch-level; can also specify per job
     $workunit_template_file
 ) {
     global $wu_templates, $result_templates;
@@ -202,7 +202,7 @@ 
     // one line per job
     //
     $x = "";
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         if ($job->name) {
             $x .= " --wu_name $job->name";
         }
@@ -234,8 +234,8 @@ 
         $x .= "\n";
     }
 
-    $errfile = "/tmp/create_work_" . getmypid() . ".err";
-    $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id --priority $priority";
+    $errfile = "/tmp/create_work_".getmypid().".err";
+    $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id --priority $priority";
     if ($result_template_file) {
         $cmd .= " --result_template templates/$result_template_file";
     }
@@ -313,7 +313,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;
@@ -384,11 +384,11 @@ 
     // - use that for batch logical end time and job priority
     //
     $total_flops = 0;
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         if ($job->rsc_fpops_est) {
             $total_flops += $job->rsc_fpops_est;
         } else {
-            $x = (double) $template->workunit->rsc_fpops_est;
+            $x = (double)$template->workunit->rsc_fpops_est;
             if ($x) {
                 $total_flops += $x;
             } else {
@@ -396,7 +396,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, "BOINC server: $cmd returned $x");
@@ -510,7 +510,7 @@ 
 }
 
 function n_outfiles($wu) {
-    $path = project_dir() . "/$wu->result_template_file";
+    $path = project_dir()."/$wu->result_template_file";
     $r = simplexml_load_file($path);
     return count($r->file_info);
 }
@@ -693,7 +693,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>
@@ -733,7 +733,7 @@ 
     } else {
         $results = BoincResult::enum("workunitid=$job_id");
         foreach ($results as $r) {
-            switch($r->outcome) {
+            switch ($r->outcome) {
             case 1:
             case 3:
             case 6:
@@ -841,8 +841,8 @@ 
     }
 
     list($user, $user_submit) = authenticate_user($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) {
         xml_error(-1, "template file missing");
     }
@@ -853,7 +853,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>
     ";
@@ -907,10 +907,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<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);
     }
 }

Braces +42 added lines, -14 removed lines

@@ -33,14 +33,18 @@ 
 function get_wu($name) {
     $name = BoincDb::escape_string($name);
     $wu = BoincWorkunit::lookup("name='$name'");
-    if (!$wu) xml_error(-1, "BOINC server: no job named $name was found");
+    if (!$wu) {
+        xml_error(-1, "BOINC server: no job named $name was found");
+    }
     return $wu;
 }
 
 function get_submit_app($name) {
     $name = BoincDb::escape_string($name);
     $app = BoincApp::lookup("name='$name'");
-    if (!$app) xml_error(-1, "BOINC server: no app named $name was found");
+    if (!$app) {
+        xml_error(-1, "BOINC server: no app named $name was found");
+    }
     return $app;
 }
 
@@ -71,7 +75,9 @@ 
 //
 function project_flops() {
     $x = BoincUser::sum("expavg_credit");
-    if ($x == 0) $x = 200;
+    if ($x == 0) {
+        $x = 200;
+    }
     $y = 1e9*$x/200;
     return $y;
 }
@@ -100,11 +106,15 @@ 
 }
 
 function check_max_jobs_in_progress($r, $user_submit) {
-    if (!$user_submit->max_jobs_in_progress) return;
+    if (!$user_submit->max_jobs_in_progress) {
+        return;
+    }
     $query = "select count(*) as total from DBNAME.result, DBNAME.batch where batch.user_id=$userid and result.batch = batch.id and result.server_state<".RESULT_SERVER_STATE_OVER;
     $db = BoincDb::get();
     $n = $db->get_int($query);
-    if ($n === false) return;
+    if ($n === false) {
+        return;
+    }
     if ($n + count($r->batch->job) > $user_submit->max_jobs_in_progress) {
         xml_error(-1, "BOINC server: limit on jobs in progress exceeded");
     }
@@ -154,7 +164,9 @@ 
         }
         $name = job_file_name($md5);
         $path = dir_hier_path($name, $download_dir, $fanout);
-        if (file_exists($path)) return $name;
+        if (file_exists($path)) {
+            return $name;
+        }
         if (!copy($file->source, $path)) {
             xml_error(-1, "BOINC server: can't copy file from $file->source to $path");
         }
@@ -168,7 +180,9 @@ 
         }
         $name = job_file_name($md5);
         $path = dir_hier_path($name, $download_dir, $fanout);
-        if (file_exists($path)) return $name;
+        if (file_exists($path)) {
+            return $name;
+        }
         if (!file_put_contents($path, $file->source)) {
             xml_error(-1, "BOINC server: can't write to file $path");
         }
@@ -406,7 +420,9 @@ 
     if ($batch_id) {
         $njobs = count($jobs);
         $ret = $batch->update("njobs=$njobs, logical_end_time=$let");
-        if (!$ret) xml_error(-1, "BOINC server: batch->update() failed");
+        if (!$ret) {
+            xml_error(-1, "BOINC server: batch->update() failed");
+        }
     } else {
         $batch_name = (string)($r->batch->batch_name);
         $batch_name = BoincDb::escape_string($batch_name);
@@ -440,7 +456,9 @@ 
     // otherwise we might flag batch as COMPLETED
     //
     $ret = $batch->update("state= ".BATCH_STATE_IN_PROGRESS);
-    if (!$ret) xml_error(-1, "BOINC server: batch->update() failed");
+    if (!$ret) {
+        xml_error(-1, "BOINC server: batch->update() failed");
+    }
 
     echo "<batch_id>$batch_id</batch_id>
         </submit_batch>
@@ -470,7 +488,9 @@ 
 
 function print_batch_params($batch, $get_cpu_time) {
     $app = BoincApp::lookup_id($batch->app_id);
-    if (!$app) $app->name = "none";
+    if (!$app) {
+        $app->name = "none";
+    }
     echo "
         <id>$batch->id</id>
         <create_time>$batch->create_time</create_time>
@@ -497,7 +517,9 @@ 
     $batches = BoincBatch::enum("user_id = $user->id");
     $get_cpu_time = (int)($r->get_cpu_time);
     foreach ($batches as $batch) {
-        if ($batch->state == BATCH_STATE_RETIRED) continue;
+        if ($batch->state == BATCH_STATE_RETIRED) {
+            continue;
+        }
         if ($batch->state < BATCH_STATE_COMPLETE) {
             $wus = BoincWorkunit::enum("batch = $batch->id");
             $batch = get_batch_params($batch, $wus);
@@ -584,7 +606,9 @@ 
     } else {
         xml_error(-1, "BOINC server: batch not specified");
     }
-    if (!$batch) xml_error(-1, "BOINC server: no such batch");
+    if (!$batch) {
+        xml_error(-1, "BOINC server: no such batch");
+    }
     return $batch;
 }
 
@@ -679,7 +703,9 @@ 
     list($user, $user_submit) = authenticate_user($r, null);
     $job_id = (int)($r->job_id);
     $wu = BoincWorkunit::lookup_id($job_id);
-    if (!$wu) xml_error(-1, "no such job");
+    if (!$wu) {
+        xml_error(-1, "no such job");
+    }
     $batch = BoincBatch::lookup_id($wu->batch);
     if ($batch->user_id != $user->id) {
         xml_error(-1, "not owner");
@@ -719,7 +745,9 @@ 
     $job_name = (string)($r->job_name);
     $job_name = BoincDb::escape_string($job_name);
     $wu = BoincWorkunit::lookup("name='$job_name'");
-    if (!$wu) xml_error(-1, "no such job");
+    if (!$wu) {
+        xml_error(-1, "no such job");
+    }
     $batch = BoincBatch::lookup_id($wu->batch);
     if ($batch->user_id != $user->id) {
         xml_error(-1, "not owner");

html/user/team_forum.php

Doc Comments +3 added lines

@@ -57,6 +57,9 @@
     edit_form($user, $team, $forum, true);
 }
 
+/**
+ * @param boolean $first
+ */
 function edit_form($user, $team, $forum, $first) {
     page_head(tra("Team Message Board"));
     echo "

Braces +21 added lines, -7 removed lines

@@ -22,7 +22,9 @@ 
 require_once("../inc/team.inc");
 require_once("../inc/forum_db.inc");
 
-if (DISABLE_TEAMS) error_page("Teams are disabled");
+if (DISABLE_TEAMS) {
+    error_page("Teams are disabled");
+}
 
 check_get_args(array("tnow", "ttok", "teamid", "cmd"));
 
@@ -66,8 +68,12 @@ 
     ";
     echo form_tokens($user->authenticator);
     start_table();
-    if (!strlen($forum->title)) $forum->title = $team->name;
-    if (!strlen($forum->description)) $forum->description = tra("Discussion among members of %1", $team->name);
+    if (!strlen($forum->title)) {
+        $forum->title = $team->name;
+    }
+    if (!strlen($forum->description)) {
+        $forum->description = tra("Discussion among members of %1", $team->name);
+    }
     row2(
         tra("Title"),
         '<input class="form-control" name="title" value="'.$forum->title.'">'
@@ -112,7 +118,9 @@ 
 
 function remove($team) {
     $forum = BoincForum::lookup("parent_type=1 and category=$team->id");
-    if (!$forum) error_page("message board not found");
+    if (!$forum) {
+        error_page("message board not found");
+    }
     
     // delete threads and posts
     //
@@ -165,7 +173,9 @@ 
 }
 
 $teamid = get_int("teamid", true);
-if (!$teamid) $teamid = post_int('teamid');
+if (!$teamid) {
+    $teamid = post_int('teamid');
+}
 
 $team = BoincTeam::lookup_id($teamid);
 if (!$team) {
@@ -173,7 +183,9 @@ 
 }
 
 $cmd = get_str('cmd', true);
-if (!$cmd) $cmd = post_str('cmd', true);
+if (!$cmd) {
+    $cmd = post_str('cmd', true);
+}
 
 if ($cmd == 'manage') {
     $user = get_logged_in_user();
@@ -194,7 +206,9 @@ 
     require_founder_login($user, $team);
     check_tokens($user->authenticator);
     $forum = BoincForum::lookup("parent_type=1 and category=$teamid");
-    if (!$forum) error_page("no such forum");
+    if (!$forum) {
+        error_page("no such forum");
+    }
     edit_action($forum);
 } else if ($cmd == "remove_confirm") {
     $user = get_logged_in_user();