Completed
Branch BUG-10202-persistent-admin-not... (260a81)
by
unknown
12:43 queued 14s
created
caffeinated/modules/recaptcha/ReCaptcha/ReCaptcha.php 2 patches
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -31,67 +31,67 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,13 +61,13 @@
 block discarded – undo
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();
Please login to merge, or discard this patch.
caffeinated/modules/recaptcha/ReCaptcha/RequestMethod/Curl.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -10,38 +10,38 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
caffeinated/modules/recaptcha/ReCaptcha/RequestMethod/SocketPost.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Indentation   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -36,85 +36,85 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
caffeinated/modules/recaptcha/ReCaptcha/RequestParameters.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,11 +80,11 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -31,73 +31,73 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
caffeinated/modules/recaptcha/ReCaptcha/Response.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -31,72 +31,72 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
caffeinated/modules/recaptcha/autoload.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -6,33 +6,33 @@
 block discarded – undo
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
 });
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
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.
Please login to merge, or discard this patch.
modules/ticket_selector_caff/EED_Ticket_Selector_Caff.module.php 3 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -47,14 +47,14 @@  discard block
 block discarded – undo
47 47
 	 * @param \WP $WP
48 48
 	 */
49 49
 	public function run( $WP ) {
50
-        $this->set_config();
50
+		$this->set_config();
51 51
 	}
52 52
 
53 53
 
54 54
 
55 55
 
56 56
 	protected function set_config(){
57
-        $this->set_config_section( 'template_settings' );
57
+		$this->set_config_section( 'template_settings' );
58 58
 		$this->set_config_class( 'EE_Ticket_Selector_Config' );
59 59
 		$this->set_config_name( 'EED_Ticket_Selector' );
60 60
 	}
@@ -103,27 +103,27 @@  discard block
 block discarded – undo
103 103
 
104 104
 
105 105
 
106
-    /**
107
-     * @return \EE_Form_Section_Proper
108
-     * @throws \EE_Error
109
-     */
110
-    public static function _ticket_selector_appearance_settings() {
111
-        if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
112
-            \EED_Ticket_Selector::instance()->set_config();
113
-            \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
114
-        }
115
-        // get option for whether to show datetime selector in TS
116
-	    $show_datetime_selector = \EE_Registry::instance()
117
-		    ->CFG
118
-		    ->template_settings
119
-		    ->EED_Ticket_Selector
120
-		    ->getShowDatetimeSelector();
121
-	    // and option for how may datetimes must exist if display is conditional
122
-	    $datetime_selector_threshold = \EE_Registry::instance()
123
-		    ->CFG
124
-		    ->template_settings
125
-		    ->EED_Ticket_Selector
126
-		    ->getDatetimeSelectorThreshold();
106
+	/**
107
+	 * @return \EE_Form_Section_Proper
108
+	 * @throws \EE_Error
109
+	 */
110
+	public static function _ticket_selector_appearance_settings() {
111
+		if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
112
+			\EED_Ticket_Selector::instance()->set_config();
113
+			\EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
114
+		}
115
+		// get option for whether to show datetime selector in TS
116
+		$show_datetime_selector = \EE_Registry::instance()
117
+			->CFG
118
+			->template_settings
119
+			->EED_Ticket_Selector
120
+			->getShowDatetimeSelector();
121
+		// and option for how may datetimes must exist if display is conditional
122
+		$datetime_selector_threshold = \EE_Registry::instance()
123
+			->CFG
124
+			->template_settings
125
+			->EED_Ticket_Selector
126
+			->getDatetimeSelectorThreshold();
127 127
 
128 128
 		return new EE_Form_Section_Proper(
129 129
 			array(
@@ -165,19 +165,19 @@  discard block
 block discarded – undo
165 165
 								)
166 166
 							),
167 167
 							'show_datetime_selector' => new EE_Select_Input(
168
-                                \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false),
168
+								\EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false),
169 169
 								array(
170 170
 									'html_label_text' => esc_html__( 'Show Date & Time Filter?', 'event_espresso' ),
171 171
 									'html_help_text' => sprintf(
172
-									    esc_html__(
173
-									        '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 &bull; %2$sdo not show date & time filter%3$s%1$s &nbsp; this option will NEVER display a date filter, regardless of how many dates exist.%1$s &bull; %2$smaybe show date & time filter%3$s%1$s &nbsp; this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".',
174
-                                            'event_espresso'
175
-                                        ),
176
-                                        '<br>',
177
-                                        '<strong>',
178
-                                        '</strong>'
179
-
180
-                                    ),
172
+										esc_html__(
173
+											'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 &bull; %2$sdo not show date & time filter%3$s%1$s &nbsp; this option will NEVER display a date filter, regardless of how many dates exist.%1$s &bull; %2$smaybe show date & time filter%3$s%1$s &nbsp; this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".',
174
+											'event_espresso'
175
+										),
176
+										'<br>',
177
+										'<strong>',
178
+										'</strong>'
179
+
180
+									),
181 181
 									'default' => ! empty( $show_datetime_selector )
182 182
 										? $show_datetime_selector
183 183
 										: \EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR,
@@ -185,13 +185,13 @@  discard block
 block discarded – undo
185 185
 								)
186 186
 							),
187 187
 							'datetime_selector_threshold' => new EE_Select_Input(
188
-                                array_combine($r = range(1, 10), $r),
188
+								array_combine($r = range(1, 10), $r),
189 189
 								array(
190 190
 									'html_label_text' => esc_html__( 'Date & Time Filter Threshold', 'event_espresso' ),
191 191
 									'html_help_text' => esc_html__(
192
-                                        'The number of unique dates an event has to have before conditionally displaying a date & time filter',
193
-                                        'event_espresso'
194
-                                    ),
192
+										'The number of unique dates an event has to have before conditionally displaying a date & time filter',
193
+										'event_espresso'
194
+									),
195 195
 									'default' => ! empty( $datetime_selector_threshold )
196 196
 										? $datetime_selector_threshold
197 197
 										: 3,
@@ -217,8 +217,8 @@  discard block
 block discarded – undo
217 217
 	 */
218 218
 	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
219 219
 		if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
220
-            \EED_Ticket_Selector::instance()->set_config();
221
-            $CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
220
+			\EED_Ticket_Selector::instance()->set_config();
221
+			$CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
222 222
 		}
223 223
 		try {
224 224
 			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
@@ -240,11 +240,11 @@  discard block
 block discarded – undo
240 240
 					$CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details'];
241 241
 					$CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets'];
242 242
 					$CFG->EED_Ticket_Selector->setShowDatetimeSelector(
243
-					    $valid_data['appearance_settings']['show_datetime_selector']
244
-                    );
243
+						$valid_data['appearance_settings']['show_datetime_selector']
244
+					);
245 245
 					$CFG->EED_Ticket_Selector->setDatetimeSelectorThreshold(
246
-					    $valid_data['appearance_settings']['datetime_selector_threshold']
247
-                    );
246
+						$valid_data['appearance_settings']['datetime_selector_threshold']
247
+					);
248 248
 				} else {
249 249
 					if ( $ticket_selector_form->submission_error_message() !== '' ) {
250 250
 						EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
Please login to merge, or discard this patch.
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
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,26 +37,26 @@  discard block
 block discarded – undo
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
 	/**
47 47
 	 * @param \WP $WP
48 48
 	 */
49
-	public function run( $WP ) {
49
+	public function run($WP) {
50 50
         $this->set_config();
51 51
 	}
52 52
 
53 53
 
54 54
 
55 55
 
56
-	protected function set_config(){
57
-        $this->set_config_section( 'template_settings' );
58
-		$this->set_config_class( 'EE_Ticket_Selector_Config' );
59
-		$this->set_config_name( 'EED_Ticket_Selector' );
56
+	protected function set_config() {
57
+        $this->set_config_section('template_settings');
58
+		$this->set_config_class('EE_Ticket_Selector_Config');
59
+		$this->set_config_name('EED_Ticket_Selector');
60 60
 	}
61 61
 
62 62
 
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
 					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
92 92
 					array(
93 93
 						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML(
94
-							EEH_HTML::br(2) .
95
-							EEH_HTML::h2( esc_html__( 'Ticket Selector Template Settings', 'event_espresso' ))
94
+							EEH_HTML::br(2).
95
+							EEH_HTML::h2(esc_html__('Ticket Selector Template Settings', 'event_espresso'))
96 96
 						),
97 97
 						'appearance_settings' 			=> EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings()
98 98
 					)
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
      * @throws \EE_Error
109 109
      */
110 110
     public static function _ticket_selector_appearance_settings() {
111
-        if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
111
+        if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
112 112
             \EED_Ticket_Selector::instance()->set_config();
113 113
             \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
114 114
         }
@@ -136,9 +136,9 @@  discard block
 block discarded – undo
136 136
 						array(
137 137
 							'show_ticket_details' => new EE_Yes_No_Input(
138 138
 								array(
139
-									'html_label_text' => esc_html__('Show Ticket Details?', 'event_espresso' ),
140
-									'html_help_text' => esc_html__( 'This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
141
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details )
139
+									'html_label_text' => esc_html__('Show Ticket Details?', 'event_espresso'),
140
+									'html_help_text' => esc_html__('This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
141
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details)
142 142
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details
143 143
 										: true,
144 144
 									'display_html_label_text' => false
@@ -146,9 +146,9 @@  discard block
 block discarded – undo
146 146
 							),
147 147
 							'show_ticket_sale_columns' => new EE_Yes_No_Input(
148 148
 								array(
149
-									'html_label_text' => esc_html__('Show Ticket Sale Info?', 'event_espresso' ),
150
-									'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'),
151
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns )
149
+									'html_label_text' => esc_html__('Show Ticket Sale Info?', 'event_espresso'),
150
+									'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'),
151
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns)
152 152
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns
153 153
 										: true,
154 154
 									'display_html_label_text' => false
@@ -156,9 +156,9 @@  discard block
 block discarded – undo
156 156
 							),
157 157
 							'show_expired_tickets' => new EE_Yes_No_Input(
158 158
 								array(
159
-									'html_label_text' => esc_html__( 'Show Expired Tickets?', 'event_espresso' ),
160
-									'html_help_text' => esc_html__( 'Indicate whether to show expired tickets in the ticket selector', 'event_espresso' ),
161
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets )
159
+									'html_label_text' => esc_html__('Show Expired Tickets?', 'event_espresso'),
160
+									'html_help_text' => esc_html__('Indicate whether to show expired tickets in the ticket selector', 'event_espresso'),
161
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets)
162 162
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets
163 163
 										: true,
164 164
 									'display_html_label_text' => false
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 							'show_datetime_selector' => new EE_Select_Input(
168 168
                                 \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false),
169 169
 								array(
170
-									'html_label_text' => esc_html__( 'Show Date & Time Filter?', 'event_espresso' ),
170
+									'html_label_text' => esc_html__('Show Date & Time Filter?', 'event_espresso'),
171 171
 									'html_help_text' => sprintf(
172 172
 									    esc_html__(
173 173
 									        '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 &bull; %2$sdo not show date & time filter%3$s%1$s &nbsp; this option will NEVER display a date filter, regardless of how many dates exist.%1$s &bull; %2$smaybe show date & time filter%3$s%1$s &nbsp; this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".',
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
                                         '</strong>'
179 179
 
180 180
                                     ),
181
-									'default' => ! empty( $show_datetime_selector )
181
+									'default' => ! empty($show_datetime_selector)
182 182
 										? $show_datetime_selector
183 183
 										: \EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR,
184 184
 									'display_html_label_text' => false
@@ -187,12 +187,12 @@  discard block
 block discarded – undo
187 187
 							'datetime_selector_threshold' => new EE_Select_Input(
188 188
                                 array_combine($r = range(1, 10), $r),
189 189
 								array(
190
-									'html_label_text' => esc_html__( 'Date & Time Filter Threshold', 'event_espresso' ),
190
+									'html_label_text' => esc_html__('Date & Time Filter Threshold', 'event_espresso'),
191 191
 									'html_help_text' => esc_html__(
192 192
                                         'The number of unique dates an event has to have before conditionally displaying a date & time filter',
193 193
                                         'event_espresso'
194 194
                                     ),
195
-									'default' => ! empty( $datetime_selector_threshold )
195
+									'default' => ! empty($datetime_selector_threshold)
196 196
 										? $datetime_selector_threshold
197 197
 										: 3,
198 198
 									'display_html_label_text' => false
@@ -215,8 +215,8 @@  discard block
 block discarded – undo
215 215
 	 * @param array              $REQ incoming request
216 216
 	 * @return EE_Template_Config
217 217
 	 */
218
-	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
219
-		if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
218
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ) {
219
+		if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
220 220
             \EED_Ticket_Selector::instance()->set_config();
221 221
             $CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
222 222
 		}
@@ -224,13 +224,13 @@  discard block
 block discarded – undo
224 224
 			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
225 225
 
226 226
 			//check for form submission
227
-			if ( $ticket_selector_form->was_submitted() ) {
227
+			if ($ticket_selector_form->was_submitted()) {
228 228
 
229 229
 				//capture form data
230 230
 				$ticket_selector_form->receive_form_submission();
231 231
 
232 232
 				//validate form data
233
-				if ( $ticket_selector_form->is_valid() ) {
233
+				if ($ticket_selector_form->is_valid()) {
234 234
 
235 235
 					//grab validated data from form
236 236
 					$valid_data = $ticket_selector_form->valid_data();
@@ -246,13 +246,13 @@  discard block
 block discarded – undo
246 246
 					    $valid_data['appearance_settings']['datetime_selector_threshold']
247 247
                     );
248 248
 				} else {
249
-					if ( $ticket_selector_form->submission_error_message() !== '' ) {
250
-						EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
249
+					if ($ticket_selector_form->submission_error_message() !== '') {
250
+						EE_Error::add_error($ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
251 251
 					}
252 252
 				}
253 253
 
254 254
 			}
255
-		} catch( EE_Error $e ) {
255
+		} catch (EE_Error $e) {
256 256
 			$e->get_error();
257 257
 		}
258 258
 
Please login to merge, or discard this patch.
caffeinated/payment_methods/Aim/EEG_Aim.gateway.php 4 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@
 block discarded – undo
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) {
Please login to merge, or discard this patch.
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
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
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EEG_Aim extends EE_Onsite_Gateway{
28
+class EEG_Aim extends EE_Onsite_Gateway {
29 29
 
30 30
 	const LIVE_URL    = 'https://secure2.authorize.net/gateway/transact.dll'; //Authnet URL
31 31
 
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
 	 * @param EEG_Aim $gateway_object
158 158
 	 * @return string
159 159
 	 */
160
-	public function possibly_use_deprecated_aim_server( $url, EEG_Aim $gateway_object ) {
161
-		if(  $gateway_object->_server === 'authorize.net'
162
-			&& ! $gateway_object->_debug_mode ) {
160
+	public function possibly_use_deprecated_aim_server($url, EEG_Aim $gateway_object) {
161
+		if ($gateway_object->_server === 'authorize.net'
162
+			&& ! $gateway_object->_debug_mode) {
163 163
 			return 'https://secure.authorize.net/gateway/transact.dll';
164 164
 		} else {
165 165
 			return $url;
@@ -182,33 +182,33 @@  discard block
 block discarded – undo
182 182
 	 */
183 183
 
184 184
 	public function do_direct_payment($payment, $billing_info = null) {
185
-			add_filter( 'FHEE__EEG_Aim___get_server_url', array( $this, 'possibly_use_deprecated_aim_server' ), 10, 2 );
185
+			add_filter('FHEE__EEG_Aim___get_server_url', array($this, 'possibly_use_deprecated_aim_server'), 10, 2);
186 186
 			// Enable test mode if needed
187 187
 			//4007000000027  <-- test successful visa
188 188
 			//4222222222222  <-- test failure card number
189 189
 
190 190
 			$item_num = 1;
191 191
 			$transaction = $payment->transaction();
192
-			$order_description = $this->_format_order_description( $payment );
192
+			$order_description = $this->_format_order_description($payment);
193 193
 			$primary_registrant = $transaction->primary_registration();
194 194
 			//if we're are charging for the full amount, show the normal line items
195 195
 			//and the itemized total adds up properly
196
-			if( $this->_can_easily_itemize_transaction_for( $payment ) ){
196
+			if ($this->_can_easily_itemize_transaction_for($payment)) {
197 197
 				$total_line_item = $transaction->total_line_item();
198 198
 				foreach ($total_line_item->get_items() as $line_item) {
199
-					if( $line_item->quantity() == 0 ){
199
+					if ($line_item->quantity() == 0) {
200 200
 						continue;
201 201
 					}
202 202
 					$this->addLineItem(
203 203
 						$item_num++, 
204
-						$this->_format_line_item_name( $line_item, $payment ), 
205
-						$this->_format_line_item_desc( $line_item, $payment ), 
204
+						$this->_format_line_item_name($line_item, $payment), 
205
+						$this->_format_line_item_desc($line_item, $payment), 
206 206
 						$line_item->quantity(),
207 207
 						$line_item->unit_price(), 
208 208
 						'N');
209 209
 					$order_description .= $line_item->desc().', ';
210 210
 				}
211
-				foreach($total_line_item->tax_descendants() as $tax_line_item){
211
+				foreach ($total_line_item->tax_descendants() as $tax_line_item) {
212 212
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
213 213
 				}
214 214
 			}
@@ -219,18 +219,18 @@  discard block
 block discarded – undo
219 219
 			//start transaction
220 220
 			//if in debug mode, use authorize.net's sandbox id; otherwise use the Event Espresso partner id
221 221
 			$partner_id = $this->_debug_mode ? 'AAA100302' : 'AAA105363';
222
-			$this->setField( 'solution_id', $partner_id );
222
+			$this->setField('solution_id', $partner_id);
223 223
 			$this->setField('amount', $this->format_currency($payment->amount()));
224
-			$this->setField('description',substr(rtrim($order_description, ', '), 0, 255));
225
-			$this->_set_sensitive_billing_data( $billing_info );
224
+			$this->setField('description', substr(rtrim($order_description, ', '), 0, 255));
225
+			$this->_set_sensitive_billing_data($billing_info);
226 226
 			$this->setField('first_name', $billing_info['first_name']);
227 227
 			$this->setField('last_name', $billing_info['last_name']);
228 228
 			$this->setField('email', $billing_info['email']);
229 229
 			$this->setField('company', $billing_info['company']);
230 230
 			$this->setField('address', $billing_info['address'].' '.$billing_info['address2']);
231 231
 			$this->setField('city', $billing_info['city']);
232
-			$this->setField('state', $billing_info['state'] );
233
-			$this->setField('country', $billing_info['country'] );
232
+			$this->setField('state', $billing_info['state']);
233
+			$this->setField('country', $billing_info['country']);
234 234
 			$this->setField('zip', $billing_info['zip']);
235 235
 			$this->setField('fax', $billing_info['fax']);
236 236
 			$this->setField('cust_id', $primary_registrant->ID());
@@ -238,9 +238,9 @@  discard block
 block discarded – undo
238 238
 			//invoice_num would be nice to have it be unique per SPCO page-load, that way if users
239 239
 			//press back, they don't submit a duplicate. However, we may be keeping the user on teh same spco page
240 240
 			//in which case, we need to generate teh invoice num per request right here...
241
-			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
241
+			$this->setField('invoice_num', wp_generate_password(12, false)); //$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
242 242
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
243
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
243
+            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS);
244 244
 
245 245
 
246 246
 			if ($this->_test_transactions) {
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 			//Capture response
251 251
 			$this->type = "AUTH_CAPTURE";
252 252
 			$response = $this->_sendRequest($payment);
253
-			if (!empty($response)){
253
+			if ( ! empty($response)) {
254 254
 				if ($this->_debug_mode) {
255 255
 					$txn_id = $response->invoice_number;
256 256
 				} else {
@@ -259,15 +259,15 @@  discard block
 block discarded – undo
259 259
 				$payment_status = $response->approved ? $this->_pay_model->approved_status() : $this->_pay_model->declined_status();
260 260
 				$payment->set_status($payment_status);
261 261
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
262
-				$payment->set_amount( (float) $response->amount );
263
-				$payment->set_gateway_response(sprintf("%s (code: %s)",$response->response_reason_text,$response->response_reason_code));
264
-				$payment->set_txn_id_chq_nmbr( $txn_id );
262
+				$payment->set_amount((float) $response->amount);
263
+				$payment->set_gateway_response(sprintf("%s (code: %s)", $response->response_reason_text, $response->response_reason_code));
264
+				$payment->set_txn_id_chq_nmbr($txn_id);
265 265
 				$payment->set_extra_accntng($primary_registrant->reg_code());
266
-				$payment->set_details(print_r($response,true));
266
+				$payment->set_details(print_r($response, true));
267 267
 			} else {
268 268
 				$payment->set_status($this->_pay_model->failed_status());
269 269
 				$payment->set_gateway_response(__("There was no response from Authorize.net", 'event_espresso'));
270
-				$payment->set_details(print_r($response,true));
270
+				$payment->set_details(print_r($response, true));
271 271
 			}
272 272
 		return $payment;
273 273
 	}
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 	 * what billing data gets sent
279 279
 	 * @param array $billing_info
280 280
 	 */
281
-	protected function _set_sensitive_billing_data( $billing_info ) {
281
+	protected function _set_sensitive_billing_data($billing_info) {
282 282
 		$this->setField('card_num', $billing_info['credit_card']);
283 283
 		$this->setField('exp_date', $billing_info['exp_month'].$billing_info['exp_year']);
284 284
 		$this->setField('card_code', $billing_info['cvv']);
@@ -337,22 +337,22 @@  discard block
 block discarded – undo
337 337
 		$this->_x_post_fields['tran_key'] = $this->_transaction_key;
338 338
 		$x_keys = array();
339 339
 		foreach ($this->_x_post_fields as $key => $value) {
340
-			$x_keys[] = "x_$key=" . urlencode($value);
340
+			$x_keys[] = "x_$key=".urlencode($value);
341 341
 		}
342 342
 		// Add line items
343 343
 		foreach ($this->_additional_line_items as $key => $value) {
344
-			$x_keys[] =  "x_line_item=" . urlencode($value);
344
+			$x_keys[] = "x_line_item=".urlencode($value);
345 345
 		}
346 346
 		$this->_log_clean_request($x_keys, $payment);
347 347
 		$post_url = $this->_get_server_url();
348 348
 		$curl_request = curl_init($post_url);
349
-		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&",$x_keys));
349
+		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&", $x_keys));
350 350
 		curl_setopt($curl_request, CURLOPT_HEADER, 0);
351 351
 		curl_setopt($curl_request, CURLOPT_TIMEOUT, 45);
352 352
 		curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1);
353 353
 		curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2);
354 354
 		if ($this->VERIFY_PEER) {
355
-			curl_setopt($curl_request, CURLOPT_CAINFO, dirname( __DIR__ ) . '/ssl/cert.pem');
355
+			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(__DIR__).'/ssl/cert.pem');
356 356
 		} else {
357 357
 			curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
358 358
 		}
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
 		$response = curl_exec($curl_request);
365 365
 
366 366
 		curl_close($curl_request);
367
-		$response_obj =  new EE_AuthorizeNetAIM_Response($response);
367
+		$response_obj = new EE_AuthorizeNetAIM_Response($response);
368 368
 
369 369
 		return $this->_log_and_clean_response($response_obj, $payment);
370 370
 	}
@@ -373,18 +373,18 @@  discard block
 block discarded – undo
373 373
 	 * @param array $request_array
374 374
 	 * @param EEI_Payment $payment
375 375
 	 */
376
-	protected function _log_clean_request($request_array,$payment){
377
-		$keys_to_filter_out = array( 'x_card_num', 'x_card_code', 'x_exp_date' );
378
-		foreach($request_array as $index => $keyvaltogether ) {
379
-			foreach( $keys_to_filter_out as $key ) {
380
-				if( strpos( $keyvaltogether, $key ) === 0 ){
376
+	protected function _log_clean_request($request_array, $payment) {
377
+		$keys_to_filter_out = array('x_card_num', 'x_card_code', 'x_exp_date');
378
+		foreach ($request_array as $index => $keyvaltogether) {
379
+			foreach ($keys_to_filter_out as $key) {
380
+				if (strpos($keyvaltogether, $key) === 0) {
381 381
 					//found it at the first character
382 382
 					//so its one of them
383
-					unset( $request_array[ $index ] );
383
+					unset($request_array[$index]);
384 384
 				}
385 385
 			}
386 386
 		}
387
-		$this->log(array('AIM Request sent:'=>$request_array, 'Server URL' => $this->_get_server_url() ),$payment);
387
+		$this->log(array('AIM Request sent:'=>$request_array, 'Server URL' => $this->_get_server_url()), $payment);
388 388
 	}
389 389
 
390 390
 
@@ -396,9 +396,9 @@  discard block
 block discarded – undo
396 396
 	 * @param EE_Payment                  $payment
397 397
 	 * @return \EE_AuthorizeNetAIM_Response
398 398
 	 */
399
-	private function _log_and_clean_response($response_obj,$payment){
399
+	private function _log_and_clean_response($response_obj, $payment) {
400 400
 		$response_obj->account_number = '';
401
-		$this->log(array('AIM Response received:'=>$response_obj),$payment);
401
+		$this->log(array('AIM Response received:'=>$response_obj), $payment);
402 402
 		return $response_obj;
403 403
 	}
404 404
 
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 			// Split Array
498 498
 			$this->response = $response;
499 499
 			if ($encap_char) {
500
-				$this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
500
+				$this->_response_array = explode($encap_char.$delimiter.$encap_char, substr($response, 1, -1));
501 501
 			} else {
502 502
 				$this->_response_array = explode($delimiter, $response);
503 503
 			}
@@ -567,7 +567,7 @@  discard block
 block discarded – undo
567 567
 			$this->held = ($this->response_code === self::HELD);
568 568
 
569 569
 			if ($this->error || $this->declined || $this->held) {
570
-				$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> ';
570
+				$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> ';
571 571
 
572 572
 
573 573
 				/* $this->error_message = "AuthorizeNet Error:
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
 
587 587
 }
588 588
 
589
-if ( ! class_exists( 'AuthorizeNetException' ) ) {
589
+if ( ! class_exists('AuthorizeNetException')) {
590 590
 	/**
591 591
 	 * Class AuthorizeNetException
592 592
 	 *
@@ -602,8 +602,8 @@  discard block
 block discarded – undo
602 602
 		 * @param Exception $previous [optional] The previous exception used for the exception chaining. Since 5.3.0
603 603
 		 * @since 5.1.0
604 604
 		 */
605
-		public function __construct( $message = "", $code = 0, Exception $previous = null ) {
606
-			parent::__construct( $message, $code, $previous );
605
+		public function __construct($message = "", $code = 0, Exception $previous = null) {
606
+			parent::__construct($message, $code, $previous);
607 607
 		}
608 608
 	}
609 609
 }
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -329,7 +329,7 @@
 block discarded – undo
329 329
 	/**
330 330
 	 * Posts the request to AuthorizeNet & returns response.
331 331
 	 *
332
-	 * @param $payment
332
+	 * @param EEI_Payment $payment
333 333
 	 * @return \EE_AuthorizeNetAIM_Response
334 334
 	 */
335 335
 	private function _sendRequest($payment) {
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
payment_methods/Aim/templates/authorize_net_aim_debug_info.template.php 3 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -3,27 +3,27 @@
 block discarded – undo
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>
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
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
  *
Please login to merge, or discard this patch.