Completed
Push — fixes_for_macos26 ( 179de4 )
by
unknown
52s queued 21s
created
html/user/forum_forum.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 // show a forum.
27 27
 // $user is null if not logged in
28 28
 //
29
-function forum_page($forum, $user, $msg=null) {
29
+function forum_page($forum, $user, $msg = null) {
30 30
     global $forum_sort_styles;
31 31
 
32 32
     if (DISABLE_FORUMS) {
@@ -53,14 +53,14 @@  discard block
 block discarded – undo
53 53
 
54 54
     if (!$sort_style) {
55 55
         // get the sort style either from the logged in user or a cookie
56
-        if ($user){
56
+        if ($user) {
57 57
             $sort_style = $user->prefs->forum_sorting;
58 58
         } else {
59 59
             list($sort_style, $thread_style) = parse_forum_cookie();
60 60
         }
61 61
     } else {
62 62
         // set the sort style
63
-        if ($user){
63
+        if ($user) {
64 64
             $user->prefs->forum_sorting = $sort_style;
65 65
             $user->prefs->update("forum_sorting=$sort_style");
66 66
         } else {
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
         echo "<td><a href=\"forum_thread.php?id=$thread->id\">$title</a><br></td>";
249 249
 
250 250
         echo '
251
-            <td>'.($thread->replies+1).'</td>
251
+            <td>'.($thread->replies + 1).'</td>
252 252
             <td>'.user_links($owner, BADGE_HEIGHT_SMALL).'</td>
253 253
             <td>'.$thread->views.'</td>
254 254
             <td>'.time_diff_str($thread->timestamp, time()).'</td>
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
         flush();
258 258
     }
259 259
     end_table();
260
-    echo "<br>$page_nav";    // show page links
260
+    echo "<br>$page_nav"; // show page links
261 261
 }
262 262
 
263 263
 $id = get_int("id");
Please login to merge, or discard this patch.
html/ops/host_stats.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     if ($n === false) return '';
34 34
     $m = strpos($p, ']', $n);
35 35
     if ($m === false) return '';
36
-    $x = substr($p, $n+5, $m-$n-5);
36
+    $x = substr($p, $n + 5, $m - $n - 5);
37 37
 
38 38
     $n = strpos($x, ' ');
39 39
     if ($n !== false) return substr($x, 0, $n);
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     if ($n === false) return '';
48 48
     $m = strpos($p, ']', $n);
49 49
     if ($m === false) return '';
50
-    $x = substr($p, $n+5, $m-$n-5);
50
+    $x = substr($p, $n + 5, $m - $n - 5);
51 51
     $n = strpos($x, '_');
52 52
     if ($n !== false) return substr($x, 0, $n);
53 53
     $n = strpos($x, 'r');
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
 function main() {
59 59
     global $max_days;
60
-    $t = time()-$max_days*86400;
60
+    $t = time() - $max_days*86400;
61 61
     $hosts = BoincHost::enum("rpc_time>$t");
62 62
     $descs = [];
63 63
     foreach ($hosts as $host) {
Please login to merge, or discard this patch.
html/inc/db_conn.inc 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -22,12 +22,12 @@  discard block
 block discarded – undo
22 22
 // Intended to be subclassed (e.g., BoincDb, BossaDb)
23 23
 //
24 24
 class DbConn {
25
-    var $db_conn;       // a mysqli object
26
-    var $db_name;       // the DB name
25
+    var $db_conn; // a mysqli object
26
+    var $db_name; // the DB name
27 27
 
28 28
     function init_conn($user, $passwd, $host, $name) {
29 29
         $x = explode(":", $host);
30
-        if (sizeof($x)>1) {
30
+        if (sizeof($x) > 1) {
31 31
             $host = $x[0];
32 32
             $port = $x[1];
33 33
         } else {
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
         }
36 36
         try {
37 37
             $this->db_conn = @new mysqli($host, $user, $passwd, $name, $port);
38
-        } catch(Exception $e) {
38
+        } catch (Exception $e) {
39 39
             return false;
40 40
         }
41 41
         if (mysqli_connect_error()) {
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
         return $this->enum_general($classname, $query);
137 137
     }
138 138
 
139
-    function enum($table, $classname, $where_clause=null, $order_clause=null) {
139
+    function enum($table, $classname, $where_clause = null, $order_clause = null) {
140 140
         return self::enum_fields(
141 141
             $table, $classname, '*', $where_clause, $order_clause
142 142
         );
@@ -181,15 +181,15 @@  discard block
 block discarded – undo
181 181
         if ($x) return (double)$x->$field;
182 182
         return false;
183 183
     }
184
-    function count($table, $clause="TRUE") {
184
+    function count($table, $clause = "TRUE") {
185 185
         $query = "select count(*) as total from DBNAME.$table where $clause";
186 186
         return $this->get_int($query, 'total');
187 187
     }
188
-    function sum($table, $field, $clause="") {
188
+    function sum($table, $field, $clause = "") {
189 189
         $query = "select sum($field) as total from DBNAME.$table $clause";
190 190
         return $this->get_double($query, 'total');
191 191
     }
192
-    function max($table, $field, $clause="") {
192
+    function max($table, $field, $clause = "") {
193 193
         $query = "select max($field) as total from DBNAME.$table $clause";
194 194
         return $this->get_double($query, 'total');
195 195
     }
Please login to merge, or discard this patch.
html/user/get_output2.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
     if ($user->authenticator != $auth) die('bad auth');
52 52
 }
53 53
 
54
-function do_result_aux($result, $batch, $file_num=null) {
54
+function do_result_aux($result, $batch, $file_num = null) {
55 55
     $phys_names = get_outfile_phys_names($result);
56 56
     $log_names = get_outfile_log_names($result);
57 57
     if ($file_num !== null) {
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
         $dir_path = "submit/$batch->id/$result->name";
72 72
         system("rm -r $dir_path");
73 73
         mkdir($dir_path);
74
-        for ($i=0; $i<count($phys_names); $i++) {
74
+        for ($i = 0; $i < count($phys_names); $i++) {
75 75
             $cmd = sprintf('ln -s %s %s/%s',
76 76
                 upload_path($phys_names[$i]),
77 77
                 $dir_path,
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     }
89 89
 }
90 90
 
91
-function do_result($result_id, $auth, $file_num=null) {
91
+function do_result($result_id, $auth, $file_num = null) {
92 92
     $result = BoincResult::lookup_id($result_id);
93 93
     if (!$result) die("no result $result_id");
94 94
     $workunit = BoincWorkunit::lookup_id($result->workunitid);
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
             system($cmd);
136 136
         } else {
137 137
             mkdir(sprintf('%s/%s', $dir_path, $result->name));
138
-            for ($i=0; $i<count($phys_names); $i++) {
138
+            for ($i = 0; $i < count($phys_names); $i++) {
139 139
                 $cmd = sprintf('ln -s %s %s/%s/%s',
140 140
                     upload_path($phys_names[$i]),
141 141
                     $dir_path,
Please login to merge, or discard this patch.
html/inc/sandbox.inc 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 // return list of files matching given pattern,
92 92
 // in the format used for form_select() and form_select_multiple()
93 93
 //
94
-function sandbox_select_items($user, $pattern=null) {
94
+function sandbox_select_items($user, $pattern = null) {
95 95
     $sbfiles = sandbox_file_names($user);
96 96
     $sbitems = [];
97 97
     foreach ($sbfiles as $f) {
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
     }
113 113
     $files = sandbox_file_names($user);
114 114
     foreach ($files as $f) {
115
-        if ($regexp && !preg_match("/$regexp/",$f)) continue;
115
+        if ($regexp && !preg_match("/$regexp/", $f)) continue;
116 116
         $x .= "<option value=\"$f\">$f</option>\n";
117 117
     }
118 118
     $x .= "</select>\n";
@@ -160,8 +160,8 @@  discard block
 block discarded – undo
160 160
             '%s <a href="%s&sort_field=%s&sort_rev=%d">%s</a>',
161 161
             $title,
162 162
             $url, $sort_field,
163
-            $sort_rev?0:1,
164
-            $sort_rev?'&uarr;':'&darr;'
163
+            $sort_rev ? 0 : 1,
164
+            $sort_rev ? '&uarr;' : '&darr;'
165 165
         );
166 166
     } else {
167 167
         return sprintf(
Please login to merge, or discard this patch.
html/inc/prefs_project.inc 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 }
71 71
 
72 72
 if ($app_types->cpu) {
73
-    $project_pref_descs[] = new PREF_BOOL (
73
+    $project_pref_descs[] = new PREF_BOOL(
74 74
         tra("Allow CPU-only tasks"),
75 75
         "Request CPU-only tasks from this project.",
76 76
         "no_cpu",
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
     );
80 80
 }
81 81
 if ($app_types->ati) {
82
-    $project_pref_descs[] = new PREF_BOOL (
82
+    $project_pref_descs[] = new PREF_BOOL(
83 83
         tra("Use AMD GPU"),
84 84
         "Request AMD GPU tasks from this project.",
85 85
         "no_ati",
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     );
89 89
 }
90 90
 if ($app_types->cuda) {
91
-    $project_pref_descs[] = new PREF_BOOL (
91
+    $project_pref_descs[] = new PREF_BOOL(
92 92
         tra("Use NVIDIA GPU"),
93 93
         "Request NVIDIA GPU tasks from this project.",
94 94
         "no_cuda",
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
     );
98 98
 }
99 99
 if ($app_types->intel_gpu) {
100
-    $project_pref_descs[] = new PREF_BOOL (
100
+    $project_pref_descs[] = new PREF_BOOL(
101 101
         tra("Use Intel GPU"),
102 102
         "Request Intel GPU tasks from this project.",
103 103
         "no_intel_gpu",
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
     );
107 107
 }
108 108
 if ($app_types->apple_gpu) {
109
-    $project_pref_descs[] = new PREF_BOOL (
109
+    $project_pref_descs[] = new PREF_BOOL(
110 110
         tra("Use Apple GPU"),
111 111
         "Request Apple GPU tasks from this project.",
112 112
         "no_apple_gpu",
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
     $x = "";
132 132
 }
133 133
 
134
-$privacy_pref_descs = array (
134
+$privacy_pref_descs = array(
135 135
     new PREF_BOOL(
136 136
         tra("Is it OK for %1 and your team (if any) to email you?", PROJECT).$x,
137 137
         "",
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
     global $in_project_specific;
180 180
     global $venue_name;
181 181
 
182
-    switch($name) {
182
+    switch ($name) {
183 183
     case "venue":
184 184
         $venue_name = $attrs["name"];
185 185
         $top_parse_result = $parse_result;
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
         break;
192 192
     default:
193 193
         if ($in_project_specific) {
194
-            $text= $text."<$name>";
194
+            $text = $text."<$name>";
195 195
         } else {
196 196
             $text = "";
197 197
         }
@@ -206,12 +206,12 @@  discard block
 block discarded – undo
206 206
     global $venue_name;
207 207
     global $project_pref_descs;
208 208
 
209
-    foreach($project_pref_descs as $p) {
209
+    foreach ($project_pref_descs as $p) {
210 210
         if ($p->xml_parse($parse_result, $name, $text)) {
211 211
             return;
212 212
         }
213 213
     }
214
-    switch($name) {
214
+    switch ($name) {
215 215
     case "venue":
216 216
         $top_parse_result->$venue_name = $parse_result;
217 217
         $parse_result = $top_parse_result;
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
     return $parse_result;
256 256
 }
257 257
 
258
-function prefs_show_project($prefs, $columns=false) {
258
+function prefs_show_project($prefs, $columns = false) {
259 259
     global $project_pref_descs;
260 260
     if ($columns) {
261 261
         foreach ($project_pref_descs as $p) {
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
     }
295 295
 }
296 296
 
297
-function prefs_show_project_specific($prefs, $columns=false) {
297
+function prefs_show_project_specific($prefs, $columns = false) {
298 298
     if ($columns) {
299 299
         $project_specific_prefs = project_specific_prefs_parse($prefs->project_specific);
300 300
         $project_specific_prefs->home = isset($prefs->home) ? project_specific_prefs_parse($prefs->home->project_specific) : "";
@@ -306,10 +306,10 @@  discard block
 block discarded – undo
306 306
     project_specific_prefs_show($project_specific_prefs, $columns);
307 307
 }
308 308
 
309
-function print_prefs_display_project($user, $columns=false) {
309
+function print_prefs_display_project($user, $columns = false) {
310 310
     $project_prefs = prefs_parse_project($user->project_prefs);
311 311
 
312
-    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=". (int)!$columns .">".tra("(Switch View)")."</a></font>";
312
+    $switch_link = " <font size=\"-1\"><a href=prefs.php?subset=project&cols=".(int)!$columns.">".tra("(Switch View)")."</a></font>";
313 313
     if ($columns) {
314 314
         start_table();
315 315
         row_heading(tra("Combined preferences").$switch_link);
@@ -360,14 +360,14 @@  discard block
 block discarded – undo
360 360
     }
361 361
 }
362 362
 
363
-function prefs_form_project($prefs, $error=false) {
363
+function prefs_form_project($prefs, $error = false) {
364 364
     global $project_pref_descs;
365 365
     foreach ($project_pref_descs as $p) {
366 366
         $p->show_form_row($prefs, $error);
367 367
     }
368 368
 }
369 369
 
370
-function prefs_form_project_specific($prefs_xml, $error=false) {
370
+function prefs_form_project_specific($prefs_xml, $error = false) {
371 371
     $prefs = project_specific_prefs_parse($prefs_xml);
372 372
     project_specific_prefs_edit($prefs, $error);
373 373
 }
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 
416 416
 // given a prefs structure, return the corresponding XML string
417 417
 //
418
-function project_prefs_make_xml($prefs, $primary=true) {
418
+function project_prefs_make_xml($prefs, $primary = true) {
419 419
     global $project_pref_descs;
420 420
     $xml = "";
421 421
     if ($primary) {
@@ -450,8 +450,8 @@  discard block
 block discarded – undo
450 450
 //
451 451
 function project_prefs_update(&$user, $prefs) {
452 452
     $prefs_xml = BoincDb::escape_string(project_prefs_make_xml($prefs));
453
-    $send_email = $user->send_email?1:0;
454
-    $show_hosts = $user->show_hosts?1:0;
453
+    $send_email = $user->send_email ? 1 : 0;
454
+    $show_hosts = $user->show_hosts ? 1 : 0;
455 455
     $retval = $user->update("project_prefs='$prefs_xml', send_email=$send_email, show_hosts=$show_hosts");
456 456
     if (!$retval) {
457 457
         return 1;
Please login to merge, or discard this patch.
html/ops/cancel_wu_action.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 $wuid2 = get_int('wuid2');
31 31
 $unsent_only = get_str('unsent_only', true);
32 32
 
33
-if ($wuid1<1 || $wuid2<$wuid1) {
33
+if ($wuid1 < 1 || $wuid2 < $wuid1) {
34 34
     admin_error_page(
35 35
         "<h2>Workunit IDs fail to satisfy the conditions:<p> 0 < ID1 <= ID2"
36 36
     );
Please login to merge, or discard this patch.
html/ops/profile_screen_action.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 db_init();
25 25
 
26 26
 admin_page_head("screen profile action");
27
-for ($i=0; $i<$n; $i++) {
27
+for ($i = 0; $i < $n; $i++) {
28 28
     $y = "user".$i;
29 29
     $val = $_GET[$y];
30 30
     $x = "userid".$i;
Please login to merge, or discard this patch.
html/ops/manage_user.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 
40 40
 // Delete a user if they have no credit, results, or posts
41 41
 //
42
-function possibly_delete_user($user){
43
-    if ($user->total_credit > 0.0){
42
+function possibly_delete_user($user) {
43
+    if ($user->total_credit > 0.0) {
44 44
         admin_error_page("Cannot delete user: User has credit.");
45 45
     }
46 46
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
         admin_error_page("Cannot delete user: User has forum posts.");
57 57
     }
58 58
 
59
-    if ($user->teamid){
59
+    if ($user->teamid) {
60 60
         user_quit_team($user);
61 61
     }
62 62
     delete_user($user);
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 function handle_special_user($user) {
68 68
     global $special_user_bitfield;
69 69
     $Nbf = sizeof($special_user_bitfield);
70
-    $bits="";
71
-    for ($i=0; $i<$Nbf; $i++) {
70
+    $bits = "";
71
+    for ($i = 0; $i < $Nbf; $i++) {
72 72
         $key = "special_user_$i";
73 73
         if (array_key_exists($key, $_POST) && $_POST[$key]) {
74 74
             $bits .= "1";
@@ -94,35 +94,35 @@  discard block
 block discarded – undo
94 94
         );
95 95
     } else {
96 96
         if (is_numeric($dt)) {
97
-            $t = $dt>0 ? time()+$dt : 0;
97
+            $t = $dt > 0 ? time() + $dt : 0;
98 98
             $q = "UPDATE forum_preferences SET banished_until=$t WHERE userid=$user->id";
99 99
             _mysql_query($q);
100 100
 
101 101
             // put a timestamp in wiki to trigger re-validation of credentials
102 102
 
103
-            if (function_exists('touch_wiki_user')){
103
+            if (function_exists('touch_wiki_user')) {
104 104
                 touch_wiki_user($user);
105 105
             }
106 106
 
107 107
             // Send suspension e-mail to user and administrators
108 108
 
109
-            if ($dt>0) {
110
-                $subject = PROJECT." posting privileges suspended for ". $user->name;
109
+            if ($dt > 0) {
110
+                $subject = PROJECT." posting privileges suspended for ".$user->name;
111 111
                 $body = "
112
-Forum posting privileges for the " .PROJECT. " user \"".$user->name."\"
113
-have been suspended for " .time_diff($dt). " by ".$g_logged_in_user->name.".
112
+Forum posting privileges for the " .PROJECT." user \"".$user->name."\"
113
+have been suspended for " .time_diff($dt)." by ".$g_logged_in_user->name.".
114 114
 The reason given was:
115 115
 
116 116
 $reason
117 117
 
118
-The suspension will end at " .time_str($t)."\n";
118
+The suspension will end at ".time_str($t)."\n";
119 119
             } else {
120
-                $subject = PROJECT." user ". $user->name. " unsuspended";
120
+                $subject = PROJECT." user ".$user->name." unsuspended";
121 121
                 $body = "
122
-Forum posting privileges for the " .PROJECT. " user \"".$user->name."\"
122
+Forum posting privileges for the " .PROJECT." user \"".$user->name."\"
123 123
 have been restored by ".$g_logged_in_user->name."\n";
124 124
                 if ($reason) {
125
-                    $body.="The reason given was:\n\n   $reason\n";
125
+                    $body .= "The reason given was:\n\n   $reason\n";
126 126
                 }
127 127
             }
128 128
 
@@ -186,13 +186,13 @@  discard block
 block discarded – undo
186 186
     row1("Special User Status");
187 187
 
188 188
     echo "<tr>\n";
189
-    for ($i=0; $i<$Nbf; $i++) {
189
+    for ($i = 0; $i < $Nbf; $i++) {
190 190
         $bit = substr($user->prefs->special_user, $i, 1);
191 191
         echo "<tr><td><input type='checkbox'' name='special_user_".$i."' value='1'";
192 192
         if ($bit == 1) {
193 193
             echo " checked='checked'";
194 194
         }
195
-        echo ">". $special_user_bitfield[$i] ."</td></tr>\n";
195
+        echo ">".$special_user_bitfield[$i]."</td></tr>\n";
196 196
     }
197 197
     echo "</tr>";
198 198
 
@@ -217,10 +217,10 @@  discard block
 block discarded – undo
217 217
     if ($user->prefs->banished_until) {
218 218
         $dt = $user->prefs->banished_until - time();
219 219
         if ($dt > 0) {
220
-            $x = " Suspended until " . time_str($user->prefs->banished_until)
221
-                ."<br/> (Expires in " . time_diff($dt) .")" ;
220
+            $x = " Suspended until ".time_str($user->prefs->banished_until)
221
+                ."<br/> (Expires in ".time_diff($dt).")";
222 222
         } else {
223
-            $x = " last suspended " . time_str($user->prefs->banished_until);
223
+            $x = " last suspended ".time_str($user->prefs->banished_until);
224 224
         }
225 225
         row1($x);
226 226
     } else {
@@ -238,11 +238,11 @@  discard block
 block discarded – undo
238 238
     ";
239 239
     echo "
240 240
         <input type='radio' name='suspend_for' value='172800'> 48 hours  <br/>
241
-        <input type='radio' name='suspend_for' value='",86400*7,"'> 1 week  <br/>
242
-        <input type='radio' name='suspend_for' value='",86400*14,"'> 2 weeks  <br/>
241
+        <input type='radio' name='suspend_for' value='",86400*7, "'> 1 week  <br/>
242
+        <input type='radio' name='suspend_for' value='",86400*14, "'> 2 weeks  <br/>
243 243
     ";
244 244
 
245
-    if ($dt>0) {
245
+    if ($dt > 0) {
246 246
         echo "
247 247
             <input type='radio' name='suspend_for' value='-1'>  <b>unsuspend</b>   <br/>";
248 248
     }
Please login to merge, or discard this patch.