BOINC / boinc

html/user/show_apps.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
             $desc->long_name,
             $desc->description,
             kw_array_to_str($desc->sci_kw),
-            empty($desc->url)?'':"<a href=$desc->url>View</a>",
+            empty($desc->url) ? '' : "<a href=$desc->url>View</a>",
             'Yes'
         );
     }

html/inc/boinc_db.inc

Spacing +21 added lines, -21 removed lines

@@ -44,8 +44,8 @@ 
 // close() closes the connection.
 
 class BoincDb {
-    static $instance;       // a DbConn object, or null
-    static $dbnum;          // which replica we're connected to
+    static $instance; // a DbConn object, or null
+    static $dbnum; // which replica we're connected to
 
     // connect to DB $dbnum (0, 1, ...)
     // If the requested DB doesn't exist or connection fails, connect to DB 0.
@@ -56,7 +56,7 @@ 
         self::$instance = null;
         $config = get_config();
         if ($dbnum) {
-            $r = $dbnum==1?'':strval($dbnum);
+            $r = $dbnum == 1 ? '' : strval($dbnum);
             $host = parse_config($config, sprintf('<replica%s_db_host>', $r));
             $name = parse_config($config, sprintf('<replica%s_db_name>', $r));
             $user = parse_config($config, sprintf('<replica%s_db_user>', $r));
@@ -204,11 +204,11 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'user', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('user', 'BoincUser', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'user', 'BoincUser', $fields, $where_clause, $order_clause
@@ -258,7 +258,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'team', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('team', 'BoincTeam', $where_clause, $order_clause);
     }
@@ -283,7 +283,7 @@ 
         $db = BoincDb::get();
         return $db->max('team', $field);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'team', 'BoincTeam', $fields, $where_clause, $order_clause
@@ -321,11 +321,11 @@ 
         $db = BoincDb::get();
         return $db->delete($this, 'host');
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('host', 'BoincHost', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'host', 'BoincHost', $fields, $where_clause, $order_clause
@@ -362,7 +362,7 @@ 
         $db = BoincDb::get();
         return $db->enum('result', 'BoincResult', $where_clause);
     }
-	static function enum_fields($fields, $where_clause, $order_clause=null) {
+	static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
 		return $db->enum_fields(
             'result', 'BoincResult', $fields, $where_clause, $order_clause
@@ -411,7 +411,7 @@ 
         $db = BoincDb::get();
         return $db->enum('workunit', 'BoincWorkunit', $where_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields('workunit', 'BoincWorkunit', $fields, $where_clause, $order_clause);
     }
@@ -453,7 +453,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'app', $clause);
     }
-    static function sum($field, $clause=null) {
+    static function sum($field, $clause = null) {
         $db = BoincDb::get();
         return $db->sum('app', $field, $clause);
     }
@@ -511,11 +511,11 @@ 
         $db = BoincDb::get();
         return $db->insert('profile', $clause);
     }
-    static function enum($where_clause=null, $order_clause=null) {
+    static function enum($where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('profile', 'BoincProfile', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause=null, $order_clause=null) {
+    static function enum_fields($fields, $where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields('profile', 'BoincProfile', $fields, $where_clause, $order_clause);
     }
@@ -910,12 +910,12 @@ 
         return $db->enum('consent', 'BoincConsent', $where_clause);
     }
 
-    static function insert ($clause) {
+    static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('consent', $clause);
     }
 
-    static function update ($clause) {
+    static function update($clause) {
         $db = BoincDb::get();
         return $db->update_aux('consent', $clause);
     }
@@ -940,17 +940,17 @@ 
         return $db->lookup('consent_type', 'BoincConsentType', $clause);
     }
 
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('consent_type', 'BoincConsentType', $where_clause, $order_clause);
     }
 
-    static function insert ($clause) {
+    static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('consent_type', $clause);
     }
 
-    static function update ($clause) {
+    static function update($clause) {
         $db = BoincDb::get();
         return $db->update_aux('consent_type', $clause);
     }
@@ -976,7 +976,7 @@ 
         return $db->lookup('latest_consent', 'BoincLatestConsent', $clause);
     }
 
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('latest_consent', 'BoincLatestConsent', $where_clause, $order_clause);
     }
@@ -987,7 +987,7 @@ 
 // apply this to any user-supplied strings used in queries
 //
 function boinc_real_escape_string($x) {
-    if (version_compare(phpversion(),"4.3.0")>=0) {
+    if (version_compare(phpversion(), "4.3.0") >= 0) {
         return BoincDb::escape_string($x);
     } else {
         $x = str_replace("'", "\'", $x);

html/user/job_fpops.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
             $host = BoincHost::lookup_id($res->hostid);
             $hosts[$res->hostid] = $host;
         }
-        $fpops = $res->cpu_time * $host->p_fpops;
+        $fpops = $res->cpu_time*$host->p_fpops;
         $samples[] = $res->cpu_time;
         //$fpops /= 1e9;
         //echo "$res->cpu_time $fpops\n";
@@ -45,11 +45,11 @@ 
 }
 
 function show($samples) {
-    $x = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
+    $x = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
     foreach ($samples as $s) {
         $x[(int)log10($s)] += 1;
     }
-    for ($i=0; $i<16; $i++) {
+    for ($i = 0; $i < 16; $i++) {
         echo sprintf("%d: %d\n", $i, $x[$i]);
     }
 }

html/user/submit_example.php

Spacing +6 added lines, -6 removed lines

@@ -158,7 +158,7 @@ 
     $user_submit = BoincUserSubmit::lookup_userid($user->id);
     if (!$user_submit) return null;
     $a = array();
-    foreach($apps as $app) {
+    foreach ($apps as $app) {
         if ($user_submit->submit_all) {
             $a[] = $app;
         } else {
@@ -235,9 +235,9 @@ 
     $input_url = get_str('input_url');
     if (!$input_url) error_page("missing input URL");
     $param_lo = (double)get_str('param_lo');
-    if ($param_lo<0 || $param_lo>60) error_page("param lo must be in 0..60");
+    if ($param_lo < 0 || $param_lo > 60) error_page("param lo must be in 0..60");
     $param_hi = (double)get_str('param_hi');
-    if ($param_hi<0 || $param_hi>60 || $param_hi <= $param_lo) {
+    if ($param_hi < 0 || $param_hi > 60 || $param_hi <= $param_lo) {
         error_page("param hi must be in 0..60 and > param lo");
     }
     $param_inc = (double)get_str('param_inc');
@@ -254,7 +254,7 @@ 
     $f->source = $input_url;
     $f->mode = 'semilocal';
 
-    for ($x=$param_lo; $x<$param_hi; $x += $param_inc) {
+    for ($x = $param_lo; $x < $param_hi; $x += $param_inc) {
         $job = new StdClass;
         $job->rsc_fpops_est = $x*1e9;
         $job->command_line = "--t $x";
@@ -343,7 +343,7 @@ 
         "status",
         "Canonical instance<br><p class=\"text-muted\">click to see result page on BOINC server</p>"
     );
-    foreach($batch->jobs as $job) {
+    foreach ($batch->jobs as $job) {
         $id = (int)$job->id;
         $resultid = (int)$job->canonical_instance_id;
         if ($resultid) {
@@ -386,7 +386,7 @@ 
         "Instance ID<br><p class=\"text-muted\">click for result page on BOINC server</p>",
         "State", "Output files"
     );
-    foreach($reply->instances as $inst) {
+    foreach ($reply->instances as $inst) {
         echo "<tr>
             <td><a href=result.php?resultid=$inst->id>$inst->id</a></td>
             <td>$inst->state</td>

html/user/register.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 function reg_form() {
     $config = get_config();
     $disable_acct = parse_bool($config, "disable_account_creation");
-    page_head("Register",  null, null, null, boinc_recaptcha_get_head_extra());
+    page_head("Register", null, null, null, boinc_recaptcha_get_head_extra());
     echo "<h3>Create an account</h3>";
     form_start("create_account_action.php", "post");
     create_account_form(0, "download_software.php");

html/user/create_account_form.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     }
 }
 
-form_start("create_account_action.php","post");
+form_start("create_account_action.php", "post");
 create_account_form($teamid, $next_url);
 if (recaptcha_public_key()) {
     form_general("", boinc_recaptcha_get_html(recaptcha_public_key()));

html/user/sample_index.php

Spacing +2 added lines, -2 removed lines

@@ -58,10 +58,10 @@
     //panel(null, 'panel_contents');
 }
 
-function left(){
+function left() {
     global $user, $no_web_account_creation, $project_id;
     panel(
-        $user?tra("Welcome, %1", $user->name):tra("What is %1?", PROJECT),
+        $user ?tra("Welcome, %1", $user->name) : tra("What is %1?", PROJECT),
         function() use($user) {
             global $no_web_account_creation, $project_id;
             if ($user) {

html/user/create_profile.php

Spacing +20 added lines, -20 removed lines

@@ -32,7 +32,7 @@ 
 // If $selection is provided, and if it matches one of the entries in the file,
 // it will be selected by default.
 //
-function show_combo_box($name, $filename, $selection=null) {
+function show_combo_box($name, $filename, $selection = null) {
     echo "<select name=\"$name\" class=\"form-control\">\n";
 
     $file = fopen($filename, "r");
@@ -63,14 +63,14 @@ 
 <tr><td colspan=2>
 <table border=0 cellpadding=5
 <tr>
-<td valign=top><a href=\"" . IMAGE_URL . $profile->userid . '.jpg' . "\"><img src=\"" . IMAGE_URL . $profile->userid . '_sm.jpg' . "\"></a>
+<td valign=top><a href=\"" . IMAGE_URL.$profile->userid.'.jpg'."\"><img src=\"".IMAGE_URL.$profile->userid.'_sm.jpg'."\"></a>
 </td>
-<td valign=top>" .tra("%1 Your profile picture is shown to the left.",  $warning) ."
+<td valign=top>" .tra("%1 Your profile picture is shown to the left.", $warning)."
 <p>".
-tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB") ."<br />
+tra("To replace it, click the \"Browse\" button and select a JPEG or PNG file (%1 or less).", "50KB")."<br />
 <input name=picture type=file><br>
 <p>".
-tra("To remove it from your profile, check this box:") . "
+tra("To remove it from your profile, check this box:")."
 <input type=checkbox name=delete_pic>
 <p>
 </td></tr>";
@@ -78,7 +78,7 @@ 
         end_table();
         echo "</td></tr>";
     } else {
-        rowify(tra("If you would like include a picture with your profile, click the \"Browse\" button and select a JPEG or PNG file. Please select images of %1 or less.", "50KB") . "
+        rowify(tra("If you would like include a picture with your profile, click the \"Browse\" button and select a JPEG or PNG file. Please select images of %1 or less.", "50KB")."
 <p>
 <input name=picture type=file>
         ");
@@ -93,7 +93,7 @@ 
     row1(tra("Language"));
     echo "<tr><td>
         <p>" .
-        tra("Select the language in which your profile is written:") . "
+        tra("Select the language in which your profile is written:")."
         <p>
     ";
     if (isset($profile->language)) {
@@ -109,7 +109,7 @@ 
     if (recaptcha_public_key()) {
         table_row(boinc_recaptcha_get_html(recaptcha_public_key()));
     }
-    table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile") ."\" name=\"submit\">");
+    table_row("<p><input class=\"btn btn-success\" type=\"submit\" value=\"".tra("Create/edit profile")."\" name=\"submit\">");
 }
 
 // Returns an array containing:
@@ -123,7 +123,7 @@ 
 
     // Determine if the filetype uploaded is supported.
     // TODO: Change these to constants.
-    switch($size[2]) {
+    switch ($size[2]) {
     case '2':    // JPEG
         $image = imageCreateFromJPEG($fileName);
         break;
@@ -160,7 +160,7 @@ 
 
 function show_description() {
     echo "
-        <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT) . "
+        <p>" .tra("Your %1 profile %2 lets you share your opinions and background with the %3 community.", "<b>", "</b>", PROJECT)."
         <p>
     ";
 }
@@ -178,14 +178,14 @@ 
     row1(show_profile_heading1());
     rowify(show_profile_question1().bbcode_info());
     show_textarea("response1", $response1);
-    row1( show_profile_heading2());
-    rowify( show_profile_question2().bbcode_info());
+    row1(show_profile_heading2());
+    rowify(show_profile_question2().bbcode_info());
     show_textarea("response2", $response2);
     show_language_selection($profile);
 }
 
 function show_textarea($name, $text) {
-    rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">" . $text . "</textarea>");
+    rowify("<textarea name=\"$name\" class=\"form-control\" rows=\"10\">".$text."</textarea>");
 }
 
 // $profile is null if user doesn't already have a profile.
@@ -229,8 +229,8 @@ 
         $delete_pic = "off";
     }
 
-    if (strlen($response1)==0 &&
-        strlen($response2)==0 &&
+    if (strlen($response1) == 0 &&
+        strlen($response2) == 0 &&
         $delete_pic != "on" &&
         !is_uploaded_file($_FILES['picture']['tmp_name'])
     ) {
@@ -244,7 +244,7 @@ 
         $profile->verification = 0;
     }
 
-    $profile ? $has_picture = $profile->has_picture: $has_picture = false;
+    $profile ? $has_picture = $profile->has_picture : $has_picture = false;
 
     if (is_uploaded_file($_FILES['picture']['tmp_name'])) {
         $has_picture = true;
@@ -259,13 +259,13 @@ 
 
         // Write the original image file to disk.
         // TODO: define a constant for image quality.
-        ImageJPEG($images[0], IMAGE_PATH . $user->id . '.jpg');
-        ImageJPEG($images[1], IMAGE_PATH . $user->id . '_sm.jpg');
+        ImageJPEG($images[0], IMAGE_PATH.$user->id.'.jpg');
+        ImageJPEG($images[1], IMAGE_PATH.$user->id.'_sm.jpg');
     }
     $response1 = sanitize_html($response1);
     $response2 = sanitize_html($response2);
 
-    $has_picture = $has_picture?1:0;
+    $has_picture = $has_picture ? 1 : 0;
     if ($profile) {
         $query = " response1 = '".BoincDb::escape_string($response1)."',"
             ." response2 = '".BoincDb::escape_string($response2)."',"
@@ -307,7 +307,7 @@ 
     page_tail();
 }
 
-function show_profile_form($profile, $warning=null) {
+function show_profile_form($profile, $warning = null) {
     if ($profile) {
         page_head(tra("Edit your profile"), null, null, null, boinc_recaptcha_get_head_extra());
     } else {

html/inc/bootstrap.inc

Spacing +23 added lines, -23 removed lines

@@ -141,12 +141,12 @@ 
         // prefix for links; needed for pages not in top dir
     $user,
         // logged-in user, if any
-    $fixed=false,
+    $fixed = false,
         // if true, navbar is fixed at top of page.
         // NOTE: if you do this, you must set a global var $fixed_navbar
         // to true at compile time
         // (it needs to be set when page_head() is called).
-    $inverse=false
+    $inverse = false
         // white on black?
 ) {
     $master_url = master_url();
@@ -246,7 +246,7 @@ 
 // output a panel.
 // $content_func is a function that generates the panel contents
 //
-function panel($title, $content_func, $class="panel-primary", $body_class="") {
+function panel($title, $content_func, $class = "panel-primary", $body_class = "") {
     echo sprintf('<div class="panel %s">
         ', $class
     );
@@ -273,7 +273,7 @@ 
 // $left_width is the width of left column in 1/12 units.
 // $arg is passed to the functions.
 //
-function grid($top_func, $left_func, $right_func, $left_width=6, $arg=null) {
+function grid($top_func, $left_func, $right_func, $left_width = 6, $arg = null) {
     echo '
         <div class="container-fluid">
     ';
@@ -288,7 +288,7 @@ 
             </div>
         ';
     }
-    $right_width = 12-$left_width;
+    $right_width = 12 - $left_width;
     echo '
         <div class="row">
         <div class="col-sm-'.$left_width.'">
@@ -312,7 +312,7 @@ 
 //      use extra = "name=x"
 //      call forum_focus(x, foo) after defining the field
 //
-function form_start($action, $method='get', $extra='') {
+function form_start($action, $method = 'get', $extra = '') {
     echo sprintf(
         '<div class="container-fluid">
         <form class="form-horizontal" method="%s" action="%s" %s>'
@@ -344,7 +344,7 @@ 
 // just the input field
 //
 function form_input_text_field(
-    $name, $value='', $type='text', $attrs='', $extra=''
+    $name, $value = '', $type = 'text', $attrs = '', $extra = ''
 ) {
     return sprintf(
         '<input %s type="%s" class="form-control" name="%s" value="%s">%s',
@@ -355,7 +355,7 @@ 
 // the whole row
 //
 function form_input_text(
-    $label, $name, $value='', $type='text', $attrs='', $extra=''
+    $label, $name, $value = '', $type = 'text', $attrs = '', $extra = ''
 ) {
     echo sprintf('
         <div class="form-group">
@@ -383,7 +383,7 @@ 
     );
 }
 
-function form_input_textarea($label, $name, $value='', $nrows=4) {
+function form_input_textarea($label, $name, $value = '', $nrows = 4) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -400,7 +400,7 @@ 
 // $items is either a string of <option> elements,
 // or an array of [value, name] pairs
 //
-function form_select($label, $name, $items, $selected=null) {
+function form_select($label, $name, $items, $selected = null) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -413,7 +413,7 @@ 
         foreach ($items as $i) {
             echo sprintf(
                 '<option %s value=%s>%s</option>',
-                ($i[0]==$selected)?'selected':'',
+                ($i[0] == $selected) ? 'selected' : '',
                 $i[0], $i[1]
             );
         }
@@ -426,7 +426,7 @@ 
 // same, for multiple select.
 // $selected, if non-null, is a list of selected values
 //
-function form_select_multiple($label, $name, $items, $selected=null, $size=0) {
+function form_select_multiple($label, $name, $items, $selected = null, $size = 0) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -438,7 +438,7 @@ 
     foreach ($items as $i) {
         echo sprintf(
             '<option %s value=%s>%s</option>',
-            ($selected && in_array($i[0], $selected))?'selected':'',
+            ($selected && in_array($i[0], $selected)) ? 'selected' : '',
             $i[0], $i[1]
         );
     }
@@ -447,12 +447,12 @@ 
 
 // return a list of strings for checkbox items
 //
-function checkbox_item_strings($items, $attrs='') {
+function checkbox_item_strings($items, $attrs = '') {
     $x = [];
     foreach ($items as $i) {
         $x[] = sprintf('<input %s type="checkbox" name="%s" %s> %s
             ',
-            $attrs, $i[0], $i[2]?"checked":"", $i[1]
+            $attrs, $i[0], $i[2] ? "checked" : "", $i[1]
         );
     }
     return $x;
@@ -460,7 +460,7 @@ 
 
 // $items is list of (name, label, checked)
 //
-function form_checkboxes($label, $items, $attrs='') {
+function form_checkboxes($label, $items, $attrs = '') {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s">%s</label>
@@ -479,7 +479,7 @@ 
 //
 function form_radio_buttons(
     $label, $name, $items, $selected,
-    $assign_ids=false       // assign IDs to buttons based on names
+    $assign_ids = false       // assign IDs to buttons based on names
 ) {
     echo sprintf('
         <div class="form-group">
@@ -489,7 +489,7 @@ 
         FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS
     );
     foreach ($items as $i) {
-        $checked = ($selected == $i[0])?"checked":"";
+        $checked = ($selected == $i[0]) ? "checked" : "";
         if ($assign_ids) {
             $id = sprintf('id="%s_%s"', $name, $i[0]);
         } else {
@@ -527,7 +527,7 @@ 
 ';
 }
 
-function form_submit($text, $attrs='') {
+function form_submit($text, $attrs = '') {
     form_general(
         "",
         sprintf(
@@ -537,7 +537,7 @@ 
     );
 }
 
-function form_checkbox($label, $name, $checked=false) {
+function form_checkbox($label, $name, $checked = false) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s">%s</label>
@@ -549,7 +549,7 @@ 
               <input type="checkbox" name="%s" %s>
            </div>
         </div>
-        ', $name, $checked?"checked":""
+        ', $name, $checked ? "checked" : ""
     );
 }
 
@@ -577,7 +577,7 @@ 
 // $selected is the list of selected values.
 // $extra is e.g. id=foo
 //
-function form_select2_multi($label, $name, $items, $selected=null, $extra='') {
+function form_select2_multi($label, $name, $items, $selected = null, $extra = '') {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -589,7 +589,7 @@ 
     foreach ($items as $i) {
         echo sprintf(
             '<option %s value=%s>%s</option>',
-            ($selected && in_array($i[0], $selected))?'selected':'',
+            ($selected && in_array($i[0], $selected)) ? 'selected' : '',
             $i[0], $i[1]
         );
     }