BOINC / boinc

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/inc/bolt.inc

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
     public $title;
         // Optional; used when showing course history outline.
     public $is_item;
-    public $attrs;        // course-defined
+    public $attrs; // course-defined
 
     abstract function walk(&$iter, $incr, &$frac_done);
         // multi-purpose function for traversing a course.
@@ -55,7 +55,7 @@ 
             $this->query_string = null;
         } else {
             $this->filename = substr($filename, 0, $p);
-            $this->query_string = substr($filename, $p+1);
+            $this->query_string = substr($filename, $p + 1);
         }
         $this->name = $filename;
         $this->title = $title;
@@ -162,7 +162,7 @@ 
             // look up unit by name
             //
             $child = null;
-            for ($i=0; $i<$n; $i++) {
+            for ($i = 0; $i < $n; $i++) {
                 $c = $this->units[$i];
                 if ($c->name == $child_name) {
                     $child = $c;
@@ -177,7 +177,7 @@ 
                 if ($i >= $n) {
                     // and if index is too big, use last unit
                     //
-                    $i = $n-1;
+                    $i = $n - 1;
                 }
                 $child = $this->units[$i];
             }
@@ -197,7 +197,7 @@ 
                         $this->finished($iter);
                         return true;
                     } else {
-                        $i = ($i+1)%$n;
+                        $i = ($i + 1)%$n;
                     }
                 }
             }
@@ -235,7 +235,7 @@ 
         if (array_key_exists($this->name, $state)) {
             $state_rec = $state[$this->name];
             $child_name = $state_rec['child_name'];
-            foreach($this->units as $c) {
+            foreach ($this->units as $c) {
                 if ($c->name == $child_name) {
                     return $c;
                 }

html/inc/recaptchalib.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 function boinc_recaptcha_get_html($publickey) {
     if ($publickey) {
-        return '<div class="g-recaptcha" data-sitekey="' . $publickey . '"></div>';
+        return '<div class="g-recaptcha" data-sitekey="'.$publickey.'"></div>';
     } else {
         return '';
     }

html/inc/translation.inc

Spacing +33 added lines, -33 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,26 +115,26 @@ 
 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;
     $output = array();
-    for ($i=0; $i<sizeof($translation_file); $i++){
+    for ($i = 0; $i < sizeof($translation_file); $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;
@@ -148,7 +148,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;
@@ -158,9 +158,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";
@@ -179,11 +179,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;
         }
@@ -192,7 +192,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);
     }
     $text = strtr($text, $replacements);
@@ -210,13 +210,13 @@ 
     return $text;
 }
 
-function language_log($message, $loglevel=0) {
+function language_log($message, $loglevel = 0) {
     global $lang_log_level;
-    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";
     }
 }
@@ -225,7 +225,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 = '';
@@ -255,10 +255,10 @@ 
 
 // Loop over languages that the client requests
 //
-for ($i=0; $i<sizeof($client_languages); $i++) {
-    if ((strlen($client_languages[$i])>2)
+for ($i = 0; $i < sizeof($client_languages); $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(
@@ -277,7 +277,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;
     }
 
@@ -285,7 +285,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;
         }
@@ -293,7 +293,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;
             }
@@ -301,7 +301,7 @@ 
     }
 }
 
-$GLOBALS['languages_in_use'] = $languages_in_use;   // for Drupal
+$GLOBALS['languages_in_use'] = $languages_in_use; // for Drupal
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

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");
@@ -120,13 +120,13 @@ 
     $parsing_token = false;
     $parsing_text = false;
     $output = array();
-    for ($i=0; $i<sizeof($translation_file); $i++){
+    for ($i=0; $i<sizeof($translation_file); $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;
             }
@@ -148,7 +148,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;
@@ -179,11 +179,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;
         }
@@ -192,7 +192,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);
     }
     $text = strtr($text, $replacements);
@@ -216,7 +216,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";
     }
 }
@@ -225,7 +225,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 = '';
@@ -258,7 +258,7 @@ 
 for ($i=0; $i<sizeof($client_languages); $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(
@@ -285,7 +285,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;
         }
@@ -293,7 +293,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;
             }

html/inc/forum_db.inc

Indentation +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
         $user->prefs = $prefs;
     }
     function privilege($specialbit) {
-         return (substr($this->special_user, $specialbit,1)==1);
+            return (substr($this->special_user, $specialbit,1)==1);
     }
     function update($clause) {
         $db = BoincDb::get();

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
         $db = BoincDb::get();
         return $db->lookup('category', 'BoincCategory', $clause);
     }
-    static function enum($clause=null) {
+    static function enum($clause = null) {
         $db = BoincDb::get();
         return $db->enum('category', 'BoincCategory', $clause);
     }
@@ -78,7 +78,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'thread', $clause);
     }
-    static function enum($clause="") {
+    static function enum($clause = "") {
         $db = BoincDb::get();
         return $db->enum('thread', 'BoincThread', $clause);
     }
@@ -142,7 +142,7 @@ 
         $db = BoincDb::get();
         $ret = $db->insert('forum_preferences', $clause);
     }
-    static function lookup(&$user, $nocache=false) {
+    static function lookup(&$user, $nocache = false) {
         if (!$user) return;
         if (isset($user->prefs)) return;
         if (!$nocache && isset(self::$cache[$user->id])) {
@@ -164,7 +164,7 @@ 
         $user->prefs = $prefs;
     }
     function privilege($specialbit) {
-         return (substr($this->special_user, $specialbit,1)==1);
+         return (substr($this->special_user, $specialbit, 1) == 1);
     }
     function update($clause) {
         $db = BoincDb::get();
@@ -175,7 +175,7 @@ 
         $db = BoincDb::get();
         return $db->delete_aux('forum_preferences', "userid=$this->userid");
     }
-    static function enum($clause=null) {
+    static function enum($clause = null) {
         $db = BoincDb::get();
         return $db->enum('forum_preferences', 'BoincForumPrefs', $clause);
     }
@@ -215,8 +215,8 @@ 
         //
         $fl = BoincForumLogging::lookup(0, 0);
         if ($fl) {
-            if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME){
-                BoincForumLogging::delete_aux("timestamp<'".(time()-MAX_FORUM_LOGGING_TIME)."' and userid != 0");
+            if ($fl->timestamp < time() - MAX_FORUM_LOGGING_TIME) {
+                BoincForumLogging::delete_aux("timestamp<'".(time() - MAX_FORUM_LOGGING_TIME)."' and userid != 0");
                 BoincForumLogging::replace(0, 0, time());
             }
         } else {
@@ -322,9 +322,9 @@ 
     }
 }
 
-define ('NOTIFY_FRIEND_REQ', 1);
-define ('NOTIFY_FRIEND_ACCEPT', 2);
-define ('NOTIFY_PM', 3);
-define ('NOTIFY_SUBSCRIBED_POST', 4);
+define('NOTIFY_FRIEND_REQ', 1);
+define('NOTIFY_FRIEND_ACCEPT', 2);
+define('NOTIFY_PM', 3);
+define('NOTIFY_SUBSCRIBED_POST', 4);
 
 ?>

Braces +1 added lines, -1 removed lines

@@ -215,7 +215,7 @@
         //
         $fl = BoincForumLogging::lookup(0, 0);
         if ($fl) {
-            if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME){
+            if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME) {
                 BoincForumLogging::delete_aux("timestamp<'".(time()-MAX_FORUM_LOGGING_TIME)."' and userid != 0");
                 BoincForumLogging::replace(0, 0, time());
             }

html/inc/credit.inc

Spacing +3 added lines, -3 removed lines

@@ -24,13 +24,13 @@
 function update_average($now, $work_start_time, $work, &$avg, &$avg_time) {
     if ($avg_time) {
         $diff = $now - $avg_time;
-        if ($diff <0) $diff = 0;
+        if ($diff < 0) $diff = 0;
         $diff_days = $diff/86400;
         $weight = exp(-$diff*M_LN2/CREDIT_HALF_LIFE);
         $avg *= $weight;
 
-        if ((1.0-$weight)>0.000001) {
-            $avg += (1.0-$weight)*($work/$diff_days);
+        if ((1.0 - $weight) > 0.000001) {
+            $avg += (1.0 - $weight)*($work/$diff_days);
         }
         else {
             $avg += M_LN2*$work*86400/CREDIT_HALF_LIFE;

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
 
         if ((1.0-$weight)>0.000001) {
             $avg += (1.0-$weight)*($work/$diff_days);
-        }
-        else {
+        } else {
             $avg += M_LN2*$work*86400/CREDIT_HALF_LIFE;
         }
     } else if ($work) {

html/inc/news.inc

Spacing +1 added lines, -1 removed lines

@@ -118,5 +118,5 @@
     ";
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/util_ops.inc

Indentation +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 
 function print_text_field($text,$name,$value) {
     echo "$text <input type=\"text\" size=\"10\" name=\"$name\" value=\"$value\">\n"
-         . "<p>\n";
+            . "<p>\n";
 }
 
 function row($x, $y) {
@@ -378,7 +378,7 @@ 
         $db->do_query($q4);
         return 2;
     } else if (!$db->do_query($q3)) {
-      echo "MySQL command '$q3' failed:<br/>unable to cancel workunits and trigger transitioner.<br>\n";
+        echo "MySQL command '$q3' failed:<br/>unable to cancel workunits and trigger transitioner.<br>\n";
         $db->do_query($q4);
         return 3;
     }

Spacing +10 added lines, -10 removed lines

@@ -46,21 +46,21 @@ 
 
 // TODO: get rid of all the following
 
-function print_checkbox($text,$name,$checked) {
+function print_checkbox($text, $name, $checked) {
     echo "<input type=\"checkbox\" name=\"$name\""
-        . (strlen($checked) ? " checked=\"checked\"" : "") . ">"
+        . (strlen($checked) ? " checked=\"checked\"" : "").">"
         . "$text\n"
         . "<p>\n";
 }
 
-function print_radio_button($text,$name,$value,$checked) {
+function print_radio_button($text, $name, $value, $checked) {
     echo "<input type=\"radio\" name=\"$name\" value=\"$value\""
-        . (strlen($checked) ? " checked=\"checked\"" : "") . ">"
+        . (strlen($checked) ? " checked=\"checked\"" : "").">"
         . "$text\n"
         . "<br>\n";
 }
 
-function print_text_field($text,$name,$value) {
+function print_text_field($text, $name, $value) {
     echo "$text <input type=\"text\" size=\"10\" name=\"$name\" value=\"$value\">\n"
          . "<p>\n";
 }
@@ -91,7 +91,7 @@ 
     if ($host == null) {
         $host = "localhost";
     }
-    $in = fopen("php://stdin","r");
+    $in = fopen("php://stdin", "r");
     print "Database username (default: owner of mysqld process): ";
     $user = rtrim(fgets($in, 80));
     print "Database password (if any): ";
@@ -103,7 +103,7 @@ 
     }
 }
 
-function print_login_form_ops($next_url='') {
+function print_login_form_ops($next_url = '') {
     if ($next_url == '') $next_url = $_SERVER['REQUEST_URI'];
     start_table();
     echo "
@@ -200,7 +200,7 @@ 
 // return a list of the current, non-deprecated ones
 //
 function current_versions($avs) {
-    foreach($avs as $av) {
+    foreach ($avs as $av) {
         foreach ($avs as $av2) {
             if ($av->id == $av2->id) continue;
             if ($av->platformid == $av2->platformid && $av->plan_class == $av2->plan_class && $av->version_num > $av2->version_num) {
@@ -209,7 +209,7 @@ 
         }
     }
     $x = array();
-    foreach($avs as $av) {
+    foreach ($avs as $av) {
         if (!$av->deprecated) $x[] = $av;
     }
     return $x;
@@ -321,7 +321,7 @@ 
 //
 function unassign_badges($is_user, $item, $badges, $k) {
     $list = null;
-    for ($i=0; $i<count($badges); $i++) {
+    for ($i = 0; $i < count($badges); $i++) {
         if ($i == $k) continue;
         $badge = $badges[$i];
         if ($list) {

Braces +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 }
 
 function show_profile_link_ops($user) {
-    if ($user->has_profile) { 
+    if ($user->has_profile) {
         row2("Profile",
             "<a href=\"".url_base()."view_profile.php?userid=$user->id\">View</a>"
         );

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\">