@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | // get the total size of output files of a batch |
301 | 301 | // |
302 | 302 | function batch_output_file_size($batchid) { |
303 | - $batch_td_size=0; |
|
303 | + $batch_td_size = 0; |
|
304 | 304 | $wus = BoincWorkunit::enum("batch=$batchid"); |
305 | 305 | $fanout = parse_config(get_config(), "<uldl_dir_fanout>"); |
306 | 306 | $upload_dir = parse_config(get_config(), "<upload_dir>"); |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | } |
331 | 331 | |
332 | 332 | function boinc_get_wu_output_files_url($user, $wu_id) { |
333 | - $auth_str = md5($user->authenticator.$wu_id); |
|
333 | + $auth_str = md5($user->authenticator.$wu_id); |
|
334 | 334 | return "get_output.php?cmd=workunit_files&wu_id=$wu_id&auth_str=$auth_str"; |
335 | 335 | } |
336 | 336 | |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | if (!file_exists($path)) return null; |
365 | 365 | $x = file_get_contents($path); |
366 | 366 | $n = sscanf($x, "%s %d", $md5, $size); |
367 | - if ($n != 2 || strlen($md5)!=32) { |
|
367 | + if ($n != 2 || strlen($md5) != 32) { |
|
368 | 368 | return null; |
369 | 369 | } |
370 | 370 | return [$md5, $size]; |
@@ -141,12 +141,12 @@ discard block |
||
141 | 141 | // prefix for links; needed for pages not in top dir |
142 | 142 | $user, |
143 | 143 | // logged-in user, if any |
144 | - $fixed=false, |
|
144 | + $fixed = false, |
|
145 | 145 | // if true, navbar is fixed at top of page. |
146 | 146 | // NOTE: if you do this, you must set a global var $fixed_navbar |
147 | 147 | // to true at compile time |
148 | 148 | // (it needs to be set when page_head() is called). |
149 | - $inverse=false |
|
149 | + $inverse = false |
|
150 | 150 | // white on black? |
151 | 151 | ) { |
152 | 152 | global $master_url; |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | // output a panel. |
216 | 216 | // $content_func is a function that generates the panel contents |
217 | 217 | // |
218 | -function panel($title, $content_func, $class="panel-primary", $body_class="") { |
|
218 | +function panel($title, $content_func, $class = "panel-primary", $body_class = "") { |
|
219 | 219 | echo sprintf('<div class="panel %s"> |
220 | 220 | ', $class |
221 | 221 | ); |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | // $left_width is the width of left column in 1/12 units. |
243 | 243 | // $arg is passed to the functions. |
244 | 244 | // |
245 | -function grid($top_func, $left_func, $right_func, $left_width=6, $arg=null) { |
|
245 | +function grid($top_func, $left_func, $right_func, $left_width = 6, $arg = null) { |
|
246 | 246 | echo ' |
247 | 247 | <div class="container-fluid"> |
248 | 248 | '; |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | </div> |
258 | 258 | '; |
259 | 259 | } |
260 | - $right_width = 12-$left_width; |
|
260 | + $right_width = 12 - $left_width; |
|
261 | 261 | echo ' |
262 | 262 | <div class="row"> |
263 | 263 | <div class="col-sm-'.$left_width.'"> |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | // use extra = "name=x" |
282 | 282 | // call forum_focus(x, foo) after defining the field |
283 | 283 | // |
284 | -function form_start($action, $method='get', $extra='') { |
|
284 | +function form_start($action, $method = 'get', $extra = '') { |
|
285 | 285 | echo sprintf( |
286 | 286 | '<div class="container-fluid"> |
287 | 287 | <form class="form-horizontal" method="%s" action="%s" %s>' |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | // just the input field |
314 | 314 | // |
315 | 315 | function form_input_text_field( |
316 | - $name, $value='', $type='text', $attrs='', $extra='' |
|
316 | + $name, $value = '', $type = 'text', $attrs = '', $extra = '' |
|
317 | 317 | ) { |
318 | 318 | return sprintf( |
319 | 319 | '<input %s type="%s" class="form-control" name="%s" value="%s">%s', |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | // the whole row |
325 | 325 | // |
326 | 326 | function form_input_text( |
327 | - $label, $name, $value='', $type='text', $attrs='', $extra='' |
|
327 | + $label, $name, $value = '', $type = 'text', $attrs = '', $extra = '' |
|
328 | 328 | ) { |
329 | 329 | echo sprintf(' |
330 | 330 | <div class="form-group"> |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | ); |
353 | 353 | } |
354 | 354 | |
355 | -function form_input_textarea($label, $name, $value='', $nrows=4) { |
|
355 | +function form_input_textarea($label, $name, $value = '', $nrows = 4) { |
|
356 | 356 | echo sprintf(' |
357 | 357 | <div class="form-group"> |
358 | 358 | <label align=right class="%s" for="%s">%s</label> |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | |
369 | 369 | // $items is either a string of <option> elements, or an array |
370 | 370 | // |
371 | -function form_select($label, $name, $items, $selected=null) { |
|
371 | +function form_select($label, $name, $items, $selected = null) { |
|
372 | 372 | echo sprintf(' |
373 | 373 | <div class="form-group"> |
374 | 374 | <label align=right class="%s" for="%s">%s</label> |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | foreach ($items as $i) { |
382 | 382 | echo sprintf( |
383 | 383 | '<option %s value=%s>%s</option>', |
384 | - ($i[0]==$selected)?'selected':'', |
|
384 | + ($i[0] == $selected) ? 'selected' : '', |
|
385 | 385 | $i[0], $i[1] |
386 | 386 | ); |
387 | 387 | } |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | // same, for multiple select. |
395 | 395 | // $selected, if non-null, is a list of selected values |
396 | 396 | // |
397 | -function form_select_multiple($label, $name, $items, $selected=null) { |
|
397 | +function form_select_multiple($label, $name, $items, $selected = null) { |
|
398 | 398 | echo sprintf(' |
399 | 399 | <div class="form-group"> |
400 | 400 | <label align=right class="%s" for="%s">%s</label> |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | foreach ($items as $i) { |
407 | 407 | echo sprintf( |
408 | 408 | '<option %s value=%s>%s</option>', |
409 | - ($selected && in_array($i[0], $selected))?'selected':'', |
|
409 | + ($selected && in_array($i[0], $selected)) ? 'selected' : '', |
|
410 | 410 | $i[0], $i[1] |
411 | 411 | ); |
412 | 412 | } |
@@ -415,12 +415,12 @@ discard block |
||
415 | 415 | |
416 | 416 | // return a list of string for checkbox items |
417 | 417 | // |
418 | -function checkbox_item_strings($items, $attrs='') { |
|
418 | +function checkbox_item_strings($items, $attrs = '') { |
|
419 | 419 | $x = []; |
420 | 420 | foreach ($items as $i) { |
421 | 421 | $x[] = sprintf('<input %s type="checkbox" name="%s" %s> %s |
422 | 422 | ', |
423 | - $attrs, $i[0], $i[2]?"checked":"", $i[1] |
|
423 | + $attrs, $i[0], $i[2] ? "checked" : "", $i[1] |
|
424 | 424 | ); |
425 | 425 | } |
426 | 426 | return $x; |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | |
429 | 429 | // $items is list of (name, label, checked) |
430 | 430 | // |
431 | -function form_checkboxes($label, $items, $attrs='') { |
|
431 | +function form_checkboxes($label, $items, $attrs = '') { |
|
432 | 432 | echo sprintf(' |
433 | 433 | <div class="form-group"> |
434 | 434 | <label align=right class="%s">%s</label> |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS |
455 | 455 | ); |
456 | 456 | foreach ($items as $i) { |
457 | - $checked = ($selected == $i[0])?"checked":""; |
|
457 | + $checked = ($selected == $i[0]) ? "checked" : ""; |
|
458 | 458 | echo sprintf('<input type="radio" name="%s" value="%s" %s> %s <br> |
459 | 459 | ', |
460 | 460 | $name, $i[0], $checked, $i[1] |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | '; |
488 | 488 | } |
489 | 489 | |
490 | -function form_submit($text, $attrs='') { |
|
490 | +function form_submit($text, $attrs = '') { |
|
491 | 491 | form_general( |
492 | 492 | "", |
493 | 493 | sprintf( |
@@ -497,7 +497,7 @@ discard block |
||
497 | 497 | ); |
498 | 498 | } |
499 | 499 | |
500 | -function form_checkbox($label, $name, $checked=false) { |
|
500 | +function form_checkbox($label, $name, $checked = false) { |
|
501 | 501 | echo sprintf(' |
502 | 502 | <div class="form-group"> |
503 | 503 | <label align=right class="%s">%s</label> |
@@ -508,6 +508,6 @@ discard block |
||
508 | 508 | echo sprintf(' |
509 | 509 | <input type="checkbox" name="%s" %s> |
510 | 510 | </div> |
511 | - ', $name, $checked?"checked":"" |
|
511 | + ', $name, $checked ? "checked" : "" |
|
512 | 512 | ); |
513 | 513 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | // |
62 | 62 | function unzip_batch_file($user, $batch_file) { |
63 | 63 | @mkdir("../../buda_batches"); |
64 | - for ($i=0; $i<1000; $i++) { |
|
64 | + for ($i = 0; $i < 1000; $i++) { |
|
65 | 65 | $batch_dir = "../../buda_batches/$i"; |
66 | 66 | $batch_dir_name = $i; |
67 | 67 | $ret = @mkdir($batch_dir); |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | } |
113 | 113 | $job_files = []; |
114 | 114 | $cmdline = ''; |
115 | - foreach(scandir("$batch_dir/$fname") as $f2) { |
|
115 | + foreach (scandir("$batch_dir/$fname") as $f2) { |
|
116 | 116 | if ($f2[0] == '.') continue; |
117 | 117 | if ($f2 == 'cmdline') { |
118 | 118 | $cmdline = trim(file_get_contents("$batch_dir/$fname/cmdline")); |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | function stage_input_files($batch_dir, $batch_desc, $batch_id) { |
163 | 163 | $n = count($batch_desc->shared_files); |
164 | 164 | $batch_desc->shared_files_phys_names = []; |
165 | - for ($i=0; $i<$n; $i++) { |
|
165 | + for ($i = 0; $i < $n; $i++) { |
|
166 | 166 | $path = sprintf('%s/%s', $batch_dir, $batch_desc->shared_files[$i]); |
167 | 167 | [$md5, $size] = $batch_desc->shared_file_infos[$i]; |
168 | 168 | $phys_name = sprintf('batch_%d_%s', $batch_id, $md5); |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | foreach ($batch_desc->jobs as $job) { |
173 | 173 | $n = count($batch_desc->unshared_files); |
174 | 174 | $job->phys_names = []; |
175 | - for ($i=0; $i<$n; $i++) { |
|
175 | + for ($i = 0; $i < $n; $i++) { |
|
176 | 176 | $path = sprintf('%s/%s/%s', |
177 | 177 | $batch_dir, $job->dir, $batch_desc->unshared_files[$i] |
178 | 178 | ); |
@@ -216,7 +216,7 @@ discard block |
||
216 | 216 | } |
217 | 217 | $cw_cmdline = sprintf('"--dockerfile %s %s %s"', |
218 | 218 | $variant_desc->dockerfile, |
219 | - $wrapper_verbose?'--verbose':'', |
|
219 | + $wrapper_verbose ? '--verbose' : '', |
|
220 | 220 | $cmdline |
221 | 221 | ); |
222 | 222 | $cmd = sprintf( |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | // |
287 | 287 | $x = "<input_template>\n"; |
288 | 288 | $ninfiles = 1 + count($variant_desc->input_file_names) + count($variant_desc->app_files); |
289 | - for ($i=0; $i<$ninfiles; $i++) { |
|
289 | + for ($i = 0; $i < $ninfiles; $i++) { |
|
290 | 290 | $x .= " <file_info>\n <no_delete/>\n </file_info>\n"; |
291 | 291 | } |
292 | 292 | $x .= " <workunit>\n"; |
@@ -169,7 +169,7 @@ |
||
169 | 169 | $notice = ""; |
170 | 170 | $dir = sandbox_dir($user); |
171 | 171 | $count = count($_FILES['new_file']['tmp_name']); |
172 | - for ($i=0; $i<$count; $i++) { |
|
172 | + for ($i = 0; $i < $count; $i++) { |
|
173 | 173 | $tmp_name = $_FILES['new_file']['tmp_name'][$i]; |
174 | 174 | if (!is_uploaded_file($tmp_name)) { |
175 | 175 | error_page("$tmp_name is not uploaded file"); |
@@ -91,7 +91,7 @@ discard block |
||
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 |
||
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 |
||
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?'↑':'↓' |
|
163 | + $sort_rev ? 0 : 1, |
|
164 | + $sort_rev ? '↑' : '↓' |
|
165 | 165 | ); |
166 | 166 | } else { |
167 | 167 | return sprintf( |
@@ -30,7 +30,7 @@ |
||
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 | ); |
@@ -24,7 +24,7 @@ |
||
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; |
@@ -39,8 +39,8 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | $apps = BoincApp::enum(""); |
156 | 156 | foreach ($apps as $app) { |
157 | 157 | if (in_array($app->id, $show_only) |
158 | - || ( in_array("all", $show_only) |
|
158 | + || (in_array("all", $show_only) |
|
159 | 159 | && (!$app->deprecated || $show_deprecated) |
160 | 160 | )) { |
161 | 161 | |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | <b>Results for <tt>$app->name</tt>:</b> |
164 | 164 | <ul> |
165 | 165 | "; |
166 | - for ($i=0; $i<2; $i++) { |
|
166 | + for ($i = 0; $i < 2; $i++) { |
|
167 | 167 | if ($i) { |
168 | 168 | $secs = 7*86400; |
169 | 169 | $period = " 7 days"; |