@@ -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. |
@@ -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 |
@@ -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 | |
@@ -37,24 +37,24 @@ discard block |
||
37 | 37 | * @return void |
38 | 38 | */ |
39 | 39 | public static function set_hooks_admin() { |
40 | - define( 'TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS ); |
|
41 | - add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Ticket_Selector_Caff', 'template_settings_form' ), 10 ); |
|
42 | - add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Ticket_Selector_Caff', 'update_template_settings' ), 10, 2 ); |
|
40 | + define('TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS); |
|
41 | + add_action('AHEE__template_settings__template__before_settings_form', array('EED_Ticket_Selector_Caff', 'template_settings_form'), 10); |
|
42 | + add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Ticket_Selector_Caff', 'update_template_settings'), 10, 2); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
46 | 46 | //just required because of abstract declaration |
47 | - public function run( $WP ) { |
|
47 | + public function run($WP) { |
|
48 | 48 | $this->set_config(); |
49 | 49 | } |
50 | 50 | |
51 | 51 | |
52 | 52 | |
53 | 53 | |
54 | - protected function set_config(){ |
|
55 | - $this->set_config_section( 'template_settings' ); |
|
56 | - $this->set_config_class( 'EE_Ticket_Selector_Config' ); |
|
57 | - $this->set_config_name( 'EED_Ticket_Selector' ); |
|
54 | + protected function set_config() { |
|
55 | + $this->set_config_section('template_settings'); |
|
56 | + $this->set_config_class('EE_Ticket_Selector_Config'); |
|
57 | + $this->set_config_name('EED_Ticket_Selector'); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | 'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections', |
90 | 90 | array( |
91 | 91 | 'appearance_settings_hdr' => new EE_Form_Section_HTML( |
92 | - EEH_HTML::br(2) . |
|
93 | - EEH_HTML::h2( __( 'Ticket Selector Template Settings', 'event_espresso' )) |
|
92 | + EEH_HTML::br(2). |
|
93 | + EEH_HTML::h2(__('Ticket Selector Template Settings', 'event_espresso')) |
|
94 | 94 | ), |
95 | 95 | 'appearance_settings' => EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings() |
96 | 96 | ) |
@@ -114,25 +114,25 @@ discard block |
||
114 | 114 | 'FHEE__EED_Ticket_Selector_Caff___ticket_selector_appearance_settings__form_subsections', array( |
115 | 115 | 'show_ticket_details' => new EE_Yes_No_Input( |
116 | 116 | array( |
117 | - 'html_label_text' => __('Show Ticket Details?', 'event_espresso' ), |
|
118 | - 'html_help_text' => __( 'This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'), |
|
119 | - 'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details ) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details : true, |
|
117 | + 'html_label_text' => __('Show Ticket Details?', 'event_espresso'), |
|
118 | + 'html_help_text' => __('This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'), |
|
119 | + 'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details : true, |
|
120 | 120 | 'display_html_label_text' => false |
121 | 121 | ) |
122 | 122 | ), |
123 | 123 | 'show_ticket_sale_columns' => new EE_Yes_No_Input( |
124 | 124 | array( |
125 | - 'html_label_text' => __('Show Ticket Sale Info?', 'event_espresso' ), |
|
126 | - 'html_help_text' => __( 'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'), |
|
127 | - 'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns ) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns : true, |
|
125 | + 'html_label_text' => __('Show Ticket Sale Info?', 'event_espresso'), |
|
126 | + 'html_help_text' => __('This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'), |
|
127 | + 'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns : true, |
|
128 | 128 | 'display_html_label_text' => false |
129 | 129 | ) |
130 | 130 | ), |
131 | 131 | 'show_expired_tickets' => new EE_Yes_No_Input( |
132 | 132 | array( |
133 | - 'html_label_text' => __( 'Show Expired Tickets?', 'event_espresso' ), |
|
134 | - 'html_help_text' => __( 'Indicate whether to show expired tickets in the ticket selector', 'event_espresso' ), |
|
135 | - 'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets ) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets : true, |
|
133 | + 'html_label_text' => __('Show Expired Tickets?', 'event_espresso'), |
|
134 | + 'html_help_text' => __('Indicate whether to show expired tickets in the ticket selector', 'event_espresso'), |
|
135 | + 'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets : true, |
|
136 | 136 | 'display_html_label_text' => false |
137 | 137 | ) |
138 | 138 | ) |
@@ -155,21 +155,21 @@ discard block |
||
155 | 155 | * |
156 | 156 | * @return void |
157 | 157 | */ |
158 | - public static function update_template_settings( EE_Template_Config $CFG, $REQ ) { |
|
159 | - if ( ! isset( $CFG->EED_Ticket_Selector ) ) { |
|
158 | + public static function update_template_settings(EE_Template_Config $CFG, $REQ) { |
|
159 | + if ( ! isset($CFG->EED_Ticket_Selector)) { |
|
160 | 160 | $CFG->EED_Ticket_Selector = new EE_Ticket_Selector_Config(); |
161 | 161 | } |
162 | 162 | try { |
163 | 163 | $ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form(); |
164 | 164 | |
165 | 165 | //check for form submission |
166 | - if ( $ticket_selector_form->was_submitted() ) { |
|
166 | + if ($ticket_selector_form->was_submitted()) { |
|
167 | 167 | |
168 | 168 | //capture form data |
169 | 169 | $ticket_selector_form->receive_form_submission(); |
170 | 170 | |
171 | 171 | //validate form data |
172 | - if ( $ticket_selector_form->is_valid() ) { |
|
172 | + if ($ticket_selector_form->is_valid()) { |
|
173 | 173 | |
174 | 174 | //grab validated data from form |
175 | 175 | $valid_data = $ticket_selector_form->valid_data(); |
@@ -179,13 +179,13 @@ discard block |
||
179 | 179 | $CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details']; |
180 | 180 | $CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets']; |
181 | 181 | } else { |
182 | - if ( $ticket_selector_form->submission_error_message() != '' ) { |
|
183 | - EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ ); |
|
182 | + if ($ticket_selector_form->submission_error_message() != '') { |
|
183 | + EE_Error::add_error($ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__); |
|
184 | 184 | } |
185 | 185 | } |
186 | 186 | |
187 | 187 | } |
188 | - } catch( EE_Error $e ) { |
|
188 | + } catch (EE_Error $e) { |
|
189 | 189 | $e->get_error(); |
190 | 190 | } |
191 | 191 |
@@ -135,7 +135,7 @@ |
||
135 | 135 | //in which case, we need to generate teh invoice num per request right here... |
136 | 136 | $this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']); |
137 | 137 | //tell AIM that any duplicates sent in the next 5 minutes are to be ignored |
138 | - $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS ); |
|
138 | + $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS ); |
|
139 | 139 | |
140 | 140 | |
141 | 141 | if ($this->_test_transactions) { |
@@ -1,7 +1,8 @@ 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 | 7 | /** |
7 | 8 | * Event Espresso |
@@ -107,7 +108,7 @@ discard block |
||
107 | 108 | foreach($total_line_item->tax_descendants() as $tax_line_item){ |
108 | 109 | $this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N'); |
109 | 110 | } |
110 | - }else{//partial payment |
|
111 | + } else{//partial payment |
|
111 | 112 | $order_description = sprintf(__("Payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code()); |
112 | 113 | } |
113 | 114 |
@@ -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 EEG_Aim extends EE_Onsite_Gateway{ |
|
28 | +class EEG_Aim extends EE_Onsite_Gateway { |
|
29 | 29 | protected $_login_id; |
30 | 30 | protected $_transaction_key; |
31 | 31 | protected $_currencies_supported = array( |
@@ -98,17 +98,17 @@ discard block |
||
98 | 98 | $primary_registrant = $transaction->primary_registration(); |
99 | 99 | //if we're are charging for the full amount, show the normal line items |
100 | 100 | //and the itemized total adds up properly |
101 | - if( $this->_can_easily_itemize_transaction_for( $payment ) ){ |
|
101 | + if ($this->_can_easily_itemize_transaction_for($payment)) { |
|
102 | 102 | $total_line_item = $transaction->total_line_item(); |
103 | 103 | foreach ($total_line_item->get_items() as $line_item) { |
104 | 104 | $this->addLineItem($item_num++, $line_item->name(), $line_item->desc(), $line_item->quantity(), $line_item->unit_price(), 'N'); |
105 | 105 | $order_description .= $line_item->desc().', '; |
106 | 106 | } |
107 | - foreach($total_line_item->tax_descendants() as $tax_line_item){ |
|
107 | + foreach ($total_line_item->tax_descendants() as $tax_line_item) { |
|
108 | 108 | $this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N'); |
109 | 109 | } |
110 | - }else{//partial payment |
|
111 | - $order_description = sprintf(__("Payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code()); |
|
110 | + } else {//partial payment |
|
111 | + $order_description = sprintf(__("Payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code()); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | //start transaction |
118 | 118 | $this->setField('amount', $this->format_currency($payment->amount())); |
119 | - $this->setField('description',substr(rtrim($order_description, ', '), 0, 255)); |
|
119 | + $this->setField('description', substr(rtrim($order_description, ', '), 0, 255)); |
|
120 | 120 | $this->setField('card_num', $billing_info['credit_card']); |
121 | 121 | $this->setField('exp_date', $billing_info['exp_month'].$billing_info['exp_year']); |
122 | 122 | $this->setField('card_code', $billing_info['cvv']); |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | $this->setField('company', $billing_info['company']); |
127 | 127 | $this->setField('address', $billing_info['address'].' '.$billing_info['address2']); |
128 | 128 | $this->setField('city', $billing_info['city']); |
129 | - $this->setField('state', $billing_info['state'] ); |
|
130 | - $this->setField('country', $billing_info['country'] ); |
|
129 | + $this->setField('state', $billing_info['state']); |
|
130 | + $this->setField('country', $billing_info['country']); |
|
131 | 131 | $this->setField('zip', $billing_info['zip']); |
132 | 132 | $this->setField('fax', $billing_info['fax']); |
133 | 133 | $this->setField('cust_id', $primary_registrant->ID()); |
@@ -135,9 +135,9 @@ discard block |
||
135 | 135 | //invoice_num would be nice to have itbe unique per SPCO page-load, taht way if users |
136 | 136 | //press back, they don't submit a duplicate. However, we may be keepin gthe user on teh same spco page |
137 | 137 | //in which case, we need to generate teh invoice num per request right here... |
138 | - $this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']); |
|
138 | + $this->setField('invoice_num', wp_generate_password(12, false)); //$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']); |
|
139 | 139 | //tell AIM that any duplicates sent in the next 5 minutes are to be ignored |
140 | - $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS ); |
|
140 | + $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS); |
|
141 | 141 | |
142 | 142 | |
143 | 143 | if ($this->_test_transactions) { |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | //Capture response |
148 | 148 | $this->type = "AUTH_CAPTURE"; |
149 | 149 | $response = $this->_sendRequest($payment); |
150 | - if (!empty($response)){ |
|
150 | + if ( ! empty($response)) { |
|
151 | 151 | if ($this->_debug_mode) { |
152 | 152 | $txn_id = $response->invoice_number; |
153 | 153 | } else { |
@@ -156,15 +156,15 @@ discard block |
||
156 | 156 | $payment_status = $response->approved ? $this->_pay_model->approved_status() : $this->_pay_model->declined_status(); |
157 | 157 | $payment->set_status($payment_status); |
158 | 158 | //make sure we interpret the AMT as a float, not an international string (where periods are thousand seperators) |
159 | - $payment->set_amount( floatval( $response->amount ) ); |
|
160 | - $payment->set_gateway_response(sprintf("%s (code: %s)",$response->response_reason_text,$response->response_reason_code)); |
|
161 | - $payment->set_txn_id_chq_nmbr( $txn_id ); |
|
159 | + $payment->set_amount(floatval($response->amount)); |
|
160 | + $payment->set_gateway_response(sprintf("%s (code: %s)", $response->response_reason_text, $response->response_reason_code)); |
|
161 | + $payment->set_txn_id_chq_nmbr($txn_id); |
|
162 | 162 | $payment->set_extra_accntng($primary_registrant->reg_code()); |
163 | - $payment->set_details(print_r($response,true)); |
|
163 | + $payment->set_details(print_r($response, true)); |
|
164 | 164 | } else { |
165 | 165 | $payment->set_status($this->_pay_model->failed_status()); |
166 | 166 | $payment->set_gateway_response(__("There was no response from Authorize.net", 'event_espresso')); |
167 | - $payment->set_details(print_r($response,true)); |
|
167 | + $payment->set_details(print_r($response, true)); |
|
168 | 168 | } |
169 | 169 | return $payment; |
170 | 170 | } |
@@ -215,22 +215,22 @@ discard block |
||
215 | 215 | $this->_x_post_fields['tran_key'] = $this->_transaction_key; |
216 | 216 | $x_keys = array(); |
217 | 217 | foreach ($this->_x_post_fields as $key => $value) { |
218 | - $x_keys[] = "x_$key=" . urlencode($value); |
|
218 | + $x_keys[] = "x_$key=".urlencode($value); |
|
219 | 219 | } |
220 | 220 | // Add line items |
221 | 221 | foreach ($this->_additional_line_items as $key => $value) { |
222 | - $x_keys[] = "x_line_item=" . urlencode($value); |
|
222 | + $x_keys[] = "x_line_item=".urlencode($value); |
|
223 | 223 | } |
224 | 224 | $this->_log_clean_request($x_keys, $payment); |
225 | 225 | $post_url = ($this->_debug_mode ? self::SANDBOX_URL : self::LIVE_URL); |
226 | 226 | $curl_request = curl_init($post_url); |
227 | - curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&",$x_keys)); |
|
227 | + curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&", $x_keys)); |
|
228 | 228 | curl_setopt($curl_request, CURLOPT_HEADER, 0); |
229 | 229 | curl_setopt($curl_request, CURLOPT_TIMEOUT, 45); |
230 | 230 | curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1); |
231 | 231 | curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2); |
232 | 232 | if ($this->VERIFY_PEER) { |
233 | - curl_setopt($curl_request, CURLOPT_CAINFO, dirname(dirname(__FILE__)) . '/ssl/cert.pem'); |
|
233 | + curl_setopt($curl_request, CURLOPT_CAINFO, dirname(dirname(__FILE__)).'/ssl/cert.pem'); |
|
234 | 234 | } else { |
235 | 235 | curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false); |
236 | 236 | } |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | $response = curl_exec($curl_request); |
243 | 243 | |
244 | 244 | curl_close($curl_request); |
245 | - $response_obj = new EE_AuthorizeNetAIM_Response($response); |
|
245 | + $response_obj = new EE_AuthorizeNetAIM_Response($response); |
|
246 | 246 | |
247 | 247 | return $this->_log_and_clean_response($response_obj, $payment); |
248 | 248 | } |
@@ -251,18 +251,18 @@ discard block |
||
251 | 251 | * @param array $request_array |
252 | 252 | * @param EEI_Payment $payment |
253 | 253 | */ |
254 | - private function _log_clean_request($request_array,$payment){ |
|
255 | - $keys_to_filter_out = array( 'x_card_num', 'x_card_code', 'x_exp_date' ); |
|
256 | - foreach($request_array as $index => $keyvaltogether ) { |
|
257 | - foreach( $keys_to_filter_out as $key ) { |
|
258 | - if( strpos( $keyvaltogether, $key ) === 0 ){ |
|
254 | + private function _log_clean_request($request_array, $payment) { |
|
255 | + $keys_to_filter_out = array('x_card_num', 'x_card_code', 'x_exp_date'); |
|
256 | + foreach ($request_array as $index => $keyvaltogether) { |
|
257 | + foreach ($keys_to_filter_out as $key) { |
|
258 | + if (strpos($keyvaltogether, $key) === 0) { |
|
259 | 259 | //found it at the first character |
260 | 260 | //so its one of them |
261 | - unset( $request_array[ $index ] ); |
|
261 | + unset($request_array[$index]); |
|
262 | 262 | } |
263 | 263 | } |
264 | 264 | } |
265 | - $this->log(array('AIM Request sent:'=>$request_array),$payment); |
|
265 | + $this->log(array('AIM Request sent:'=>$request_array), $payment); |
|
266 | 266 | } |
267 | 267 | |
268 | 268 | /** |
@@ -270,9 +270,9 @@ discard block |
||
270 | 270 | * @param EE_AuthorizeNetAIM_Response $response_obj |
271 | 271 | * @param EE_Payment $payment |
272 | 272 | */ |
273 | - private function _log_and_clean_response($response_obj,$payment){ |
|
273 | + private function _log_and_clean_response($response_obj, $payment) { |
|
274 | 274 | $response_obj->account_number = ''; |
275 | - $this->log(array('AIM Response received:'=>$response_obj),$payment); |
|
275 | + $this->log(array('AIM Response received:'=>$response_obj), $payment); |
|
276 | 276 | return $response_obj; |
277 | 277 | } |
278 | 278 | |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | // Split Array |
369 | 369 | $this->response = $response; |
370 | 370 | if ($encap_char) { |
371 | - $this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1)); |
|
371 | + $this->_response_array = explode($encap_char.$delimiter.$encap_char, substr($response, 1, -1)); |
|
372 | 372 | } else { |
373 | 373 | $this->_response_array = explode($delimiter, $response); |
374 | 374 | } |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | $this->held = ($this->response_code == self::HELD); |
439 | 439 | |
440 | 440 | if ($this->error || $this->declined || $this->held) { |
441 | - $this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />' . $this->response_reason_text . '<br /><span class="response_code">Response Code: ' . $this->response_code . '<br /></span><span class="response_subcode">Response Subcode: ' . $this->response_subcode . '</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> '; |
|
441 | + $this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />'.$this->response_reason_text.'<br /><span class="response_code">Response Code: '.$this->response_code.'<br /></span><span class="response_subcode">Response Subcode: '.$this->response_subcode.'</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> '; |
|
442 | 442 | |
443 | 443 | |
444 | 444 | /* $this->error_message = "AuthorizeNet Error: |