BOINC / boinc

html/inc/translation.inc

Doc Comments +6 added lines

@@ -112,6 +112,9 @@ 
 // @param file The file to parse
 // checking for inconsistencies if needed.
 //
+/**
+ * @param string $file
+ */
 function parse_po_file($file) {
     $translation_file = file($file);
     $first_entry = true;
@@ -157,6 +160,9 @@ 
 
 // Returns the contents of a line (ie removes "" from start and end)
 //
+/**
+ * @param string $line
+ */
 function get_po_line($line, $file) {
     $start = strpos($line, '"')+1;
     $stop = strrpos($line, '"');

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 +21 added lines, -7 removed lines

@@ -33,11 +33,17 @@ 
         exit;
     }
     $dh = opendir($lang_language_dir.$lang_compiled_dir);
-    if (!$dh) die("can't open language dir");
+    if (!$dh) {
+        die("can't open language dir");
+    }
 
     while ($file = readdir($dh)) {
-        if (substr($file, -7) != ".po.inc") continue;
-        if (is_numeric(substr($file, 0, 5))) continue;
+        if (substr($file, -7) != ".po.inc") {
+            continue;
+        }
+        if (is_numeric(substr($file, 0, 5))) {
+            continue;
+        }
         $list[] = substr($file, 0, -7);
     }
     return $list;
@@ -62,7 +68,9 @@ 
         //debug("$info_dir not found or is not a directory");
     }
     $dh = opendir($langdir.$transdir);
-    if (!$dh) die("can't open translation dir");
+    if (!$dh) {
+        die("can't open translation dir");
+    }
     while (($file = readdir($dh)) !== false) {
         if ($file==".." || $file==".") {
             continue;
@@ -212,9 +220,15 @@ 
 
 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){
         echo gmdate("Y-m-d H:i:s", time())." ".$msg." ".$message."\n";

html/inc/user.inc

Doc Comments +3 added lines

@@ -113,6 +113,9 @@
     return ($a->expavg_credit < $b->expavg_credit)? 1 : -1;
 }
 
+/**
+ * @param boolean $personal
+ */
 function show_other_projects($user, $personal) {
     if (!isset($user->projects)) return;
     if (count($user->projects) < 2) return;

Spacing +18 added lines, -18 removed lines

@@ -33,13 +33,13 @@ 
 // they've participated in
 //
 function get_other_projects($user) {
-    $cpid = md5($user->cross_project_id . $user->email_addr);
+    $cpid = md5($user->cross_project_id.$user->email_addr);
     $url = "http://boinc.netsoft-online.com/get_user.php?cpid=".$cpid;
 
     // Check the cache for that URL
     //
     $cacheddata = get_cached_data(REMOTE_PROJECTS_TTL, $url);
-    if ($cacheddata){
+    if ($cacheddata) {
         $remote = unserialize($cacheddata);
     } else {
         // Fetch the XML, use curl if fopen() is disallowed
@@ -110,7 +110,7 @@ 
 
 function cmp($a, $b) {
     if ($a->expavg_credit == $b->expavg_credit) return 0;
-    return ($a->expavg_credit < $b->expavg_credit)? 1 : -1;
+    return ($a->expavg_credit < $b->expavg_credit) ? 1 : -1;
 }
 
 function show_other_projects($user, $personal) {
@@ -133,7 +133,7 @@ 
         ),
         array("", ALIGN_RIGHT, ALIGN_RIGHT, ALIGN_RIGHT)
     );
-    foreach($user->projects as $project) {
+    foreach ($user->projects as $project) {
         show_project($project);
     }
     end_table();
@@ -161,7 +161,7 @@ 
     $config = get_config();
     row2(tra("Computers on this account"), "<a href=\"hosts_user.php\">".tra("View")."</a>");
     row2(tra("Tasks"), "<a href=\"results.php?userid=$user->id\">".tra("View")."</a>");
-    $cpid = md5($user->cross_project_id . $user->email_addr);
+    $cpid = md5($user->cross_project_id.$user->email_addr);
     $x = "";
     shuffle($cpid_stats_sites);
     foreach ($cpid_stats_sites as $site) {
@@ -308,7 +308,7 @@ 
 // show user name, with links to profile if present.
 // if $badge_height is > 0, show badges
 //
-function user_links($user, $badge_height=0) {
+function user_links($user, $badge_height = 0) {
     BoincForumPrefs::lookup($user);
     if (is_banished($user)) {
         return "(banished: ID $user->id)";
@@ -330,7 +330,7 @@ 
     if ($badge_height) {
         $x .= badges_string(true, $user, $badge_height);
     }
-    if (function_exists("project_user_links")){
+    if (function_exists("project_user_links")) {
         $x .= project_user_links($user);
     }
     return $x;
@@ -383,7 +383,7 @@ 
 
             // if there's a foundership request, notify the founder
             //
-            if ($user->id==$team->userid && $team->ping_user >0) {
+            if ($user->id == $team->userid && $team->ping_user > 0) {
                 $x .= "<p class=\"text-danger\">".tra("(foundership change request pending)")."</p>";
             }
             row2(tra("Member of team"), $x);
@@ -408,7 +408,7 @@ 
     $x = "<a href=\"user_search.php\">".tra("Find friends")."</a><br/>\n";
     $n = count($friends);
     if ($n) {
-        foreach($friends as $friend) {
+        foreach ($friends as $friend) {
             $fuser = BoincUser::lookup_id($friend->user_dest);
             if (!$fuser) continue;
             $x .= friend_links($fuser);
@@ -461,7 +461,7 @@ 
 // Returns a cacheable community links data object
 // @param user The user to produce a community links object for
 
-function get_community_links_object($user){
+function get_community_links_object($user) {
     $cache_object = new StdClass;
     $cache_object->post_count = total_posts($user);
     $cache_object->user = $user;
@@ -469,7 +469,7 @@ 
     $cache_object->friends = array();
 
     $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
-    foreach($friends as $friend) {
+    foreach ($friends as $friend) {
         $fuser = BoincUser::lookup_id($friend->user_dest);
         if (!$fuser) continue;
         $cache_object->friends[] = $fuser;
@@ -477,7 +477,7 @@ 
     return $cache_object;
 }
 
-function community_links($clo, $logged_in_user){
+function community_links($clo, $logged_in_user) {
     $user = $clo->user;
     $team = $clo->team;
     $friends = $clo->friends;
@@ -503,15 +503,15 @@ 
                 "<a href=\"friend.php?action=cancel_confirm&userid=$user->id\">".tra("Cancel friendship")."</a>"
             );
         } else if ($friend) {
-            row2(tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."</a>");
+            row2(tra("Friends"), "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."</a>");
         } else {
-            row2(tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."</a>");
+            row2(tra("Friends"), "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."</a>");
         }
     }
     
     if ($friends) {
         $x = "";
-        foreach($friends as $friend) {
+        foreach ($friends as $friend) {
             $x .= friend_links($friend);
         }
         row2(tra("Friends")." (".sizeof($friends).")", $x);
@@ -554,7 +554,7 @@ 
 function is_banned_email_addr($email_addr) {
     global $banned_email_domains;
     if (isset($banned_email_domains)) {
-        foreach($banned_email_domains as $d) {
+        foreach ($banned_email_domains as $d) {
             $x = strstr($email_addr, $d);
             if ($x == $d) return true;
         }
@@ -582,7 +582,7 @@ 
 //
 function make_user(
     $email_addr, $name, $passwd_hash,
-    $country=null, $postal_code=null, $project_prefs=null, $teamid=0
+    $country = null, $postal_code = null, $project_prefs = null, $teamid = 0
 ) {
     if (!is_valid_email_addr($email_addr)) return null;
     if (is_banned_email_addr($email_addr)) return null;
@@ -654,6 +654,6 @@ 
     $user->delete();
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

Braces +27 added lines, -9 removed lines

@@ -109,13 +109,19 @@ 
 }
 
 function cmp($a, $b) {
-    if ($a->expavg_credit == $b->expavg_credit) return 0;
+    if ($a->expavg_credit == $b->expavg_credit) {
+        return 0;
+    }
     return ($a->expavg_credit < $b->expavg_credit)? 1 : -1;
 }
 
 function show_other_projects($user, $personal) {
-    if (!isset($user->projects)) return;
-    if (count($user->projects) < 2) return;
+    if (!isset($user->projects)) {
+        return;
+    }
+    if (count($user->projects) < 2) {
+        return;
+    }
 
     usort($user->projects, "cmp");
     if ($personal) {
@@ -410,7 +416,9 @@ 
     if ($n) {
         foreach($friends as $friend) {
             $fuser = BoincUser::lookup_id($friend->user_dest);
-            if (!$fuser) continue;
+            if (!$fuser) {
+                continue;
+            }
             $x .= friend_links($fuser);
         }
         row2(tra("Friends")." ($n)", $x);
@@ -471,7 +479,9 @@ 
     $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
     foreach($friends as $friend) {
         $fuser = BoincUser::lookup_id($friend->user_dest);
-        if (!$fuser) continue;
+        if (!$fuser) {
+            continue;
+        }
         $cache_object->friends[] = $fuser;
     }
     return $cache_object;
@@ -556,7 +566,9 @@ 
     if (isset($banned_email_domains)) {
         foreach($banned_email_domains as $d) {
             $x = strstr($email_addr, $d);
-            if ($x == $d) return true;
+            if ($x == $d) {
+                return true;
+            }
         }
     }
     return false;
@@ -584,13 +596,19 @@ 
     $email_addr, $name, $passwd_hash,
     $country=null, $postal_code=null, $project_prefs=null, $teamid=0
 ) {
-    if (!is_valid_email_addr($email_addr)) return null;
-    if (is_banned_email_addr($email_addr)) return null;
+    if (!is_valid_email_addr($email_addr)) {
+        return null;
+    }
+    if (is_banned_email_addr($email_addr)) {
+        return null;
+    }
 
     $authenticator = random_string();
     $cross_project_id = random_string();
     $now = time();
-    if (!is_valid_country($country)) return null;
+    if (!is_valid_country($country)) {
+        return null;
+    }
 
     $email_addr = BoincDb::escape_string($email_addr);
     $name = sanitize_tags($name);

html/inc/util_ops.inc

Doc Comments +17 added lines

@@ -65,10 +65,17 @@ 
          . "<p>\n";
 }
 
+/**
+ * @param string $x
+ */
 function row($x, $y) {
     echo "<tr><td valign=\"top\" align=\"right\">$x</td>\n<td>$y</td>\n</tr>\n";
 }
 
+/**
+ * @param string $color
+ * @param string $x
+ */
 function c_row2($color, $x, $y) {
     echo "<tr bgcolor=\"$color\"><td align=\"right\">$x</td><td>$y</td></tr>\n";
 }
@@ -134,6 +141,9 @@ 
 
 // allow access only if logged in as user in a given set
 //
+/**
+ * @param integer[] $admin_user_ids
+ */
 function auth_ops_userid($admin_user_ids) {
     $user = get_logged_in_user_ops();
     if (!$user) {
@@ -288,6 +298,10 @@ 
 
 ////// badge-related stuff
 
+/**
+ * @param string $name
+ * @param string $title
+ */
 function get_badge($name, $title, $image_url) {
     $b = BoincBadge::lookup("name='$name'");
     if ($b) return $b;
@@ -319,6 +333,9 @@ 
 
 // unassign all badges except the given one
 //
+/**
+ * @param integer $k
+ */
 function unassign_badges($is_user, $item, $badges, $k) {
     $list = null;
     for ($i=0; $i<count($badges); $i++) {

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 +27 added lines, -9 removed lines

@@ -104,7 +104,9 @@ 
 }
 
 function print_login_form_ops($next_url='') {
-    if ($next_url == '') $next_url = $_SERVER['REQUEST_URI'];
+    if ($next_url == '') {
+        $next_url = $_SERVER['REQUEST_URI'];
+    }
     start_table();
     echo "
         <form method=post action=login_action.php>
@@ -119,9 +121,13 @@ 
 
 function get_logged_in_user_ops() {
     global $g_logged_in_user;
-    if ($g_logged_in_user) return $g_logged_in_user;
+    if ($g_logged_in_user) {
+        return $g_logged_in_user;
+    }
     $authenticator = null;
-    if (isset($_COOKIE['auth'])) $authenticator = $_COOKIE['auth'];
+    if (isset($_COOKIE['auth'])) {
+        $authenticator = $_COOKIE['auth'];
+    }
 
     $authenticator = BoincDb::escape_string($authenticator);
     if ($authenticator) {
@@ -202,7 +208,9 @@ 
 function current_versions($avs) {
     foreach($avs as $av) {
         foreach ($avs as $av2) {
-            if ($av->id == $av2->id) continue;
+            if ($av->id == $av2->id) {
+                continue;
+            }
             if ($av->platformid == $av2->platformid && $av->plan_class == $av2->plan_class && $av->version_num > $av2->version_num) {
                 $av2->deprecated = 1;
             }
@@ -210,7 +218,9 @@ 
     }
     $x = array();
     foreach($avs as $av) {
-        if (!$av->deprecated) $x[] = $av;
+        if (!$av->deprecated) {
+            $x[] = $av;
+        }
     }
     return $x;
 }
@@ -245,7 +255,9 @@ 
     $wus = BoincWorkunit::enum("id >= $id1 and id <= $id2");
     foreach ($wus as $wu) {
         $results = BoincResult::enum("workunitid=$wu->id and server_state > 2");
-        if (count($results)) continue;
+        if (count($results)) {
+            continue;
+        }
         $retval = BoincResult::update_aux("server_state=5, outcome=5 where workunitid=$wu->id");
         if (!$retval) {
             error_page("result update failed");
@@ -290,11 +302,15 @@ 
 
 function get_badge($name, $title, $image_url) {
     $b = BoincBadge::lookup("name='$name'");
-    if ($b) return $b;
+    if ($b) {
+        return $b;
+    }
     $now = time();
     $id = BoincBadge::insert("(create_time, name, title, image_url) values ($now, '$name', '$title', 'img/$image_url')");
     $b = BoincBadge::lookup_id($id);
-    if ($b) return $b;
+    if ($b) {
+        return $b;
+    }
     die("can't create badge $name\n");
 }
 
@@ -322,7 +338,9 @@ 
 function unassign_badges($is_user, $item, $badges, $k) {
     $list = null;
     for ($i=0; $i<count($badges); $i++) {
-        if ($i == $k) continue;
+        if ($i == $k) {
+            continue;
+        }
         $badge = $badges[$i];
         if ($list) {
             $list .= ",$badge->id";

html/inc/web_rpc_api.inc

Doc Comments +14 added lines

@@ -21,6 +21,9 @@ 
 // my PHP currently doesn't support file_get_contents(https://...)
 // so do it with Curl
 //
+/**
+ * @param string $url
+ */
 function fetch_url($url) {
     if (0) {
         return file_get_contents($url);
@@ -35,6 +38,11 @@ 
     }
 }
 
+/**
+ * @param string $project_url
+ * @param string $email_addr
+ * @param string $passwd_hash
+ */
 function lookup_account(
     $project_url,
     $email_addr,
@@ -57,6 +65,12 @@ 
 
 // return (authenticator, errmsg)
 //
+/**
+ * @param string $project_url
+ * @param string $email_addr
+ * @param string $passwd_hash
+ * @param string $user_name
+ */
 function create_account(
     $project_url,
     $email_addr,

Braces +6 added lines, -2 removed lines

@@ -42,7 +42,9 @@ 
 ) {
     $url = $project_url."/lookup_account.php?email_addr=".urlencode($email_addr)."&passwd_hash=$passwd_hash";
     $reply = fetch_url($url);
-    if (!$reply) return array(null, -1, "HTTP error");
+    if (!$reply) {
+        return array(null, -1, "HTTP error");
+    }
     $r = @simplexml_load_string($reply);
     if (!$r) {
         return array(null, -1, "Can't parse reply XML:\n$reply");
@@ -67,7 +69,9 @@ 
 
     //echo "url: $url\n";
     $reply = fetch_url($url);
-    if (!$reply) return array(null, -1, "HTTP error");
+    if (!$reply) {
+        return array(null, -1, "HTTP error");
+    }
     //echo "reply: $reply\n";
     $r = @simplexml_load_string($reply);
     if (!$r) {

html/inc/xml.inc

Doc Comments +3 added lines

@@ -57,6 +57,9 @@
 
 $xml_outer_tag = "";
 
+/**
+ * @param string $tag
+ */
 function xml_start_tag($tag) {
     global $xml_outer_tag;
     echo "<$tag>\n";

Braces +9 added lines, -3 removed lines

@@ -26,15 +26,21 @@
         return ERR_PROJECT_DOWN;
     }
     $db = BoincDb::get();
-    if (!$db) return ERR_DB_CANT_CONNECT;
+    if (!$db) {
+        return ERR_DB_CANT_CONNECT;
+    }
     return 0;
 }
 
 // write PHP warnings as XML, so that the reply can be parsed by client
 //
 function error_handler($errno, $errstr, $errfile, $errline) {
-    if ($errno == E_WARNING) $errno = "Warning";
-    if ($errno == E_NOTICE) $errno = "Notice";
+    if ($errno == E_WARNING) {
+        $errno = "Warning";
+    }
+    if ($errno == E_NOTICE) {
+        $errno = "Notice";
+    }
     echo "<error>
     <error_msg><![CDATA[$errstr]]></error_msg>
     <type>$errno</type>

html/ops/badge_assign_custom.php

Doc Comments +6 added lines

@@ -72,6 +72,9 @@ 
 // badge_name_prefix should be user or team
 // sub_project is an array with name and short_name as in $sub_projects
 //
+/**
+ * @param string $badge_name_prefix
+ */
 function get_badges(
     $badge_name_prefix, $badge_level_names, $badge_images, $sub_project
 ) {
@@ -105,6 +108,9 @@ 
 // decide which subproject badge to assign, if any.
 // Unassign other badges.
 //
+/**
+ * @param string $where_clause
+ */
 function assign_sub_badge($is_user, $item, $levels, $badges, $where_clause) {
     if ($is_user) {
         $sub_total = BoincCreditUser::sum('total', "where userid=".$item->id." and ($where_clause)");

Spacing +6 added lines, -6 removed lines

@@ -77,7 +77,7 @@ 
 ) {
     $badges = array();
     $limit = count($badge_level_names);
-    for ($i=0; $i < $limit; $i++) {
+    for ($i = 0; $i < $limit; $i++) {
         $badges[$i] = get_badge($badge_name_prefix."_".$sub_project["short_name"]."_".$i, "$badge_level_names[$i] in ".$sub_project["name"]." credit", $sub_project["short_name"].$badge_images[$i]);
     }
     return $badges;
@@ -90,7 +90,7 @@ 
     // count from highest to lowest level, so the user get's assigned the
     // highest possible level and the lower levels get removed
     //
-    for ($i=count($levels)-1; $i>=0; $i--) {
+    for ($i = count($levels) - 1; $i >= 0; $i--) {
         if ($item->total_credit >= $levels[$i]) {
             assign_badge($is_user, $item, $badges[$i]);
             unassign_badges($is_user, $item, $badges, $i);
@@ -114,7 +114,7 @@ 
     // count from highest to lowest level, so the user get's assigned the
     // highest possible level and the lower levels get removed
     //
-    for ($i=count($levels)-1; $i>=0; $i--) {
+    for ($i = count($levels) - 1; $i >= 0; $i--) {
         if ($sub_total >= $levels[$i]) {
             assign_badge($is_user, $item, $badges[$i]);
             unassign_badges($is_user, $item, $badges, $i);
@@ -134,7 +134,7 @@ 
     $is_user, $badge_levels, $badge_level_names, $badge_images,
     $subprojects_list
 ) {
-    $kind = $is_user?"user":"team";
+    $kind = $is_user ? "user" : "team";
 
     // get badges for all subprojects including total
     //
@@ -143,7 +143,7 @@ 
     }
 
     $n = 0;
-    $maxid = $is_user?BoincUser::max("id"):BoincTeam::max("id");
+    $maxid = $is_user ? BoincUser::max("id") : BoincTeam::max("id");
     while ($n <= $maxid) {
         $m = $n + 1000;
         if ($is_user) {
@@ -161,7 +161,7 @@ 
                     assign_tot_badge($is_user, $item, $badge_levels, $badges["total"]);
                 } else {
                     // appids come from project/project.inc
-                    $where_clause = "appid in (". implode(',', $sp["appids"]) .")";
+                    $where_clause = "appid in (".implode(',', $sp["appids"]).")";
                     assign_sub_badge(
                         $is_user, $item, $badge_levels, $badges[$sp["short_name"]],
                         $where_clause

html/ops/bolt_map.php

Doc Comments +16 added lines

@@ -173,6 +173,9 @@ 
     return $x;
 }
 
+/**
+ * @param integer $mode
+ */
 function get_nquestions($unit, $mode) {
     global $snap;
 
@@ -187,6 +190,9 @@ 
     return 0;
 }
 
+/**
+ * @param integer $mode
+ */
 function get_views($unit, $mode) {
     global $snap;
 
@@ -231,6 +237,10 @@ 
 
 $rownum = 0;
 
+/**
+ * @param string $class
+ * @param boolean $is_answer
+ */
 function show_unit_row($unit, $class, $level, $is_answer) {
     global $breakdown, $breakdown_cat;
     global $rownum, $course_id;
@@ -319,6 +329,9 @@ 
     echo "</tr>\n";
 }
 
+/**
+ * @param string $class
+ */
 function breakdown_class($class) {
     switch ($class) {
     case "BoltLesson":
@@ -356,6 +369,9 @@ 
     }
 }
 
+/**
+ * @param integer $level
+ */
 function show_unit_recurse($unit, $level) {
     show_unit($unit, $level);
     if ($unit->is_item) return;

Spacing +9 added lines, -9 removed lines

@@ -103,7 +103,7 @@ 
 
 function spaces($level) {
     $x = "";
-    for ($i=0; $i<$level; $i++) {
+    for ($i = 0; $i < $level; $i++) {
         $x .= "&nbsp;&nbsp;&nbsp;&nbsp;";
     }
     return $x;
@@ -136,7 +136,7 @@ 
 function avg_score($array) {
     $sum = 0;
     $n = count($array);
-    if ($n ==0) return 0;
+    if ($n == 0) return 0;
     foreach ($array as $a) {
         $sum += $a->score;
     }
@@ -152,7 +152,7 @@ 
             $n++;
         }
     }
-    if ($n ==0) return 0;
+    if ($n == 0) return 0;
     return $sum/$n;
 }
 
@@ -235,7 +235,7 @@ 
     global $breakdown, $breakdown_cat;
     global $rownum, $course_id;
 
-    $a = $is_answer?" (answer)":"";
+    $a = $is_answer ? " (answer)" : "";
     $j = ($rownum++)%2;
     echo "<tr class=row$j>";
     if ($breakdown && $breakdown_cat) {
@@ -243,7 +243,7 @@ 
             <td><br></td>
             <td><br></td>
         ";
-    } else  {
+    } else {
         $c = class_name($class);
         echo "
             <td><b>".spaces($level)."$unit->name</b></td>
@@ -277,7 +277,7 @@ 
         echo time_graph($t, 200);
         break;
     case "BoltExercise":
-        $mode = $is_answer?BOLT_MODE_ANSWER:BOLT_MODE_SHOW;
+        $mode = $is_answer ? BOLT_MODE_ANSWER : BOLT_MODE_SHOW;
         $views = get_views($unit, $mode);
         $n = count($views);
         $out = outcomes($views);
@@ -360,7 +360,7 @@ 
     show_unit($unit, $level);
     if ($unit->is_item) return;
     foreach ($unit->units as $u) {
-        show_unit_recurse($u, $level+1);
+        show_unit_recurse($u, $level + 1);
     }
 }
 
@@ -402,9 +402,9 @@ 
         <input type=hidden name=course_id value=$course_id>
         <table width=600><tr><td valign=top>
     ";
-    filter_form($filter?$filter->name():"", $filter_cat);
+    filter_form($filter ? $filter->name() : "", $filter_cat);
     echo "</td><td valign=top>";
-    breakdown_form($breakdown?$breakdown->name():"");
+    breakdown_form($breakdown ? $breakdown->name() : "");
     echo "
         </td></tr></table>
         <p>

Braces +27 added lines, -9 removed lines

@@ -115,10 +115,14 @@ 
 function filter_array($array) {
     global $snap, $filter, $filter_cat, $breakdown, $breakdown_cat;
 
-    if (!$filter && !$breakdown) return $array;
+    if (!$filter && !$breakdown) {
+        return $array;
+    }
     $x = array();
     foreach ($array as $y) {
-        if (!array_key_exists($y->user_id, $snap->users)) continue;
+        if (!array_key_exists($y->user_id, $snap->users)) {
+            continue;
+        }
         $u = $snap->users[$y->user_id];
         if ($filter && $filter->categorize($u) != $filter_cat) {
             continue;
@@ -136,7 +140,9 @@ 
 function avg_score($array) {
     $sum = 0;
     $n = count($array);
-    if ($n ==0) return 0;
+    if ($n ==0) {
+        return 0;
+    }
     foreach ($array as $a) {
         $sum += $a->score;
     }
@@ -152,7 +158,9 @@ 
             $n++;
         }
     }
-    if ($n ==0) return 0;
+    if ($n ==0) {
+        return 0;
+    }
     return $sum/$n;
 }
 
@@ -180,7 +188,9 @@ 
         $a = filter_array($snap->questions[$unit->name]);
         $n = 0;
         foreach ($a as $q) {
-            if ($q->mode == $mode) $n++;
+            if ($q->mode == $mode) {
+                $n++;
+            }
         }
         return $n;
     }
@@ -194,7 +204,9 @@ 
     if (array_key_exists($unit->name, $snap->views)) {
         $a = filter_array($snap->views[$unit->name]);
         foreach ($a as $x) {
-            if ($x->mode == $mode) $y[] = $x;
+            if ($x->mode == $mode) {
+                $y[] = $x;
+            }
         }
     }
     return $y;
@@ -358,7 +370,9 @@ 
 
 function show_unit_recurse($unit, $level) {
     show_unit($unit, $level);
-    if ($unit->is_item) return;
+    if ($unit->is_item) {
+        return;
+    }
     foreach ($unit->units as $u) {
         show_unit_recurse($u, $level+1);
     }
@@ -431,7 +445,9 @@ 
         </tr>
     ";
     foreach ($qs as $q) {
-        if ($q->mode != $mode) continue;
+        if ($q->mode != $mode) {
+            continue;
+        }
         $user = $snap->users[$q->user_id];
         echo "<tr>
             <td>".time_str($q->create_time)."</td>
@@ -446,7 +462,9 @@ 
 
 $course_id = get_int('course_id');
 $course = BoltCourse::lookup_id($course_id);
-if (!$course) error_page("no course");
+if (!$course) {
+    error_page("no course");
+}
 $top_unit = require_once($course->doc_file());
 
 $action = get_str('action', true);

html/ops/bossa_admin.php

Doc Comments +3 added lines

@@ -34,6 +34,9 @@
     require_once($file);
 }
 
+/**
+ * @param integer $i
+ */
 function show_bossa_app($app, $i) {
     $j = $i%2;
     echo "<tr class=row$j>

Spacing +5 added lines, -5 removed lines

@@ -101,9 +101,9 @@ 
     ";
     start_table();
     row1("User settings");
-    $x = ($flags&BOLT_FLAGS_SHOW_ALL)?"checked":"";
+    $x = ($flags&BOLT_FLAGS_SHOW_ALL) ? "checked" : "";
     row2("Show hidden apps?", "<input type=checkbox name=show_all $x>");
-    $x = ($flags&BOLT_FLAGS_DEBUG)?"checked":"";
+    $x = ($flags&BOLT_FLAGS_DEBUG) ? "checked" : "";
     row2("Show debugging output?", "<input type=checkbox name=debug $x>");
     row2("", "<input class=\"btn btn-default\" type=submit value=\"Update user\">");
     end_table();
@@ -171,7 +171,7 @@ 
     foreach ($jobs as $job) {
         $t = time_str($job->create_time);
         $s = job_state_string($job->state);
-        $j = $i++ % 2;
+        $j = $i++%2;
         echo "<tr class=row$j>
             <td>
                 $job->id <a href=bossa_admin.php?action=job_show_insts&job_id=$job->id>(details)</a><br>
@@ -203,7 +203,7 @@ 
         table_row(
             "$batch->id | <a href=bossa_admin.php?action=show_batch&batch_id=$batch->id>show jobs</a> | <a href=bossa_admin.php?action=clear_batch_confirm&batch_id=$batch->id>delete instances</a>",
             "$batch->name",
-            $batch->calibration?"yes":"no",
+            $batch->calibration ? "yes" : "no",
             time_str($batch->create_time),
             BossaJob::count("batch_id=$batch->id"),
             BossaJob::count("batch_id=$batch->id and state=2")
@@ -333,7 +333,7 @@ 
     if (!$time_estimate) $time_estimate = 60;
     $time_limit = get_str('time_limit');
     if (!$time_limit) $time_limit = 3600;
-    $calibration_frac = get_str('calibration_frac' , true);
+    $calibration_frac = get_str('calibration_frac', true);
     if (!$calibration_frac) $calibration_frac = 0;
     $now = time();
     $app_id = BossaApp::insert("(create_time, name, short_name, description, bolt_course_id, time_estimate, time_limit, calibration_frac) values ($now, '$name', '$short_name', '$description', $courseid, $time_estimate, $time_limit, $calibration_frac)");

Braces +27 added lines, -9 removed lines

@@ -161,7 +161,9 @@ 
 
 function show_batch($batch_id) {
     $batch = BossaBatch::lookup_id($batch_id);
-    if (!$batch) error_page("No such batch");
+    if (!$batch) {
+        error_page("No such batch");
+    }
     include_app_file($batch->app_id);
     admin_page_head("Jobs for batch $batch->name");
     $jobs = BossaJob::enum("batch_id=$batch_id");
@@ -293,7 +295,9 @@ 
 $user = get_logged_in_user();
 
 $db = BossaDb::get();
-if (!$db) error_page("Can't connect to database server");
+if (!$db) {
+    error_page("Can't connect to database server");
+}
 
 if (!$db->table_exists('bossa_app')) {
     admin_page_head("Create Bossa database");
@@ -330,11 +334,17 @@ 
         $courseid = 0;
     }
     $time_estimate = get_str('time_estimate');
-    if (!$time_estimate) $time_estimate = 60;
+    if (!$time_estimate) {
+        $time_estimate = 60;
+    }
     $time_limit = get_str('time_limit');
-    if (!$time_limit) $time_limit = 3600;
+    if (!$time_limit) {
+        $time_limit = 3600;
+    }
     $calibration_frac = get_str('calibration_frac' , true);
-    if (!$calibration_frac) $calibration_frac = 0;
+    if (!$calibration_frac) {
+        $calibration_frac = 0;
+    }
     $now = time();
     $app_id = BossaApp::insert("(create_time, name, short_name, description, bolt_course_id, time_estimate, time_limit, calibration_frac) values ($now, '$name', '$short_name', '$description', $courseid, $time_estimate, $time_limit, $calibration_frac)");
     if ($courseid) {
@@ -344,8 +354,12 @@ 
     exit;
 case 'update_user':
     $flags = 0;
-    if (get_str('show_all', true)) $flags |= BOLT_FLAGS_SHOW_ALL;
-    if (get_str('debug', true)) $flags |= BOLT_FLAGS_DEBUG;
+    if (get_str('show_all', true)) {
+        $flags |= BOLT_FLAGS_SHOW_ALL;
+    }
+    if (get_str('debug', true)) {
+        $flags |= BOLT_FLAGS_DEBUG;
+    }
     $user->bossa->update("flags=$flags");
     $user->bossa->flags = $flags;
     Header('Location: bossa_admin.php');
@@ -368,13 +382,17 @@ 
 case 'hide':
     $app_id = get_int('app_id');
     $app = BossaApp::lookup_id($app_id);
-    if (!$app) error_page("no such app");
+    if (!$app) {
+        error_page("no such app");
+    }
     $app->update("hidden=1");
     break;
 case 'unhide':
     $app_id = get_int('app_id');
     $app = BossaApp::lookup_id($app_id);
-    if (!$app) error_page("no such app");
+    if (!$app) {
+        error_page("no such app");
+    }
     $app->update("hidden=0");
     break;
 case 'clear_batch_confirm':

html/ops/bossa_example_make_files.php

Doc Comments +9 added lines

@@ -28,6 +28,9 @@ 
 require_once("../inc/util_basic.inc");
 require_once("../inc/util_ops.inc");
 
+/**
+ * @param integer $range
+ */
 function rand_color($im, $range) {
     $mid = 200;
     $lo = $mid - $range;
@@ -35,12 +38,18 @@ 
     return imagecolorallocate($im, rand($lo,$hi), rand($lo,$hi), rand($lo,$hi));
 }
 
+/**
+ * @param resource $im
+ */
 function add_ellipse($im, $case) {
     imagefilledellipse(
         $im, $case->cx, $case->cy, $case->w, $case->h, rand_color($im, 50)
     );
 }
 
+/**
+ * @param resource $im
+ */
 function add_rect($im) {
     $cx = rand(-100, 600);
     $cy = rand(-100, 400);

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
     $mid = 200;
     $lo = $mid - $range;
     $hi = $mid + $range;
-    return imagecolorallocate($im, rand($lo,$hi), rand($lo,$hi), rand($lo,$hi));
+    return imagecolorallocate($im, rand($lo, $hi), rand($lo, $hi), rand($lo, $hi));
 }
 
 function add_ellipse($im, $case) {
@@ -46,14 +46,14 @@ 
     $cy = rand(-100, 400);
     $w = rand(50, 100);
     $h = rand(50, 100);
-    imagefilledrectangle($im, $cx, $cy, $cx+$w, $cy+$h, rand_color($im, 50));
+    imagefilledrectangle($im, $cx, $cy, $cx + $w, $cy + $h, rand_color($im, 50));
 }
 
 
 function make_image($case) {
     $im = imagecreatetruecolor(600, 400);
     imagefill($im, 0, 0, imagecolorallocate($im, 255, 255, 255));
-    for ($i=0; $i<400; $i++) {
+    for ($i = 0; $i < 400; $i++) {
         add_rect($im);
     }
     $im2 = imagecreatetruecolor(600, 400);
@@ -85,7 +85,7 @@ 
 $nfiles = 0;
 $dir = null;
 $ellipse_frac = 0.5;
-for ($i=1; $i<$argc; $i++) {
+for ($i = 1; $i < $argc; $i++) {
     if ($argv[$i] == '--nfiles') $nfiles = $argv[++$i];
     elseif ($argv[$i] == '--dir') $dir = $argv[++$i];
     elseif ($argv[$i] == '--ellipse_frac') $ellipse_frac = $argv[++$i];
@@ -99,7 +99,7 @@ 
     exit("$dir is not a directory\n");
 }
 
-for ($i=0; $i<$nfiles; $i++) {
+for ($i = 0; $i < $nfiles; $i++) {
     $path = "$dir/$i.png";
     $anspath = "$dir/$i.ans";
     $case = make_test_case($ellipse_frac);

Braces +13 added lines, -6 removed lines

@@ -86,13 +86,20 @@
 $dir = null;
 $ellipse_frac = 0.5;
 for ($i=1; $i<$argc; $i++) {
-    if ($argv[$i] == '--nfiles') $nfiles = $argv[++$i];
-    elseif ($argv[$i] == '--dir') $dir = $argv[++$i];
-    elseif ($argv[$i] == '--ellipse_frac') $ellipse_frac = $argv[++$i];
-    else usage();
-}
+    if ($argv[$i] == '--nfiles') {
+        $nfiles = $argv[++$i];
+    } elseif ($argv[$i] == '--dir') {
+        $dir = $argv[++$i];
+    } elseif ($argv[$i] == '--ellipse_frac') {
+        $ellipse_frac = $argv[++$i];
+    } else {
+        usage();
+    }
+    }
 
-if (!$nfiles || !$dir) usage();
+if (!$nfiles || !$dir) {
+    usage();
+}
 
 $dir = "../user/$dir";
 if (!is_dir($dir)) {