@@ -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. |
@@ -1,4 +1,6 @@ |
||
1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | +} |
|
2 | 4 | /** |
3 | 5 | * |
4 | 6 | * EED_Ticket_Selector_Caff |
@@ -28,12 +28,12 @@ discard block |
||
28 | 28 | * @return void |
29 | 29 | */ |
30 | 30 | public static function set_hooks() { |
31 | - add_action( |
|
32 | - 'AHEE__ticket_selector_chart_template__ticket_details__after_description', |
|
33 | - array('EED_Ticket_Selector_Caff', 'ticket_price_details'), |
|
34 | - 10, |
|
35 | - 3 |
|
36 | - ); |
|
31 | + add_action( |
|
32 | + 'AHEE__ticket_selector_chart_template__ticket_details__after_description', |
|
33 | + array('EED_Ticket_Selector_Caff', 'ticket_price_details'), |
|
34 | + 10, |
|
35 | + 3 |
|
36 | + ); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -53,14 +53,14 @@ discard block |
||
53 | 53 | * @param \WP $WP |
54 | 54 | */ |
55 | 55 | public function run( $WP ) { |
56 | - $this->set_config(); |
|
56 | + $this->set_config(); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | |
60 | 60 | |
61 | 61 | |
62 | 62 | protected function set_config(){ |
63 | - $this->set_config_section( 'template_settings' ); |
|
63 | + $this->set_config_section( 'template_settings' ); |
|
64 | 64 | $this->set_config_class( 'EE_Ticket_Selector_Config' ); |
65 | 65 | $this->set_config_name( 'EED_Ticket_Selector' ); |
66 | 66 | } |
@@ -109,27 +109,27 @@ discard block |
||
109 | 109 | |
110 | 110 | |
111 | 111 | |
112 | - /** |
|
113 | - * @return \EE_Form_Section_Proper |
|
114 | - * @throws \EE_Error |
|
115 | - */ |
|
116 | - public static function _ticket_selector_appearance_settings() { |
|
117 | - if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) { |
|
118 | - \EED_Ticket_Selector::instance()->set_config(); |
|
119 | - \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config(); |
|
120 | - } |
|
121 | - // get option for whether to show datetime selector in TS |
|
122 | - $show_datetime_selector = \EE_Registry::instance() |
|
123 | - ->CFG |
|
124 | - ->template_settings |
|
125 | - ->EED_Ticket_Selector |
|
126 | - ->getShowDatetimeSelector(); |
|
127 | - // and option for how may datetimes must exist if display is conditional |
|
128 | - $datetime_selector_threshold = \EE_Registry::instance() |
|
129 | - ->CFG |
|
130 | - ->template_settings |
|
131 | - ->EED_Ticket_Selector |
|
132 | - ->getDatetimeSelectorThreshold(); |
|
112 | + /** |
|
113 | + * @return \EE_Form_Section_Proper |
|
114 | + * @throws \EE_Error |
|
115 | + */ |
|
116 | + public static function _ticket_selector_appearance_settings() { |
|
117 | + if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) { |
|
118 | + \EED_Ticket_Selector::instance()->set_config(); |
|
119 | + \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config(); |
|
120 | + } |
|
121 | + // get option for whether to show datetime selector in TS |
|
122 | + $show_datetime_selector = \EE_Registry::instance() |
|
123 | + ->CFG |
|
124 | + ->template_settings |
|
125 | + ->EED_Ticket_Selector |
|
126 | + ->getShowDatetimeSelector(); |
|
127 | + // and option for how may datetimes must exist if display is conditional |
|
128 | + $datetime_selector_threshold = \EE_Registry::instance() |
|
129 | + ->CFG |
|
130 | + ->template_settings |
|
131 | + ->EED_Ticket_Selector |
|
132 | + ->getDatetimeSelectorThreshold(); |
|
133 | 133 | |
134 | 134 | return new EE_Form_Section_Proper( |
135 | 135 | array( |
@@ -171,19 +171,19 @@ discard block |
||
171 | 171 | ) |
172 | 172 | ), |
173 | 173 | 'show_datetime_selector' => new EE_Select_Input( |
174 | - \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false), |
|
174 | + \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false), |
|
175 | 175 | array( |
176 | 176 | 'html_label_text' => esc_html__( 'Show Date & Time Filter?', 'event_espresso' ), |
177 | 177 | 'html_help_text' => sprintf( |
178 | - esc_html__( |
|
179 | - 'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates and times for the available tickets. Ticket options can be unselected, which removes (hides) them from the list of tickets being displayed.%1$sOptions include:%1$s • %2$sdo not show date & time filter%3$s%1$s this option will NEVER display a date filter, regardless of how many dates exist.%1$s • %2$smaybe show date & time filter%3$s%1$s this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".', |
|
180 | - 'event_espresso' |
|
181 | - ), |
|
182 | - '<br>', |
|
183 | - '<strong>', |
|
184 | - '</strong>' |
|
185 | - |
|
186 | - ), |
|
178 | + esc_html__( |
|
179 | + 'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates and times for the available tickets. Ticket options can be unselected, which removes (hides) them from the list of tickets being displayed.%1$sOptions include:%1$s • %2$sdo not show date & time filter%3$s%1$s this option will NEVER display a date filter, regardless of how many dates exist.%1$s • %2$smaybe show date & time filter%3$s%1$s this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".', |
|
180 | + 'event_espresso' |
|
181 | + ), |
|
182 | + '<br>', |
|
183 | + '<strong>', |
|
184 | + '</strong>' |
|
185 | + |
|
186 | + ), |
|
187 | 187 | 'default' => ! empty( $show_datetime_selector ) |
188 | 188 | ? $show_datetime_selector |
189 | 189 | : \EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR, |
@@ -191,13 +191,13 @@ discard block |
||
191 | 191 | ) |
192 | 192 | ), |
193 | 193 | 'datetime_selector_threshold' => new EE_Select_Input( |
194 | - array_combine($r = range(1, 10), $r), |
|
194 | + array_combine($r = range(1, 10), $r), |
|
195 | 195 | array( |
196 | 196 | 'html_label_text' => esc_html__( 'Date & Time Filter Threshold', 'event_espresso' ), |
197 | 197 | 'html_help_text' => esc_html__( |
198 | - 'The number of unique dates an event has to have before conditionally displaying a date & time filter', |
|
199 | - 'event_espresso' |
|
200 | - ), |
|
198 | + 'The number of unique dates an event has to have before conditionally displaying a date & time filter', |
|
199 | + 'event_espresso' |
|
200 | + ), |
|
201 | 201 | 'default' => ! empty( $datetime_selector_threshold ) |
202 | 202 | ? $datetime_selector_threshold |
203 | 203 | : 3, |
@@ -223,8 +223,8 @@ discard block |
||
223 | 223 | */ |
224 | 224 | public static function update_template_settings( EE_Template_Config $CFG, $REQ ) { |
225 | 225 | if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) { |
226 | - \EED_Ticket_Selector::instance()->set_config(); |
|
227 | - $CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config(); |
|
226 | + \EED_Ticket_Selector::instance()->set_config(); |
|
227 | + $CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config(); |
|
228 | 228 | } |
229 | 229 | try { |
230 | 230 | $ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form(); |
@@ -246,11 +246,11 @@ discard block |
||
246 | 246 | $CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details']; |
247 | 247 | $CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets']; |
248 | 248 | $CFG->EED_Ticket_Selector->setShowDatetimeSelector( |
249 | - $valid_data['appearance_settings']['show_datetime_selector'] |
|
250 | - ); |
|
249 | + $valid_data['appearance_settings']['show_datetime_selector'] |
|
250 | + ); |
|
251 | 251 | $CFG->EED_Ticket_Selector->setDatetimeSelectorThreshold( |
252 | - $valid_data['appearance_settings']['datetime_selector_threshold'] |
|
253 | - ); |
|
252 | + $valid_data['appearance_settings']['datetime_selector_threshold'] |
|
253 | + ); |
|
254 | 254 | } else { |
255 | 255 | if ( $ticket_selector_form->submission_error_message() !== '' ) { |
256 | 256 | EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ ); |
@@ -267,17 +267,17 @@ discard block |
||
267 | 267 | |
268 | 268 | |
269 | 269 | |
270 | - /** |
|
271 | - * @param \EE_Ticket $ticket |
|
272 | - * @param int $ticket_price |
|
273 | - * @param bool $display_ticket_price |
|
274 | - */ |
|
275 | - public static function ticket_price_details(EE_Ticket $ticket, $ticket_price = 0, $display_ticket_price = false) |
|
276 | - { |
|
277 | - require( |
|
278 | - str_replace('\\', DS, plugin_dir_path(__FILE__)) |
|
279 | - . 'templates' . DS . 'ticket_selector_price_details.template.php' |
|
280 | - ); |
|
270 | + /** |
|
271 | + * @param \EE_Ticket $ticket |
|
272 | + * @param int $ticket_price |
|
273 | + * @param bool $display_ticket_price |
|
274 | + */ |
|
275 | + public static function ticket_price_details(EE_Ticket $ticket, $ticket_price = 0, $display_ticket_price = false) |
|
276 | + { |
|
277 | + require( |
|
278 | + str_replace('\\', DS, plugin_dir_path(__FILE__)) |
|
279 | + . 'templates' . DS . 'ticket_selector_price_details.template.php' |
|
280 | + ); |
|
281 | 281 | } |
282 | 282 | |
283 | 283 |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | * @return EED_Ticket_Selector_Caff |
17 | 17 | */ |
18 | 18 | public static function instance() { |
19 | - return parent::get_instance( __CLASS__ ); |
|
19 | + return parent::get_instance(__CLASS__); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | |
@@ -43,26 +43,26 @@ discard block |
||
43 | 43 | * @return void |
44 | 44 | */ |
45 | 45 | public static function set_hooks_admin() { |
46 | - define( 'TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS ); |
|
47 | - add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Ticket_Selector_Caff', 'template_settings_form' ), 10 ); |
|
48 | - add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Ticket_Selector_Caff', 'update_template_settings' ), 10, 2 ); |
|
46 | + define('TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS); |
|
47 | + add_action('AHEE__template_settings__template__before_settings_form', array('EED_Ticket_Selector_Caff', 'template_settings_form'), 10); |
|
48 | + add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Ticket_Selector_Caff', 'update_template_settings'), 10, 2); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
52 | 52 | /** |
53 | 53 | * @param \WP $WP |
54 | 54 | */ |
55 | - public function run( $WP ) { |
|
55 | + public function run($WP) { |
|
56 | 56 | $this->set_config(); |
57 | 57 | } |
58 | 58 | |
59 | 59 | |
60 | 60 | |
61 | 61 | |
62 | - protected function set_config(){ |
|
63 | - $this->set_config_section( 'template_settings' ); |
|
64 | - $this->set_config_class( 'EE_Ticket_Selector_Config' ); |
|
65 | - $this->set_config_name( 'EED_Ticket_Selector' ); |
|
62 | + protected function set_config() { |
|
63 | + $this->set_config_section('template_settings'); |
|
64 | + $this->set_config_class('EE_Ticket_Selector_Config'); |
|
65 | + $this->set_config_name('EED_Ticket_Selector'); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | 'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections', |
98 | 98 | array( |
99 | 99 | 'appearance_settings_hdr' => new EE_Form_Section_HTML( |
100 | - EEH_HTML::br(2) . |
|
101 | - EEH_HTML::h2( esc_html__( 'Ticket Selector Template Settings', 'event_espresso' )) |
|
100 | + EEH_HTML::br(2). |
|
101 | + EEH_HTML::h2(esc_html__('Ticket Selector Template Settings', 'event_espresso')) |
|
102 | 102 | ), |
103 | 103 | 'appearance_settings' => EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings() |
104 | 104 | ) |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * @throws \EE_Error |
115 | 115 | */ |
116 | 116 | public static function _ticket_selector_appearance_settings() { |
117 | - if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) { |
|
117 | + if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) { |
|
118 | 118 | \EED_Ticket_Selector::instance()->set_config(); |
119 | 119 | \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config(); |
120 | 120 | } |
@@ -142,9 +142,9 @@ discard block |
||
142 | 142 | array( |
143 | 143 | 'show_ticket_details' => new EE_Yes_No_Input( |
144 | 144 | array( |
145 | - 'html_label_text' => esc_html__('Show Ticket Details?', 'event_espresso' ), |
|
146 | - 'html_help_text' => esc_html__( 'This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'), |
|
147 | - 'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details ) |
|
145 | + 'html_label_text' => esc_html__('Show Ticket Details?', 'event_espresso'), |
|
146 | + 'html_help_text' => esc_html__('This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'), |
|
147 | + 'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details) |
|
148 | 148 | ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details |
149 | 149 | : true, |
150 | 150 | 'display_html_label_text' => false |
@@ -152,9 +152,9 @@ discard block |
||
152 | 152 | ), |
153 | 153 | 'show_ticket_sale_columns' => new EE_Yes_No_Input( |
154 | 154 | array( |
155 | - 'html_label_text' => esc_html__('Show Ticket Sale Info?', 'event_espresso' ), |
|
156 | - 'html_help_text' => esc_html__( 'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'), |
|
157 | - 'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns ) |
|
155 | + 'html_label_text' => esc_html__('Show Ticket Sale Info?', 'event_espresso'), |
|
156 | + 'html_help_text' => esc_html__('This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'), |
|
157 | + 'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns) |
|
158 | 158 | ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns |
159 | 159 | : true, |
160 | 160 | 'display_html_label_text' => false |
@@ -162,9 +162,9 @@ discard block |
||
162 | 162 | ), |
163 | 163 | 'show_expired_tickets' => new EE_Yes_No_Input( |
164 | 164 | array( |
165 | - 'html_label_text' => esc_html__( 'Show Expired Tickets?', 'event_espresso' ), |
|
166 | - 'html_help_text' => esc_html__( 'Indicate whether to show expired tickets in the ticket selector', 'event_espresso' ), |
|
167 | - 'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets ) |
|
165 | + 'html_label_text' => esc_html__('Show Expired Tickets?', 'event_espresso'), |
|
166 | + 'html_help_text' => esc_html__('Indicate whether to show expired tickets in the ticket selector', 'event_espresso'), |
|
167 | + 'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets) |
|
168 | 168 | ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets |
169 | 169 | : true, |
170 | 170 | 'display_html_label_text' => false |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | 'show_datetime_selector' => new EE_Select_Input( |
174 | 174 | \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false), |
175 | 175 | array( |
176 | - 'html_label_text' => esc_html__( 'Show Date & Time Filter?', 'event_espresso' ), |
|
176 | + 'html_label_text' => esc_html__('Show Date & Time Filter?', 'event_espresso'), |
|
177 | 177 | 'html_help_text' => sprintf( |
178 | 178 | esc_html__( |
179 | 179 | 'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates and times for the available tickets. Ticket options can be unselected, which removes (hides) them from the list of tickets being displayed.%1$sOptions include:%1$s • %2$sdo not show date & time filter%3$s%1$s this option will NEVER display a date filter, regardless of how many dates exist.%1$s • %2$smaybe show date & time filter%3$s%1$s this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".', |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | '</strong>' |
185 | 185 | |
186 | 186 | ), |
187 | - 'default' => ! empty( $show_datetime_selector ) |
|
187 | + 'default' => ! empty($show_datetime_selector) |
|
188 | 188 | ? $show_datetime_selector |
189 | 189 | : \EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR, |
190 | 190 | 'display_html_label_text' => false |
@@ -193,12 +193,12 @@ discard block |
||
193 | 193 | 'datetime_selector_threshold' => new EE_Select_Input( |
194 | 194 | array_combine($r = range(1, 10), $r), |
195 | 195 | array( |
196 | - 'html_label_text' => esc_html__( 'Date & Time Filter Threshold', 'event_espresso' ), |
|
196 | + 'html_label_text' => esc_html__('Date & Time Filter Threshold', 'event_espresso'), |
|
197 | 197 | 'html_help_text' => esc_html__( |
198 | 198 | 'The number of unique dates an event has to have before conditionally displaying a date & time filter', |
199 | 199 | 'event_espresso' |
200 | 200 | ), |
201 | - 'default' => ! empty( $datetime_selector_threshold ) |
|
201 | + 'default' => ! empty($datetime_selector_threshold) |
|
202 | 202 | ? $datetime_selector_threshold |
203 | 203 | : 3, |
204 | 204 | 'display_html_label_text' => false |
@@ -221,8 +221,8 @@ discard block |
||
221 | 221 | * @param array $REQ incoming request |
222 | 222 | * @return EE_Template_Config |
223 | 223 | */ |
224 | - public static function update_template_settings( EE_Template_Config $CFG, $REQ ) { |
|
225 | - if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) { |
|
224 | + public static function update_template_settings(EE_Template_Config $CFG, $REQ) { |
|
225 | + if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) { |
|
226 | 226 | \EED_Ticket_Selector::instance()->set_config(); |
227 | 227 | $CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config(); |
228 | 228 | } |
@@ -230,13 +230,13 @@ discard block |
||
230 | 230 | $ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form(); |
231 | 231 | |
232 | 232 | //check for form submission |
233 | - if ( $ticket_selector_form->was_submitted() ) { |
|
233 | + if ($ticket_selector_form->was_submitted()) { |
|
234 | 234 | |
235 | 235 | //capture form data |
236 | 236 | $ticket_selector_form->receive_form_submission(); |
237 | 237 | |
238 | 238 | //validate form data |
239 | - if ( $ticket_selector_form->is_valid() ) { |
|
239 | + if ($ticket_selector_form->is_valid()) { |
|
240 | 240 | |
241 | 241 | //grab validated data from form |
242 | 242 | $valid_data = $ticket_selector_form->valid_data(); |
@@ -252,13 +252,13 @@ discard block |
||
252 | 252 | $valid_data['appearance_settings']['datetime_selector_threshold'] |
253 | 253 | ); |
254 | 254 | } else { |
255 | - if ( $ticket_selector_form->submission_error_message() !== '' ) { |
|
256 | - EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ ); |
|
255 | + if ($ticket_selector_form->submission_error_message() !== '') { |
|
256 | + EE_Error::add_error($ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__); |
|
257 | 257 | } |
258 | 258 | } |
259 | 259 | |
260 | 260 | } |
261 | - } catch( EE_Error $e ) { |
|
261 | + } catch (EE_Error $e) { |
|
262 | 262 | $e->get_error(); |
263 | 263 | } |
264 | 264 | |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | { |
277 | 277 | require( |
278 | 278 | str_replace('\\', DS, plugin_dir_path(__FILE__)) |
279 | - . 'templates' . DS . 'ticket_selector_price_details.template.php' |
|
279 | + . 'templates'.DS.'ticket_selector_price_details.template.php' |
|
280 | 280 | ); |
281 | 281 | } |
282 | 282 |
@@ -3,27 +3,27 @@ |
||
3 | 3 | if (!defined('EVENT_ESPRESSO_VERSION')) |
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | /** |
6 | - * Event Espresso |
|
7 | - * |
|
8 | - * Event Registration and Management Plugin for WordPress |
|
9 | - * |
|
10 | - * @ package Event Espresso |
|
11 | - * @ author Seth Shoultes |
|
12 | - * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
13 | - * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
14 | - * @ link http://www.eventespresso.com |
|
15 | - * @ version 4.3 |
|
16 | - * |
|
17 | - * ------------------------------------------------------------------------ |
|
18 | - * |
|
19 | - * authorize_net_aim_debug_info |
|
20 | - * |
|
21 | - * @package Event Espresso |
|
22 | - * @subpackage |
|
23 | - * @author Mike Nelson |
|
24 | - * |
|
25 | - * ------------------------------------------------------------------------ |
|
26 | - */ |
|
6 | + * Event Espresso |
|
7 | + * |
|
8 | + * Event Registration and Management Plugin for WordPress |
|
9 | + * |
|
10 | + * @ package Event Espresso |
|
11 | + * @ author Seth Shoultes |
|
12 | + * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
13 | + * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
14 | + * @ link http://www.eventespresso.com |
|
15 | + * @ version 4.3 |
|
16 | + * |
|
17 | + * ------------------------------------------------------------------------ |
|
18 | + * |
|
19 | + * authorize_net_aim_debug_info |
|
20 | + * |
|
21 | + * @package Event Espresso |
|
22 | + * @subpackage |
|
23 | + * @author Mike Nelson |
|
24 | + * |
|
25 | + * ------------------------------------------------------------------------ |
|
26 | + */ |
|
27 | 27 | ?> |
28 | 28 | <div class="sandbox-panel"> |
29 | 29 | <h2> |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | /** |
6 | 6 | * Event Espresso |
@@ -27,22 +27,22 @@ discard block |
||
27 | 27 | ?> |
28 | 28 | <div class="sandbox-panel"> |
29 | 29 | <h2> |
30 | - <?php _e( 'Authorize.net AIM Test Mode', 'event_espresso' ); ?> |
|
30 | + <?php _e('Authorize.net AIM Test Mode', 'event_espresso'); ?> |
|
31 | 31 | </h2> |
32 | 32 | |
33 | 33 | <p> |
34 | - <?php _e( 'Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.', 'event_espresso' ); ?> |
|
34 | + <?php _e('Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.', 'event_espresso'); ?> |
|
35 | 35 | </p> |
36 | 36 | |
37 | 37 | <p> |
38 | - <strong><?php _e( 'Example Card Numbers:', 'event_espresso' ); ?></strong> |
|
38 | + <strong><?php _e('Example Card Numbers:', 'event_espresso'); ?></strong> |
|
39 | 39 | </p> |
40 | 40 | |
41 | 41 | <p> |
42 | - 370000000000002 (<?php _e( 'American Express', 'event_espresso' ); ?>)<br/> |
|
43 | - 6011000000000012 (<?php _e( 'Discover', 'event_espresso' ); ?>)<br/> |
|
44 | - 5424000000000015 (<?php _e( 'MasterCard', 'event_espresso' ); ?>)<br/> |
|
45 | - 4007000000027 (<?php _e( 'Visa', 'event_espresso' ); ?>) |
|
42 | + 370000000000002 (<?php _e('American Express', 'event_espresso'); ?>)<br/> |
|
43 | + 6011000000000012 (<?php _e('Discover', 'event_espresso'); ?>)<br/> |
|
44 | + 5424000000000015 (<?php _e('MasterCard', 'event_espresso'); ?>)<br/> |
|
45 | + 4007000000027 (<?php _e('Visa', 'event_espresso'); ?>) |
|
46 | 46 | </p> |
47 | 47 | </div> |
48 | 48 | <?php |
@@ -1,7 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if (!defined('EVENT_ESPRESSO_VERSION')) { |
|
4 | 4 | exit('No direct script access allowed'); |
5 | +} |
|
5 | 6 | /** |
6 | 7 | * Event Espresso |
7 | 8 | * |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | |
6 | 6 | /** |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * |
26 | 26 | * ------------------------------------------------------------------------ |
27 | 27 | */ |
28 | -class EE_PMT_Mijireh extends EE_PMT_Base{ |
|
28 | +class EE_PMT_Mijireh extends EE_PMT_Base { |
|
29 | 29 | |
30 | 30 | |
31 | 31 | |
@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | require_once($this->file_folder().'EEG_Mijireh.gateway.php'); |
39 | 39 | $this->_gateway = new EEG_Mijireh(); |
40 | 40 | $this->_pretty_name = __("Mijireh", 'event_espresso'); |
41 | - $this->_default_description = __( 'After clicking "Finalize Registration", you will be able to enter your billing information and complete your payment.', 'event_espresso' ); |
|
41 | + $this->_default_description = __('After clicking "Finalize Registration", you will be able to enter your billing information and complete your payment.', 'event_espresso'); |
|
42 | 42 | parent::__construct($pm_instance); |
43 | - $this->_default_button_url = $this->file_url() . 'lib' . DS . 'mijireh-checkout-logo.png'; |
|
43 | + $this->_default_button_url = $this->file_url().'lib'.DS.'mijireh-checkout-logo.png'; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * @see EE_PMT_Base::help_tabs_config() |
51 | 51 | * @return array |
52 | 52 | */ |
53 | - public function help_tabs_config(){ |
|
53 | + public function help_tabs_config() { |
|
54 | 54 | return array( |
55 | 55 | $this->get_help_tab_name() => array( |
56 | 56 | 'title' => __('Mijireh Settings', 'event_espresso'), |
@@ -72,20 +72,20 @@ discard block |
||
72 | 72 | 'access_key' => new EE_Text_Input( |
73 | 73 | array( |
74 | 74 | 'html_label_text' => sprintf( |
75 | - __( "Mijireh Access Key %s", 'event_espresso' ), |
|
75 | + __("Mijireh Access Key %s", 'event_espresso'), |
|
76 | 76 | $this->get_help_tab_link() |
77 | 77 | ), |
78 | 78 | 'required' => true |
79 | 79 | ) |
80 | 80 | ), |
81 | 81 | ), |
82 | - 'exclude' => array( 'PMD_debug_mode' ), |
|
82 | + 'exclude' => array('PMD_debug_mode'), |
|
83 | 83 | ) |
84 | 84 | ); |
85 | 85 | $form->add_subsections( |
86 | 86 | array( |
87 | 87 | 'slurper_area' => new EE_Form_Section_HTML_From_Template( |
88 | - $this->file_folder() . DS . 'templates' . DS . 'mijireh_settings_after_form.template.php' |
|
88 | + $this->file_folder().DS.'templates'.DS.'mijireh_settings_after_form.template.php' |
|
89 | 89 | ) |
90 | 90 | ), |
91 | 91 | null, // no specific subsection targeted |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @param \EE_Transaction $transaction |
102 | 102 | * @return NULL |
103 | 103 | */ |
104 | - public function generate_new_billing_form( EE_Transaction $transaction = NULL ) { |
|
104 | + public function generate_new_billing_form(EE_Transaction $transaction = NULL) { |
|
105 | 105 | return NULL; |
106 | 106 | } |
107 | 107 |
@@ -1,7 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if (!defined('EVENT_ESPRESSO_VERSION')) { |
|
4 | 4 | exit('No direct script access allowed'); |
5 | +} |
|
5 | 6 | |
6 | 7 | /** |
7 | 8 | * Event Espresso |