@@ -22,21 +22,21 @@ discard block |
||
22 | 22 | function time_diff_str($t1, $t2) { |
23 | 23 | if (!$t1 || !$t2) return "---"; |
24 | 24 | $diff = $t2 - $t1; |
25 | - if ($diff<0){ |
|
26 | - $pre="In "; |
|
27 | - $post=""; |
|
28 | - $diff=-$diff; |
|
25 | + if ($diff < 0) { |
|
26 | + $pre = "In "; |
|
27 | + $post = ""; |
|
28 | + $diff = -$diff; |
|
29 | 29 | } else { |
30 | 30 | if ($diff > 86400*30) { |
31 | 31 | return date_str($t1); |
32 | 32 | } |
33 | - $pre=""; |
|
34 | - $post=" ago"; |
|
33 | + $pre = ""; |
|
34 | + $post = " ago"; |
|
35 | 35 | } |
36 | 36 | $x = ""; |
37 | 37 | |
38 | 38 | if ($diff >= 3600*24) { |
39 | - $n = (int) ($diff/(3600*24)); |
|
39 | + $n = (int)($diff/(3600*24)); |
|
40 | 40 | if ($n == 1) { |
41 | 41 | $x .= "1 day "; |
42 | 42 | } else { |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | return $pre.$x.$post; |
46 | 46 | //$diff -= $n*3600*24; |
47 | 47 | } elseif ($diff >= 3600) { |
48 | - $n = (int) ($diff/3600); |
|
48 | + $n = (int)($diff/3600); |
|
49 | 49 | if ($n == 1) { |
50 | 50 | $x .= "1 hour "; |
51 | 51 | } else { |
@@ -54,16 +54,16 @@ discard block |
||
54 | 54 | return $pre.$x.$post; |
55 | 55 | //$diff -= $n*3600; |
56 | 56 | } elseif ($diff >= 60) { |
57 | - $n = (int) ($diff/60); |
|
57 | + $n = (int)($diff/60); |
|
58 | 58 | if ($n == 1) { |
59 | 59 | $x .= "1 minute "; |
60 | 60 | } else { |
61 | 61 | $x .= $n." minutes "; |
62 | 62 | } |
63 | 63 | return $pre.$x.$post; |
64 | - } elseif($diff > 1 || $diff==0) { |
|
64 | + } elseif ($diff > 1 || $diff == 0) { |
|
65 | 65 | return $pre."$diff seconds".$post; |
66 | - } elseif($diff == 1){ |
|
66 | + } elseif ($diff == 1) { |
|
67 | 67 | return $pre."$diff seconds".$post; |
68 | 68 | } |
69 | 69 | } |
@@ -40,7 +40,7 @@ |
||
40 | 40 | |
41 | 41 | function bossa_batch_create($appid, $name, $calibration) { |
42 | 42 | $now = time(); |
43 | - $c = $calibration?"1":"0"; |
|
43 | + $c = $calibration ? "1" : "0"; |
|
44 | 44 | return BossaBatch::insert("(create_time, app_id, name, calibration) values ($now, $appid, '$name', $c)"); |
45 | 45 | } |
46 | 46 |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | "Zimbabwe" |
258 | 258 | ); |
259 | 259 | |
260 | -$country_to_iso3166_2 = array ( |
|
260 | +$country_to_iso3166_2 = array( |
|
261 | 261 | "Afghanistan" => "af", |
262 | 262 | "Albania" => "al", |
263 | 263 | "Algeria" => "dz", |
@@ -493,25 +493,25 @@ discard block |
||
493 | 493 | |
494 | 494 | // return a list of country options for a <select> |
495 | 495 | // |
496 | -function country_select_options($selected_country="None") { |
|
496 | +function country_select_options($selected_country = "None") { |
|
497 | 497 | global $countries; |
498 | 498 | |
499 | 499 | require_once("../inc/geoip.inc"); |
500 | 500 | |
501 | 501 | // See if we can find the user's country and select it as default: |
502 | 502 | // |
503 | - $gi = geoip_open("../inc/GeoIP.dat",GEOIP_STANDARD); |
|
504 | - $geoip_country = geoip_country_name_by_addr($gi,$_SERVER["REMOTE_ADDR"]); |
|
503 | + $gi = geoip_open("../inc/GeoIP.dat", GEOIP_STANDARD); |
|
504 | + $geoip_country = geoip_country_name_by_addr($gi, $_SERVER["REMOTE_ADDR"]); |
|
505 | 505 | geoip_close($gi); |
506 | 506 | |
507 | - if ($selected_country=="") $selected_country="None"; |
|
508 | - if ($selected_country=="None" and $geoip_country!=""){ |
|
509 | - $selected_country=$geoip_country; |
|
507 | + if ($selected_country == "") $selected_country = "None"; |
|
508 | + if ($selected_country == "None" and $geoip_country != "") { |
|
509 | + $selected_country = $geoip_country; |
|
510 | 510 | } |
511 | 511 | |
512 | 512 | $x = ""; |
513 | 513 | foreach ($countries as $country) { |
514 | - $selected = ($selected_country == $country ? "selected":""); |
|
514 | + $selected = ($selected_country == $country ? "selected" : ""); |
|
515 | 515 | $x .= "<option value=\"$country\" $selected>$country</option>\n"; |
516 | 516 | } |
517 | 517 | return $x; |
@@ -43,10 +43,10 @@ |
||
43 | 43 | credit_to_ops($credit, $ops, $unit); |
44 | 44 | |
45 | 45 | if ($bolden) { |
46 | - $lbold="[["; |
|
47 | - $rbold="]]"; |
|
46 | + $lbold = "[["; |
|
47 | + $rbold = "]]"; |
|
48 | 48 | } else { |
49 | - $lbold=""; $rbold=""; |
|
49 | + $lbold = ""; $rbold = ""; |
|
50 | 50 | } |
51 | 51 | return " $lbold$cobbs Cobblestones$rbold of computation ($ops $unit floating-point operations)"; |
52 | 52 | } |
@@ -9,7 +9,7 @@ |
||
9 | 9 | * classes. |
10 | 10 | */ |
11 | 11 | |
12 | -spl_autoload_register(function ($class) { |
|
12 | +spl_autoload_register(function($class) { |
|
13 | 13 | if (substr($class, 0, 10) !== 'ReCaptcha\\') { |
14 | 14 | /* If the class does not lie under the "ReCaptcha" namespace, |
15 | 15 | * then we can exit immediately. |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | |
20 | 20 | require_once('../inc/sanitize_html.inc'); |
21 | 21 | |
22 | -function image_as_bb($text){ |
|
22 | +function image_as_bb($text) { |
|
23 | 23 | // This function depends on sanitized HTML |
24 | 24 | |
25 | 25 | $pattern = '@<img(.*) src=\"([^>^"]+)\"([^>]*)>@si'; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | return $text; |
34 | 34 | } |
35 | 35 | |
36 | -function link_as_bb($text){ |
|
36 | +function link_as_bb($text) { |
|
37 | 37 | /* This function depends on sanitized HTML */ |
38 | 38 | // Build some regex (should be a *lot* faster) |
39 | 39 | $pattern = '@<a href=\"([^>]+)\">@si'; // Gives us the URL in $1... |
@@ -49,35 +49,35 @@ discard block |
||
49 | 49 | return $text; |
50 | 50 | } |
51 | 51 | |
52 | -function formatting_as_bb($text){ |
|
52 | +function formatting_as_bb($text) { |
|
53 | 53 | /* This function depends on sanitized HTML */ |
54 | - $in[]="<b>";$out[]="[b]"; |
|
55 | - $in[]="</b>";$out[]="[/b]"; |
|
54 | + $in[] = "<b>"; $out[] = "[b]"; |
|
55 | + $in[] = "</b>"; $out[] = "[/b]"; |
|
56 | 56 | |
57 | - $in[]="<i>";$out[]="[i]"; |
|
58 | - $in[]="</i>";$out[]="[/i]"; |
|
57 | + $in[] = "<i>"; $out[] = "[i]"; |
|
58 | + $in[] = "</i>"; $out[] = "[/i]"; |
|
59 | 59 | |
60 | - $in[]="<u>";$out[]="[u]"; |
|
61 | - $in[]="</u>";$out[]="[/u]"; |
|
60 | + $in[] = "<u>"; $out[] = "[u]"; |
|
61 | + $in[] = "</u>"; $out[] = "[/u]"; |
|
62 | 62 | |
63 | - $in[]="<b>";$out[]="[b]"; |
|
64 | - $in[]="</b>";$out[]="[/b]"; |
|
63 | + $in[] = "<b>"; $out[] = "[b]"; |
|
64 | + $in[] = "</b>"; $out[] = "[/b]"; |
|
65 | 65 | |
66 | - $in[]="<ul>";$out[]="[list]"; |
|
67 | - $in[]="</ul>";$out[]="[/list]"; |
|
66 | + $in[] = "<ul>"; $out[] = "[list]"; |
|
67 | + $in[] = "</ul>"; $out[] = "[/list]"; |
|
68 | 68 | |
69 | - $in[]="<ol>";$out[]="[list=1]"; |
|
70 | - $in[]="</ol>";$out[]="[/list]"; |
|
69 | + $in[] = "<ol>"; $out[] = "[list=1]"; |
|
70 | + $in[] = "</ol>"; $out[] = "[/list]"; |
|
71 | 71 | |
72 | - $in[]="<pre>";$out[]="[pre]"; |
|
73 | - $in[]="</pre>";$out[]="[/pre]"; |
|
72 | + $in[] = "<pre>"; $out[] = "[pre]"; |
|
73 | + $in[] = "</pre>"; $out[] = "[/pre]"; |
|
74 | 74 | |
75 | - $in[]="</br>";$out[]="\n"; |
|
76 | - $in[]="<br/>";$out[]="\n"; |
|
77 | - $in[]="<br>";$out[]="\n"; |
|
78 | - $in[]=">";$out[]=">"; |
|
79 | - $in[]="<";$out[]="<"; |
|
80 | - $in[]="&";$out[]="&"; |
|
75 | + $in[] = "</br>"; $out[] = "\n"; |
|
76 | + $in[] = "<br/>"; $out[] = "\n"; |
|
77 | + $in[] = "<br>"; $out[] = "\n"; |
|
78 | + $in[] = ">"; $out[] = ">"; |
|
79 | + $in[] = "<"; $out[] = "<"; |
|
80 | + $in[] = "&"; $out[] = "&"; |
|
81 | 81 | |
82 | 82 | return str_replace($in, $out, $text); |
83 | 83 | } |
@@ -21,11 +21,11 @@ discard block |
||
21 | 21 | // The following is a global var accessed by exercise functions. |
22 | 22 | // |
23 | 23 | $bolt_ex = null; |
24 | -$bolt_ex->mode = 0; // input: SHOW/SCORE/ANSWER |
|
25 | -$bolt_ex->index = 0; // input: sequence of this exercise in file |
|
26 | -$bolt_ex->score = 0; // input/output: cumulative score (if mode = SCORE) |
|
27 | -$bolt_ex->weight = 0; // input/output: cumulative weight |
|
28 | -$bolt_ex->query_string = ""; // user's response (if SCORE or ANSWER) |
|
24 | +$bolt_ex->mode = 0; // input: SHOW/SCORE/ANSWER |
|
25 | +$bolt_ex->index = 0; // input: sequence of this exercise in file |
|
26 | +$bolt_ex->score = 0; // input/output: cumulative score (if mode = SCORE) |
|
27 | +$bolt_ex->weight = 0; // input/output: cumulative weight |
|
28 | +$bolt_ex->query_string = ""; // user's response (if SCORE or ANSWER) |
|
29 | 29 | |
30 | 30 | function weight($w) { |
31 | 31 | return array('weight', $w); |
@@ -170,9 +170,9 @@ discard block |
||
170 | 170 | $response = isset($$key); |
171 | 171 | $r = $choice[1]; |
172 | 172 | $correct = ($r && $response) || (!$r && !$response); |
173 | - $color = $correct?"#88ff88":"#ff8888"; |
|
174 | - table_row($c, $r?"yes":"no", |
|
175 | - array($response?"yes":"no", "bgcolor=$color") |
|
173 | + $color = $correct ? "#88ff88" : "#ff8888"; |
|
174 | + table_row($c, $r ? "yes" : "no", |
|
175 | + array($response ? "yes" : "no", "bgcolor=$color") |
|
176 | 176 | ); |
177 | 177 | $i++; |
178 | 178 | } |
@@ -215,11 +215,11 @@ discard block |
||
215 | 215 | if ($y > $rect[3]) $right = false; |
216 | 216 | $cx = $rect[0]; |
217 | 217 | $cy = $rect[2]; |
218 | - $sizex = $rect[1]-$rect[0]; |
|
219 | - $sizey = $rect[3]-$rect[2]; |
|
220 | - $ax = $x-4; |
|
221 | - $ay = $y-4; |
|
222 | - $color = $right?"green":"red"; |
|
218 | + $sizex = $rect[1] - $rect[0]; |
|
219 | + $sizey = $rect[3] - $rect[2]; |
|
220 | + $ax = $x - 4; |
|
221 | + $ay = $y - 4; |
|
222 | + $color = $right ? "green" : "red"; |
|
223 | 223 | if ($right) { |
224 | 224 | echo "The point you selected (shown in green) is correct."; |
225 | 225 | } else { |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | } |
257 | 257 | |
258 | 258 | class BoltFitbAnswer { |
259 | - public $type; // 0=constant, 1=regexp, 2=func |
|
259 | + public $type; // 0=constant, 1=regexp, 2=func |
|
260 | 260 | public $ans; |
261 | 261 | function __construct($type, $ans) { |
262 | 262 | $this->type = $type; |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | if (!$user->has_profile) return null; |
72 | 72 | $profile = BoincProfile::lookup("userid=$user->id"); |
73 | 73 | if (!$profile->has_picture) return null; |
74 | - if (profile_screening() && $profile->verification!=1) return null; |
|
74 | + if (profile_screening() && $profile->verification != 1) return null; |
|
75 | 75 | return profile_thumb_url($user->id); |
76 | 76 | } |
77 | 77 | |
@@ -125,18 +125,18 @@ discard block |
||
125 | 125 | return $image; |
126 | 126 | } |
127 | 127 | |
128 | - ($origWidth > $origHeight)? $scalar = ($origWidth / $targetWidth) : $scalar = ($origHeight / $targetHeight); |
|
128 | + ($origWidth > $origHeight) ? $scalar = ($origWidth/$targetWidth) : $scalar = ($origHeight/$targetHeight); |
|
129 | 129 | |
130 | 130 | if ($scalar != 0) { |
131 | - $destWidth = $origWidth / $scalar; |
|
132 | - $destHeight = $origHeight / $scalar; |
|
131 | + $destWidth = $origWidth/$scalar; |
|
132 | + $destHeight = $origHeight/$scalar; |
|
133 | 133 | } else { |
134 | 134 | $destWidth = $origWidth; |
135 | 135 | $destHeight = $origHeight; |
136 | 136 | } |
137 | 137 | |
138 | 138 | $gd_info = gd_info(); |
139 | - $newGD = (strstr($gd_info["GD Version"], "2.0")!=""); |
|
139 | + $newGD = (strstr($gd_info["GD Version"], "2.0") != ""); |
|
140 | 140 | if ($newGD) { |
141 | 141 | // If you are using a modern PHP/GD installation that does |
142 | 142 | // 'truecolor' images, this is what's needed. |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $options->htmlitems = false; |
180 | 180 | $temp = output_transform($profile->response1, $options); |
181 | 181 | $temp = sanitize_tags($temp); |
182 | - $description = "(\"" . sub_sentence($temp, ' ', MAX_DESC_LENGTH, true) . "\")"; |
|
182 | + $description = "(\"".sub_sentence($temp, ' ', MAX_DESC_LENGTH, true)."\")"; |
|
183 | 183 | |
184 | 184 | } |
185 | 185 | |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | |
190 | 190 | function check_whether_to_show_profile($user, $logged_in_user) { |
191 | 191 | $min_credit = parse_config(get_config(), "<profile_min_credit>"); |
192 | - if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit ) { |
|
192 | + if (!$logged_in_user && $min_credit && $user->expavg_credit < $min_credit) { |
|
193 | 193 | error_page( |
194 | 194 | tra("To prevent spam, profiles of users with an average credit of less than %1 are displayed only to logged-in users. We apologize for this inconvenience.", $min_credit) |
195 | 195 | ); |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | // |
228 | 228 | $show_picture = $profile->has_picture; |
229 | 229 | if (profile_screening()) { |
230 | - if (!$screen_mode && !$can_edit && $profile->verification!=1) { |
|
230 | + if (!$screen_mode && !$can_edit && $profile->verification != 1) { |
|
231 | 231 | $show_picture = false; |
232 | 232 | } |
233 | 233 | } |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | // yet verified. This will tell them if other users can't view it yet, or |
244 | 244 | // if there is a problem with it and they need to replace it. |
245 | 245 | // |
246 | - if (profile_screening() && $profile->has_picture && $can_edit && $profile->verification!=1) { |
|
246 | + if (profile_screening() && $profile->has_picture && $can_edit && $profile->verification != 1) { |
|
247 | 247 | row1(offensive_profile_warning($profile->verification)); |
248 | 248 | } |
249 | 249 | |
@@ -276,6 +276,6 @@ discard block |
||
276 | 276 | } |
277 | 277 | } |
278 | 278 | |
279 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit |
|
279 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit |
|
280 | 280 | |
281 | 281 | ?> |
@@ -46,8 +46,8 @@ |
||
46 | 46 | define('BOLT_COURSE_FINISHED', 3); |
47 | 47 | |
48 | 48 | // bits in bolt_user.flags |
49 | -define('BOLT_FLAGS_DEBUG', 1); // print debugging info in output pages |
|
50 | -define('BOLT_FLAGS_SHOW_ALL', 2); // show hidden courses |
|
49 | +define('BOLT_FLAGS_DEBUG', 1); // print debugging info in output pages |
|
50 | +define('BOLT_FLAGS_SHOW_ALL', 2); // show hidden courses |
|
51 | 51 | |
52 | 52 | class BoltDb extends DbConn { |
53 | 53 | static $instance; |