BOINC / boinc

html/inc/cache.inc

Indentation +1 added lines, -1 removed lines

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

Spacing +29 added lines, -29 removed lines

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

Braces +7 added lines, -7 removed lines

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

html/inc/forum_banishment_vote.inc

Spacing +26 added lines, -26 removed lines

@@ -26,7 +26,7 @@ 
 db_init();
 
 function current_tally($voteid) {
-    $query="select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid;
+    $query = "select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     echo "<b>Current Tally</b>    Ayes: ".$foobar->ayes." Nays: ".$foobar->nays."<p>";
@@ -35,8 +35,8 @@ 
 
 function vote_is_in_progress($userid) {
     // check whether a vote is already ongoing
-    $now=time();
-    $query="select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now;
+    $now = time();
+    $query = "select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now;
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to read banishment_vote table 1.<p>";
@@ -51,56 +51,56 @@ 
     return $foobar->count;
 }
 
-function start_vote($config,$logged_in_user,$user,$category,$reason) {
-    $now=time();
-    $fin=$now+21600;
+function start_vote($config, $logged_in_user, $user, $category, $reason) {
+    $now = time();
+    $fin = $now + 21600;
 
 
-    if ( vote_is_in_progress($user->id) !=0 ) {
+    if (vote_is_in_progress($user->id) != 0) {
         echo "A banishment vote is already underway for this user.<p>";
         return 0;
     }
-    $query="insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")";
+    $query = "insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_vote table.<p>";
         return 0;
     }
 
-    $voteid=_mysql_insert_id();
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (". $voteid .",". $logged_in_user->id .",". $now .",1)";
+    $voteid = _mysql_insert_id();
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",1)";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";
         return 0;
     }
 
-    $query="update forum_preferences set banished_until=".$fin." where userid=".$user->id;
+    $query = "update forum_preferences set banished_until=".$fin." where userid=".$user->id;
     $result = _mysql_query($query);
 
     echo "Banishment vote started.<p><p>";
     current_tally($voteid);
-    return send_banish_vote_email($user, 86400*14, $reason, $now+21600);
+    return send_banish_vote_email($user, 86400*14, $reason, $now + 21600);
 }
 
-function vote_yes($config,$logged_in_user,$user) {
-    $now=time();
+function vote_yes($config, $logged_in_user, $user) {
+    $now = time();
     // Check that a vote is underway.
-    if (vote_is_in_progress($user->id)<1) {
+    if (vote_is_in_progress($user->id) < 1) {
         echo "No banishment vote is underway for this user.<p><p>";
         return 0;
     }
     // Find the voteid
-    $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
+    $query = "select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table.<p>";
         return 0;
     }
-    $voteid=$foobar->voteid;
+    $voteid = $foobar->voteid;
     // Check whether mod has voted already.
-    $query="select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
+    $query = "select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
@@ -113,7 +113,7 @@ 
         return 0;
     }
     // insert the vote
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",1)";
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",1)";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";
@@ -124,24 +124,24 @@ 
     return 1;
 }
 
-function vote_no($config,$logged_in_user,$user) {
+function vote_no($config, $logged_in_user, $user) {
     // Check that a vote is underway.
-    $now=time();
-    if (vote_is_in_progress($user->id)<1) {
+    $now = time();
+    if (vote_is_in_progress($user->id) < 1) {
         echo "No banishment vote is underway for this user.<p>";
         return 0;
     }
     // Find the voteid
-    $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
+    $query = "select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
         echo "Database error attempting to read banishment_vote table.<p>";
         return 0;
     }
-    $voteid=$foobar->voteid;
+    $voteid = $foobar->voteid;
     // Check whether mod has voted already.
-    $query="select count(id) as count from banishment_votes where voteid=".$voteid ." and modid=".$logged_in_user->id;
+    $query = "select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id;
     $result = _mysql_query($query);
     $foobar = _mysql_fetch_object($result);
     if (!$foobar) {
@@ -154,7 +154,7 @@ 
         return 0;
     }
     // insert the vote
-    $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",0)";
+    $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",0)";
     $result = _mysql_query($query);
     if (!$result) {
         echo "Database error attempting to insert to banishment_votes table.<p>";

html/user/tree_threader.php

Indentation +55 added lines, -55 removed lines

@@ -31,18 +31,18 @@ 
     global $app_name,$log;
 
     $timestamp = date("Y-m-d H:i",time());
-	// read the list of template filenames
-	//
-	$files = file("../../tree_threader_template_files");
-	if ($files === false) {
+    // 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");
         error("no templates file");
 
     }
-	$njobs = sizeof($files);
-	$now = time();
+    $njobs = sizeof($files);
+    $now = time();
     $batch_id = BoincBatch::insert(
-		"(user_id, create_time, njobs, name, app_id, state) values ($user->id, $now, $njobs, 'tree_threader batch', $app->id, ".BATCH_STATE_IN_PROGRESS.")"
+        "(user_id, create_time, njobs, name, app_id, state) values ($user->id, $now, $njobs, 'tree_threader batch', $app->id, ".BATCH_STATE_IN_PROGRESS.")"
     );
     if (!$batch_id) {
         $log_msg = "$timestamp\tfailed to create batch for user $user->id\n";
@@ -68,20 +68,20 @@ 
     }
 
     $i = 1;
-	foreach ($files as $file) {
+    foreach ($files as $file) {
         $file = trim($file);
         $wu_name = "ICT_".$batch_id."_$i";
 
-		$cmd = "cd ../..; ./bin/create_work --appname $app_name --batch $batch_id --wu_name $wu_name --wu_template templates/ICT_in --result_template templates/ICT_out $seq_fname $file";
+        $cmd = "cd ../..; ./bin/create_work --appname $app_name --batch $batch_id --wu_name $wu_name --wu_template templates/ICT_in --result_template templates/ICT_out $seq_fname $file";
         fwrite($log, "$timestamp\t$cmd\n");
         system($cmd, $ret);
-		if ($ret != 0) {
+        if ($ret != 0) {
             fwrite($log, "can not creat job $wu_name\n");
-			error("can't create job");
+            error("can't create job");
         }
         $i++;
-	}
-	echo "<tt_reply>\n<batch_id>$batch_id</batch_id>\n</tt_reply>\n";
+    }
+    echo "<tt_reply>\n<batch_id>$batch_id</batch_id>\n</tt_reply>\n";
 }
 
 // Enumerate all the successfully completed WUs for this batch.
@@ -93,51 +93,51 @@ 
 function handle_get_output($r, $batch) {
     global $log;
     $timestamp = date("Y-m-d H:i",time());
-	$wus = BoincWorkUnit::enum("batch=$batch->id");
-	$outdir = "/tmp/treeThreader_result_".$batch->id;
+    $wus = BoincWorkUnit::enum("batch=$batch->id");
+    $outdir = "/tmp/treeThreader_result_".$batch->id;
     @mkdir($outdir);
-	foreach ($wus as $wu) {
-		if (!$wu->canonical_resultid) continue;
-		$result = BoincResult::lookup_id($wu->canonical_resultid);
-		if (!$result) continue;
-		$paths = get_outfile_paths($result);
-		if (sizeof($paths) < 1) continue;
-
-		// there's only one output file
-		//
-		$path = $paths[0];
-
-		// unzip it into a directory in /tmp
-		//
-		$dir = "/tmp/$wu->name";
+    foreach ($wus as $wu) {
+        if (!$wu->canonical_resultid) continue;
+        $result = BoincResult::lookup_id($wu->canonical_resultid);
+        if (!$result) continue;
+        $paths = get_outfile_paths($result);
+        if (sizeof($paths) < 1) continue;
+
+        // there's only one output file
+        //
+        $path = $paths[0];
+
+        // unzip it into a directory in /tmp
+        //
+        $dir = "/tmp/$wu->name";
         @mkdir($dir);
-		$cmd = "cd $dir; unzip -q $path";
-		system($cmd, $ret);
-		if ($ret != 0) {
-			error("can't unzip output file");
-		}
-		$cmd = "cp $dir/Aln/* $outdir";
-		system($cmd, $ret);
-		if ($ret != 0) {
-			error("can't copy output files");
-		}
+        $cmd = "cd $dir; unzip -q $path";
+        system($cmd, $ret);
+        if ($ret != 0) {
+            error("can't unzip output file");
+        }
+        $cmd = "cp $dir/Aln/* $outdir";
+        system($cmd, $ret);
+        if ($ret != 0) {
+            error("can't copy output files");
+        }
 
         system("rm -rf $dir");
-	}
-
-	$cmd = "zip -r -q $outdir $outdir";
-	system($cmd, $ret);
-	if ($ret != $ret) {
-		error("can't zip output files");
-	}
-	$fname = "treeThreader_result_".$batch->id.".zip";
+    }
+
+    $cmd = "zip -r -q $outdir $outdir";
+    system($cmd, $ret);
+    if ($ret != $ret) {
+        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");
-	@symlink("/tmp/$fname", "../../download/$treeThreader_dir/$fname");
+    @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";
+    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";
     fwrite($log, $log_msg);
 }
@@ -177,12 +177,12 @@ 
         handle_submit($r, $user, $app);
         break;
     case 'get_output':
-		$batch_id = (int)$r->batch_id;
-		$batch = BoincBatch::lookup_id($batch_id);
-		if (!$batch) error("no such batch");
-		if ($batch->user_id != $user->id) error("not owner of batch");
-		handle_get_output($r, $batch);
-		break;
+        $batch_id = (int)$r->batch_id;
+        $batch = BoincBatch::lookup_id($batch_id);
+        if (!$batch) error("no such batch");
+        if ($batch->user_id != $user->id) error("not owner of batch");
+        handle_get_output($r, $batch);
+        break;
     default: error("bad command");
 }
 

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/user/download_network.php

Spacing +4 added lines, -4 removed lines

@@ -25,17 +25,17 @@
 page_head(tra("Download BOINC add-on software"));
 echo "
     <p>" .
-    tra("You can download applications in several categories.") ."
+    tra("You can download applications in several categories.")."
     <ul>
     <li>".
-    tra("These applications are not endorsed by %1 and you use them at your own risk.", PROJECT) ."
+    tra("These applications are not endorsed by %1 and you use them at your own risk.", PROJECT)."
     <li>" .
     tra("We do not provide instructions for installing these applications.
 However, the author may have provided some help on installing or uninstalling the application.
 If this is not enough you should contact the author.").
     tra("Instructions for installing and running BOINC are %1 here %2.", "<a href=https://boinc.berkeley.edu/download.php>", "</a>")
-    . "<li>" .
-    tra("This list is managed centrally at %1 the BOINC website %2.", "<a href=\"https://boinc.berkeley.edu/addons.php\">", "</a>") ."
+    . "<li>".
+    tra("This list is managed centrally at %1 the BOINC website %2.", "<a href=\"https://boinc.berkeley.edu/addons.php\">", "</a>")."
     </ul>
 ";
 

html/user/team_search.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 // where team includes a field "refcnt".
 //
 function merge_lists($list1, &$list2, $weight) {
-    foreach($list1 as $team) {
+    foreach ($list1 as $team) {
         $id = $team->id;
         if (array_key_exists($id, $list2)) {
             $list2[$id]->refcnt += $weight;
@@ -97,7 +97,7 @@ 
         if (defined("SHOW_NONVALIDATED_TEAMS")) {
             $user = BoincUser::lookup_id($team->userid);
             echo "<td>";
-            echo $user->email_validated?"Yes":"No";
+            echo $user->email_validated ? "Yes" : "No";
             echo "</td>\n";
         }
         echo "
@@ -137,7 +137,7 @@ 
     xml_header();
     echo "<teams>\n";
     sort_list($list);
-    foreach($list as $team) {
+    foreach ($list as $team) {
         show_team_xml($team);
     }
     echo "</teams>\n";
@@ -164,14 +164,14 @@ 
         merge_lists($list2, $list, 3);
         $tried = true;
     }
-    if (strlen($params->country) && $params->country!='None') {
+    if (strlen($params->country) && $params->country != 'None') {
         $country = BoincDb::escape_string($params->country);
         $list2 = get_teams("country = '$country'", $params->active);
         //echo "<br>country matches: ",sizeof($list2);
         merge_lists($list2, $list, 1);
         $tried = true;
     }
-    if ($params->type and $params->type>1) {
+    if ($params->type and $params->type > 1) {
         $list2 = get_teams("type=$params->type", $params->active);
         //echo "<br>type matches: ",sizeof($list2);
         merge_lists($list2, $list, 2);

html/user/forum_thread_status.php

Spacing +2 added lines, -2 removed lines

@@ -35,14 +35,14 @@
 }
 
 $owner = BoincUser::lookup_id($thread->owner);
-if ($logged_in_user->id == $owner->id){
+if ($logged_in_user->id == $owner->id) {
     $action = get_str("action");
     if ($action == "set") {
         $ret = $thread->update("status=1");
     } else {
         $ret = $thread->update("status=0");
     }
-    if (!$ret){
+    if (!$ret) {
         error_page("Could not update the status of the thread: ".$thread->id);
     }
 } else {

Braces +2 added lines, -2 removed lines

@@ -35,14 +35,14 @@
 }
 
 $owner = BoincUser::lookup_id($thread->owner);
-if ($logged_in_user->id == $owner->id){
+if ($logged_in_user->id == $owner->id) {
     $action = get_str("action");
     if ($action == "set") {
         $ret = $thread->update("status=1");
     } else {
         $ret = $thread->update("status=0");
     }
-    if (!$ret){
+    if (!$ret) {
         error_page("Could not update the status of the thread: ".$thread->id);
     }
 } else {

html/user/lammps.php

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

Braces +19 added lines, -20 removed lines

@@ -38,8 +38,8 @@ 
      proc_terminate($p);
     // echo "child process is $ret\n";
     $pids=preg_split('/\s+/',$ret);
-    foreach($pids as $pid){
-        if(is_numeric($pid)){
+    foreach($pids as $pid) {
+        if(is_numeric($pid)) {
             if($GLOBALS["debug"])echo "killing child process $pid\n";
             posix_kill($pid,9);
         }
@@ -60,7 +60,7 @@ 
     $p = proc_open("$cmd", $descs, $pipes);
     while (1) {
         $ctime=time();
-        if($ctime-$stime >=2 and ! file_exists("log.1")){
+        if($ctime-$stime >=2 and ! file_exists("log.1")) {
            if($GLOBALS["debug"]) echo "time out "."<br>";
            terminate_job($p);
            break;
@@ -157,7 +157,7 @@ 
                 $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>";
                 }
@@ -169,20 +169,19 @@ 
     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){
+    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);}
 
             $dump_types=(int)$matches[1];
@@ -194,7 +193,7 @@ 
 
     $structure_file_size = filesize($structure_file);
     $fd = fopen($cmd_file,"r");
-    if (!$fd){
+    if (!$fd) {
         echo "can not open file $cmd_file\n";
         exit(-1);
     }
@@ -202,10 +201,10 @@ 
 
     $loopno=1;
     $looprun=1;
-    while (!feof($fd)){
+    while (!feof($fd)) {
         $line = fgets($fd,4096);
-        if(preg_match("/loopnumber\s+\d+/", $line, $matches)){
-            if(preg_match("/\d+/", $matches[0], $no)){
+        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];
             }
@@ -215,7 +214,7 @@ 
         }
     }
     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>";
     }
@@ -231,7 +230,7 @@ 
     $app_fixed_size = 5e7;
     $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>";
@@ -367,7 +366,7 @@ 
         $err="Your test job <strong>failed</strong>
             <br>Please refer to the following Error Message:<br><p>
         ";
-        foreach($err_msgs as $line){
+        foreach($err_msgs as $line) {
              $err=$err.$line."<br>";
         }
         $err=$err." <p>
@@ -380,9 +379,9 @@ 
     $info->rsc_fpops_est = $est_cpu_time * 1.5e9;
     $info->rsc_fpops_bound = $info->rsc_fpops_est * 20;
 
-    if ($disk==0){
+    if ($disk==0) {
         $info->rsc_disk_bound=1000000;
-    } else{
+    } else {
         $info->rsc_disk_bound = $disk;
     }
 
@@ -444,7 +443,7 @@ 
 
     $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 +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++;
         }

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

@@ -430,7 +430,7 @@
     //echo "<br> $cmd\n";
 
     system($cmd, $ret);
-    if ($ret === FALSE) {
+    if ($ret === false) {
         error_page("can't create job");
     } else {
         header('Location: submit.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/show_user.php

Braces +3 added lines, -3 removed lines

@@ -39,12 +39,12 @@ 
 }
 $format = get_str("format", true);
 
-if ($format=="xml"){
+if ($format=="xml") {
     // don't do caching for XML
     xml_header();
     $retval = db_init_xml();
     if ($retval) xml_error($retval);
-    if ($auth){
+    if ($auth) {
         $user = BoincUser::lookup_auth($auth);
         $show_hosts = true;
     } else {
@@ -60,7 +60,7 @@ 
     //
     $cache_args="userid=".$id;
     $cached_data = get_cached_data(USER_PAGE_TTL, $cache_args);
-    if ($cached_data){
+    if ($cached_data) {
         // We found some old but non-stale data, let's use it
         $data = unserialize($cached_data);
         $user = $data->user;

Spacing +5 added lines, -5 removed lines

@@ -38,12 +38,12 @@ 
 }
 $format = get_str("format", true);
 
-if ($format=="xml"){
+if ($format == "xml") {
     // don't do caching for XML
     xml_header();
     $retval = db_init_xml();
     if ($retval) xml_error($retval);
-    if ($auth){
+    if ($auth) {
         $user = BoincUser::lookup_auth($auth);
         $show_hosts = true;
     } else {
@@ -57,9 +57,9 @@ 
     // The page may be presented in many different languages,
     // so here we cache the data instead
     //
-    $cache_args="userid=".$id;
+    $cache_args = "userid=".$id;
     $cached_data = get_cached_data(USER_PAGE_TTL, $cache_args);
-    if ($cached_data){
+    if ($cached_data) {
         // We found some old but non-stale data, let's use it
         $data = unserialize($cached_data);
         $user = $data->user;
@@ -75,7 +75,7 @@ 
         }
         BoincForumPrefs::lookup($user);
         $user = @get_other_projects($user);
-        $community_links =  get_community_links_object($user);
+        $community_links = get_community_links_object($user);
 
         $data = new StdClass;
         $data->user = $user;

html/user/notify_rss.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 } else {
     $last_mod_time = time();
 }
-$create_date  = gmdate('D, d M Y H:i:s', $last_mod_time) . ' GMT';
+$create_date = gmdate('D, d M Y H:i:s', $last_mod_time).' GMT';
 
 header("Expires: ".gmdate('D, d M Y H:i:s', time())." GMT");
 header("Last-Modified: ".$create_date);