BOINC / boinc

html/user/download_software.php

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 //
 function get_platform($user_agent) {
     if (strstr($user_agent, 'Windows')) {
-        if (strstr($user_agent, 'Win64')||strstr($user_agent, 'WOW64')) {
+        if (strstr($user_agent, 'Win64') || strstr($user_agent, 'WOW64')) {
             return 'windows_x86_64';
         } else {
             return 'windows_intelx86';
@@ -138,7 +138,7 @@ 
         $token,
         $user->id,
         (string)$v->filename,
-        $green?"btn-success":"btn-info",
+        $green ? "btn-success" : "btn-info",
         (string)$v->platform,
         (string)$v->size_mb,
         (string)$v->version_num
@@ -147,7 +147,7 @@ 
 
 function download_button_vbox($v, $project_id, $token, $user) {
     // if no vbox version exists for platform, don't show vbox button
-    if(!$v->vbox_filename) {
+    if (!$v->vbox_filename) {
         return;
     }
     return sprintf(
@@ -436,7 +436,7 @@ 
     handle_get_info();
 } else {
     $dev = get_str("dev", true);
-    $user_agent = get_str("user_agent", true);      // for debugging
+    $user_agent = get_str("user_agent", true); // for debugging
     if (!$user_agent) {
         $user_agent = $_SERVER['HTTP_USER_AGENT'];
     }

html/inc/web_rpc_api.inc

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
     // Adapt to your web site. The following assumes Bootstrap.
     //
     function show_download_button($info, $is_vbox) {
-        $desc = $is_vbox?$info->boinc_vbox:$info->boinc;
+        $desc = $is_vbox ? $info->boinc_vbox : $info->boinc;
         echo sprintf('
 <form action="https://boinc.berkeley.edu/concierge.php" method="post">
     <input type=hidden name=project_id value="%d">
@@ -150,7 +150,7 @@ 
             (string)$info->token,
             (int)$info->user_id,
             (string)$desc->filename,
-            $is_vbox?" + VirtualBox":"",
+            $is_vbox ? " + VirtualBox" : "",
             (string)$info->platform,
             (string)$desc->size_mb
         );

html/inc/rss.inc

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 // You can pass a function $filter;
 // if $filter(item) returns true, don't show it.
 //
-function show_rss_items($items, $n=0, $filter=null) {
+function show_rss_items($items, $n = 0, $filter = null) {
     $i = 0;
     foreach ($items as $item) {
         if ($filter && $filter($item)) {

html/inc/keywords.inc

Spacing +61 added lines, -61 removed lines

@@ -24,72 +24,72 @@
 define('KW_CATEGORY_SCIENCE', 0);
 define('KW_CATEGORY_LOC', 1);
 
-define('KW_ASTRONOMY',      1);
-define('KW_SETI',           2);
-define('KW_PULSARS',        3);
-define('KW_GW',             4);
-define('KW_COSMOLOGY',      5);
-define('KW_PHYSICS',        6);
+define('KW_ASTRONOMY', 1);
+define('KW_SETI', 2);
+define('KW_PULSARS', 3);
+define('KW_GW', 4);
+define('KW_COSMOLOGY', 5);
+define('KW_PHYSICS', 6);
 define('KW_PARTICLE_PHYSICS', 7);
-define('KW_NANOSCIENCE',    8);
-define('KW_BIOMED',         9);
+define('KW_NANOSCIENCE', 8);
+define('KW_BIOMED', 9);
 define('KW_DRUG_DISCOVERY', 10);
-define('KW_PROTEINS',       11);
-define('KW_GENETICS',       12);
-define('KW_DISEASE',        13);
-define('KW_CANCER',         14);
-define('KW_MATH_CS',        15);
-define('KW_AI',             16);
-define('KW_OCEANIA',        17);
-define('KW_AUSTRALIA',      18);
+define('KW_PROTEINS', 11);
+define('KW_GENETICS', 12);
+define('KW_DISEASE', 13);
+define('KW_CANCER', 14);
+define('KW_MATH_CS', 15);
+define('KW_AI', 16);
+define('KW_OCEANIA', 17);
+define('KW_AUSTRALIA', 18);
 
-define('KW_EUROPE',         20);
-define('KW_GERMANY',        21);
-define('KW_ASIA',           22);
-define('KW_AMERICAS',       23);
-define('KW_US',             24);
-define('KW_UCB',            25);
-define('KW_AEI',            26);
-define('KW_CERN',           27);
-define('KW_UW',             28);
-define('KW_EARTH_SCI',      29);
-define('KW_SPAIN',          30);
-define('KW_SAN_JORGE',      31);
-define('KW_NUMBER_THEORY',  32);
-define('KW_CRYPTO',         33);
-define('KW_ENV_RESEARCH',   34);
-define('KW_CLIMATE',        35);
-define('KW_CZECH',          36);
+define('KW_EUROPE', 20);
+define('KW_GERMANY', 21);
+define('KW_ASIA', 22);
+define('KW_AMERICAS', 23);
+define('KW_US', 24);
+define('KW_UCB', 25);
+define('KW_AEI', 26);
+define('KW_CERN', 27);
+define('KW_UW', 28);
+define('KW_EARTH_SCI', 29);
+define('KW_SPAIN', 30);
+define('KW_SAN_JORGE', 31);
+define('KW_NUMBER_THEORY', 32);
+define('KW_CRYPTO', 33);
+define('KW_ENV_RESEARCH', 34);
+define('KW_CLIMATE', 35);
+define('KW_CZECH', 36);
 define('KW_CHARLES_PRAGUE', 37);
-define('KW_RECHENKRAFT',    38);
-define('KW_RHEINMAIN',      39);
-define('KW_HUNGARY',        40);
-define('KW_IRELAND',        41);
-define('KW_UC_DUBLIN',      42);
-define('KW_POLAND',         43);
-define('KW_RUSSIA',         44);
+define('KW_RECHENKRAFT', 38);
+define('KW_RHEINMAIN', 39);
+define('KW_HUNGARY', 40);
+define('KW_IRELAND', 41);
+define('KW_UC_DUBLIN', 42);
+define('KW_POLAND', 43);
+define('KW_RUSSIA', 44);
 define('KW_SW_STATE_RUSSIA', 45);
-define('KW_RAS',            46);
-define('KW_PRBB',           47);
-define('KW_UK',             48);
-define('KW_OXFORD',         49);
-define('KW_CHINA',          50);
-define('KW_U_DAYTON',       51);
-define('KW_WRIGHT_STATE',   52);
-define('KW_USC',            53);
-define('KW_FULLERTON',      54);
-define('KW_ARIZONA_STATE',  55);
-define('KW_U_ILLINOIS',     56);
-define('KW_U_WARSAW',       57);
-define('KW_RPI',            58);
-define('KW_INTERNATIONAL',  59);
-define('KW_UND',            60);
-define('KW_HOLLAND',        61);
-define('KW_CHEMISTRY',      62);
-define('KW_GAMES',          63);
-define('KW_VIRUS',          64);
-define('KW_FRANCE',         65);
-define('KW_CANADA',         66);
+define('KW_RAS', 46);
+define('KW_PRBB', 47);
+define('KW_UK', 48);
+define('KW_OXFORD', 49);
+define('KW_CHINA', 50);
+define('KW_U_DAYTON', 51);
+define('KW_WRIGHT_STATE', 52);
+define('KW_USC', 53);
+define('KW_FULLERTON', 54);
+define('KW_ARIZONA_STATE', 55);
+define('KW_U_ILLINOIS', 56);
+define('KW_U_WARSAW', 57);
+define('KW_RPI', 58);
+define('KW_INTERNATIONAL', 59);
+define('KW_UND', 60);
+define('KW_HOLLAND', 61);
+define('KW_CHEMISTRY', 62);
+define('KW_GAMES', 63);
+define('KW_VIRUS', 64);
+define('KW_FRANCE', 65);
+define('KW_CANADA', 66);
 
 $job_keywords = array();
 

html/user/team_members.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 }
 
 $offset = get_int("offset", true);
-if (!$offset) $offset=0;
+if (!$offset) $offset = 0;
 
 if ($offset > 1000) {
     error_page(tra("Limit exceeded:  Can only display the first 1000 members."));

html/inc/forum_rss.inc

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
 }
 
 function show_forum_rss_item($thread, $userid, $threads_only, $no_images) {
-    $unique_url=secure_url_base()."forum_thread.php?id=".$thread->id;
+    $unique_url = secure_url_base()."forum_thread.php?id=".$thread->id;
 
     $clause2 = " and hidden=0 ";
     if ($userid) $clause2 .= "and user=$userid";
@@ -41,7 +41,7 @@ 
     }
     if (!count($posts)) return;
     $post = $posts[0];
-    $post_date = gmdate('D, d M Y H:i:s',$post->timestamp).' GMT';
+    $post_date = gmdate('D, d M Y H:i:s', $post->timestamp).' GMT';
     $post_user = BOincUser::lookup_id($post->user);
     BoincForumPrefs::lookup($post_user);
     $options = new output_options();
@@ -84,25 +84,25 @@ 
 
     // Now construct header
     //
-    header ("Expires: " . gmdate('D, d M Y H:i:s', time()+86400) . " GMT");
+    header("Expires: ".gmdate('D, d M Y H:i:s', time() + 86400)." GMT");
     if (sizeof($threads)) {
         $t = $threads[0];
-        $last_mod_time = $threads_only?$t->create_time:$t->timestamp;
-        $create_date  = gmdate('D, d M Y H:i:s', $last_mod_time) . ' GMT';
-        header ("Last-Modified: " . $create_date);
+        $last_mod_time = $threads_only ? $t->create_time : $t->timestamp;
+        $create_date  = gmdate('D, d M Y H:i:s', $last_mod_time).' GMT';
+        header("Last-Modified: ".$create_date);
     } else {
-        $create_date  = gmdate('D, d M Y H:i:s') . ' GMT';
+        $create_date  = gmdate('D, d M Y H:i:s').' GMT';
     }
-    header ("Content-Type: application/xml");
+    header("Content-Type: application/xml");
 
-    $forum=BoincForum::lookup_id($forumid);
+    $forum = BoincForum::lookup_id($forumid);
     // Create channel header and open XML content
     //
     $description = PROJECT.": $forum->title";
     if ($userid) {
         $description .= " (posts by $user->name)";
     }
-    $channel_image = secure_url_base() . "rss_image.gif";
+    $channel_image = secure_url_base()."rss_image.gif";
     $language = "en-us";
     echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>
         <rss version=\"2.0\">

html/inc/translation.inc

Braces +14 added lines, -14 removed lines

@@ -68,7 +68,7 @@ 
             continue;
         }
         // only do files ending in .po
-        if (substr($file,-3) != ".po"){
+        if (substr($file,-3) != ".po") {
             //debug("File $file with unknown extension found in $info_dir");
             continue;
         }
@@ -76,7 +76,7 @@ 
             "-------------Compiling $transdir$file------------", 0
         );
         $language = parse_po_file($langdir.$transdir.$file);
-        if (!$language){
+        if (!$language) {
             language_log(
                 "WARNING: Could not parse language ".$file
             );
@@ -95,7 +95,7 @@ 
             );
             exit;
         }
-        foreach ($language as $key => $value){
+        foreach ($language as $key => $value) {
             if ($value !== "") {
                 // Skip if the msgstr is empty
                 fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file,0,-3))."\"][\"".$key."\"] = \"".$value."\";\n");
@@ -121,13 +121,13 @@ 
     $parsing_text = false;
     $size = sizeof($translation_file);
     $output = array();
-    for ($i=0; $i<$size; $i++){
+    for ($i=0; $i<$size; $i++) {
         $entry = trim($translation_file[$i]);
         //echo "line $i: $entry\n";
         if (substr($entry, 0, 1)=="#") {
             continue;
         } elseif (strpos($entry, "msgid") !== false) {
-            if (!$first_entry){
+            if (!$first_entry) {
                 //If this is not the first, save the previous entry
                 $output[$current_token]=$current_token_text;
             }
@@ -149,7 +149,7 @@ 
 
     // Get the last token
     //
-    if ($current_token && $current_token_text){
+    if ($current_token && $current_token_text) {
         $output[$current_token] = $current_token_text;
     }
     return $output;
@@ -180,11 +180,11 @@ 
 
     // Find the string in the user's language
     //
-    foreach ($languages_in_use as $language){
+    foreach ($languages_in_use as $language) {
         if (isset($language_lookup_array[$language][$text])) {
             $text = $language_lookup_array[$language][$text];
             break;
-        } else if ($language=="en"){
+        } else if ($language=="en") {
             // This language is defined in the code and is always available
             break;
         }
@@ -193,7 +193,7 @@ 
     // Replace relevant substrings with given arguments.
     // Use strtr to avoid problems if an argument contains %n.
     $replacements = array();
-    for ($i=1; $i<func_num_args(); $i++){
+    for ($i=1; $i<func_num_args(); $i++) {
         $replacements["%".$i] = func_get_arg($i);
     }
 
@@ -217,7 +217,7 @@ 
     if ($loglevel==1) $msg = "[ Warning  ]";
     if ($loglevel==2) $msg = "[ CRITICAL ]";
 
-    if ($loglevel >= $lang_log_level){
+    if ($loglevel >= $lang_log_level) {
         echo gmdate("Y-m-d H:i:s", time())." ".$msg." ".$message."\n";
     }
 }
@@ -226,7 +226,7 @@ 
 // (by looking at cookies and browser settings)
 // cookies have highest priority.
 
-if (isset($_COOKIE['lang'])){
+if (isset($_COOKIE['lang'])) {
     $language_string = $_COOKIE['lang'].",";
 } else {
     $language_string = '';
@@ -260,7 +260,7 @@ 
 for ($i=0; $i<$size; $i++) {
     if ((strlen($client_languages[$i])>2)
         && (substr($client_languages[$i], 2, 1) == "_" || substr($client_languages[$i], 2, 1) == "-")
-    ){
+    ) {
         // If this is defined as primary-secondary, represent it as xx_YY
         //
         $language = substr(
@@ -287,7 +287,7 @@ 
     //
     $file_name = $lang_language_dir.$lang_compiled_dir.$language.".po.inc";
     if (file_exists($file_name)) {
-        if (!in_array($language, $languages_in_use)){
+        if (!in_array($language, $languages_in_use)) {
             require_once($file_name);
             $languages_in_use[] = $language;
         }
@@ -295,7 +295,7 @@ 
     if ($language2) {
         $file_name = $lang_language_dir.$lang_compiled_dir.$language2.".po.inc";
         if (file_exists($file_name)) {
-            if (!in_array($language2, $languages_in_use)){
+            if (!in_array($language2, $languages_in_use)) {
                 require_once($file_name);
                 $languages_in_use[] = $language2;
             }

Spacing +32 added lines, -32 removed lines

@@ -64,11 +64,11 @@ 
     $dh = opendir($langdir.$transdir);
     if (!$dh) die("can't open translation dir");
     while (($file = readdir($dh)) !== false) {
-        if ($file==".." || $file==".") {
+        if ($file == ".." || $file == ".") {
             continue;
         }
         // only do files ending in .po
-        if (substr($file,-3) != ".po"){
+        if (substr($file, -3) != ".po") {
             //debug("File $file with unknown extension found in $info_dir");
             continue;
         }
@@ -76,7 +76,7 @@ 
             "-------------Compiling $transdir$file------------", 0
         );
         $language = parse_po_file($langdir.$transdir.$file);
-        if (!$language){
+        if (!$language) {
             language_log(
                 "WARNING: Could not parse language ".$file
             );
@@ -95,10 +95,10 @@ 
             );
             exit;
         }
-        foreach ($language as $key => $value){
+        foreach ($language as $key => $value) {
             if ($value !== "") {
                 // Skip if the msgstr is empty
-                fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file,0,-3))."\"][\"".$key."\"] = \"".$value."\";\n");
+                fwrite($fh, "\$language_lookup_array[\"".str_replace("\"", "\\\"", substr($file, 0, -3))."\"][\"".$key."\"] = \"".$value."\";\n");
             }
         }
         // don't write \?\> - may append
@@ -115,27 +115,27 @@ 
 function parse_po_file($file) {
     $translation_file = file($file);
     $first_entry = true;
-    $current_token_text="";
-    $current_token ="";
+    $current_token_text = "";
+    $current_token = "";
     $parsing_token = false;
     $parsing_text = false;
     $size = sizeof($translation_file);
     $output = array();
-    for ($i=0; $i<$size; $i++){
+    for ($i = 0; $i < $size; $i++) {
         $entry = trim($translation_file[$i]);
         //echo "line $i: $entry\n";
-        if (substr($entry, 0, 1)=="#") {
+        if (substr($entry, 0, 1) == "#") {
             continue;
         } elseif (strpos($entry, "msgid") !== false) {
-            if (!$first_entry){
+            if (!$first_entry) {
                 //If this is not the first, save the previous entry
-                $output[$current_token]=$current_token_text;
+                $output[$current_token] = $current_token_text;
             }
             $current_token = get_po_line($entry, $file);
-            $current_token_text="";
+            $current_token_text = "";
             $parsing_token = true;
             $parsing_text = false;
-            $first_entry=false;
+            $first_entry = false;
         } elseif (strpos($entry, "msgstr") !== false) {
             $current_token_text = get_po_line($entry, $file);
             $parsing_token = false;
@@ -149,7 +149,7 @@ 
 
     // Get the last token
     //
-    if ($current_token && $current_token_text){
+    if ($current_token && $current_token_text) {
         $output[$current_token] = $current_token_text;
     }
     return $output;
@@ -159,9 +159,9 @@ 
 // Returns the contents of a line (ie removes "" from start and end)
 //
 function get_po_line($line, $file) {
-    $start = strpos($line, '"')+1;
+    $start = strpos($line, '"') + 1;
     $stop = strrpos($line, '"');
-    $x = substr($line, $start, $stop-$start);
+    $x = substr($line, $start, $stop - $start);
     $n = preg_match("/[^\\\\]\"/", $x);
     if ($n) {
         echo "ERROR - MISMATCHED QUOTES IN $file: $line\n";
@@ -180,11 +180,11 @@ 
 
     // Find the string in the user's language
     //
-    foreach ($languages_in_use as $language){
+    foreach ($languages_in_use as $language) {
         if (isset($language_lookup_array[$language][$text])) {
             $text = $language_lookup_array[$language][$text];
             break;
-        } else if ($language=="en"){
+        } else if ($language == "en") {
             // This language is defined in the code and is always available
             break;
         }
@@ -193,7 +193,7 @@ 
     // Replace relevant substrings with given arguments.
     // Use strtr to avoid problems if an argument contains %n.
     $replacements = array();
-    for ($i=1; $i<func_num_args(); $i++){
+    for ($i = 1; $i < func_num_args(); $i++) {
         $replacements["%".$i] = func_get_arg($i);
     }
 
@@ -210,14 +210,14 @@ 
     return $text;
 }
 
-function language_log($message, $loglevel=0) {
+function language_log($message, $loglevel = 0) {
     global $lang_log_level;
     $msg = "";
-    if ($loglevel==0) $msg = "[ Debug    ]";
-    if ($loglevel==1) $msg = "[ Warning  ]";
-    if ($loglevel==2) $msg = "[ CRITICAL ]";
+    if ($loglevel == 0) $msg = "[ Debug    ]";
+    if ($loglevel == 1) $msg = "[ Warning  ]";
+    if ($loglevel == 2) $msg = "[ CRITICAL ]";
 
-    if ($loglevel >= $lang_log_level){
+    if ($loglevel >= $lang_log_level) {
         echo gmdate("Y-m-d H:i:s", time())." ".$msg." ".$message."\n";
     }
 }
@@ -226,7 +226,7 @@ 
 // (by looking at cookies and browser settings)
 // cookies have highest priority.
 
-if (isset($_COOKIE['lang'])){
+if (isset($_COOKIE['lang'])) {
     $language_string = $_COOKIE['lang'].",";
 } else {
     $language_string = '';
@@ -257,10 +257,10 @@ 
 // Loop over languages that the client requests
 //
 $size = sizeof($client_languages);
-for ($i=0; $i<$size; $i++) {
-    if ((strlen($client_languages[$i])>2)
+for ($i = 0; $i < $size; $i++) {
+    if ((strlen($client_languages[$i]) > 2)
         && (substr($client_languages[$i], 2, 1) == "_" || substr($client_languages[$i], 2, 1) == "-")
-    ){
+    ) {
         // If this is defined as primary-secondary, represent it as xx_YY
         //
         $language = substr(
@@ -279,7 +279,7 @@ 
 
     // if main language is english, look no further
     //
-    if ((count($languages_in_use)==0) && ($language == 'en' || $language2 == 'en')) {
+    if ((count($languages_in_use) == 0) && ($language == 'en' || $language2 == 'en')) {
         break;
     }
 
@@ -287,7 +287,7 @@ 
     //
     $file_name = $lang_language_dir.$lang_compiled_dir.$language.".po.inc";
     if (file_exists($file_name)) {
-        if (!in_array($language, $languages_in_use)){
+        if (!in_array($language, $languages_in_use)) {
             require_once($file_name);
             $languages_in_use[] = $language;
         }
@@ -295,7 +295,7 @@ 
     if ($language2) {
         $file_name = $lang_language_dir.$lang_compiled_dir.$language2.".po.inc";
         if (file_exists($file_name)) {
-            if (!in_array($language2, $languages_in_use)){
+            if (!in_array($language2, $languages_in_use)) {
                 require_once($file_name);
                 $languages_in_use[] = $language2;
             }
@@ -303,6 +303,6 @@ 
     }
 }
 
-$GLOBALS['languages_in_use'] = $languages_in_use;   // for Drupal
+$GLOBALS['languages_in_use'] = $languages_in_use; // for Drupal
 
 ?>

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