@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | return file_exists("$d/stop_sched"); |
57 | 57 | } |
58 | 58 | |
59 | -function xml_error($num=-1, $msg=null, $file=null, $line=null) { |
|
59 | +function xml_error($num = -1, $msg = null, $file = null, $line = null) { |
|
60 | 60 | global $xml_outer_tag; |
61 | 61 | if (!$msg) { |
62 | - switch($num) { |
|
62 | + switch ($num) { |
|
63 | 63 | case -112: $msg = "Invalid XML"; break; |
64 | 64 | case -136: $msg = "Not found"; break; |
65 | 65 | case -137: $msg = "Name or email address is not unique"; break; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | // If it's a single-tag element, and it's present, just return the tag |
106 | 106 | // |
107 | 107 | function parse_element($xml, $tag) { |
108 | - $closetag = "</" . substr($tag,1); |
|
108 | + $closetag = "</".substr($tag, 1); |
|
109 | 109 | $x = strstr($xml, $tag); |
110 | 110 | if ($x) { |
111 | 111 | if (strstr($tag, "/>")) return $tag; |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | |
122 | 122 | function parse_next_element($xml, $tag, &$cursor) { |
123 | 123 | $element = null; |
124 | - $closetag = "</" . substr($tag,1); |
|
125 | - $pos = substr($xml,$cursor); |
|
124 | + $closetag = "</".substr($tag, 1); |
|
125 | + $pos = substr($xml, $cursor); |
|
126 | 126 | $x = strstr($pos, $tag); |
127 | 127 | if ($x) { |
128 | 128 | if (strstr($tag, "/>")) return $tag; |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | if ($template) { |
60 | 60 | $t = (double)$template->workunit->rsc_fpops_est; |
61 | 61 | } |
62 | - foreach($r->batch->job as $job) { |
|
62 | + foreach ($r->batch->job as $job) { |
|
63 | 63 | $y = (double)$job->rsc_fpops_est; |
64 | 64 | if ($y) { |
65 | 65 | $x += $y; |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | function est_elapsed_time($r, $template) { |
86 | 86 | // crude estimate: batch FLOPs / project FLOPS |
87 | 87 | // |
88 | - return batch_flop_count($r, $template) / project_flops(); |
|
88 | + return batch_flop_count($r, $template)/project_flops(); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | // if batch-level input template filename was given, read it; |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | // |
96 | 96 | function read_input_template($app, $r) { |
97 | 97 | if ((isset($r->batch)) && (isset($r->batch->workunit_template_file)) && ($r->batch->workunit_template_file)) { |
98 | - $path = project_dir() . "/templates/".$r->batch->workunit_template_file; |
|
98 | + $path = project_dir()."/templates/".$r->batch->workunit_template_file; |
|
99 | 99 | } else { |
100 | - $path = project_dir() . "/templates/$app->name"."_in"; |
|
100 | + $path = project_dir()."/templates/$app->name"."_in"; |
|
101 | 101 | } |
102 | 102 | if (file_exists($path)) { |
103 | 103 | $x = simplexml_load_file($path); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | function validate_batch($jobs, $template) { |
146 | 146 | $i = 0; |
147 | 147 | $n = count($template->file_info); |
148 | - foreach($jobs as $job) { |
|
148 | + foreach ($jobs as $job) { |
|
149 | 149 | $m = count($job->input_files); |
150 | 150 | if ($n != $m) { |
151 | 151 | log_write("wrong # of input files for job $i: need $n, got $m"); |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | // stage all the files |
215 | 215 | // |
216 | 216 | function stage_files(&$jobs, $user) { |
217 | - foreach($jobs as $job) { |
|
217 | + foreach ($jobs as $job) { |
|
218 | 218 | foreach ($job->input_files as $file) { |
219 | 219 | if ($file->mode != "remote") { |
220 | 220 | $file->name = stage_file($file, $user); |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | // |
228 | 228 | function submit_jobs( |
229 | 229 | $jobs, $job_params, $app, $batch_id, $priority, $app_version_num, |
230 | - $input_template_filename, // batch-level; can also specify per job |
|
230 | + $input_template_filename, // batch-level; can also specify per job |
|
231 | 231 | $output_template_filename, |
232 | 232 | $user |
233 | 233 | ) { |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | // one line per job |
238 | 238 | // |
239 | 239 | $x = ""; |
240 | - foreach($jobs as $job) { |
|
240 | + foreach ($jobs as $job) { |
|
241 | 241 | if ($job->name) { |
242 | 242 | $x .= " --wu_name $job->name"; |
243 | 243 | } |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | $x .= "\n"; |
273 | 273 | } |
274 | 274 | |
275 | - $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id"; |
|
275 | + $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id"; |
|
276 | 276 | |
277 | 277 | if ($user->seti_id) { |
278 | 278 | $cmd .= " --target_user $user->id "; |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | // |
381 | 381 | function xml_get_jobs($r) { |
382 | 382 | $jobs = array(); |
383 | - foreach($r->batch->job as $j) { |
|
383 | + foreach ($r->batch->job as $j) { |
|
384 | 384 | $job = new StdClass; |
385 | 385 | $job->input_files = array(); |
386 | 386 | $job->command_line = (string)$j->command_line; |
@@ -431,16 +431,16 @@ discard block |
||
431 | 431 | // |
432 | 432 | function logical_end_time($r, $jobs, $user, $app) { |
433 | 433 | $total_flops = 0; |
434 | - foreach($jobs as $job) { |
|
434 | + foreach ($jobs as $job) { |
|
435 | 435 | //print_r($job); |
436 | 436 | if ($job->rsc_fpops_est) { |
437 | 437 | $total_flops += $job->rsc_fpops_est; |
438 | 438 | } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) { |
439 | - $total_flops += (double) $job->input_template->workunit->rsc_fpops_est; |
|
439 | + $total_flops += (double)$job->input_template->workunit->rsc_fpops_est; |
|
440 | 440 | } else if ($r->batch->job_params->rsc_fpops_est) { |
441 | - $total_flops += (double) $r->batch->job_params->rsc_fpops_est; |
|
441 | + $total_flops += (double)$r->batch->job_params->rsc_fpops_est; |
|
442 | 442 | } else { |
443 | - $x = (double) $template->workunit->rsc_fpops_est; |
|
443 | + $x = (double)$template->workunit->rsc_fpops_est; |
|
444 | 444 | if ($x) { |
445 | 445 | $total_flops += $x; |
446 | 446 | } else { |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | } |
449 | 449 | } |
450 | 450 | } |
451 | - $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name"; |
|
451 | + $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name"; |
|
452 | 452 | $x = exec($cmd); |
453 | 453 | if (!is_numeric($x) || (double)$x == 0) { |
454 | 454 | xml_error(-1, "$cmd returned $x"); |
@@ -533,15 +533,15 @@ discard block |
||
533 | 533 | } |
534 | 534 | |
535 | 535 | $job_params = new StdClass; |
536 | - $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound; |
|
537 | - $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est; |
|
538 | - $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound; |
|
539 | - $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound; |
|
540 | - $job_params->delay_bound = (double) $r->batch->job_params->delay_bound; |
|
536 | + $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound; |
|
537 | + $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est; |
|
538 | + $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound; |
|
539 | + $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound; |
|
540 | + $job_params->delay_bound = (double)$r->batch->job_params->delay_bound; |
|
541 | 541 | // could add quorum-related stuff |
542 | 542 | |
543 | - $input_template_filename = (string) $r->batch->input_template_filename; |
|
544 | - $output_template_filename = (string) $r->batch->output_template_filename; |
|
543 | + $input_template_filename = (string)$r->batch->input_template_filename; |
|
544 | + $output_template_filename = (string)$r->batch->output_template_filename; |
|
545 | 545 | // possibly empty |
546 | 546 | |
547 | 547 | submit_jobs( |
@@ -634,7 +634,7 @@ discard block |
||
634 | 634 | } |
635 | 635 | |
636 | 636 | function n_outfiles($wu) { |
637 | - $path = project_dir() . "/$wu->output_template_filename"; |
|
637 | + $path = project_dir()."/$wu->output_template_filename"; |
|
638 | 638 | $r = simplexml_load_file($path); |
639 | 639 | return count($r->file_info); |
640 | 640 | } |
@@ -841,7 +841,7 @@ discard block |
||
841 | 841 | "; |
842 | 842 | if ($result->server_state == 5) { // over? |
843 | 843 | $paths = get_outfile_paths($result); |
844 | - foreach($paths as $path) { |
|
844 | + foreach ($paths as $path) { |
|
845 | 845 | if (is_file($path)) { |
846 | 846 | $size = filesize($path); |
847 | 847 | echo " <outfile> |
@@ -885,7 +885,7 @@ discard block |
||
885 | 885 | } else { |
886 | 886 | $results = BoincResult::enum("workunitid=$job_id"); |
887 | 887 | foreach ($results as $r) { |
888 | - switch($r->outcome) { |
|
888 | + switch ($r->outcome) { |
|
889 | 889 | case 1: |
890 | 890 | case 3: |
891 | 891 | case 6: |
@@ -1000,8 +1000,8 @@ discard block |
||
1000 | 1000 | } |
1001 | 1001 | |
1002 | 1002 | $user = check_remote_submit_permissions($r, $app); |
1003 | - $in = file_get_contents(project_dir() . "/templates/".$app->name."_in"); |
|
1004 | - $out = file_get_contents(project_dir() . "/templates/".$app->name."_out"); |
|
1003 | + $in = file_get_contents(project_dir()."/templates/".$app->name."_in"); |
|
1004 | + $out = file_get_contents(project_dir()."/templates/".$app->name."_out"); |
|
1005 | 1005 | if ($in === false || $out === false) { |
1006 | 1006 | log_write("template file missing"); |
1007 | 1007 | xml_error(-1, "template file missing"); |
@@ -1013,7 +1013,7 @@ discard block |
||
1013 | 1013 | |
1014 | 1014 | function ping($r) { |
1015 | 1015 | xml_start_tag("ping"); |
1016 | - BoincDb::get(); // errors out if DB down or web disabled |
|
1016 | + BoincDb::get(); // errors out if DB down or web disabled |
|
1017 | 1017 | echo "<success>1</success> |
1018 | 1018 | </ping> |
1019 | 1019 | "; |
@@ -1080,9 +1080,9 @@ discard block |
||
1080 | 1080 | $request_log = parse_config(get_config(), "<remote_submit_request_log>"); |
1081 | 1081 | if ($request_log) { |
1082 | 1082 | $log_dir = parse_config(get_config(), "<log_dir>"); |
1083 | - $request_log = $log_dir . "/" . $request_log; |
|
1083 | + $request_log = $log_dir."/".$request_log; |
|
1084 | 1084 | if ($file = fopen($request_log, "a")) { |
1085 | - fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $_POST['request'] . "\n</submit_rpc_handler>\n"); |
|
1085 | + fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$_POST['request']."\n</submit_rpc_handler>\n"); |
|
1086 | 1086 | fclose($file); |
1087 | 1087 | } |
1088 | 1088 | } |
@@ -51,7 +51,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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, |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | if ($owner) { |
462 | 462 | row2('submitter', $owner->name); |
463 | 463 | } |
464 | - row2("application", $app?$app->name:'---'); |
|
464 | + row2("application", $app ? $app->name : '---'); |
|
465 | 465 | row2("state", batch_state_string($batch->state)); |
466 | 466 | //row2("# jobs", $batch->njobs); |
467 | 467 | //row2("# error jobs", $batch->nerror_jobs); |
@@ -523,7 +523,7 @@ discard block |
||
523 | 523 | $x[] = "Download Results"; |
524 | 524 | } |
525 | 525 | row_heading_array($x); |
526 | - foreach($wus as $wu) { |
|
526 | + foreach ($wus as $wu) { |
|
527 | 527 | $resultid = $wu->canonical_resultid; |
528 | 528 | if ($resultid) { |
529 | 529 | $y = '<font color="green">completed</font>'; |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | $text = "---"; |
533 | 533 | if ($batch->state == BATCH_STATE_COMPLETE) { |
534 | 534 | $y = '<font color="red">failed</font>'; |
535 | - } else { |
|
535 | + } else { |
|
536 | 536 | $y = "in progress"; |
537 | 537 | } |
538 | 538 | } |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | $results = BoincResult::enum("workunitid=$wuid"); |
596 | 596 | $upload_dir = parse_config(get_config(), "<upload_dir>"); |
597 | 597 | $fanout = parse_config(get_config(), "<uldl_dir_fanout>"); |
598 | - foreach($results as $result) { |
|
598 | + foreach ($results as $result) { |
|
599 | 599 | $x = [ |
600 | 600 | "<a href=result.php?resultid=$result->id>$result->id</a>", |
601 | 601 | state_string($result) |
@@ -604,7 +604,7 @@ discard block |
||
604 | 604 | if ($result->server_state == RESULT_SERVER_STATE_OVER) { |
605 | 605 | $phys_names = get_outfile_phys_names($result); |
606 | 606 | $log_names = get_outfile_log_names($result); |
607 | - for ($i=0; $i<count($phys_names); $i++) { |
|
607 | + for ($i = 0; $i < count($phys_names); $i++) { |
|
608 | 608 | if ($web_app->assim_move) { |
609 | 609 | // file is in |
610 | 610 | // project/results/<batchid>/<wu_name>__file_<log_name> |
@@ -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 | } |
@@ -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( |
@@ -33,17 +33,17 @@ discard block |
||
33 | 33 | // |
34 | 34 | $config = get_config(); |
35 | 35 | global $master_url; |
36 | -$master_url = parse_config($config , "<master_url>"); |
|
36 | +$master_url = parse_config($config, "<master_url>"); |
|
37 | 37 | $recaptcha_public_key = parse_config($config, "<recaptcha_public_key>"); |
38 | 38 | $recaptcha_private_key = parse_config($config, "<recaptcha_private_key>"); |
39 | 39 | |
40 | 40 | // Set parameters to defaults if not defined in config.xml |
41 | 41 | |
42 | 42 | $x = parse_config($config, "<user_country>"); |
43 | -define('USER_COUNTRY', ($x===null)?1:(int)$x); |
|
43 | +define('USER_COUNTRY', ($x === null) ? 1 : (int)$x); |
|
44 | 44 | |
45 | 45 | $x = parse_config($config, "<user_url>"); |
46 | -define('USER_URL', ($x===null)?1:(int)$x); |
|
46 | +define('USER_URL', ($x === null) ? 1 : (int)$x); |
|
47 | 47 | |
48 | 48 | // Set parameters to defaults if not defined in project.inc |
49 | 49 | |
@@ -151,10 +151,10 @@ discard block |
||
151 | 151 | } |
152 | 152 | |
153 | 153 | function url_base() { |
154 | - return is_https()?secure_url_base():URL_BASE; |
|
154 | + return is_https() ?secure_url_base() : URL_BASE; |
|
155 | 155 | } |
156 | 156 | |
157 | -function send_cookie($name, $value, $permanent, $ops=false) { |
|
157 | +function send_cookie($name, $value, $permanent, $ops = false) { |
|
158 | 158 | global $master_url; |
159 | 159 | |
160 | 160 | // the following allows independent login for projects on the same server |
@@ -165,11 +165,11 @@ discard block |
||
165 | 165 | $path = substr($path, 0, -1); |
166 | 166 | $path .= "_ops/"; |
167 | 167 | } |
168 | - $expire = $permanent?time()+3600*24*365:0; |
|
168 | + $expire = $permanent ?time() + 3600*24*365 : 0; |
|
169 | 169 | setcookie($name, $value, $expire, $path); |
170 | 170 | } |
171 | 171 | |
172 | -function clear_cookie($name, $ops=false) { |
|
172 | +function clear_cookie($name, $ops = false) { |
|
173 | 173 | global $master_url; |
174 | 174 | $url = parse_url($master_url); |
175 | 175 | $path = $url['path']; |
@@ -177,13 +177,13 @@ discard block |
||
177 | 177 | $path = substr($path, 0, -1); |
178 | 178 | $path .= "_ops/"; |
179 | 179 | } |
180 | - setcookie($name, '', time()-3600, $path); |
|
180 | + setcookie($name, '', time() - 3600, $path); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | $g_logged_in_user = null; |
184 | 184 | $got_logged_in_user = false; |
185 | 185 | |
186 | -function get_logged_in_user($must_be_logged_in=true) { |
|
186 | +function get_logged_in_user($must_be_logged_in = true) { |
|
187 | 187 | global $g_logged_in_user, $got_logged_in_user; |
188 | 188 | if ($got_logged_in_user) { |
189 | 189 | // this could have been called earlier with $must_be_logged_in false |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | $next_url = $_SERVER['REQUEST_URI']; |
210 | 210 | $n = strrpos($next_url, "/"); |
211 | 211 | if ($n) { |
212 | - $next_url = substr($next_url, $n+1); |
|
212 | + $next_url = substr($next_url, $n + 1); |
|
213 | 213 | } |
214 | 214 | } |
215 | 215 | $next_url = urlencode($next_url); |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | return $g_logged_in_user; |
221 | 221 | } |
222 | 222 | |
223 | -function show_login_info($prefix="") { |
|
223 | +function show_login_info($prefix = "") { |
|
224 | 224 | $user = get_logged_in_user(false); |
225 | 225 | if ($user) { |
226 | 226 | $url_tokens = url_tokens($user->authenticator); |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | } |
231 | 231 | } |
232 | 232 | |
233 | -$cache_control_extra=""; |
|
233 | +$cache_control_extra = ""; |
|
234 | 234 | $is_login_page = false; |
235 | 235 | |
236 | 236 | // Call this to start pages. |
@@ -242,11 +242,11 @@ discard block |
||
242 | 242 | // with an existing web framework can more easily do so. |
243 | 243 | // To do so, define page_head() in the project include file. |
244 | 244 | // |
245 | -if (!function_exists("page_head")){ |
|
245 | +if (!function_exists("page_head")) { |
|
246 | 246 | function page_head( |
247 | 247 | $title, |
248 | 248 | // page title. Put in <title>, used as title for browser tab. |
249 | - $body_attrs=null, |
|
249 | + $body_attrs = null, |
|
250 | 250 | // <body XXXX> |
251 | 251 | // e.g. Javascript to put focus in an input field |
252 | 252 | // (onload="document.form.foo.focus()") |
@@ -255,10 +255,10 @@ discard block |
||
255 | 255 | // if set, include schedulers.txt. |
256 | 256 | // also pass to project_banner() in case you want a different |
257 | 257 | // header for your main page. |
258 | - $url_prefix="", |
|
258 | + $url_prefix = "", |
|
259 | 259 | // prepend this to links. |
260 | 260 | // Use for web pages not in the top directory |
261 | - $head_extra=null |
|
261 | + $head_extra = null |
|
262 | 262 | // extra stuff to put in <head>. E.g.: |
263 | 263 | // reCAPTCHA code (create_profile.php) |
264 | 264 | // bbcode javascript (forums) |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | header("Content-type: text/html; charset=utf-8"); |
281 | 281 | header("Expires: Mon, 26 Jul 1997 05:00:00 UTC"); |
282 | 282 | // Date in the past |
283 | - header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " UTC"); |
|
283 | + header("Last-Modified: ".gmdate("D, d M Y H:i:s")." UTC"); |
|
284 | 284 | // always modified |
285 | 285 | header("Cache-Control: $cache_control_extra no-cache, must-revalidate, post-check=0, pre-check=0"); |
286 | 286 | // for HTTP/1.1 |
@@ -301,11 +301,11 @@ discard block |
||
301 | 301 | if ($head_extra) { |
302 | 302 | echo "\n$head_extra\n"; |
303 | 303 | } |
304 | - if ($is_main && (!defined('NO_COMPUTING')||!NO_COMPUTING)) { |
|
304 | + if ($is_main && (!defined('NO_COMPUTING') || !NO_COMPUTING)) { |
|
305 | 305 | readfile("schedulers.txt"); |
306 | 306 | } |
307 | 307 | |
308 | - $t = $title?$title:PROJECT; |
|
308 | + $t = $title ? $title : PROJECT; |
|
309 | 309 | echo "<title>$t</title>\n"; |
310 | 310 | echo ' |
311 | 311 | <meta charset="utf-8"> |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | echo '<div class="container-fluid"> |
363 | 363 | '; |
364 | 364 | |
365 | - switch($title) { //kludge |
|
365 | + switch ($title) { //kludge |
|
366 | 366 | case tra("Log in"): |
367 | 367 | case tra("Create an account"): |
368 | 368 | case tra("Server status page"): |
@@ -377,13 +377,13 @@ discard block |
||
377 | 377 | |
378 | 378 | // See the comments for page_head() |
379 | 379 | // |
380 | -if (!function_exists("page_tail")){ |
|
380 | +if (!function_exists("page_tail")) { |
|
381 | 381 | function page_tail( |
382 | - $show_date=false, |
|
382 | + $show_date = false, |
|
383 | 383 | // true for pages that are generated periodically rather than on the fly |
384 | - $url_prefix="", |
|
384 | + $url_prefix = "", |
|
385 | 385 | // use for pages not at top level |
386 | - $is_main=false |
|
386 | + $is_main = false |
|
387 | 387 | // passed to project_footer; |
388 | 388 | ) { |
389 | 389 | echo "<br>\n"; |
@@ -398,10 +398,10 @@ discard block |
||
398 | 398 | } |
399 | 399 | } |
400 | 400 | |
401 | -function display_cvs_versions(){ |
|
401 | +function display_cvs_versions() { |
|
402 | 402 | global $cvs_version_tracker; |
403 | 403 | echo "\n<!-- SVN VERSIONS -->\n"; |
404 | - for ($i=0;$i<sizeof($cvs_version_tracker);$i++) { |
|
404 | + for ($i = 0; $i < sizeof($cvs_version_tracker); $i++) { |
|
405 | 405 | echo "<!-- ".$cvs_version_tracker[$i]." -->\n"; |
406 | 406 | } |
407 | 407 | } |
@@ -426,24 +426,24 @@ discard block |
||
426 | 426 | // convert time interval in seconds to a string of the form |
427 | 427 | // 'D days h hours m min s sec'. |
428 | 428 | |
429 | -function time_diff($x, $res=3) { |
|
429 | +function time_diff($x, $res = 3) { |
|
430 | 430 | $x = (int)$x; |
431 | 431 | $days = (int)($x/86400); |
432 | - $hours = (int)(($x-$days*86400)/3600); |
|
433 | - $minutes = (int)(($x-$days*86400-$hours*3600)/60); |
|
434 | - $seconds = $x % 60; |
|
432 | + $hours = (int)(($x - $days*86400)/3600); |
|
433 | + $minutes = (int)(($x - $days*86400 - $hours*3600)/60); |
|
434 | + $seconds = $x%60; |
|
435 | 435 | |
436 | 436 | $s = ""; |
437 | 437 | if ($days) { |
438 | 438 | $s .= "$days ".tra("days")." "; |
439 | 439 | } |
440 | - if ($res>0 && ($hours || strlen($s))) { |
|
440 | + if ($res > 0 && ($hours || strlen($s))) { |
|
441 | 441 | $s .= "$hours ".tra("hours")." "; |
442 | 442 | } |
443 | - if ($res>1 && ($minutes || strlen($s))) { |
|
443 | + if ($res > 1 && ($minutes || strlen($s))) { |
|
444 | 444 | $s .= "$minutes ".tra("min")." "; |
445 | 445 | } |
446 | - if ($res>2) { |
|
446 | + if ($res > 2) { |
|
447 | 447 | $s .= "$seconds ".tra("sec")." "; |
448 | 448 | } |
449 | 449 | return $s; |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | |
458 | 458 | function time_str($x) { |
459 | 459 | if ($x == 0) return "---"; |
460 | - return gmdate('j M Y, G:i:s', (int)$x) . " UTC"; |
|
460 | + return gmdate('j M Y, G:i:s', (int)$x)." UTC"; |
|
461 | 461 | } |
462 | 462 | |
463 | 463 | function local_time_str($x) { |
@@ -469,14 +469,14 @@ discard block |
||
469 | 469 | return time_str($x); |
470 | 470 | } |
471 | 471 | |
472 | -function start_table_str($class="", $style="") { |
|
473 | - $s = $style?'style="'.$style.'"':''; |
|
472 | +function start_table_str($class = "", $style = "") { |
|
473 | + $s = $style ? 'style="'.$style.'"' : ''; |
|
474 | 474 | return '<div class="table"> |
475 | 475 | <table '.$s.' width="100%" class="table table-condensed '.$class.'" > |
476 | 476 | '; |
477 | 477 | } |
478 | 478 | |
479 | -function start_table($class="", $style="") { |
|
479 | +function start_table($class = "", $style = "") { |
|
480 | 480 | echo start_table_str($class, $style); |
481 | 481 | } |
482 | 482 | |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | echo "</tr>\n"; |
522 | 522 | } |
523 | 523 | |
524 | -function row1($x, $ncols=2, $class="heading") { |
|
524 | +function row1($x, $ncols = 2, $class = "heading") { |
|
525 | 525 | if ($class == "heading") { |
526 | 526 | echo "<tr><th class=\"bg-primary\" colspan=\"$ncols\">$x</th></tr>\n"; |
527 | 527 | } else { |
@@ -535,10 +535,10 @@ discard block |
||
535 | 535 | |
536 | 536 | // a table row with 2 columns, with the left on right-aligned |
537 | 537 | |
538 | -function row2($x, $y, $show_error=false, $lwidth='40%') { |
|
539 | - if ($x==="") $x="<br>"; |
|
540 | - if ($y==="") $y="<br>"; |
|
541 | - $attrs = $show_error?VALUE_ATTRS_ERR:VALUE_ATTRS; |
|
538 | +function row2($x, $y, $show_error = false, $lwidth = '40%') { |
|
539 | + if ($x === "") $x = "<br>"; |
|
540 | + if ($y === "") $y = "<br>"; |
|
541 | + $attrs = $show_error ?VALUE_ATTRS_ERR:VALUE_ATTRS; |
|
542 | 542 | echo "<tr> |
543 | 543 | <td width=\"$lwidth\" ".NAME_ATTRS.">$x</td> |
544 | 544 | <td $attrs >$y</td> |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | // output the first part of row2(); |
550 | 550 | // then write the content, followed by </td></tr> |
551 | 551 | |
552 | -function row2_init($x, $lwidth='40%') { |
|
552 | +function row2_init($x, $lwidth = '40%') { |
|
553 | 553 | echo sprintf('<tr> |
554 | 554 | <td width="%s" %s>%s</td> |
555 | 555 | <td %s>', |
@@ -565,31 +565,31 @@ discard block |
||
565 | 565 | echo "<tr><td>$string</td></tr>"; |
566 | 566 | } |
567 | 567 | |
568 | -function row_array($x, $attrs=null) { |
|
568 | +function row_array($x, $attrs = null) { |
|
569 | 569 | echo "<tr>\n"; |
570 | 570 | $i = 0; |
571 | 571 | foreach ($x as $h) { |
572 | - $a = $attrs?$attrs[$i]:""; |
|
572 | + $a = $attrs ? $attrs[$i] : ""; |
|
573 | 573 | echo "<td $a>$h</td>\n"; |
574 | 574 | $i++; |
575 | 575 | } |
576 | 576 | echo "</tr>\n"; |
577 | 577 | } |
578 | 578 | |
579 | -define ('ALIGN_RIGHT', 'style="text-align:right;"'); |
|
579 | +define('ALIGN_RIGHT', 'style="text-align:right;"'); |
|
580 | 580 | |
581 | -function row_heading_array($x, $attrs=null, $class='bg-primary') { |
|
581 | +function row_heading_array($x, $attrs = null, $class = 'bg-primary') { |
|
582 | 582 | echo "<tr>"; |
583 | 583 | $i = 0; |
584 | 584 | foreach ($x as $h) { |
585 | - $a = $attrs?$attrs[$i]:""; |
|
585 | + $a = $attrs ? $attrs[$i] : ""; |
|
586 | 586 | echo "<th $a class=\"$class\">$h</th>"; |
587 | 587 | $i++; |
588 | 588 | } |
589 | 589 | echo "</tr>\n"; |
590 | 590 | } |
591 | 591 | |
592 | -function row_heading($x, $class='bg-primary') { |
|
592 | +function row_heading($x, $class = 'bg-primary') { |
|
593 | 593 | echo sprintf('<tr><th class="%s" colspan=99>%s</th></tr> |
594 | 594 | ', $class, $x |
595 | 595 | ); |
@@ -649,7 +649,7 @@ discard block |
||
649 | 649 | // If $ellipsis is true, then an ellipsis is added to any sentence which |
650 | 650 | // is cut short. |
651 | 651 | |
652 | -function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis=false) { |
|
652 | +function sub_sentence($sentence, $delimiter, $max_chars, $ellipsis = false) { |
|
653 | 653 | $words = explode($delimiter, $sentence); |
654 | 654 | $total_chars = 0; |
655 | 655 | $trunc = false; |
@@ -732,8 +732,8 @@ discard block |
||
732 | 732 | |
733 | 733 | // returns null if the arg is optional and missing |
734 | 734 | // |
735 | -function get_int($name, $optional=false) { |
|
736 | - $x=null; |
|
735 | +function get_int($name, $optional = false) { |
|
736 | + $x = null; |
|
737 | 737 | if (isset($_GET[$name])) $x = $_GET[$name]; |
738 | 738 | if (!is_numeric($x)) { |
739 | 739 | if ($optional) { |
@@ -752,7 +752,7 @@ discard block |
||
752 | 752 | |
753 | 753 | // returns null if the arg is optional and missing |
754 | 754 | // |
755 | -function post_num($name, $optional=false) { |
|
755 | +function post_num($name, $optional = false) { |
|
756 | 756 | $x = null; |
757 | 757 | if (isset($_POST[$name])) $x = $_POST[$name]; |
758 | 758 | if (!is_numeric($x)) { |
@@ -767,7 +767,7 @@ discard block |
||
767 | 767 | |
768 | 768 | // returns null if the arg is optional and missing |
769 | 769 | // |
770 | -function post_int($name, $optional=false) { |
|
770 | +function post_int($name, $optional = false) { |
|
771 | 771 | $x = post_num($name, $optional); |
772 | 772 | if (is_null($x)) return null; |
773 | 773 | $y = (int)$x; |
@@ -785,7 +785,7 @@ discard block |
||
785 | 785 | } |
786 | 786 | } |
787 | 787 | |
788 | -function get_str($name, $optional=false) { |
|
788 | +function get_str($name, $optional = false) { |
|
789 | 789 | if (isset($_GET[$name])) { |
790 | 790 | $x = $_GET[$name]; |
791 | 791 | } else { |
@@ -797,7 +797,7 @@ discard block |
||
797 | 797 | return undo_magic_quotes($x); |
798 | 798 | } |
799 | 799 | |
800 | -function post_str($name, $optional=false) { |
|
800 | +function post_str($name, $optional = false) { |
|
801 | 801 | if (isset($_POST[$name])) { |
802 | 802 | $x = $_POST[$name]; |
803 | 803 | } else { |
@@ -809,7 +809,7 @@ discard block |
||
809 | 809 | return undo_magic_quotes($x); |
810 | 810 | } |
811 | 811 | |
812 | -function post_arr($name, $optional=false) { |
|
812 | +function post_arr($name, $optional = false) { |
|
813 | 813 | if (isset($_POST[$name]) && is_array($_POST[$name])) { |
814 | 814 | $x = $_POST[$name]; |
815 | 815 | } else { |
@@ -825,7 +825,7 @@ discard block |
||
825 | 825 | // the mb_* functions are not included by default |
826 | 826 | // return (mb_detect_encoding($passwd) -= 'ASCII'); |
827 | 827 | |
828 | - for ($i=0; $i<strlen($str); $i++) { |
|
828 | + for ($i = 0; $i < strlen($str); $i++) { |
|
829 | 829 | $c = ord(substr($str, $i)); |
830 | 830 | if ($c < 32 || $c > 127) return false; |
831 | 831 | } |
@@ -849,7 +849,7 @@ discard block |
||
849 | 849 | $number = str_replace(',', '.', $number); // replace the german decimal separator |
850 | 850 | // if no value was entered and this is ok |
851 | 851 | // |
852 | - if ($number=='' && !$low) return true; |
|
852 | + if ($number == '' && !$low) return true; |
|
853 | 853 | |
854 | 854 | // the supplied value contains alphabetic characters |
855 | 855 | // |
@@ -866,7 +866,7 @@ discard block |
||
866 | 866 | |
867 | 867 | // Generate a "select" element from an array of values |
868 | 868 | // |
869 | -function select_from_array($name, $array, $selection=null, $width=240) { |
|
869 | +function select_from_array($name, $array, $selection = null, $width = 240) { |
|
870 | 870 | $out = '<select style="color:#000;"class="form-control input-sm" style="width:'.$width.'px" name="'.$name.'">"'; |
871 | 871 | |
872 | 872 | foreach ($array as $key => $value) { |
@@ -891,8 +891,8 @@ discard block |
||
891 | 891 | return $str; |
892 | 892 | } |
893 | 893 | |
894 | -function strip_bbcode($string){ |
|
895 | - return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/","",$string); |
|
894 | +function strip_bbcode($string) { |
|
895 | + return preg_replace("/((\[.+\])+?)(.+?)((\[\/.+\])+?)/", "", $string); |
|
896 | 896 | } |
897 | 897 | |
898 | 898 | function current_url() { |
@@ -917,7 +917,7 @@ discard block |
||
917 | 917 | // the colors for bootstrap's btn-success are almost illegible; |
918 | 918 | // the green is too light. Use a darker green. |
919 | 919 | // |
920 | -function button_style($color='green', $font_size=null) { |
|
920 | +function button_style($color = 'green', $font_size = null) { |
|
921 | 921 | $fs = ''; |
922 | 922 | if ($font_size) { |
923 | 923 | $fs = sprintf('; font-size:%dpx', $font_size); |
@@ -936,7 +936,7 @@ discard block |
||
936 | 936 | // class: class of the button, e.g. btn |
937 | 937 | // extra: Additional text in href tag |
938 | 938 | // |
939 | -function button_text($url, $text, $desc=null, $class=null, $extra='') { |
|
939 | +function button_text($url, $text, $desc = null, $class = null, $extra = '') { |
|
940 | 940 | if (!$desc) { |
941 | 941 | $desc = $text; |
942 | 942 | } |
@@ -951,23 +951,23 @@ discard block |
||
951 | 951 | ); |
952 | 952 | } |
953 | 953 | |
954 | -function button_text_small($url, $text, $desc=null) { |
|
954 | +function button_text_small($url, $text, $desc = null) { |
|
955 | 955 | return button_text($url, $text, $desc, "btn btn-xs", button_style()); |
956 | 956 | } |
957 | 957 | |
958 | -function show_button($url, $text, $desc=null, $class=null, $extra=null) { |
|
958 | +function show_button($url, $text, $desc = null, $class = null, $extra = null) { |
|
959 | 959 | echo button_text($url, $text, $desc, $class, $extra); |
960 | 960 | } |
961 | 961 | |
962 | 962 | // for places with a bunch of buttons, like forum posts |
963 | 963 | // |
964 | -function show_button_small($url, $text, $desc=null) { |
|
964 | +function show_button_small($url, $text, $desc = null) { |
|
965 | 965 | echo button_text_small($url, $text, $desc); |
966 | 966 | } |
967 | 967 | |
968 | 968 | // used for showing icons |
969 | 969 | // |
970 | -function show_image($src, $title, $alt, $height=null) { |
|
970 | +function show_image($src, $title, $alt, $height = null) { |
|
971 | 971 | $h = ""; |
972 | 972 | if ($height) { |
973 | 973 | $h = "height=\"$height\""; |
@@ -1004,7 +1004,7 @@ discard block |
||
1004 | 1004 | // tries instead to connect to <replica_db_host> if tag exists. |
1005 | 1005 | // DEPRECATED - use boinc_db.inc |
1006 | 1006 | // |
1007 | -function db_init($try_replica=false) { |
|
1007 | +function db_init($try_replica = false) { |
|
1008 | 1008 | check_web_stopped(); |
1009 | 1009 | $retval = db_init_aux($try_replica); |
1010 | 1010 | if ($retval == 1) { |
@@ -1120,7 +1120,7 @@ discard block |
||
1120 | 1120 | // Check this to avoid XSS vulnerability |
1121 | 1121 | // |
1122 | 1122 | function sanitize_sort_by($x) { |
1123 | - switch($x) { |
|
1123 | + switch ($x) { |
|
1124 | 1124 | case 'expavg_credit': |
1125 | 1125 | case 'total_credit': |
1126 | 1126 | return; |
@@ -1138,7 +1138,7 @@ discard block |
||
1138 | 1138 | } |
1139 | 1139 | |
1140 | 1140 | function do_download($path) { |
1141 | - $name=basename($path); |
|
1141 | + $name = basename($path); |
|
1142 | 1142 | header('Content-Description: File Transfer'); |
1143 | 1143 | header('Content-Type: application/octet-stream'); |
1144 | 1144 | header('Content-Disposition: attachment; filename='.$name); |
@@ -1146,7 +1146,7 @@ discard block |
||
1146 | 1146 | header('Expires: 0'); |
1147 | 1147 | header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); |
1148 | 1148 | header('Pragma: public'); |
1149 | - header('Content-Length: ' . filesize($path)); |
|
1149 | + header('Content-Length: '.filesize($path)); |
|
1150 | 1150 | flush(); |
1151 | 1151 | readfile($path); |
1152 | 1152 | } |
@@ -1195,10 +1195,10 @@ discard block |
||
1195 | 1195 | // Otherwise return 0. |
1196 | 1196 | // Format of user agent string is "BOINC client (windows_x86_64 7.3.17)" |
1197 | 1197 | // |
1198 | -function boinc_client_version(){ |
|
1198 | +function boinc_client_version() { |
|
1199 | 1199 | if (!array_key_exists('HTTP_USER_AGENT', $_SERVER)) return 0; |
1200 | 1200 | $x = $_SERVER['HTTP_USER_AGENT']; |
1201 | - $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/"; |
|
1201 | + $e = "/BOINC client [^ ]* (\d+).(\d+).(\d+)\)/"; |
|
1202 | 1202 | if (preg_match($e, $x, $matches)) { |
1203 | 1203 | return $matches[1]*10000 + $matches[2]*100 + $matches[3]; |
1204 | 1204 | } |
@@ -1227,7 +1227,7 @@ discard block |
||
1227 | 1227 | $rem_name = $name."_remaining"; |
1228 | 1228 | return "<textarea name=\"$name\" class=\"form-control\" rows=3 id=\"$name\" onkeydown=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\" |
1229 | 1229 | onkeyup=\"text_counter(this.form.$name, this.form.$rem_name, $maxlen);\">".$text."</textarea> |
1230 | - <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen-strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining") |
|
1230 | + <br><input name=\"$rem_name\" type=\"text\" id=\"$rem_name\" value=\"".($maxlen - strlen($text))."\" size=\"3\" maxlength=\"3\" readonly> ".tra("characters remaining") |
|
1231 | 1231 | ; |
1232 | 1232 | } |
1233 | 1233 | |
@@ -1257,7 +1257,7 @@ discard block |
||
1257 | 1257 | // use the following around text with long lines, |
1258 | 1258 | // to limit the width and make it more readable. |
1259 | 1259 | // |
1260 | -function text_start($width=640) { |
|
1260 | +function text_start($width = 640) { |
|
1261 | 1261 | echo sprintf("<div style=\"max-width: %dpx;\">\n", $width); |
1262 | 1262 | } |
1263 | 1263 | function text_end() { |
@@ -1283,7 +1283,7 @@ discard block |
||
1283 | 1283 | } |
1284 | 1284 | |
1285 | 1285 | function cert_filename() { |
1286 | - return defined("CERT_FILENAME")?CERT_FILENAME:"cert1.php"; |
|
1286 | + return defined("CERT_FILENAME") ?CERT_FILENAME:"cert1.php"; |
|
1287 | 1287 | } |
1288 | 1288 | |
1289 | 1289 | // if user hasn't validated their email addr, tell them to |
@@ -1300,6 +1300,6 @@ discard block |
||
1300 | 1300 | } |
1301 | 1301 | } |
1302 | 1302 | |
1303 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
1303 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
1304 | 1304 | |
1305 | 1305 | ?> |