eventespresso / event-espresso-core

caffeinated/modules/recaptcha/ReCaptcha/ReCaptcha.php

Indentation +55 added lines, -55 removed lines

@@ -31,67 +31,67 @@
  */
 class ReCaptcha
 {
-    /**
-     * Version of this client library.
-     * @const string
-     */
-    const VERSION = 'php_1.1.1';
+	/**
+	 * Version of this client library.
+	 * @const string
+	 */
+	const VERSION = 'php_1.1.1';
 
-    /**
-     * Shared secret for the site.
-     * @var type string
-     */
-    private $secret;
+	/**
+	 * Shared secret for the site.
+	 * @var type string
+	 */
+	private $secret;
 
-    /**
-     * Method used to communicate  with service. Defaults to POST request.
-     * @var RequestMethod
-     */
-    private $requestMethod;
+	/**
+	 * Method used to communicate  with service. Defaults to POST request.
+	 * @var RequestMethod
+	 */
+	private $requestMethod;
 
-    /**
-     * Create a configured instance to use the reCAPTCHA service.
-     *
-     * @param string $secret shared secret between site and reCAPTCHA server.
-     * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
-     */
-    public function __construct($secret, RequestMethod $requestMethod = null)
-    {
-        if (empty($secret)) {
-            throw new \RuntimeException('No secret provided');
-        }
+	/**
+	 * Create a configured instance to use the reCAPTCHA service.
+	 *
+	 * @param string $secret shared secret between site and reCAPTCHA server.
+	 * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
+	 */
+	public function __construct($secret, RequestMethod $requestMethod = null)
+	{
+		if (empty($secret)) {
+			throw new \RuntimeException('No secret provided');
+		}
 
-        if (!is_string($secret)) {
-            throw new \RuntimeException('The provided secret must be a string');
-        }
+		if (!is_string($secret)) {
+			throw new \RuntimeException('The provided secret must be a string');
+		}
 
-        $this->secret = $secret;
+		$this->secret = $secret;
 
-        if (!is_null($requestMethod)) {
-            $this->requestMethod = $requestMethod;
-        } else {
-            $this->requestMethod = new RequestMethod\Post();
-        }
-    }
+		if (!is_null($requestMethod)) {
+			$this->requestMethod = $requestMethod;
+		} else {
+			$this->requestMethod = new RequestMethod\Post();
+		}
+	}
 
-    /**
-     * Calls the reCAPTCHA siteverify API to verify whether the user passes
-     * CAPTCHA test.
-     *
-     * @param string $response The value of 'g-recaptcha-response' in the submitted form.
-     * @param string $remoteIp The end user's IP address.
-     * @return Response Response from the service.
-     */
-    public function verify($response, $remoteIp = null)
-    {
-        // Discard empty solution submissions
-        if (empty($response)) {
-            $recaptchaResponse = new Response(false, array('missing-input-response'));
-            return $recaptchaResponse;
-        }
+	/**
+	 * Calls the reCAPTCHA siteverify API to verify whether the user passes
+	 * CAPTCHA test.
+	 *
+	 * @param string $response The value of 'g-recaptcha-response' in the submitted form.
+	 * @param string $remoteIp The end user's IP address.
+	 * @return Response Response from the service.
+	 */
+	public function verify($response, $remoteIp = null)
+	{
+		// Discard empty solution submissions
+		if (empty($response)) {
+			$recaptchaResponse = new Response(false, array('missing-input-response'));
+			return $recaptchaResponse;
+		}
 
-        $params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION);
-        $rawResponse = $this->requestMethod->submit($params);
-        return Response::fromJson($rawResponse);
-    }
+		$params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION);
+		$rawResponse = $this->requestMethod->submit($params);
+		return Response::fromJson($rawResponse);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -61,13 +61,13 @@
             throw new \RuntimeException('No secret provided');
         }
 
-        if (!is_string($secret)) {
+        if ( ! is_string($secret)) {
             throw new \RuntimeException('The provided secret must be a string');
         }
 
         $this->secret = $secret;
 
-        if (!is_null($requestMethod)) {
+        if ( ! is_null($requestMethod)) {
             $this->requestMethod = $requestMethod;
         } else {
             $this->requestMethod = new RequestMethod\Post();

caffeinated/modules/recaptcha/ReCaptcha/RequestMethod/Curl.php

Indentation +30 added lines, -30 removed lines

@@ -10,38 +10,38 @@
  */
 class Curl implements RequestMethod
 {
-    /**
-     * URL to which requests are sent via cURL.
-     * @const string
-     */
-    const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
+	/**
+	 * URL to which requests are sent via cURL.
+	 * @const string
+	 */
+	const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
 
-    /**
-     * Submit the cURL request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params)
-    {
-        $handle = curl_init(self::SITE_VERIFY_URL);
+	/**
+	 * Submit the cURL request with the specified parameters.
+	 *
+	 * @param RequestParameters $params Request parameters
+	 * @return string Body of the reCAPTCHA response
+	 */
+	public function submit(RequestParameters $params)
+	{
+		$handle = curl_init(self::SITE_VERIFY_URL);
 
-        $options = array(
-            CURLOPT_POST => true,
-            CURLOPT_POSTFIELDS => $params->toQueryString(),
-            CURLOPT_HTTPHEADER => array(
-                'Content-Type: application/x-www-form-urlencoded'
-            ),
-            CURLINFO_HEADER_OUT => false,
-            CURLOPT_HEADER => false,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_SSL_VERIFYPEER => true
-        );
-        curl_setopt_array($handle, $options);
+		$options = array(
+			CURLOPT_POST => true,
+			CURLOPT_POSTFIELDS => $params->toQueryString(),
+			CURLOPT_HTTPHEADER => array(
+				'Content-Type: application/x-www-form-urlencoded'
+			),
+			CURLINFO_HEADER_OUT => false,
+			CURLOPT_HEADER => false,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_SSL_VERIFYPEER => true
+		);
+		curl_setopt_array($handle, $options);
 
-        $response = curl_exec($handle);
-        curl_close($handle);
+		$response = curl_exec($handle);
+		curl_close($handle);
 
-        return $response;
-    }
+		return $response;
+	}
 }

caffeinated/modules/recaptcha/ReCaptcha/RequestParameters.php

Spacing +2 added lines, -2 removed lines

@@ -80,11 +80,11 @@
     {
         $params = array('secret' => $this->secret, 'response' => $this->response);
 
-        if (!is_null($this->remoteIp)) {
+        if ( ! is_null($this->remoteIp)) {
             $params['remoteip'] = $this->remoteIp;
         }
 
-        if (!is_null($this->version)) {
+        if ( ! is_null($this->version)) {
             $params['version'] = $this->version;
         }
 

Indentation +60 added lines, -60 removed lines

@@ -31,73 +31,73 @@
  */
 class RequestParameters
 {
-    /**
-     * Site secret.
-     * @var string
-     */
-    private $secret;
+	/**
+	 * Site secret.
+	 * @var string
+	 */
+	private $secret;
 
-    /**
-     * Form response.
-     * @var string
-     */
-    private $response;
+	/**
+	 * Form response.
+	 * @var string
+	 */
+	private $response;
 
-    /**
-     * Remote user's IP address.
-     * @var string
-     */
-    private $remoteIp;
+	/**
+	 * Remote user's IP address.
+	 * @var string
+	 */
+	private $remoteIp;
 
-    /**
-     * Client version.
-     * @var string
-     */
-    private $version;
+	/**
+	 * Client version.
+	 * @var string
+	 */
+	private $version;
 
-    /**
-     * Initialise parameters.
-     *
-     * @param string $secret Site secret.
-     * @param string $response Value from g-captcha-response form field.
-     * @param string $remoteIp User's IP address.
-     * @param string $version Version of this client library.
-     */
-    public function __construct($secret, $response, $remoteIp = null, $version = null)
-    {
-        $this->secret = $secret;
-        $this->response = $response;
-        $this->remoteIp = $remoteIp;
-        $this->version = $version;
-    }
+	/**
+	 * Initialise parameters.
+	 *
+	 * @param string $secret Site secret.
+	 * @param string $response Value from g-captcha-response form field.
+	 * @param string $remoteIp User's IP address.
+	 * @param string $version Version of this client library.
+	 */
+	public function __construct($secret, $response, $remoteIp = null, $version = null)
+	{
+		$this->secret = $secret;
+		$this->response = $response;
+		$this->remoteIp = $remoteIp;
+		$this->version = $version;
+	}
 
-    /**
-     * Array representation.
-     *
-     * @return array Array formatted parameters.
-     */
-    public function toArray()
-    {
-        $params = array('secret' => $this->secret, 'response' => $this->response);
+	/**
+	 * Array representation.
+	 *
+	 * @return array Array formatted parameters.
+	 */
+	public function toArray()
+	{
+		$params = array('secret' => $this->secret, 'response' => $this->response);
 
-        if (!is_null($this->remoteIp)) {
-            $params['remoteip'] = $this->remoteIp;
-        }
+		if (!is_null($this->remoteIp)) {
+			$params['remoteip'] = $this->remoteIp;
+		}
 
-        if (!is_null($this->version)) {
-            $params['version'] = $this->version;
-        }
+		if (!is_null($this->version)) {
+			$params['version'] = $this->version;
+		}
 
-        return $params;
-    }
+		return $params;
+	}
 
-    /**
-     * Query string representation for HTTP request.
-     *
-     * @return string Query string formatted parameters.
-     */
-    public function toQueryString()
-    {
-        return http_build_query($this->toArray(), '', '&');
-    }
+	/**
+	 * Query string representation for HTTP request.
+	 *
+	 * @return string Query string formatted parameters.
+	 */
+	public function toQueryString()
+	{
+		return http_build_query($this->toArray(), '', '&');
+	}
 }

public/Espresso_Arabica_2014/archive-espresso_events.php

Spacing +2 added lines, -2 removed lines

@@ -16,11 +16,11 @@
 
 	<section id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
-			<?php espresso_get_template_part( 'loop', 'espresso_events' ); ?>			
+			<?php espresso_get_template_part('loop', 'espresso_events'); ?>			
 		</div><!-- #content -->
 	</section><!-- #primary -->
 
 <?php
-get_sidebar( 'content' );
+get_sidebar('content');
 get_sidebar();
 get_footer();

public/Espresso_Arabica_2014/archive-espresso_venues.php

Spacing +2 added lines, -2 removed lines

@@ -18,11 +18,11 @@
 
 	<section id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
-			<?php espresso_get_template_part( 'loop', 'espresso_venues' ); ?>			
+			<?php espresso_get_template_part('loop', 'espresso_venues'); ?>			
 		</div><!-- #content -->
 	</section><!-- #primary -->
 
 <?php
-get_sidebar( 'content' );
+get_sidebar('content');
 get_sidebar();
 get_footer();
\ No newline at end of file

public/Espresso_Arabica_2014/content-espresso_events-tickets.php

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@
 <?php
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 global $post;
-if ( espresso_display_ticket_selector( $post->ID ) && ( is_single() || ( is_archive() && espresso_display_ticket_selector_in_event_list() ))) :
+if (espresso_display_ticket_selector($post->ID) && (is_single() || (is_archive() && espresso_display_ticket_selector_in_event_list()))) :
 ?>
 <div class="event-tickets" style="clear: both;">
-	<?php espresso_ticket_selector( $post ); ?>
+	<?php espresso_ticket_selector($post); ?>
 </div>
 <!-- .event-tickets -->
-<?php elseif ( ! is_single() ) : ?>
-<?php espresso_view_details_btn( $post ); ?>
+<?php elseif ( ! is_single()) : ?>
+<?php espresso_view_details_btn($post); ?>
 <?php endif; ?>
\ No newline at end of file

public/Espresso_Arabica_2014/loop-espresso_venues.php

Braces +3 added lines, -1 removed lines

@@ -32,8 +32,10 @@
 	do_action( 'AHEE__archive_espresso_venues_template__after_loop' ); 
 
 
-else :
+else {
+	:
 	// If no content, include the "No posts found" template.
 	espresso_get_template_part( 'content', 'none' );
+}
 	
 endif;

Spacing +7 added lines, -7 removed lines

@@ -10,30 +10,30 @@
  * @ version		4+
  */
 
-if ( have_posts() ) : ?>
+if (have_posts()) : ?>
 
 	<header class="page-header">
 		<h1 class="page-title">
-			<?php echo esc_html__( 'Event Venues', 'event_espresso' ); ?>
+			<?php echo esc_html__('Event Venues', 'event_espresso'); ?>
 		</h1>
 	</header><!-- .page-header -->
 	
 <?php 
 	// allow other stuff
-	do_action( 'AHEE__archive_espresso_venues_template__before_loop' ); 
+	do_action('AHEE__archive_espresso_venues_template__before_loop'); 
 	// Start the Loop.
-	while ( have_posts() ) : the_post();
+	while (have_posts()) : the_post();
 		// Include the post TYPE-specific template for the content.
-		espresso_get_template_part( 'content', 'espresso_venues' );
+		espresso_get_template_part('content', 'espresso_venues');
 	endwhile;
 	// Previous/next page navigation.
 	espresso_pagination();
 	// allow moar other stuff
-	do_action( 'AHEE__archive_espresso_venues_template__after_loop' ); 
+	do_action('AHEE__archive_espresso_venues_template__after_loop'); 
 
 
 else :
 	// If no content, include the "No posts found" template.
-	espresso_get_template_part( 'content', 'none' );
+	espresso_get_template_part('content', 'none');
 	
 endif;

public/Espresso_Arabica_2014/single-espresso_venues.php

Spacing +4 added lines, -4 removed lines

@@ -18,11 +18,11 @@ 
 				<div id="espresso-venue-details-dv" class="" >				
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+				while (have_posts()) : the_post();
 					//  Include the post TYPE-specific template for the content.
-					espresso_get_template_part( 'content', 'espresso_venues' );
+					espresso_get_template_part('content', 'espresso_venues');
 					// If comments are open or we have at least one comment, load up the comment template.
-					if ( comments_open() || get_comments_number() ) {
+					if (comments_open() || get_comments_number()) {
 						comments_template();
 					}
 				endwhile;
@@ -34,6 +34,6 @@ 
 	</div><!-- #primary -->
 
 <?php
-get_sidebar( 'content' );
+get_sidebar('content');
 get_sidebar();
 get_footer();
\ No newline at end of file

caffeinated/modules/recaptcha/ReCaptcha/RequestMethod/Post.php

Indentation +32 added lines, -32 removed lines

@@ -34,37 +34,37 @@
  */
 class Post implements RequestMethod
 {
-    /**
-     * URL to which requests are POSTed.
-     * @const string
-     */
-    const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
+	/**
+	 * URL to which requests are POSTed.
+	 * @const string
+	 */
+	const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
 
-    /**
-     * Submit the POST request with the specified parameters.
-     *
-     * @param RequestParameters $params Request parameters
-     * @return string Body of the reCAPTCHA response
-     */
-    public function submit(RequestParameters $params)
-    {
-        /**
-         * PHP 5.6.0 changed the way you specify the peer name for SSL context options.
-         * Using "CN_name" will still work, but it will raise deprecated errors.
-         */
-        $peer_key = version_compare(PHP_VERSION, '5.6.0', '<') ? 'CN_name' : 'peer_name';
-        $options = array(
-            'http' => array(
-                'header' => "Content-type: application/x-www-form-urlencoded\r\n",
-                'method' => 'POST',
-                'content' => $params->toQueryString(),
-                // Force the peer to validate (not needed in 5.6.0+, but still works
-                'verify_peer' => true,
-                // Force the peer validation to use www.google.com
-                $peer_key => 'www.google.com',
-            ),
-        );
-        $context = stream_context_create($options);
-        return file_get_contents(self::SITE_VERIFY_URL, false, $context);
-    }
+	/**
+	 * Submit the POST request with the specified parameters.
+	 *
+	 * @param RequestParameters $params Request parameters
+	 * @return string Body of the reCAPTCHA response
+	 */
+	public function submit(RequestParameters $params)
+	{
+		/**
+		 * PHP 5.6.0 changed the way you specify the peer name for SSL context options.
+		 * Using "CN_name" will still work, but it will raise deprecated errors.
+		 */
+		$peer_key = version_compare(PHP_VERSION, '5.6.0', '<') ? 'CN_name' : 'peer_name';
+		$options = array(
+			'http' => array(
+				'header' => "Content-type: application/x-www-form-urlencoded\r\n",
+				'method' => 'POST',
+				'content' => $params->toQueryString(),
+				// Force the peer to validate (not needed in 5.6.0+, but still works
+				'verify_peer' => true,
+				// Force the peer validation to use www.google.com
+				$peer_key => 'www.google.com',
+			),
+		);
+		$context = stream_context_create($options);
+		return file_get_contents(self::SITE_VERIFY_URL, false, $context);
+	}
 }