@@ -36,7 +36,7 @@ |
||
36 | 36 | "X-Poedit-SourceCharset: utf-8\\n" |
37 | 37 | |
38 | 38 | |
39 | -HDR; |
|
39 | +hdr; |
|
40 | 40 | |
41 | 41 | $out = fopen("en.po", "w"); |
42 | 42 |
@@ -53,10 +53,10 @@ discard block |
||
53 | 53 | $preview = post_str("preview", true); |
54 | 54 | $warning = null; |
55 | 55 | |
56 | -if ($content && $title && (!$preview)){ |
|
57 | - if (post_str('add_signature', true) == "add_it"){ |
|
56 | +if ($content && $title && (!$preview)) { |
|
57 | + if (post_str('add_signature', true) == "add_it") { |
|
58 | 58 | $add_signature = true; // set a flag and concatenate later |
59 | - } else { |
|
59 | + } else { |
|
60 | 60 | $add_signature = false; |
61 | 61 | } |
62 | 62 | check_tokens($logged_in_user->authenticator); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | $submit_help = "<br /><font color=\"red\">".tra("Remember to add a title")."</font>"; |
112 | 112 | } |
113 | 113 | |
114 | -if ($force_title && $title){ |
|
114 | +if ($force_title && $title) { |
|
115 | 115 | row2(tra("Title"), htmlspecialchars($title)."<input type=\"hidden\" name=\"title\" value=\"".htmlspecialchars($title)."\">"); |
116 | 116 | } else { |
117 | 117 | row2(tra("Title").$submit_help, |
@@ -56,10 +56,10 @@ discard block |
||
56 | 56 | $preview = post_str("preview", true); |
57 | 57 | $warning = null; |
58 | 58 | |
59 | -if ($content && $title && (!$preview)){ |
|
60 | - if (post_str('add_signature', true) == "add_it"){ |
|
61 | - $add_signature = true; // set a flag and concatenate later |
|
62 | - } else { |
|
59 | +if ($content && $title && (!$preview)) { |
|
60 | + if (post_str('add_signature', true) == "add_it") { |
|
61 | + $add_signature = true; // set a flag and concatenate later |
|
62 | + } else { |
|
63 | 63 | $add_signature = false; |
64 | 64 | } |
65 | 65 | check_tokens($logged_in_user->authenticator); |
@@ -71,14 +71,14 @@ discard block |
||
71 | 71 | $title, $content, $logged_in_user, $forum, $add_signature, $export |
72 | 72 | ); |
73 | 73 | if ($thread) { |
74 | - header('Location: forum_thread.php?id=' . $thread->id); |
|
74 | + header('Location: forum_thread.php?id='.$thread->id); |
|
75 | 75 | } else { |
76 | 76 | error_page("Can't create thread. $forum_error"); |
77 | 77 | } |
78 | 78 | } |
79 | 79 | } |
80 | 80 | |
81 | -page_head(tra("Create new thread"),'','','', $bbcode_js); |
|
81 | +page_head(tra("Create new thread"), '', '', '', $bbcode_js); |
|
82 | 82 | show_forum_header($logged_in_user); |
83 | 83 | |
84 | 84 | if ($warning) { |
@@ -119,12 +119,12 @@ discard block |
||
119 | 119 | $submit_help = "<br /><font color=\"red\">".tra("Remember to add a title")."</font>"; |
120 | 120 | } |
121 | 121 | |
122 | -if ($force_title && $title){ |
|
122 | +if ($force_title && $title) { |
|
123 | 123 | row2(tra("Title"), htmlspecialchars($title)."<input type=\"hidden\" name=\"title\" value=\"".htmlspecialchars($title)."\">"); |
124 | 124 | } else { |
125 | 125 | row2(tra("Title").$submit_help, |
126 | 126 | sprintf('<input type="text" class="form-control" name="title" value="%s">', |
127 | - $title?htmlspecialchars($title):'' |
|
127 | + $title ?htmlspecialchars($title) : '' |
|
128 | 128 | ) |
129 | 129 | ); |
130 | 130 | } |
@@ -134,14 +134,14 @@ discard block |
||
134 | 134 | echo $bbcode_html; |
135 | 135 | end_table(); |
136 | 136 | echo sprintf('<textarea class="form-control" name="content" rows="12" cols="80">%s</textarea>', |
137 | - $content?htmlspecialchars($content):'' |
|
137 | + $content ?htmlspecialchars($content) : '' |
|
138 | 138 | ); |
139 | 139 | echo "</td></tr>"; |
140 | 140 | |
141 | 141 | if (!$logged_in_user->prefs->no_signature_by_default) { |
142 | - $enable_signature="checked=\"true\""; |
|
142 | + $enable_signature = "checked=\"true\""; |
|
143 | 143 | } else { |
144 | - $enable_signature=""; |
|
144 | + $enable_signature = ""; |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | if (is_news_forum($forum)) { |
@@ -157,5 +157,5 @@ discard block |
||
157 | 157 | |
158 | 158 | page_tail(); |
159 | 159 | |
160 | -$cvs_version_tracker[]="\$Id$"; |
|
160 | +$cvs_version_tracker[] = "\$Id$"; |
|
161 | 161 | ?> |
@@ -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 | } |
@@ -365,11 +365,11 @@ discard block |
||
365 | 365 | function progress_bar($batch, $wus, $width) { |
366 | 366 | $w_success = $width*$batch->fraction_done; |
367 | 367 | $w_fail = $width*$batch->nerror_jobs/$batch->njobs; |
368 | - $nsuccess = $batch->njobs * $batch->fraction_done; |
|
368 | + $nsuccess = $batch->njobs*$batch->fraction_done; |
|
369 | 369 | $nsent = wus_nsent($wus); |
370 | 370 | $nprog = $nsent - $nsuccess - $batch->nerror_jobs; |
371 | 371 | $w_prog = $width*$nprog/$batch->njobs; |
372 | - $nunsent = $batch->njobs-$nsent; |
|
372 | + $nunsent = $batch->njobs - $nsent; |
|
373 | 373 | $w_unsent = $width*$nunsent/$batch->njobs; |
374 | 374 | $x = '<table height=20><tr>'; |
375 | 375 | if ($w_fail) { |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | page_head("Batch $batch_id"); |
408 | 408 | start_table(); |
409 | 409 | row2("name", $batch->name); |
410 | - row2("application", $app?$app->name:'---'); |
|
410 | + row2("application", $app ? $app->name : '---'); |
|
411 | 411 | row2("state", batch_state_string($batch->state)); |
412 | 412 | //row2("# jobs", $batch->njobs); |
413 | 413 | //row2("# error jobs", $batch->nerror_jobs); |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | "Canonical instance<br><small>click to see result page on BOINC server</smallp>", |
455 | 455 | "Download Results" |
456 | 456 | ); |
457 | - foreach($wus as $wu) { |
|
457 | + foreach ($wus as $wu) { |
|
458 | 458 | $resultid = $wu->canonical_resultid; |
459 | 459 | if ($resultid) { |
460 | 460 | $x = "<a href=result.php?resultid=$resultid>$resultid</a>"; |
@@ -465,7 +465,7 @@ discard block |
||
465 | 465 | $text = "---"; |
466 | 466 | if ($batch->state == BATCH_STATE_COMPLETE) { |
467 | 467 | $y = '<font color="red">failed</font>'; |
468 | - } else { |
|
468 | + } else { |
|
469 | 469 | $y = "in progress"; |
470 | 470 | } |
471 | 471 | } |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | $results = BoincResult::enum("workunitid=$wuid"); |
531 | 531 | $upload_dir = parse_config(get_config(), "<upload_dir>"); |
532 | 532 | $fanout = parse_config(get_config(), "<uldl_dir_fanout>"); |
533 | - foreach($results as $result) { |
|
533 | + foreach ($results as $result) { |
|
534 | 534 | echo "<tr> |
535 | 535 | <td><a href=result.php?resultid=$result->id>$result->id · $result->name </a></td> |
536 | 536 | <td>".state_string($result)."</td> |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | if ($result->server_state == 5) { |
541 | 541 | $phys_names = get_outfile_names($result); |
542 | 542 | $log_names = get_outfile_log_names($result); |
543 | - for ($i=0; $i<count($phys_names); $i++) { |
|
543 | + for ($i = 0; $i < count($phys_names); $i++) { |
|
544 | 544 | $url = sprintf( |
545 | 545 | 'get_output2.php?cmd=result&result_id=%d&file_num=%d', |
546 | 546 | $result->id, $i |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | $wus = BoincWorkunit::enum("batch = $batch->id"); |
405 | 405 | $batch = get_batch_params($batch, $wus); |
406 | 406 | |
407 | - page_head("Batch $batch_id"); |
|
407 | + page_head("batch $batch_id"); |
|
408 | 408 | start_table(); |
409 | 409 | row2("name", $batch->name); |
410 | 410 | row2("application", $app?$app->name:'---'); |
@@ -489,7 +489,7 @@ discard block |
||
489 | 489 | $wu = BoincWorkunit::lookup_id($wuid); |
490 | 490 | if (!$wu) error_page("no such job"); |
491 | 491 | |
492 | - page_head("Job $wuid"); |
|
492 | + page_head("job $wuid"); |
|
493 | 493 | |
494 | 494 | echo " |
495 | 495 | <a href=workunit.php?wuid=$wuid>Workunit details</a> · |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $parent_post_id = 0; |
51 | 51 | } |
52 | 52 | |
53 | -if ($filter != "false"){ |
|
53 | +if ($filter != "false") { |
|
54 | 54 | $filter = true; |
55 | 55 | } else { |
56 | 56 | $filter = false; |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | } |
66 | 66 | |
67 | 67 | $warning = null; |
68 | -if ($content && (!$preview)){ |
|
69 | - if (post_str('add_signature',true)=="add_it"){ |
|
68 | +if ($content && (!$preview)) { |
|
69 | + if (post_str('add_signature',true)=="add_it") { |
|
70 | 70 | $add_signature=true; // set a flag and concatenate later |
71 | - } else { |
|
71 | + } else { |
|
72 | 72 | $add_signature=false; |
73 | 73 | } |
74 | 74 | check_tokens($logged_in_user->authenticator); |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | $parent_post_id = 0; |
54 | 54 | } |
55 | 55 | |
56 | -if ($filter != "false"){ |
|
56 | +if ($filter != "false") { |
|
57 | 57 | $filter = true; |
58 | 58 | } else { |
59 | 59 | $filter = false; |
@@ -68,11 +68,11 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | $warning = null; |
71 | -if ($content && (!$preview)){ |
|
72 | - if (post_str('add_signature',true)=="add_it"){ |
|
73 | - $add_signature=true; // set a flag and concatenate later |
|
74 | - } else { |
|
75 | - $add_signature=false; |
|
71 | +if ($content && (!$preview)) { |
|
72 | + if (post_str('add_signature', true) == "add_it") { |
|
73 | + $add_signature = true; // set a flag and concatenate later |
|
74 | + } else { |
|
75 | + $add_signature = false; |
|
76 | 76 | } |
77 | 77 | check_tokens($logged_in_user->authenticator); |
78 | 78 | if (!akismet_check($logged_in_user, $content)) { |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | } |
92 | 92 | } |
93 | 93 | |
94 | -page_head(tra("Post to thread"),'','','', $bbcode_js); |
|
94 | +page_head(tra("Post to thread"), '', '', '', $bbcode_js); |
|
95 | 95 | |
96 | 96 | show_forum_header($logged_in_user); |
97 | 97 | |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | $x1 = tra("Message:").bbcode_info().post_warning(); |
146 | 146 | $x2 = ""; |
147 | 147 | if ($parent_post) { |
148 | - $x2 .=" ".tra("reply to %1 Message ID %2:", "<a href=#".$parent_post->id.">", " ".$parent_post->id."</a>"); |
|
148 | + $x2 .= " ".tra("reply to %1 Message ID %2:", "<a href=#".$parent_post->id.">", " ".$parent_post->id."</a>"); |
|
149 | 149 | } |
150 | 150 | $x2 .= "<form action=forum_reply.php?thread=".$thread->id; |
151 | 151 | |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $x2 .= " method=\"post\" name=\"post\" onsubmit=\"return checkForm(this)\">\n"; |
157 | 157 | $x2 .= form_tokens($logged_in_user->authenticator); |
158 | 158 | $x2 .= start_table_str().$bbcode_html.end_table_str()."<textarea class=\"form-control\" name=\"content\" rows=\"18\">"; |
159 | - $no_quote = get_int("no_quote", true)==1; |
|
159 | + $no_quote = get_int("no_quote", true) == 1; |
|
160 | 160 | if ($preview) { |
161 | 161 | $x2 .= htmlspecialchars($content); |
162 | 162 | } else if (!$no_quote) { |
@@ -165,9 +165,9 @@ discard block |
||
165 | 165 | } |
166 | 166 | } |
167 | 167 | if (!$logged_in_user->prefs->no_signature_by_default) { |
168 | - $enable_signature='checked="true"'; |
|
168 | + $enable_signature = 'checked="true"'; |
|
169 | 169 | } else { |
170 | - $enable_signature=""; |
|
170 | + $enable_signature = ""; |
|
171 | 171 | } |
172 | 172 | $x2 .= sprintf('</textarea><p> </p> |
173 | 173 | <input class="btn btn-sm" %s type="submit" name="preview" value="%s"> |
@@ -191,11 +191,11 @@ discard block |
||
191 | 191 | return sprintf( |
192 | 192 | 'In reply to %s\'s message of %s: |
193 | 193 | [quote]%s[/quote]', |
194 | - $user?$user->name:'unknown user', |
|
194 | + $user ? $user->name : 'unknown user', |
|
195 | 195 | date_str($post->timestamp), |
196 | 196 | htmlspecialchars($post->content) |
197 | 197 | ); |
198 | 198 | } |
199 | 199 | |
200 | -$cvs_version_tracker[]="\$Id$"; |
|
200 | +$cvs_version_tracker[] = "\$Id$"; |
|
201 | 201 | ?> |
@@ -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); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | function validate_batch($jobs, $template) { |
143 | 143 | $i = 0; |
144 | 144 | $n = count($template->file_info); |
145 | - foreach($jobs as $job) { |
|
145 | + foreach ($jobs as $job) { |
|
146 | 146 | $m = count($job->input_files); |
147 | 147 | if ($n != $m) { |
148 | 148 | log_write("wrong # of input files for job $i: need $n, got $m"); |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | // stage all the files |
212 | 212 | // |
213 | 213 | function stage_files(&$jobs, $user) { |
214 | - foreach($jobs as $job) { |
|
214 | + foreach ($jobs as $job) { |
|
215 | 215 | foreach ($job->input_files as $file) { |
216 | 216 | if ($file->mode != "remote") { |
217 | 217 | $file->name = stage_file($file, $user); |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | // |
225 | 225 | function submit_jobs( |
226 | 226 | $jobs, $job_params, $app, $batch_id, $priority, $app_version_num, |
227 | - $input_template_filename, // batch-level; can also specify per job |
|
227 | + $input_template_filename, // batch-level; can also specify per job |
|
228 | 228 | $output_template_filename, |
229 | 229 | $user |
230 | 230 | ) { |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | // one line per job |
235 | 235 | // |
236 | 236 | $x = ""; |
237 | - foreach($jobs as $job) { |
|
237 | + foreach ($jobs as $job) { |
|
238 | 238 | if ($job->name) { |
239 | 239 | $x .= " --wu_name $job->name"; |
240 | 240 | } |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | $x .= "\n"; |
270 | 270 | } |
271 | 271 | |
272 | - $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id"; |
|
272 | + $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id"; |
|
273 | 273 | |
274 | 274 | if ($user->seti_id) { |
275 | 275 | $cmd .= " --target_user $user->id "; |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | // |
378 | 378 | function xml_get_jobs($r) { |
379 | 379 | $jobs = array(); |
380 | - foreach($r->batch->job as $j) { |
|
380 | + foreach ($r->batch->job as $j) { |
|
381 | 381 | $job = new StdClass; |
382 | 382 | $job->input_files = array(); |
383 | 383 | $job->command_line = (string)$j->command_line; |
@@ -428,16 +428,16 @@ discard block |
||
428 | 428 | // |
429 | 429 | function logical_end_time($r, $jobs, $user, $app) { |
430 | 430 | $total_flops = 0; |
431 | - foreach($jobs as $job) { |
|
431 | + foreach ($jobs as $job) { |
|
432 | 432 | //print_r($job); |
433 | 433 | if ($job->rsc_fpops_est) { |
434 | 434 | $total_flops += $job->rsc_fpops_est; |
435 | 435 | } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) { |
436 | - $total_flops += (double) $job->input_template->workunit->rsc_fpops_est; |
|
436 | + $total_flops += (double)$job->input_template->workunit->rsc_fpops_est; |
|
437 | 437 | } else if ($r->batch->job_params->rsc_fpops_est) { |
438 | - $total_flops += (double) $r->batch->job_params->rsc_fpops_est; |
|
438 | + $total_flops += (double)$r->batch->job_params->rsc_fpops_est; |
|
439 | 439 | } else { |
440 | - $x = (double) $template->workunit->rsc_fpops_est; |
|
440 | + $x = (double)$template->workunit->rsc_fpops_est; |
|
441 | 441 | if ($x) { |
442 | 442 | $total_flops += $x; |
443 | 443 | } else { |
@@ -445,7 +445,7 @@ discard block |
||
445 | 445 | } |
446 | 446 | } |
447 | 447 | } |
448 | - $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name"; |
|
448 | + $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name"; |
|
449 | 449 | $x = exec($cmd); |
450 | 450 | if (!is_numeric($x) || (double)$x == 0) { |
451 | 451 | xml_error(-1, "$cmd returned $x"); |
@@ -530,15 +530,15 @@ discard block |
||
530 | 530 | } |
531 | 531 | |
532 | 532 | $job_params = new StdClass; |
533 | - $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound; |
|
534 | - $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est; |
|
535 | - $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound; |
|
536 | - $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound; |
|
537 | - $job_params->delay_bound = (double) $r->batch->job_params->delay_bound; |
|
533 | + $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound; |
|
534 | + $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est; |
|
535 | + $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound; |
|
536 | + $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound; |
|
537 | + $job_params->delay_bound = (double)$r->batch->job_params->delay_bound; |
|
538 | 538 | // could add quorum-related stuff |
539 | 539 | |
540 | - $input_template_filename = (string) $r->batch->input_template_filename; |
|
541 | - $output_template_filename = (string) $r->batch->output_template_filename; |
|
540 | + $input_template_filename = (string)$r->batch->input_template_filename; |
|
541 | + $output_template_filename = (string)$r->batch->output_template_filename; |
|
542 | 542 | // possibly empty |
543 | 543 | |
544 | 544 | submit_jobs( |
@@ -631,7 +631,7 @@ discard block |
||
631 | 631 | } |
632 | 632 | |
633 | 633 | function n_outfiles($wu) { |
634 | - $path = project_dir() . "/$wu->output_template_filename"; |
|
634 | + $path = project_dir()."/$wu->output_template_filename"; |
|
635 | 635 | $r = simplexml_load_file($path); |
636 | 636 | return count($r->file_info); |
637 | 637 | } |
@@ -838,7 +838,7 @@ discard block |
||
838 | 838 | "; |
839 | 839 | if ($result->server_state == 5) { // over? |
840 | 840 | $paths = get_outfile_paths($result); |
841 | - foreach($paths as $path) { |
|
841 | + foreach ($paths as $path) { |
|
842 | 842 | if (is_file($path)) { |
843 | 843 | $size = filesize($path); |
844 | 844 | echo " <outfile> |
@@ -882,7 +882,7 @@ discard block |
||
882 | 882 | } else { |
883 | 883 | $results = BoincResult::enum("workunitid=$job_id"); |
884 | 884 | foreach ($results as $r) { |
885 | - switch($r->outcome) { |
|
885 | + switch ($r->outcome) { |
|
886 | 886 | case 1: |
887 | 887 | case 3: |
888 | 888 | case 6: |
@@ -997,8 +997,8 @@ discard block |
||
997 | 997 | } |
998 | 998 | |
999 | 999 | list($user, $user_submit) = check_remote_submit_permissions($r, $app); |
1000 | - $in = file_get_contents(project_dir() . "/templates/".$app->name."_in"); |
|
1001 | - $out = file_get_contents(project_dir() . "/templates/".$app->name."_out"); |
|
1000 | + $in = file_get_contents(project_dir()."/templates/".$app->name."_in"); |
|
1001 | + $out = file_get_contents(project_dir()."/templates/".$app->name."_out"); |
|
1002 | 1002 | if ($in === false || $out === false) { |
1003 | 1003 | log_write("template file missing"); |
1004 | 1004 | xml_error(-1, "template file missing"); |
@@ -1010,7 +1010,7 @@ discard block |
||
1010 | 1010 | |
1011 | 1011 | function ping($r) { |
1012 | 1012 | xml_start_tag("ping"); |
1013 | - BoincDb::get(); // errors out if DB down or web disabled |
|
1013 | + BoincDb::get(); // errors out if DB down or web disabled |
|
1014 | 1014 | echo "<success>1</success> |
1015 | 1015 | </ping> |
1016 | 1016 | "; |
@@ -1077,9 +1077,9 @@ discard block |
||
1077 | 1077 | $request_log = parse_config(get_config(), "<remote_submit_request_log>"); |
1078 | 1078 | if ($request_log) { |
1079 | 1079 | $log_dir = parse_config(get_config(), "<log_dir>"); |
1080 | - $request_log = $log_dir . "/" . $request_log; |
|
1080 | + $request_log = $log_dir."/".$request_log; |
|
1081 | 1081 | if ($file = fopen($request_log, "a")) { |
1082 | - fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $_POST['request'] . "\n</submit_rpc_handler>\n"); |
|
1082 | + fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$_POST['request']."\n</submit_rpc_handler>\n"); |
|
1083 | 1083 | fclose($file); |
1084 | 1084 | } |
1085 | 1085 | } |
@@ -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 | ?> |