@@ -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) { |
@@ -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,7 +49,7 @@ 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 | 54 | $in[]="<b>";$out[]="[b]"; |
55 | 55 | $in[]="</b>";$out[]="[/b]"; |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | // check cache size every once in a while, purge if too big |
109 | 109 | // |
110 | -function cache_check_diskspace(){ |
|
110 | +function cache_check_diskspace() { |
|
111 | 111 | if ((rand() % CACHE_SIZE_CHECK_FREQ)) return; |
112 | 112 | if (disk_usage("../cache") < MAX_CACHE_USAGE) return; |
113 | 113 | $x = max(TEAM_PAGE_TTL, USER_PAGE_TTL, USER_HOST_TTL, |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | clean_cache($x, "../cache"); |
117 | 117 | } |
118 | 118 | |
119 | -function cache_need_to_regenerate($path, $max_age){ |
|
119 | +function cache_need_to_regenerate($path, $max_age) { |
|
120 | 120 | $regenerate = false; |
121 | 121 | $request = apache_request_headers(); |
122 | 122 | |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | } |
140 | 140 | |
141 | 141 | // Returns cached data or false if nothing was found |
142 | -function get_cached_data($max_age, $params=""){ |
|
142 | +function get_cached_data($max_age, $params="") { |
|
143 | 143 | global $no_cache; |
144 | 144 | |
145 | 145 | if ($no_cache) return; |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | // DEPRECATED |
168 | -function start_cache($max_age, $params=""){ |
|
168 | +function start_cache($max_age, $params="") { |
|
169 | 169 | global $no_cache, $caching, $memcache; |
170 | 170 | |
171 | 171 | if ($no_cache) return; |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | $regenerate = cache_need_to_regenerate($path, $max_age); |
189 | 189 | } |
190 | 190 | //Is the stored version too old, do we need to regenerate it? |
191 | - if ($regenerate){ |
|
191 | + if ($regenerate) { |
|
192 | 192 | // If cached version is too old (or non-existent) |
193 | 193 | // generate the page and write to cache |
194 | 194 | // |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | |
229 | 229 | // write output buffer both to client and to cache |
230 | 230 | // DEPRECATED |
231 | -function end_cache($max_age,$params=""){ |
|
231 | +function end_cache($max_age,$params="") { |
|
232 | 232 | global $no_cache; |
233 | 233 | if ($no_cache) return; |
234 | 234 | |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | } |
254 | 254 | } |
255 | 255 | |
256 | -function set_cached_data($max_age, $data, $params=""){ |
|
256 | +function set_cached_data($max_age, $data, $params="") { |
|
257 | 257 | // for the benefit of hackers |
258 | 258 | if (strstr($params, "..")) { |
259 | 259 | return "bad params"; |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | // To override this with your own policy, create a similar function in |
162 | 162 | // your own project.inc called uotd_candidates_query() |
163 | 163 | // |
164 | -function default_uotd_candidates_query(){ |
|
164 | +function default_uotd_candidates_query() { |
|
165 | 165 | $query = "SELECT * FROM profile,user WHERE profile.userid=user.id "; |
166 | 166 | $query .= " AND verification=1 "; |
167 | 167 | $query .= " AND expavg_credit>1 "; |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | // get a list of profiles that have been 'approved' for UOTD, |
174 | 174 | // using a project-specific query if supplied in project.inc |
175 | 175 | // |
176 | -function count_uotd_candidates(){ |
|
176 | +function count_uotd_candidates() { |
|
177 | 177 | $n = -1; // negative value returned on error |
178 | 178 | if (function_exists('uotd_candidates_query')) { |
179 | 179 | $query = uotd_candidates_query(); |
@@ -196,16 +196,16 @@ discard block |
||
196 | 196 | function generate_uotd_gadget($profile, $user) { |
197 | 197 | $x = "<font size='2'>\n"; |
198 | 198 | $gadget = PROFILE_PATH."uotd_gadget.html"; |
199 | - if( $h = fopen($gadget, "w") ){ |
|
199 | + if( $h = fopen($gadget, "w") ) { |
|
200 | 200 | $age = time()-$profile->uotd_time; |
201 | 201 | echo "age: $age"; |
202 | - if($age <= 86400+3600) { // allow for slop |
|
202 | + if($age <= 86400+3600) { |
|
203 | +// allow for slop |
|
203 | 204 | $x .= uotd_thumbnail($profile, $user); |
204 | 205 | $x .= user_links($user, BADGE_HEIGHT_MEDIUM); |
205 | 206 | $resp = sanitize_tags(output_transform($profile->response1)); |
206 | 207 | $x .= " ". sub_sentence($resp, ' ', 250, true); |
207 | - } |
|
208 | - else { |
|
208 | + } else { |
|
209 | 209 | $x .= "<font color='fuscia'> |
210 | 210 | There is no User of the Day today. |
211 | 211 | Only volunteers who have created a Profile |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $temph = $fh; |
47 | 47 | } |
48 | 48 | |
49 | - if ($newGD){ |
|
49 | + if ($newGD) { |
|
50 | 50 | $tempImage = imageCreateTrueColor($tempw, $temph); |
51 | 51 | // Seems not to work: |
52 | 52 | // imageAntiAlias($tempImage, true); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $offsetx = number_format(($tempw/2)-($fw/2), 0); |
67 | 67 | } |
68 | 68 | |
69 | - if ($newGD){ |
|
69 | + if ($newGD) { |
|
70 | 70 | $destImage = imageCreateTrueColor($fw, $fh); |
71 | 71 | // Seems not to work: |
72 | 72 | // imageAntiAlias($tempImage, true); |
@@ -42,7 +42,8 @@ discard block |
||
42 | 42 | |
43 | 43 | $response = akismet_request($request, "$key.rest.akismet.com", "/1.1/comment-check"); |
44 | 44 | |
45 | - if ("true" == $response[1]) { // Akismet says it's spam |
|
45 | + if ("true" == $response[1]) { |
|
46 | +// Akismet says it's spam |
|
46 | 47 | return false; |
47 | 48 | } else { |
48 | 49 | return true; |
@@ -64,8 +65,10 @@ discard block |
||
64 | 65 | $response = ''; |
65 | 66 | if( false !== ( $fs = @fsockopen($host, $port, $errno, $errstr, 3) ) ) { |
66 | 67 | fwrite($fs, $http_request); |
67 | - while ( !feof($fs) ) |
|
68 | - $response .= fgets($fs, 1160); // One TCP-IP packet |
|
68 | + while ( !feof($fs) ) { |
|
69 | + $response .= fgets($fs, 1160); |
|
70 | + } |
|
71 | + // One TCP-IP packet |
|
69 | 72 | fclose($fs); |
70 | 73 | $response = explode("\r\n\r\n", $response, 2); |
71 | 74 | } |
@@ -29,8 +29,7 @@ discard block |
||
29 | 29 | /** |
30 | 30 | * reCAPTCHA client. |
31 | 31 | */ |
32 | -class ReCaptcha |
|
33 | -{ |
|
32 | +class ReCaptcha { |
|
34 | 33 | /** |
35 | 34 | * Version of this client library. |
36 | 35 | * @const string |
@@ -55,8 +54,7 @@ discard block |
||
55 | 54 | * @param string $secret shared secret between site and reCAPTCHA server. |
56 | 55 | * @param RequestMethod $requestMethod method used to send the request. Defaults to POST. |
57 | 56 | */ |
58 | - public function __construct($secret, RequestMethod $requestMethod = null) |
|
59 | - { |
|
57 | + public function __construct($secret, RequestMethod $requestMethod = null) { |
|
60 | 58 | if (empty($secret)) { |
61 | 59 | throw new \RuntimeException('No secret provided'); |
62 | 60 | } |
@@ -82,8 +80,7 @@ discard block |
||
82 | 80 | * @param string $remoteIp The end user's IP address. |
83 | 81 | * @return Response Response from the service. |
84 | 82 | */ |
85 | - public function verify($response, $remoteIp = null) |
|
86 | - { |
|
83 | + public function verify($response, $remoteIp = null) { |
|
87 | 84 | // Discard empty solution submissions |
88 | 85 | if (empty($response)) { |
89 | 86 | $recaptchaResponse = new Response(false, array('missing-input-response')); |
@@ -29,8 +29,7 @@ |
||
29 | 29 | /** |
30 | 30 | * Method used to send the request to the service. |
31 | 31 | */ |
32 | -interface RequestMethod |
|
33 | -{ |
|
32 | +interface RequestMethod { |
|
34 | 33 | |
35 | 34 | /** |
36 | 35 | * Submit the request with the specified parameters. |
@@ -34,8 +34,7 @@ discard block |
||
34 | 34 | * Note: this requires the cURL extension to be enabled in PHP |
35 | 35 | * @see http://php.net/manual/en/book.curl.php |
36 | 36 | */ |
37 | -class CurlPost implements RequestMethod |
|
38 | -{ |
|
37 | +class CurlPost implements RequestMethod { |
|
39 | 38 | /** |
40 | 39 | * URL to which requests are sent via cURL. |
41 | 40 | * @const string |
@@ -48,8 +47,7 @@ discard block |
||
48 | 47 | */ |
49 | 48 | private $curl; |
50 | 49 | |
51 | - public function __construct(Curl $curl = null) |
|
52 | - { |
|
50 | + public function __construct(Curl $curl = null) { |
|
53 | 51 | if (!is_null($curl)) { |
54 | 52 | $this->curl = $curl; |
55 | 53 | } else { |
@@ -63,8 +61,7 @@ discard block |
||
63 | 61 | * @param RequestParameters $params Request parameters |
64 | 62 | * @return string Body of the reCAPTCHA response |
65 | 63 | */ |
66 | - public function submit(RequestParameters $params) |
|
67 | - { |
|
64 | + public function submit(RequestParameters $params) { |
|
68 | 65 | $handle = $this->curl->init(self::SITE_VERIFY_URL); |
69 | 66 | |
70 | 67 | $options = array( |