BOINC / boinc

html/inc/boinc_db.inc

Indentation +3 added lines, -3 removed lines

@@ -362,12 +362,12 @@
         $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(
+        return $db->enum_fields(
             'result', 'BoincResult', $fields, $where_clause, $order_clause
         );
-	}
+    }
     function update($clause) {
         $db = BoincDb::get();
         return $db->update($this, 'result', $clause);

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/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/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) {

Braces +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     //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),

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/user/submit.php

Spacing +5 added lines, -5 removed lines

@@ -551,7 +551,7 @@ 
     if ($owner) {
         row2('submitter', $owner->name);
     }
-    row2("application", $app?$app->name:'---');
+    row2("application", $app ? $app->name : '---');
     row2("state", batch_state_string($batch->state));
     //row2("# jobs", $batch->njobs);
     //row2("# error jobs", $batch->nerror_jobs);
@@ -610,9 +610,9 @@ 
         "status"
     ];
     row_heading_array($x);
-    foreach($wus as $wu) {
+    foreach ($wus as $wu) {
         $y = '';
-        switch($wu->status) {
+        switch ($wu->status) {
         case WU_SUCCESS:
             $resultid = $wu->canonical_resultid;
             $y = sprintf('<font color="%s">completed</font>', COLOR_SUCCESS);
@@ -688,7 +688,7 @@ 
     $results = BoincResult::enum("workunitid=$wuid");
     $upload_dir = parse_config(get_config(), "<upload_dir>");
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
-    foreach($results as $result) {
+    foreach ($results as $result) {
         $x = [
             "<a href=result.php?resultid=$result->id>$result->id</a>",
             state_string($result)
@@ -697,7 +697,7 @@ 
         if ($result->server_state == RESULT_SERVER_STATE_OVER) {
             $phys_names = get_outfile_phys_names($result);
             $log_names = get_outfile_log_names($result);
-            for ($i=0; $i<count($phys_names); $i++) {
+            for ($i = 0; $i < count($phys_names); $i++) {
                 if ($is_assim_move) {
                     // file is in
                     // project/results/<batchid>/<wu_name>__file_<log_name>

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -541,7 +541,7 @@ 
 
     $is_assim_move = is_assim_move($app);
 
-    page_head("Batch $batch_id");
+    page_head("batch $batch_id");
     text_start(800);
     start_table();
     row2("name", $batch->name);
@@ -817,7 +817,7 @@ 
 
     if (get_int('confirmed', true)) {
         retire_batch($batch);
-        page_head("Batch $batch_id retired");
+        page_head("batch $batch_id retired");
         return_link();
         page_tail();
     } else {

html/user/kw_prefs.php

Spacing +3 added lines, -3 removed lines

@@ -93,9 +93,9 @@
     global $job_keywords;
     $kw = $job_keywords[$id];
     $u = $uprefs[$id];
-    $yes_checked = ($u == KW_YES)?"checked":"";
-    $no_checked = ($u == KW_NO)?"checked":"";
-    $maybe_checked = ($u == KW_MAYBE)?"checked":"";
+    $yes_checked = ($u == KW_YES) ? "checked" : "";
+    $no_checked = ($u == KW_NO) ? "checked" : "";
+    $maybe_checked = ($u == KW_MAYBE) ? "checked" : "";
 
     echo sprintf('<tr id="%s" hidden>%s', "row$id", "\n");
     echo sprintf('   <td width=50%% id="%s"></td>%s', "text$id", "\n");

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -298,7 +298,7 @@
 
     render();
 
-EOT;
+eot;
     echo "</script>\n";
 }
 

html/user/manage_project.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
             $app = BoincApp::lookup_id($ua->app_id);
             $names[] = $app->name;
         }
-        $sub = $names?implode(', ', $names):'---';
+        $sub = $names ?implode(', ', $names) : '---';
     }
     if ($u->manage_all) {
         $admin = 'All applications';
@@ -49,7 +49,7 @@ 
             $app = BoincApp::lookup_id($ua->app_id);
             $names[] = $app->name;
         }
-        $admin = $names?implode(', ', $names):'---';
+        $admin = $names ?implode(', ', $names) : '---';
     }
     [$yes, $no] = read_kw_prefs($user);
     global $job_keywords;
@@ -69,7 +69,7 @@ 
         implode('<br>', $kws),
         $u->quota,
         $u->max_jobs_in_progress,
-        ($u->logical_start_time > time())?local_time_str($u->logical_start_time):'---'
+        ($u->logical_start_time > time()) ?local_time_str($u->logical_start_time) : '---'
     );
 }
 
@@ -199,18 +199,18 @@ 
     $manage_apps = array_map('intval', $manage_apps);
     foreach ($apps as $app) {
         $s = in_array($app->id, $submit_apps);
-        $m = in_array($app->id, $manage_apps)?1:0;
+        $m = in_array($app->id, $manage_apps) ? 1 : 0;
         if ($s || $m) {
             BoincUserSubmitApp::insert(
                 "(user_id, app_id, manage) values ($user_id, $app->id, $m)"
             );
         }
     }
-    $quota = (double) get_str('quota');
+    $quota = (double)get_str('quota');
     if ($quota != $us->quota) {
         $us->update("quota=$quota");
     }
-    $mj = (int) get_str('max_jobs_in_progress');
+    $mj = (int)get_str('max_jobs_in_progress');
     if ($mj != $us->max_jobs_in_progress) {
         $us->update("max_jobs_in_progress=$mj");
     }

html/inc/kw_prefs.inc

Spacing +3 added lines, -3 removed lines

@@ -31,14 +31,14 @@
     if (file_exists($path)) {
         $x = file($path);
         $yes = explode(' ', trim($x[0]));
-        if ($yes[0]=='') $yes=[];
+        if ($yes[0] == '') $yes = [];
         $yes = array_map('intval', $yes);
         $no = explode(' ', trim($x[1]));
-        if ($no[0]=='') $no=[];
+        if ($no[0] == '') $no = [];
         $no = array_map('intval', $no);
         return [$yes, $no];
     } else {
-        return [[],[]];
+        return [[], []];
     }
 }