@@ -7,15 +7,15 @@ |
||
7 | 7 | */ |
8 | 8 | |
9 | 9 | class views_handler_argument_boincteam_id extends views_handler_argument_numeric { |
10 | - function construct() { |
|
10 | + function construct() { |
|
11 | 11 | parent::construct(); |
12 | - } |
|
12 | + } |
|
13 | 13 | |
14 | - function set_argument($arg) { |
|
14 | + function set_argument($arg) { |
|
15 | 15 | // When setting the ID argument, convert to BOINC ID |
16 | 16 | $id = is_numeric($arg) ? $arg : 0; |
17 | 17 | $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = %d", $id)); |
18 | 18 | $this->argument = $boinc_id; |
19 | 19 | return $this->validate_arg($boinc_id); |
20 | - } |
|
20 | + } |
|
21 | 21 | } |
@@ -7,15 +7,15 @@ |
||
7 | 7 | */ |
8 | 8 | |
9 | 9 | class views_handler_argument_boincuser_id extends views_handler_argument_numeric { |
10 | - function construct() { |
|
10 | + function construct() { |
|
11 | 11 | parent::construct(); |
12 | - } |
|
12 | + } |
|
13 | 13 | |
14 | - function set_argument($arg) { |
|
14 | + function set_argument($arg) { |
|
15 | 15 | // When setting the ID argument, convert to BOINC ID |
16 | 16 | $id = is_numeric($arg) ? $arg : 0; |
17 | 17 | $boinc_id = db_result(db_query("SELECT boinc_id FROM {boincuser} WHERE uid = %d", $id)); |
18 | 18 | $this->argument = $boinc_id; |
19 | 19 | return $this->validate_arg($boinc_id); |
20 | - } |
|
20 | + } |
|
21 | 21 | } |
@@ -7,15 +7,15 @@ |
||
7 | 7 | */ |
8 | 8 | |
9 | 9 | class views_handler_argument_boincteam_id extends views_handler_argument_numeric { |
10 | - function construct() { |
|
10 | + function construct() { |
|
11 | 11 | parent::construct(); |
12 | - } |
|
12 | + } |
|
13 | 13 | |
14 | - function set_argument($arg) { |
|
14 | + function set_argument($arg) { |
|
15 | 15 | // When setting the ID argument, convert to BOINC ID |
16 | 16 | $id = is_numeric($arg) ? $arg : 0; |
17 | 17 | $boinc_id = db_result(db_query("SELECT team_id FROM {boincteam} WHERE nid = %d", $id)); |
18 | 18 | $this->argument = $boinc_id; |
19 | 19 | return $this->validate_arg($boinc_id); |
20 | - } |
|
20 | + } |
|
21 | 21 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | $bitset = ''; |
27 | 27 | |
28 | 28 | for ($i=0;$i<S_NFLAGS;$i++) { |
29 | - if (post_int("role".$i, TRUE) == '1') { |
|
29 | + if (post_int("role".$i, true) == '1') { |
|
30 | 30 | $bitset = str_pad($bitset, $i+1, '1'); |
31 | 31 | } else { |
32 | 32 | $bitset = str_pad($bitset, $i+1, '0'); |
@@ -25,11 +25,11 @@ |
||
25 | 25 | |
26 | 26 | $bitset = ''; |
27 | 27 | |
28 | -for ($i=0;$i<S_NFLAGS;$i++) { |
|
28 | +for ($i = 0; $i < S_NFLAGS; $i++) { |
|
29 | 29 | if (post_int("role".$i, TRUE) == '1') { |
30 | - $bitset = str_pad($bitset, $i+1, '1'); |
|
30 | + $bitset = str_pad($bitset, $i + 1, '1'); |
|
31 | 31 | } else { |
32 | - $bitset = str_pad($bitset, $i+1, '0'); |
|
32 | + $bitset = str_pad($bitset, $i + 1, '0'); |
|
33 | 33 | } |
34 | 34 | } |
35 | 35 | if ($bitset == "0000000") $bitset = ''; |
@@ -141,7 +141,7 @@ |
||
141 | 141 | global $special_user_bitfield; |
142 | 142 | $Nbf = sizeof($special_user_bitfield); |
143 | 143 | |
144 | - admin_page_head("Management $user->name"); |
|
144 | + admin_page_head("management $user->name"); |
|
145 | 145 | |
146 | 146 | if (!defined("POST_REPORT_EMAILS")) { |
147 | 147 | echo "<p><font color='RED'> |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | |
40 | 40 | // Delete a user if they have no credit, results, or posts |
41 | 41 | // |
42 | -function possibly_delete_user($user){ |
|
43 | - if ($user->total_credit > 0.0){ |
|
42 | +function possibly_delete_user($user) { |
|
43 | + if ($user->total_credit > 0.0) { |
|
44 | 44 | admin_error_page("Cannot delete user: User has credit."); |
45 | 45 | } |
46 | 46 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | admin_error_page("Cannot delete user: User has forum posts."); |
57 | 57 | } |
58 | 58 | |
59 | - if ($user->teamid){ |
|
59 | + if ($user->teamid) { |
|
60 | 60 | user_quit_team($user); |
61 | 61 | } |
62 | 62 | delete_user($user); |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | |
101 | 101 | // put a timestamp in wiki to trigger re-validation of credentials |
102 | 102 | |
103 | - if (function_exists('touch_wiki_user')){ |
|
103 | + if (function_exists('touch_wiki_user')) { |
|
104 | 104 | touch_wiki_user($user); |
105 | 105 | } |
106 | 106 |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | |
40 | 40 | // Delete a user if they have no credit, results, or posts |
41 | 41 | // |
42 | -function possibly_delete_user($user){ |
|
43 | - if ($user->total_credit > 0.0){ |
|
42 | +function possibly_delete_user($user) { |
|
43 | + if ($user->total_credit > 0.0) { |
|
44 | 44 | admin_error_page("Cannot delete user: User has credit."); |
45 | 45 | } |
46 | 46 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | admin_error_page("Cannot delete user: User has forum posts."); |
57 | 57 | } |
58 | 58 | |
59 | - if ($user->teamid){ |
|
59 | + if ($user->teamid) { |
|
60 | 60 | user_quit_team($user); |
61 | 61 | } |
62 | 62 | delete_user($user); |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | function handle_special_user($user) { |
68 | 68 | global $special_user_bitfield; |
69 | 69 | $Nbf = sizeof($special_user_bitfield); |
70 | - $bits=""; |
|
71 | - for ($i=0; $i<$Nbf; $i++) { |
|
70 | + $bits = ""; |
|
71 | + for ($i = 0; $i < $Nbf; $i++) { |
|
72 | 72 | $key = "special_user_$i"; |
73 | 73 | if (array_key_exists($key, $_POST) && $_POST[$key]) { |
74 | 74 | $bits .= "1"; |
@@ -94,35 +94,35 @@ discard block |
||
94 | 94 | ); |
95 | 95 | } else { |
96 | 96 | if (is_numeric($dt)) { |
97 | - $t = $dt>0 ? time()+$dt : 0; |
|
97 | + $t = $dt > 0 ? time() + $dt : 0; |
|
98 | 98 | $q = "UPDATE forum_preferences SET banished_until=$t WHERE userid=$user->id"; |
99 | 99 | _mysql_query($q); |
100 | 100 | |
101 | 101 | // put a timestamp in wiki to trigger re-validation of credentials |
102 | 102 | |
103 | - if (function_exists('touch_wiki_user')){ |
|
103 | + if (function_exists('touch_wiki_user')) { |
|
104 | 104 | touch_wiki_user($user); |
105 | 105 | } |
106 | 106 | |
107 | 107 | // Send suspension e-mail to user and administrators |
108 | 108 | |
109 | - if ($dt>0) { |
|
110 | - $subject = PROJECT." posting privileges suspended for ". $user->name; |
|
109 | + if ($dt > 0) { |
|
110 | + $subject = PROJECT." posting privileges suspended for ".$user->name; |
|
111 | 111 | $body = " |
112 | -Forum posting privileges for the " .PROJECT. " user \"".$user->name."\" |
|
113 | -have been suspended for " .time_diff($dt). " by ".$g_logged_in_user->name.". |
|
112 | +Forum posting privileges for the " .PROJECT." user \"".$user->name."\" |
|
113 | +have been suspended for " .time_diff($dt)." by ".$g_logged_in_user->name.". |
|
114 | 114 | The reason given was: |
115 | 115 | |
116 | 116 | $reason |
117 | 117 | |
118 | -The suspension will end at " .time_str($t)."\n"; |
|
118 | +The suspension will end at ".time_str($t)."\n"; |
|
119 | 119 | } else { |
120 | - $subject = PROJECT." user ". $user->name. " unsuspended"; |
|
120 | + $subject = PROJECT." user ".$user->name." unsuspended"; |
|
121 | 121 | $body = " |
122 | -Forum posting privileges for the " .PROJECT. " user \"".$user->name."\" |
|
122 | +Forum posting privileges for the " .PROJECT." user \"".$user->name."\" |
|
123 | 123 | have been restored by ".$g_logged_in_user->name."\n"; |
124 | 124 | if ($reason) { |
125 | - $body.="The reason given was:\n\n $reason\n"; |
|
125 | + $body .= "The reason given was:\n\n $reason\n"; |
|
126 | 126 | } |
127 | 127 | } |
128 | 128 | |
@@ -186,13 +186,13 @@ discard block |
||
186 | 186 | row1("Special User Status"); |
187 | 187 | |
188 | 188 | echo "<tr>\n"; |
189 | - for ($i=0; $i<$Nbf; $i++) { |
|
189 | + for ($i = 0; $i < $Nbf; $i++) { |
|
190 | 190 | $bit = substr($user->prefs->special_user, $i, 1); |
191 | 191 | echo "<tr><td><input type='checkbox'' name='special_user_".$i."' value='1'"; |
192 | 192 | if ($bit == 1) { |
193 | 193 | echo " checked='checked'"; |
194 | 194 | } |
195 | - echo ">". $special_user_bitfield[$i] ."</td></tr>\n"; |
|
195 | + echo ">".$special_user_bitfield[$i]."</td></tr>\n"; |
|
196 | 196 | } |
197 | 197 | echo "</tr>"; |
198 | 198 | |
@@ -217,10 +217,10 @@ discard block |
||
217 | 217 | if ($user->prefs->banished_until) { |
218 | 218 | $dt = $user->prefs->banished_until - time(); |
219 | 219 | if ($dt > 0) { |
220 | - $x = " Suspended until " . time_str($user->prefs->banished_until) |
|
221 | - ."<br/> (Expires in " . time_diff($dt) .")" ; |
|
220 | + $x = " Suspended until ".time_str($user->prefs->banished_until) |
|
221 | + ."<br/> (Expires in ".time_diff($dt).")"; |
|
222 | 222 | } else { |
223 | - $x = " last suspended " . time_str($user->prefs->banished_until); |
|
223 | + $x = " last suspended ".time_str($user->prefs->banished_until); |
|
224 | 224 | } |
225 | 225 | row1($x); |
226 | 226 | } else { |
@@ -238,11 +238,11 @@ discard block |
||
238 | 238 | "; |
239 | 239 | echo " |
240 | 240 | <input type='radio' name='suspend_for' value='172800'> 48 hours <br/> |
241 | - <input type='radio' name='suspend_for' value='",86400*7,"'> 1 week <br/> |
|
242 | - <input type='radio' name='suspend_for' value='",86400*14,"'> 2 weeks <br/> |
|
241 | + <input type='radio' name='suspend_for' value='",86400*7, "'> 1 week <br/> |
|
242 | + <input type='radio' name='suspend_for' value='",86400*14, "'> 2 weeks <br/> |
|
243 | 243 | "; |
244 | 244 | |
245 | - if ($dt>0) { |
|
245 | + if ($dt > 0) { |
|
246 | 246 | echo " |
247 | 247 | <input type='radio' name='suspend_for' value='-1'> <b>unsuspend</b> <br/>"; |
248 | 248 | } |
@@ -49,7 +49,7 @@ |
||
49 | 49 | $n = post_str("fraction_done_exact", true)?1:0; |
50 | 50 | $app->update("fraction_done_exact=$n"); |
51 | 51 | |
52 | - echo "Application $id updated. |
|
52 | + echo "application $id updated. |
|
53 | 53 | <p> |
54 | 54 | You must restart the project for this to take effect. |
55 | 55 | "; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $app = BoincApp::lookup_id($id); |
26 | 26 | if (!$app) admin_error_page("no such app"); |
27 | 27 | |
28 | - $n = post_str("deprecated", true)?1:0; |
|
28 | + $n = post_str("deprecated", true) ? 1 : 0; |
|
29 | 29 | $app->update("deprecated=$n"); |
30 | 30 | |
31 | 31 | $n = post_num("weight"); |
@@ -37,16 +37,16 @@ discard block |
||
37 | 37 | $n = post_int("target_nresults"); |
38 | 38 | $app->update("target_nresults=$n"); |
39 | 39 | |
40 | - $n = post_str("homogeneous_app_version", true)?1:0; |
|
40 | + $n = post_str("homogeneous_app_version", true) ? 1 : 0; |
|
41 | 41 | $app->update("homogeneous_app_version=$n"); |
42 | 42 | |
43 | - $n = post_str("non_cpu_intensive", true)?1:0; |
|
43 | + $n = post_str("non_cpu_intensive", true) ? 1 : 0; |
|
44 | 44 | $app->update("non_cpu_intensive=$n"); |
45 | 45 | |
46 | - $n = post_str("beta", true)?1:0; |
|
46 | + $n = post_str("beta", true) ? 1 : 0; |
|
47 | 47 | $app->update("beta=$n"); |
48 | 48 | |
49 | - $n = post_str("fraction_done_exact", true)?1:0; |
|
49 | + $n = post_str("fraction_done_exact", true) ? 1 : 0; |
|
50 | 50 | $app->update("fraction_done_exact=$n"); |
51 | 51 | |
52 | 52 | echo "Application $id updated. |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | function add_app() { |
59 | 59 | $name = BoincDb::escape_string(post_str('add_name')); |
60 | 60 | $user_friendly_name = BoincDb::escape_string(post_str('add_user_friendly_name')); |
61 | - if (empty($name) || empty($user_friendly_name) ) { |
|
61 | + if (empty($name) || empty($user_friendly_name)) { |
|
62 | 62 | admin_error_page( |
63 | 63 | "To add a new application please supply both a brief name and a longer 'user-friendly' name.</font></p>" |
64 | 64 | ); |
@@ -81,11 +81,11 @@ discard block |
||
81 | 81 | <h2>Edit applications</h2> |
82 | 82 | "; |
83 | 83 | |
84 | - $app_clause="deprecated=0"; |
|
85 | - $action_url="manage_apps.php"; |
|
86 | - if($all) { |
|
84 | + $app_clause = "deprecated=0"; |
|
85 | + $action_url = "manage_apps.php"; |
|
86 | + if ($all) { |
|
87 | 87 | $app_clause = ""; |
88 | - $action_url="manage_apps.php?all=1"; |
|
88 | + $action_url = "manage_apps.php?all=1"; |
|
89 | 89 | echo "<a href=\"manage_apps.php\">Don't show deprecated applications</a>"; |
90 | 90 | } else { |
91 | 91 | echo "<a href=\"manage_apps.php?all=1\">Show deprecated applications</a>"; |
@@ -117,8 +117,8 @@ discard block |
||
117 | 117 | $apps = BoincApp::enum($app_clause); |
118 | 118 | foreach ($apps as $app) { |
119 | 119 | // grey-out deprecated versions |
120 | - $f1=$f2=''; |
|
121 | - if ($app->deprecated==1) { |
|
120 | + $f1 = $f2 = ''; |
|
121 | + if ($app->deprecated == 1) { |
|
122 | 122 | $f1 = "<font color='GREY'>"; |
123 | 123 | $f2 = "</font>"; |
124 | 124 | } |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | |
129 | 129 | echo " <TD align='left'>$f1<a href=app_details.php?appid=$app->id>$app->name</a><br> $app->user_friendly_name $f2</TD>\n"; |
130 | 130 | |
131 | - echo " <TD align='center'>$f1 " .date_str($app->create_time)."$f2</TD>\n"; |
|
131 | + echo " <TD align='center'>$f1 ".date_str($app->create_time)."$f2</TD>\n"; |
|
132 | 132 | |
133 | 133 | $v = $app->weight; |
134 | 134 | echo " <TD align='center'> |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | "; |
152 | 152 | |
153 | 153 | $v = ''; |
154 | - if ($app->homogeneous_app_version) $v=' CHECKED '; |
|
154 | + if ($app->homogeneous_app_version) $v = ' CHECKED '; |
|
155 | 155 | echo " <TD align='center'> |
156 | 156 | <input name='homogeneous_app_version' type='checkbox' $v></TD> |
157 | 157 | "; |
@@ -100,7 +100,8 @@ |
||
100 | 100 | echo "</p>\n"; |
101 | 101 | echo "</form>\n"; |
102 | 102 | |
103 | -} else { // if ($qclause) |
|
103 | +} else { |
|
104 | +// if ($qclause) |
|
104 | 105 | |
105 | 106 | $query = "SELECT id, name FROM workunit WHERE canonical_resultid = 0 AND error_mask = 0 AND $qclause;"; |
106 | 107 | $db = BoincDb::get(true); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | admin_page_head("Cancel Jobs"); |
30 | 30 | |
31 | 31 | $limit = get_int('limit', true); |
32 | -if (!$limit || $limit==0) { |
|
32 | +if (!$limit || $limit == 0) { |
|
33 | 33 | $limit = 100; |
34 | 34 | } |
35 | 35 | |
@@ -42,9 +42,9 @@ discard block |
||
42 | 42 | $clause = get_str('clause', true); |
43 | 43 | |
44 | 44 | if ($minid && $maxid) { |
45 | - $qclause = "id >=" . $minid . " AND id <=" . $maxid; |
|
45 | + $qclause = "id >=".$minid." AND id <=".$maxid; |
|
46 | 46 | } else if ($list) { |
47 | - $qclause = "id IN (" . $list . ")"; |
|
47 | + $qclause = "id IN (".$list.")"; |
|
48 | 48 | } else if ($uclause) { |
49 | 49 | $qclause = urldecode($uclause); |
50 | 50 | } else if ($clause) { |
@@ -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 |
@@ -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; |