@@ -251,7 +251,7 @@ |
||
251 | 251 | $pid = file_get_contents($path); |
252 | 252 | if ($pid) { |
253 | 253 | $pid = trim($pid); |
254 | - $out = Array(); |
|
254 | + $out = array(); |
|
255 | 255 | exec("ps -ww $pid", $out); |
256 | 256 | foreach ($out as $y) { |
257 | 257 | if (strstr($y, (string)$pid)) return 1; |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | $avg = round($app->info->avg, 2); |
181 | 181 | $min = round($app->info->min, 2); |
182 | 182 | $max = round($app->info->max, 2); |
183 | - $x = $max?"$avg ($min - $max)":"---"; |
|
183 | + $x = $max ? "$avg ($min - $max)" : "---"; |
|
184 | 184 | $u = $app->info->users; |
185 | 185 | } else { |
186 | 186 | $x = '---'; |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | $cmd = trim($cmd); |
276 | 276 | $x = explode(" ", $cmd); |
277 | 277 | $prog = $x[0]; |
278 | - $pidname = $prog . '.pid'; |
|
278 | + $pidname = $prog.'.pid'; |
|
279 | 279 | } |
280 | 280 | $path = "../../pid_$host/$pidname"; |
281 | 281 | if (is_file($path)) { |
@@ -316,12 +316,12 @@ discard block |
||
316 | 316 | } |
317 | 317 | $master_host = $u["host"]; |
318 | 318 | if ($config->www_host) { |
319 | - $web_host = trim((string) $config->www_host); |
|
319 | + $web_host = trim((string)$config->www_host); |
|
320 | 320 | } else { |
321 | 321 | $web_host = $main_host; |
322 | 322 | } |
323 | 323 | if ($config->sched_host) { |
324 | - $sched_host = trim((string) $config->sched_host); |
|
324 | + $sched_host = trim((string)$config->sched_host); |
|
325 | 325 | } else { |
326 | 326 | $sched_host = $main_host; |
327 | 327 | } |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | |
332 | 332 | // the upload and download servers are sort of daemons too |
333 | 333 | // |
334 | - $url = trim((string) $config->download_url); |
|
334 | + $url = trim((string)$config->download_url); |
|
335 | 335 | $u = parse_url($url); |
336 | 336 | $h = $u["host"]; |
337 | 337 | if ($h == $master_host) { |
@@ -343,14 +343,14 @@ discard block |
||
343 | 343 | } else { |
344 | 344 | $have_remote = true; |
345 | 345 | } |
346 | - $url = trim((string) $config->upload_url); |
|
346 | + $url = trim((string)$config->upload_url); |
|
347 | 347 | $u = parse_url($url); |
348 | 348 | $h = $u["host"]; |
349 | 349 | if ($h == $master_host) { |
350 | 350 | $y = new StdClass; |
351 | 351 | $y->cmd = "Upload server"; |
352 | 352 | $y->host = $h; |
353 | - $y->status = !file_exists("../../stop_upload");; |
|
353 | + $y->status = !file_exists("../../stop_upload"); ; |
|
354 | 354 | $local_daemons[] = $y; |
355 | 355 | } else { |
356 | 356 | $have_remote = true; |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | $y = new StdClass; |
362 | 362 | $y->cmd = "Scheduler"; |
363 | 363 | $y->host = $sched_host; |
364 | - $y->status = !file_exists("../../stop_sched");; |
|
364 | + $y->status = !file_exists("../../stop_sched"); ; |
|
365 | 365 | $local_daemons[] = $y; |
366 | 366 | |
367 | 367 | foreach ($daemons->daemon as $d) { |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | $disabled_daemons[] = $x; |
375 | 375 | continue; |
376 | 376 | } |
377 | - $host = $d->host?(string)$d->host:$main_host; |
|
377 | + $host = $d->host ? (string)$d->host : $main_host; |
|
378 | 378 | if ($host != $web_host) { |
379 | 379 | $have_remote = true; |
380 | 380 | continue; |
@@ -369,7 +369,7 @@ |
||
369 | 369 | $text = "---"; |
370 | 370 | if ($batch->state == BATCH_STATE_COMPLETE) { |
371 | 371 | $y = '<font color="red">failed</font>'; |
372 | - } else { |
|
372 | + } else { |
|
373 | 373 | $y = "in progress"; |
374 | 374 | } |
375 | 375 | } |
@@ -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> |
@@ -451,7 +451,7 @@ |
||
451 | 451 | |
452 | 452 | $web_app = get_web_app($app); |
453 | 453 | |
454 | - page_head("Batch $batch_id"); |
|
454 | + page_head("batch $batch_id"); |
|
455 | 455 | text_start(800); |
456 | 456 | start_table(); |
457 | 457 | row2("name", $batch->name); |
@@ -32,7 +32,7 @@ |
||
32 | 32 | if (!$batch || $batch->user_id != $user->id) { |
33 | 33 | error_page("no batch"); |
34 | 34 | } |
35 | - page_head("Batch $batch->id"); |
|
35 | + page_head("batch $batch->id"); |
|
36 | 36 | $results = BoincResult::enum("batch=$batch->id order by workunitid"); |
37 | 37 | result_table_start(true, true, null); |
38 | 38 | foreach ($results as $result) { |
@@ -691,7 +691,8 @@ |
||
691 | 691 | <id>$result->id</id> |
692 | 692 | <state>".state_string($result)."</state> |
693 | 693 | "; |
694 | - if ($result->server_state == 5) { // over? |
|
694 | + if ($result->server_state == 5) { |
|
695 | +// over? |
|
695 | 696 | $paths = get_outfile_paths($result); |
696 | 697 | foreach($paths as $path) { |
697 | 698 | if (is_file($path)) { |
@@ -595,7 +595,7 @@ |
||
595 | 595 | // return a batch specified by the command, using either ID or name |
596 | 596 | // |
597 | 597 | function get_batch($r) { |
598 | - $batch = NULL; |
|
598 | + $batch = null; |
|
599 | 599 | if (!empty($r->batch_id)) { |
600 | 600 | $batch_id = (int)($r->batch_id); |
601 | 601 | $batch = BoincBatch::lookup_id($batch_id); |
@@ -1049,24 +1049,24 @@ |
||
1049 | 1049 | log_write("----- Handling RPC; command ".$r->getName()); |
1050 | 1050 | |
1051 | 1051 | switch ($r->getName()) { |
1052 | - case 'abort_batch': handle_abort_batch($r); break; |
|
1053 | - case 'abort_jobs': handle_abort_jobs($r); break; |
|
1054 | - case 'create_batch': create_batch($r); break; |
|
1055 | - case 'estimate_batch': estimate_batch($r); break; |
|
1056 | - case 'get_templates': get_templates($r); break; |
|
1057 | - case 'ping': ping($r); break; |
|
1058 | - case 'query_batch': query_batch($r); break; |
|
1059 | - case 'query_batch2': query_batch2($r); break; |
|
1060 | - case 'query_batches': query_batches($r); break; |
|
1061 | - case 'query_job': query_job($r); break; |
|
1062 | - case 'query_completed_job': query_completed_job($r); break; |
|
1063 | - case 'retire_batch': handle_retire_batch($r); break; |
|
1064 | - case 'set_expire_time': handle_set_expire_time($r); break; |
|
1065 | - case 'submit_batch': submit_batch($r); break; |
|
1066 | - default: |
|
1067 | - log_write("bad command"); |
|
1068 | - xml_error(-1, "bad command: ".$r->getName()); |
|
1069 | - break; |
|
1052 | +case 'abort_batch': handle_abort_batch($r); break; |
|
1053 | +case 'abort_jobs': handle_abort_jobs($r); break; |
|
1054 | +case 'create_batch': create_batch($r); break; |
|
1055 | +case 'estimate_batch': estimate_batch($r); break; |
|
1056 | +case 'get_templates': get_templates($r); break; |
|
1057 | +case 'ping': ping($r); break; |
|
1058 | +case 'query_batch': query_batch($r); break; |
|
1059 | +case 'query_batch2': query_batch2($r); break; |
|
1060 | +case 'query_batches': query_batches($r); break; |
|
1061 | +case 'query_job': query_job($r); break; |
|
1062 | +case 'query_completed_job': query_completed_job($r); break; |
|
1063 | +case 'retire_batch': handle_retire_batch($r); break; |
|
1064 | +case 'set_expire_time': handle_set_expire_time($r); break; |
|
1065 | +case 'submit_batch': submit_batch($r); break; |
|
1066 | +default: |
|
1067 | + log_write("bad command"); |
|
1068 | + xml_error(-1, "bad command: ".$r->getName()); |
|
1069 | + break; |
|
1070 | 1070 | } |
1071 | 1071 | |
1072 | 1072 | log_write("RPC done"); |
@@ -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 | } |
@@ -28,10 +28,10 @@ |
||
28 | 28 | // |
29 | 29 | function show_platforms() { |
30 | 30 | $xmlFragment = unserialize(get_cached_data(3600, "project_config_platform_xml")); |
31 | - if ($xmlFragment==false){ |
|
31 | + if ($xmlFragment==false) { |
|
32 | 32 | $platforms = BoincDB::get()->enum_fields("platform, DBNAME.app_version, DBNAME.app", "BoincPlatform", "platform.name, platform.user_friendly_name, plan_class", "app_version.platformid = platform.id and app_version.appid = app.id and app_version.deprecated=0 and app.deprecated=0 group by platform.name, plan_class", ""); |
33 | 33 | $xmlFragment = " <platforms>"; |
34 | - foreach ($platforms as $platform){ |
|
34 | + foreach ($platforms as $platform) { |
|
35 | 35 | $xmlFragment .= " |
36 | 36 | <platform> |
37 | 37 | <platform_name>$platform->name</platform_name> |
@@ -86,11 +86,11 @@ discard block |
||
86 | 86 | } |
87 | 87 | |
88 | 88 | if ($disable_account_creation || defined('INVITE_CODES')) { |
89 | - echo " <account_creation_disabled/>\n"; |
|
89 | + echo " <account_creation_disabled/>\n"; |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | if (defined('INVITE_CODES')) { |
93 | - echo " <invite_code_required/>\n"; |
|
93 | + echo " <invite_code_required/>\n"; |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | echo " <min_passwd_length>$min_passwd_length</min_passwd_length>\n"; |
@@ -113,9 +113,9 @@ discard block |
||
113 | 113 | // the terms_of_use.txt file in the project base directory. |
114 | 114 | // |
115 | 115 | if (defined('TERMSOFUSE_FILE')) { |
116 | - $tou_file = TERMSOFUSE_FILE; |
|
116 | + $tou_file = TERMSOFUSE_FILE; |
|
117 | 117 | } else { |
118 | - $tou_file = "../../terms_of_use.txt"; |
|
118 | + $tou_file = "../../terms_of_use.txt"; |
|
119 | 119 | } |
120 | 120 | if (file_exists($tou_file)) { |
121 | 121 | $terms_of_use = trim(file_get_contents($tou_file)); |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | // |
31 | 31 | function show_platforms() { |
32 | 32 | $xmlFragment = unserialize(get_cached_data(3600, "project_config_platform_xml")); |
33 | - if ($xmlFragment==false){ |
|
33 | + if ($xmlFragment == false) { |
|
34 | 34 | $platforms = BoincDB::get()->enum_fields("platform, DBNAME.app_version, DBNAME.app", "BoincPlatform", "platform.name, platform.user_friendly_name, plan_class", "app_version.platformid = platform.id and app_version.appid = app.id and app_version.deprecated=0 and app.deprecated=0 group by platform.name, plan_class", ""); |
35 | 35 | $xmlFragment = " <platforms>"; |
36 | - foreach ($platforms as $platform){ |
|
36 | + foreach ($platforms as $platform) { |
|
37 | 37 | $xmlFragment .= " |
38 | 38 | <platform> |
39 | 39 | <platform_name>$platform->name</platform_name> |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | if (defined('TERMSOFUSE_FILE')) { |
116 | 116 | $tou_file = TERMSOFUSE_FILE; |
117 | 117 | } else { |
118 | - $tou_file = "../../terms_of_use.txt"; |
|
118 | + $tou_file = "../../terms_of_use.txt"; |
|
119 | 119 | } |
120 | 120 | if (file_exists($tou_file)) { |
121 | 121 | $terms_of_use = trim(file_get_contents($tou_file)); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | </select>"); |
57 | 57 | |
58 | 58 | $forumid = null; |
59 | -if (get_str("forumid",true)){ |
|
59 | +if (get_str("forumid",true)) { |
|
60 | 60 | $forumid = get_str("forumid"); |
61 | 61 | } |
62 | 62 | $forumlist="<option value=\"-1\">".tra("All")."</option>"; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | foreach ($categories as $category) { |
65 | 65 | $forums = BoincForum::enum("parent_type=0 and category=$category->id"); |
66 | 66 | foreach ($forums as $forum) { |
67 | - if ($forum->id==$forumid){ |
|
67 | + if ($forum->id==$forumid) { |
|
68 | 68 | $forumlist.="<option selected value=\"".$forum->id."\">".$forum->title."</option>"; |
69 | 69 | } else { |
70 | 70 | $forumlist.="<option value=\"".$forum->id."\">".$forum->title."</option>"; |
@@ -76,8 +76,8 @@ discard block |
||
76 | 76 | '<select class="form-control" name="search_forum">'.$forumlist.'</select'); |
77 | 77 | |
78 | 78 | $sortlist = null; |
79 | -foreach ($thread_sort_styles as $id => $style){ |
|
80 | - if ($id == CREATE_TIME_NEW){ |
|
79 | +foreach ($thread_sort_styles as $id => $style) { |
|
80 | + if ($id == CREATE_TIME_NEW) { |
|
81 | 81 | $sortlist.="<option selected value=\"".$id."\">".$style."</option>"; |
82 | 82 | } else { |
83 | 83 | $sortlist.="<option value=\"".$id."\">".$style."</option>"; |
@@ -56,18 +56,18 @@ discard block |
||
56 | 56 | </select>"); |
57 | 57 | |
58 | 58 | $forumid = null; |
59 | -if (get_str("forumid",true)){ |
|
59 | +if (get_str("forumid", true)) { |
|
60 | 60 | $forumid = get_str("forumid"); |
61 | 61 | } |
62 | -$forumlist="<option value=\"-1\">".tra("All")."</option>"; |
|
62 | +$forumlist = "<option value=\"-1\">".tra("All")."</option>"; |
|
63 | 63 | $categories = BoincCategory::enum(); |
64 | 64 | foreach ($categories as $category) { |
65 | 65 | $forums = BoincForum::enum("parent_type=0 and category=$category->id"); |
66 | 66 | foreach ($forums as $forum) { |
67 | - if ($forum->id==$forumid){ |
|
68 | - $forumlist.="<option selected value=\"".$forum->id."\">".$forum->title."</option>"; |
|
67 | + if ($forum->id == $forumid) { |
|
68 | + $forumlist .= "<option selected value=\"".$forum->id."\">".$forum->title."</option>"; |
|
69 | 69 | } else { |
70 | - $forumlist.="<option value=\"".$forum->id."\">".$forum->title."</option>"; |
|
70 | + $forumlist .= "<option value=\"".$forum->id."\">".$forum->title."</option>"; |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 | } |
@@ -76,11 +76,11 @@ discard block |
||
76 | 76 | '<select class="form-control" name="search_forum">'.$forumlist.'</select'); |
77 | 77 | |
78 | 78 | $sortlist = null; |
79 | -foreach ($thread_sort_styles as $id => $style){ |
|
80 | - if ($id == CREATE_TIME_NEW){ |
|
81 | - $sortlist.="<option selected value=\"".$id."\">".$style."</option>"; |
|
79 | +foreach ($thread_sort_styles as $id => $style) { |
|
80 | + if ($id == CREATE_TIME_NEW) { |
|
81 | + $sortlist .= "<option selected value=\"".$id."\">".$style."</option>"; |
|
82 | 82 | } else { |
83 | - $sortlist.="<option value=\"".$id."\">".$style."</option>"; |
|
83 | + $sortlist .= "<option value=\"".$id."\">".$style."</option>"; |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | row2(tra("Sort by"), |
@@ -98,5 +98,5 @@ discard block |
||
98 | 98 | |
99 | 99 | page_tail(); |
100 | 100 | |
101 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
101 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
102 | 102 | ?> |
@@ -57,7 +57,7 @@ |
||
57 | 57 | $team = BoincTeam::lookup_id($teamid); |
58 | 58 | $user = BoincUser::lookup_id($team->userid); |
59 | 59 | if (!$user) { |
60 | - error_page("Team $team->name has no founder"); |
|
60 | + error_page("team $team->name has no founder"); |
|
61 | 61 | $teamid = 0; |
62 | 62 | } else { |
63 | 63 | echo "<b>".tra("This account will belong to the team %1 and will have the project preferences of its founder.", "<a href=\"team_display.php?teamid=$team->id\">$team->name</a>")."</b><p>"; |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | } |
68 | 68 | |
69 | -form_start("create_account_action.php","post"); |
|
69 | +form_start("create_account_action.php", "post"); |
|
70 | 70 | create_account_form($teamid, $next_url); |
71 | 71 | global $recaptcha_public_key; |
72 | 72 | if ($recaptcha_public_key) { |
@@ -77,5 +77,5 @@ discard block |
||
77 | 77 | |
78 | 78 | page_tail(); |
79 | 79 | |
80 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
80 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
81 | 81 | ?> |
@@ -70,7 +70,7 @@ |
||
70 | 70 | $now = time(); |
71 | 71 | $post->update("signature=$add_signature, content='$content', modified=$now"); |
72 | 72 | |
73 | - if ($can_edit_title){ |
|
73 | + if ($can_edit_title) { |
|
74 | 74 | $title = trim($title); |
75 | 75 | $title = sanitize_tags($title); |
76 | 76 | $title = BoincDb::escape_string($title); |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | $post_owner = BoincUser::lookup_id($post->user); |
44 | 44 | if (($logged_in_user->id != $post_owner->id) || (can_reply($thread, $forum, $logged_in_user) == false)) { |
45 | - error_page (tra("You are not authorized to edit this post.")); |
|
45 | + error_page(tra("You are not authorized to edit this post.")); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | $thread_owner = BoincUser::lookup_id($thread->owner); |
@@ -51,13 +51,13 @@ discard block |
||
51 | 51 | // (ie. not a response to another post) |
52 | 52 | // allow the user to modify the thread title |
53 | 53 | // |
54 | -$can_edit_title = ($post->parent_post==0 && $thread_owner->id==$logged_in_user->id && !is_banished($logged_in_user)); |
|
54 | +$can_edit_title = ($post->parent_post == 0 && $thread_owner->id == $logged_in_user->id && !is_banished($logged_in_user)); |
|
55 | 55 | |
56 | 56 | $content = post_str("content", true); |
57 | 57 | $title = post_str("title", true); |
58 | 58 | $preview = post_str("preview", true); |
59 | 59 | |
60 | -if (post_str('submit',true) && (!$preview)) { |
|
60 | +if (post_str('submit', true) && (!$preview)) { |
|
61 | 61 | if (POST_MAX_LINKS |
62 | 62 | && link_count($content) > POST_MAX_LINKS |
63 | 63 | && !is_moderator($logged_in_user, $forum) |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | check_tokens($logged_in_user->authenticator); |
68 | 68 | |
69 | - $add_signature = (post_str('add_signature', true) == "1")?1:0; |
|
69 | + $add_signature = (post_str('add_signature', true) == "1") ? 1 : 0; |
|
70 | 70 | $content = substr($content, 0, 64000); |
71 | 71 | $content = trim($content); |
72 | 72 | if (strlen($content)) { |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $now = time(); |
75 | 75 | $post->update("signature=$add_signature, content='$content', modified=$now"); |
76 | 76 | |
77 | - if ($can_edit_title){ |
|
77 | + if ($can_edit_title) { |
|
78 | 78 | $title = trim($title); |
79 | 79 | $title = sanitize_tags($title); |
80 | 80 | $title = BoincDb::escape_string($title); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | } |
88 | 88 | } |
89 | 89 | |
90 | -page_head(tra("Edit post"),'','','', $bbcode_js); |
|
90 | +page_head(tra("Edit post"), '', '', '', $bbcode_js); |
|
91 | 91 | |
92 | 92 | switch ($forum->parent_type) { |
93 | 93 | case 0: |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | sprintf( |
123 | 123 | '<input type="text" size=%d name="title" value="%s">', |
124 | 124 | 80, |
125 | - htmlspecialchars($preview?$title:$thread->title) |
|
125 | + htmlspecialchars($preview ? $title : $thread->title) |
|
126 | 126 | ), |
127 | 127 | null, FORUM_LH_PCT |
128 | 128 | ); |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $bbcode_html, |
140 | 140 | 12, |
141 | 141 | 80, |
142 | - htmlspecialchars($preview?$content:$post->content) |
|
142 | + htmlspecialchars($preview ? $content : $post->content) |
|
143 | 143 | ), |
144 | 144 | null, FORUM_LH_PCT |
145 | 145 | ); |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | '<input id="add_signature" name="add_signature" value="1" type="checkbox" %s> |
150 | 150 | <label for="add_signature">%s</label> |
151 | 151 | ', |
152 | - $post->signature?'checked="true"':'', |
|
152 | + $post->signature ? 'checked="true"' : '', |
|
153 | 153 | tra("Add my signature to this post") |
154 | 154 | ), |
155 | 155 | null, FORUM_LH_PCT |
@@ -170,5 +170,5 @@ discard block |
||
170 | 170 | |
171 | 171 | page_tail(); |
172 | 172 | |
173 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
173 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
174 | 174 | ?> |
@@ -113,7 +113,7 @@ |
||
113 | 113 | |
114 | 114 | For assistance with ".PROJECT." go to ".$master_url; |
115 | 115 | |
116 | - $subject = "THREAD $action REPORT: $thread->title"; |
|
116 | + $subject = "thread $action REPORT: $thread->title"; |
|
117 | 117 | $success = mail_report_list($forum, $subject, $body); |
118 | 118 | $success &= send_email($user, $subject, $body); |
119 | 119 | pm_send_msg($user, $user, $subject, $body, false); |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $link = secure_url_base() . "forum_thread.php?id=" . $thread->id; |
132 | 132 | $body = "A " . PROJECT . " user has posted to the thread |
133 | 133 | \"" . $thread->title . "\".\n" |
134 | - ."To view the updated thread, visit:\n$link |
|
134 | + ."To view the updated thread, visit:\n$link |
|
135 | 135 | |
136 | 136 | -------------------------- |
137 | 137 | To change email preferences, visit: |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $link = secure_url_base() . "forum_forum.php?id=" . $forum->id; |
150 | 150 | $body = "A " . PROJECT . " user has added a thread to the forum |
151 | 151 | \"" . $thread->title . "\".\n" |
152 | - ."To view the updated forum, visit:\n$link |
|
152 | + ."To view the updated forum, visit:\n$link |
|
153 | 153 | |
154 | 154 | -------------------------- |
155 | 155 | To change email preferences, visit: |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | //////////////////// a user clicks the red "x" to report a post /////////// |
163 | 163 | // |
164 | 164 | function send_report_post_email($user, $forum, $thread, $post, $message) { |
165 | - global $master_url; |
|
165 | + global $master_url; |
|
166 | 166 | |
167 | 167 | $body = ""; |
168 | 168 | $owner = BoincUser::lookup_id($post->user); |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | //////////////////// a banishment vote has been started /////////// |
219 | 219 | // |
220 | 220 | function send_banish_vote_email($user, $duration, $reason, $end_time) { |
221 | - global $master_url; |
|
221 | + global $master_url; |
|
222 | 222 | $now=time(); |
223 | 223 | $subject = PROJECT." banishment vote underway"; |
224 | 224 | $vote_url = $master_url."forum_banishment_vote.php"; |
@@ -240,11 +240,11 @@ discard block |
||
240 | 240 | pm_send_msg($user, $user, $subject, $body, false); |
241 | 241 | |
242 | 242 | $body .= "\n\n<a href=".$vote_url."?action=yes&userid=" |
243 | - .$user->id |
|
244 | - .">[vote to banish author]</a>\n\n" |
|
245 | - ."<a href=".$vote_url."?action=no&userid=" |
|
246 | - .$user->id |
|
247 | - .">[vote not to banish author]</a>"; |
|
243 | + .$user->id |
|
244 | + .">[vote to banish author]</a>\n\n" |
|
245 | + ."<a href=".$vote_url."?action=no&userid=" |
|
246 | + .$user->id |
|
247 | + .">[vote not to banish author]</a>"; |
|
248 | 248 | |
249 | 249 | $forum = new BoincForum; |
250 | 250 | $forum->parent_type = 0; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | // - project forums: everyone in POST_REPORT_EMAILS |
25 | 25 | // - team message board: team founder and admins |
26 | 26 | // |
27 | -function mail_report_list($forum, $subject, $body, $must_send=false) { |
|
27 | +function mail_report_list($forum, $subject, $body, $must_send = false) { |
|
28 | 28 | $success = true; |
29 | 29 | switch ($forum->parent_type) { |
30 | 30 | case 0: |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | function send_moderation_email($forum, $post, $thread, $explanation, $action) { |
66 | 66 | global $master_url; |
67 | 67 | |
68 | - $moderator=get_logged_in_user(); |
|
68 | + $moderator = get_logged_in_user(); |
|
69 | 69 | $body = ""; |
70 | 70 | $user = BoincUser::lookup_id($post->user); |
71 | 71 | |
@@ -126,11 +126,11 @@ discard block |
||
126 | 126 | // There's a new post in the thread, which the user is subscribed to. |
127 | 127 | // send them an email notifying them. |
128 | 128 | // |
129 | -function send_thread_notification_email($thread, $user){ |
|
130 | - $title = PROJECT . ": there is a new post in '". $thread->title ."'"; |
|
131 | - $link = secure_url_base() . "forum_thread.php?id=" . $thread->id; |
|
132 | - $body = "A " . PROJECT . " user has posted to the thread |
|
133 | -\"" . $thread->title . "\".\n" |
|
129 | +function send_thread_notification_email($thread, $user) { |
|
130 | + $title = PROJECT.": there is a new post in '".$thread->title."'"; |
|
131 | + $link = secure_url_base()."forum_thread.php?id=".$thread->id; |
|
132 | + $body = "A ".PROJECT." user has posted to the thread |
|
133 | +\"" . $thread->title."\".\n" |
|
134 | 134 | ."To view the updated thread, visit:\n$link |
135 | 135 | |
136 | 136 | -------------------------- |
@@ -144,11 +144,11 @@ discard block |
||
144 | 144 | // There's a new thread in the forum, which the user is subscribed to. |
145 | 145 | // send them an email notifying them. |
146 | 146 | // |
147 | -function send_forum_notification_email($forum, $user){ |
|
148 | - $title = PROJECT . ": there is a new thread in '". $forum->title ."'"; |
|
149 | - $link = secure_url_base() . "forum_forum.php?id=" . $forum->id; |
|
150 | - $body = "A " . PROJECT . " user has added a thread to the forum |
|
151 | -\"" . $thread->title . "\".\n" |
|
147 | +function send_forum_notification_email($forum, $user) { |
|
148 | + $title = PROJECT.": there is a new thread in '".$forum->title."'"; |
|
149 | + $link = secure_url_base()."forum_forum.php?id=".$forum->id; |
|
150 | + $body = "A ".PROJECT." user has added a thread to the forum |
|
151 | +\"" . $thread->title."\".\n" |
|
152 | 152 | ."To view the updated forum, visit:\n$link |
153 | 153 | |
154 | 154 | -------------------------- |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | |
162 | 162 | //////////////////// a user clicks the red "x" to report a post /////////// |
163 | 163 | // |
164 | -function send_report_post_email($user, $forum, $thread, $post, $message) { |
|
164 | +function send_report_post_email($user, $forum, $thread, $post, $message) { |
|
165 | 165 | global $master_url; |
166 | 166 | |
167 | 167 | $body = ""; |
@@ -219,16 +219,16 @@ discard block |
||
219 | 219 | // |
220 | 220 | function send_banish_vote_email($user, $duration, $reason, $end_time) { |
221 | 221 | global $master_url; |
222 | - $now=time(); |
|
222 | + $now = time(); |
|
223 | 223 | $subject = PROJECT." banishment vote underway"; |
224 | 224 | $vote_url = $master_url."forum_banishment_vote.php"; |
225 | 225 | $body = " |
226 | 226 | A vote has been started to banish you |
227 | 227 | from the ".PROJECT." message boards until ".date('M j, |
228 | -Y G:i', $duration+$now).", |
|
228 | +Y G:i', $duration + $now).", |
|
229 | 229 | because your postings have not followed our guidelines. |
230 | 230 | |
231 | -This vote will last until ".date('M j, Y G:i',$end_time)." or until a majority |
|
231 | +This vote will last until ".date('M j, Y G:i', $end_time)." or until a majority |
|
232 | 232 | decision has been reached. If the vote does not result in banishment, you will be |
233 | 233 | able to resume posting at that time. |
234 | 234 | "; |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | // There's a new post in the thread, which the user is subscribed to. |
127 | 127 | // send them an email notifying them. |
128 | 128 | // |
129 | -function send_thread_notification_email($thread, $user){ |
|
129 | +function send_thread_notification_email($thread, $user) { |
|
130 | 130 | $title = PROJECT . ": there is a new post in '". $thread->title ."'"; |
131 | 131 | $link = secure_url_base() . "forum_thread.php?id=" . $thread->id; |
132 | 132 | $body = "A " . PROJECT . " user has posted to the thread |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | // There's a new thread in the forum, which the user is subscribed to. |
145 | 145 | // send them an email notifying them. |
146 | 146 | // |
147 | -function send_forum_notification_email($forum, $user){ |
|
147 | +function send_forum_notification_email($forum, $user) { |
|
148 | 148 | $title = PROJECT . ": there is a new thread in '". $forum->title ."'"; |
149 | 149 | $link = secure_url_base() . "forum_forum.php?id=" . $forum->id; |
150 | 150 | $body = "A " . PROJECT . " user has added a thread to the forum |