@@ -88,18 +88,18 @@ |
||
| 88 | 88 | $errno = 0; |
| 89 | 89 | $errstr = ''; |
| 90 | 90 | |
| 91 | - if (false === $this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30)) { |
|
| 91 | + if (false === $this->socket->fsockopen('ssl://'.self::RECAPTCHA_HOST, 443, $errno, $errstr, 30)) { |
|
| 92 | 92 | return self::BAD_REQUEST; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | $content = $params->toQueryString(); |
| 96 | 96 | |
| 97 | - $request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n"; |
|
| 98 | - $request .= "Host: " . self::RECAPTCHA_HOST . "\r\n"; |
|
| 97 | + $request = "POST ".self::SITE_VERIFY_PATH." HTTP/1.1\r\n"; |
|
| 98 | + $request .= "Host: ".self::RECAPTCHA_HOST."\r\n"; |
|
| 99 | 99 | $request .= "Content-Type: application/x-www-form-urlencoded\r\n"; |
| 100 | - $request .= "Content-length: " . strlen($content) . "\r\n"; |
|
| 100 | + $request .= "Content-length: ".strlen($content)."\r\n"; |
|
| 101 | 101 | $request .= "Connection: close\r\n\r\n"; |
| 102 | - $request .= $content . "\r\n\r\n"; |
|
| 102 | + $request .= $content."\r\n\r\n"; |
|
| 103 | 103 | |
| 104 | 104 | $this->socket->fwrite($request); |
| 105 | 105 | $response = ''; |
@@ -34,8 +34,7 @@ discard block |
||
| 34 | 34 | * instead of get_file_contents(). This is to account for people who may be on |
| 35 | 35 | * servers where allow_furl_open is disabled. |
| 36 | 36 | */ |
| 37 | -class SocketPost implements RequestMethod |
|
| 38 | -{ |
|
| 37 | +class SocketPost implements RequestMethod { |
|
| 39 | 38 | /** |
| 40 | 39 | * reCAPTCHA service host. |
| 41 | 40 | * @const string |
@@ -68,8 +67,7 @@ discard block |
||
| 68 | 67 | * |
| 69 | 68 | * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing |
| 70 | 69 | */ |
| 71 | - public function __construct(Socket $socket = null) |
|
| 72 | - { |
|
| 70 | + public function __construct(Socket $socket = null) { |
|
| 73 | 71 | if (!is_null($socket)) { |
| 74 | 72 | $this->socket = $socket; |
| 75 | 73 | } else { |
@@ -83,8 +81,7 @@ discard block |
||
| 83 | 81 | * @param RequestParameters $params Request parameters |
| 84 | 82 | * @return string Body of the reCAPTCHA response |
| 85 | 83 | */ |
| 86 | - public function submit(RequestParameters $params) |
|
| 87 | - { |
|
| 84 | + public function submit(RequestParameters $params) { |
|
| 88 | 85 | $errno = 0; |
| 89 | 86 | $errstr = ''; |
| 90 | 87 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | function send_friend_request_email($src_user, $dest_user, $msg) { |
| 53 | - $message = " |
|
| 53 | + $message = " |
|
| 54 | 54 | $src_user->name has added you as a friend at ".PROJECT.". |
| 55 | 55 | "; |
| 56 | 56 | if (strlen($msg)) { |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | function send_friend_accept_email($dest_user, $src_user, $msg) { |
| 75 | - $message = " |
|
| 75 | + $message = " |
|
| 76 | 76 | $dest_user->name has confirmed you as a friend at ".PROJECT.". |
| 77 | 77 | "; |
| 78 | 78 | if (strlen($msg)) { |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | // Some of this should be merged with translation.inc |
| 21 | 21 | |
| 22 | 22 | function get_lang_list() { |
| 23 | - if (isset($_COOKIE['lang'])){ |
|
| 23 | + if (isset($_COOKIE['lang'])) { |
|
| 24 | 24 | $language_string = $_COOKIE['lang'].","; |
| 25 | 25 | } else { |
| 26 | 26 | $language_string = ''; |
@@ -28,28 +28,28 @@ discard block |
||
| 28 | 28 | if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { |
| 29 | 29 | $language_string .= strtolower($_SERVER["HTTP_ACCEPT_LANGUAGE"]); |
| 30 | 30 | } |
| 31 | - $client_languages = explode(",",$language_string); |
|
| 31 | + $client_languages = explode(",", $language_string); |
|
| 32 | 32 | |
| 33 | 33 | $lang_list = array(); |
| 34 | - for ($i=0; $i<sizeof($client_languages); $i++) { |
|
| 35 | - if ((strlen($client_languages[$i])>2) |
|
| 36 | - && (substr($client_languages[$i],2,1)=="_" || substr($client_languages[$i],2,1)=="-")) |
|
| 34 | + for ($i = 0; $i < sizeof($client_languages); $i++) { |
|
| 35 | + if ((strlen($client_languages[$i]) > 2) |
|
| 36 | + && (substr($client_languages[$i], 2, 1) == "_" || substr($client_languages[$i], 2, 1) == "-")) |
|
| 37 | 37 | { |
| 38 | 38 | // If this is defined as primary-secondary, represent it as xx_YY |
| 39 | 39 | // |
| 40 | 40 | $language = substr( |
| 41 | - $client_languages[$i],0,2)."_".strtoupper(substr($client_languages[$i],3,2) |
|
| 41 | + $client_languages[$i], 0, 2)."_".strtoupper(substr($client_languages[$i], 3, 2) |
|
| 42 | 42 | ); |
| 43 | 43 | $lang_list[] = $language; |
| 44 | 44 | |
| 45 | 45 | // And also check for the primary language |
| 46 | 46 | // |
| 47 | - $language = substr($client_languages[$i],0,2); |
|
| 47 | + $language = substr($client_languages[$i], 0, 2); |
|
| 48 | 48 | $lang_list[] = $language; |
| 49 | 49 | } else { |
| 50 | 50 | // else just use xx |
| 51 | 51 | // |
| 52 | - $language = substr($client_languages[$i],0,2); |
|
| 52 | + $language = substr($client_languages[$i], 0, 2); |
|
| 53 | 53 | $lang_list[] = $language; |
| 54 | 54 | } |
| 55 | 55 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | // Some of this should be merged with translation.inc |
| 21 | 21 | |
| 22 | 22 | function get_lang_list() { |
| 23 | - if (isset($_COOKIE['lang'])){ |
|
| 23 | + if (isset($_COOKIE['lang'])) { |
|
| 24 | 24 | $language_string = $_COOKIE['lang'].","; |
| 25 | 25 | } else { |
| 26 | 26 | $language_string = ''; |
@@ -33,8 +33,7 @@ discard block |
||
| 33 | 33 | $lang_list = array(); |
| 34 | 34 | for ($i=0; $i<sizeof($client_languages); $i++) { |
| 35 | 35 | if ((strlen($client_languages[$i])>2) |
| 36 | - && (substr($client_languages[$i],2,1)=="_" || substr($client_languages[$i],2,1)=="-")) |
|
| 37 | - { |
|
| 36 | + && (substr($client_languages[$i],2,1)=="_" || substr($client_languages[$i],2,1)=="-")) { |
|
| 38 | 37 | // If this is defined as primary-secondary, represent it as xx_YY |
| 39 | 38 | // |
| 40 | 39 | $language = substr( |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | return; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - $news_date=gmdate('D, d M Y H:i:s',$notify->create_time) . ' GMT'; |
|
| 49 | + $news_date = gmdate('D, d M Y H:i:s', $notify->create_time).' GMT'; |
|
| 50 | 50 | echo "<item> |
| 51 | 51 | <title><![CDATA[$title]]></title> |
| 52 | 52 | <guid>".url_base()."_notify_$notify->id</guid> |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | $master_url_enc = urlencode($master_url); |
| 28 | 28 | $response = akismet_request("key=$key&blog=$master_url_enc", "rest.akismet.com", "/1.1/verify-key"); |
| 29 | - if ("valid" == $response[1] ) { |
|
| 29 | + if ("valid" == $response[1]) { |
|
| 30 | 30 | $post = urlencode($post); |
| 31 | 31 | $ip = urlencode($_SERVER['REMOTE_ADDR']); |
| 32 | 32 | $referrer = urlencode($_SERVER['HTTP_REFERER']); |
@@ -56,15 +56,15 @@ discard block |
||
| 56 | 56 | $http_request = "POST $path HTTP/1.0\r\n"; |
| 57 | 57 | $http_request .= "Host: $host\r\n"; |
| 58 | 58 | $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=utf-8\r\n"; |
| 59 | - $http_request .= "Content-Length: " . strlen($request) . "\r\n"; |
|
| 59 | + $http_request .= "Content-Length: ".strlen($request)."\r\n"; |
|
| 60 | 60 | $http_request .= "User-Agent: BOINC | Akismet 1.1\r\n"; |
| 61 | 61 | $http_request .= "\r\n"; |
| 62 | 62 | $http_request .= $request; |
| 63 | 63 | |
| 64 | 64 | $response = ''; |
| 65 | - if( false !== ( $fs = @fsockopen($host, $port, $errno, $errstr, 3) ) ) { |
|
| 65 | + if (false !== ($fs = @fsockopen($host, $port, $errno, $errstr, 3))) { |
|
| 66 | 66 | fwrite($fs, $http_request); |
| 67 | - while ( !feof($fs) ) |
|
| 67 | + while (!feof($fs)) |
|
| 68 | 68 | $response .= fgets($fs, 1160); // One TCP-IP packet |
| 69 | 69 | fclose($fs); |
| 70 | 70 | $response = explode("\r\n\r\n", $response, 2); |
@@ -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 | } |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | function akismet_request($request, $host, $path, $port = 80) { |
| 56 | - $http_request = "POST $path HTTP/1.0\r\n"; |
|
| 56 | + $http_request = "post $path HTTP/1.0\r\n"; |
|
| 57 | 57 | $http_request .= "Host: $host\r\n"; |
| 58 | 58 | $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=utf-8\r\n"; |
| 59 | 59 | $http_request .= "Content-Length: " . strlen($request) . "\r\n"; |
@@ -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 = ''; |