BOINC / boinc

html/user/submit.php

Spacing +7 added lines, -7 removed lines

@@ -365,11 +365,11 @@ 
 function progress_bar($batch, $wus, $width) {
     $w_success = $width*$batch->fraction_done;
     $w_fail = $width*$batch->nerror_jobs/$batch->njobs;
-    $nsuccess = $batch->njobs * $batch->fraction_done;
+    $nsuccess = $batch->njobs*$batch->fraction_done;
     $nsent = wus_nsent($wus);
     $nprog = $nsent - $nsuccess - $batch->nerror_jobs;
     $w_prog = $width*$nprog/$batch->njobs;
-    $nunsent = $batch->njobs-$nsent;
+    $nunsent = $batch->njobs - $nsent;
     $w_unsent = $width*$nunsent/$batch->njobs;
     $x = '<table height=20><tr>';
     if ($w_fail) {
@@ -407,7 +407,7 @@ 
     page_head("Batch $batch_id");
     start_table();
     row2("name", $batch->name);
-    row2("application", $app?$app->name:'---');
+    row2("application", $app ? $app->name : '---');
     row2("state", batch_state_string($batch->state));
     //row2("# jobs", $batch->njobs);
     //row2("# error jobs", $batch->nerror_jobs);
@@ -454,7 +454,7 @@ 
         "Canonical instance<br><small>click to see result page on BOINC server</smallp>",
         "Download Results"
     );
-    foreach($wus as $wu) {
+    foreach ($wus as $wu) {
         $resultid = $wu->canonical_resultid;
         if ($resultid) {
             $x = "<a href=result.php?resultid=$resultid>$resultid</a>";
@@ -465,7 +465,7 @@ 
             $text = "---";
             if ($batch->state == BATCH_STATE_COMPLETE) {
                 $y = '<font color="red">failed</font>';
-            }   else {
+            } else {
                 $y = "in progress";
             }
         }
@@ -530,7 +530,7 @@ 
     $results = BoincResult::enum("workunitid=$wuid");
     $upload_dir = parse_config(get_config(), "<upload_dir>");
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
-    foreach($results as $result) {
+    foreach ($results as $result) {
         echo "<tr>
             <td><a href=result.php?resultid=$result->id>$result->id &middot; $result->name </a></td>
             <td>".state_string($result)."</td>
@@ -540,7 +540,7 @@ 
         if ($result->server_state == 5) {
             $phys_names = get_outfile_names($result);
             $log_names = get_outfile_log_names($result);
-            for ($i=0; $i<count($phys_names); $i++) {
+            for ($i = 0; $i < count($phys_names); $i++) {
                 $url = sprintf(
                     'get_output2.php?cmd=result&result_id=%d&file_num=%d',
                     $result->id, $i

html/user/lammps.php

Spacing +74 added lines, -74 removed lines

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

html/user/tree_threader.php

Spacing +8 added lines, -8 removed lines

@@ -18,7 +18,7 @@ 
 display_errors();
 
 $app_name = "treeThreader";
-$log = fopen("/tmp/tt_job.log","a+");
+$log = fopen("/tmp/tt_job.log", "a+");
 
 function error($s) {
     echo "<error>\n<message>$s</message>\n</error>\n";
@@ -26,14 +26,14 @@ 
 }
 
 function handle_submit($r, $user, $app) {
-    global $app_name,$log;
+    global $app_name, $log;
 
-    $timestamp = date("Y-m-d H:i",time());
+    $timestamp = date("Y-m-d H:i", time());
 	// read the list of template filenames
 	//
 	$files = file("../../tree_threader_template_files");
 	if ($files === false) {
-        fwrite($log,"$timestamp\ttemplate file tree_threader_template_files\n");
+        fwrite($log, "$timestamp\ttemplate file tree_threader_template_files\n");
         error("no templates file");
 
     }
@@ -90,7 +90,7 @@ 
 //
 function handle_get_output($r, $batch) {
     global $log;
-    $timestamp = date("Y-m-d H:i",time());
+    $timestamp = date("Y-m-d H:i", time());
 	$wus = BoincWorkUnit::enum("batch=$batch->id");
 	$outdir = "/tmp/treeThreader_result_".$batch->id;
     @mkdir($outdir);
@@ -129,14 +129,14 @@ 
 		error("can't zip output files");
 	}
 	$fname = "treeThreader_result_".$batch->id.".zip";
-    $treeThreader_dir="treeThreaderResult";
-    if(!is_dir("../../download/$treeThreader_dir"))mkdir("../../download/$treeThreader_dir");
+    $treeThreader_dir = "treeThreaderResult";
+    if (!is_dir("../../download/$treeThreader_dir"))mkdir("../../download/$treeThreader_dir");
 	@symlink("/tmp/$fname", "../../download/$treeThreader_dir/$fname");
     system("rm -fr $outdir");
     $config = simplexml_load_string(file_get_contents("../../config.xml"));
     $download_url = trim((string)$config->config->download_url);
 	echo "<tt_reply>\n<url>$download_url/$treeThreader_dir/$fname</url>\n</tt_reply>\n";
-    $log_msg="$timestamp\tuser $batch->user_id downloads results for batch $batch->id : $download_url/$treeThreader_dir/$fname\n";
+    $log_msg = "$timestamp\tuser $batch->user_id downloads results for batch $batch->id : $download_url/$treeThreader_dir/$fname\n";
     fwrite($log, $log_msg);
 }
 

html/inc/prefs_project.inc

Spacing +19 added lines, -19 removed lines

@@ -69,7 +69,7 @@ 
 }
 
 if ($app_types->cpu) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use CPU"),
         "Request CPU-only tasks from this project.",
         "no_cpu",
@@ -78,7 +78,7 @@ 
     );
 }
 if ($app_types->ati) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use AMD GPU"),
         "Request AMD GPU tasks from this project.",
         "no_ati",
@@ -87,7 +87,7 @@ 
     );
 }
 if ($app_types->cuda) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use NVIDIA GPU"),
         "Request NVIDIA GPU tasks from this project.",
         "no_cuda",
@@ -96,7 +96,7 @@ 
     );
 }
 if ($app_types->intel_gpu) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use Intel GPU"),
         "Request Intel GPU tasks from this project.",
         "no_intel_gpu",
@@ -105,7 +105,7 @@ 
     );
 }
 if ($app_types->apple_gpu) {
-    $project_pref_descs[] = new PREF_BOOL (
+    $project_pref_descs[] = new PREF_BOOL(
         tra("Use Apple GPU"),
         "Request Apple GPU tasks from this project.",
         "no_apple_gpu",
@@ -130,7 +130,7 @@ 
     $x = "";
 }
 
-$privacy_pref_descs = array (
+$privacy_pref_descs = array(
     new PREF_BOOL(
         tra("Is it OK for %1 and your team (if any) to email you?", PROJECT).$x,
         "",
@@ -178,7 +178,7 @@ 
     global $in_project_specific;
     global $venue_name;
 
-    switch($name) {
+    switch ($name) {
     case "venue":
         $venue_name = $attrs["name"];
         $top_parse_result = $parse_result;
@@ -190,7 +190,7 @@ 
         break;
     default:
         if ($in_project_specific) {
-            $text= $text."<$name>";
+            $text = $text."<$name>";
         } else {
             $text = "";
         }
@@ -205,12 +205,12 @@ 
     global $venue_name;
     global $project_pref_descs;
 
-    foreach($project_pref_descs as $p) {
+    foreach ($project_pref_descs as $p) {
         if ($p->xml_parse($parse_result, $name, $text)) {
             return;
         }
     }
-    switch($name) {
+    switch ($name) {
     case "venue":
         $top_parse_result->$venue_name = $parse_result;
         $parse_result = $top_parse_result;
@@ -254,7 +254,7 @@ 
     return $parse_result;
 }
 
-function prefs_show_project($prefs, $columns=false) {
+function prefs_show_project($prefs, $columns = false) {
     global $project_pref_descs;
     if ($columns) {
         foreach ($project_pref_descs as $p) {
@@ -293,7 +293,7 @@ 
     }
 }
 
-function prefs_show_project_specific($prefs, $columns=false) {
+function prefs_show_project_specific($prefs, $columns = false) {
     if ($columns) {
         $project_specific_prefs = project_specific_prefs_parse($prefs->project_specific);
         $project_specific_prefs->home = isset($prefs->home) ? project_specific_prefs_parse($prefs->home->project_specific) : "";
@@ -305,10 +305,10 @@ 
     project_specific_prefs_show($project_specific_prefs, $columns);
 }
 
-function print_prefs_display_project($user, $columns=false) {
+function print_prefs_display_project($user, $columns = false) {
     $project_prefs = prefs_parse_project($user->project_prefs);
 
-    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=". (int)!$columns .">".tra("(Switch View)")."</a></font>";
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=".(int)!$columns.">".tra("(Switch View)")."</a></font>";
     if ($columns) {
         start_table();
         row_heading(tra("Combined preferences").$switch_link);
@@ -359,14 +359,14 @@ 
     }
 }
 
-function prefs_form_project($prefs, $error=false) {
+function prefs_form_project($prefs, $error = false) {
     global $project_pref_descs;
     foreach ($project_pref_descs as $p) {
         $p->show_form_row($prefs, $error);
     }
 }
 
-function prefs_form_project_specific($prefs_xml, $error=false) {
+function prefs_form_project_specific($prefs_xml, $error = false) {
     $prefs = project_specific_prefs_parse($prefs_xml);
     project_specific_prefs_edit($prefs, $error);
 }
@@ -414,7 +414,7 @@ 
 
 // given a prefs structure, return the corresponding XML string
 //
-function project_prefs_make_xml($prefs, $primary=true) {
+function project_prefs_make_xml($prefs, $primary = true) {
     global $project_pref_descs;
     $xml = "";
     if ($primary) {
@@ -449,8 +449,8 @@ 
 //
 function project_prefs_update(&$user, $prefs) {
     $prefs_xml = BoincDb::escape_string(project_prefs_make_xml($prefs));
-    $send_email = $user->send_email?1:0;
-    $show_hosts = $user->show_hosts?1:0;
+    $send_email = $user->send_email ? 1 : 0;
+    $show_hosts = $user->show_hosts ? 1 : 0;
     $retval = $user->update("project_prefs='$prefs_xml', send_email=$send_email, show_hosts=$show_hosts");
     if (!$retval) {
         return 1;

html/inc/common_defs.inc

Spacing +57 added lines, -57 removed lines

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

html/user/gpu_ratios.php

Spacing +6 added lines, -6 removed lines

@@ -34,26 +34,26 @@
 $intel_gpu_credit_sum = 0;
 $apple_gpu_scale_sum = 0;
 $apple_gpu_credit_sum = 0;
-$total_credit_sum= 0;
+$total_credit_sum = 0;
 
 $apps = BoincApp::enum("deprecated=0");
 foreach ($apps as $app) {
     $avs = BoincAppVersion::enum("appid=$app->id and deprecated=0");
     foreach ($avs as $av) {
         if (strstr($av->plan_class, "ati")) {
-            $ati_scale_sum += $av->pfc_scale * $av->expavg_credit;
+            $ati_scale_sum += $av->pfc_scale*$av->expavg_credit;
             $ati_credit_sum += $av->expavg_credit;
         } else if (strstr($av->plan_class, "nvidia") || strstr($av->plan_class, "cuda")) {
-            $nvidia_scale_sum += $av->pfc_scale * $av->expavg_credit;
+            $nvidia_scale_sum += $av->pfc_scale*$av->expavg_credit;
             $nvidia_credit_sum += $av->expavg_credit;
         } else if (strstr($av->plan_class, "intel_gpu")) {
-            $intel_gpu_scale_sum += $av->pfc_scale * $av->expavg_credit;
+            $intel_gpu_scale_sum += $av->pfc_scale*$av->expavg_credit;
             $intel_gpu_credit_sum += $av->expavg_credit;
         } else if (strstr($av->plan_class, "apple_gpu")) {
-            $apple_gpu_scale_sum += $av->pfc_scale * $av->expavg_credit;
+            $apple_gpu_scale_sum += $av->pfc_scale*$av->expavg_credit;
             $apple_gpu_credit_sum += $av->expavg_credit;
         } else {
-            $cpu_scale_sum += $av->pfc_scale * $av->expavg_credit;
+            $cpu_scale_sum += $av->pfc_scale*$av->expavg_credit;
             $cpu_credit_sum += $av->expavg_credit;
         }
         $total_credit_sum += $av->expavg_credit;

html/inc/team.inc

Spacing +17 added lines, -17 removed lines

@@ -40,7 +40,7 @@ 
     row2('<b>'.tra('Search criteria (use one or more)').'</b>', '');
     row2(
         tra('Key words').'<br><small>'.tra('Find teams with these words in their names or descriptions').'</small>',
-        '<input class="form-control" type="text" name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
+        '<input class="form-control" type="text" name="keywords" value="'.htmlspecialchars($params->keywords).'">');
     row2_init(tra('Country'));
     echo '<select class="form-control" name="country"><option value="" selected>---</option>';
     $country = $params->country;
@@ -48,7 +48,7 @@ 
     echo country_select_options($country);
     echo "</select></td></tr>\n";
     row2(tra('Type of team'), team_type_select($params->type, true));
-    $checked = $params->active?"checked":"";
+    $checked = $params->active ? "checked" : "";
     row2(tra('Show only active teams'), "<input type=checkbox name=active $checked>");
     row2("", "<input class=\"btn btn-primary\" type=submit name=submit value=\"".tra('Search')."\">");
     end_table();
@@ -96,7 +96,7 @@ 
     row2("Created", date_str($team->create_time));
     if (defined("SHOW_NONVALIDATED_TEAMS")) {
         $founder = $team->founder;
-        row2("Founder email validated", $founder->email_validated?"Yes":"No (team will not be exported)");
+        row2("Founder email validated", $founder->email_validated ? "Yes" : "No (team will not be exported)");
     }
     if (strlen($team->url)) {;
         if (strstr($team->url, "http://")) {
@@ -169,7 +169,7 @@ 
     }
     row1(tra('Members'));
     row2(tra('Founder'),
-        $team->founder?user_links($team->founder, BADGE_HEIGHT_MEDIUM):"---"
+        $team->founder ?user_links($team->founder, BADGE_HEIGHT_MEDIUM) : "---"
     );
     if (count($team->admins)) {
         $first = true;
@@ -356,7 +356,7 @@ 
     foreach ($deltas as $delta) {
         $u = BoincUser::lookup_id($delta->userid);
         if ($u->teamid == $teamid) {
-            $new_members[] = $u->id;  // they might have later quit
+            $new_members[] = $u->id; // they might have later quit
         }
     }
     return array_unique($new_members);
@@ -439,7 +439,7 @@ 
     if (!$user->teamid) return;
     $user->update("teamid=0");
     $team = BoincTeam::lookup_id($user->teamid);
-    if ($team && $team->ping_user==$user->id) {
+    if ($team && $team->ping_user == $user->id) {
         $team->update("ping_user=-ping_user");
     }
     BoincTeamAdmin::delete("teamid=$user->teamid and userid=$user->id");
@@ -478,33 +478,33 @@ 
     start_table();
     row2(tra('Team name, text version').'
         <br><p class=\"text-muted\">'.tra('Don\'t use HTML tags.').'</p>',
-        '<input class="form-control" name="name" type="text" size="50" value="'.($team?$team->name:"").'">'
+        '<input class="form-control" name="name" type="text" size="50" value="'.($team ? $team->name : "").'">'
     );
     row2(tra('Team name, HTML version').'
         <br><p class=\"text-muted\">
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
         '.tra('If you don\'t know HTML, leave this box blank.').'</p>',
-        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"',"'",($team?$team->name_html:"")).'">'
+        '<input class="form-control" name="name_html" type="text" size="50" value="'.str_replace('"', "'", ($team ? $team->name_html : "")).'">'
     );
     row2(tra('URL of team web page, if any').':<br><font size=-2>('.tra('without "http://"').')
         '.tra('This URL will be linked to from the team\'s page on this site.'),
-        '<input class="form-control" type="text" name="url" size="60" value="'.($team?$team->url:"").'">'
+        '<input class="form-control" type="text" name="url" size="60" value="'.($team ? $team->url : "").'">'
     );
     row2(tra('Description of team').':
         <br><p class=\"text-muted\">
         '.tra('You may use %1 limited HTML tags %2.', '<a href="html.php" target="_new">', '</a>').'
         </p>',
-        '<textarea class="form-control" name="description" rows=10>'.($team?$team->description:"").'</textarea>'
+        '<textarea class="form-control" name="description" rows=10>'.($team ? $team->description : "").'</textarea>'
     );
 
-    row2(tra('Type of team').':', team_type_select($team?$team->type:null));
+    row2(tra('Type of team').':', team_type_select($team ? $team->type : null));
 
     row2_init(tra('Country'));
     echo '<select class="form-control" name="country">';
-    echo country_select_options($team?$team->country:null);
+    echo country_select_options($team ? $team->country : null);
     echo "</select></td></tr>\n";
 
-    $x = (!$team || $team->joinable)?"checked":"";
+    $x = (!$team || $team->joinable) ? "checked" : "";
     row2(tra("Accept new members?"), "<input type=checkbox name=joinable $x>");
     // Check if we're using reCaptcha to prevent spam accounts
     //
@@ -568,12 +568,12 @@ 
 //
 function new_transfer_request_ok($team, $now) {
     if ($team->ping_user <= 0) {
-        if ($team->ping_time < $now - 60 * 86400) {
+        if ($team->ping_time < $now - 60*86400) {
             return true;
         }
         return false;
     }
-    if ($team->ping_time < $now - 90 * 86400) {
+    if ($team->ping_time < $now - 90*86400) {
         return true;
     }
     return false;
@@ -608,7 +608,7 @@ 
     if (!is_valid_country($country)) {
         $country = tra('None');
     }
-    $country = BoincDb::escape_string($country);  // for Cote d'Ivoire
+    $country = BoincDb::escape_string($country); // for Cote d'Ivoire
 
     $clause = sprintf(
         "(userid, create_time, name, name_lc, url, type, name_html, description, country, nusers, expavg_time) values(%d, %d, '%s', '%s', '%s', %d, '%s', '%s', '%s', %d, unix_timestamp())",
@@ -631,6 +631,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/inc/user_util.inc

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
 
 function check_passwd_ui($user, $passwd) {
     $passwd_hash = md5($passwd.$user->email_addr);
-    if(!check_passwd_hash($user, $passwd_hash)) {
+    if (!check_passwd_hash($user, $passwd_hash)) {
         sleep(LOGIN_FAIL_SLEEP_SEC);
         page_head("Password incorrect");
         echo "The password you entered is incorrect. Please go back and try again.\n";
@@ -69,7 +69,7 @@ 
 function is_banned_email_addr($email_addr) {
     global $banned_email_domains;
     if (isset($banned_email_domains)) {
-        foreach($banned_email_domains as $d) {
+        foreach ($banned_email_domains as $d) {
             $x = strstr($email_addr, $d);
             if ($x == $d) return true;
         }
@@ -108,7 +108,7 @@ 
 //
 function make_user(
     $email_addr, $name, $passwd_hash,
-    $country=null, $postal_code=null, $project_prefs=null, $teamid=0
+    $country = null, $postal_code = null, $project_prefs = null, $teamid = 0
 ) {
     if (!is_valid_email_addr($email_addr)) return null;
     if (is_banned_email_addr($email_addr)) return null;
@@ -242,7 +242,7 @@ 
             $users = BoincUser::enum(
                 sprintf("name like '%s%%'", $new_name)
             );
-            foreach ($users as $u){
+            foreach ($users as $u) {
                 echo "<p>$u->name\n";
             }
             page_tail();
@@ -272,7 +272,7 @@ 
         show_error(tra("Passwords may only include ASCII characters."));
     }
 
-    if (strlen($passwd)<$min_passwd_length) {
+    if (strlen($passwd) < $min_passwd_length) {
         show_error(
             tra("New password is too short: minimum password length is %1 characters.", $min_passwd_length)
         );

html/user/edit_forum_preferences_action.php

Spacing +29 added lines, -29 removed lines

@@ -29,7 +29,7 @@ 
 }
 BoincForumPrefs::lookup($user);
 
-if (post_str("action", true)=="reset_confirm"){
+if (post_str("action", true) == "reset_confirm") {
     page_head(tra("Confirm reset"));
     echo tra("This action will erase any changes you have made in your community preferences. To cancel, click your browser's Back button.")."
         <p>
@@ -45,7 +45,7 @@ 
 // If the user has requested a reset of preferences;
 // preserve a few fields.
 //
-if (post_str("action", true)=="reset"){
+if (post_str("action", true) == "reset") {
     $posts = $user->prefs->posts;
     $last_post = $user->prefs->last_post;
     $rated_posts = $user->prefs->rated_posts;
@@ -67,30 +67,30 @@ 
 if (!DISABLE_FORUMS) {
 
 $avatar_type = post_int("avatar_select");
-$newfile=IMAGE_PATH.$user->id."_avatar.jpg";
+$newfile = IMAGE_PATH.$user->id."_avatar.jpg";
 
 // Update the user avatar
-if ($avatar_type<0 or $avatar_type>3) $avatar_type=0;
-if ($avatar_type==0){
-    if (file_exists($newfile)){
+if ($avatar_type < 0 or $avatar_type > 3) $avatar_type = 0;
+if ($avatar_type == 0) {
+    if (file_exists($newfile)) {
         // Delete the file on the server if the user
         // decides not to use an avatar
         //
         unlink($newfile);
     }
-    $avatar_url="";
+    $avatar_url = "";
 } elseif ($avatar_type == 1) {
     $avatar_url = "//www.gravatar.com/avatar/".md5($user->email_addr)."?s=100&amp;d=identicon";
-} elseif ($avatar_type==2){
-    if (($rpc && (post_str("avatar_url", true) != null)) || ($_FILES['picture']['tmp_name']!="")) {
-        if ($_FILES['picture']['tmp_name']!="") {
+} elseif ($avatar_type == 2) {
+    if (($rpc && (post_str("avatar_url", true) != null)) || ($_FILES['picture']['tmp_name'] != "")) {
+        if ($_FILES['picture']['tmp_name'] != "") {
             $file = $_FILES['picture']['tmp_name'];
         } else {
             // Remote image. Download and store locally
             $file = post_str("avatar_url");
         }
         $size = getImageSize($file);
-        if ($size[2]!=2 and $size[2]!=3){
+        if ($size[2] != 2 and $size[2] != 3) {
             //Not the right kind of file
             error_page(tra("Error: Not the right kind of file, only PNG and JPEG are supported."));
         }
@@ -99,30 +99,30 @@ 
         $image2 = intelligently_scale_image($file, 100, 100);
         ImageJPEG($image2, $newfile);
     }
-    if (file_exists($newfile)){
-        $avatar_url=IMAGE_URL.$user->id."_avatar.jpg"; //$newfile;
+    if (file_exists($newfile)) {
+        $avatar_url = IMAGE_URL.$user->id."_avatar.jpg"; //$newfile;
     } else {
         //User didn't upload a compatible file or it went lost on the server
-        $avatar_url="";
+        $avatar_url = "";
     }
 }
 
-$images_as_links = (isset($_POST["forum_images_as_links"]) && $_POST["forum_images_as_links"]!="")?1:0;
-$link_popup = (isset($_POST["forum_link_popup"]) && $_POST["forum_link_popup"]!="")?1:0;
-$hide_avatars = (isset($_POST["forum_hide_avatars"]) && $_POST["forum_hide_avatars"]!="")?1:0;
-$hide_signatures = (isset($_POST["forum_hide_signatures"]) && $_POST["forum_hide_signatures"]!="")?1:0;
-$highlight_special = (isset($_POST["forum_highlight_special"]) && $_POST["forum_highlight_special"]!="")?1:0;
-$jump_to_unread = (isset($_POST["forum_jump_to_unread"]) && $_POST["forum_jump_to_unread"]!="")?1:0;
-$ignore_sticky_posts = (isset($_POST["forum_ignore_sticky_posts"]) && $_POST["forum_ignore_sticky_posts"]!="")?1:0;
-$no_signature_by_default = (isset($_POST["signature_by_default"]) && $_POST["signature_by_default"]!="")?0:1;
+$images_as_links = (isset($_POST["forum_images_as_links"]) && $_POST["forum_images_as_links"] != "") ? 1 : 0;
+$link_popup = (isset($_POST["forum_link_popup"]) && $_POST["forum_link_popup"] != "") ? 1 : 0;
+$hide_avatars = (isset($_POST["forum_hide_avatars"]) && $_POST["forum_hide_avatars"] != "") ? 1 : 0;
+$hide_signatures = (isset($_POST["forum_hide_signatures"]) && $_POST["forum_hide_signatures"] != "") ? 1 : 0;
+$highlight_special = (isset($_POST["forum_highlight_special"]) && $_POST["forum_highlight_special"] != "") ? 1 : 0;
+$jump_to_unread = (isset($_POST["forum_jump_to_unread"]) && $_POST["forum_jump_to_unread"] != "") ? 1 : 0;
+$ignore_sticky_posts = (isset($_POST["forum_ignore_sticky_posts"]) && $_POST["forum_ignore_sticky_posts"] != "") ? 1 : 0;
+$no_signature_by_default = (isset($_POST["signature_by_default"]) && $_POST["signature_by_default"] != "") ? 0 : 1;
 $signature = post_str("signature", true);
-if (strlen($signature)>250) {
+if (strlen($signature) > 250) {
     error_page(tra("Your signature was too long, please keep it less than 250 characters."));
 }
 $forum_sort = post_int("forum_sort");
 $thread_sort = post_int("thread_sort");
 $display_wrap_postcount = post_int("forum_display_wrap_postcount");
-if ($display_wrap_postcount<1) $display_wrap_postcount=1;
+if ($display_wrap_postcount < 1) $display_wrap_postcount = 1;
 
 $signature = BoincDb::escape_string($signature);
 
@@ -141,10 +141,10 @@ 
     }
 } else {
     // todo: clean up the following
-    $add_user_to_filter = (isset($_POST["add_user_to_filter"]) && $_POST["add_user_to_filter"]!="");
-    if ($add_user_to_filter){
+    $add_user_to_filter = (isset($_POST["add_user_to_filter"]) && $_POST["add_user_to_filter"] != "");
+    if ($add_user_to_filter) {
         $user_to_add = trim($_POST["forum_filter_user"]);
-        if ($user_to_add!="" and $user_to_add==strval(intval($user_to_add))){
+        if ($user_to_add != "" and $user_to_add == strval(intval($user_to_add))) {
             $other_user = BoincUser::lookup_id($user_to_add);
             if (!$other_user) {
                 echo tra("No such user:")." ".$user_to_add;
@@ -159,9 +159,9 @@ 
 //
 $ignored_users = get_ignored_list($user);
 // todo: use foreach
-for ($i=0;$i<sizeof($ignored_users);$i++){
+for ($i = 0; $i < sizeof($ignored_users); $i++) {
     $remove = "remove".trim($ignored_users[$i]);
-    if (isset($_POST[$remove]) && $_POST[$remove]!=""){
+    if (isset($_POST[$remove]) && $_POST[$remove] != "") {
         $other_user = BoincUser::lookup_id($ignored_users[$i]);
         if (!$other_user) {
             echo tra("No such user:")." ".$ignored_users[$j];