@@ -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 |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | $x = (int)$y; |
400 | 400 | } |
401 | 401 | if (0<=$x && $x<=9) { |
402 | - return FALSE; |
|
402 | + return false; |
|
403 | 403 | } else { |
404 | 404 | return "$x ".error_code_str($x); |
405 | 405 | } |
@@ -891,7 +891,7 @@ discard block |
||
891 | 891 | row("Domain name", $host->domain_name); |
892 | 892 | $x = $host->timezone/3600; |
893 | 893 | if ($x >= 0) $x="+$x"; |
894 | - row("Local Standard Time", "UTC $x hours"); |
|
894 | + row("Local Standard Time", "utc $x hours"); |
|
895 | 895 | row("Number of CPUs", $host->p_ncpus); |
896 | 896 | row("CPU", "$host->p_vendor $host->p_model"); |
897 | 897 | row("GFLOPS", number_format($host->p_fpops/1e9, 2)); |
@@ -310,9 +310,9 @@ discard block |
||
310 | 310 | $value=null; |
311 | 311 | } |
312 | 312 | if (isset($_GET[$order])) { |
313 | - $order = $_GET[$order]; |
|
313 | + $order = $_GET[$order]; |
|
314 | 314 | } else { |
315 | - $order = null; |
|
315 | + $order = null; |
|
316 | 316 | } |
317 | 317 | if ($value) { |
318 | 318 | if ($order == 'asc') { |
@@ -580,7 +580,7 @@ discard block |
||
580 | 580 | $res = new StdClass; |
581 | 581 | $res->server_state = $ss; |
582 | 582 | row2(result_server_state_string($res), |
583 | - link_results("$server_state[$ss]", $urlquery,"server_state=$ss", '') |
|
583 | + link_results("$server_state[$ss]", $urlquery,"server_state=$ss", '') |
|
584 | 584 | ); |
585 | 585 | } |
586 | 586 | end_table(); |
@@ -1056,8 +1056,8 @@ discard block |
||
1056 | 1056 | |
1057 | 1057 | function validate_color($validate_state) { |
1058 | 1058 | switch ($validate_state) { |
1059 | - case 1: return '33cc33'; // valid, green |
|
1060 | - case 2: return 'ffa500'; // invalid result, orange |
|
1059 | + case 1: return '33cc33'; // valid, green |
|
1060 | + case 2: return 'ffa500'; // invalid result, orange |
|
1061 | 1061 | } |
1062 | 1062 | return ''; |
1063 | 1063 | } |
@@ -98,7 +98,9 @@ discard block |
||
98 | 98 | if (!isset($types)) { |
99 | 99 | $types = array(); |
100 | 100 | $constants = get_defined_constants(true); |
101 | - foreach ($constants['mysqli'] as $c => $n) if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1]; |
|
101 | + foreach ($constants['mysqli'] as $c => $n) { |
|
102 | + if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1]; |
|
103 | + } |
|
102 | 104 | } |
103 | 105 | return array_key_exists($type_id, $types)? strtolower($types[$type_id]) : "unknown"; |
104 | 106 | } |
@@ -381,13 +383,13 @@ discard block |
||
381 | 383 | |
382 | 384 | |
383 | 385 | function link_results($n, $mq, $query, $clauses) { |
384 | - if ($n == '0') { // intentional compare by string |
|
386 | + if ($n == '0') { |
|
387 | +// intentional compare by string |
|
385 | 388 | return "0"; |
386 | 389 | } else { |
387 | 390 | if(strlen($clauses)) { |
388 | 391 | return "<a href=\"db_action.php?table=result&query=$mq&$query&clauses=".urlencode($clauses)."&sort_by=mod_time&detail=low\">$n</a>"; |
389 | - } |
|
390 | - else { |
|
392 | + } else { |
|
391 | 393 | return "<a href=\"db_action.php?table=result&query=$mq&$query&sort_by=mod_time&detail=low\">$n</a>"; |
392 | 394 | } |
393 | 395 | |
@@ -397,7 +399,7 @@ discard block |
||
397 | 399 | // Determines if in stderr_out is an error reported and prints as human readable String |
398 | 400 | // @return String A human readable string if error otherwise FALSE |
399 | 401 | // @param String $stderr_out the stderr_out value to parse |
400 | -function stderr_error_string($stderr_out){ |
|
402 | +function stderr_error_string($stderr_out) { |
|
401 | 403 | $y = parse_element($stderr_out, "<error_code>"); |
402 | 404 | $x = 0; |
403 | 405 | if ($y) { |
@@ -1176,7 +1178,7 @@ discard block |
||
1176 | 1178 | // result has not been received yet, so show report deadline either |
1177 | 1179 | // in green if in the future or in red if in the past. |
1178 | 1180 | $timenow=time(); |
1179 | - if ($result->report_deadline==0) { |
|
1181 | + if ($result->report_deadline==0) { |
|
1180 | 1182 | // not sent -- show create time in purple |
1181 | 1183 | $received = "<font color=\"9900cc\">". time_str($result->create_time) . "</font>"; |
1182 | 1184 | } else if ($result->report_deadline>=$timenow) { |
@@ -42,27 +42,27 @@ discard block |
||
42 | 42 | // @return String A user readable DateTime-String in UTC |
43 | 43 | // @param Integer $x The mysql-Timestamp to convert |
44 | 44 | function mysqltime_str($x) { |
45 | - if(strpos($x,"-")==4) { |
|
45 | + if (strpos($x, "-") == 4) { |
|
46 | 46 | // Syntax of supplied mysql-timestamp is YYYY-MM-DD HH:MM:SS |
47 | - $year = substr($x,0,4); |
|
48 | - $month = substr($x,5,2); |
|
49 | - $day = substr($x,8,2); |
|
50 | - $hour = substr($x,11,2); |
|
51 | - $minute = substr($x,14,2); |
|
52 | - $second = substr($x,17,2); |
|
47 | + $year = substr($x, 0, 4); |
|
48 | + $month = substr($x, 5, 2); |
|
49 | + $day = substr($x, 8, 2); |
|
50 | + $hour = substr($x, 11, 2); |
|
51 | + $minute = substr($x, 14, 2); |
|
52 | + $second = substr($x, 17, 2); |
|
53 | 53 | } else { |
54 | 54 | // Syntax of supplied mysql-timestamp is YYYYMMDDHHMMSS |
55 | - $year = substr($x,0,4); |
|
56 | - $month = substr($x,4,2); |
|
57 | - $day = substr($x,6,2); |
|
58 | - $hour = substr($x,8,2); |
|
59 | - $minute = substr($x,10,2); |
|
60 | - $second = substr($x,12,2); |
|
55 | + $year = substr($x, 0, 4); |
|
56 | + $month = substr($x, 4, 2); |
|
57 | + $day = substr($x, 6, 2); |
|
58 | + $hour = substr($x, 8, 2); |
|
59 | + $minute = substr($x, 10, 2); |
|
60 | + $second = substr($x, 12, 2); |
|
61 | 61 | |
62 | 62 | } |
63 | 63 | //make a Unix-Timestamp |
64 | 64 | // echo "Time string is " . "$x"; |
65 | - $time = mktime($hour,$minute,$second,$month,$day,$year); |
|
65 | + $time = mktime($hour, $minute, $second, $month, $day, $year); |
|
66 | 66 | return time_str($time); |
67 | 67 | } |
68 | 68 | |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | $constants = get_defined_constants(true); |
101 | 101 | foreach ($constants['mysqli'] as $c => $n) if (preg_match('/^MYSQLI_TYPE_(.*)/', $c, $m)) $types[$n] = $m[1]; |
102 | 102 | } |
103 | - return array_key_exists($type_id, $types)? strtolower($types[$type_id]) : "unknown"; |
|
103 | + return array_key_exists($type_id, $types) ? strtolower($types[$type_id]) : "unknown"; |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | // Function prints a description of $table |
@@ -110,38 +110,38 @@ discard block |
||
110 | 110 | $result = $db->do_query("SELECT * from $table LIMIT 1"); |
111 | 111 | $fields = $result->field_count; |
112 | 112 | |
113 | - $avgnum=(int)($fields/$columns); |
|
114 | - if ($avgnum*$columns<$fields) { |
|
113 | + $avgnum = (int)($fields/$columns); |
|
114 | + if ($avgnum*$columns < $fields) { |
|
115 | 115 | $avgnum++; |
116 | 116 | } |
117 | 117 | |
118 | - $actualcolumns=0; |
|
119 | - while ($avgnum*$actualcolumns<$fields) { |
|
118 | + $actualcolumns = 0; |
|
119 | + while ($avgnum*$actualcolumns < $fields) { |
|
120 | 120 | $actualcolumns++; |
121 | 121 | } |
122 | 122 | |
123 | - if ($which>$actualcolumns) { |
|
123 | + if ($which > $actualcolumns) { |
|
124 | 124 | return 0; |
125 | 125 | } |
126 | 126 | |
127 | - $bot=($which-1)*$avgnum; |
|
128 | - $top=$which*$avgnum; |
|
127 | + $bot = ($which - 1)*$avgnum; |
|
128 | + $top = $which*$avgnum; |
|
129 | 129 | |
130 | - $width=100.0/$actualcolumns; |
|
130 | + $width = 100.0/$actualcolumns; |
|
131 | 131 | |
132 | 132 | echo "<td>"; |
133 | 133 | start_table('table-striped'); |
134 | 134 | echo "<tr><th align=\"left\">NAME</th><th align=\"left\">Type</th><th align=\"left\">Bytes</th>\n"; |
135 | - for ($count=$bot; $count<$top; $count++) { |
|
136 | - if ($count<$fields) { |
|
135 | + for ($count = $bot; $count < $top; $count++) { |
|
136 | + if ($count < $fields) { |
|
137 | 137 | $x = $result->fetch_field_direct($count); |
138 | 138 | $name = $x->name; |
139 | 139 | $type = mysql_fieldtype_str($x->type); |
140 | 140 | $length = $x->length; |
141 | 141 | } else { |
142 | - $name="<br/> "; |
|
143 | - $type="<br/>"; |
|
144 | - $length="<br/>"; |
|
142 | + $name = "<br/> "; |
|
143 | + $type = "<br/>"; |
|
144 | + $length = "<br/>"; |
|
145 | 145 | } |
146 | 146 | echo "\t<tr><td><b>$name</b></td><td>$type</td><td>$length</td></tr>\n"; |
147 | 147 | } |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | echo "<h2>Description of <b>$table</b> table fields:</h2>\n"; |
157 | 157 | start_table(); |
158 | 158 | echo "<tr>"; |
159 | - for ($i=1; $i<=$how_many_columns; $i++) { |
|
159 | + for ($i = 1; $i <= $how_many_columns; $i++) { |
|
160 | 160 | print_describe_table_onecol($table, $i, $how_many_columns); |
161 | 161 | } |
162 | 162 | echo "</tr>"; |
@@ -175,10 +175,10 @@ discard block |
||
175 | 175 | } |
176 | 176 | |
177 | 177 | function print_query_field() { |
178 | - $currenttime=time(); |
|
179 | - $hourago=$currenttime-3600; |
|
180 | - $dayago=$currenttime-24*3600; |
|
181 | - $weekago=$currenttime-7*24*3600; |
|
178 | + $currenttime = time(); |
|
179 | + $hourago = $currenttime - 3600; |
|
180 | + $dayago = $currenttime - 24*3600; |
|
181 | + $weekago = $currenttime - 7*24*3600; |
|
182 | 182 | echo " |
183 | 183 | <tr> |
184 | 184 | <td align=\"right\">Additional clauses</td> |
@@ -202,11 +202,11 @@ discard block |
||
202 | 202 | } |
203 | 203 | } |
204 | 204 | |
205 | -function append_sql_query($original,$addition,$first) { |
|
205 | +function append_sql_query($original, $addition, $first) { |
|
206 | 206 | if ($first == 1) { |
207 | - return $original . " where " . $addition; |
|
207 | + return $original." where ".$addition; |
|
208 | 208 | } else { |
209 | - return $original . " and " . $addition; |
|
209 | + return $original." and ".$addition; |
|
210 | 210 | } |
211 | 211 | } |
212 | 212 | |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | if (isset($_GET[$name])) { |
308 | 308 | $value = $_GET[$name]; |
309 | 309 | } else { |
310 | - $value=null; |
|
310 | + $value = null; |
|
311 | 311 | } |
312 | 312 | if (isset($_GET[$order])) { |
313 | 313 | $order = $_GET[$order]; |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | } |
349 | 349 | |
350 | 350 | function get_url($base = "db_action.php") { |
351 | - $s = $base . "?table=$this->table$this->urlquery"; |
|
351 | + $s = $base."?table=$this->table$this->urlquery"; |
|
352 | 352 | return $s; |
353 | 353 | } |
354 | 354 | |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | $this->addeq('app_version_id'); |
364 | 364 | $this->addeq('exit_status'); |
365 | 365 | if (isset($_GET['nsecs'])) { |
366 | - $_GET['mod_time'] = date("YmdHis",time() - $_GET['nsecs']); |
|
366 | + $_GET['mod_time'] = date("YmdHis", time() - $_GET['nsecs']); |
|
367 | 367 | } |
368 | 368 | $this->addgt('mod_time'); |
369 | 369 | $this->addeq_not_CHOOSE_ALL('server_state'); |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | if ($n == '0') { // intentional compare by string |
385 | 385 | return "0"; |
386 | 386 | } else { |
387 | - if(strlen($clauses)) { |
|
387 | + if (strlen($clauses)) { |
|
388 | 388 | return "<a href=\"db_action.php?table=result&query=$mq&$query&clauses=".urlencode($clauses)."&sort_by=mod_time&detail=low\">$n</a>"; |
389 | 389 | } |
390 | 390 | else { |
@@ -397,13 +397,13 @@ discard block |
||
397 | 397 | // Determines if in stderr_out is an error reported and prints as human readable String |
398 | 398 | // @return String A human readable string if error otherwise FALSE |
399 | 399 | // @param String $stderr_out the stderr_out value to parse |
400 | -function stderr_error_string($stderr_out){ |
|
400 | +function stderr_error_string($stderr_out) { |
|
401 | 401 | $y = parse_element($stderr_out, "<error_code>"); |
402 | 402 | $x = 0; |
403 | 403 | if ($y) { |
404 | 404 | $x = (int)$y; |
405 | 405 | } |
406 | - if (0<=$x && $x<=9) { |
|
406 | + if (0 <= $x && $x <= 9) { |
|
407 | 407 | return FALSE; |
408 | 408 | } else { |
409 | 409 | return "$x ".error_code_str($x); |
@@ -411,8 +411,8 @@ discard block |
||
411 | 411 | } |
412 | 412 | |
413 | 413 | function admin_show_result_summary() { |
414 | - $ntotal =0; // TODO: how to count $result? |
|
415 | - $nvalid = 0; // for SUCCESS results |
|
414 | + $ntotal = 0; // TODO: how to count $result? |
|
415 | + $nvalid = 0; // for SUCCESS results |
|
416 | 416 | $ninvalid = 0; |
417 | 417 | $nfile_deleted = 0; |
418 | 418 | |
@@ -420,20 +420,20 @@ discard block |
||
420 | 420 | $outcome = array(); |
421 | 421 | $client_state = array(); |
422 | 422 | |
423 | - for ($ss=1; $ss<6; $ss++) { |
|
423 | + for ($ss = 1; $ss < 6; $ss++) { |
|
424 | 424 | $server_state[$ss] = 0; |
425 | 425 | } |
426 | - for ($ro=0; $ro<8; $ro++) { |
|
426 | + for ($ro = 0; $ro < 8; $ro++) { |
|
427 | 427 | $outcome[$ro] = 0; |
428 | 428 | } |
429 | - for ($cs=1; $cs<7; $cs++) { |
|
429 | + for ($cs = 1; $cs < 7; $cs++) { |
|
430 | 430 | $client_state[$cs] = 0; |
431 | 431 | } |
432 | - for ($fds=0; $fds<4; $fds++) { |
|
432 | + for ($fds = 0; $fds < 4; $fds++) { |
|
433 | 433 | $delete_state[$fds] = 0; |
434 | 434 | } |
435 | - for ($vs=0; $vs<NVALIDATE_STATES; $vs++) { |
|
436 | - $validate_state[$vs]=0; |
|
435 | + for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) { |
|
436 | + $validate_state[$vs] = 0; |
|
437 | 437 | } |
438 | 438 | |
439 | 439 | $_GET['table'] = 'result'; |
@@ -508,7 +508,7 @@ discard block |
||
508 | 508 | // |
509 | 509 | $delay = parse_config(get_config(), "<delete_delay_hours>"); |
510 | 510 | if ($delay) { |
511 | - $start2 = $start - $delay*3600;; |
|
511 | + $start2 = $start - $delay*3600; ; |
|
512 | 512 | $main_query .= " and ((file_delete_state>1 and mod_time>FROM_UNIXTIME($start2)) or (mod_time>FROM_UNIXTIME($start)))"; |
513 | 513 | } else { |
514 | 514 | $main_query .= " and mod_time > FROM_UNIXTIME($start)"; |
@@ -567,20 +567,20 @@ discard block |
||
567 | 567 | |
568 | 568 | start_table(); |
569 | 569 | echo "<tr valign=\"top\">"; |
570 | - echo "<td><h2>" . link_results("$ntotal results", $urlquery, '', '') . "</h2></td>"; |
|
571 | - echo "<td><h2>" . link_results("'Over' results", $urlquery, "server_state=5", '') . "</h2></td>"; |
|
572 | - echo "<td><h2>" . link_results("'Success' results", $urlquery, "outcome=1", '') . "</h2></td>"; |
|
573 | - echo "<td><h2>" . link_results("'Client error' results", $urlquery, "outcome=3", '') . "</h2></td>"; |
|
570 | + echo "<td><h2>".link_results("$ntotal results", $urlquery, '', '')."</h2></td>"; |
|
571 | + echo "<td><h2>".link_results("'Over' results", $urlquery, "server_state=5", '')."</h2></td>"; |
|
572 | + echo "<td><h2>".link_results("'Success' results", $urlquery, "outcome=1", '')."</h2></td>"; |
|
573 | + echo "<td><h2>".link_results("'Client error' results", $urlquery, "outcome=3", '')."</h2></td>"; |
|
574 | 574 | echo "</tr>"; |
575 | 575 | echo "<tr valign=\"top\">"; |
576 | 576 | echo "<td>"; |
577 | 577 | start_table('table-striped'); |
578 | 578 | echo "<tr><th>Server state</th><th># results</th></tr>\n"; |
579 | - for ($ss=1; $ss<6; $ss++) { |
|
579 | + for ($ss = 1; $ss < 6; $ss++) { |
|
580 | 580 | $res = new StdClass; |
581 | 581 | $res->server_state = $ss; |
582 | 582 | row2(result_server_state_string($res), |
583 | - link_results("$server_state[$ss]", $urlquery,"server_state=$ss", '') |
|
583 | + link_results("$server_state[$ss]", $urlquery, "server_state=$ss", '') |
|
584 | 584 | ); |
585 | 585 | } |
586 | 586 | end_table(); |
@@ -590,11 +590,11 @@ discard block |
||
590 | 590 | start_table('table-striped'); |
591 | 591 | echo "<tr><th>Outcome</th><th># results</th></tr>\n"; |
592 | 592 | |
593 | - for ($ro=0; $ro<8; $ro++) { |
|
593 | + for ($ro = 0; $ro < 8; $ro++) { |
|
594 | 594 | $res = new StdClass; |
595 | 595 | $res->outcome = $ro; |
596 | 596 | $res->exit_status = 0; |
597 | - c_row2($outcome[$ro]?outcome_color($ro):'', result_outcome_string($res), |
|
597 | + c_row2($outcome[$ro] ?outcome_color($ro) : '', result_outcome_string($res), |
|
598 | 598 | link_results("$outcome[$ro]", $urlquery, "outcome=$ro", '') |
599 | 599 | ); |
600 | 600 | } |
@@ -604,18 +604,18 @@ discard block |
||
604 | 604 | echo "<td>"; |
605 | 605 | start_table('table-striped'); |
606 | 606 | echo "<tr><th>Validate state</th><th># results</th></tr>\n"; |
607 | - for ($vs=0; $vs<NVALIDATE_STATES; $vs++) { |
|
607 | + for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) { |
|
608 | 608 | $res = new StdClass; |
609 | 609 | $res->validate_state = $vs; |
610 | 610 | $res->exit_status = 0; |
611 | - c_row2($validate_state[$vs]?validate_color($vs):'', validate_state_str($res), |
|
611 | + c_row2($validate_state[$vs] ?validate_color($vs) : '', validate_state_str($res), |
|
612 | 612 | link_results("$validate_state[$vs]", $urlquery, "validate_state=$vs", "outcome=1")); |
613 | 613 | } |
614 | 614 | end_table(); |
615 | 615 | start_table('table-striped'); |
616 | 616 | echo "<tr><th>File Delete state</th><th># results</th></tr>\n"; |
617 | 617 | |
618 | - for ($fds=0; $fds<4; $fds++) { |
|
618 | + for ($fds = 0; $fds < 4; $fds++) { |
|
619 | 619 | row2(file_delete_state_str($fds), |
620 | 620 | link_results("$file_delete[$fds]", $urlquery, "outcome=1", "file_delete_state=$fds")); |
621 | 621 | } |
@@ -627,7 +627,7 @@ discard block |
||
627 | 627 | echo "<td>"; |
628 | 628 | start_table('table-striped'); |
629 | 629 | echo "<tr><th>Client state</th><th># results</th></tr>\n"; |
630 | - for ($cs=1; $cs<7; $cs++) { |
|
630 | + for ($cs = 1; $cs < 7; $cs++) { |
|
631 | 631 | $res = new StdClass; |
632 | 632 | $res->client_state = $cs; |
633 | 633 | $res->exit_status = 0; |
@@ -646,9 +646,9 @@ discard block |
||
646 | 646 | <select name=\"server_state\"> |
647 | 647 | <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option> |
648 | 648 | "; |
649 | - for ($i=1; $i<6; $i++) { |
|
649 | + for ($i = 1; $i < 6; $i++) { |
|
650 | 650 | $res = new StdClass; |
651 | - $res->server_state=$i; |
|
651 | + $res->server_state = $i; |
|
652 | 652 | echo "<option value=\"$i\"> "."[$i] ".' '.result_server_state_string($res)."</option>\n"; |
653 | 653 | } |
654 | 654 | echo "</select>\n"; |
@@ -659,7 +659,7 @@ discard block |
||
659 | 659 | <select name=\"outcome\"> |
660 | 660 | <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option> |
661 | 661 | "; |
662 | - for ($i=0; $i<8; $i++) { |
|
662 | + for ($i = 0; $i < 8; $i++) { |
|
663 | 663 | $res = new StdClass; |
664 | 664 | $res->outcome = $i; |
665 | 665 | $res->exit_status = 0; |
@@ -673,7 +673,7 @@ discard block |
||
673 | 673 | <select name=\"validate_state\"> |
674 | 674 | <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option> |
675 | 675 | "; |
676 | - for ($vs=0; $vs<NVALIDATE_STATES; $vs++) { |
|
676 | + for ($vs = 0; $vs < NVALIDATE_STATES; $vs++) { |
|
677 | 677 | $res = new StdClass; |
678 | 678 | $res->validate_state = $vs; |
679 | 679 | $res->exit_status = 0; |
@@ -687,7 +687,7 @@ discard block |
||
687 | 687 | <select name=\"client_state\"> |
688 | 688 | <option value=\"CHOOSE_ALL\" selected=\"selected\"> Any </option> |
689 | 689 | "; |
690 | - for ($i=0; $i<7; $i++) { |
|
690 | + for ($i = 0; $i < 7; $i++) { |
|
691 | 691 | $res = new StdClass; |
692 | 692 | $res->client_state = $i; |
693 | 693 | $res->exit_status = 0; |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | } |
725 | 725 | |
726 | 726 | function table_title($table) { |
727 | - switch($table) { |
|
727 | + switch ($table) { |
|
728 | 728 | case "platform": return "Platforms"; |
729 | 729 | case "app": return "Applications"; |
730 | 730 | case "app_version": return "Application Versions"; |
@@ -744,7 +744,7 @@ discard block |
||
744 | 744 | row("Created", time_str($platform->create_time)); |
745 | 745 | row("Name", $platform->name); |
746 | 746 | row("User friendly name", $platform->user_friendly_name); |
747 | - row("","<a href=\"db_action.php?table=app_version&platformid=$platform->id\">App versions for this platform</a>"); |
|
747 | + row("", "<a href=\"db_action.php?table=app_version&platformid=$platform->id\">App versions for this platform</a>"); |
|
748 | 748 | end_table(); |
749 | 749 | } |
750 | 750 | |
@@ -756,8 +756,8 @@ discard block |
||
756 | 756 | row("User-friendly name", $app->user_friendly_name); |
757 | 757 | row("Deprecated", $app->deprecated); |
758 | 758 | row("Homogeneous redundancy", $app->homogeneous_redundancy); |
759 | - row("","<a href=\"db_action.php?table=app_version&appid=$app->id\">App Versions for this application</a>"); |
|
760 | - row("","<a href=\"db_action.php?table=workunit&appid=$app->id&detail=low\">Workunits for this application</a>"); |
|
759 | + row("", "<a href=\"db_action.php?table=app_version&appid=$app->id\">App Versions for this application</a>"); |
|
760 | + row("", "<a href=\"db_action.php?table=workunit&appid=$app->id&detail=low\">Workunits for this application</a>"); |
|
761 | 761 | end_table(); |
762 | 762 | } |
763 | 763 | |
@@ -765,9 +765,9 @@ discard block |
||
765 | 765 | start_table(); |
766 | 766 | row("ID", $app_version->id); |
767 | 767 | row("Created", time_str($app_version->create_time)); |
768 | - row("Application", "<a href=\"db_action.php?table=app&id=$app_version->appid\">" . app_name_by_id($app_version->appid) . "</a>"); |
|
768 | + row("Application", "<a href=\"db_action.php?table=app&id=$app_version->appid\">".app_name_by_id($app_version->appid)."</a>"); |
|
769 | 769 | row("Version num", $app_version->version_num); |
770 | - row("Platform", "<a href=\"db_action.php?table=platform&id=$app_version->platformid\">" . platform_name_by_id($app_version->platformid) . "</a>" ); |
|
770 | + row("Platform", "<a href=\"db_action.php?table=platform&id=$app_version->platformid\">".platform_name_by_id($app_version->platformid)."</a>"); |
|
771 | 771 | row("Plan Class", $app_version->plan_class); |
772 | 772 | row("XML doc", "<pre>".htmlspecialchars($app_version->xml_doc)."</pre>"); |
773 | 773 | row("min_core_version", $app_version->min_core_version); |
@@ -901,7 +901,7 @@ discard block |
||
901 | 901 | row("External IP address", "$host->external_ip_addr<br>"); |
902 | 902 | row("Domain name", $host->domain_name); |
903 | 903 | $x = $host->timezone/3600; |
904 | - if ($x >= 0) $x="+$x"; |
|
904 | + if ($x >= 0) $x = "+$x"; |
|
905 | 905 | row("Local Standard Time", "UTC $x hours"); |
906 | 906 | row("Number of CPUs", $host->p_ncpus); |
907 | 907 | row("CPU", "$host->p_vendor $host->p_model"); |
@@ -953,10 +953,10 @@ discard block |
||
953 | 953 | start_table(); |
954 | 954 | row("Created", time_str($wu->create_time)); |
955 | 955 | row("Transition Time", time_str($wu->transition_time)); |
956 | - row("Last time modified",mysqltime_str($wu->mod_time)); |
|
956 | + row("Last time modified", mysqltime_str($wu->mod_time)); |
|
957 | 957 | row("Name", $wu->name); |
958 | 958 | row("XML doc", "<pre>".htmlspecialchars($wu->xml_doc)."</pre>"); |
959 | - row("Application", "<a href=\"db_action.php?table=app&id=$wu->appid\">" . app_name_by_id($wu->appid) . " [".$wu->appid."]</a>"); |
|
959 | + row("Application", "<a href=\"db_action.php?table=app&id=$wu->appid\">".app_name_by_id($wu->appid)." [".$wu->appid."]</a>"); |
|
960 | 960 | row("Application version number", $wu->app_version_num); |
961 | 961 | row("Batch", $wu->batch); |
962 | 962 | $x = number_format($wu->rsc_fpops_est/1e9, 2); |
@@ -969,12 +969,12 @@ discard block |
||
969 | 969 | $x = $wu->rsc_disk_bound/(1024*1024); |
970 | 970 | $y = number_format($x, 2); |
971 | 971 | row("Max Disk Usage", "$y MB"); |
972 | - row("Need validate?", ($wu->need_validate?"yes [":"no [").$wu->need_validate."]"); |
|
972 | + row("Need validate?", ($wu->need_validate ? "yes [" : "no [").$wu->need_validate."]"); |
|
973 | 973 | row("Canonical resultid", |
974 | 974 | "<a href=\"db_action.php?table=result&id=$wu->canonical_resultid\">".$wu->canonical_resultid."</a>"); |
975 | 975 | row("Canonical credit", $wu->canonical_credit); |
976 | 976 | //row("Timeout check time", time_str($wu->timeout_check_time)); |
977 | - row("Delay bound", "$wu->delay_bound" . " = " . time_diff($wu->delay_bound) ); |
|
977 | + row("Delay bound", "$wu->delay_bound"." = ".time_diff($wu->delay_bound)); |
|
978 | 978 | row("Error mask", wu_error_mask_str($wu->error_mask, true)); |
979 | 979 | row("File delete state", file_delete_state_str($wu->file_delete_state)." [".$wu->file_delete_state."]"); |
980 | 980 | row("Assimilation state", assimilate_state_str($wu->assimilate_state)." [".$wu->assimilate_state."]"); |
@@ -984,7 +984,7 @@ discard block |
||
984 | 984 | row("max error results", $wu->max_error_results); |
985 | 985 | row("max total results", $wu->max_total_results); |
986 | 986 | row("max success results", $wu->max_success_results); |
987 | - row("result template file",$wu->result_template_file); |
|
987 | + row("result template file", $wu->result_template_file); |
|
988 | 988 | row("hr_class", $wu->hr_class); |
989 | 989 | row("opaque", $wu->opaque); |
990 | 990 | row("Priority", $wu->priority); |
@@ -1062,7 +1062,7 @@ discard block |
||
1062 | 1062 | } |
1063 | 1063 | |
1064 | 1064 | function outcome_color($outcome) { |
1065 | - switch($outcome) { |
|
1065 | + switch ($outcome) { |
|
1066 | 1066 | case 0: return '9900cc'; // "Init", purple |
1067 | 1067 | case 1: return '33cc33'; // "Success", green |
1068 | 1068 | case 3: return 'ff3333'; // "Client error", red |
@@ -1089,18 +1089,18 @@ discard block |
||
1089 | 1089 | row("Sent", time_str($result->sent_time)); |
1090 | 1090 | row("Report deadline", time_str($result->report_deadline)); |
1091 | 1091 | row("Received", time_str($result->received_time)); |
1092 | - row("Last time modified",mysqltime_str($result->mod_time)); |
|
1092 | + row("Last time modified", mysqltime_str($result->mod_time)); |
|
1093 | 1093 | row("Name", $result->name); |
1094 | - row("Workunit", "<a href=\"db_action.php?table=workunit&id=$result->workunitid\">" . wu_name_by_id($result->workunitid) . "</a> [$result->workunitid]" ); |
|
1094 | + row("Workunit", "<a href=\"db_action.php?table=workunit&id=$result->workunitid\">".wu_name_by_id($result->workunitid)."</a> [$result->workunitid]"); |
|
1095 | 1095 | row("Server state", result_server_state_string($result)." [$result->server_state]"); |
1096 | 1096 | row("Outcome", result_outcome_string($result)." [$result->outcome]"); |
1097 | 1097 | row("Client state", result_client_state_string($result)." [$result->client_state]"); |
1098 | 1098 | row("Exit status", exit_status_string($result->exit_status)); |
1099 | - row("Host ID", "<a href=\"db_action.php?table=host&id=$result->hostid\">" . host_name_by_id($result->hostid) . "</a> [$result->hostid]"); |
|
1100 | - row("User ID", "<a href=\"db_action.php?table=user&id=$result->userid\">" . user_name_by_id($result->userid) . "</a> [$result->userid]"); |
|
1099 | + row("Host ID", "<a href=\"db_action.php?table=host&id=$result->hostid\">".host_name_by_id($result->hostid)."</a> [$result->hostid]"); |
|
1100 | + row("User ID", "<a href=\"db_action.php?table=user&id=$result->userid\">".user_name_by_id($result->userid)."</a> [$result->userid]"); |
|
1101 | 1101 | row("CPU time", $result->cpu_time); |
1102 | 1102 | row("Elapsed time", $result->elapsed_time); |
1103 | - if($error=stderr_error_string($result->stderr_out)) { |
|
1103 | + if ($error = stderr_error_string($result->stderr_out)) { |
|
1104 | 1104 | row("error in stderr out", $error); |
1105 | 1105 | } |
1106 | 1106 | row("Batch", $result->batch); |
@@ -1117,16 +1117,16 @@ discard block |
||
1117 | 1117 | row("App version", $x1.app_version_string($result).$x2); |
1118 | 1118 | row("App version ID", $result->app_version_id); |
1119 | 1119 | row("Estimated GFLOPS", number_format($result->flops_estimate/1e9, 2)); |
1120 | - row("Random",$result->random); |
|
1121 | - row("Opaque",$result->opaque); |
|
1122 | - row("Teamid",$result->teamid); |
|
1123 | - row("Priority",$result->priority); |
|
1120 | + row("Random", $result->random); |
|
1121 | + row("Opaque", $result->opaque); |
|
1122 | + row("Teamid", $result->teamid); |
|
1123 | + row("Priority", $result->priority); |
|
1124 | 1124 | row("XML doc in", "<pre>".htmlspecialchars($result->xml_doc_in)."</pre>"); |
1125 | 1125 | row("XML doc out", "<pre>".htmlspecialchars($result->xml_doc_out)."</pre>"); |
1126 | 1126 | row("stderr out", "<pre>" |
1127 | 1127 | .htmlspecialchars( |
1128 | 1128 | $result->stderr_out, |
1129 | - ENT_QUOTES | (defined('ENT_SUBSTITUTE')?ENT_SUBSTITUTE:0), |
|
1129 | + ENT_QUOTES|(defined('ENT_SUBSTITUTE') ?ENT_SUBSTITUTE:0), |
|
1130 | 1130 | 'utf-8' |
1131 | 1131 | ) |
1132 | 1132 | ."</pre>" |
@@ -1174,23 +1174,23 @@ discard block |
||
1174 | 1174 | } else { |
1175 | 1175 | // result has not been received yet, so show report deadline either |
1176 | 1176 | // in green if in the future or in red if in the past. |
1177 | - $timenow=time(); |
|
1178 | - if ($result->report_deadline==0) { |
|
1177 | + $timenow = time(); |
|
1178 | + if ($result->report_deadline == 0) { |
|
1179 | 1179 | // not sent -- show create time in purple |
1180 | - $received = "<font color=\"9900cc\">". time_str($result->create_time) . "</font>"; |
|
1181 | - } else if ($result->report_deadline>=$timenow) { |
|
1180 | + $received = "<font color=\"9900cc\">".time_str($result->create_time)."</font>"; |
|
1181 | + } else if ($result->report_deadline >= $timenow) { |
|
1182 | 1182 | // overdue -- show deadline in red |
1183 | - $received = "<font color=\"#33cc33\">". time_str($result->report_deadline) . "</font>"; |
|
1183 | + $received = "<font color=\"#33cc33\">".time_str($result->report_deadline)."</font>"; |
|
1184 | 1184 | } else { |
1185 | 1185 | // in progress and not overdue -- show deadline in green |
1186 | - $received = "<font color=\"#ff3333\">". time_str($result->report_deadline) . "</font>"; |
|
1186 | + $received = "<font color=\"#ff3333\">".time_str($result->report_deadline)."</font>"; |
|
1187 | 1187 | } |
1188 | 1188 | } |
1189 | 1189 | $version = app_version_string($result)." (<a href=\"db_action.php?table=app_version&id=$result->app_version_id\">$result->app_version_id</a>)"; |
1190 | 1190 | $outcome_color = outcome_color($result->outcome); |
1191 | 1191 | $validate_color = validate_color($result->validate_state); |
1192 | 1192 | $host_user = host_user_link($result->hostid); |
1193 | - $cpu_hours = sprintf("%.1f",$result->cpu_time / 3600); |
|
1193 | + $cpu_hours = sprintf("%.1f", $result->cpu_time/3600); |
|
1194 | 1194 | $granted_credit = "<a href=credit.php?wu_id=$result->workunitid>".credit_str($result->granted_credit)."</a>"; |
1195 | 1195 | $delete_state = file_delete_state_str($result->file_delete_state); |
1196 | 1196 | |
@@ -1218,7 +1218,7 @@ discard block |
||
1218 | 1218 | row("ID", $user->id); |
1219 | 1219 | row("Created", time_str($user->create_time)); |
1220 | 1220 | row("Name", $user->name); |
1221 | - if(!in_rops()) { |
|
1221 | + if (!in_rops()) { |
|
1222 | 1222 | row("Authenticator", $user->authenticator); |
1223 | 1223 | } |
1224 | 1224 | row("Email address", $user->email_addr); |
@@ -1233,7 +1233,7 @@ discard block |
||
1233 | 1233 | row("Default venue", $user->venue); |
1234 | 1234 | row("Hosts", "<a href=\"db_action.php?table=host&userid=$user->id&detail=low\">click</a>"); |
1235 | 1235 | row("Cross project ID", $user->cross_project_id); |
1236 | - if(!in_rops()) { |
|
1236 | + if (!in_rops()) { |
|
1237 | 1237 | row("Password Hash", $user->passwd_hash); |
1238 | 1238 | } |
1239 | 1239 | row("Donated", $user->donated); |
@@ -1284,7 +1284,7 @@ discard block |
||
1284 | 1284 | echo "</table></td>"; |
1285 | 1285 | echo "<td><table border=\"2\">\n"; |
1286 | 1286 | echo "<tr><th>User</th><th># posts</th></tr>\n"; |
1287 | - for ($p=1; $p<=10; $p++) { |
|
1287 | + for ($p = 1; $p <= 10; $p++) { |
|
1288 | 1288 | row2_plain(user_links_ops($top10poster[$p]), $top10poster[$p]->posts); |
1289 | 1289 | } |
1290 | 1290 | echo "</table></td>"; |
@@ -1323,10 +1323,10 @@ discard block |
||
1323 | 1323 | function admin_show_team($team) { |
1324 | 1324 | start_table(); |
1325 | 1325 | row("ID", $team->id); |
1326 | - row("Team Founder", "<a href=\"db_action.php?table=user&id=$team->userid\">" . user_name_by_id($team->userid) . "</a>"); |
|
1326 | + row("Team Founder", "<a href=\"db_action.php?table=user&id=$team->userid\">".user_name_by_id($team->userid)."</a>"); |
|
1327 | 1327 | row("Name", $team->name); |
1328 | - row("Name (HTML Formatted)", "<pre>" . htmlspecialchars($team->name_html) . "</pre>" ); |
|
1329 | - row("Url", "<a href=\"http://$team->url\">" . $team->url . "</a>"); |
|
1328 | + row("Name (HTML Formatted)", "<pre>".htmlspecialchars($team->name_html)."</pre>"); |
|
1329 | + row("Url", "<a href=\"http://$team->url\">".$team->url."</a>"); |
|
1330 | 1330 | row("Type", team_type_string($team->type)); |
1331 | 1331 | row("Description", $team->description); |
1332 | 1332 | row("", "<a href=\"db_action.php?table=user&teamid=$team->id\">List All Members</a>"); |
@@ -1369,7 +1369,7 @@ discard block |
||
1369 | 1369 | if (!strlen($host->domain_name) && !strlen($host->last_ip_addr)) { |
1370 | 1370 | return "(blank)"; |
1371 | 1371 | } else { |
1372 | - return $host->domain_name . " (" . $host->last_ip_addr . ")"; |
|
1372 | + return $host->domain_name." (".$host->last_ip_addr.")"; |
|
1373 | 1373 | } |
1374 | 1374 | } |
1375 | 1375 |