BOINC / boinc

html/inc/prefs_util.inc

Doc Comments +17 added lines

@@ -440,6 +440,10 @@ 
     }
 }
 
+/**
+ * @param string $id
+ * @param string $d
+ */
 function hour_select($x, $name, $id, $d) {
     $s = "";
     $s .= "<select class=\"selectbox form-control input-sm\" name=$name id=$id $d>\n";
@@ -533,6 +537,9 @@ 
 
 // display preference subsets as columns
 //
+/**
+ * @param string $x
+ */
 function row_top($x) {
     echo "<tr class=\"bg-primary\"><th width=35%>$x</th>";
     echo "<th ><b>".tra("Default")."</b></th>
@@ -545,6 +552,13 @@ 
 
 // row_defs - Display a value for all 4 venues in one row
 //
+/**
+ * @param string $pre
+ * @param string $item
+ * @param string $post
+ * @param string $type
+ * @param string $tooltip
+ */
 function row_defs($pre, $item, $post, $type, $prefs, $tooltip=null) {
     $gen = $prefs->$item;
     $hom  = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--";
@@ -599,6 +613,9 @@ 
 //
 // row_links - Display Edit/Add/Remove links for all venues in 1 row
 //
+/**
+ * @param string $subset
+ */
 function row_links($subset, $prefs) {
     global $g_logged_in_user;
     $tokens = url_tokens($g_logged_in_user->authenticator);

Spacing +26 added lines, -26 removed lines

@@ -40,9 +40,9 @@ 
 }
 
 abstract class PREF {
-    public $desc;       // short description
-    public $tooltip;    // longer description, shown as tooltip
-    public $tag;        // the pref's primary XML tag
+    public $desc; // short description
+    public $tooltip; // longer description, shown as tooltip
+    public $tag; // the pref's primary XML tag
     function __construct($desc, $tooltip, $tag) {
         $this->desc = $desc;
         $this->tooltip = $tooltip;
@@ -120,15 +120,15 @@ 
 
 class PREF_BOOL extends PREF {
     public $default;
-    public $invert;     // show to user in opposite sense
-    function __construct($desc, $tooltip, $tag, $default, $invert=false) {
+    public $invert; // show to user in opposite sense
+    function __construct($desc, $tooltip, $tag, $default, $invert = false) {
         $this->default = $default;
         $this->invert = $invert;
         parent::__construct($desc, $tooltip, $tag);
     }
     function show_value($prefs) {
         $tag = $this->tag;
-        $v = $this->invert?!$prefs->$tag:$prefs->$tag;
+        $v = $this->invert ? !$prefs->$tag : $prefs->$tag;
         echo "<td>".readonly_checkbox($v)."</td>";
     }
     function show_form($prefs, $error) {
@@ -140,7 +140,7 @@ 
         }
         echo "<td ".VALUE_ATTRS.">"
             ."<input type=checkbox name=$this->tag "
-            . ($checked?"checked":"")
+            . ($checked ? "checked" : "")
             ."></td>
         ";
     }
@@ -153,7 +153,7 @@ 
     function xml_string($prefs) {
         $tag = $this->tag;
         return "<$tag>"
-            .($prefs->$tag?"1":"0")
+            .($prefs->$tag ? "1" : "0")
             ."</$tag>\n";
     }
     function xml_parse(&$prefs, $name, $text) {
@@ -179,7 +179,7 @@ 
         // this is the value if they check the box
     public $scale;
 
-    function __construct($suffix, $min, $max, $default, $scale=1, $default2=0) {
+    function __construct($suffix, $min, $max, $default, $scale = 1, $default2 = 0) {
         $this->suffix = " $suffix";
         $this->min = $min;
         $this->max = $max;
@@ -198,7 +198,7 @@ 
         $v .= "$this->suffix ";
         return $v;
     }
-    function form_str($tag, $v, $had_error, $disabled=false, $id=null) {
+    function form_str($tag, $v, $had_error, $disabled = false, $id = null) {
         if (is_numeric($v)) {
             $v /= $this->scale;
             if (!$had_error && ($v < $this->min || $v > $this->max)) {
@@ -206,7 +206,7 @@ 
             }
         }
         if ($disabled) $v = "";
-        $i = $id?"id=\"$id\"":"";
+        $i = $id ? "id=\"$id\"" : "";
         return '<input type="text" size="5" class="form-control input-sm" name="'.$tag.'" value="'.$v."\" $disabled $i> &nbsp; $this->suffix ";
     }
     function form_convert($in, &$out, &$error) {
@@ -243,7 +243,7 @@ 
     function show_form($prefs, $error) {
         $tag = $this->tag;
         $had_error = isset($error->$tag);
-        $attrs = $had_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
+        $attrs = $had_error ? VALUE_ATTRS_ERR : VALUE_ATTRS;
         echo "<td $attrs>"
             .$this->num_spec->form_str($tag, $prefs->$tag, $had_error)
             ."</td>
@@ -324,13 +324,13 @@ 
     function show_form($prefs, $error) {
         $tag = $this->tag;
         $had_error = isset($error->$tag);
-        $attrs = $had_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
+        $attrs = $had_error ? VALUE_ATTRS_ERR : VALUE_ATTRS;
         $checkbox_id = $this->tag."_cb";
         $text_id = $this->tag;
         $default = $this->num_spec->get_default();
         $val = $prefs->$tag;
-        $c = $val?"checked":"";
-        $d = $val?"":"disabled";
+        $c = $val ? "checked" : "";
+        $d = $val ? "" : "disabled";
         echo "<td $attrs>"
             ."<input type=checkbox id=$checkbox_id onClick=\"checkbox_clicked('$checkbox_id', '$text_id', $default)\" $c> &nbsp;"
             .$this->num_spec->form_str($tag, $prefs->$tag, $had_error, $d, $text_id)
@@ -387,7 +387,7 @@ 
         $tag = $this->tag;
         $tag2 = $this->tag2;
         $had_error = isset($error->$tag) || isset($error->$tag2);
-        $attrs = $had_error ?VALUE_ATTRS_ERR:VALUE_ATTRS;
+        $attrs = $had_error ? VALUE_ATTRS_ERR : VALUE_ATTRS;
         $checkbox_id = $this->tag."_cb";
         $t1_id = $this->tag."_t1";
         $t2_id = $this->tag."_t2";
@@ -443,8 +443,8 @@ 
 function hour_select($x, $name, $id, $d) {
     $s = "";
     $s .= "<select class=\"selectbox form-control input-sm\" name=$name id=$id $d>\n";
-    for ($i=0; $i<24; $i++) {
-        $sel = ($x == $i)?"selected":"";
+    for ($i = 0; $i < 24; $i++) {
+        $sel = ($x == $i) ? "selected" : "";
         $s .= "<option value=$i $sel> $i:00";
     }
     $s .= "</select>\n";
@@ -545,7 +545,7 @@ 
 
 // row_defs - Display a value for all 4 venues in one row
 //
-function row_defs($pre, $item, $post, $type, $prefs, $tooltip=null) {
+function row_defs($pre, $item, $post, $type, $prefs, $tooltip = null) {
     $gen = $prefs->$item;
     $hom  = (isset($prefs->home) && isset($prefs->home->$item)) ? $prefs->home->$item : "--";
     $schl = (isset($prefs->school) && isset($prefs->school->$item)) ? $prefs->school->$item : "--";
@@ -557,10 +557,10 @@ 
         echo "<tr>";
     }
     echo "<td ".NAME_ATTRS.">$pre</td>";
-    row_field($gen,  $type);
-    row_field($hom,  $type);
+    row_field($gen, $type);
+    row_field($hom, $type);
     row_field($schl, $type);
-    row_field($wrk,  $type);
+    row_field($wrk, $type);
     echo "<td align=left>$post</td></tr>\n";
 }
 
@@ -570,16 +570,16 @@ 
 function row_field($value, $type) {
     echo "<td>";
     $type = $value === "--" ? "--" : $type;
-    switch($type) {
+    switch ($type) {
     case "yesno":
-        echo $value ?tra("yes"):tra("no");
+        echo $value ? tra("yes") : tra("no");
         break;
     case "noyes":
-        echo $value ?tra("no"):tra("yes");
+        echo $value ? tra("no") : tra("yes");
         break;
     case "limit":
         $x = max_bytes_display_mode($value);
-        $y = "$x " . BYTE_ABBR;
+        $y = "$x ".BYTE_ABBR;
         echo $x ? "$y" : tra("no limit");
         break;
     case "minutes":

Braces +66 added lines, -22 removed lines

@@ -26,16 +26,28 @@ 
 $venues = array("home", "school", "work");
 
 function check_venue($x) {
-    if ($x == "") return;
-    if ($x == "home") return;
-    if ($x == "work") return;
-    if ($x == "school") return;
+    if ($x == "") {
+        return;
+    }
+    if ($x == "home") {
+        return;
+    }
+    if ($x == "work") {
+        return;
+    }
+    if ($x == "school") {
+        return;
+    }
     error_page(tra("bad venue: %1", $x));
 }
 
 function check_subset($x) {
-    if ($x == "global") return;
-    if ($x == "project") return;
+    if ($x == "global") {
+        return;
+    }
+    if ($x == "project") {
+        return;
+    }
     error_page(tra("bad subset: %1", $x));
 }
 
@@ -147,7 +159,9 @@ 
     function parse_form(&$prefs, &$error) {
         $tag = $this->tag;
         $val = array_key_exists($tag, $_GET);
-        if ($this->invert) $val = !$val;
+        if ($this->invert) {
+            $val = !$val;
+        }
         $prefs->$tag = $val;
     }
     function xml_string($prefs) {
@@ -158,7 +172,9 @@ 
     }
     function xml_parse(&$prefs, $name, $text) {
         $tag = $this->tag;
-        if ($name != $tag) return false;
+        if ($name != $tag) {
+            return false;
+        }
         $val = (trim($text) != '0');
         $prefs->$tag = $val;
         return true;
@@ -205,13 +221,17 @@ 
                 $v = $this->default;
             }
         }
-        if ($disabled) $v = "";
+        if ($disabled) {
+            $v = "";
+        }
         $i = $id?"id=\"$id\"":"";
         return '<input type="text" size="5" class="form-control input-sm" name="'.$tag.'" value="'.$v."\" $disabled $i> &nbsp; $this->suffix ";
     }
     function form_convert($in, &$out, &$error) {
         $error = false;
-        if ($in == "") $in = 0;
+        if ($in == "") {
+            $in = 0;
+        }
         if (!is_numeric($in)) {
             $error = true;
             $out = $in;
@@ -223,7 +243,9 @@ 
         }
     }
     function get_default() {
-        if ($this->default) return $this->default;
+        if ($this->default) {
+            return $this->default;
+        }
         return $this->default2;
     }
 }
@@ -252,17 +274,23 @@ 
     function parse_form(&$prefs, &$error) {
         $tag = $this->tag;
         $this->num_spec->form_convert(get_str($tag, true), $prefs->$tag, $e);
-        if ($e) $error->$tag = true;
+        if ($e) {
+            $error->$tag = true;
+        }
     }
     function xml_string($prefs) {
         $tag = $this->tag;
         $v = $prefs->$tag;
-        if (!$v) $v = 0;
+        if (!$v) {
+            $v = 0;
+        }
         return "<$tag>$v</$tag>\n";
     }
     function xml_parse(&$prefs, $name, $text) {
         $tag = $this->tag;
-        if ($name != $tag) return false;
+        if ($name != $tag) {
+            return false;
+        }
         $prefs->$tag = $text;
         return true;
     }
@@ -340,17 +368,23 @@ 
     function parse_form(&$prefs, &$error) {
         $tag = $this->tag;
         $this->num_spec->form_convert(get_str($tag, true), $prefs->$tag, $e);
-        if ($e) $error->$tag = true;
+        if ($e) {
+            $error->$tag = true;
+        }
     }
     function xml_string($prefs) {
         $tag = $this->tag;
         $v = $prefs->$tag;
-        if (!$v) $v = 0;
+        if (!$v) {
+            $v = 0;
+        }
         return "<$tag>$v</$tag>\n";
     }
     function xml_parse(&$prefs, $name, $text) {
         $tag = $this->tag;
-        if ($name != $tag) return false;
+        if ($name != $tag) {
+            return false;
+        }
         $prefs->$tag = $text;
         return true;
     }
@@ -413,9 +447,13 @@ 
         $tag = $this->tag;
         $tag2 = $this->tag2;
         $this->num_spec1->form_convert(get_str($tag, true), $prefs->$tag, $e);
-        if ($e) $error->$tag = true;
+        if ($e) {
+            $error->$tag = true;
+        }
         $this->num_spec2->form_convert(get_str($tag2, true), $prefs->$tag2, $e);
-        if ($e) $error->$tag2 = $e;
+        if ($e) {
+            $error->$tag2 = $e;
+        }
     }
     function xml_string($prefs) {
         $tag = $this->tag;
@@ -508,7 +546,9 @@ 
         $tag2 = $this->tag2;
         $h1 = $prefs->$tag;
         $h2 = $prefs->$tag2;
-        if ($h1 == $h2) return "";
+        if ($h1 == $h2) {
+            return "";
+        }
         return "<$tag>$h1</$tag>\n<$tag2>$h2</$tag2>\n";
     }
     function xml_parse(&$prefs, $name, $text) {
@@ -637,9 +677,13 @@ 
 //
 function project_has_beta() {
     $apps = BoincApp::enum("deprecated=0 and beta>0");
-    if (count($apps)) return true;
+    if (count($apps)) {
+        return true;
+    }
     $avs = BoincAppVersion::enum("deprecated=0 and beta>0");
-    if (count($avs)) return true;
+    if (count($avs)) {
+        return true;
+    }
     return false;
 }
 

html/inc/profile.inc

Doc Comments +5 added lines

@@ -114,6 +114,11 @@
     return BoincProfile::delete_aux("userid=$user->id");
 }
 
+/**
+ * @param resource $image
+ * @param integer $targetWidth
+ * @param integer $targetHeight
+ */
 function scale_image(
     $image, $origWidth, $origHeight, $targetWidth, $targetHeight
 ) {

Indentation +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
     $min_credit = parse_config(get_config(), "<profile_min_credit>");
     if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit ) {
         error_page(
-           tra("To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users. We apologize for this inconvenience.", $min_credit)
+            tra("To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users. We apologize for this inconvenience.", $min_credit)
         );
     }
     if (is_banished($user)) {

Spacing +10 added lines, -10 removed lines

@@ -71,7 +71,7 @@ 
     if (!$user->has_profile) return null;
     $profile = BoincProfile::lookup("userid=$user->id");
     if (!$profile->has_picture) return null;
-    if (profile_screening() && $profile->verification!=1) return null;
+    if (profile_screening() && $profile->verification != 1) return null;
     return profile_thumb_url($user->id);
 }
 
@@ -125,18 +125,18 @@ 
         return $image;
     }
 
-    ($origWidth > $origHeight)? $scalar = ($origWidth / $targetWidth) : $scalar = ($origHeight / $targetHeight);
+    ($origWidth > $origHeight) ? $scalar = ($origWidth/$targetWidth) : $scalar = ($origHeight/$targetHeight);
 
     if ($scalar != 0) {
-        $destWidth = $origWidth / $scalar;
-        $destHeight = $origHeight / $scalar;
+        $destWidth = $origWidth/$scalar;
+        $destHeight = $origHeight/$scalar;
     } else {
         $destWidth = $origWidth;
         $destHeight = $origHeight;
     }
 
     $gd_info = gd_info();
-    $newGD = (strstr($gd_info["GD Version"], "2.0")!="");
+    $newGD = (strstr($gd_info["GD Version"], "2.0") != "");
     if ($newGD) {
         // If you are using a modern PHP/GD installation that does
         // 'truecolor' images, this is what's needed.
@@ -179,7 +179,7 @@ 
         $options->htmlitems = false;
         $temp = output_transform($profile->response1, $options);
         $temp = sanitize_tags($temp);
-        $description = "(\"" . sub_sentence($temp, ' ', MAX_DESC_LENGTH, true) . "\")";
+        $description = "(\"".sub_sentence($temp, ' ', MAX_DESC_LENGTH, true)."\")";
 
     }
 
@@ -189,7 +189,7 @@ 
 
 function check_whether_to_show_profile($user, $logged_in_user) {
     $min_credit = parse_config(get_config(), "<profile_min_credit>");
-    if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit ) {
+    if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit) {
         error_page(
            tra("To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users. We apologize for this inconvenience.", $min_credit)
         );
@@ -227,7 +227,7 @@ 
     //
     $show_picture = $profile->has_picture;
     if (profile_screening()) {
-        if (!$screen_mode && !$can_edit && $profile->verification!=1) {
+        if (!$screen_mode && !$can_edit && $profile->verification != 1) {
             $show_picture = false;
         }
     }
@@ -243,7 +243,7 @@ 
     // yet verified.  This will tell them if other users can't view it yet, or
     // if there is a problem with it and they need to replace it.
     //
-    if (profile_screening() && $profile->has_picture && $can_edit && $profile->verification!=1) {
+    if (profile_screening() && $profile->has_picture && $can_edit && $profile->verification != 1) {
         row1(offensive_profile_warning($profile->verification));
     }
 
@@ -276,6 +276,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

Braces +9 added lines, -3 removed lines

@@ -68,10 +68,16 @@
 }
 
 function profile_user_thumb_url($user) {
-    if (!$user->has_profile) return null;
+    if (!$user->has_profile) {
+        return null;
+    }
     $profile = BoincProfile::lookup("userid=$user->id");
-    if (!$profile->has_picture) return null;
-    if (profile_screening() && $profile->verification!=1) return null;
+    if (!$profile->has_picture) {
+        return null;
+    }
+    if (profile_screening() && $profile->verification!=1) {
+        return null;
+    }
     return profile_thumb_url($user->id);
 }
 

html/inc/result.inc

Doc Comments +15 added lines

@@ -53,6 +53,9 @@ 
     return $platforms[$id];
 }
 
+/**
+ * @param string $rsc_name
+ */
 function anon_platform_string($result, $rsc_name=null) {
     $app = get_app($result->appid);
     $n = $app->user_friendly_name."<br>".  tra("Anonymous platform");
@@ -92,6 +95,9 @@ 
     return "$n v$v $c<br>$platform->name";
 }
 
+/**
+ * @param string $string_to_show
+ */
 function result_granted_credit_string($result, $string_to_show) {
     if ($result->server_state == RESULT_SERVER_STATE_IN_PROGRESS && $result->granted_credit > 0) {
         return $string_to_show;
@@ -356,6 +362,10 @@ 
     return "results.php?$c&amp;offset=$o&amp;show_names=$sn&amp;state=$st&amp;appid=$appid";
 }
 
+/**
+ * @param boolean $show_wu_link
+ * @param boolean $show_host_link
+ */
 function result_table_start($show_wu_link, $show_host_link, $info) {
     start_table('table-striped');
     $x = array();
@@ -417,6 +427,11 @@ 
     return false;
 }
 
+/**
+ * @param boolean $show_wu_link
+ * @param boolean $show_host_link
+ * @param boolean $show_name
+ */
 function show_result_row($result, $show_wu_link, $show_host_link, $show_name) {
     $s = time_str($result->sent_time);
     // if result has been reported, show the received time,

Spacing +33 added lines, -33 removed lines

@@ -53,9 +53,9 @@ 
     return $platforms[$id];
 }
 
-function anon_platform_string($result, $rsc_name=null) {
+function anon_platform_string($result, $rsc_name = null) {
     $app = get_app($result->appid);
-    $n = $app->user_friendly_name."<br>".  tra("Anonymous platform");
+    $n = $app->user_friendly_name."<br>".tra("Anonymous platform");
     if ($rsc_name) {
         $n .= " ($rsc_name)";
     }
@@ -97,7 +97,7 @@ 
         return $string_to_show;
     }
     if ($result->server_state <> RESULT_SERVER_STATE_OVER) return "---";
-    switch($result->outcome) {
+    switch ($result->outcome) {
     case RESULT_OUTCOME_SUCCESS:
         switch ($result->validate_state) {
         case VALIDATE_STATE_INIT:
@@ -212,7 +212,7 @@ 
             ) {
                 return tra("Not started by deadline - canceled");
             }
-            switch($result->client_state) {
+            switch ($result->client_state) {
             case RESULT_FILES_DOWNLOADING: return tra("Error while downloading");
             case RESULT_FILES_DOWNLOADED:
             case RESULT_COMPUTE_ERROR: return tra("Error while computing");
@@ -231,7 +231,7 @@ 
 }
 
 function result_server_state_string($result) {
-    switch($result->server_state) {
+    switch ($result->server_state) {
     case RESULT_SERVER_STATE_INACTIVE: return tra("Inactive");
     case RESULT_SERVER_STATE_UNSENT: return tra("Unsent");
     case RESULT_SERVER_STATE_IN_PROGRESS: return tra("In progress");
@@ -241,7 +241,7 @@ 
 }
 
 function result_outcome_string($result) {
-    switch($result->outcome) {
+    switch ($result->outcome) {
     case RESULT_OUTCOME_INIT: return "---";
     case RESULT_OUTCOME_SUCCESS: return tra("Success");
     case RESULT_OUTCOME_COULDNT_SEND: return tra("Couldn't send");
@@ -259,7 +259,7 @@ 
 }
 
 function result_client_state_string($result) {
-    switch($result->client_state) {
+    switch ($result->client_state) {
     case RESULT_NEW: return tra("New");
     case RESULT_FILES_DOWNLOADING: return tra("Downloading");
     case RESULT_FILES_DOWNLOADED: return tra("Processing");
@@ -277,7 +277,7 @@ 
 }
 
 function validate_state_str($result) {
-    switch($result->validate_state) {
+    switch ($result->validate_state) {
     case VALIDATE_STATE_INIT: return tra("Initial");
     case VALIDATE_STATE_VALID: return tra("Valid");
     case VALIDATE_STATE_INVALID:
@@ -293,7 +293,7 @@ 
 }
 
 function assimilate_state_str($s) {
-    switch($s) {
+    switch ($s) {
     case ASSIMILATE_INIT: return "Initial";
     case ASSIMILATE_READY: return "Ready to assimilate";
     case ASSIMILATE_DONE: return "Assimilated";
@@ -302,7 +302,7 @@ 
 }
 
 function file_delete_state_str($s) {
-    switch($s) {
+    switch ($s) {
     case FILE_DELETE_INIT: return "Initial";
     case FILE_DELETE_READY: return "Ready to delete";
     case FILE_DELETE_DONE: return "Deleted";
@@ -312,27 +312,27 @@ 
 }
 function wu_error_mask_str($s) {
     $x = "";
-    if ($s & WU_ERROR_COULDNT_SEND_RESULT) {
+    if ($s&WU_ERROR_COULDNT_SEND_RESULT) {
         $x = $x." ".tra("Couldn't send result");
         $s -= WU_ERROR_COULDNT_SEND_RESULT;
     }
-    if ($s & WU_ERROR_TOO_MANY_ERROR_RESULTS) {
+    if ($s&WU_ERROR_TOO_MANY_ERROR_RESULTS) {
         $x = $x." ".tra("Too many errors (may have bug)");
         $s -= WU_ERROR_TOO_MANY_ERROR_RESULTS;
     }
-    if ($s & WU_ERROR_TOO_MANY_SUCCESS_RESULTS) {
+    if ($s&WU_ERROR_TOO_MANY_SUCCESS_RESULTS) {
         $x = $x." ".tra("Too many results (may be nondeterministic)");
         $s -= WU_ERROR_TOO_MANY_SUCCESS_RESULTS;
     }
-    if ($s & WU_ERROR_TOO_MANY_TOTAL_RESULTS) {
+    if ($s&WU_ERROR_TOO_MANY_TOTAL_RESULTS) {
         $x = $x." ".tra("Too many total results");
         $s -= WU_ERROR_TOO_MANY_TOTAL_RESULTS;
     }
-    if ($s & WU_ERROR_CANCELLED) {
+    if ($s&WU_ERROR_CANCELLED) {
         $x = $x." ".tra("WU cancelled");
         $s -= WU_ERROR_CANCELLED;
     }
-    if ($s & WU_ERROR_NO_CANONICAL_RESULT) {
+    if ($s&WU_ERROR_NO_CANONICAL_RESULT) {
         $x = $x." ".tra("Canonical result is missing");
         $s -= WU_ERROR_NO_CANONICAL_RESULT;
     }
@@ -340,9 +340,9 @@ 
         $x = $x." ".tra("Unrecognized Error: %1", $s);
     }
     if (strlen($x)) {
-        $x="<font color=\"#ff3333\">".$x."</font>";
+        $x = "<font color=\"#ff3333\">".$x."</font>";
     } else {
-        $x="";
+        $x = "";
     }
     return $x;
 }
@@ -426,10 +426,10 @@ 
     if ($result->received_time) {
         $r = time_str($result->received_time);
     } else if ($result->report_deadline) {
-        if ($result->report_deadline>time()) {
-            $r = "<font color='#33cc33'>" . time_str($result->report_deadline) . "</font>";
+        if ($result->report_deadline > time()) {
+            $r = "<font color='#33cc33'>".time_str($result->report_deadline)."</font>";
         } else {
-            $r = "<font color='#ff3333'>" . time_str($result->report_deadline) . "</font>";
+            $r = "<font color='#ff3333'>".time_str($result->report_deadline)."</font>";
         }
     } else {
         $r = "---";
@@ -490,7 +490,7 @@ 
 // @param Integer $dec A signed integer
 //
 function int2hex($dec) {
-    return "0x".strtoupper(substr(sprintf("%08x",$dec), -8));
+    return "0x".strtoupper(substr(sprintf("%08x", $dec), -8));
 }
 
 // Decode a windows error number into semi-human-readable,
@@ -500,9 +500,9 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function windows_error_code_str($x){
-    $h=int2hex($x);
-    switch($h){
+function windows_error_code_str($x) {
+    $h = int2hex($x);
+    switch ($h) {
     case "0xC0000005": return "STATUS_ACCESS_VIOLATION";
     case "0xC000001D": return "STATUS_ILLEGAL_INSTRUCTION";
     case "0xC0000094": return "STATUS_INTEGER_DIVIDE_BY_ZERO";
@@ -523,10 +523,10 @@ 
 // @return String A human readable error message
 // @param Integer $x An error number
 //
-function error_code_str($x){
+function error_code_str($x) {
     // severe Windows error numbers are always large negative integers
-    if ($x<-400) return windows_error_code_str($x);
-    switch($x){
+    if ($x < -400) return windows_error_code_str($x);
+    switch ($x) {
     case 0: return "";
     case 192: return "EXIT_STATEFILE_WRITE";
     case 193: return "EXIT_SIGNAL";
@@ -687,7 +687,7 @@ 
     return $x." (".int2hex($x).") ".error_code_str($x);
 }
 
-function show_result($result, $show_outfile_links=false) {
+function show_result($result, $show_outfile_links = false) {
     start_table();
     row2(tra("Name"), $result->name);
     row2(tra("Workunit"), "<a href=\"workunit.php?wuid=$result->workunitid\">$result->workunitid</a>");
@@ -736,7 +736,7 @@ 
     echo "<h3>".tra("Stderr output")."</h3> <pre>"
         .htmlspecialchars(
             $result->stderr_out,
-            ENT_QUOTES | (defined('ENT_SUBSTITUTE')?ENT_SUBSTITUTE:0),
+            ENT_QUOTES|(defined('ENT_SUBSTITUTE') ? ENT_SUBSTITUTE : 0),
             'utf-8'
         )
         ."</pre>"
@@ -751,7 +751,7 @@ 
 
     $apps = BoincApp::enum('deprecated=0 ORDER BY user_friendly_name');
 
-    for ($i=0; $i<NSTATES; $i++) {
+    for ($i = 0; $i < NSTATES; $i++) {
         $state_count[$i] = 0;
     }
     foreach ($apps as $app) {
@@ -793,7 +793,7 @@ 
         $x .= "<a href=$url>".tra("Next")." ".$info->results_per_page."</a>";
     }
     $x .= "<br>".tra("State").": ";
-    for ($i=0; $i<NSTATES; $i++) {
+    for ($i = 0; $i < NSTATES; $i++) {
         if ($i) $x .= " &middot; ";
         if ($info->state == $i) {
             $x .= $state_name[$i];
@@ -838,6 +838,6 @@ 
     return $x;
 }
 
-$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

@@ -96,7 +96,9 @@ 
     if ($result->server_state == RESULT_SERVER_STATE_IN_PROGRESS && $result->granted_credit > 0) {
         return $string_to_show;
     }
-    if ($result->server_state <> RESULT_SERVER_STATE_OVER) return "---";
+    if ($result->server_state <> RESULT_SERVER_STATE_OVER) {
+        return "---";
+    }
     switch($result->outcome) {
     case RESULT_OUTCOME_SUCCESS:
         switch ($result->validate_state) {
@@ -145,7 +147,9 @@ 
 );
 
 function state_num($result) {
-    if ($result->server_state == RESULT_SERVER_STATE_IN_PROGRESS) return 1;
+    if ($result->server_state == RESULT_SERVER_STATE_IN_PROGRESS) {
+        return 1;
+    }
     if ($result->server_state == RESULT_SERVER_STATE_OVER && $result->outcome == RESULT_OUTCOME_SUCCESS) {
         if ($result->validate_state == VALIDATE_STATE_INIT) {
             return STATE_PENDING;
@@ -412,8 +416,12 @@ 
 // was result invalid or timed out?
 //
 function bad_result($result) {
-    if ($result->validate_state == 2) return true;
-    if (!$result->received_time && ($result->report_deadline < time())) return true;
+    if ($result->validate_state == 2) {
+        return true;
+    }
+    if (!$result->received_time && ($result->report_deadline < time())) {
+        return true;
+    }
     return false;
 }
 
@@ -525,7 +533,9 @@ 
 //
 function error_code_str($x){
     // severe Windows error numbers are always large negative integers
-    if ($x<-400) return windows_error_code_str($x);
+    if ($x<-400) {
+        return windows_error_code_str($x);
+    }
     switch($x){
     case 0: return "";
     case 192: return "EXIT_STATEFILE_WRITE";
@@ -724,7 +734,9 @@ 
         $i = 0;
         $x = "";
         foreach ($names as $name) {
-            if ($i) $x .= " &middot; ";
+            if ($i) {
+                $x .= " &middot; ";
+            }
             $url = dir_hier_url($name, "upload", $fanout);
             echo $name;
             $x .= " <a href=$url>$i</a> ";
@@ -794,7 +806,9 @@ 
     }
     $x .= "<br>".tra("State").": ";
     for ($i=0; $i<NSTATES; $i++) {
-        if ($i) $x .= " &middot; ";
+        if ($i) {
+            $x .= " &middot; ";
+        }
         if ($info->state == $i) {
             $x .= $state_name[$i];
         } else {

html/inc/sandbox.inc

Doc Comments +12 added lines

@@ -26,6 +26,9 @@ 
 // Create dir if not present.
 //
 if (!function_exists("sandbox_dir")){
+/**
+ * @return string
+ */
 function sandbox_dir($user) {
     $dir = parse_config(get_config(), "<sandbox_dir>");
     if (!$dir) { $dir = "../../sandbox/"; }
@@ -40,12 +43,18 @@ 
 }
 }
 
+/**
+ * @param string $md5
+ */
 function sandbox_write_link_file($path, $size, $md5) {
     file_put_contents($path, "sb $size $md5");
 }
 
 // check if a newly update files already exists in sandbox via its md5 sum
 //
+/**
+ * @param string $md5
+ */
 function sandbox_lf_exist($user, $md5) {
     $exist = 0;
     $elf = "";
@@ -115,6 +124,9 @@ 
 // return a <select> for files in sandbox
 //
 if (!function_exists('sandbox_file_select')) {
+/**
+ * @param string $select_name
+ */
 function sandbox_file_select($user, $select_name, $regexp = null, $allow_none = false) {
     if ($regexp === null) {
         $regexp = $select_name;

Spacing +12 added lines, -12 removed lines

@@ -25,7 +25,7 @@ 
 // Return path of sandbox directory for the given user.
 // Create dir if not present.
 //
-if (!function_exists("sandbox_dir")){
+if (!function_exists("sandbox_dir")) {
 function sandbox_dir($user) {
     $dir = parse_config(get_config(), "<sandbox_dir>");
     if (!$dir) { $dir = "../../sandbox/"; }
@@ -54,7 +54,7 @@ 
     foreach ($files as $file) {
         $path = $dir."/".$file;
         list($err, $file_size, $file_md5) = sandbox_parse_link_file($path);
-        if (!$err){
+        if (!$err) {
             if (strcmp($md5, $file_md5) == 0) {
                 //echo "this file with $md5 already exisits with another name $file";
                 $exist = 1;
@@ -125,7 +125,7 @@ 
     }
     $files = sandbox_file_names($user);
     foreach ($files as $f) {
-        if(preg_match("/$regexp/",$f)){
+        if (preg_match("/$regexp/", $f)) {
             $x .= "<option value=\"$f\">$f</option>\n";
         }
     }
@@ -136,7 +136,7 @@ 
 
 //check if a file is still being used by a unfinished batch
 //
-function sandbox_file_in_use($user, $file){
+function sandbox_file_in_use($user, $file) {
     $ufiles = array();
 
     // batch status: 2(completed), 3(aborted)
@@ -144,17 +144,17 @@ 
     $pbatches = BoincBatch::enum("user_id = $user->id and state != 2 and state != 3");
     if (!$pbatches) return false;
 
-    foreach ($pbatches as $batch){
-        $wus = BoincWorkUnit::enum("batch = $batch->id limit 1" );
-        if ($wus == null){
+    foreach ($pbatches as $batch) {
+        $wus = BoincWorkUnit::enum("batch = $batch->id limit 1");
+        if ($wus == null) {
             //echo " no workunit for this batch<br/>"; 
             continue;
         }
-        foreach($wus as $wu){
+        foreach ($wus as $wu) {
             $x = "<in>".$wu->xml_doc."</in>";
             $x = simplexml_load_string($x);
             global $fanout;
-            foreach($x->workunit->file_ref as $fr){
+            foreach ($x->workunit->file_ref as $fr) {
                 $pname = (string)$fr->file_name;
                 $ufiles[] = $pname;
             }
@@ -165,10 +165,10 @@ 
     $dir = sandbox_dir($user);
     $path = $dir."/".$file;
     list($err, $size, $md5) = sandbox_parse_link_file($path);
-    if (!$err){
+    if (!$err) {
         $f = sandbox_file_name($user, $md5);
-        foreach($ufiles as $uf) {
-            if (strcmp($f,$uf) == 0){
+        foreach ($ufiles as $uf) {
+            if (strcmp($f, $uf) == 0) {
                 return true;
             }
             

Braces +15 added lines, -5 removed lines

@@ -72,8 +72,12 @@ 
     if (!file_exists($path)) { return array(true, null, null); }
     $x = file_get_contents($path);
     $n = sscanf($x, "%s %d %s", $s, $size, $md5);
-    if ($n != 3) return array(true, null, null);
-    if ($s != 'sb') return array(true, null, null);
+    if ($n != 3) {
+        return array(true, null, null);
+    }
+    if ($s != 'sb') {
+        return array(true, null, null);
+    }
     return array(false, $size, $md5);
 }
 
@@ -103,8 +107,12 @@ 
     $d = opendir(sandbox_dir($user));
     $names = array();
     while (($f = readdir($d)) !== false) {
-        if ($f == '.') continue;
-        if ($f == '..') continue;
+        if ($f == '.') {
+            continue;
+        }
+        if ($f == '..') {
+            continue;
+        }
         $names[] = $f;
     }
     natsort($names);
@@ -142,7 +150,9 @@ 
     // batch status: 2(completed), 3(aborted)
     // $pbatches = BoincBatch::enum("user_id = $user->id and state != BATCH_STATE_COMPLETE and state != BATCH_STATE_ABORTED");
     $pbatches = BoincBatch::enum("user_id = $user->id and state != 2 and state != 3");
-    if (!$pbatches) return false;
+    if (!$pbatches) {
+        return false;
+    }
 
     foreach ($pbatches as $batch){
         $wus = BoincWorkUnit::enum("batch = $batch->id limit 1" );

html/inc/submit.inc

Doc Comments +24 added lines

@@ -145,6 +145,9 @@ 
     }
 }
 
+/**
+ * @param string $op
+ */
 function do_batch_op($req, $op) {
     $retval = validate_request($req);
     if ($retval) return array(null, $retval);
@@ -172,6 +175,9 @@ 
 
 // if RPC had a fatal error, return the message
 //
+/**
+ * @param string $outer_tag
+ */
 function get_error($reply, $outer_tag) {
     $name = $reply->getName();
     if ($name != $outer_tag) {
@@ -187,6 +193,9 @@ 
 
 //// API functions follow
 
+/**
+ * @param stdClass $req
+ */
 function boinc_estimate_batch($req) {
     list($reply, $errmsg) = do_batch_op($req, "estimate_batch");
     if ($errmsg) return array(0, $errmsg);
@@ -205,6 +214,9 @@ 
     return array((int)$reply->batch_id, null);
 }
 
+/**
+ * @param stdClass $req
+ */
 function boinc_query_batches($req) {
     $req_xml = "<query_batches>
     <authenticator>$req->authenticator</authenticator>
@@ -255,6 +267,9 @@ 
     return array($r, null);
 }
 
+/**
+ * @param stdClass $req
+ */
 function boinc_query_job($req) {
     $req_xml = "<query_job>
     <authenticator>$req->authenticator</authenticator>
@@ -285,6 +300,9 @@ 
     return array($r, null);
 }
 
+/**
+ * @return string
+ */
 function boinc_abort_batch($req) {
     $req_xml = "<abort_batch>
     <authenticator>$req->authenticator</authenticator>
@@ -299,6 +317,9 @@ 
     return array(true, null);
 }
 
+/**
+ * @param stdClass $req
+ */
 function boinc_get_output_file($req) {
     $auth_str = md5($req->authenticator.$req->instance_name);
     $name = $req->instance_name;
@@ -312,6 +333,9 @@ 
     return $req->project."/get_output.php?cmd=batch_files&batch_id=$batch_id&auth_str=$auth_str";
 }
 
+/**
+ * @return string
+ */
 function boinc_retire_batch($req) {
     $req_xml = "<retire_batch>
     <authenticator>$req->authenticator</authenticator>

Spacing +2 added lines, -2 removed lines

@@ -158,7 +158,7 @@ 
     $b->create_time = (double)($batch->create_time);
     $b->est_completion_time = (double)($batch->est_completion_time);
     $b->njobs = (int)($batch->njobs);
-    $b->fraction_done = (double) $batch->fraction_done;
+    $b->fraction_done = (double)$batch->fraction_done;
     $b->nerror_jobs = (int)($batch->nerror_jobs);
     $b->state = (int)($batch->state);
     $b->completion_time = (double)($batch->completion_time);
@@ -386,7 +386,7 @@ 
     </result>
 </output_template>
 ";
-    for ($i=0; $i<2; $i++) {
+    for ($i = 0; $i < 2; $i++) {
         $job->rsc_fpops_est = $i*1e9;
         $job->command_line = "--t $i";
         $job->wu_template = $it;

Braces +45 added lines, -15 removed lines

@@ -95,12 +95,24 @@ 
 }
 
 function validate_request($req) {
-    if (!is_object($req)) return "req is not an object";
-    if (!array_key_exists('project', $req)) return "missing req->project";
-    if (!array_key_exists('authenticator', $req)) return "missing req->authenticator";
-    if (!array_key_exists('app_name', $req)) return "missing req->app_name";
-    if (!array_key_exists('jobs', $req)) return "missing req->jobs";
-    if (!is_array($req->jobs)) return "req->jobs is not an array";
+    if (!is_object($req)) {
+        return "req is not an object";
+    }
+    if (!array_key_exists('project', $req)) {
+        return "missing req->project";
+    }
+    if (!array_key_exists('authenticator', $req)) {
+        return "missing req->authenticator";
+    }
+    if (!array_key_exists('app_name', $req)) {
+        return "missing req->app_name";
+    }
+    if (!array_key_exists('jobs', $req)) {
+        return "missing req->jobs";
+    }
+    if (!is_array($req->jobs)) {
+        return "req->jobs is not an array";
+    }
     foreach ($req->jobs as $job) {
         // other checks
     }
@@ -132,7 +144,9 @@ 
     curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
     $reply = curl_exec($ch);
     curl_close($ch);
-    if (!$reply) return array(null, "HTTP error");
+    if (!$reply) {
+        return array(null, "HTTP error");
+    }
     $r = @simplexml_load_string($reply);
     if (!$r) {
         return array(null, "Can't parse reply XML:\n$reply");
@@ -147,7 +161,9 @@ 
 
 function do_batch_op($req, $op) {
     $retval = validate_request($req);
-    if ($retval) return array(null, $retval);
+    if ($retval) {
+        return array(null, $retval);
+    }
     $xml = req_to_xml($req, $op);
     return do_http_op($req, $xml, $op);
 }
@@ -189,7 +205,9 @@ 
 
 function boinc_estimate_batch($req) {
     list($reply, $errmsg) = do_batch_op($req, "estimate_batch");
-    if ($errmsg) return array(0, $errmsg);
+    if ($errmsg) {
+        return array(0, $errmsg);
+    }
     if ($x = get_error($reply, "estimate_batch")) {
         return array(null, $x);
     }
@@ -198,7 +216,9 @@ 
 
 function boinc_submit_batch($req) {
     list($reply, $errmsg) = do_batch_op($req, "submit_batch");
-    if ($errmsg) return array(0, $errmsg);
+    if ($errmsg) {
+        return array(0, $errmsg);
+    }
     if ($x = get_error($reply, "submit_batch")) {
         return array(null, $x);
     }
@@ -214,7 +234,9 @@ 
     }
     $req_xml .= "</query_batches>\n";
     list($reply, $errmsg) = do_http_op($req, $req_xml, "");
-    if ($errmsg) return array(null, $errmsg);
+    if ($errmsg) {
+        return array(null, $errmsg);
+    }
     if ($x = get_error($reply, "query_batches")) {
         return array(null, $x);
     }
@@ -239,7 +261,9 @@ 
     }
     echo "</query_batch>\n";
     list($reply, $errmsg) = do_http_op($req, $req_xml, "");
-    if ($errmsg) return array(null, $errmsg);
+    if ($errmsg) {
+        return array(null, $errmsg);
+    }
     if ($x = get_error($reply, "query_batch")) {
         return array(null, $x);
     }
@@ -262,7 +286,9 @@ 
 </query_job>
 ";
     list($reply, $errmsg) = do_http_op($req, $req_xml, "");
-    if ($errmsg) return array(null, $errmsg);
+    if ($errmsg) {
+        return array(null, $errmsg);
+    }
     if ($x = get_error($reply, "query_job")) {
         return array(null, $x);
     }
@@ -292,7 +318,9 @@ 
 </abort_batch>
 ";
     list($reply, $errmsg) = do_http_op($req, $req_xml, "");
-    if ($errmsg) return $errmsg;
+    if ($errmsg) {
+        return $errmsg;
+    }
     if ($x = get_error($reply, "abort_batch")) {
         return array(null, $x);
     }
@@ -319,7 +347,9 @@ 
 </retire_batch>
 ";
     list($reply, $errmsg) = do_http_op($req, $req_xml, "");
-    if ($errmsg) return $errmsg;
+    if ($errmsg) {
+        return $errmsg;
+    }
     if ($x = get_error($reply, "retire_batch")) {
         return array(null, $x);
     }

html/inc/submit_db.inc

Doc Comments +16 added lines

@@ -34,6 +34,10 @@ 
         $db = BoincDb::get();
         return $db->enum('batch', 'BoincBatch', $clause);
     }
+
+    /**
+     * @param string $clause
+     */
     static function insert($clause) {
         $db = BoincDb::get();
         $ret = $db->insert('batch', $clause);
@@ -44,6 +48,10 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'batch', $clause);
     }
+
+    /**
+     * @param string $clause
+     */
     static function update_aux($clause) {
         $db = BoincDb::get();
         return $db->update_aux('batch', $clause);
@@ -59,6 +67,10 @@ 
 }
 
 class BoincUserSubmit {
+
+    /**
+     * @param string $clause
+     */
     static function enum($clause) {
         $db = BoincDb::get();
         return $db->enum('user_submit', 'BoincUserSubmit', $clause);
@@ -77,6 +89,10 @@ 
         $db = BoincDb::get();
         return $db->update_aux('user_submit', "$clause where user_id=$this->user_id");
     }
+
+    /**
+     * @param string $clause
+     */
     static function update_aux($clause) {
         $db = BoincDb::get();
         return $db->update_aux('user_submit', $clause);

Braces +15 added lines, -5 removed lines

@@ -37,7 +37,9 @@ 
     static function insert($clause) {
         $db = BoincDb::get();
         $ret = $db->insert('batch', $clause);
-        if (!$ret) return $ret;
+        if (!$ret) {
+            return $ret;
+        }
         return $db->insert_id();
     }
     function update($clause) {
@@ -66,7 +68,9 @@ 
     static function insert($clause) {
         $db = BoincDb::get();
         $ret = $db->insert('user_submit', $clause);
-        if (!$ret) return false;
+        if (!$ret) {
+            return false;
+        }
         return true;
     }
     static function lookup_userid($user_id) {
@@ -95,7 +99,9 @@ 
     static function insert($clause) {
         $db = BoincDb::get();
         $ret = $db->insert('user_submit_app', $clause);
-        if (!$ret) return false;
+        if (!$ret) {
+            return false;
+        }
         return true;
     }
     static function delete_user($user_id) {
@@ -112,7 +118,9 @@ 
     static function insert($clause) {
         $db = BoincDb::get();
         $ret = $db->insert('job_file', $clause);
-        if (!$ret) return false;
+        if (!$ret) {
+            return false;
+        }
         return $db->insert_id();
     }
     static function lookup_name($name) {
@@ -133,7 +141,9 @@ 
     static function insert($clause) {
         $db = BoincDb::get();
         $ret = $db->insert('batch_file_assoc', $clause);
-        if (!$ret) return false;
+        if (!$ret) {
+            return false;
+        }
         return true;
     }
     static function lookup($clause) {

html/inc/submit_util.inc

Doc Comments +11 added lines

@@ -26,6 +26,9 @@ 
 // we need to give a unique physical name based on its content.
 // Prepend the jf_ to make the origin of the file clear
 //
+/**
+ * @param string $md5
+ */
 function job_file_name($md5) {
     return "jf_$md5";
 }
@@ -179,12 +182,20 @@ 
     return $batch_td_size;
 }
 
+/**
+ * @param integer $i
+ *
+ * @return double
+ */
 function boinc_get_output_file_url($user, $result, $i) {
     $name = $result->name;
     $auth_str = md5($user->authenticator.$name);
     return "get_output.php?cmd=result_file&result_name=$name&file_num=$i&auth_str=$auth_str";
 }
 
+/**
+ * @param null|integer $batch_id
+ */
 function boinc_get_output_files_url($user, $batch_id) {
     $auth_str = md5($user->authenticator.$batch_id);
     return "get_output.php?cmd=batch_files&batch_id=$batch_id&auth_str=$auth_str";

Spacing +6 added lines, -6 removed lines

@@ -73,7 +73,7 @@ 
         }
     }
     if ($fp_total) {
-        $batch->fraction_done = $fp_done / $fp_total;
+        $batch->fraction_done = $fp_done/$fp_total;
     }
     if ($completed && $batch->state == BATCH_STATE_IN_PROGRESS) {
         $batch->state = BATCH_STATE_COMPLETE;
@@ -159,7 +159,7 @@ 
 // get the total size of output files of a batch
 //
 function batch_output_file_size($batchid) {
-    $batch_td_size=0;
+    $batch_td_size = 0;
     $wus = BoincWorkunit::enum("batch=$batchid");
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
     $upload_dir = parse_config(get_config(), "<upload_dir>");
@@ -170,9 +170,9 @@ 
         foreach ($names as $name) {
             $path = dir_hier_path($name, $upload_dir, $fanout);
             if (is_file($path)) {
-                $s=stat($path);
-                $size=$s['size'];
-                $batch_td_size+=$size;
+                $s = stat($path);
+                $size = $s['size'];
+                $batch_td_size += $size;
             }
         }
     }
@@ -191,7 +191,7 @@ 
 }
 
 function boinc_get_wu_output_files_url($user, $wu_id) {
-    $auth_str =  md5($user->authenticator.$wu_id);
+    $auth_str = md5($user->authenticator.$wu_id);
     return "get_output.php?cmd=workunit_files&wu_id=$wu_id&auth_str=$auth_str";
 }
 

Braces +18 added lines, -6 removed lines

@@ -32,12 +32,18 @@ 
 
 function authenticate_user($r, $app) {
     $auth = (string)$r->authenticator;
-    if (!$auth) xml_error(-1, "no authenticator");
+    if (!$auth) {
+        xml_error(-1, "no authenticator");
+    }
     $auth = BoincDb::escape_string($auth);
     $user = BoincUser::lookup("authenticator='$auth'");
-    if (!$user) xml_error(-1, "bad authenticator");
+    if (!$user) {
+        xml_error(-1, "bad authenticator");
+    }
     $user_submit = BoincUserSubmit::lookup_userid($user->id);
-    if (!$user_submit) xml_error(-1, "no submit access");
+    if (!$user_submit) {
+        xml_error(-1, "no submit access");
+    }
     if ($app && !$user_submit->submit_all) {
         $usa = BoincUserSubmitApp::lookup("user_id=$user->id and app_id=$app->id");
         if (!$usa) {
@@ -89,7 +95,9 @@ 
     $names = array();
     $xml = "<a>".$result->xml_doc_out."</a>";
     $r = simplexml_load_string($xml);
-    if (!$r) return $names;
+    if (!$r) {
+        return $names;
+    }
     foreach ($r->file_info as $fi) {
         $names[] = (string)($fi->name);
     }
@@ -103,7 +111,9 @@ 
     $paths = array();
     $xml = "<a>".$result->xml_doc_out."</a>";
     $r = simplexml_load_string($xml);
-    if (!$r) return $paths;
+    if (!$r) {
+        return $paths;
+    }
     foreach ($r->file_info as $fi) {
         $path = dir_hier_path((string)($fi->name), $upload_dir, $fanout);
         $paths[] = $path;
@@ -164,7 +174,9 @@ 
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
     $upload_dir = parse_config(get_config(), "<upload_dir>");
     foreach ($wus as $wu) {
-        if (!$wu->canonical_resultid) continue;
+        if (!$wu->canonical_resultid) {
+            continue;
+        }
         $result = BoincResult::lookup_id($wu->canonical_resultid);
         $names = get_outfile_names($result);
         foreach ($names as $name) {

html/inc/team.inc

Doc Comments +6 added lines

@@ -524,6 +524,9 @@ 
 //   an active request, i.e. after the 60 days elapse X has another
 //   30 days to assume foundership before someone elase can request it
 //
+/**
+ * @param integer $now
+ */
 function new_transfer_request_ok($team, $now) {
     if ($team->ping_user <= 0) {
         if ($team->ping_time < $now - 60 * 86400) {
@@ -544,6 +547,9 @@ 
     return $team->ping_time + 60*86400;
 }
 
+/**
+ * @param integer $now
+ */
 function transfer_ok($team, $now) {
     if ($now > transfer_ok_time($team)) return true;
     return false;

Spacing +17 added lines, -17 removed lines

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

Braces +24 added lines, -8 removed lines

@@ -44,7 +44,9 @@ 
     row2_init(tra('Country'), '');
     echo '<select class="form-control" name="country"><option value="" selected>---</option>';
     $country = $params->country;
-    if (!$country || $country == 'None') $country = "XXX";
+    if (!$country || $country == 'None') {
+        $country = "XXX";
+    }
     echo country_select_options($country);
     echo "</select></td></tr>\n";
     row2(tra('Type of team'), team_type_select($params->type, true));
@@ -315,10 +317,16 @@ 
 }
 
 function is_team_admin($user, $team) {
-    if (!$user) return false;
-    if ($user->id == $team->userid) return true;
+    if (!$user) {
+        return false;
+    }
+    if ($user->id == $team->userid) {
+        return true;
+    }
     $admin = BoincTeamAdmin::lookup($team->id, $user->id);
-    if ($admin) return true;
+    if ($admin) {
+        return true;
+    }
     return false;
 }
 
@@ -327,7 +335,9 @@ 
 //
 function is_team_admin_aux($user, $admins) {
     foreach ($admins as $a) {
-        if ($a->userid == $user->id) return true;
+        if ($a->userid == $user->id) {
+            return true;
+        }
     }
     return false;
 }
@@ -414,7 +424,9 @@ 
 }
 
 function user_quit_team($user) {
-    if (!$user->teamid) return;
+    if (!$user->teamid) {
+        return;
+    }
     $user->update("teamid=0");
     $team = BoincTeam::lookup_id($user->teamid);
     if ($team && $team->ping_user=$user->id) {
@@ -545,7 +557,9 @@ 
 }
 
 function transfer_ok($team, $now) {
-    if ($now > transfer_ok_time($team)) return true;
+    if ($now > transfer_ok_time($team)) {
+        return true;
+    }
     return false;
 }
 
@@ -555,7 +569,9 @@ 
     $userid, $name, $url, $type, $name_html, $description, $country
 ) {
     $name = BoincDb::escape_string(sanitize_tags($name));
-    if (strlen($name) == 0) return null;
+    if (strlen($name) == 0) {
+        return null;
+    }
     $name_lc = strtolower($name);
     $url = BoincDb::escape_string(sanitize_tags($url));
     if (strstr($url, "http://")) {

html/inc/text_transform.inc

Doc Comments +8 added lines

@@ -105,6 +105,9 @@ 
 
 // handle [pre] and [code] separately because we need to remove <br />s
 //
+/**
+ * @param boolean $export
+ */
 function replace_pre_code($text, $export) {
     if ($export) {
         $text = preg_replace_callback(
@@ -272,6 +275,11 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
+/**
+ * @param string $text
+ *
+ * @return string
+ */
 function remove_br($text){
     return str_replace("<br />", "", $text);
 }

Spacing +26 added lines, -26 removed lines

@@ -26,13 +26,13 @@ 
 require_once('../inc/sanitize_html.inc');
 
 class output_options {
-    var $bb2html;            // BBCode as HTML? (on)
-    var $images_as_links;    // Images as hyperlinks? (off)
-    var $link_popup;        // Links in new windows? (off)
-    var $nl2br;                // Convert newlines to <br>'s? (on)
-    var $htmlitems;            // Convert special chars to HTML entities? (on)
-    var $htmlscrub;            // Scrub "bad" HTML tags? (off)
-    var $highlight_terms;// Array of terms to be highlighted (off)    
+    var $bb2html; // BBCode as HTML? (on)
+    var $images_as_links; // Images as hyperlinks? (off)
+    var $link_popup; // Links in new windows? (off)
+    var $nl2br; // Convert newlines to <br>'s? (on)
+    var $htmlitems; // Convert special chars to HTML entities? (on)
+    var $htmlscrub; // Scrub "bad" HTML tags? (off)
+    var $highlight_terms; // Array of terms to be highlighted (off)    
 
     // Constructor - set the defaults.
 
@@ -109,7 +109,7 @@ 
     if ($export) {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -119,7 +119,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -130,7 +130,7 @@ 
     } else {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -140,7 +140,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -151,7 +151,7 @@ 
     }
 }
 
-function bb2html($text, $export=false) {
+function bb2html($text, $export = false) {
     $urlregex = "(?:\"?)(?:(http\:\/\/)?)([^\[\"<\ ]+)(?:\"?)";
     // NOTE:
     // This matches https:// too; I don't understand why.
@@ -171,7 +171,7 @@ 
 
     $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
     // List of allowable tags
-    $bbtags = array (
+    $bbtags = array(
         "@\[b\](.*?)\[/b\]@is",
         "@\[i\](.*?)\[/i\]@is",
         "@\[u\](.*?)\[/u\]@is",
@@ -200,7 +200,7 @@ 
     
     // What the above tags are turned in to
     if ($export) {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -227,7 +227,7 @@ 
             "<a href=\"https://github.com/BOINC/boinc-dev-doc/wiki/\\1\">\\1</a>",
         );
     } else {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -259,7 +259,7 @@ 
     $lasttext = "";
     $i = 0;
     // $i<1000 to prevent DoS
-    while ($text != $lasttext && $i<1000) {
+    while ($text != $lasttext && $i < 1000) {
         $lasttext = $text;
         $text = replace_pre_code($text, $export);
         $text = preg_replace($bbtags, $htmltags, $text);
@@ -272,7 +272,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -280,19 +280,19 @@ 
 //
 function externalize_links($text) {
     // TODO:  Convert this to PCRE
-    $i=0;
-    $linkpos=true;
+    $i = 0;
+    $linkpos = true;
     $out = "";
-    while (true){
+    while (true) {
         //Find a link
         //
-        $linkpos=strpos($text, "<a ", $i);
-        if ($linkpos===false) break;
+        $linkpos = strpos($text, "<a ", $i);
+        if ($linkpos === false) break;
 
         //Replace with target='_new'
         //
-        $out .= substr($text, $i, $linkpos-$i)."<a target=\"_new\" ";
-        $i = $linkpos+3;
+        $out .= substr($text, $i, $linkpos - $i)."<a target=\"_new\" ";
+        $i = $linkpos + 3;
     }
     $out .= substr($text, $i);
     return $out;
@@ -300,7 +300,7 @@ 
 
 // Converts image tags to links to the images.
 
-function image_as_link($text){
+function image_as_link($text) {
     /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
@@ -325,5 +325,5 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

Braces +9 added lines, -3 removed lines

@@ -94,8 +94,12 @@ 
 function get_output_options($user) {
     $options = new output_options();
     if ($user) {
-        if ($user->prefs->images_as_links) $options->images_as_links = 1;
-        if ($user->prefs->link_popup) $options->link_popup = 1;
+        if ($user->prefs->images_as_links) {
+            $options->images_as_links = 1;
+        }
+        if ($user->prefs->link_popup) {
+            $options->link_popup = 1;
+        }
     }
     return $options;
 }
@@ -287,7 +291,9 @@ 
         //Find a link
         //
         $linkpos=strpos($text, "<a ", $i);
-        if ($linkpos===false) break;
+        if ($linkpos===false) {
+            break;
+        }
 
         //Replace with target='_new'
         //