eventespresso / event-espresso-core

caffeinated/core/libraries/shortcodes/EE_Newsletter_Shortcodes.lib.php

Braces +9 added lines, -5 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage helpers
  * @since           4.3.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * This is the library class for the "newsletter" group shortcodes.
@@ -54,8 +56,9 @@ 
      * @return  array                                             new validator config.
      */
     public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $validator_config;
+        if ( $messenger->name !== 'email' ) {
+                    return $validator_config;
+        }
 
         $validator_config['content']['shortcodes'][] = 'newsletter';
         $validator_config['newsletter_content'] = array(
@@ -82,8 +85,9 @@ 
      * @return  array                                           new/modified template fields array.
      */
     public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $template_fields;
+        if ( $messenger->name !== 'email' ) {
+                    return $template_fields;
+        }
 
         $template_fields['extra']['content']['newsletter_content'] = array(
             'input' => 'wp_editor',

Indentation +65 added lines, -65 removed lines

@@ -20,81 +20,81 @@
  */
 class EE_Newsletter_Shortcodes extends EE_Shortcodes {
 
-    protected function _init_props() {
-        $this->label = __("Batch Messages Shortcodes", 'event_espresso');
-        $this->description = __('All shortcodes used for the batch message type', 'event_espresso');
-        $this->_shortcodes = array(
-            '[NEWSLETTER_CONTENT]' => __('This will parse to whatever is found in the related [newsletter_content] field.  Note that when triggering a batch message, whatever is added for the custom message will be inserted where this shortcode is placed.', 'event_espresso')
-            );
-    }
+	protected function _init_props() {
+		$this->label = __("Batch Messages Shortcodes", 'event_espresso');
+		$this->description = __('All shortcodes used for the batch message type', 'event_espresso');
+		$this->_shortcodes = array(
+			'[NEWSLETTER_CONTENT]' => __('This will parse to whatever is found in the related [newsletter_content] field.  Note that when triggering a batch message, whatever is added for the custom message will be inserted where this shortcode is placed.', 'event_espresso')
+			);
+	}
 
 
 
-    protected function _parser( $shortcode ) {
-        if ( $shortcode == '[NEWSLETTER_CONTENT]' ) {
-            $this->_validate_list_requirements();
-            $valid_shortcodes = array('recipient_details', 'organization');
-            $template = $this->_data['template']['newsletter_content'];
-            $data = $this->_data;
-            return $this->_shortcode_helper->parse_message_template( $template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
-        }
-    }
+	protected function _parser( $shortcode ) {
+		if ( $shortcode == '[NEWSLETTER_CONTENT]' ) {
+			$this->_validate_list_requirements();
+			$valid_shortcodes = array('recipient_details', 'organization');
+			$template = $this->_data['template']['newsletter_content'];
+			$data = $this->_data;
+			return $this->_shortcode_helper->parse_message_template( $template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
+		}
+	}
 
 
-    /**
-     * Callback set in args for EE_Register_Messages_Shortcode_Library::register for 'msgr_validator_callback'.
-     *
-     * EE_Register_Messages_Shortcode_Library::register registers this callback with the
-     * 'FHEE__EE_messenger__get_validator_config' filter.
-     *
-     * @since    4.3.0
-     * @param  array        $validator_config  current validator configuration array
-     * @param  EE_messenger $messenger
-     * @return  array                                             new validator config.
-     */
-    public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $validator_config;
+	/**
+	 * Callback set in args for EE_Register_Messages_Shortcode_Library::register for 'msgr_validator_callback'.
+	 *
+	 * EE_Register_Messages_Shortcode_Library::register registers this callback with the
+	 * 'FHEE__EE_messenger__get_validator_config' filter.
+	 *
+	 * @since    4.3.0
+	 * @param  array        $validator_config  current validator configuration array
+	 * @param  EE_messenger $messenger
+	 * @return  array                                             new validator config.
+	 */
+	public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
+		if ( $messenger->name !== 'email' )
+			return $validator_config;
 
-        $validator_config['content']['shortcodes'][] = 'newsletter';
-        $validator_config['newsletter_content'] = array(
-            'shortcodes' => array('recipient_details', 'organization'),
-            'required' => array('[NEWSLETTER_CONTENT]')
-            );
-        return $validator_config;
-    }
+		$validator_config['content']['shortcodes'][] = 'newsletter';
+		$validator_config['newsletter_content'] = array(
+			'shortcodes' => array('recipient_details', 'organization'),
+			'required' => array('[NEWSLETTER_CONTENT]')
+			);
+		return $validator_config;
+	}
 
 
 
 
-    /**
-     * Callback set in args for EE_Register_Messages_Shortcode_Library::register for
-     * 'msgr_template_fields_callback'.
-     *
-     * EE_Register_Messages_Shortcode_Library::register registers this callback with the
-     * FHEE__EE_messenger__get_template_fields filter.
-     *
-     * @since    4.3.0
-     *
-     * @param  array        $template_fields current template fields setup array.
-     * @param  EE_messenger $messenger
-     * @return  array                                           new/modified template fields array.
-     */
-    public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $template_fields;
+	/**
+	 * Callback set in args for EE_Register_Messages_Shortcode_Library::register for
+	 * 'msgr_template_fields_callback'.
+	 *
+	 * EE_Register_Messages_Shortcode_Library::register registers this callback with the
+	 * FHEE__EE_messenger__get_template_fields filter.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param  array        $template_fields current template fields setup array.
+	 * @param  EE_messenger $messenger
+	 * @return  array                                           new/modified template fields array.
+	 */
+	public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
+		if ( $messenger->name !== 'email' )
+			return $template_fields;
 
-        $template_fields['extra']['content']['newsletter_content'] = array(
-            'input' => 'wp_editor',
-            'label' => '[NEWSLETTER_CONTENT]',
-            'type' => 'string',
-            'required' => TRUE,
-            'validation' => TRUE,
-            'format' => '%s',
-            'rows' => '15',
-            'shortcodes_required' => array('[NEWSLETTER_CONTENT]')
-            );
-        return $template_fields;
-    }
+		$template_fields['extra']['content']['newsletter_content'] = array(
+			'input' => 'wp_editor',
+			'label' => '[NEWSLETTER_CONTENT]',
+			'type' => 'string',
+			'required' => TRUE,
+			'validation' => TRUE,
+			'format' => '%s',
+			'rows' => '15',
+			'shortcodes_required' => array('[NEWSLETTER_CONTENT]')
+			);
+		return $template_fields;
+	}
 
 } //end class EE_Newsletter_Shortcodes

Spacing +7 added lines, -7 removed lines

@@ -30,13 +30,13 @@ 
 
 
 
-    protected function _parser( $shortcode ) {
-        if ( $shortcode == '[NEWSLETTER_CONTENT]' ) {
+    protected function _parser($shortcode) {
+        if ($shortcode == '[NEWSLETTER_CONTENT]') {
             $this->_validate_list_requirements();
             $valid_shortcodes = array('recipient_details', 'organization');
             $template = $this->_data['template']['newsletter_content'];
             $data = $this->_data;
-            return $this->_shortcode_helper->parse_message_template( $template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
+            return $this->_shortcode_helper->parse_message_template($template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message);
         }
     }
 
@@ -52,8 +52,8 @@ 
      * @param  EE_messenger $messenger
      * @return  array                                             new validator config.
      */
-    public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
+    public static function messenger_validator_config($validator_config, EE_messenger $messenger) {
+        if ($messenger->name !== 'email')
             return $validator_config;
 
         $validator_config['content']['shortcodes'][] = 'newsletter';
@@ -80,8 +80,8 @@ 
      * @param  EE_messenger $messenger
      * @return  array                                           new/modified template fields array.
      */
-    public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
+    public static function messenger_template_fields($template_fields, EE_messenger $messenger) {
+        if ($messenger->name !== 'email')
             return $template_fields;
 
         $template_fields['extra']['content']['newsletter_content'] = array(

caffeinated/modules/mijireh_slurper/EED_Mijireh_Slurper.module.php

Indentation +18 added lines, -18 removed lines

@@ -110,10 +110,10 @@ 
 	}
 
 	/**
-	* Return true if the current page is the mijireh checkout page, otherwise return false.
-	*
-	* @return boolean
-	*/
+	 * Return true if the current page is the mijireh checkout page, otherwise return false.
+	 *
+	 * @return boolean
+	 */
 	public static function is_slurp_page() {
 		global $post;
 		$isSlurp = false;
@@ -130,9 +130,9 @@ 
 	}
 
 	/**
-	* adds the callback to adding the slurp page metabox, which shoudl only appear on a page with the {{mj-checkout-form}} "shortcode"
-	* @return void
-	*/
+	 * adds the callback to adding the slurp page metabox, which shoudl only appear on a page with the {{mj-checkout-form}} "shortcode"
+	 * @return void
+	 */
 	public static function add_slurp_page_metabox() {
 		if(self::is_slurp_page() && EEM_Payment_Method::instance()->get_one_active( EEM_Payment_Method::scope_cart, array( array( 'PMD_type' => 'Mijireh' ) ) ) ){
 			add_meta_box(
@@ -147,10 +147,10 @@ 
 	}
 
 	/**
-	* outputs HTML for displaying the slurping metabox
-	* @param WP_Post $post
-	* @return void echoes out html
-	*/
+	 * outputs HTML for displaying the slurping metabox
+	 * @param WP_Post $post
+	 * @return void echoes out html
+	 */
 	public static function slurp_page_metabox($post) {
 	   global $wp;
 	   $mijireh_payment_method = EEM_Payment_Method::instance()->get_one_of_type( 'Mijireh' );
@@ -168,10 +168,10 @@ 
 	}
 
 	/**
-	* decides whether to slurp the post indicated by the $post global or not, based entirely
-	* on a special arg being in the querystring
-	* @return void
-	*/
+	 * decides whether to slurp the post indicated by the $post global or not, based entirely
+	 * on a special arg being in the querystring
+	 * @return void
+	 */
 	public static function slurp_or_not(){
 	  //check if this page has the right mijire 'shortcode' and if they've specified to slurp it
 	  if(isset($_GET['mijireh_slurp_now']) && $_GET['mijireh_slurp_now'] == 'true' && EED_Mijireh_Slurper::is_slurp_page()){
@@ -180,9 +180,9 @@ 
 	}
 
 	/**
-	* Sends a request to mijireh to slurp the current $post, and then redirects the user back to the current page without the
-	* special querystring arg indicating to slurp. Also, should temporarily make the current post published, then revert it to its previous status
-	*/
+	 * Sends a request to mijireh to slurp the current $post, and then redirects the user back to the current page without the
+	 * special querystring arg indicating to slurp. Also, should temporarily make the current post published, then revert it to its previous status
+	 */
 	public static function slurp_now(){
 		global $post;
 		if ( $post->post_status != 'publish' ) {

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -122,8 +124,7 @@ 
 			if( strpos($content, EED_Mijireh_Slurper::mijireh_slurper_shortcode ) !== false ) {
 				$isSlurp = true;
 			}
-		}
-		else {
+		} else {
 			// echo '[' . basename(__FILE__) . ' - line ' . __LINE__ . "] Check Slurp Page Failed: " . print_r($post, 1);
 		}
 		return $isSlurp;

Spacing +36 added lines, -36 removed lines

@@ -49,19 +49,19 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define('EED_MIJIREH_SLURPER_PATH',EE_CAFF_PATH.'modules'.DS.'mijireh_slurper'.DS);
-		add_action('load-post.php',array('EED_Mijireh_Slurper','set_edit_post_page_hooks'));
-		add_action('load-admin.php',array('EED_Mijireh_Slurper','check_for_edit_slurp_page'));
-		add_action('AHEE__EE_Mijireh__settings_end',array('EED_Mijireh_Slurper','add_slurp_link_to_gateway'));
+		define('EED_MIJIREH_SLURPER_PATH', EE_CAFF_PATH.'modules'.DS.'mijireh_slurper'.DS);
+		add_action('load-post.php', array('EED_Mijireh_Slurper', 'set_edit_post_page_hooks'));
+		add_action('load-admin.php', array('EED_Mijireh_Slurper', 'check_for_edit_slurp_page'));
+		add_action('AHEE__EE_Mijireh__settings_end', array('EED_Mijireh_Slurper', 'add_slurp_link_to_gateway'));
 	}
 	/**
 	 * Merely used to avoid even bothering to add these hooks on pages besides admin's post.php
 	 */
-	public static function set_edit_post_page_hooks(){
-		add_action('add_meta_boxes',array('EED_Mijireh_Slurper','add_slurp_page_metabox'));
-		add_action('posts_selection',array('EED_Mijireh_Slurper','slurp_or_not'));
-		if(get_transient(EED_Mijireh_Slurper::slurp_started_transient_name)){
-			add_action( 'admin_notices', array('EED_Mijireh_Slurper', 'slurping_in_progress_notice') );
+	public static function set_edit_post_page_hooks() {
+		add_action('add_meta_boxes', array('EED_Mijireh_Slurper', 'add_slurp_page_metabox'));
+		add_action('posts_selection', array('EED_Mijireh_Slurper', 'slurp_or_not'));
+		if (get_transient(EED_Mijireh_Slurper::slurp_started_transient_name)) {
+			add_action('admin_notices', array('EED_Mijireh_Slurper', 'slurping_in_progress_notice'));
 			delete_transient(EED_Mijireh_Slurper::slurp_started_transient_name);
 		}
 	}
@@ -70,11 +70,11 @@ 
 	 * Adds the slurping content to the gateway's settings page, because I thought this was best suited to remain in the module's code (because
 	 * the gateway works fine independent of this module)
 	 */
-	public static function add_slurp_link_to_gateway($existing_content){
-		echo EEH_Template::display_template( EED_MIJIREH_SLURPER_PATH.'templates/additional_content_on_gateway.template.php', array(),true ) . $existing_content;
+	public static function add_slurp_link_to_gateway($existing_content) {
+		echo EEH_Template::display_template(EED_MIJIREH_SLURPER_PATH.'templates/additional_content_on_gateway.template.php', array(), true).$existing_content;
 	}
-	public static function slurping_in_progress_notice(){
-		EEH_Template::display_template( EED_MIJIREH_SLURPER_PATH.'templates/slurping_in_progress_notice.template.php', array() );
+	public static function slurping_in_progress_notice() {
+		EEH_Template::display_template(EED_MIJIREH_SLURPER_PATH.'templates/slurping_in_progress_notice.template.php', array());
 	}
 
 	/**
@@ -83,10 +83,10 @@ 
 	 * need to first make it). If the special arg is present, redirects the user to the slurp page's edit page
 	 * @return void
 	 */
-	public static function check_for_edit_slurp_page(){
-		if(isset($_GET['mijireh_edit_slurp_page']) && $_GET['mijireh_edit_slurp_page'] == 'true'){
+	public static function check_for_edit_slurp_page() {
+		if (isset($_GET['mijireh_edit_slurp_page']) && $_GET['mijireh_edit_slurp_page'] == 'true') {
 			//check if we already have a slurping page
-			if( ! $slurp_page_id = self::find_slurp_page() ){
+			if ( ! $slurp_page_id = self::find_slurp_page()) {
 				//if no slurp page yet, make one
 				$slurp_page_id = wp_insert_post(
 					array(
@@ -96,7 +96,7 @@ 
 					)
 				);
 			}
-			wp_redirect(add_query_arg(array('post'=>$slurp_page_id,'action'=>'edit'),admin_url('post.php')));
+			wp_redirect(add_query_arg(array('post'=>$slurp_page_id, 'action'=>'edit'), admin_url('post.php')));
 		}
 	}
 
@@ -104,7 +104,7 @@ 
 	 * Gets the post id which has the {{mj-checkout-form}} "shortcode" in it, otherwise null
 	 * @return int
 	 */
-	public static function find_slurp_page(){
+	public static function find_slurp_page() {
 		global $wpdb;
 		return $wpdb->get_var("SELECT id FROM {$wpdb->posts} WHERE post_content LIKE '%".EED_Mijireh_Slurper::mijireh_slurper_shortcode."%'");
 	}
@@ -117,9 +117,9 @@ 
 	public static function is_slurp_page() {
 		global $post;
 		$isSlurp = false;
-		if(isset($post) && is_object($post)) {
+		if (isset($post) && is_object($post)) {
 			$content = $post->post_content;
-			if( strpos($content, EED_Mijireh_Slurper::mijireh_slurper_shortcode ) !== false ) {
+			if (strpos($content, EED_Mijireh_Slurper::mijireh_slurper_shortcode) !== false) {
 				$isSlurp = true;
 			}
 		}
@@ -134,7 +134,7 @@ 
 	* @return void
 	*/
 	public static function add_slurp_page_metabox() {
-		if(self::is_slurp_page() && EEM_Payment_Method::instance()->get_one_active( EEM_Payment_Method::scope_cart, array( array( 'PMD_type' => 'Mijireh' ) ) ) ){
+		if (self::is_slurp_page() && EEM_Payment_Method::instance()->get_one_active(EEM_Payment_Method::scope_cart, array(array('PMD_type' => 'Mijireh')))) {
 			add_meta_box(
 				'slurp_meta_box', // $id
 				'Mijireh Page Slurp', // $title
@@ -153,15 +153,15 @@ 
 	*/
 	public static function slurp_page_metabox($post) {
 	   global $wp;
-	   $mijireh_payment_method = EEM_Payment_Method::instance()->get_one_of_type( 'Mijireh' );
-	   if( $mijireh_payment_method ){
-		$access_key = $mijireh_payment_method->get_extra_meta( 'access_key', TRUE );
+	   $mijireh_payment_method = EEM_Payment_Method::instance()->get_one_of_type('Mijireh');
+	   if ($mijireh_payment_method) {
+		$access_key = $mijireh_payment_method->get_extra_meta('access_key', TRUE);
 		EEH_Template::display_template(
 			EED_MIJIREH_SLURPER_PATH.'templates/mijireh_slurp_page_metabox.template.php',
 			 array(
 				 'mijireh_image_url'=> $mijireh_payment_method->button_url(),
 				 'access_key'=>$access_key,
-				 'slurp_action_link'=> esc_url_raw( add_query_arg('mijireh_slurp_now','true', add_query_arg( $wp->query_string, '',  '?'.$_SERVER['QUERY_STRING'] )))
+				 'slurp_action_link'=> esc_url_raw(add_query_arg('mijireh_slurp_now', 'true', add_query_arg($wp->query_string, '', '?'.$_SERVER['QUERY_STRING'])))
 			 )
 		 );
 	   }
@@ -172,9 +172,9 @@ 
 	* on a special arg being in the querystring
 	* @return void
 	*/
-	public static function slurp_or_not(){
+	public static function slurp_or_not() {
 	  //check if this page has the right mijire 'shortcode' and if they've specified to slurp it
-	  if(isset($_GET['mijireh_slurp_now']) && $_GET['mijireh_slurp_now'] == 'true' && EED_Mijireh_Slurper::is_slurp_page()){
+	  if (isset($_GET['mijireh_slurp_now']) && $_GET['mijireh_slurp_now'] == 'true' && EED_Mijireh_Slurper::is_slurp_page()) {
 		  EED_Mijireh_Slurper::slurp_now();
 	  }
 	}
@@ -183,22 +183,22 @@ 
 	* Sends a request to mijireh to slurp the current $post, and then redirects the user back to the current page without the
 	* special querystring arg indicating to slurp. Also, should temporarily make the current post published, then revert it to its previous status
 	*/
-	public static function slurp_now(){
+	public static function slurp_now() {
 		global $post;
-		if ( $post->post_status != 'publish' ) {
+		if ($post->post_status != 'publish') {
 			//make sure the post is published at least while slurping
 			$post->post_status = 'publish';
 			wp_update_post($post);
 		}
-		$mijireh_gateway = EEM_Payment_Method::instance()->get_one_of_type( 'Mijireh' );
-		$access_key = $mijireh_gateway->get_extra_meta( 'access_key', TRUE );
+		$mijireh_gateway = EEM_Payment_Method::instance()->get_one_of_type('Mijireh');
+		$access_key = $mijireh_gateway->get_extra_meta('access_key', TRUE);
 		// 'slurp_url'=>get_permalink($post),
 		// 'page_id'=>$post->ID,
 		// 'return_url'=>$return_url
 		$url = 'https://secure.mijireh.com/api/1/slurps';
 		$args = array(
 		  	'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $access_key . ':' ),
+				'Authorization' => 'Basic '.base64_encode($access_key.':'),
 				'Accept'=>'application/json'
 			),
 			'body'=> wp_json_encode(
@@ -209,12 +209,12 @@ 
 				)
 			)
 		);
-		$response = wp_remote_post($url,$args);
+		$response = wp_remote_post($url, $args);
 		//now redirect the user back to the same page
 		$redirect_args = $_GET;
 		unset($redirect_args['mijireh_slurp_now']);
-		$url = add_query_arg($redirect_args,admin_url('post.php'));
-		set_transient(EED_Mijireh_Slurper::slurp_started_transient_name,true);
+		$url = add_query_arg($redirect_args, admin_url('post.php'));
+		set_transient(EED_Mijireh_Slurper::slurp_started_transient_name, true);
 		// echo "redirect to $url";
 		wp_redirect($url);
 	}
@@ -225,7 +225,7 @@ 
 	 *  @access 	public
 	 *  @return 	void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 }

caffeinated/modules/mijireh_slurper/templates/additional_content_on_gateway.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <tr>
-	<th><?php _e("Mijireh Checkout Page Design", 'event_espresso');?><?php echo EEH_Template::get_help_tab_link( 'ee_mijireh_help_tab' ); ?></th>
+	<th><?php _e("Mijireh Checkout Page Design", 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('ee_mijireh_help_tab'); ?></th>
 	<td>
-		<a href="?mijireh_edit_slurp_page=true"><?php _e("Edit Slurp Page", 'event_espresso');?></a>
+		<a href="?mijireh_edit_slurp_page=true"><?php _e("Edit Slurp Page", 'event_espresso'); ?></a>
 	</td>
 </tr>
\ No newline at end of file

caffeinated/modules/mijireh_slurper/templates/mijireh_slurp_page_metabox.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
    <div id='mijireh_notice' class='mijireh-info alert-message info' data-alert='alert'>
-      <div class='mijireh-logo'><img src='<?php echo $mijireh_image_url;?>' alt='<?php printf( esc_attr__( '%s Checkout Logo', 'event_espresso' ), 'Mijereh' ); ?>'></div>
+      <div class='mijireh-logo'><img src='<?php echo $mijireh_image_url; ?>' alt='<?php printf(esc_attr__('%s Checkout Logo', 'event_espresso'), 'Mijereh'); ?>'></div>
       <div class='mijireh-blurb'>
-		  <h2><?php _e("Slurp Into Mijireh", 'event_espresso');?></h2>
-		  <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>");?>
+		  <h2><?php _e("Slurp Into Mijireh", 'event_espresso'); ?></h2>
+		  <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>"); ?>
 
         <p class='aligncenter'><a href='<?php echo $slurp_action_link?>' id='page_slurp' class='button-primary'>Slurp This Page!</a></p>
         <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>

caffeinated/modules/mijireh_slurper/templates/slurping_in_progress_notice.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <div class="updated">
-        <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>
+        <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>
     </div>
\ No newline at end of file

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/RequestMethod/SocketPost.php

Spacing +7 added lines, -7 removed lines

@@ -70,7 +70,7 @@ 
      */
     public function __construct(Socket $socket = null)
     {
-        if (!is_null($socket)) {
+        if ( ! is_null($socket)) {
             $this->socket = $socket;
         } else {
             $this->socket = new Socket();
@@ -88,20 +88,20 @@ 
         $errno = 0;
         $errstr = '';
 
-        if ($this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30) !== false) {
+        if ($this->socket->fsockopen('ssl://'.self::RECAPTCHA_HOST, 443, $errno, $errstr, 30) !== false) {
             $content = $params->toQueryString();
 
-            $request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n";
-            $request .= "Host: " . self::RECAPTCHA_HOST . "\r\n";
+            $request = "POST ".self::SITE_VERIFY_PATH." HTTP/1.1\r\n";
+            $request .= "Host: ".self::RECAPTCHA_HOST."\r\n";
             $request .= "Content-Type: application/x-www-form-urlencoded\r\n";
-            $request .= "Content-length: " . strlen($content) . "\r\n";
+            $request .= "Content-length: ".strlen($content)."\r\n";
             $request .= "Connection: close\r\n\r\n";
-            $request .= $content . "\r\n\r\n";
+            $request .= $content."\r\n\r\n";
 
             $this->socket->fwrite($request);
             $response = '';
 
-            while (!$this->socket->feof()) {
+            while ( ! $this->socket->feof()) {
                 $response .= $this->socket->fgets(4096);
             }
 

Indentation +81 added lines, -81 removed lines

@@ -36,85 +36,85 @@
  */
 class SocketPost implements RequestMethod
 {
-    /**
-     * reCAPTCHA service host.
-     * @const string 
-     */
-    const RECAPTCHA_HOST = 'www.google.com';
-
-    /**
-     * @const string reCAPTCHA service path
-     */
-    const SITE_VERIFY_PATH = '/recaptcha/api/siteverify';
-
-    /**
-     * @const string Bad request error
-     */
-    const BAD_REQUEST = '{"success": false, "error-codes": ["invalid-request"]}';
-
-    /**
-     * @const string Bad response error
-     */
-    const BAD_RESPONSE = '{"success": false, "error-codes": ["invalid-response"]}';
-
-    /**
-     * Socket to the reCAPTCHA service
-     * @var Socket
-     */
-    private $socket;
-
-    /**
-     * Constructor
-     * 
-     * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing
-     */
-    public function __construct(Socket $socket = null)
-    {
-        if (!is_null($socket)) {
-            $this->socket = $socket;
-        } else {
-            $this->socket = new Socket();
-        }
-    }
-
-    /**
-     * 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)
-    {
-        $errno = 0;
-        $errstr = '';
-
-        if ($this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30) !== false) {
-            $content = $params->toQueryString();
-
-            $request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n";
-            $request .= "Host: " . self::RECAPTCHA_HOST . "\r\n";
-            $request .= "Content-Type: application/x-www-form-urlencoded\r\n";
-            $request .= "Content-length: " . strlen($content) . "\r\n";
-            $request .= "Connection: close\r\n\r\n";
-            $request .= $content . "\r\n\r\n";
-
-            $this->socket->fwrite($request);
-            $response = '';
-
-            while (!$this->socket->feof()) {
-                $response .= $this->socket->fgets(4096);
-            }
-
-            $this->socket->fclose();
-
-            if (0 === strpos($response, 'HTTP/1.1 200 OK')) {
-                $parts = preg_split("#\n\s*\n#Uis", $response);
-                return $parts[1];
-            }
-
-            return self::BAD_RESPONSE;
-        }
-
-        return self::BAD_REQUEST;
-    }
+	/**
+	 * reCAPTCHA service host.
+	 * @const string 
+	 */
+	const RECAPTCHA_HOST = 'www.google.com';
+
+	/**
+	 * @const string reCAPTCHA service path
+	 */
+	const SITE_VERIFY_PATH = '/recaptcha/api/siteverify';
+
+	/**
+	 * @const string Bad request error
+	 */
+	const BAD_REQUEST = '{"success": false, "error-codes": ["invalid-request"]}';
+
+	/**
+	 * @const string Bad response error
+	 */
+	const BAD_RESPONSE = '{"success": false, "error-codes": ["invalid-response"]}';
+
+	/**
+	 * Socket to the reCAPTCHA service
+	 * @var Socket
+	 */
+	private $socket;
+
+	/**
+	 * Constructor
+	 * 
+	 * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing
+	 */
+	public function __construct(Socket $socket = null)
+	{
+		if (!is_null($socket)) {
+			$this->socket = $socket;
+		} else {
+			$this->socket = new Socket();
+		}
+	}
+
+	/**
+	 * 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)
+	{
+		$errno = 0;
+		$errstr = '';
+
+		if ($this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30) !== false) {
+			$content = $params->toQueryString();
+
+			$request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n";
+			$request .= "Host: " . self::RECAPTCHA_HOST . "\r\n";
+			$request .= "Content-Type: application/x-www-form-urlencoded\r\n";
+			$request .= "Content-length: " . strlen($content) . "\r\n";
+			$request .= "Connection: close\r\n\r\n";
+			$request .= $content . "\r\n\r\n";
+
+			$this->socket->fwrite($request);
+			$response = '';
+
+			while (!$this->socket->feof()) {
+				$response .= $this->socket->fgets(4096);
+			}
+
+			$this->socket->fclose();
+
+			if (0 === strpos($response, 'HTTP/1.1 200 OK')) {
+				$parts = preg_split("#\n\s*\n#Uis", $response);
+				return $parts[1];
+			}
+
+			return self::BAD_RESPONSE;
+		}
+
+		return self::BAD_REQUEST;
+	}
 }

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(), '', '&');
+	}
 }