Completed
Branch BETA-4.9-message-activity (09871e)
by
unknown
17:34
created
mijireh_slurper/templates/additional_content_on_gateway.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <tr>
2
-	<th><?php _e("Mijireh Checkout Page Design", 'event_espresso');?><?php echo EEH_Template::get_help_tab_link( 'ee_mijireh_help_tab' ); ?></th>
2
+	<th><?php _e("Mijireh Checkout Page Design", 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('ee_mijireh_help_tab'); ?></th>
3 3
 	<td>
4
-		<a href="?mijireh_edit_slurp_page=true"><?php _e("Edit Slurp Page", 'event_espresso');?></a>
4
+		<a href="?mijireh_edit_slurp_page=true"><?php _e("Edit Slurp Page", 'event_espresso'); ?></a>
5 5
 	</td>
6 6
 </tr>
7 7
\ No newline at end of file
Please login to merge, or discard this patch.
modules/mijireh_slurper/templates/mijireh_slurp_page_metabox.template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
    <div id='mijireh_notice' class='mijireh-info alert-message info' data-alert='alert'>
2
-      <div class='mijireh-logo'><img src='<?php echo $mijireh_image_url;?>' alt='<?php printf( esc_attr__( '%s Checkout Logo', 'event_espresso' ), 'Mijereh' ); ?>'></div>
2
+      <div class='mijireh-logo'><img src='<?php echo $mijireh_image_url; ?>' alt='<?php printf(esc_attr__('%s Checkout Logo', 'event_espresso'), 'Mijereh'); ?>'></div>
3 3
       <div class='mijireh-blurb'>
4
-		  <h2><?php _e("Slurp Into Mijireh", 'event_espresso');?></h2>
5
-		  <p><?php printf(__("Design the page how you want, and be sure to include the special text {{mj-checkout-form}} to indicate where to place Mijireh's Checkout Form. You may want to read %s Mijireh's instructions on slurping%s.", 'event_espresso'),"<a href='http://www.mijireh.com/docs/what-is-page-slurp/'>","</a>");?>
4
+		  <h2><?php _e("Slurp Into Mijireh", 'event_espresso'); ?></h2>
5
+		  <p><?php printf(__("Design the page how you want, and be sure to include the special text {{mj-checkout-form}} to indicate where to place Mijireh's Checkout Form. You may want to read %s Mijireh's instructions on slurping%s.", 'event_espresso'), "<a href='http://www.mijireh.com/docs/what-is-page-slurp/'>", "</a>"); ?>
6 6
 
7 7
         <p class='aligncenter'><a href='<?php echo $slurp_action_link?>' id='page_slurp' class='button-primary'>Slurp This Page!</a></p>
8 8
         <p class="aligncenter"><a class="nobold" href="https://secure.mijireh.com/checkout/<?php echo $access_key?>" id="view_slurp" target="_new">Preview Checkout Page</a></p>
Please login to merge, or discard this patch.
modules/mijireh_slurper/templates/slurping_in_progress_notice.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,3 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
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.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -1,28 +1,28 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This is a PHP library that handles calling reCAPTCHA.
4
- *
5
- * @copyright Copyright (c) 2015, Google Inc.
6
- * @link      http://www.google.com/recaptcha
7
- *
8
- * Permission is hereby granted, free of charge, to any person obtaining a copy
9
- * of this software and associated documentation files (the "Software"), to deal
10
- * in the Software without restriction, including without limitation the rights
11
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12
- * copies of the Software, and to permit persons to whom the Software is
13
- * furnished to do so, subject to the following conditions:
14
- *
15
- * The above copyright notice and this permission notice shall be included in
16
- * all copies or substantial portions of the Software.
17
- *
18
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24
- * THE SOFTWARE.
25
- */
3
+	 * This is a PHP library that handles calling reCAPTCHA.
4
+	 *
5
+	 * @copyright Copyright (c) 2015, Google Inc.
6
+	 * @link      http://www.google.com/recaptcha
7
+	 *
8
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
9
+	 * of this software and associated documentation files (the "Software"), to deal
10
+	 * in the Software without restriction, including without limitation the rights
11
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12
+	 * copies of the Software, and to permit persons to whom the Software is
13
+	 * furnished to do so, subject to the following conditions:
14
+	 *
15
+	 * The above copyright notice and this permission notice shall be included in
16
+	 * all copies or substantial portions of the Software.
17
+	 *
18
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24
+	 * THE SOFTWARE.
25
+	 */
26 26
 
27 27
 namespace ReCaptcha;
28 28
 
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 interface RequestMethod
33 33
 {
34 34
 
35
-    /**
36
-     * Submit the request with the specified parameters.
37
-     *
38
-     * @param RequestParameters $params Request parameters
39
-     * @return string Body of the reCAPTCHA response
40
-     */
41
-    public function submit(RequestParameters $params);
35
+	/**
36
+	 * Submit the request with the specified parameters.
37
+	 *
38
+	 * @param RequestParameters $params Request parameters
39
+	 * @return string Body of the reCAPTCHA response
40
+	 */
41
+	public function submit(RequestParameters $params);
42 42
 }
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/Post.php 1 patch
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -1,28 +1,28 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This is a PHP library that handles calling reCAPTCHA.
4
- *
5
- * @copyright Copyright (c) 2015, Google Inc.
6
- * @link      http://www.google.com/recaptcha
7
- *
8
- * Permission is hereby granted, free of charge, to any person obtaining a copy
9
- * of this software and associated documentation files (the "Software"), to deal
10
- * in the Software without restriction, including without limitation the rights
11
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12
- * copies of the Software, and to permit persons to whom the Software is
13
- * furnished to do so, subject to the following conditions:
14
- *
15
- * The above copyright notice and this permission notice shall be included in
16
- * all copies or substantial portions of the Software.
17
- *
18
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24
- * THE SOFTWARE.
25
- */
3
+	 * This is a PHP library that handles calling reCAPTCHA.
4
+	 *
5
+	 * @copyright Copyright (c) 2015, Google Inc.
6
+	 * @link      http://www.google.com/recaptcha
7
+	 *
8
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
9
+	 * of this software and associated documentation files (the "Software"), to deal
10
+	 * in the Software without restriction, including without limitation the rights
11
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12
+	 * copies of the Software, and to permit persons to whom the Software is
13
+	 * furnished to do so, subject to the following conditions:
14
+	 *
15
+	 * The above copyright notice and this permission notice shall be included in
16
+	 * all copies or substantial portions of the Software.
17
+	 *
18
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24
+	 * THE SOFTWARE.
25
+	 */
26 26
 
27 27
 namespace ReCaptcha\RequestMethod;
28 28
 
@@ -34,37 +34,37 @@  discard block
 block discarded – undo
34 34
  */
35 35
 class Post implements RequestMethod
36 36
 {
37
-    /**
38
-     * URL to which requests are POSTed.
39
-     * @const string
40
-     */
41
-    const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
37
+	/**
38
+	 * URL to which requests are POSTed.
39
+	 * @const string
40
+	 */
41
+	const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
42 42
 
43
-    /**
44
-     * Submit the POST request with the specified parameters.
45
-     *
46
-     * @param RequestParameters $params Request parameters
47
-     * @return string Body of the reCAPTCHA response
48
-     */
49
-    public function submit(RequestParameters $params)
50
-    {
51
-        /**
52
-         * PHP 5.6.0 changed the way you specify the peer name for SSL context options.
53
-         * Using "CN_name" will still work, but it will raise deprecated errors.
54
-         */
55
-        $peer_key = version_compare(PHP_VERSION, '5.6.0', '<') ? 'CN_name' : 'peer_name';
56
-        $options = array(
57
-            'http' => array(
58
-                'header' => "Content-type: application/x-www-form-urlencoded\r\n",
59
-                'method' => 'POST',
60
-                'content' => $params->toQueryString(),
61
-                // Force the peer to validate (not needed in 5.6.0+, but still works
62
-                'verify_peer' => true,
63
-                // Force the peer validation to use www.google.com
64
-                $peer_key => 'www.google.com',
65
-            ),
66
-        );
67
-        $context = stream_context_create($options);
68
-        return file_get_contents(self::SITE_VERIFY_URL, false, $context);
69
-    }
43
+	/**
44
+	 * Submit the POST request with the specified parameters.
45
+	 *
46
+	 * @param RequestParameters $params Request parameters
47
+	 * @return string Body of the reCAPTCHA response
48
+	 */
49
+	public function submit(RequestParameters $params)
50
+	{
51
+		/**
52
+		 * PHP 5.6.0 changed the way you specify the peer name for SSL context options.
53
+		 * Using "CN_name" will still work, but it will raise deprecated errors.
54
+		 */
55
+		$peer_key = version_compare(PHP_VERSION, '5.6.0', '<') ? 'CN_name' : 'peer_name';
56
+		$options = array(
57
+			'http' => array(
58
+				'header' => "Content-type: application/x-www-form-urlencoded\r\n",
59
+				'method' => 'POST',
60
+				'content' => $params->toQueryString(),
61
+				// Force the peer to validate (not needed in 5.6.0+, but still works
62
+				'verify_peer' => true,
63
+				// Force the peer validation to use www.google.com
64
+				$peer_key => 'www.google.com',
65
+			),
66
+		);
67
+		$context = stream_context_create($options);
68
+		return file_get_contents(self::SITE_VERIFY_URL, false, $context);
69
+	}
70 70
 }
Please login to merge, or discard this patch.
caffeinated/modules/recaptcha/ReCaptcha/RequestMethod/Socket.php 1 patch
Indentation   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -1,28 +1,28 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This is a PHP library that handles calling reCAPTCHA.
4
- *
5
- * @copyright Copyright (c) 2015, Google Inc.
6
- * @link      http://www.google.com/recaptcha
7
- *
8
- * Permission is hereby granted, free of charge, to any person obtaining a copy
9
- * of this software and associated documentation files (the "Software"), to deal
10
- * in the Software without restriction, including without limitation the rights
11
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12
- * copies of the Software, and to permit persons to whom the Software is
13
- * furnished to do so, subject to the following conditions:
14
- *
15
- * The above copyright notice and this permission notice shall be included in
16
- * all copies or substantial portions of the Software.
17
- *
18
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24
- * THE SOFTWARE.
25
- */
3
+	 * This is a PHP library that handles calling reCAPTCHA.
4
+	 *
5
+	 * @copyright Copyright (c) 2015, Google Inc.
6
+	 * @link      http://www.google.com/recaptcha
7
+	 *
8
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
9
+	 * of this software and associated documentation files (the "Software"), to deal
10
+	 * in the Software without restriction, including without limitation the rights
11
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12
+	 * copies of the Software, and to permit persons to whom the Software is
13
+	 * furnished to do so, subject to the following conditions:
14
+	 *
15
+	 * The above copyright notice and this permission notice shall be included in
16
+	 * all copies or substantial portions of the Software.
17
+	 *
18
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24
+	 * THE SOFTWARE.
25
+	 */
26 26
 
27 27
 namespace ReCaptcha\RequestMethod;
28 28
 
@@ -32,73 +32,73 @@  discard block
 block discarded – undo
32 32
  */
33 33
 class Socket
34 34
 {
35
-    private $handle = null;
35
+	private $handle = null;
36 36
 
37
-    /**
38
-     * fsockopen
39
-     * 
40
-     * @see http://php.net/fsockopen
41
-     * @param string $hostname
42
-     * @param int $port
43
-     * @param int $errno
44
-     * @param string $errstr
45
-     * @param float $timeout
46
-     * @return resource
47
-     */
48
-    public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
49
-    {
50
-        $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
37
+	/**
38
+	 * fsockopen
39
+	 * 
40
+	 * @see http://php.net/fsockopen
41
+	 * @param string $hostname
42
+	 * @param int $port
43
+	 * @param int $errno
44
+	 * @param string $errstr
45
+	 * @param float $timeout
46
+	 * @return resource
47
+	 */
48
+	public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
49
+	{
50
+		$this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
51 51
 
52
-        if ($this->handle != false && $errno === 0 && $errstr === '') {
53
-            return $this->handle;
54
-        } else {
55
-            return false;
56
-        }
57
-    }
52
+		if ($this->handle != false && $errno === 0 && $errstr === '') {
53
+			return $this->handle;
54
+		} else {
55
+			return false;
56
+		}
57
+	}
58 58
 
59
-    /**
60
-     * fwrite
61
-     * 
62
-     * @see http://php.net/fwrite
63
-     * @param string $string
64
-     * @param int $length
65
-     * @return int | bool
66
-     */
67
-    public function fwrite($string, $length = null)
68
-    {
69
-        return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
70
-    }
59
+	/**
60
+	 * fwrite
61
+	 * 
62
+	 * @see http://php.net/fwrite
63
+	 * @param string $string
64
+	 * @param int $length
65
+	 * @return int | bool
66
+	 */
67
+	public function fwrite($string, $length = null)
68
+	{
69
+		return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
70
+	}
71 71
 
72
-    /**
73
-     * fgets
74
-     * 
75
-     * @see http://php.net/fgets
76
-     * @param int $length
77
-     */
78
-    public function fgets($length = null)
79
-    {
80
-        return fgets($this->handle, $length);
81
-    }
72
+	/**
73
+	 * fgets
74
+	 * 
75
+	 * @see http://php.net/fgets
76
+	 * @param int $length
77
+	 */
78
+	public function fgets($length = null)
79
+	{
80
+		return fgets($this->handle, $length);
81
+	}
82 82
 
83
-    /**
84
-     * feof
85
-     * 
86
-     * @see http://php.net/feof
87
-     * @return bool
88
-     */
89
-    public function feof()
90
-    {
91
-        return feof($this->handle);
92
-    }
83
+	/**
84
+	 * feof
85
+	 * 
86
+	 * @see http://php.net/feof
87
+	 * @return bool
88
+	 */
89
+	public function feof()
90
+	{
91
+		return feof($this->handle);
92
+	}
93 93
 
94
-    /**
95
-     * fclose
96
-     * 
97
-     * @see http://php.net/fclose
98
-     * @return bool
99
-     */
100
-    public function fclose()
101
-    {
102
-        return fclose($this->handle);
103
-    }
94
+	/**
95
+	 * fclose
96
+	 * 
97
+	 * @see http://php.net/fclose
98
+	 * @return bool
99
+	 */
100
+	public function fclose()
101
+	{
102
+		return fclose($this->handle);
103
+	}
104 104
 }
Please login to merge, or discard this patch.
caffeinated/modules/recaptcha/ReCaptcha/RequestMethod/SocketPost.php 2 patches
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -1,28 +1,28 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * This is a PHP library that handles calling reCAPTCHA.
4
- *
5
- * @copyright Copyright (c) 2015, Google Inc.
6
- * @link      http://www.google.com/recaptcha
7
- *
8
- * Permission is hereby granted, free of charge, to any person obtaining a copy
9
- * of this software and associated documentation files (the "Software"), to deal
10
- * in the Software without restriction, including without limitation the rights
11
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12
- * copies of the Software, and to permit persons to whom the Software is
13
- * furnished to do so, subject to the following conditions:
14
- *
15
- * The above copyright notice and this permission notice shall be included in
16
- * all copies or substantial portions of the Software.
17
- *
18
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24
- * THE SOFTWARE.
25
- */
3
+	 * This is a PHP library that handles calling reCAPTCHA.
4
+	 *
5
+	 * @copyright Copyright (c) 2015, Google Inc.
6
+	 * @link      http://www.google.com/recaptcha
7
+	 *
8
+	 * Permission is hereby granted, free of charge, to any person obtaining a copy
9
+	 * of this software and associated documentation files (the "Software"), to deal
10
+	 * in the Software without restriction, including without limitation the rights
11
+	 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12
+	 * copies of the Software, and to permit persons to whom the Software is
13
+	 * furnished to do so, subject to the following conditions:
14
+	 *
15
+	 * The above copyright notice and this permission notice shall be included in
16
+	 * all copies or substantial portions of the Software.
17
+	 *
18
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19
+	 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20
+	 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21
+	 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22
+	 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23
+	 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24
+	 * THE SOFTWARE.
25
+	 */
26 26
 
27 27
 namespace ReCaptcha\RequestMethod;
28 28
 
@@ -36,85 +36,85 @@  discard block
 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.
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.