@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $globals->userid = 0; |
83 | 83 | $globals->count = -1; |
84 | 84 | |
85 | -for ($i=1; $i<$argc; $i++) { |
|
85 | +for ($i = 1; $i < $argc; $i++) { |
|
86 | 86 | if ($argv[$i] == "--failed") { |
87 | 87 | $globals->do_failed = true; |
88 | 88 | } elseif ($argv[$i] == "--lapsed") { |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | number_format($user->total_credit, 0), |
190 | 190 | opt_out_url($user), |
191 | 191 | $user->id, |
192 | - floor ((time() - last_rpc_time($user)) / 86400), |
|
192 | + floor((time() - last_rpc_time($user))/86400), |
|
193 | 193 | ); |
194 | 194 | return preg_replace($pat, $rep, $template); |
195 | 195 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | $result = _mysql_query($query); |
241 | 241 | $t = 0; |
242 | 242 | while ($r = _mysql_fetch_object($result)) { |
243 | - if ($r->email_type !=2 && $r->email_type != 3) continue; |
|
243 | + if ($r->email_type != 2 && $r->email_type != 3) continue; |
|
244 | 244 | if ($r->time_sent > $t) $t = $r->time_sent; |
245 | 245 | |
246 | 246 | } |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | if ($globals->explain) { |
269 | 269 | $x = (time() - $user->create_time)/86400; |
270 | 270 | $t = last_rpc_time($user); |
271 | - $show_lapsed_interval = (time()-$t)/86400; |
|
271 | + $show_lapsed_interval = (time() - $t)/86400; |
|
272 | 272 | echo "user $user->id ($user->email_addr) was created $x days ago\n"; |
273 | 273 | echo " total_credit: $user->total_credit; last RPC $show_lapsed_interval days ago\n"; |
274 | 274 | echo " sending $do_type email\n"; |
@@ -229,7 +229,7 @@ |
||
229 | 229 | _mysql_query($query); |
230 | 230 | } |
231 | 231 | $globals->count--; |
232 | - if ($globals->count == 0) { |
|
232 | + if ($globals->count == 0) { |
|
233 | 233 | echo "reached limit set by --count - exiting...\n"; |
234 | 234 | exit(); |
235 | 235 | } |
@@ -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) { |
@@ -161,5 +161,5 @@ discard block |
||
161 | 161 | |
162 | 162 | admin_page_tail(); |
163 | 163 | |
164 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
164 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
165 | 165 | ?> |
@@ -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); |
@@ -186,11 +186,11 @@ discard block |
||
186 | 186 | |
187 | 187 | function site_list($sites) { |
188 | 188 | echo "<ul>\n"; |
189 | - for ($i=0; $i<count($sites); $i++) { |
|
189 | + for ($i = 0; $i < count($sites); $i++) { |
|
190 | 190 | $s = $sites[$i]; |
191 | 191 | $url = $s[0]; |
192 | 192 | $name = $s[1]; |
193 | - $comment = array_key_exists(2, $s)?$s[2]:""; |
|
193 | + $comment = array_key_exists(2, $s) ? $s[2] : ""; |
|
194 | 194 | echo "<li><a href=\"$url\">$name</a> $comment\n"; |
195 | 195 | } |
196 | 196 | echo "</ul>\n"; |
@@ -199,5 +199,5 @@ discard block |
||
199 | 199 | $GLOBALS['cpid_stats_sites'] = $cpid_stats_sites; |
200 | 200 | $GLOBALS['host_sites'] = $host_sites; |
201 | 201 | |
202 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
202 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
203 | 203 | ?> |
@@ -29,13 +29,13 @@ |
||
29 | 29 | |
30 | 30 | // |
31 | 31 | class BoltIter { |
32 | - public $top; // topmost unit |
|
32 | + public $top; // topmost unit |
|
33 | 33 | public $state; |
34 | - public $xset; // exercise set, if any |
|
34 | + public $xset; // exercise set, if any |
|
35 | 35 | |
36 | 36 | // the following are temps |
37 | - public $item; // current item |
|
38 | - public $frac_done; // fraction done |
|
37 | + public $item; // current item |
|
38 | + public $frac_done; // fraction done |
|
39 | 39 | |
40 | 40 | function __construct($top) { |
41 | 41 | $this->top = $top; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | db_init(); |
27 | 27 | |
28 | 28 | function current_tally($voteid) { |
29 | - $query="select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid; |
|
29 | + $query = "select sum(yes) as ayes,count(id)-sum(yes) as nays from banishment_votes where voteid=".$voteid; |
|
30 | 30 | $result = _mysql_query($query); |
31 | 31 | $foobar = _mysql_fetch_object($result); |
32 | 32 | echo "<b>Current Tally</b> Ayes: ".$foobar->ayes." Nays: ".$foobar->nays."<p>"; |
@@ -35,8 +35,8 @@ discard block |
||
35 | 35 | |
36 | 36 | function vote_is_in_progress($userid) { |
37 | 37 | // check whether a vote is already ongoing |
38 | - $now=time(); |
|
39 | - $query="select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now; |
|
38 | + $now = time(); |
|
39 | + $query = "select count(id) as count from banishment_vote where userid=".$userid." and end_time>".$now; |
|
40 | 40 | $result = _mysql_query($query); |
41 | 41 | if (!$result) { |
42 | 42 | echo "Database error attempting to read banishment_vote table 1.<p>"; |
@@ -51,56 +51,56 @@ discard block |
||
51 | 51 | return $foobar->count; |
52 | 52 | } |
53 | 53 | |
54 | -function start_vote($config,$logged_in_user,$user,$category,$reason) { |
|
55 | - $now=time(); |
|
56 | - $fin=$now+21600; |
|
54 | +function start_vote($config, $logged_in_user, $user, $category, $reason) { |
|
55 | + $now = time(); |
|
56 | + $fin = $now + 21600; |
|
57 | 57 | |
58 | 58 | |
59 | - if ( vote_is_in_progress($user->id) !=0 ) { |
|
59 | + if (vote_is_in_progress($user->id) != 0) { |
|
60 | 60 | echo "A banishment vote is already underway for this user.<p>"; |
61 | 61 | return 0; |
62 | 62 | } |
63 | - $query="insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")"; |
|
63 | + $query = "insert into banishment_vote (userid,modid,start_time,end_time) values (".$user->id.",".$logged_in_user->id.",".$now.",".$fin.")"; |
|
64 | 64 | $result = _mysql_query($query); |
65 | 65 | if (!$result) { |
66 | 66 | echo "Database error attempting to insert to banishment_vote table.<p>"; |
67 | 67 | return 0; |
68 | 68 | } |
69 | 69 | |
70 | - $voteid=_mysql_insert_id(); |
|
71 | - $query="insert into banishment_votes (voteid,modid,time,yes) values (". $voteid .",". $logged_in_user->id .",". $now .",1)"; |
|
70 | + $voteid = _mysql_insert_id(); |
|
71 | + $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",1)"; |
|
72 | 72 | $result = _mysql_query($query); |
73 | 73 | if (!$result) { |
74 | 74 | echo "Database error attempting to insert to banishment_votes table.<p>"; |
75 | 75 | return 0; |
76 | 76 | } |
77 | 77 | |
78 | - $query="update forum_preferences set banished_until=".$fin." where userid=".$user->id; |
|
78 | + $query = "update forum_preferences set banished_until=".$fin." where userid=".$user->id; |
|
79 | 79 | $result = _mysql_query($query); |
80 | 80 | |
81 | 81 | echo "Banishment vote started.<p><p>"; |
82 | 82 | current_tally($voteid); |
83 | - return send_banish_vote_email($user, 86400*14, $reason, $now+21600); |
|
83 | + return send_banish_vote_email($user, 86400*14, $reason, $now + 21600); |
|
84 | 84 | } |
85 | 85 | |
86 | -function vote_yes($config,$logged_in_user,$user) { |
|
87 | - $now=time(); |
|
86 | +function vote_yes($config, $logged_in_user, $user) { |
|
87 | + $now = time(); |
|
88 | 88 | // Check that a vote is underway. |
89 | - if (vote_is_in_progress($user->id)<1) { |
|
89 | + if (vote_is_in_progress($user->id) < 1) { |
|
90 | 90 | echo "No banishment vote is underway for this user.<p><p>"; |
91 | 91 | return 0; |
92 | 92 | } |
93 | 93 | // Find the voteid |
94 | - $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now; |
|
94 | + $query = "select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now; |
|
95 | 95 | $result = _mysql_query($query); |
96 | 96 | $foobar = _mysql_fetch_object($result); |
97 | 97 | if (!$foobar) { |
98 | 98 | echo "Database error attempting to read banishment_vote table.<p>"; |
99 | 99 | return 0; |
100 | 100 | } |
101 | - $voteid=$foobar->voteid; |
|
101 | + $voteid = $foobar->voteid; |
|
102 | 102 | // Check whether mod has voted already. |
103 | - $query="select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id; |
|
103 | + $query = "select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id; |
|
104 | 104 | $result = _mysql_query($query); |
105 | 105 | $foobar = _mysql_fetch_object($result); |
106 | 106 | if (!$foobar) { |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | return 0; |
114 | 114 | } |
115 | 115 | // insert the vote |
116 | - $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",1)"; |
|
116 | + $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",1)"; |
|
117 | 117 | $result = _mysql_query($query); |
118 | 118 | if (!$result) { |
119 | 119 | echo "Database error attempting to insert to banishment_votes table.<p>"; |
@@ -124,24 +124,24 @@ discard block |
||
124 | 124 | return 1; |
125 | 125 | } |
126 | 126 | |
127 | -function vote_no($config,$logged_in_user,$user) { |
|
127 | +function vote_no($config, $logged_in_user, $user) { |
|
128 | 128 | // Check that a vote is underway. |
129 | - $now=time(); |
|
130 | - if (vote_is_in_progress($user->id)<1) { |
|
129 | + $now = time(); |
|
130 | + if (vote_is_in_progress($user->id) < 1) { |
|
131 | 131 | echo "No banishment vote is underway for this user.<p>"; |
132 | 132 | return 0; |
133 | 133 | } |
134 | 134 | // Find the voteid |
135 | - $query="select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now; |
|
135 | + $query = "select id as voteid from banishment_vote where userid=".$user->id." and end_time>".$now; |
|
136 | 136 | $result = _mysql_query($query); |
137 | 137 | $foobar = _mysql_fetch_object($result); |
138 | 138 | if (!$foobar) { |
139 | 139 | echo "Database error attempting to read banishment_vote table.<p>"; |
140 | 140 | return 0; |
141 | 141 | } |
142 | - $voteid=$foobar->voteid; |
|
142 | + $voteid = $foobar->voteid; |
|
143 | 143 | // Check whether mod has voted already. |
144 | - $query="select count(id) as count from banishment_votes where voteid=".$voteid ." and modid=".$logged_in_user->id; |
|
144 | + $query = "select count(id) as count from banishment_votes where voteid=".$voteid." and modid=".$logged_in_user->id; |
|
145 | 145 | $result = _mysql_query($query); |
146 | 146 | $foobar = _mysql_fetch_object($result); |
147 | 147 | if (!$foobar) { |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | return 0; |
155 | 155 | } |
156 | 156 | // insert the vote |
157 | - $query="insert into banishment_votes (voteid,modid,time,yes) values (" . $voteid .",". $logged_in_user->id .",". $now .",0)"; |
|
157 | + $query = "insert into banishment_votes (voteid,modid,time,yes) values (".$voteid.",".$logged_in_user->id.",".$now.",0)"; |
|
158 | 158 | $result = _mysql_query($query); |
159 | 159 | if (!$result) { |
160 | 160 | echo "Database error attempting to insert to banishment_votes table.<p>"; |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | public $title; |
31 | 31 | // Optional; used when showing course history outline. |
32 | 32 | public $is_item; |
33 | - public $attrs; // course-defined |
|
33 | + public $attrs; // course-defined |
|
34 | 34 | |
35 | 35 | abstract function walk(&$iter, $incr, &$frac_done); |
36 | 36 | // multi-purpose function for traversing a course. |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $this->query_string = null; |
56 | 56 | } else { |
57 | 57 | $this->filename = substr($filename, 0, $p); |
58 | - $this->query_string = substr($filename, $p+1); |
|
58 | + $this->query_string = substr($filename, $p + 1); |
|
59 | 59 | } |
60 | 60 | $this->name = $filename; |
61 | 61 | $this->title = $title; |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | // look up unit by name |
163 | 163 | // |
164 | 164 | $child = null; |
165 | - for ($i=0; $i<$n; $i++) { |
|
165 | + for ($i = 0; $i < $n; $i++) { |
|
166 | 166 | $c = $this->units[$i]; |
167 | 167 | if ($c->name == $child_name) { |
168 | 168 | $child = $c; |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | if ($i >= $n) { |
178 | 178 | // and if index is too big, use last unit |
179 | 179 | // |
180 | - $i = $n-1; |
|
180 | + $i = $n - 1; |
|
181 | 181 | } |
182 | 182 | $child = $this->units[$i]; |
183 | 183 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | $this->finished($iter); |
198 | 198 | return true; |
199 | 199 | } else { |
200 | - $i = ($i+1)%$n; |
|
200 | + $i = ($i + 1)%$n; |
|
201 | 201 | } |
202 | 202 | } |
203 | 203 | } |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | if (array_key_exists($this->name, $state)) { |
236 | 236 | $state_rec = $state[$this->name]; |
237 | 237 | $child_name = $state_rec['child_name']; |
238 | - foreach($this->units as $c) { |
|
238 | + foreach ($this->units as $c) { |
|
239 | 239 | if ($c->name == $child_name) { |
240 | 240 | return $c; |
241 | 241 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | |
33 | 33 | function boinc_recaptcha_get_html($publickey) { |
34 | 34 | if ($publickey) { |
35 | - return '<div class="g-recaptcha" data-sitekey="' . $publickey . '"></div>'; |
|
35 | + return '<div class="g-recaptcha" data-sitekey="'.$publickey.'"></div>'; |
|
36 | 36 | } else { |
37 | 37 | return ''; |
38 | 38 | } |
@@ -164,7 +164,7 @@ |
||
164 | 164 | $user->prefs = $prefs; |
165 | 165 | } |
166 | 166 | function privilege($specialbit) { |
167 | - return (substr($this->special_user, $specialbit,1)==1); |
|
167 | + return (substr($this->special_user, $specialbit,1)==1); |
|
168 | 168 | } |
169 | 169 | function update($clause) { |
170 | 170 | $db = BoincDb::get(); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $db = BoincDb::get(); |
28 | 28 | return $db->lookup('category', 'BoincCategory', $clause); |
29 | 29 | } |
30 | - static function enum($clause=null) { |
|
30 | + static function enum($clause = null) { |
|
31 | 31 | $db = BoincDb::get(); |
32 | 32 | return $db->enum('category', 'BoincCategory', $clause); |
33 | 33 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $db = BoincDb::get(); |
79 | 79 | return $db->update($this, 'thread', $clause); |
80 | 80 | } |
81 | - static function enum($clause="") { |
|
81 | + static function enum($clause = "") { |
|
82 | 82 | $db = BoincDb::get(); |
83 | 83 | return $db->enum('thread', 'BoincThread', $clause); |
84 | 84 | } |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | $db = BoincDb::get(); |
143 | 143 | $ret = $db->insert('forum_preferences', $clause); |
144 | 144 | } |
145 | - static function lookup(&$user, $nocache=false) { |
|
145 | + static function lookup(&$user, $nocache = false) { |
|
146 | 146 | if (!$user) return; |
147 | 147 | if (isset($user->prefs)) return; |
148 | 148 | if (!$nocache && isset(self::$cache[$user->id])) { |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | $user->prefs = $prefs; |
165 | 165 | } |
166 | 166 | function privilege($specialbit) { |
167 | - return (substr($this->special_user, $specialbit,1)==1); |
|
167 | + return (substr($this->special_user, $specialbit, 1) == 1); |
|
168 | 168 | } |
169 | 169 | function update($clause) { |
170 | 170 | $db = BoincDb::get(); |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | $db = BoincDb::get(); |
176 | 176 | return $db->delete_aux('forum_preferences', "userid=$this->userid"); |
177 | 177 | } |
178 | - static function enum($clause=null) { |
|
178 | + static function enum($clause = null) { |
|
179 | 179 | $db = BoincDb::get(); |
180 | 180 | return $db->enum('forum_preferences', 'BoincForumPrefs', $clause); |
181 | 181 | } |
@@ -215,8 +215,8 @@ discard block |
||
215 | 215 | // |
216 | 216 | $fl = BoincForumLogging::lookup(0, 0); |
217 | 217 | if ($fl) { |
218 | - if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME){ |
|
219 | - BoincForumLogging::delete_aux("timestamp<'".(time()-MAX_FORUM_LOGGING_TIME)."' and userid != 0"); |
|
218 | + if ($fl->timestamp < time() - MAX_FORUM_LOGGING_TIME) { |
|
219 | + BoincForumLogging::delete_aux("timestamp<'".(time() - MAX_FORUM_LOGGING_TIME)."' and userid != 0"); |
|
220 | 220 | BoincForumLogging::replace(0, 0, time()); |
221 | 221 | } |
222 | 222 | } else { |
@@ -322,9 +322,9 @@ discard block |
||
322 | 322 | } |
323 | 323 | } |
324 | 324 | |
325 | -define ('NOTIFY_FRIEND_REQ', 1); |
|
326 | -define ('NOTIFY_FRIEND_ACCEPT', 2); |
|
327 | -define ('NOTIFY_PM', 3); |
|
328 | -define ('NOTIFY_SUBSCRIBED_POST', 4); |
|
325 | +define('NOTIFY_FRIEND_REQ', 1); |
|
326 | +define('NOTIFY_FRIEND_ACCEPT', 2); |
|
327 | +define('NOTIFY_PM', 3); |
|
328 | +define('NOTIFY_SUBSCRIBED_POST', 4); |
|
329 | 329 | |
330 | 330 | ?> |
@@ -215,7 +215,7 @@ |
||
215 | 215 | // |
216 | 216 | $fl = BoincForumLogging::lookup(0, 0); |
217 | 217 | if ($fl) { |
218 | - if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME){ |
|
218 | + if ($fl->timestamp<time()-MAX_FORUM_LOGGING_TIME) { |
|
219 | 219 | BoincForumLogging::delete_aux("timestamp<'".(time()-MAX_FORUM_LOGGING_TIME)."' and userid != 0"); |
220 | 220 | BoincForumLogging::replace(0, 0, time()); |
221 | 221 | } |
@@ -24,13 +24,13 @@ |
||
24 | 24 | function update_average($now, $work_start_time, $work, &$avg, &$avg_time) { |
25 | 25 | if ($avg_time) { |
26 | 26 | $diff = $now - $avg_time; |
27 | - if ($diff <0) $diff = 0; |
|
27 | + if ($diff < 0) $diff = 0; |
|
28 | 28 | $diff_days = $diff/86400; |
29 | 29 | $weight = exp(-$diff*M_LN2/CREDIT_HALF_LIFE); |
30 | 30 | $avg *= $weight; |
31 | 31 | |
32 | - if ((1.0-$weight)>0.000001) { |
|
33 | - $avg += (1.0-$weight)*($work/$diff_days); |
|
32 | + if ((1.0 - $weight) > 0.000001) { |
|
33 | + $avg += (1.0 - $weight)*($work/$diff_days); |
|
34 | 34 | } |
35 | 35 | else { |
36 | 36 | $avg += M_LN2*$work*86400/CREDIT_HALF_LIFE; |
@@ -31,8 +31,7 @@ |
||
31 | 31 | |
32 | 32 | if ((1.0-$weight)>0.000001) { |
33 | 33 | $avg += (1.0-$weight)*($work/$diff_days); |
34 | - } |
|
35 | - else { |
|
34 | + } else { |
|
36 | 35 | $avg += M_LN2*$work*86400/CREDIT_HALF_LIFE; |
37 | 36 | } |
38 | 37 | } else if ($work) { |