@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <tr> |
| 2 | - <th><?php _e("Mijireh Checkout Page Design", 'event_espresso');?><?php echo EEH_Template::get_help_tab_link( 'ee_mijireh_help_tab' ); ?></th> |
|
| 2 | + <th><?php _e("Mijireh Checkout Page Design", 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('ee_mijireh_help_tab'); ?></th> |
|
| 3 | 3 | <td> |
| 4 | - <a href="?mijireh_edit_slurp_page=true"><?php _e("Edit Slurp Page", 'event_espresso');?></a> |
|
| 4 | + <a href="?mijireh_edit_slurp_page=true"><?php _e("Edit Slurp Page", 'event_espresso'); ?></a> |
|
| 5 | 5 | </td> |
| 6 | 6 | </tr> |
| 7 | 7 | \ No newline at end of file |
@@ -1,8 +1,8 @@ |
||
| 1 | 1 | <div id='mijireh_notice' class='mijireh-info alert-message info' data-alert='alert'> |
| 2 | - <div class='mijireh-logo'><img src='<?php echo $mijireh_image_url;?>' alt='<?php printf( esc_attr__( '%s Checkout Logo', 'event_espresso' ), 'Mijereh' ); ?>'></div> |
|
| 2 | + <div class='mijireh-logo'><img src='<?php echo $mijireh_image_url; ?>' alt='<?php printf(esc_attr__('%s Checkout Logo', 'event_espresso'), 'Mijereh'); ?>'></div> |
|
| 3 | 3 | <div class='mijireh-blurb'> |
| 4 | - <h2><?php _e("Slurp Into Mijireh", 'event_espresso');?></h2> |
|
| 5 | - <p><?php printf(__("Design the page how you want, and be sure to include the special text {{mj-checkout-form}} to indicate where to place Mijireh's Checkout Form. You may want to read %s Mijireh's instructions on slurping%s.", 'event_espresso'),"<a href='http://www.mijireh.com/docs/what-is-page-slurp/'>","</a>");?> |
|
| 4 | + <h2><?php _e("Slurp Into Mijireh", 'event_espresso'); ?></h2> |
|
| 5 | + <p><?php printf(__("Design the page how you want, and be sure to include the special text {{mj-checkout-form}} to indicate where to place Mijireh's Checkout Form. You may want to read %s Mijireh's instructions on slurping%s.", 'event_espresso'), "<a href='http://www.mijireh.com/docs/what-is-page-slurp/'>", "</a>"); ?> |
|
| 6 | 6 | |
| 7 | 7 | <p class='aligncenter'><a href='<?php echo $slurp_action_link?>' id='page_slurp' class='button-primary'>Slurp This Page!</a></p> |
| 8 | 8 | <p class="aligncenter"><a class="nobold" href="https://secure.mijireh.com/checkout/<?php echo $access_key?>" id="view_slurp" target="_new">Preview Checkout Page</a></p> |
@@ -1,3 +1,3 @@ |
||
| 1 | 1 | <div class="updated"> |
| 2 | - <p><?php _e( "Mijireh is currently slurping your content. This will usually take a few minutes. Please login to Mijireh to see the slurp's progress", 'event_espresso' ); ?></p> |
|
| 2 | + <p><?php _e("Mijireh is currently slurping your content. This will usually take a few minutes. Please login to Mijireh to see the slurp's progress", 'event_espresso'); ?></p> |
|
| 3 | 3 | </div> |
| 4 | 4 | \ No newline at end of file |
@@ -31,67 +31,67 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | class ReCaptcha |
| 33 | 33 | { |
| 34 | - /** |
|
| 35 | - * Version of this client library. |
|
| 36 | - * @const string |
|
| 37 | - */ |
|
| 38 | - const VERSION = 'php_1.1.1'; |
|
| 34 | + /** |
|
| 35 | + * Version of this client library. |
|
| 36 | + * @const string |
|
| 37 | + */ |
|
| 38 | + const VERSION = 'php_1.1.1'; |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * Shared secret for the site. |
|
| 42 | - * @var type string |
|
| 43 | - */ |
|
| 44 | - private $secret; |
|
| 40 | + /** |
|
| 41 | + * Shared secret for the site. |
|
| 42 | + * @var type string |
|
| 43 | + */ |
|
| 44 | + private $secret; |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * Method used to communicate with service. Defaults to POST request. |
|
| 48 | - * @var RequestMethod |
|
| 49 | - */ |
|
| 50 | - private $requestMethod; |
|
| 46 | + /** |
|
| 47 | + * Method used to communicate with service. Defaults to POST request. |
|
| 48 | + * @var RequestMethod |
|
| 49 | + */ |
|
| 50 | + private $requestMethod; |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * Create a configured instance to use the reCAPTCHA service. |
|
| 54 | - * |
|
| 55 | - * @param string $secret shared secret between site and reCAPTCHA server. |
|
| 56 | - * @param RequestMethod $requestMethod method used to send the request. Defaults to POST. |
|
| 57 | - */ |
|
| 58 | - public function __construct($secret, RequestMethod $requestMethod = null) |
|
| 59 | - { |
|
| 60 | - if (empty($secret)) { |
|
| 61 | - throw new \RuntimeException('No secret provided'); |
|
| 62 | - } |
|
| 52 | + /** |
|
| 53 | + * Create a configured instance to use the reCAPTCHA service. |
|
| 54 | + * |
|
| 55 | + * @param string $secret shared secret between site and reCAPTCHA server. |
|
| 56 | + * @param RequestMethod $requestMethod method used to send the request. Defaults to POST. |
|
| 57 | + */ |
|
| 58 | + public function __construct($secret, RequestMethod $requestMethod = null) |
|
| 59 | + { |
|
| 60 | + if (empty($secret)) { |
|
| 61 | + throw new \RuntimeException('No secret provided'); |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - if (!is_string($secret)) { |
|
| 65 | - throw new \RuntimeException('The provided secret must be a string'); |
|
| 66 | - } |
|
| 64 | + if (!is_string($secret)) { |
|
| 65 | + throw new \RuntimeException('The provided secret must be a string'); |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - $this->secret = $secret; |
|
| 68 | + $this->secret = $secret; |
|
| 69 | 69 | |
| 70 | - if (!is_null($requestMethod)) { |
|
| 71 | - $this->requestMethod = $requestMethod; |
|
| 72 | - } else { |
|
| 73 | - $this->requestMethod = new RequestMethod\Post(); |
|
| 74 | - } |
|
| 75 | - } |
|
| 70 | + if (!is_null($requestMethod)) { |
|
| 71 | + $this->requestMethod = $requestMethod; |
|
| 72 | + } else { |
|
| 73 | + $this->requestMethod = new RequestMethod\Post(); |
|
| 74 | + } |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - /** |
|
| 78 | - * Calls the reCAPTCHA siteverify API to verify whether the user passes |
|
| 79 | - * CAPTCHA test. |
|
| 80 | - * |
|
| 81 | - * @param string $response The value of 'g-recaptcha-response' in the submitted form. |
|
| 82 | - * @param string $remoteIp The end user's IP address. |
|
| 83 | - * @return Response Response from the service. |
|
| 84 | - */ |
|
| 85 | - public function verify($response, $remoteIp = null) |
|
| 86 | - { |
|
| 87 | - // Discard empty solution submissions |
|
| 88 | - if (empty($response)) { |
|
| 89 | - $recaptchaResponse = new Response(false, array('missing-input-response')); |
|
| 90 | - return $recaptchaResponse; |
|
| 91 | - } |
|
| 77 | + /** |
|
| 78 | + * Calls the reCAPTCHA siteverify API to verify whether the user passes |
|
| 79 | + * CAPTCHA test. |
|
| 80 | + * |
|
| 81 | + * @param string $response The value of 'g-recaptcha-response' in the submitted form. |
|
| 82 | + * @param string $remoteIp The end user's IP address. |
|
| 83 | + * @return Response Response from the service. |
|
| 84 | + */ |
|
| 85 | + public function verify($response, $remoteIp = null) |
|
| 86 | + { |
|
| 87 | + // Discard empty solution submissions |
|
| 88 | + if (empty($response)) { |
|
| 89 | + $recaptchaResponse = new Response(false, array('missing-input-response')); |
|
| 90 | + return $recaptchaResponse; |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - $params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION); |
|
| 94 | - $rawResponse = $this->requestMethod->submit($params); |
|
| 95 | - return Response::fromJson($rawResponse); |
|
| 96 | - } |
|
| 93 | + $params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION); |
|
| 94 | + $rawResponse = $this->requestMethod->submit($params); |
|
| 95 | + return Response::fromJson($rawResponse); |
|
| 96 | + } |
|
| 97 | 97 | } |
@@ -61,13 +61,13 @@ |
||
| 61 | 61 | throw new \RuntimeException('No secret provided'); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - if (!is_string($secret)) { |
|
| 64 | + if ( ! is_string($secret)) { |
|
| 65 | 65 | throw new \RuntimeException('The provided secret must be a string'); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | $this->secret = $secret; |
| 69 | 69 | |
| 70 | - if (!is_null($requestMethod)) { |
|
| 70 | + if ( ! is_null($requestMethod)) { |
|
| 71 | 71 | $this->requestMethod = $requestMethod; |
| 72 | 72 | } else { |
| 73 | 73 | $this->requestMethod = new RequestMethod\Post(); |
@@ -10,38 +10,38 @@ |
||
| 10 | 10 | */ |
| 11 | 11 | class Curl implements RequestMethod |
| 12 | 12 | { |
| 13 | - /** |
|
| 14 | - * URL to which requests are sent via cURL. |
|
| 15 | - * @const string |
|
| 16 | - */ |
|
| 17 | - const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify'; |
|
| 13 | + /** |
|
| 14 | + * URL to which requests are sent via cURL. |
|
| 15 | + * @const string |
|
| 16 | + */ |
|
| 17 | + const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify'; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Submit the cURL request with the specified parameters. |
|
| 21 | - * |
|
| 22 | - * @param RequestParameters $params Request parameters |
|
| 23 | - * @return string Body of the reCAPTCHA response |
|
| 24 | - */ |
|
| 25 | - public function submit(RequestParameters $params) |
|
| 26 | - { |
|
| 27 | - $handle = curl_init(self::SITE_VERIFY_URL); |
|
| 19 | + /** |
|
| 20 | + * Submit the cURL request with the specified parameters. |
|
| 21 | + * |
|
| 22 | + * @param RequestParameters $params Request parameters |
|
| 23 | + * @return string Body of the reCAPTCHA response |
|
| 24 | + */ |
|
| 25 | + public function submit(RequestParameters $params) |
|
| 26 | + { |
|
| 27 | + $handle = curl_init(self::SITE_VERIFY_URL); |
|
| 28 | 28 | |
| 29 | - $options = array( |
|
| 30 | - CURLOPT_POST => true, |
|
| 31 | - CURLOPT_POSTFIELDS => $params->toQueryString(), |
|
| 32 | - CURLOPT_HTTPHEADER => array( |
|
| 33 | - 'Content-Type: application/x-www-form-urlencoded' |
|
| 34 | - ), |
|
| 35 | - CURLINFO_HEADER_OUT => false, |
|
| 36 | - CURLOPT_HEADER => false, |
|
| 37 | - CURLOPT_RETURNTRANSFER => true, |
|
| 38 | - CURLOPT_SSL_VERIFYPEER => true |
|
| 39 | - ); |
|
| 40 | - curl_setopt_array($handle, $options); |
|
| 29 | + $options = array( |
|
| 30 | + CURLOPT_POST => true, |
|
| 31 | + CURLOPT_POSTFIELDS => $params->toQueryString(), |
|
| 32 | + CURLOPT_HTTPHEADER => array( |
|
| 33 | + 'Content-Type: application/x-www-form-urlencoded' |
|
| 34 | + ), |
|
| 35 | + CURLINFO_HEADER_OUT => false, |
|
| 36 | + CURLOPT_HEADER => false, |
|
| 37 | + CURLOPT_RETURNTRANSFER => true, |
|
| 38 | + CURLOPT_SSL_VERIFYPEER => true |
|
| 39 | + ); |
|
| 40 | + curl_setopt_array($handle, $options); |
|
| 41 | 41 | |
| 42 | - $response = curl_exec($handle); |
|
| 43 | - curl_close($handle); |
|
| 42 | + $response = curl_exec($handle); |
|
| 43 | + curl_close($handle); |
|
| 44 | 44 | |
| 45 | - return $response; |
|
| 46 | - } |
|
| 45 | + return $response; |
|
| 46 | + } |
|
| 47 | 47 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | */ |
| 71 | 71 | public function __construct(Socket $socket = null) |
| 72 | 72 | { |
| 73 | - if (!is_null($socket)) { |
|
| 73 | + if ( ! is_null($socket)) { |
|
| 74 | 74 | $this->socket = $socket; |
| 75 | 75 | } else { |
| 76 | 76 | $this->socket = new Socket(); |
@@ -88,20 +88,20 @@ discard block |
||
| 88 | 88 | $errno = 0; |
| 89 | 89 | $errstr = ''; |
| 90 | 90 | |
| 91 | - if ($this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30) !== false) { |
|
| 91 | + if ($this->socket->fsockopen('ssl://'.self::RECAPTCHA_HOST, 443, $errno, $errstr, 30) !== false) { |
|
| 92 | 92 | $content = $params->toQueryString(); |
| 93 | 93 | |
| 94 | - $request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n"; |
|
| 95 | - $request .= "Host: " . self::RECAPTCHA_HOST . "\r\n"; |
|
| 94 | + $request = "POST ".self::SITE_VERIFY_PATH." HTTP/1.1\r\n"; |
|
| 95 | + $request .= "Host: ".self::RECAPTCHA_HOST."\r\n"; |
|
| 96 | 96 | $request .= "Content-Type: application/x-www-form-urlencoded\r\n"; |
| 97 | - $request .= "Content-length: " . strlen($content) . "\r\n"; |
|
| 97 | + $request .= "Content-length: ".strlen($content)."\r\n"; |
|
| 98 | 98 | $request .= "Connection: close\r\n\r\n"; |
| 99 | - $request .= $content . "\r\n\r\n"; |
|
| 99 | + $request .= $content."\r\n\r\n"; |
|
| 100 | 100 | |
| 101 | 101 | $this->socket->fwrite($request); |
| 102 | 102 | $response = ''; |
| 103 | 103 | |
| 104 | - while (!$this->socket->feof()) { |
|
| 104 | + while ( ! $this->socket->feof()) { |
|
| 105 | 105 | $response .= $this->socket->fgets(4096); |
| 106 | 106 | } |
| 107 | 107 | |
@@ -36,85 +36,85 @@ |
||
| 36 | 36 | */ |
| 37 | 37 | class SocketPost implements RequestMethod |
| 38 | 38 | { |
| 39 | - /** |
|
| 40 | - * reCAPTCHA service host. |
|
| 41 | - * @const string |
|
| 42 | - */ |
|
| 43 | - const RECAPTCHA_HOST = 'www.google.com'; |
|
| 44 | - |
|
| 45 | - /** |
|
| 46 | - * @const string reCAPTCHA service path |
|
| 47 | - */ |
|
| 48 | - const SITE_VERIFY_PATH = '/recaptcha/api/siteverify'; |
|
| 49 | - |
|
| 50 | - /** |
|
| 51 | - * @const string Bad request error |
|
| 52 | - */ |
|
| 53 | - const BAD_REQUEST = '{"success": false, "error-codes": ["invalid-request"]}'; |
|
| 54 | - |
|
| 55 | - /** |
|
| 56 | - * @const string Bad response error |
|
| 57 | - */ |
|
| 58 | - const BAD_RESPONSE = '{"success": false, "error-codes": ["invalid-response"]}'; |
|
| 59 | - |
|
| 60 | - /** |
|
| 61 | - * Socket to the reCAPTCHA service |
|
| 62 | - * @var Socket |
|
| 63 | - */ |
|
| 64 | - private $socket; |
|
| 65 | - |
|
| 66 | - /** |
|
| 67 | - * Constructor |
|
| 68 | - * |
|
| 69 | - * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing |
|
| 70 | - */ |
|
| 71 | - public function __construct(Socket $socket = null) |
|
| 72 | - { |
|
| 73 | - if (!is_null($socket)) { |
|
| 74 | - $this->socket = $socket; |
|
| 75 | - } else { |
|
| 76 | - $this->socket = new Socket(); |
|
| 77 | - } |
|
| 78 | - } |
|
| 79 | - |
|
| 80 | - /** |
|
| 81 | - * Submit the POST request with the specified parameters. |
|
| 82 | - * |
|
| 83 | - * @param RequestParameters $params Request parameters |
|
| 84 | - * @return string Body of the reCAPTCHA response |
|
| 85 | - */ |
|
| 86 | - public function submit(RequestParameters $params) |
|
| 87 | - { |
|
| 88 | - $errno = 0; |
|
| 89 | - $errstr = ''; |
|
| 90 | - |
|
| 91 | - if ($this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30) !== false) { |
|
| 92 | - $content = $params->toQueryString(); |
|
| 93 | - |
|
| 94 | - $request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n"; |
|
| 95 | - $request .= "Host: " . self::RECAPTCHA_HOST . "\r\n"; |
|
| 96 | - $request .= "Content-Type: application/x-www-form-urlencoded\r\n"; |
|
| 97 | - $request .= "Content-length: " . strlen($content) . "\r\n"; |
|
| 98 | - $request .= "Connection: close\r\n\r\n"; |
|
| 99 | - $request .= $content . "\r\n\r\n"; |
|
| 100 | - |
|
| 101 | - $this->socket->fwrite($request); |
|
| 102 | - $response = ''; |
|
| 103 | - |
|
| 104 | - while (!$this->socket->feof()) { |
|
| 105 | - $response .= $this->socket->fgets(4096); |
|
| 106 | - } |
|
| 107 | - |
|
| 108 | - $this->socket->fclose(); |
|
| 109 | - |
|
| 110 | - if (0 === strpos($response, 'HTTP/1.1 200 OK')) { |
|
| 111 | - $parts = preg_split("#\n\s*\n#Uis", $response); |
|
| 112 | - return $parts[1]; |
|
| 113 | - } |
|
| 114 | - |
|
| 115 | - return self::BAD_RESPONSE; |
|
| 116 | - } |
|
| 117 | - |
|
| 118 | - return self::BAD_REQUEST; |
|
| 119 | - } |
|
| 39 | + /** |
|
| 40 | + * reCAPTCHA service host. |
|
| 41 | + * @const string |
|
| 42 | + */ |
|
| 43 | + const RECAPTCHA_HOST = 'www.google.com'; |
|
| 44 | + |
|
| 45 | + /** |
|
| 46 | + * @const string reCAPTCHA service path |
|
| 47 | + */ |
|
| 48 | + const SITE_VERIFY_PATH = '/recaptcha/api/siteverify'; |
|
| 49 | + |
|
| 50 | + /** |
|
| 51 | + * @const string Bad request error |
|
| 52 | + */ |
|
| 53 | + const BAD_REQUEST = '{"success": false, "error-codes": ["invalid-request"]}'; |
|
| 54 | + |
|
| 55 | + /** |
|
| 56 | + * @const string Bad response error |
|
| 57 | + */ |
|
| 58 | + const BAD_RESPONSE = '{"success": false, "error-codes": ["invalid-response"]}'; |
|
| 59 | + |
|
| 60 | + /** |
|
| 61 | + * Socket to the reCAPTCHA service |
|
| 62 | + * @var Socket |
|
| 63 | + */ |
|
| 64 | + private $socket; |
|
| 65 | + |
|
| 66 | + /** |
|
| 67 | + * Constructor |
|
| 68 | + * |
|
| 69 | + * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing |
|
| 70 | + */ |
|
| 71 | + public function __construct(Socket $socket = null) |
|
| 72 | + { |
|
| 73 | + if (!is_null($socket)) { |
|
| 74 | + $this->socket = $socket; |
|
| 75 | + } else { |
|
| 76 | + $this->socket = new Socket(); |
|
| 77 | + } |
|
| 78 | + } |
|
| 79 | + |
|
| 80 | + /** |
|
| 81 | + * Submit the POST request with the specified parameters. |
|
| 82 | + * |
|
| 83 | + * @param RequestParameters $params Request parameters |
|
| 84 | + * @return string Body of the reCAPTCHA response |
|
| 85 | + */ |
|
| 86 | + public function submit(RequestParameters $params) |
|
| 87 | + { |
|
| 88 | + $errno = 0; |
|
| 89 | + $errstr = ''; |
|
| 90 | + |
|
| 91 | + if ($this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30) !== false) { |
|
| 92 | + $content = $params->toQueryString(); |
|
| 93 | + |
|
| 94 | + $request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n"; |
|
| 95 | + $request .= "Host: " . self::RECAPTCHA_HOST . "\r\n"; |
|
| 96 | + $request .= "Content-Type: application/x-www-form-urlencoded\r\n"; |
|
| 97 | + $request .= "Content-length: " . strlen($content) . "\r\n"; |
|
| 98 | + $request .= "Connection: close\r\n\r\n"; |
|
| 99 | + $request .= $content . "\r\n\r\n"; |
|
| 100 | + |
|
| 101 | + $this->socket->fwrite($request); |
|
| 102 | + $response = ''; |
|
| 103 | + |
|
| 104 | + while (!$this->socket->feof()) { |
|
| 105 | + $response .= $this->socket->fgets(4096); |
|
| 106 | + } |
|
| 107 | + |
|
| 108 | + $this->socket->fclose(); |
|
| 109 | + |
|
| 110 | + if (0 === strpos($response, 'HTTP/1.1 200 OK')) { |
|
| 111 | + $parts = preg_split("#\n\s*\n#Uis", $response); |
|
| 112 | + return $parts[1]; |
|
| 113 | + } |
|
| 114 | + |
|
| 115 | + return self::BAD_RESPONSE; |
|
| 116 | + } |
|
| 117 | + |
|
| 118 | + return self::BAD_REQUEST; |
|
| 119 | + } |
|
| 120 | 120 | } |
@@ -80,11 +80,11 @@ |
||
| 80 | 80 | { |
| 81 | 81 | $params = array('secret' => $this->secret, 'response' => $this->response); |
| 82 | 82 | |
| 83 | - if (!is_null($this->remoteIp)) { |
|
| 83 | + if ( ! is_null($this->remoteIp)) { |
|
| 84 | 84 | $params['remoteip'] = $this->remoteIp; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - if (!is_null($this->version)) { |
|
| 87 | + if ( ! is_null($this->version)) { |
|
| 88 | 88 | $params['version'] = $this->version; |
| 89 | 89 | } |
| 90 | 90 | |
@@ -31,73 +31,73 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | class RequestParameters |
| 33 | 33 | { |
| 34 | - /** |
|
| 35 | - * Site secret. |
|
| 36 | - * @var string |
|
| 37 | - */ |
|
| 38 | - private $secret; |
|
| 34 | + /** |
|
| 35 | + * Site secret. |
|
| 36 | + * @var string |
|
| 37 | + */ |
|
| 38 | + private $secret; |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * Form response. |
|
| 42 | - * @var string |
|
| 43 | - */ |
|
| 44 | - private $response; |
|
| 40 | + /** |
|
| 41 | + * Form response. |
|
| 42 | + * @var string |
|
| 43 | + */ |
|
| 44 | + private $response; |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * Remote user's IP address. |
|
| 48 | - * @var string |
|
| 49 | - */ |
|
| 50 | - private $remoteIp; |
|
| 46 | + /** |
|
| 47 | + * Remote user's IP address. |
|
| 48 | + * @var string |
|
| 49 | + */ |
|
| 50 | + private $remoteIp; |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * Client version. |
|
| 54 | - * @var string |
|
| 55 | - */ |
|
| 56 | - private $version; |
|
| 52 | + /** |
|
| 53 | + * Client version. |
|
| 54 | + * @var string |
|
| 55 | + */ |
|
| 56 | + private $version; |
|
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * Initialise parameters. |
|
| 60 | - * |
|
| 61 | - * @param string $secret Site secret. |
|
| 62 | - * @param string $response Value from g-captcha-response form field. |
|
| 63 | - * @param string $remoteIp User's IP address. |
|
| 64 | - * @param string $version Version of this client library. |
|
| 65 | - */ |
|
| 66 | - public function __construct($secret, $response, $remoteIp = null, $version = null) |
|
| 67 | - { |
|
| 68 | - $this->secret = $secret; |
|
| 69 | - $this->response = $response; |
|
| 70 | - $this->remoteIp = $remoteIp; |
|
| 71 | - $this->version = $version; |
|
| 72 | - } |
|
| 58 | + /** |
|
| 59 | + * Initialise parameters. |
|
| 60 | + * |
|
| 61 | + * @param string $secret Site secret. |
|
| 62 | + * @param string $response Value from g-captcha-response form field. |
|
| 63 | + * @param string $remoteIp User's IP address. |
|
| 64 | + * @param string $version Version of this client library. |
|
| 65 | + */ |
|
| 66 | + public function __construct($secret, $response, $remoteIp = null, $version = null) |
|
| 67 | + { |
|
| 68 | + $this->secret = $secret; |
|
| 69 | + $this->response = $response; |
|
| 70 | + $this->remoteIp = $remoteIp; |
|
| 71 | + $this->version = $version; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * Array representation. |
|
| 76 | - * |
|
| 77 | - * @return array Array formatted parameters. |
|
| 78 | - */ |
|
| 79 | - public function toArray() |
|
| 80 | - { |
|
| 81 | - $params = array('secret' => $this->secret, 'response' => $this->response); |
|
| 74 | + /** |
|
| 75 | + * Array representation. |
|
| 76 | + * |
|
| 77 | + * @return array Array formatted parameters. |
|
| 78 | + */ |
|
| 79 | + public function toArray() |
|
| 80 | + { |
|
| 81 | + $params = array('secret' => $this->secret, 'response' => $this->response); |
|
| 82 | 82 | |
| 83 | - if (!is_null($this->remoteIp)) { |
|
| 84 | - $params['remoteip'] = $this->remoteIp; |
|
| 85 | - } |
|
| 83 | + if (!is_null($this->remoteIp)) { |
|
| 84 | + $params['remoteip'] = $this->remoteIp; |
|
| 85 | + } |
|
| 86 | 86 | |
| 87 | - if (!is_null($this->version)) { |
|
| 88 | - $params['version'] = $this->version; |
|
| 89 | - } |
|
| 87 | + if (!is_null($this->version)) { |
|
| 88 | + $params['version'] = $this->version; |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | - return $params; |
|
| 92 | - } |
|
| 91 | + return $params; |
|
| 92 | + } |
|
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * Query string representation for HTTP request. |
|
| 96 | - * |
|
| 97 | - * @return string Query string formatted parameters. |
|
| 98 | - */ |
|
| 99 | - public function toQueryString() |
|
| 100 | - { |
|
| 101 | - return http_build_query($this->toArray(), '', '&'); |
|
| 102 | - } |
|
| 94 | + /** |
|
| 95 | + * Query string representation for HTTP request. |
|
| 96 | + * |
|
| 97 | + * @return string Query string formatted parameters. |
|
| 98 | + */ |
|
| 99 | + public function toQueryString() |
|
| 100 | + { |
|
| 101 | + return http_build_query($this->toArray(), '', '&'); |
|
| 102 | + } |
|
| 103 | 103 | } |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | { |
| 54 | 54 | $responseData = json_decode($json, true); |
| 55 | 55 | |
| 56 | - if (!$responseData) { |
|
| 56 | + if ( ! $responseData) { |
|
| 57 | 57 | return new Response(false, array('invalid-json')); |
| 58 | 58 | } |
| 59 | 59 | |
@@ -31,72 +31,72 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | class Response |
| 33 | 33 | { |
| 34 | - /** |
|
| 35 | - * Succes or failure. |
|
| 36 | - * @var boolean |
|
| 37 | - */ |
|
| 38 | - private $success = false; |
|
| 34 | + /** |
|
| 35 | + * Succes or failure. |
|
| 36 | + * @var boolean |
|
| 37 | + */ |
|
| 38 | + private $success = false; |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * Error code strings. |
|
| 42 | - * @var array |
|
| 43 | - */ |
|
| 44 | - private $errorCodes = array(); |
|
| 40 | + /** |
|
| 41 | + * Error code strings. |
|
| 42 | + * @var array |
|
| 43 | + */ |
|
| 44 | + private $errorCodes = array(); |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * Build the response from the expected JSON returned by the service. |
|
| 48 | - * |
|
| 49 | - * @param string $json |
|
| 50 | - * @return \ReCaptcha\Response |
|
| 51 | - */ |
|
| 52 | - public static function fromJson($json) |
|
| 53 | - { |
|
| 54 | - $responseData = json_decode($json, true); |
|
| 46 | + /** |
|
| 47 | + * Build the response from the expected JSON returned by the service. |
|
| 48 | + * |
|
| 49 | + * @param string $json |
|
| 50 | + * @return \ReCaptcha\Response |
|
| 51 | + */ |
|
| 52 | + public static function fromJson($json) |
|
| 53 | + { |
|
| 54 | + $responseData = json_decode($json, true); |
|
| 55 | 55 | |
| 56 | - if (!$responseData) { |
|
| 57 | - return new Response(false, array('invalid-json')); |
|
| 58 | - } |
|
| 56 | + if (!$responseData) { |
|
| 57 | + return new Response(false, array('invalid-json')); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - if (isset($responseData['success']) && $responseData['success'] == true) { |
|
| 61 | - return new Response(true); |
|
| 62 | - } |
|
| 60 | + if (isset($responseData['success']) && $responseData['success'] == true) { |
|
| 61 | + return new Response(true); |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) { |
|
| 65 | - return new Response(false, $responseData['error-codes']); |
|
| 66 | - } |
|
| 64 | + if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) { |
|
| 65 | + return new Response(false, $responseData['error-codes']); |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - return new Response(false); |
|
| 69 | - } |
|
| 68 | + return new Response(false); |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - /** |
|
| 72 | - * Constructor. |
|
| 73 | - * |
|
| 74 | - * @param boolean $success |
|
| 75 | - * @param array $errorCodes |
|
| 76 | - */ |
|
| 77 | - public function __construct($success, array $errorCodes = array()) |
|
| 78 | - { |
|
| 79 | - $this->success = $success; |
|
| 80 | - $this->errorCodes = $errorCodes; |
|
| 81 | - } |
|
| 71 | + /** |
|
| 72 | + * Constructor. |
|
| 73 | + * |
|
| 74 | + * @param boolean $success |
|
| 75 | + * @param array $errorCodes |
|
| 76 | + */ |
|
| 77 | + public function __construct($success, array $errorCodes = array()) |
|
| 78 | + { |
|
| 79 | + $this->success = $success; |
|
| 80 | + $this->errorCodes = $errorCodes; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * Is success? |
|
| 85 | - * |
|
| 86 | - * @return boolean |
|
| 87 | - */ |
|
| 88 | - public function isSuccess() |
|
| 89 | - { |
|
| 90 | - return $this->success; |
|
| 91 | - } |
|
| 83 | + /** |
|
| 84 | + * Is success? |
|
| 85 | + * |
|
| 86 | + * @return boolean |
|
| 87 | + */ |
|
| 88 | + public function isSuccess() |
|
| 89 | + { |
|
| 90 | + return $this->success; |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - /** |
|
| 94 | - * Get error codes. |
|
| 95 | - * |
|
| 96 | - * @return array |
|
| 97 | - */ |
|
| 98 | - public function getErrorCodes() |
|
| 99 | - { |
|
| 100 | - return $this->errorCodes; |
|
| 101 | - } |
|
| 93 | + /** |
|
| 94 | + * Get error codes. |
|
| 95 | + * |
|
| 96 | + * @return array |
|
| 97 | + */ |
|
| 98 | + public function getErrorCodes() |
|
| 99 | + { |
|
| 100 | + return $this->errorCodes; |
|
| 101 | + } |
|
| 102 | 102 | } |
@@ -6,33 +6,33 @@ |
||
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | 8 | spl_autoload_register(function ($class) { |
| 9 | - if (substr($class, 0, 10) !== 'ReCaptcha\\') { |
|
| 10 | - /* If the class does not lie under the "ReCaptcha" namespace, |
|
| 9 | + if (substr($class, 0, 10) !== 'ReCaptcha\\') { |
|
| 10 | + /* If the class does not lie under the "ReCaptcha" namespace, |
|
| 11 | 11 | * then we can exit immediately. |
| 12 | 12 | */ |
| 13 | - return; |
|
| 14 | - } |
|
| 13 | + return; |
|
| 14 | + } |
|
| 15 | 15 | |
| 16 | - /* All of the classes have names like "ReCaptcha\Foo", so we need |
|
| 16 | + /* All of the classes have names like "ReCaptcha\Foo", so we need |
|
| 17 | 17 | * to replace the backslashes with frontslashes if we want the |
| 18 | 18 | * name to map directly to a location in the filesystem. |
| 19 | 19 | */ |
| 20 | - $class = str_replace('\\', '/', $class); |
|
| 20 | + $class = str_replace('\\', '/', $class); |
|
| 21 | 21 | |
| 22 | - /* First, check under the current directory. It is important that |
|
| 22 | + /* First, check under the current directory. It is important that |
|
| 23 | 23 | * we look here first, so that we don't waste time searching for |
| 24 | 24 | * test classes in the common case. |
| 25 | 25 | */ |
| 26 | - $path = dirname(__FILE__).'/'.$class.'.php'; |
|
| 27 | - if (is_readable($path)) { |
|
| 28 | - require_once $path; |
|
| 29 | - } |
|
| 26 | + $path = dirname(__FILE__).'/'.$class.'.php'; |
|
| 27 | + if (is_readable($path)) { |
|
| 28 | + require_once $path; |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /* If we didn't find what we're looking for already, maybe it's |
|
| 31 | + /* If we didn't find what we're looking for already, maybe it's |
|
| 32 | 32 | * a test class? |
| 33 | 33 | */ |
| 34 | - $path = dirname(__FILE__).'/../tests/'.$class.'.php'; |
|
| 35 | - if (is_readable($path)) { |
|
| 36 | - require_once $path; |
|
| 37 | - } |
|
| 34 | + $path = dirname(__FILE__).'/../tests/'.$class.'.php'; |
|
| 35 | + if (is_readable($path)) { |
|
| 36 | + require_once $path; |
|
| 37 | + } |
|
| 38 | 38 | }); |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | * classes. |
| 6 | 6 | */ |
| 7 | 7 | |
| 8 | -spl_autoload_register(function ($class) { |
|
| 8 | +spl_autoload_register(function($class) { |
|
| 9 | 9 | if (substr($class, 0, 10) !== 'ReCaptcha\\') { |
| 10 | 10 | /* If the class does not lie under the "ReCaptcha" namespace, |
| 11 | 11 | * then we can exit immediately. |