eventespresso / event-espresso-core

caffeinated/brewing_regular.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	/**
 	 * callback for the FHEE__EE_Registry__load_helper__helper_paths filter to add the caffeinated paths
 	 * @param array  $paths original helper paths array
-	 * @return array             new array of paths
+	 * @return string[]             new array of paths
 	 */
 	public function caf_helper_paths( $paths ) {
 		$paths[] = EE_CAF_CORE . 'helpers' . DS;

Indentation +23 added lines, -23 removed lines

@@ -1,29 +1,29 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * the purpose of this file is to simply contain any action/filter hook callbacks etc for specific aspects of EE related to caffeinated (regular) use.  Before putting any code in here, First be certain that it isn't better to define and use the hook in a specific caffeinated/whatever class or file.
- */
+						 * the purpose of this file is to simply contain any action/filter hook callbacks etc for specific aspects of EE related to caffeinated (regular) use.  Before putting any code in here, First be certain that it isn't better to define and use the hook in a specific caffeinated/whatever class or file.
+						 */
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author				Seth Shoultes
- * @ copyright			(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link				http://www.eventespresso.com
- * @ version		 	4.0
- *
- * ------------------------------------------------------------------------
- *
- * EE_Brewing_Regular class.  Just a wrapper to help namespace activity for the functionality of this file.
- *
- * @package		Event Espresso
- * @subpackage	/caffeinated/brewing_regular.php
- * @author		Darren Ethier
- *
- * ------------------------------------------------------------------------
- */
+						 * Event Espresso
+						 *
+						 * Event Registration and Management Plugin for WordPress
+						 *
+						 * @ package			Event Espresso
+						 * @ author				Seth Shoultes
+						 * @ copyright			(c) 2008-2011 Event Espresso  All Rights Reserved.
+						 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+						 * @ link				http://www.eventespresso.com
+						 * @ version		 	4.0
+						 *
+						 * ------------------------------------------------------------------------
+						 *
+						 * EE_Brewing_Regular class.  Just a wrapper to help namespace activity for the functionality of this file.
+						 *
+						 * @package		Event Espresso
+						 * @subpackage	/caffeinated/brewing_regular.php
+						 * @author		Darren Ethier
+						 *
+						 * ------------------------------------------------------------------------
+						 */
 // defined some new constants related to caffeinated folder
 define('EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/' );
 define('EE_CAF_CORE', EE_CAFF_PATH . 'core' . DS);

Spacing +59 added lines, -59 removed lines

@@ -25,30 +25,30 @@ 
  * ------------------------------------------------------------------------
  */
 // defined some new constants related to caffeinated folder
-define('EE_CAF_URL', EE_PLUGIN_DIR_URL . 'caffeinated/' );
-define('EE_CAF_CORE', EE_CAFF_PATH . 'core' . DS);
-define('EE_CAF_LIBRARIES', EE_CAF_CORE . 'libraries' . DS);
-define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH . 'payment_methods' . DS );
+define('EE_CAF_URL', EE_PLUGIN_DIR_URL.'caffeinated/');
+define('EE_CAF_CORE', EE_CAFF_PATH.'core'.DS);
+define('EE_CAF_LIBRARIES', EE_CAF_CORE.'libraries'.DS);
+define('EE_CAF_PAYMENT_METHODS', EE_CAFF_PATH.'payment_methods'.DS);
 class EE_Brewing_Regular extends EE_Base {
 
 	public function __construct() {
-		if ( defined( 'EE_CAFF_PATH' )) {
+		if (defined('EE_CAFF_PATH')) {
 			// activation
-			add_action( 'AHEE__EEH_Activation__initialize_db_content', array( $this, 'initialize_caf_db_content' ));
+			add_action('AHEE__EEH_Activation__initialize_db_content', array($this, 'initialize_caf_db_content'));
 			// load caff init
-			add_action( 'AHEE__EE_System__set_hooks_for_core', array( $this, 'caffeinated_init' ));
+			add_action('AHEE__EE_System__set_hooks_for_core', array($this, 'caffeinated_init'));
 			// make it so the PDF receipt doesn't show our shameless plug
-			add_filter( 'FHEE_Invoice__send_invoice__shameless_plug', '__return_false' );
+			add_filter('FHEE_Invoice__send_invoice__shameless_plug', '__return_false');
 			// add caffeinated modules
-			add_filter( 'FHEE__EE_Config__register_modules__modules_to_register', array( $this, 'caffeinated_modules_to_register' ));
+			add_filter('FHEE__EE_Config__register_modules__modules_to_register', array($this, 'caffeinated_modules_to_register'));
 			// load caff scripts
-			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_caffeinated_scripts'), 10 );
+			add_action('wp_enqueue_scripts', array($this, 'enqueue_caffeinated_scripts'), 10);
 
-			add_filter( 'FHEE__EE_Registry__load_helper__helper_paths', array( $this, 'caf_helper_paths' ), 10 );
+			add_filter('FHEE__EE_Registry__load_helper__helper_paths', array($this, 'caf_helper_paths'), 10);
 
-			add_filter( 'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', array( $this, 'caf_payment_methods' ) );
+			add_filter('FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register', array($this, 'caf_payment_methods'));
 			// caffeinated constructed
-			do_action( 'AHEE__EE_Brewing_Regular__construct__complete' );
+			do_action('AHEE__EE_Brewing_Regular__construct__complete');
 		}
 	}
 
@@ -58,8 +58,8 @@ 
 	 * @param array  $paths original helper paths array
 	 * @return array             new array of paths
 	 */
-	public function caf_helper_paths( $paths ) {
-		$paths[] = EE_CAF_CORE . 'helpers' . DS;
+	public function caf_helper_paths($paths) {
+		$paths[] = EE_CAF_CORE.'helpers'.DS;
 		return $paths;
 	}
 
@@ -75,22 +75,22 @@ 
 	 * Right now, we ASSUME the only price types in the system are default ones
 	 * @global type $wpdb
 	 */
-	function initialize_caf_db_content(){
+	function initialize_caf_db_content() {
 //		echo "initialize caf db content!";
 		global $wpdb;
 
 		//use same method of getting creator id as the version introducing the change
-		$default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id',get_current_user_id());
+		$default_creator_id = apply_filters('FHEE__EE_DMS_Core_4_5_0__get_default_creator_id', get_current_user_id());
 
 		$price_type_table = $wpdb->prefix."esp_price_type";
 		$price_table = $wpdb->prefix."esp_price";
 
 		if ($wpdb->get_var("SHOW TABLES LIKE '$price_type_table'") == $price_type_table) {
 
-			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table . ' WHERE PBT_ID=4';//include trashed price types
-			$tax_price_type_count = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table.' WHERE PBT_ID=4'; //include trashed price types
+			$tax_price_type_count = $wpdb->get_var($SQL);
 
-			if ( $tax_price_type_count <= 1) {
+			if ($tax_price_type_count <= 1) {
 				$result = $wpdb->insert($price_type_table,
 						array(
 							'PRT_name'=>  __("Regional Tax", "event_espresso"),
@@ -101,11 +101,11 @@ 
 							'PRT_wp_user' => $default_creator_id
 						),
 						array(
-							'%s',//PRT_name
-							'%d',//PBT_id
-							'%d',//PRT_is_percent
-							'%d',//PRT_order
-							'%d',//PRT_deleted
+							'%s', //PRT_name
+							'%d', //PBT_id
+							'%d', //PRT_is_percent
+							'%d', //PRT_order
+							'%d', //PRT_deleted
 							'%d', //PRT_wp_user
 						));
 				//federal tax
@@ -119,14 +119,14 @@ 
 							'PRT_wp_user' => $default_creator_id,
 						),
 						array(
-							'%s',//PRT_name
-							'%d',//PBT_id
-							'%d',//PRT_is_percent
-							'%d',//PRT_order
-							'%d',//PRT_deleted
+							'%s', //PRT_name
+							'%d', //PBT_id
+							'%d', //PRT_is_percent
+							'%d', //PRT_order
+							'%d', //PRT_deleted
 							'%d' //PRT_wp_user
 						));
-				if( $result){
+				if ($result) {
 					$wpdb->insert($price_table,
 							array(
 								'PRT_ID'=>$wpdb->insert_id,
@@ -141,15 +141,15 @@ 
 								'PRC_wp_user' => $default_creator_id
 							),
 							array(
-								'%d',//PRT_id
-								'%f',//PRC_amount
-								'%s',//PRC_name
-								'%s',//PRC_desc
-								'%d',//PRC_is_default
-								'%d',//PRC_overrides
-								'%d',//PRC_deleted
-								'%d',//PRC_order
-								'%d',//PRC_parent
+								'%d', //PRT_id
+								'%f', //PRC_amount
+								'%s', //PRC_name
+								'%s', //PRC_desc
+								'%d', //PRC_is_default
+								'%d', //PRC_overrides
+								'%d', //PRC_deleted
+								'%d', //PRC_order
+								'%d', //PRC_parent
 								'%d' //PRC_wp_user
 							));
 				}
@@ -169,11 +169,11 @@ 
 	 *  	@param array $modules_to_register
 	 *  	@return array
 	 */
-	public function caffeinated_modules_to_register( $modules_to_register = array() ){
-		if ( is_readable( EE_CAFF_PATH . 'modules' )) {
-			$caffeinated_modules_to_register = glob( EE_CAFF_PATH . 'modules' . DS . '*', GLOB_ONLYDIR );
-			if ( is_array( $caffeinated_modules_to_register ) && ! empty( $caffeinated_modules_to_register )) {
-				$modules_to_register = array_merge( $modules_to_register, $caffeinated_modules_to_register );
+	public function caffeinated_modules_to_register($modules_to_register = array()) {
+		if (is_readable(EE_CAFF_PATH.'modules')) {
+			$caffeinated_modules_to_register = glob(EE_CAFF_PATH.'modules'.DS.'*', GLOB_ONLYDIR);
+			if (is_array($caffeinated_modules_to_register) && ! empty($caffeinated_modules_to_register)) {
+				$modules_to_register = array_merge($modules_to_register, $caffeinated_modules_to_register);
 			}
 		}
 		return $modules_to_register;
@@ -181,19 +181,19 @@ 
 
 
 
-	public function caffeinated_init(){
+	public function caffeinated_init() {
 		// EE_Register_CPTs hooks
-		add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array( $this, 'filter_taxonomies' ), 10 );
-		add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', array( $this, 'filter_cpts' ), 10 );
-		add_filter('FHEE__EE_Admin__get_extra_nav_menu_pages_items', array( $this, 'nav_metabox_items' ), 10 );
-		EE_Registry::instance()->load_file( EE_CAFF_PATH, 'EE_Caf_Messages', 'class', array(), FALSE );
+		add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array($this, 'filter_taxonomies'), 10);
+		add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', array($this, 'filter_cpts'), 10);
+		add_filter('FHEE__EE_Admin__get_extra_nav_menu_pages_items', array($this, 'nav_metabox_items'), 10);
+		EE_Registry::instance()->load_file(EE_CAFF_PATH, 'EE_Caf_Messages', 'class', array(), FALSE);
 		// caffeinated_init__complete hook
-		do_action( 'AHEE__EE_Brewing_Regular__caffeinated_init__complete' );
+		do_action('AHEE__EE_Brewing_Regular__caffeinated_init__complete');
 	}
 
 
 
-	public function enqueue_caffeinated_scripts(){
+	public function enqueue_caffeinated_scripts() {
 		// sound of crickets...
 	}
 
@@ -202,23 +202,23 @@ 
 	 * callbacks below here
 	 */
 
-	public function filter_taxonomies( $taxonomy_array ) {
+	public function filter_taxonomies($taxonomy_array) {
 		$taxonomy_array['espresso_venue_categories']['args']['show_in_nav_menus'] = TRUE;
 		return $taxonomy_array;
 	}
 
 
 
-	public function filter_cpts( $cpt_array ) {
+	public function filter_cpts($cpt_array) {
 		$cpt_array['espresso_venues']['args']['show_in_nav_menus'] = TRUE;
 		return $cpt_array;
 	}
 
 
-	public function nav_metabox_items( $menuitems ) {
+	public function nav_metabox_items($menuitems) {
 		$menuitems[] = array(
 			'title' => __('Venue List', 'event_espresso'),
-			'url' => get_post_type_archive_link( 'espresso_venues' ),
+			'url' => get_post_type_archive_link('espresso_venues'),
 			'description' => __('Archive page for all venues.', 'event_espresso')
 			);
 		return $menuitems;
@@ -229,9 +229,9 @@ 
 	 * @param array $payment_method_paths
 	 * @return array values are folder paths to payment method folders
 	 */
-	public function caf_payment_methods( $payment_method_paths ) {
-		$caf_payment_methods_paths = glob( EE_CAF_PAYMENT_METHODS . '*', GLOB_ONLYDIR );
-		$payment_method_paths = array_merge( $payment_method_paths, $caf_payment_methods_paths );
+	public function caf_payment_methods($payment_method_paths) {
+		$caf_payment_methods_paths = glob(EE_CAF_PAYMENT_METHODS.'*', GLOB_ONLYDIR);
+		$payment_method_paths = array_merge($payment_method_paths, $caf_payment_methods_paths);
 		return $payment_method_paths;
 	}
 }

Braces +3 added lines, -1 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
  *

caffeinated/EE_Caf_Messages.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	/**
 	 * This just allows us to add additional paths to the autoloader (EED_Messages::autoload_messages()) for the messages system.
 	 * @param  array  $dir_ref original array of paths
-	 * @return array           appended paths
+	 * @return string[]           appended paths
 	 */
 	public function messages_autoload_paths( $dir_ref ) {
 		$dir_ref[] = EE_CAF_LIBRARIES . 'shortcodes/';

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * This file contains the Caffeinated Messages class that handles plugging in all the caffeinated messages functionality.
- * @package      Event Espresso
- * @subpackage plugin api, messages
- * @since           4.3.2
- */
+	 * This file contains the Caffeinated Messages class that handles plugging in all the caffeinated messages functionality.
+	 * @package      Event Espresso
+	 * @subpackage plugin api, messages
+	 * @since           4.3.2
+	 */
 if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 
 /**

Spacing +142 added lines, -142 removed lines

@@ -15,7 +15,7 @@ 
  * @since            4.3.2
  * @author          Darren Ethier
  */
-class EE_Caf_Messages  {
+class EE_Caf_Messages {
 
 
 	/**
@@ -34,36 +34,36 @@ 
 	 * @return void
 	 */
 	private function _caf_hooks() {
-		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array( $this, 'messages_autoload_paths'), 5 );
-		add_filter('FHEE__EE_Email_messenger__get_validator_config', array( $this, 'email_messenger_validator_config'), 5, 2 );
-		add_filter('FHEE__EE_Email_messenger__get_template_fields', array( $this, 'email_messenger_template_fields'), 5, 2 );
-		add_filter( 'FHEE__EE_Html_messenger__get_template_fields', array( $this, 'html_messenger_template_fields' ), 5, 2 );
-		add_filter( 'FHEE__EE_Html_messenger__get_validator_config', array( $this, 'html_messenger_validator_config' ), 5, 2 );
-		add_filter( 'FHEE__EE_Pdf_messenger__get_template_fields', array( $this, 'pdf_messenger_template_fields' ), 5, 2 );
-		add_filter( 'FHEE__EE_Pdf_messenger__get_validator_config', array( $this, 'pdf_messenger_validator_config' ), 5, 2 );
-		add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', array( $this, 'new_default_templates'), 5, 7 );
-		add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', array( $this, 'message_types_valid_shortcodes'), 5, 2 );
+		add_filter('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', array($this, 'messages_autoload_paths'), 5);
+		add_filter('FHEE__EE_Email_messenger__get_validator_config', array($this, 'email_messenger_validator_config'), 5, 2);
+		add_filter('FHEE__EE_Email_messenger__get_template_fields', array($this, 'email_messenger_template_fields'), 5, 2);
+		add_filter('FHEE__EE_Html_messenger__get_template_fields', array($this, 'html_messenger_template_fields'), 5, 2);
+		add_filter('FHEE__EE_Html_messenger__get_validator_config', array($this, 'html_messenger_validator_config'), 5, 2);
+		add_filter('FHEE__EE_Pdf_messenger__get_template_fields', array($this, 'pdf_messenger_template_fields'), 5, 2);
+		add_filter('FHEE__EE_Pdf_messenger__get_validator_config', array($this, 'pdf_messenger_validator_config'), 5, 2);
+		add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', array($this, 'new_default_templates'), 5, 7);
+		add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', array($this, 'message_types_valid_shortcodes'), 5, 2);
 
 		//shortcode parsers
-		add_filter('FHEE__EE_Attendee_Shortcodes__shortcodes', array( $this, 'additional_attendee_shortcodes'), 5, 2 );
-		add_filter('FHEE__EE_Attendee_Shortcodes__parser_after', array( $this, 'additional_attendee_parser'), 5, 5 );
-		add_filter('FHEE__EE_Recipient_List_Shortcodes__shortcodes', array( $this, 'additional_recipient_details_shortcodes'), 5, 2 );
-		add_filter('FHEE__EE_Recipient_List_Shortcodes__parser_after', array( $this, 'additional_recipient_details_parser'), 5, 5 );
-		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__shortcodes', array( $this, 'additional_primary_registration_details_shortcodes'), 5, 2 );
-		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__parser_after', array( $this, 'additional_primary_registration_details_parser'), 5, 5 );
+		add_filter('FHEE__EE_Attendee_Shortcodes__shortcodes', array($this, 'additional_attendee_shortcodes'), 5, 2);
+		add_filter('FHEE__EE_Attendee_Shortcodes__parser_after', array($this, 'additional_attendee_parser'), 5, 5);
+		add_filter('FHEE__EE_Recipient_List_Shortcodes__shortcodes', array($this, 'additional_recipient_details_shortcodes'), 5, 2);
+		add_filter('FHEE__EE_Recipient_List_Shortcodes__parser_after', array($this, 'additional_recipient_details_parser'), 5, 5);
+		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__shortcodes', array($this, 'additional_primary_registration_details_shortcodes'), 5, 2);
+		add_filter('FHEE__EE_Primary_Registration_List_Shortcodes__parser_after', array($this, 'additional_primary_registration_details_parser'), 5, 5);
 
 		/**
 		 * @since 4.2.0
 		 */
-		add_filter( 'FHEE__EE_Datetime_Shortcodes__shortcodes', array( $this, 'additional_datetime_shortcodes'), 10, 2 );
-		add_filter( 'FHEE__EE_Datetime_Shortcodes__parser_after', array( $this, 'additional_datetime_parser'), 10, 5 );
+		add_filter('FHEE__EE_Datetime_Shortcodes__shortcodes', array($this, 'additional_datetime_shortcodes'), 10, 2);
+		add_filter('FHEE__EE_Datetime_Shortcodes__parser_after', array($this, 'additional_datetime_parser'), 10, 5);
 
 		/**
 		 * @since 4.3.0
 		 */
 		//eat our own dog food!
-		add_action('EE_Brewing_Regular___messages_caf', array( $this, 'register_caf_message_types' ) );
-		add_action('EE_Brewing_Regular___messages_caf', array( $this, 'register_caf_shortcodes' ) );
+		add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_message_types'));
+		add_action('EE_Brewing_Regular___messages_caf', array($this, 'register_caf_shortcodes'));
 		do_action('EE_Brewing_Regular___messages_caf');
 	}
 
@@ -74,14 +74,14 @@ 
 	 * @param  array  $dir_ref original array of paths
 	 * @return array           appended paths
 	 */
-	public function messages_autoload_paths( $dir_ref ) {
-		$dir_ref[] = EE_CAF_LIBRARIES . 'shortcodes/';
+	public function messages_autoload_paths($dir_ref) {
+		$dir_ref[] = EE_CAF_LIBRARIES.'shortcodes/';
 		return $dir_ref;
 	}
 
 
 
-	public function email_messenger_validator_config( $validator_config, EE_Email_messenger $messenger ) {
+	public function email_messenger_validator_config($validator_config, EE_Email_messenger $messenger) {
 		$validator_config['attendee_list'] = array(
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
 				'required' => array('[ATTENDEE_LIST]')
@@ -95,7 +95,7 @@ 
 
 
 
-	public function html_messenger_validator_config( $validator_config, EE_Html_messenger $messenger ) {
+	public function html_messenger_validator_config($validator_config, EE_Html_messenger $messenger) {
 		$validator_config['attendee_list'] = array(
 			'shortcodes' => array('attendee', 'question_list'),
 			'required' => array('[ATTENDEE_LIST]')
@@ -109,7 +109,7 @@ 
 
 
 
-	public function pdf_messenger_validator_config( $validator_config, EE_Pdf_messenger $messenger ) {
+	public function pdf_messenger_validator_config($validator_config, EE_Pdf_messenger $messenger) {
 		$validator_config['attendee_list'] = array(
 			'shortcodes' => array('attendee', 'event_list', 'ticket_list', 'question_list'),
 			'required' => array('[ATTENDEE_LIST]')
@@ -124,7 +124,7 @@ 
 
 
 
-	public function email_messenger_template_fields( $template_fields, EE_Email_messenger $messenger ) {
+	public function email_messenger_template_fields($template_fields, EE_Email_messenger $messenger) {
 		$template_fields['extra']['content']['question_list'] = array(
 						'input' => 'textarea',
 						'label' => '[QUESTION_LIST]',
@@ -140,7 +140,7 @@ 
 	}
 
 
-	public function html_messenger_template_fields( $template_fields, EE_Html_messenger $messenger ) {
+	public function html_messenger_template_fields($template_fields, EE_Html_messenger $messenger) {
 		$template_fields['extra']['content']['question_list'] = array(
 			'input' => 'textarea',
 			'label' => '[QUESTION_LIST]',
@@ -157,7 +157,7 @@ 
 
 
 
-	public function pdf_messenger_template_fields( $template_fields, EE_Pdf_messenger $messenger ) {
+	public function pdf_messenger_template_fields($template_fields, EE_Pdf_messenger $messenger) {
 		$template_fields['extra']['content']['question_list'] = array(
 			'input' => 'textarea',
 			'label' => '[QUESTION_LIST]',
@@ -174,39 +174,39 @@ 
 
 
 
-	public function new_default_templates( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack  ) {
+	public function new_default_templates($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) {
 
 		//we're only modifying templates for the default template pack
-		if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default ) {
+		if ( ! $template_pack instanceof EE_Messages_Template_Pack_Default) {
 			return $contents;
 		}
 
 		//the template file name we're replacing contents for.
-		$template_file_prefix = $field . '_' . $context;
-		$msg_prefix = $messenger->name . '_' . $message_type->name . '_' ;
+		$template_file_prefix = $field.'_'.$context;
+		$msg_prefix = $messenger->name.'_'.$message_type->name.'_';
 
-		$base_path = EE_CAF_LIBRARIES . 'messages/defaults/default/';
+		$base_path = EE_CAF_LIBRARIES.'messages/defaults/default/';
 
-		if ( $messenger->name == 'email' && $message_type->name == 'registration' ) {
+		if ($messenger->name == 'email' && $message_type->name == 'registration') {
 
-			switch ( $template_file_prefix ) {
+			switch ($template_file_prefix) {
 
 				case 'question_list_admin' :
 				case 'question_list_attendee' :
 				case 'question_list_primary_attendee' :
-					$path = $base_path . $msg_prefix . 'question_list.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'question_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'attendee_list_primary_attendee' :
-					$path = $base_path . $msg_prefix . 'attendee_list.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'attendee_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'attendee_list_admin' :
-					$path = $base_path . $msg_prefix . 'attendee_list_admin.template.php';
-					$contents = EEH_Template::display_template( $path,
-						array(), true );
+					$path = $base_path.$msg_prefix.'attendee_list_admin.template.php';
+					$contents = EEH_Template::display_template($path,
+						array(), true);
 					break;
 
 				case 'attendee_list_attendee' :
@@ -214,33 +214,33 @@ 
 					break;
 
 				case 'event_list_attendee' :
-					$path = $base_path . $msg_prefix . 'event_list_attendee.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'event_list_attendee.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 			}
-		} elseif ( $messenger->name == 'email' && $message_type->name == 'newsletter' ) {
-			switch( $template_file_prefix ) {
+		} elseif ($messenger->name == 'email' && $message_type->name == 'newsletter') {
+			switch ($template_file_prefix) {
 
 				case 'content_attendee' :
-					$path = $base_path . $msg_prefix . 'content.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'content.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'newsletter_content_attendee' :
-					$path = $base_path . $msg_prefix . 'newsletter_content.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'newsletter_content.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 
 				case 'newsletter_subject_attendee' :
-					$path = $base_path . $msg_prefix . 'subject.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'subject.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 			}
-		} elseif ( $messenger->name == 'html' && $message_type->name == 'receipt' ) {
-			switch  ( $template_file_prefix ) {
+		} elseif ($messenger->name == 'html' && $message_type->name == 'receipt') {
+			switch ($template_file_prefix) {
 				case 'attendee_list_purchaser' :
-					$path = $base_path . $msg_prefix . 'attendee_list.template.php';
-					$contents = EEH_Template::display_template( $path, array(), true );
+					$path = $base_path.$msg_prefix.'attendee_list.template.php';
+					$contents = EEH_Template::display_template($path, array(), true);
 					break;
 			}
 		}
@@ -251,7 +251,7 @@ 
 
 
 
-	public function message_types_valid_shortcodes( $valid_shortcodes, EE_Messages_Base $msg ) {
+	public function message_types_valid_shortcodes($valid_shortcodes, EE_Messages_Base $msg) {
 		//make sure question_list and question are ONLY added for the core message types.  Any other message types will have to explicitly set question_list as a valid shortcode.
 		$include_with = array(
 			'registration',
@@ -268,9 +268,9 @@ 
 			'invoice',
 			'receipt'
 			);
-		if ( $msg instanceof EE_message_type && in_array( $msg->name, $include_with )) {
+		if ($msg instanceof EE_message_type && in_array($msg->name, $include_with)) {
 			$contexts = array_keys($msg->get_contexts());
-				foreach ( $contexts as $context ) {
+				foreach ($contexts as $context) {
 					$valid_shortcodes[$context][] = 'question_list';
 					$valid_shortcodes[$context][] = 'question';
 				}
@@ -282,35 +282,35 @@ 
 
 
 
-	public function additional_attendee_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_attendee_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[ANSWER_*]'] = __('This is a special dynamic shortcode. Right after the "*", add the exact text of a existing question, and if there is an answer for that question for this registrant, that will take the place of this shortcode.', 'event_espresso');
 		return $shortcodes;
 	}
 
 
 
-	public function additional_attendee_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
+	public function additional_attendee_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
 
-		if ( strpos( $shortcode, '[ANSWER_*' ) === FALSE || !isset( $extra_data['data']->questions) || !isset( $extra_data['data']->registrations) )
+		if (strpos($shortcode, '[ANSWER_*') === FALSE || ! isset($extra_data['data']->questions) || ! isset($extra_data['data']->registrations))
 			return $parsed;
 
 		//let's get the question from the code.
 		$shortcode = str_replace('[ANSWER_*', '', $shortcode);
-		$shortcode = trim( str_replace(']', '', $shortcode) );
+		$shortcode = trim(str_replace(']', '', $shortcode));
 
 		$registration = $data instanceof EE_Registration ? $data : null;
-		$registration = ! $registration instanceof EE_Registration && is_array( $extra_data ) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Registration ? $extra_data['data'] : $registration;
+		$registration = ! $registration instanceof EE_Registration && is_array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Registration ? $extra_data['data'] : $registration;
 
 		$aee = $data instanceof EE_Messages_Addressee ? $data : null;
-		$aee = ! $aee instanceof EE_Messages_Addressee && is_array( $extra_data ) && isset( $extra_data['data'] ) ? $extra_data['data'] : $aee;
+		$aee = ! $aee instanceof EE_Messages_Addressee && is_array($extra_data) && isset($extra_data['data']) ? $extra_data['data'] : $aee;
 
-		if ( ! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee ) {
+		if ( ! $registration instanceof EE_Registration || ! $aee instanceof EE_Messages_Addressee) {
 			return $parsed;
 		}
 
 		//now let's figure out which question has this text.
-		foreach ( $aee->questions as $ansid => $question ) {
-			if ( $question instanceof EE_Question && $question->display_text() == $shortcode && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid]) ) {
+		foreach ($aee->questions as $ansid => $question) {
+			if ($question instanceof EE_Question && $question->display_text() == $shortcode && isset($aee->registrations[$registration->ID()]['ans_objs'][$ansid])) {
 				return $aee->registrations[$registration->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 			}
 		}
@@ -332,7 +332,7 @@ 
 	 * @return array                   						array of shortcodes and
 	 *                                             			descriptions
 	 */
-	public function additional_datetime_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_datetime_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[DTT_NAME]'] = __('This will be parsed to the Title given for a Datetime', 'event_espresso');
 		$shortcodes['[DTT_DESCRIPTION]'] = __('This will be parsed to the description for a Datetime', 'event_espresso');
 		$shortcodes['[DTT_NAME_OR_DATES]'] = __('When parsed, if the Datetime has a name, it is used, otherwise a formatted string including the start date and end date will be used.', 'event_espresso');
@@ -354,13 +354,13 @@ 
 	 * @param  EE_Datetime_Shortcodes $shortcode_parser
 	 * @return string                   The new parsed string.
 	 */
-	public function additional_datetime_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
+	public function additional_datetime_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
 
-		if ( ! $data instanceof EE_Datetime ) {
+		if ( ! $data instanceof EE_Datetime) {
 			return ''; //get out because we can only parse with the datetime object.
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[DTT_NAME]' :
 				return $data->name();
 				break;
@@ -368,7 +368,7 @@ 
 				return $data->description();
 				break;
 			case '[DTT_NAME_OR_DATES]' :
-				return $data->get_dtt_display_name( TRUE );
+				return $data->get_dtt_display_name(TRUE);
 				break;
 			default :
 				return $parsed;
@@ -380,40 +380,40 @@ 
 
 
 
-	public function additional_recipient_details_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_recipient_details_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[RECIPIENT_QUESTION_LIST]'] = __('This is used to indicate where you want the list of questions and answers to show for the person receiving the message.', 'event_espresso');
 		return $shortcodes;
 	}
 
 
-	public function additional_recipient_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
+	public function additional_recipient_details_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
 
-		if ( array($data) && ! isset( $data['data'] ) )
+		if (array($data) && ! isset($data['data']))
 			return $parsed;
 
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
+		if ( ! $recipient instanceof EE_Messages_Addressee)
 			return $parsed;
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[RECIPIENT_QUESTION_LIST]' :
 				$att = $recipient->att_obj;
 				$registrations_on_attendee = $att instanceof EE_Attendee ? $recipient->attendees[$att->ID()]['reg_objs'] : array();
-				$registrations_on_attendee = empty( $registrations_on_attendee ) && $recipient->reg_obj instanceof EE_Registration ? array( $recipient->reg_obj ) : $registrations_on_attendee;
+				$registrations_on_attendee = empty($registrations_on_attendee) && $recipient->reg_obj instanceof EE_Registration ? array($recipient->reg_obj) : $registrations_on_attendee;
 				$answers = array();
 
-				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
+				$template = is_array($data['template']) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
 				$valid_shortcodes = array('question');
 
 				//if the context is main_content then get all answers for all registrations on this attendee
-				if ( $data['data'] instanceof EE_Messages_Addressee ) {
-					foreach ( $registrations_on_attendee as $reg ) {
-						if ( $reg instanceof EE_Registration ) {
-							$anss = !empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
-							foreach( $anss as $ans ) {
-								if ( $ans instanceof EE_Answer ) {
+				if ($data['data'] instanceof EE_Messages_Addressee) {
+					foreach ($registrations_on_attendee as $reg) {
+						if ($reg instanceof EE_Registration) {
+							$anss = ! empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
+							foreach ($anss as $ans) {
+								if ($ans instanceof EE_Answer) {
 									$answers[$ans->ID()] = $ans;
 								}
 							}
@@ -422,13 +422,13 @@ 
 				}
 
 				//if the context is the event list parser, then let's return just the answers for all registrations attached to the recipient for that event.
-				if ( $data['data'] instanceof EE_Event ) {
+				if ($data['data'] instanceof EE_Event) {
 					$event = $data['data'];
-					foreach( $registrations_on_attendee as $reg ) {
-						if ( $reg instanceof EE_Registration && $reg->event_ID() == $event->ID() ) {
-							$anss = !empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
-							foreach( $anss as $ans ) {
-								if ( $ans instanceof EE_Answer ) {
+					foreach ($registrations_on_attendee as $reg) {
+						if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
+							$anss = ! empty($recipient->registrations[$reg->ID()]['ans_objs']) ? $recipient->registrations[$reg->ID()]['ans_objs'] : array();
+							foreach ($anss as $ans) {
+								if ($ans instanceof EE_Answer) {
 									$answers[$ans->ID()] = $ans;
 								}
 							}
@@ -438,13 +438,13 @@ 
 
 				$question_list = '';
 				$shortcode_helper = $shortcode_parser->get_shortcode_helper();
-				foreach ( $answers as $answer ) {
-					if ( $answer instanceof EE_Answer ) {
+				foreach ($answers as $answer) {
+					if ($answer instanceof EE_Answer) {
 						$question = $answer->question();
-						if ( ! $question instanceof EE_Question || ( $question instanceof EE_Question && $question->admin_only() ) ) {
+						if ( ! $question instanceof EE_Question || ($question instanceof EE_Question && $question->admin_only())) {
 							continue;
 						}
-						$question_list .= $shortcode_helper->parse_question_list_template( $template, $answer, $valid_shortcodes, $extra_data);
+						$question_list .= $shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes, $extra_data);
 					}
 				}
 				return $question_list;
@@ -457,41 +457,41 @@ 
 	}
 
 
-	public function additional_primary_registration_details_shortcodes( $shortcodes, $shortcode_parser ) {
+	public function additional_primary_registration_details_shortcodes($shortcodes, $shortcode_parser) {
 		$shortcodes['[PRIMARY_REGISTRANT_QUESTION_LIST]'] = __('This is used to indicate the questions and answers for the primary_registrant. It should be placed in the "[attendee_list]" field', 'event_espresso');
 		return $shortcodes;
 	}
 
 
-	public function additional_primary_registration_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
-		if ( array($data) && ! isset( $data['data'] ) )
+	public function additional_primary_registration_details_parser($parsed, $shortcode, $data, $extra_data, $shortcode_parser) {
+		if (array($data) && ! isset($data['data']))
 			return $parsed;
 
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
-		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
+		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset($extra_data['data']) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
+		if ( ! $recipient instanceof EE_Messages_Addressee)
 			return $parsed;
 
 		$send_data = ! $data['data'] instanceof EE_Messages_Addressee ? $extra_data : $data;
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[RECIPIENT_QUESTION_LIST]' :
-				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration )
+				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration)
 					return '';
 				$registration = $recipient->primary_reg_obj;
-				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
+				$template = is_array($data['template']) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
 				$valid_shortcodes = array('question');
 				$shortcode_helper = $shortcode_parser->get_shortcode_helper();
 				$answers = $recipient->registrations[$registration->ID()]['ans_objs'];
 				$question_list = '';
-				foreach ( $answers as $answer ) {
-					if ( $answer instanceof EE_Answer ) {
+				foreach ($answers as $answer) {
+					if ($answer instanceof EE_Answer) {
 						$question = $answer->question();
-						if ( $question instanceof EE_Question and $question->admin_only() ) {
+						if ($question instanceof EE_Question and $question->admin_only()) {
 							continue;
 						}
-						$question_list .= $shortcode_helper->parse_question_list_template( $template, $answer, $valid_shortcodes, $send_data);
+						$question_list .= $shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes, $send_data);
 					}
 				}
 				return $question_list;
@@ -517,67 +517,67 @@ 
 		$setup_args = array(
 			'mtfilename' => 'EE_Newsletter_message_type.class.php',
 			'autoloadpaths' => array(
-				EE_CAF_LIBRARIES . 'messages/message_type/newsletter/'
+				EE_CAF_LIBRARIES.'messages/message_type/newsletter/'
 				),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'newsletter', $setup_args );
+		EE_Register_Message_Type::register('newsletter', $setup_args);
 
 		//register payment reminder message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Reminder_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_reminder/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_reminder/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_reminder', $setup_args );
+		EE_Register_Message_Type::register('payment_reminder', $setup_args);
 
 		//register payment declined message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Declined_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_declined/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_declined/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_declined', $setup_args );
+		EE_Register_Message_Type::register('payment_declined', $setup_args);
 
 		//register registration declined message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Declined_Registration_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/declined_registration/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/declined_registration/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'declined_registration', $setup_args );
+		EE_Register_Message_Type::register('declined_registration', $setup_args);
 
 		//register registration cancelled message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Cancelled_Registration_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/cancelled_registration/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/cancelled_registration/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'cancelled_registration', $setup_args );
+		EE_Register_Message_Type::register('cancelled_registration', $setup_args);
 
 
 		//register payment failed message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Failed_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_failed/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_failed/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_failed', $setup_args );
+		EE_Register_Message_Type::register('payment_failed', $setup_args);
 
 		//register payment declined message type
 		$setup_args = array(
 			'mtfilename' => 'EE_Payment_Cancelled_message_type.class.php',
-			'autoloadpaths' => array( EE_CAF_LIBRARIES . 'messages/message_type/payment_cancelled/' ),
-			'messengers_to_activate_with' => array( 'email' ),
-			'messengers_to_validate_with' => array( 'email' )
+			'autoloadpaths' => array(EE_CAF_LIBRARIES.'messages/message_type/payment_cancelled/'),
+			'messengers_to_activate_with' => array('email'),
+			'messengers_to_validate_with' => array('email')
 			);
-		EE_Register_Message_Type::register( 'payment_cancelled', $setup_args );
+		EE_Register_Message_Type::register('payment_cancelled', $setup_args);
 	}
 
 
@@ -593,12 +593,12 @@ 
 	public function register_caf_shortcodes() {
 		$setup_args = array(
 			'autoloadpaths' => array(
-				EE_CAF_LIBRARIES . 'shortcodes/'
+				EE_CAF_LIBRARIES.'shortcodes/'
 				),
-			'msgr_validator_callback' => array( 'EE_Newsletter_Shortcodes', 'messenger_validator_config' ),
-			'msgr_template_fields_callback' => array( 'EE_Newsletter_Shortcodes', 'messenger_template_fields' ),
-			'list_type_shortcodes' => array( '[NEWSLETTER_CONTENT]' )
+			'msgr_validator_callback' => array('EE_Newsletter_Shortcodes', 'messenger_validator_config'),
+			'msgr_template_fields_callback' => array('EE_Newsletter_Shortcodes', 'messenger_template_fields'),
+			'list_type_shortcodes' => array('[NEWSLETTER_CONTENT]')
 			);
-		EE_Register_Messages_Shortcode_Library::register( 'newsletter', $setup_args );
+		EE_Register_Messages_Shortcode_Library::register('newsletter', $setup_args);
 	}
 }

Braces +21 added lines, -13 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage plugin api, messages
  * @since           4.3.2
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Used to initialize all EE messages caffeinated functionality.
@@ -291,8 +293,9 @@ 
 
 	public function additional_attendee_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
 
-		if ( strpos( $shortcode, '[ANSWER_*' ) === FALSE || !isset( $extra_data['data']->questions) || !isset( $extra_data['data']->registrations) )
-			return $parsed;
+		if ( strpos( $shortcode, '[ANSWER_*' ) === FALSE || !isset( $extra_data['data']->questions) || !isset( $extra_data['data']->registrations) ) {
+					return $parsed;
+		}
 
 		//let's get the question from the code.
 		$shortcode = str_replace('[ANSWER_*', '', $shortcode);
@@ -388,14 +391,16 @@ 
 
 	public function additional_recipient_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
 
-		if ( array($data) && ! isset( $data['data'] ) )
-			return $parsed;
+		if ( array($data) && ! isset( $data['data'] ) ) {
+					return $parsed;
+		}
 
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
-			return $parsed;
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
+					return $parsed;
+		}
 
 		switch ( $shortcode ) {
 			case '[RECIPIENT_QUESTION_LIST]' :
@@ -464,21 +469,24 @@ 
 
 
 	public function additional_primary_registration_details_parser( $parsed, $shortcode, $data, $extra_data, $shortcode_parser ) {
-		if ( array($data) && ! isset( $data['data'] ) )
-			return $parsed;
+		if ( array($data) && ! isset( $data['data'] ) ) {
+					return $parsed;
+		}
 
 		$recipient = $data['data'] instanceof EE_Messages_Addressee ? $data['data'] : NULL;
 		$recipient = ! $recipient instanceof EE_Messages_Addressee && array($extra_data) && isset( $extra_data['data'] ) && $extra_data['data'] instanceof EE_Messages_Addressee ? $extra_data['data'] : $recipient;
 
-		if ( ! $recipient instanceof EE_Messages_Addressee )
-			return $parsed;
+		if ( ! $recipient instanceof EE_Messages_Addressee ) {
+					return $parsed;
+		}
 
 		$send_data = ! $data['data'] instanceof EE_Messages_Addressee ? $extra_data : $data;
 
 		switch ( $shortcode ) {
 			case '[RECIPIENT_QUESTION_LIST]' :
-				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $recipient->primary_att_obj instanceof EE_Attendee || ! $recipient->primary_reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				$registration = $recipient->primary_reg_obj;
 				$template = is_array($data['template'] ) && isset($data['template']['question_list']) ? $data['template']['question_list'] : $extra_data['template']['question_list'];
 				$valid_shortcodes = array('question');

caffeinated/modules/events_archive_caff/EED_Events_Archive_Caff.module.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	 *  @access 	public
 	 *  @param 	EE_Events_Archive_Config $CFG
 	 *  @param 	EE_Request_Handler $REQ
-	 *  @return 	void
+	 *  @return 	EE_Events_Archive_Config
 	 */
 	public static function update_template_settings( $CFG, $REQ ) {
 		$CFG->EED_Events_Archive = new EE_Events_Archive_Config();

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.0
- *
- * ------------------------------------------------------------------------
- *
- * EED_Events_Archive_Caff
- *
- * @package		Event Espresso
- * @subpackage	/modules/events_archive_caff/
- * @author		Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * EED_Events_Archive_Caff
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	/modules/events_archive_caff/
+	 * @author		Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EED_Events_Archive_Caff  extends EED_Events_Archive {
 
 

Spacing +20 added lines, -20 removed lines

@@ -28,7 +28,7 @@ 
 	 * @return EED_Events_Archive_Caff
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -49,9 +49,9 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define( 'EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Events_Archive_Caff', 'template_settings_form' ), 10 );
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Events_Archive_Caff', 'update_template_settings' ), 10, 2 );
+		define('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Events_Archive_Caff', 'template_settings_form'), 10);
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Events_Archive_Caff', 'update_template_settings'), 10, 2);
 	}
 
 
@@ -64,7 +64,7 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -79,13 +79,13 @@ 
 	 */
 	public static function template_settings_form() {
 		// grab general settings admin page and remove the existing hook callback
-		$gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object( 'general_settings' );
-		if ( $gen_set_admin instanceof General_Settings_Admin_Page ) {
-			remove_action( 'AHEE__template_settings__template__before_settings_form', array( $gen_set_admin, 'template_settings_caff_features' ), 100 );
+		$gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object('general_settings');
+		if ($gen_set_admin instanceof General_Settings_Admin_Page) {
+			remove_action('AHEE__template_settings__template__before_settings_form', array($gen_set_admin, 'template_settings_caff_features'), 100);
 		}
 		$template_settings = EE_Registry::instance()->CFG->template_settings;
-		$template_settings->EED_Events_Archive = isset( $template_settings->EED_Events_Archive ) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
-		$template_settings->EED_Events_Archive = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive );
+		$template_settings->EED_Events_Archive = isset($template_settings->EED_Events_Archive) ? $template_settings->EED_Events_Archive : new EE_Events_Archive_Config();
+		$template_settings->EED_Events_Archive = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $template_settings->EED_Events_Archive);
 		$events_archive_settings = array(
 			'display_status_banner' => 0,
 			'display_description' => 1,
@@ -94,8 +94,8 @@ 
 			'display_venue' => 0,
 			'display_expired_events' => 0
 		);
-		$events_archive_settings = array_merge( $events_archive_settings, (array)$template_settings->EED_Events_Archive );
-		EEH_Template::display_template( EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $events_archive_settings );
+		$events_archive_settings = array_merge($events_archive_settings, (array) $template_settings->EED_Events_Archive);
+		EEH_Template::display_template(EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH.'admin-event-list-settings.template.php', $events_archive_settings);
 	}
 
 
@@ -111,16 +111,16 @@ 
 	 *  @param 	EE_Request_Handler $REQ
 	 *  @return 	void
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 		$CFG->EED_Events_Archive = new EE_Events_Archive_Config();
 		// unless we are resetting the config...
-		if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) || absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
-			$CFG->EED_Events_Archive->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
-			$CFG->EED_Events_Archive->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
-			$CFG->EED_Events_Archive->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
-			$CFG->EED_Events_Archive->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
-			$CFG->EED_Events_Archive->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
-			$CFG->EED_Events_Archive->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;			}
+		if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) || absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
+			$CFG->EED_Events_Archive->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
+			$CFG->EED_Events_Archive->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
+			$CFG->EED_Events_Archive->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
+			$CFG->EED_Events_Archive->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
+			$CFG->EED_Events_Archive->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
+			$CFG->EED_Events_Archive->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0; }
 		return $CFG;
 	}
 

Braces +3 added lines, -1 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
  *

caffeinated/modules/recaptcha/EED_Recaptcha.module.php

Doc Comments +2 added lines, -2 removed lines

@@ -287,7 +287,7 @@ 
 	 * 	process_recaptcha
 	 *
 	 * 	@access private
-	 * 	@return 	boolean
+	 * 	@return 	boolean|null
 	 */
 	private static function _get_recaptcha_response() {
 		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get( 'g-recaptcha-response', false );
@@ -574,7 +574,7 @@ 
 	 *
 	 * @access public
 	 * @param EE_Registration_Config $EE_Registration_Config
-	 * @return array
+	 * @return EE_Registration_Config
 	 */
 	public static function update_admin_settings( EE_Registration_Config $EE_Registration_Config ) {
 		try {

Braces +3 added lines, -1 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
  *

Spacing +131 added lines, -132 removed lines

@@ -43,7 +43,7 @@ 
 	 * @return EED_Recaptcha
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -56,15 +56,15 @@ 
 	 */
 	public static function set_hooks() {
 		// use_captcha ?
-		if ( EE_Registry::instance()->CFG->registration->use_captcha ) {
+		if (EE_Registry::instance()->CFG->registration->use_captcha) {
 			EED_Recaptcha::set_definitions();
 			EED_Recaptcha::enqueue_styles_and_scripts();
-			add_action( 'wp', array( 'EED_Recaptcha', 'set_late_hooks' ), 1, 0 );
-			add_action( 'AHEE__before_spco_whats_next_buttons', array( 'EED_Recaptcha', 'display_recaptcha' ), 10, 0 );
-			add_filter( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__set_completed___completed', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
-			add_filter( 'FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array( 'EED_Recaptcha', 'recaptcha_response' ), 10, 1 );
-			add_filter( 'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array( 'EED_Recaptcha', 'bypass_recaptcha_for_spco_load_payment_method' ), 10, 1 );
+			add_action('wp', array('EED_Recaptcha', 'set_late_hooks'), 1, 0);
+			add_action('AHEE__before_spco_whats_next_buttons', array('EED_Recaptcha', 'display_recaptcha'), 10, 0);
+			add_filter('FHEE__EED_Single_Page_Checkout__init___continue_reg', array('EED_Recaptcha', 'not_a_robot'), 10);
+			add_filter('FHEE__EE_SPCO_Reg_Step__set_completed___completed', array('EED_Recaptcha', 'not_a_robot'), 10);
+			add_filter('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array('EED_Recaptcha', 'recaptcha_response'), 10, 1);
+			add_filter('FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array('EED_Recaptcha', 'bypass_recaptcha_for_spco_load_payment_method'), 10, 1);
 		}
 	}
 
@@ -79,15 +79,15 @@ 
 	public static function set_hooks_admin() {
 		EED_Recaptcha::set_definitions();
 		// use_captcha ?
-		if ( EE_Registry::instance()->CFG->registration->use_captcha ) {
+		if (EE_Registry::instance()->CFG->registration->use_captcha) {
 			EED_Recaptcha::enqueue_styles_and_scripts();
-			add_filter( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__set_completed___completed', array( 'EED_Recaptcha', 'not_a_robot' ), 10 );
-			add_filter( 'FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array( 'EED_Recaptcha', 'recaptcha_response' ), 10, 1 );
+			add_filter('FHEE__EED_Single_Page_Checkout__init___continue_reg', array('EED_Recaptcha', 'not_a_robot'), 10);
+			add_filter('FHEE__EE_SPCO_Reg_Step__set_completed___completed', array('EED_Recaptcha', 'not_a_robot'), 10);
+			add_filter('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', array('EED_Recaptcha', 'recaptcha_response'), 10, 1);
 		}
 		// admin settings
-		add_action( 'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template', array( 'EED_Recaptcha', 'admin_settings' ), 10, 1 );
-		add_filter( 'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', array( 'EED_Recaptcha', 'update_admin_settings' ), 10, 1 );
+		add_action('AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template', array('EED_Recaptcha', 'admin_settings'), 10, 1);
+		add_filter('FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration', array('EED_Recaptcha', 'update_admin_settings'), 10, 1);
 	}
 
 
@@ -99,11 +99,11 @@ 
 	 *  @return 	void
 	 */
 	public static function set_definitions() {
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			EED_Recaptcha::$_not_a_robot = true;
 		}
-		define( 'RECAPTCHA_BASE_PATH', rtrim( str_replace( array( '\\', '/' ), DS, plugin_dir_path( __FILE__ )), DS ) . DS );
-		define( 'RECAPTCHA_BASE_URL', plugin_dir_url( __FILE__ ));
+		define('RECAPTCHA_BASE_PATH', rtrim(str_replace(array('\\', '/'), DS, plugin_dir_path(__FILE__)), DS).DS);
+		define('RECAPTCHA_BASE_URL', plugin_dir_url(__FILE__));
 	}
 
 
@@ -117,7 +117,7 @@ 
 	public static function set_late_hooks() {
 		add_filter(
 			'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit',
-			array( 'EED_Recaptcha', 'not_a_robot' )
+			array('EED_Recaptcha', 'not_a_robot')
 		);
 	}
 
@@ -130,11 +130,11 @@ 
 	 *  @return 	void
 	 */
 	public static function enqueue_styles_and_scripts() {
-		wp_register_script( 'espresso_recaptcha', RECAPTCHA_BASE_URL . 'scripts' . DS . 'espresso_recaptcha.js', array( 'single_page_checkout' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'google_recaptcha', 'https://www.google.com/recaptcha/api.js?hl=' . EE_Registry::instance()->CFG->registration->recaptcha_language, array( 'espresso_recaptcha' ), EVENT_ESPRESSO_VERSION, TRUE );
-		EE_Registry::$i18n_js_strings['no_SPCO_error'] = __( 'It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __( 'There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['recaptcha_fail'] = __( 'Please complete the anti-spam test before proceeding.', 'event_espresso' );
+		wp_register_script('espresso_recaptcha', RECAPTCHA_BASE_URL.'scripts'.DS.'espresso_recaptcha.js', array('single_page_checkout'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('google_recaptcha', 'https://www.google.com/recaptcha/api.js?hl='.EE_Registry::instance()->CFG->registration->recaptcha_language, array('espresso_recaptcha'), EVENT_ESPRESSO_VERSION, TRUE);
+		EE_Registry::$i18n_js_strings['no_SPCO_error'] = __('It appears the Single Page Checkout javascript was not loaded properly! Please refresh the page and try again or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['no_recaptcha_error'] = __('There appears to be a problem with the reCAPTCHA configuration! Please check the admin settings or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['recaptcha_fail'] = __('Please complete the anti-spam test before proceeding.', 'event_espresso');
 	}
 
 
@@ -145,7 +145,7 @@ 
 	 * @access    public
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -155,8 +155,7 @@ 
 	 *  @return boolean
 	 */
 	public static function not_a_robot() {
-		$not_a_robot = is_bool( EED_Recaptcha::$_not_a_robot ) ? EED_Recaptcha::$_not_a_robot :
-			EED_Recaptcha::recaptcha_passed();
+		$not_a_robot = is_bool(EED_Recaptcha::$_not_a_robot) ? EED_Recaptcha::$_not_a_robot : EED_Recaptcha::recaptcha_passed();
 		return $not_a_robot;
 	}
 
@@ -172,23 +171,23 @@ 
 	 */
 	public static function display_recaptcha() {
 		// logged in means you have already passed a turing test of sorts
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 			return;
 		}
 		// don't display if not using recaptcha or user is logged in
-		if ( EE_Registry::instance()->CFG->registration->use_captcha ) {
+		if (EE_Registry::instance()->CFG->registration->use_captcha) {
 			// only display if they have NOT passed the test yet
-			if ( ! EED_Recaptcha::$_not_a_robot ) {
-				EE_Registry::instance()->load_helper( 'Template' );
+			if ( ! EED_Recaptcha::$_not_a_robot) {
+				EE_Registry::instance()->load_helper('Template');
 				EEH_Template::display_template(
-					RECAPTCHA_BASE_PATH . DS . 'templates' . DS . 'recaptcha.template.php',
+					RECAPTCHA_BASE_PATH.DS.'templates'.DS.'recaptcha.template.php',
 					array(
 						'recaptcha_publickey' 	=> EE_Registry::instance()->CFG->registration->recaptcha_publickey,
 						'recaptcha_theme' 		=> EE_Registry::instance()->CFG->registration->recaptcha_theme,
 						'recaptcha_type' 			=> EE_Registry::instance()->CFG->registration->recaptcha_type
 					)
 				);
-				wp_enqueue_script( 'google_recaptcha' );
+				wp_enqueue_script('google_recaptcha');
 			}
 		}
 	}
@@ -219,17 +218,17 @@ 
 	 */
 	public static function recaptcha_passed() {
 		// logged in means you have already passed a turing test of sorts
-		if ( is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha() ) {
+		if (is_user_logged_in() || EED_Recaptcha::_bypass_recaptcha()) {
 			return TRUE;
 		}
 		// was test already passed?
-		$recaptcha_passed = EE_Registry::instance()->SSN->get_session_data( 'recaptcha_passed' );
-		$recaptcha_passed = filter_var( $recaptcha_passed, FILTER_VALIDATE_BOOLEAN );
+		$recaptcha_passed = EE_Registry::instance()->SSN->get_session_data('recaptcha_passed');
+		$recaptcha_passed = filter_var($recaptcha_passed, FILTER_VALIDATE_BOOLEAN);
 		// verify recaptcha
 		EED_Recaptcha::_get_recaptcha_response();
-		if ( ! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response ) {
+		if ( ! $recaptcha_passed && EED_Recaptcha::$_recaptcha_response) {
 			$recaptcha_passed = EED_Recaptcha::_process_recaptcha_response();
-			EE_Registry::instance()->SSN->set_session_data( array( 'recaptcha_passed' => $recaptcha_passed ));
+			EE_Registry::instance()->SSN->set_session_data(array('recaptcha_passed' => $recaptcha_passed));
 			EE_Registry::instance()->SSN->update();
 		}
 		EED_Recaptcha::$_not_a_robot = $recaptcha_passed;
@@ -245,8 +244,8 @@ 
 	 * @param array $recaptcha_response
 	 * @return boolean
 	 */
-	public static function recaptcha_response( $recaptcha_response = array() ) {
-		if ( EED_Recaptcha::_bypass_recaptcha() ) {
+	public static function recaptcha_response($recaptcha_response = array()) {
+		if (EED_Recaptcha::_bypass_recaptcha()) {
 			$recaptcha_response['bypass_recaptcha'] = TRUE;
 			$recaptcha_response['recaptcha_passed'] = TRUE;
 		} else {
@@ -266,16 +265,16 @@ 
 	 */
 	private static function _bypass_recaptcha() {
 		// an array of key value pairs that must match exactly with the incoming request, in order to bypass recaptcha for the current request ONLY
-		$bypass_request_params_array = apply_filters( 'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array() );
+		$bypass_request_params_array = apply_filters('FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array', array());
 		// does $bypass_request_params_array have any values ?
-		if ( empty( $bypass_request_params_array )) {
+		if (empty($bypass_request_params_array)) {
 			return FALSE;
 		}
 		// initially set bypass to TRUE
 		$bypass_recaptcha = TRUE;
-		foreach ( $bypass_request_params_array as $key => $value ) {
+		foreach ($bypass_request_params_array as $key => $value) {
 			// if $key is not found or value doesn't match exactly, then toggle bypass to FALSE, otherwise carry over it's value. This way, one missed setting results in no bypass
-			$bypass_recaptcha = isset( $_REQUEST[ $key ] ) && $_REQUEST[ $key ] === $value ? $bypass_recaptcha : FALSE;
+			$bypass_recaptcha = isset($_REQUEST[$key]) && $_REQUEST[$key] === $value ? $bypass_recaptcha : FALSE;
 		}
 		return $bypass_recaptcha;
 	}
@@ -290,7 +289,7 @@ 
 	 * 	@return 	boolean
 	 */
 	private static function _get_recaptcha_response() {
-		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get( 'g-recaptcha-response', false );
+		EED_Recaptcha::$_recaptcha_response = EE_Registry::instance()->REQ->get('g-recaptcha-response', false);
 	}
 
 
@@ -304,26 +303,26 @@ 
 	 */
 	private static function _process_recaptcha_response() {
 		// verify library is loaded
-		if ( ! class_exists( '\\ReCaptcha\\ReCaptcha' )) {
-			require_once( RECAPTCHA_BASE_PATH . DS . 'autoload.php' );
+		if ( ! class_exists('\\ReCaptcha\\ReCaptcha')) {
+			require_once(RECAPTCHA_BASE_PATH.DS.'autoload.php');
 		}
 		// The response from reCAPTCHA
 		EED_Recaptcha::_get_recaptcha_response();
 		$recaptcha_response = EED_Recaptcha::$_recaptcha_response;
 		// Was there a reCAPTCHA response?
-		if ( $recaptcha_response ) {
+		if ($recaptcha_response) {
 			// if allow_url_fopen is Off, then set a different request method
-			$request_method = ! ini_get( 'allow_url_fopen' ) ? new \ReCaptcha\RequestMethod\SocketPost() : null;
+			$request_method = ! ini_get('allow_url_fopen') ? new \ReCaptcha\RequestMethod\SocketPost() : null;
 			$recaptcha = new \ReCaptcha\ReCaptcha(
 				EE_Registry::instance()->CFG->registration->recaptcha_privatekey,
 				$request_method
 			);
 			$recaptcha_response = $recaptcha->verify(
 				EED_Recaptcha::$_recaptcha_response,
-				$_SERVER[ 'REMOTE_ADDR' ]
+				$_SERVER['REMOTE_ADDR']
 			);
 		}
-		if ( $recaptcha_response instanceof \ReCaptcha\Response && $recaptcha_response->isSuccess() ) {
+		if ($recaptcha_response instanceof \ReCaptcha\Response && $recaptcha_response->isSuccess()) {
 			return TRUE;
 		}
 		// sorry... it appears you can't don't know what soup or hamburgers are !!!
@@ -358,8 +357,8 @@ 
 	 */
 	protected static function _recaptcha_settings_form() {
 
-		EE_Registry::instance()->load_helper( 'HTML' );
-		EE_Registry::instance()->load_helper( 'Template' );
+		EE_Registry::instance()->load_helper('HTML');
+		EE_Registry::instance()->load_helper('Template');
 
 		return new EE_Form_Section_Proper(
 			array(
@@ -369,12 +368,12 @@ 
 				'subsections' 			=> apply_filters(
 					'FHEE__EED_Recaptcha___recaptcha_settings_form__form_subsections',
 					array(
-						'main_settings_hdr' 				=> new EE_Form_Section_HTML( EEH_HTML::h2( __( 'reCAPTCHA Anti-spam Settings', 'event_espresso' ) . EEH_Template::get_help_tab_link( 'recaptcha_info' ))),
+						'main_settings_hdr' 				=> new EE_Form_Section_HTML(EEH_HTML::h2(__('reCAPTCHA Anti-spam Settings', 'event_espresso').EEH_Template::get_help_tab_link('recaptcha_info'))),
 						'main_settings' 						=> EED_Recaptcha::_recaptcha_main_settings(),
-						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML( EEH_HTML::h2( __( 'reCAPTCHA Appearance', 'event_espresso' ) )),
+						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML(EEH_HTML::h2(__('reCAPTCHA Appearance', 'event_espresso'))),
 						'appearance_settings' 			=> EED_Recaptcha::_recaptcha_appearance_settings(),
 						// 'recaptcha_example' 				=> new EE_Form_Section_HTML( EED_Recaptcha::display_recaptcha() ),
-						'required_fields_note' 			=> new EE_Form_Section_HTML( EEH_HTML::p( __( 'All fields marked with a * are required fields', 'event_espresso' ), '', 'grey-text' ))
+						'required_fields_note' 			=> new EE_Form_Section_HTML(EEH_HTML::p(__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text'))
 					)
 				)
 			)
@@ -401,28 +400,28 @@ 
 					array(
 						'use_captcha' 				=> new EE_Yes_No_Input(
 							array(
-								'html_label_text'	 	=> __( 'Use reCAPTCHA', 'event_espresso' ),
+								'html_label_text'	 	=> __('Use reCAPTCHA', 'event_espresso'),
 								'html_help_text' 		=> sprintf(
-									__( 'reCAPTCHA is a free service that  protects your website from spam and abuse. It employs advanced risk analysis technology to separate humans from abusive actors. Sign up %1$shere%2$s to receive your Public and Private keys.', 'event_espresso' ),
+									__('reCAPTCHA is a free service that  protects your website from spam and abuse. It employs advanced risk analysis technology to separate humans from abusive actors. Sign up %1$shere%2$s to receive your Public and Private keys.', 'event_espresso'),
 									'<a href="https://www.google.com/recaptcha/intro/index.html">',
 									'</a>'
 								),
-								'default' 								=> isset( EE_Registry::instance()->CFG->registration->use_captcha ) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE,
+								'default' 								=> isset(EE_Registry::instance()->CFG->registration->use_captcha) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE,
 								'display_html_label_text' 	=> FALSE
 							)
 						),
 						'recaptcha_publickey' 		=> new EE_Text_Input(
 							array(
-								'html_label_text'	 	=> __( 'Site Key', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The site key is used to display the widget on your site.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) : ''
+								'html_label_text'	 	=> __('Site Key', 'event_espresso'),
+								'html_help_text' 		=> __('The site key is used to display the widget on your site.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_publickey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_publickey) : ''
 							)
 						),
 						'recaptcha_privatekey' 		=> new EE_Text_Input(
 							array(
-								'html_label_text'	 	=> __( 'Secret Key', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The secret key authorizes communication between your application backend and the reCAPTCHA server to verify the user\'s response. The secret key needs to be kept safe for security purposes.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) : ''
+								'html_label_text'	 	=> __('Secret Key', 'event_espresso'),
+								'html_help_text' 		=> __('The secret key authorizes communication between your application backend and the reCAPTCHA server to verify the user\'s response. The secret key needs to be kept safe for security purposes.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) : ''
 							)
 						)
 					)
@@ -454,81 +453,81 @@ 
 					array(
 						'recaptcha_theme' 		=> new EE_Radio_Button_Input(
 							array(
-								'light' => __( 'Light', 'event_espresso' ),
-								'dark' => __( 'Dark', 'event_espresso' )
+								'light' => __('Light', 'event_espresso'),
+								'dark' => __('Dark', 'event_espresso')
 							),
 							array(
-								'html_label_text'	 	=> __( 'Theme', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The color theme of the widget.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_theme ) ? EE_Registry::instance()->CFG->registration->recaptcha_theme : 'light',
+								'html_label_text'	 	=> __('Theme', 'event_espresso'),
+								'html_help_text' 		=> __('The color theme of the widget.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_theme) ? EE_Registry::instance()->CFG->registration->recaptcha_theme : 'light',
 								'display_html_label_text' => FALSE
 							)
 						),
 						'recaptcha_type' 		=> new EE_Radio_Button_Input(
 							array(
-								'image' => __( 'Image', 'event_espresso' ),
-								'audio' => __( 'Audio', 'event_espresso' )
+								'image' => __('Image', 'event_espresso'),
+								'audio' => __('Audio', 'event_espresso')
 							),
 							array(
-								'html_label_text'	 	=> __( 'Type', 'event_espresso' ),
-								'html_help_text' 		=> __( 'The type of CAPTCHA to serve.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_type ) ? EE_Registry::instance()->CFG->registration->recaptcha_type : 'image',
+								'html_label_text'	 	=> __('Type', 'event_espresso'),
+								'html_help_text' 		=> __('The type of CAPTCHA to serve.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_type) ? EE_Registry::instance()->CFG->registration->recaptcha_type : 'image',
 								'display_html_label_text' =>FALSE
 							)
 						),
 						'recaptcha_language' 		=> new EE_Select_Input(
 							array(
-								 'ar' 			=> __( 'Arabic', 'event_espresso' ),
-								 'bg' 		=> __( 'Bulgarian', 'event_espresso' ),
-								 'ca' 			=> __( 'Catalan', 'event_espresso' ),
-								 'zh-CN' 	=>  __( 'Chinese (Simplified)', 'event_espresso' ),
-								 'zh-TW' 	=>  __( 'Chinese (Traditional)	', 'event_espresso' ),
-								 'hr' 			=> __( 'Croatian', 'event_espresso' ),
-								 'cs' 			=> __( 'Czech', 'event_espresso' ),
-								 'da' 			=> __( 'Danish', 'event_espresso' ),
-								 'nl' 			=> __( 'Dutch', 'event_espresso' ),
-								 'en-GB' 	=>  __( 'English (UK)', 'event_espresso' ),
-								 'en' 			=> __( 'English (US)', 'event_espresso' ),
-								 'fil' 			=> __( 'Filipino', 'event_espresso' ),
-								 'fi' 			=> __( 'Finnish', 'event_espresso' ),
-								 'fr' 			=> __( 'French', 'event_espresso' ),
-								 'fr-CA' 	=>  __( 'French (Canadian)', 'event_espresso' ),
-								 'de' 			=> __( 'German', 'event_espresso' ),
-								 'de-AT' 	=>  __( 'German (Austria)', 'event_espresso' ),
-								 'de-CH' 	=>  __( 'German (Switzerland)', 'event_espresso' ),
-								 'el' 			=> __( 'Greek', 'event_espresso' ),
-								 'iw' 			=> __( 'Hebrew', 'event_espresso' ),
-								 'hi' 			=> __( 'Hindi', 'event_espresso' ),
-								 'hu' 		=> __( 'Hungarian', 'event_espresso' ),
-								 'id' 			=> __( 'Indonesian', 'event_espresso' ),
-								 'it' 			=> __( 'Italian', 'event_espresso' ),
-								 'ja' 			=> __( 'Japanese', 'event_espresso' ),
-								 'ko' 			=> __( 'Korean', 'event_espresso' ),
-								 'lv' 			=> __( 'Latvian', 'event_espresso' ),
-								 'lt' 			=> __( 'Lithuanian', 'event_espresso' ),
-								 'no' 		=> __( 'Norwegian', 'event_espresso' ),
-								 'fa' 			=> __( 'Persian', 'event_espresso' ),
-								 'pl' 			=> __( 'Polish', 'event_espresso' ),
-								 'pt' 			=> __( 'Portuguese', 'event_espresso' ),
-								 'pt-BR' 	=>  __( 'Portuguese (Brazil)', 'event_espresso' ),
-								 'pt-PT' 	=>  __( 'Portuguese (Portugal)', 'event_espresso' ),
-								 'ro' 			=> __( 'Romanian', 'event_espresso' ),
-								 'ru' 			=> __( 'Russian', 'event_espresso' ),
-								 'sr' 			=> __( 'Serbian', 'event_espresso' ),
-								 'sk' 			=> __( 'Slovak', 'event_espresso' ),
-								 'sl' 			=> __( 'Slovenian', 'event_espresso' ),
-								 'es' 			=> __( 'Spanish', 'event_espresso' ),
-								 'es-419' 	=>  __( 'Spanish (Latin America)', 'event_espresso' ),
-								 'sv' 			=> __( 'Swedish', 'event_espresso' ),
-								 'th' 			=> __( 'Thai', 'event_espresso' ),
-								 'tr' 			=> __( 'Turkish', 'event_espresso' ),
-								 'uk' 			=> __( 'Ukrainian', 'event_espresso' ),
-								 'vi' 			=> __( 'Vietnamese', 'event_espresso')
+								 'ar' 			=> __('Arabic', 'event_espresso'),
+								 'bg' 		=> __('Bulgarian', 'event_espresso'),
+								 'ca' 			=> __('Catalan', 'event_espresso'),
+								 'zh-CN' 	=>  __('Chinese (Simplified)', 'event_espresso'),
+								 'zh-TW' 	=>  __('Chinese (Traditional)	', 'event_espresso'),
+								 'hr' 			=> __('Croatian', 'event_espresso'),
+								 'cs' 			=> __('Czech', 'event_espresso'),
+								 'da' 			=> __('Danish', 'event_espresso'),
+								 'nl' 			=> __('Dutch', 'event_espresso'),
+								 'en-GB' 	=>  __('English (UK)', 'event_espresso'),
+								 'en' 			=> __('English (US)', 'event_espresso'),
+								 'fil' 			=> __('Filipino', 'event_espresso'),
+								 'fi' 			=> __('Finnish', 'event_espresso'),
+								 'fr' 			=> __('French', 'event_espresso'),
+								 'fr-CA' 	=>  __('French (Canadian)', 'event_espresso'),
+								 'de' 			=> __('German', 'event_espresso'),
+								 'de-AT' 	=>  __('German (Austria)', 'event_espresso'),
+								 'de-CH' 	=>  __('German (Switzerland)', 'event_espresso'),
+								 'el' 			=> __('Greek', 'event_espresso'),
+								 'iw' 			=> __('Hebrew', 'event_espresso'),
+								 'hi' 			=> __('Hindi', 'event_espresso'),
+								 'hu' 		=> __('Hungarian', 'event_espresso'),
+								 'id' 			=> __('Indonesian', 'event_espresso'),
+								 'it' 			=> __('Italian', 'event_espresso'),
+								 'ja' 			=> __('Japanese', 'event_espresso'),
+								 'ko' 			=> __('Korean', 'event_espresso'),
+								 'lv' 			=> __('Latvian', 'event_espresso'),
+								 'lt' 			=> __('Lithuanian', 'event_espresso'),
+								 'no' 		=> __('Norwegian', 'event_espresso'),
+								 'fa' 			=> __('Persian', 'event_espresso'),
+								 'pl' 			=> __('Polish', 'event_espresso'),
+								 'pt' 			=> __('Portuguese', 'event_espresso'),
+								 'pt-BR' 	=>  __('Portuguese (Brazil)', 'event_espresso'),
+								 'pt-PT' 	=>  __('Portuguese (Portugal)', 'event_espresso'),
+								 'ro' 			=> __('Romanian', 'event_espresso'),
+								 'ru' 			=> __('Russian', 'event_espresso'),
+								 'sr' 			=> __('Serbian', 'event_espresso'),
+								 'sk' 			=> __('Slovak', 'event_espresso'),
+								 'sl' 			=> __('Slovenian', 'event_espresso'),
+								 'es' 			=> __('Spanish', 'event_espresso'),
+								 'es-419' 	=>  __('Spanish (Latin America)', 'event_espresso'),
+								 'sv' 			=> __('Swedish', 'event_espresso'),
+								 'th' 			=> __('Thai', 'event_espresso'),
+								 'tr' 			=> __('Turkish', 'event_espresso'),
+								 'uk' 			=> __('Ukrainian', 'event_espresso'),
+								 'vi' 			=> __('Vietnamese', 'event_espresso')
 							),
 							array(
-								'html_label_text'	 	=> __( 'Language', 'event_espresso' ),
-								'html_help_text' 		=> __( 'Forces the widget to render in a specific language.', 'event_espresso' ),
-								'default' 					=> isset( EE_Registry::instance()->CFG->registration->recaptcha_language ) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en'
+								'html_label_text'	 	=> __('Language', 'event_espresso'),
+								'html_help_text' 		=> __('Forces the widget to render in a specific language.', 'event_espresso'),
+								'default' 					=> isset(EE_Registry::instance()->CFG->registration->recaptcha_language) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en'
 							)
 						)
 					)
@@ -576,25 +575,25 @@ 
 	 * @param EE_Registration_Config $EE_Registration_Config
 	 * @return array
 	 */
-	public static function update_admin_settings( EE_Registration_Config $EE_Registration_Config ) {
+	public static function update_admin_settings(EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$recaptcha_settings_form = EED_Recaptcha::_recaptcha_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $recaptcha_settings_form->was_submitted() ) {
+			if ($recaptcha_settings_form->was_submitted()) {
 				// capture form data
 				$recaptcha_settings_form->receive_form_submission();
 				// validate form data
-				if ( $recaptcha_settings_form->is_valid() ) {
+				if ($recaptcha_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $recaptcha_settings_form->valid_data();
 					// user proofing recaptcha:  If Use reCAPTCHA is set to yes but we dont' have site or secret keys then set Use reCAPTCHA to FALSE and give error message.
 					if (
-						apply_filters( 'FHEE__Extend_Registration_Form_Admin_Page__check_for_recaptcha_keys', TRUE, $EE_Registration_Config )
+						apply_filters('FHEE__Extend_Registration_Form_Admin_Page__check_for_recaptcha_keys', TRUE, $EE_Registration_Config)
 						&& $valid_data['main_settings']['use_captcha']
-						&& ( ! $EE_Registration_Config->use_captcha && ( empty( $valid_data['main_settings']['recaptcha_publickey'] ) || empty( $valid_data['main_settings']['recaptcha_privatekey'] )))
+						&& ( ! $EE_Registration_Config->use_captcha && (empty($valid_data['main_settings']['recaptcha_publickey']) || empty($valid_data['main_settings']['recaptcha_privatekey'])))
 					) {
 						$valid_data['main_settings']['use_captcha'] = FALSE;
-						EE_Error::add_error( __('The use reCAPTCHA setting has been reset to "no". In order to enable the reCAPTCHA service, you must enter a Site Key and Secret Key.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+						EE_Error::add_error(__('The use reCAPTCHA setting has been reset to "no". In order to enable the reCAPTCHA service, you must enter a Site Key and Secret Key.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 					$EE_Registration_Config->use_captcha = $valid_data['main_settings']['use_captcha'];
 					$EE_Registration_Config->recaptcha_publickey = $valid_data['main_settings']['recaptcha_publickey'];
@@ -603,12 +602,12 @@ 
 					$EE_Registration_Config->recaptcha_theme = $valid_data['appearance_settings']['recaptcha_theme'];
 					$EE_Registration_Config->recaptcha_language = $valid_data['appearance_settings']['recaptcha_language'];
 				} else {
-					if ( $recaptcha_settings_form->submission_error_message() != '' ) {
-						EE_Error::add_error( $recaptcha_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($recaptcha_settings_form->submission_error_message() != '') {
+						EE_Error::add_error($recaptcha_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 

caffeinated/modules/ticket_selector_caff/EED_Ticket_Selector_Caff.module.php

Doc Comments +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 	 * @param EE_Template_Config $CFG
 	 * @param array             $REQ incoming request
 	 *
-	 * @return void
+	 * @return EE_Template_Config
 	 */
 	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
 		if ( ! isset( $CFG->EED_Ticket_Selector ) ) {

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- *
- * EED_Ticket_Selector_Caff
- *
- * @package		Event Espresso
- * @subpackage	/modules/events_archive_caff/
- * @author		Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 *
+	 * EED_Ticket_Selector_Caff
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	/modules/events_archive_caff/
+	 * @author		Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EED_Ticket_Selector_Caff  extends EED_Ticket_Selector {
 
 

Spacing +26 added lines, -26 removed lines

@@ -16,7 +16,7 @@ 
 	 * @return EED_Ticket_Selector_Caff
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -37,24 +37,24 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define( 'TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Ticket_Selector_Caff', 'template_settings_form' ), 10 );
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Ticket_Selector_Caff', 'update_template_settings' ), 10, 2 );
+		define('TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Ticket_Selector_Caff', 'template_settings_form'), 10);
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Ticket_Selector_Caff', 'update_template_settings'), 10, 2);
 	}
 
 
 	//just required because of abstract declaration
-	public function run( $WP ) {
+	public function run($WP) {
 		$this->set_config();
 	}
 
 
 
 
-	protected function set_config(){
-		$this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Ticket_Selector_Config' );
-		$this->set_config_name( 'EED_Ticket_Selector' );
+	protected function set_config() {
+		$this->set_config_section('template_settings');
+		$this->set_config_class('EE_Ticket_Selector_Config');
+		$this->set_config_name('EED_Ticket_Selector');
 	}
 
 
@@ -88,7 +88,7 @@ 
 				'subsections' => apply_filters(
 					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
 					array(
-						'appearance_settings_hdr' 				=> new EE_Form_Section_HTML( EEH_HTML::h3( __( 'Ticket Selector Template Settings', 'event_espresso' ))),
+						'appearance_settings_hdr' 				=> new EE_Form_Section_HTML(EEH_HTML::h3(__('Ticket Selector Template Settings', 'event_espresso'))),
 						'appearance_settings' 			=> EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings()
 					)
 				)
@@ -111,25 +111,25 @@ 
 					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_appearance_settings__form_subsections', array(
 						'show_ticket_details' => new EE_Yes_No_Input(
 							array(
-								'html_label_text' => __('Show Ticket Details?', 'event_espresso' ),
-								'html_help_text' => __( 'This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
-								'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details ) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details : true,
+								'html_label_text' => __('Show Ticket Details?', 'event_espresso'),
+								'html_help_text' => __('This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
+								'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details : true,
 								'display_html_label_text' => false
 								)
 							),
 						'show_ticket_sale_columns' => new EE_Yes_No_Input(
 							array(
-								'html_label_text' => __('Show Ticket Sale Info?', 'event_espresso' ),
-								'html_help_text' => __( 'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'),
-								'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns ) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns : true,
+								'html_label_text' => __('Show Ticket Sale Info?', 'event_espresso'),
+								'html_help_text' => __('This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'),
+								'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns : true,
 								'display_html_label_text' => false
 								)
 							),
 						'show_expired_tickets' => new EE_Yes_No_Input(
 							array(
-								'html_label_text' => __( 'Show Expired Tickets?', 'event_espresso' ),
-								'html_help_text' => __( 'Indicate whether to show expired tickets in the ticket selector', 'event_espresso' ),
-								'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets ) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets : true,
+								'html_label_text' => __('Show Expired Tickets?', 'event_espresso'),
+								'html_help_text' => __('Indicate whether to show expired tickets in the ticket selector', 'event_espresso'),
+								'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets) ? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets : true,
 								'display_html_label_text' => false
 							)
 						)
@@ -152,21 +152,21 @@ 
 	 *
 	 * @return void
 	 */
-	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
-		if ( ! isset( $CFG->EED_Ticket_Selector ) ) {
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ) {
+		if ( ! isset($CFG->EED_Ticket_Selector)) {
 			$CFG->EED_Ticket_Selector = new EE_Ticket_Selector_Config();
 		}
 		try {
 			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
 
 			//check for form submission
-			if ( $ticket_selector_form->was_submitted() ) {
+			if ($ticket_selector_form->was_submitted()) {
 
 				//capture form data
 				$ticket_selector_form->receive_form_submission();
 
 				//validate form data
-				if ( $ticket_selector_form->is_valid() ) {
+				if ($ticket_selector_form->is_valid()) {
 
 					//grab validated data from form
 					$valid_data = $ticket_selector_form->valid_data();
@@ -176,13 +176,13 @@ 
 					$CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details'];
 					$CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets'];
 				} else {
-					if ( $ticket_selector_form->submission_error_message() != '' ) {
-						EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($ticket_selector_form->submission_error_message() != '') {
+						EE_Error::add_error($ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 
 			}
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 

Braces +3 added lines, -1 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
  *

caffeinated/payment_methods/Aim/EEG_Aim.gateway.php

Doc Comments +2 added lines, -4 removed lines

@@ -206,7 +206,8 @@ 
 	/**
 	 * Posts the request to AuthorizeNet & returns response.
 	 *
-	 * @return AuthorizeNetARB_Response The response.
+	 * @param EEI_Payment $payment
+	 * @return EE_AuthorizeNetAIM_Response The response.
 	 */
 	private function _sendRequest($payment) {
 		$this->_x_post_fields['login'] = $this->_login_id;
@@ -353,9 +354,6 @@ 
 	 * Constructor. Parses the AuthorizeNet response string.
 	 *
 	 * @param string $response	  The response from the AuthNet server.
-	 * @param string $delimiter	 The delimiter used (default is ",")
-	 * @param string $encap_char	The encap_char used (default is "|")
-	 * @param array  $custom_fields Any custom fields set in the request.
 	 */
 
 	public function __construct($response) {

Indentation +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 			//in which case, we need to generate teh invoice num per request right here...
 			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
+			$this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
 
 
 			if ($this->_test_transactions) {

Spacing +33 added lines, -33 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEG_Aim extends EE_Onsite_Gateway{
+class EEG_Aim extends EE_Onsite_Gateway {
 	protected $_login_id;
 	protected $_transaction_key;
 	protected $_currencies_supported = array(
@@ -98,17 +98,17 @@ 
 			$primary_registrant = $transaction->primary_registration();
 			//if we're are charging for the full amount, show the normal line items
 			//and the itemized total adds up properly
-			if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+			if ($this->_can_easily_itemize_transaction_for($payment)) {
 				$total_line_item = $transaction->total_line_item();
 				foreach ($total_line_item->get_items() as $line_item) {
 					$this->addLineItem($item_num++, $line_item->name(), $line_item->desc(), $line_item->quantity(), $line_item->unit_price(), 'N');
 					$order_description .= $line_item->desc().', ';
 				}
-				foreach($total_line_item->tax_descendants() as $tax_line_item){
+				foreach ($total_line_item->tax_descendants() as $tax_line_item) {
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
 				}
-			}else{//partial payment
-				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
+			} else {//partial payment
+				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code());
 			}
 
 
@@ -116,7 +116,7 @@ 
 
 			//start transaction
 			$this->setField('amount', $this->format_currency($payment->amount()));
-			$this->setField('description',substr(rtrim($order_description, ', '), 0, 255));
+			$this->setField('description', substr(rtrim($order_description, ', '), 0, 255));
 			$this->setField('card_num', $billing_info['credit_card']);
 			$this->setField('exp_date', $billing_info['exp_month'].$billing_info['exp_year']);
 			$this->setField('card_code', $billing_info['cvv']);
@@ -125,17 +125,17 @@ 
 			$this->setField('email', $billing_info['email']);
 			$this->setField('address', $billing_info['address'].' '.$billing_info['address2']);
 			$this->setField('city', $billing_info['city']);
-			$this->setField('state', $billing_info['state'] );
-			$this->setField('country', $billing_info['country'] );
+			$this->setField('state', $billing_info['state']);
+			$this->setField('country', $billing_info['country']);
 			$this->setField('zip', $billing_info['zip']);
 			$this->setField('cust_id', $primary_registrant->ID());
 			$this->setField('phone', $billing_info['phone']);
 			//invoice_num would be nice to have itbe unique per SPCO page-load, taht way if users
 			//press back, they don't submit a duplicate. However, we may be keepin gthe user on teh same spco page
 			//in which case, we need to generate teh invoice num per request right here...
-			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
+			$this->setField('invoice_num', wp_generate_password(12, false)); //$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
+            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS);
 
 
 			if ($this->_test_transactions) {
@@ -145,7 +145,7 @@ 
 			//Capture response
 			$this->type = "AUTH_CAPTURE";
 			$response = $this->_sendRequest($payment);
-			if (!empty($response)){
+			if ( ! empty($response)) {
 				if ($this->_debug_mode) {
 					$txn_id = $response->invoice_number;
 				} else {
@@ -154,15 +154,15 @@ 
 				$payment_status = $response->approved ? $this->_pay_model->approved_status() : $this->_pay_model->declined_status();
 				$payment->set_status($payment_status);
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand seperators)
-				$payment->set_amount( floatval( $response->amount ) );
-				$payment->set_gateway_response(sprintf("%s (code: %s)",$response->response_reason_text,$response->response_reason_code));
-				$payment->set_txn_id_chq_nmbr( $txn_id );
+				$payment->set_amount(floatval($response->amount));
+				$payment->set_gateway_response(sprintf("%s (code: %s)", $response->response_reason_text, $response->response_reason_code));
+				$payment->set_txn_id_chq_nmbr($txn_id);
 				$payment->set_extra_accntng($primary_registrant->reg_code());
-				$payment->set_details(print_r($response,true));
+				$payment->set_details(print_r($response, true));
 			} else {
 				$payment->set_status($this->_pay_model->failed_status());
 				$payment->set_gateway_response(__("There was no response from Authorize.net", 'event_espresso'));
-				$payment->set_details(print_r($response,true));
+				$payment->set_details(print_r($response, true));
 			}
 		return $payment;
 	}
@@ -213,22 +213,22 @@ 
 		$this->_x_post_fields['tran_key'] = $this->_transaction_key;
 		$x_keys = array();
 		foreach ($this->_x_post_fields as $key => $value) {
-			$x_keys[] = "x_$key=" . urlencode($value);
+			$x_keys[] = "x_$key=".urlencode($value);
 		}
 		// Add line items
 		foreach ($this->_additional_line_items as $key => $value) {
-			$x_keys[] =  "x_line_item=" . urlencode($value);
+			$x_keys[] = "x_line_item=".urlencode($value);
 		}
 		$this->_log_clean_request($x_keys, $payment);
 		$post_url = ($this->_debug_mode ? self::SANDBOX_URL : self::LIVE_URL);
 		$curl_request = curl_init($post_url);
-		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&",$x_keys));
+		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&", $x_keys));
 		curl_setopt($curl_request, CURLOPT_HEADER, 0);
 		curl_setopt($curl_request, CURLOPT_TIMEOUT, 45);
 		curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2);
 		if ($this->VERIFY_PEER) {
-			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(dirname(__FILE__)) . '/ssl/cert.pem');
+			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(dirname(__FILE__)).'/ssl/cert.pem');
 		} else {
 			curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
 		}
@@ -240,7 +240,7 @@ 
 		$response = curl_exec($curl_request);
 
 		curl_close($curl_request);
-		$response_obj =  new EE_AuthorizeNetAIM_Response($response);
+		$response_obj = new EE_AuthorizeNetAIM_Response($response);
 
 		return $this->_log_and_clean_response($response_obj, $payment);
 	}
@@ -249,18 +249,18 @@ 
 	 * @param array $request_array
 	 * @param EEI_Payment $payment
 	 */
-	private function _log_clean_request($request_array,$payment){
-		$keys_to_filter_out = array( 'x_card_num', 'x_card_code', 'x_exp_date' );
-		foreach($request_array as $index => $keyvaltogether ) {
-			foreach( $keys_to_filter_out as $key ) {
-				if( strpos( $keyvaltogether, $key ) === 0 ){
+	private function _log_clean_request($request_array, $payment) {
+		$keys_to_filter_out = array('x_card_num', 'x_card_code', 'x_exp_date');
+		foreach ($request_array as $index => $keyvaltogether) {
+			foreach ($keys_to_filter_out as $key) {
+				if (strpos($keyvaltogether, $key) === 0) {
 					//found it at the first character
 					//so its one of them
-					unset( $request_array[ $index ] );
+					unset($request_array[$index]);
 				}
 			}
 		}
-		$this->log(array('AIM Request sent:'=>$request_array),$payment);
+		$this->log(array('AIM Request sent:'=>$request_array), $payment);
 	}
 
 	/**
@@ -268,9 +268,9 @@ 
 	 * @param EE_AuthorizeNetAIM_Response $response_obj
 	 * @param EE_Payment $payment
 	 */
-	private function _log_and_clean_response($response_obj,$payment){
+	private function _log_and_clean_response($response_obj, $payment) {
 		$response_obj->account_number = '';
-		$this->log(array('AIM Response received:'=>$response_obj),$payment);
+		$this->log(array('AIM Response received:'=>$response_obj), $payment);
 		return $response_obj;
 	}
 
@@ -366,7 +366,7 @@ 
 			// Split Array
 			$this->response = $response;
 			if ($encap_char) {
-				$this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
+				$this->_response_array = explode($encap_char.$delimiter.$encap_char, substr($response, 1, -1));
 			} else {
 				$this->_response_array = explode($delimiter, $response);
 			}
@@ -436,7 +436,7 @@ 
 			$this->held = ($this->response_code == self::HELD);
 
 			if ($this->error || $this->declined || $this->held) {
-				$this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />' . $this->response_reason_text . '<br /><span class="response_code">Response Code: ' . $this->response_code . '<br /></span><span class="response_subcode">Response Subcode: ' . $this->response_subcode . '</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> ';
+				$this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />'.$this->response_reason_text.'<br /><span class="response_code">Response Code: '.$this->response_code.'<br /></span><span class="response_subcode">Response Subcode: '.$this->response_subcode.'</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> ';
 
 
 				/* $this->error_message = "AuthorizeNet Error:

Braces +3 added lines, -2 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -107,7 +108,7 @@ 
 				foreach($total_line_item->tax_descendants() as $tax_line_item){
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
 				}
-			}else{//partial payment
+			} else{//partial payment
 				$order_description = sprintf(__("Payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
 			}
 

caffeinated/payment_methods/Paypal_Pro/EEG_Paypal_Pro.gateway.php

Doc Comments +1 added lines, -1 removed lines

@@ -392,7 +392,7 @@
 
 
 	/**
-	 * @param $Request
+	 * @param string $Request
 	 * @return mixed
 	 */
 	private function _CURLRequest($Request) {

Spacing +51 added lines, -51 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEG_Paypal_Pro extends EE_Onsite_Gateway{
+class EEG_Paypal_Pro extends EE_Onsite_Gateway {
 	/**
 	 *
 	 * @var $_paypal_api_username string
@@ -88,21 +88,21 @@ 
 	 * } @see parent::do_direct_payment for more info
 	 * @return \EE_Payment|\EEI_Payment
 	 */
-	public function do_direct_payment($payment,$billing_info = null){
+	public function do_direct_payment($payment, $billing_info = null) {
 		$transaction = $payment->transaction();
 		$primary_registrant = $transaction->primary_registration();
-		$order_description  = sprintf(__("'Event Registrations from %s", "event_espresso"),get_bloginfo('name'));
+		$order_description  = sprintf(__("'Event Registrations from %s", "event_espresso"), get_bloginfo('name'));
 		//charge for the full amount. Show itemized list
-		if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
 			$item_num = 1;
 			$total_line_item = $transaction->total_line_item();
 			$order_items = array();
 			foreach ($total_line_item->get_items() as $line_item) {
 				$item = array(
 						// Item Name.  127 char max.
-						'l_name' => substr($line_item->name(),0,127),
+						'l_name' => substr($line_item->name(), 0, 127),
 						// Item description.  127 char max.
-						'l_desc' => substr($line_item->desc(),0,127),
+						'l_desc' => substr($line_item->desc(), 0, 127),
 						// Cost of individual item.
 						'l_amt' => $line_item->unit_price(),
 						// Item Number.  127 char max.
@@ -123,14 +123,14 @@ 
 			}
 			$item_amount = $total_line_item->get_items_total();
 			$tax_amount = $total_line_item->get_total_tax();
-		}else{
+		} else {
 			$order_items = array();
 			$item_amount = $payment->amount();
-			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
+			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"), $payment->amount(), $primary_registrant->reg_code());
 			$tax_amount = 0;
-			array_push($order_items,array(
+			array_push($order_items, array(
 				// Item Name.  127 char max.
-				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'),$primary_registrant->reg_code()),
+				'l_name' => sprintf(__("Partial payment for registration: %s", 'event_espresso'), $primary_registrant->reg_code()),
 				// Item description.  127 char max.
 				'l_desc' => $single_item_desc,
 				// Cost of individual item.
@@ -177,11 +177,11 @@ 
 			// Payer's salutation.  20 char max.
 			'salutation' => '',
 			// Payer's first name.  25 char max.
-			'firstname' => substr($billing_info['first_name'],0,25),
+			'firstname' => substr($billing_info['first_name'], 0, 25),
 			// Payer's middle name.  25 char max.
 			'middlename' => '',
 			// Payer's last name.  25 char max.
-			'lastname' => substr($billing_info['last_name'],0,25),
+			'lastname' => substr($billing_info['last_name'], 0, 25),
 			// Payer's suffix.  12 char max.
 			'suffix' => ''
 		);
@@ -194,13 +194,13 @@ 
 			// Required.  Name of City.
 			'city' => $billing_info['city'],
 			// Required. Name of State or Province.
-			'state' => substr( $billing_info['state'], 0, 40 ),
+			'state' => substr($billing_info['state'], 0, 40),
 			// Required.  Country code.
 			'countrycode' => $billing_info['country'],
 			// Required.  Postal code of payer.
 			'zip' => $billing_info['zip'],
 			// Phone Number of payer.  20 char max.
-			'shiptophonenum' => substr($billing_info['phone'],0,20)
+			'shiptophonenum' => substr($billing_info['phone'], 0, 20)
 		);
 
 
@@ -210,7 +210,7 @@ 
 			// Required.  Three-letter currency code.  Default is USD.
 			'currencycode' => $payment->currency_code(),
 			// Required if you include itemized cart details. (L_AMTn, etc.)  Subtotal of items not including S&H, or tax.
-			'itemamt' => $this->format_currency($item_amount),//
+			'itemamt' => $this->format_currency($item_amount), //
 			// Total shipping costs for the order.  If you specify shippingamt, you must also specify itemamt.
 			'shippingamt' => '',
 			// Total handling costs for the order.  If you specify handlingamt, you must also specify itemamt.
@@ -222,10 +222,10 @@ 
 			// Free-form field for your own use.  256 char max.
 			'custom' => $primary_registrant ? $primary_registrant->ID() : '',
 			// Your own invoice or tracking number
-			'invnum' => wp_generate_password(12,false),//$transaction->ID(),
+			'invnum' => wp_generate_password(12, false), //$transaction->ID(),
 			// URL for receiving Instant Payment Notifications.  This overrides what your profile is set to use.
 			'notifyurl' => '',
-			'buttonsource' => 'EventEspresso_SP',//EE will blow up if you change this
+			'buttonsource' => 'EventEspresso_SP', //EE will blow up if you change this
 		);
 		// Wrap all data arrays into a single, "master" array which will be passed into the class function.
 		$PayPalRequestData = array(
@@ -238,32 +238,32 @@ 
 				'OrderItems' => $order_items,
 		);
 		$this->_log_clean_request($PayPalRequestData, $payment);
-		try{
+		try {
 			$PayPalResult = $this->prep_and_curl_request($PayPalRequestData);
 			//remove PCI-sensitive data so it doesn't get stored
-			$PayPalResult = $this->_log_clean_response($PayPalResult,$payment);
+			$PayPalResult = $this->_log_clean_response($PayPalResult, $payment);
 
 			$message = isset($PayPalResult['L_LONGMESSAGE0']) ? $PayPalResult['L_LONGMESSAGE0'] : $PayPalResult['ACK'];
-			if( empty($PayPalResult[ 'RAWRESPONSE' ] ) ) {
-				$payment->set_status( $this->_pay_model->failed_status() ) ;
-				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
+			if (empty($PayPalResult['RAWRESPONSE'])) {
+				$payment->set_status($this->_pay_model->failed_status());
+				$payment->set_gateway_response(__('No response received from Paypal Pro', 'event_espresso'));
 				$payment->set_details($PayPalResult);
-			}else{
-				if($this->_APICallSuccessful($PayPalResult)){
+			} else {
+				if ($this->_APICallSuccessful($PayPalResult)) {
 					$payment->set_status($this->_pay_model->approved_status());
-				}else{
+				} else {
 					$payment->set_status($this->_pay_model->declined_status());
 				}
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
-				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval( $PayPalResult['AMT'] ) : 0);
+				$payment->set_amount(isset($PayPalResult['AMT']) ? floatval($PayPalResult['AMT']) : 0);
 				$payment->set_gateway_response($message);
-				$payment->set_txn_id_chq_nmbr(isset( $PayPalResult['TRANSACTIONID'] )? $PayPalResult['TRANSACTIONID'] : null);
+				$payment->set_txn_id_chq_nmbr(isset($PayPalResult['TRANSACTIONID']) ? $PayPalResult['TRANSACTIONID'] : null);
 
 				$primary_registration_code = $primary_registrant instanceof EE_Registration ? $primary_registrant->reg_code() : '';
 				$payment->set_extra_accntng($primary_registration_code);
 				$payment->set_details($PayPalResult);
 			}
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$payment->set_status($this->_pay_model->failed_status());
 			$payment->set_gateway_response($e->getMessage());
 		}
@@ -280,7 +280,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array
 	 */
-	private function _log_clean_request($request,$payment){
+	private function _log_clean_request($request, $payment) {
 		$cleaned_request_data = $request;
 		unset($cleaned_request_data['CCDetails']['acct']);
 		unset($cleaned_request_data['CCDetails']['cvv2']);
@@ -295,13 +295,13 @@ 
 	 * @param EEI_Payment $payment
 	 * @return array cleaned
 	 */
-	private function _log_clean_response($response,$payment){
+	private function _log_clean_response($response, $payment) {
 		unset($response['REQUESTDATA']['CREDITCARDTYPE']);
 		unset($response['REQUESTDATA']['ACCT']);
 		unset($response['REQUESTDATA']['EXPDATE']);
 		unset($response['REQUESTDATA']['CVV2']);
 		unset($response['RAWREQUEST']);
-		$this->log(array('Paypal Response'=>$response),$payment);
+		$this->log(array('Paypal Response'=>$response), $payment);
 		return $response;
 	}
 
@@ -326,32 +326,32 @@ 
 		// DP Fields
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
 		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+			$DPFieldsNVP .= '&'.strtoupper($DPFieldsVar).'='.urlencode($DPFieldsVal);
 
 		// CC Details Fields
 		$CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
 		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal)
-			$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+			$CCDetailsNVP .= '&'.strtoupper($CCDetailsVar).'='.urlencode($CCDetailsVal);
 
 		// PayerInfo Type Fields
 		$PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
 		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal)
-			$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+			$PayerInfoNVP .= '&'.strtoupper($PayerInfoVar).'='.urlencode($PayerInfoVal);
 
 		// Payer Name Fields
 		$PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
 		foreach ($PayerName as $PayerNameVar => $PayerNameVal)
-			$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+			$PayerNameNVP .= '&'.strtoupper($PayerNameVar).'='.urlencode($PayerNameVal);
 
 		// Address Fields (Billing)
 		$BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
 		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal)
-			$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+			$BillingAddressNVP .= '&'.strtoupper($BillingAddressVar).'='.urlencode($BillingAddressVal);
 
 		// Payment Details Type Fields
 		$PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
 		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal)
-			$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+			$PaymentDetailsNVP .= '&'.strtoupper($PaymentDetailsVar).'='.urlencode($PaymentDetailsVal);
 
 		// Payment Details Item Type Fields
 		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
@@ -359,22 +359,22 @@ 
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
 			$CurrentItem = $OrderItems[$OrderItemsVar];
 			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal)
-				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+				$OrderItemsNVP .= '&'.strtoupper($CurrentItemVar).$n.'='.urlencode($CurrentItemVal);
 			$n++;
 		}
 
 		// Ship To Address Fields
 		$ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
 		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal)
-			$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+			$ShippingAddressNVP .= '&'.strtoupper($ShippingAddressVar).'='.urlencode($ShippingAddressVal);
 
 		// 3D Secure Fields
 		$Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
 		foreach ($Secure3D as $Secure3DVar => $Secure3DVal)
-			$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+			$Secure3DNVP .= '&'.strtoupper($Secure3DVar).'='.urlencode($Secure3DVal);
 
 		// Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
-		$NVPRequest = 'USER=' . $this->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
+		$NVPRequest = 'USER='.$this->_username.'&PWD='.$this->_password.'&VERSION=64.0'.'&SIGNATURE='.$this->_signature.$DPFieldsNVP.$CCDetailsNVP.$PayerInfoNVP.$PayerNameNVP.$BillingAddressNVP.$PaymentDetailsNVP.$OrderItemsNVP.$ShippingAddressNVP.$Secure3DNVP;
 		$NVPResponse = $this->_CURLRequest($NVPRequest);
 		$NVPRequestArray = $this->_NVPToArray($NVPRequest);
 		$NVPResponseArray = $this->_NVPToArray($NVPResponse);
@@ -398,7 +398,7 @@ 
 	private function _CURLRequest($Request) {
 		$EndPointURL = $this->_debug_mode ? 'https://api-3t.sandbox.paypal.com/nvp' : 'https://api-3t.paypal.com/nvp';
 		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE ) );
+		curl_setopt($curl, CURLOPT_VERBOSE, apply_filters('FHEE__EEG_Paypal_Pro__CurlRequest__CURLOPT_VERBOSE', TRUE));
 		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
 		curl_setopt($curl, CURLOPT_TIMEOUT, 60);
 		curl_setopt($curl, CURLOPT_URL, $EndPointURL);
@@ -447,9 +447,9 @@ 
 	private function _APICallSuccessful($PayPalResult) {
 		$approved = false;
 		// check main response message from PayPal
-		if (isset($PayPalResult['ACK']) && !empty($PayPalResult['ACK'])) {
+		if (isset($PayPalResult['ACK']) && ! empty($PayPalResult['ACK'])) {
 			$ack = strtoupper($PayPalResult['ACK']);
-			$approved = ( $ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS' ) ? true : false;
+			$approved = ($ack == 'SUCCESS' || $ack == 'SUCCESSWITHWARNING' || $ack == 'PARTIALSUCCESS') ? true : false;
 		}
 
 		return $approved;
@@ -465,11 +465,11 @@ 
 
 		$Errors = array();
 		$n = 0;
-		while (isset($DataArray['L_ERRORCODE' . $n . ''])) {
-			$LErrorCode = isset($DataArray['L_ERRORCODE' . $n . '']) ? $DataArray['L_ERRORCODE' . $n . ''] : '';
-			$LShortMessage = isset($DataArray['L_SHORTMESSAGE' . $n . '']) ? $DataArray['L_SHORTMESSAGE' . $n . ''] : '';
-			$LLongMessage = isset($DataArray['L_LONGMESSAGE' . $n . '']) ? $DataArray['L_LONGMESSAGE' . $n . ''] : '';
-			$LSeverityCode = isset($DataArray['L_SEVERITYCODE' . $n . '']) ? $DataArray['L_SEVERITYCODE' . $n . ''] : '';
+		while (isset($DataArray['L_ERRORCODE'.$n.''])) {
+			$LErrorCode = isset($DataArray['L_ERRORCODE'.$n.'']) ? $DataArray['L_ERRORCODE'.$n.''] : '';
+			$LShortMessage = isset($DataArray['L_SHORTMESSAGE'.$n.'']) ? $DataArray['L_SHORTMESSAGE'.$n.''] : '';
+			$LLongMessage = isset($DataArray['L_LONGMESSAGE'.$n.'']) ? $DataArray['L_LONGMESSAGE'.$n.''] : '';
+			$LSeverityCode = isset($DataArray['L_SEVERITYCODE'.$n.'']) ? $DataArray['L_SEVERITYCODE'.$n.''] : '';
 
 			$CurrentItem = array(
 					'L_ERRORCODE' => $LErrorCode,
@@ -509,7 +509,7 @@ 
 				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
 					$CurrentVarName = 'Severity Code';
 
-				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
+				$error .= '<br />'.$CurrentVarName.': '.$CurrentErrorVal;
 			}
 		}
 		return $error;

Braces +42 added lines, -31 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -123,7 +124,7 @@ 
 			}
 			$item_amount = $total_line_item->get_items_total();
 			$tax_amount = $total_line_item->get_total_tax();
-		}else{
+		} else{
 			$order_items = array();
 			$item_amount = $payment->amount();
 			$single_item_desc = sprintf(__("Partial payment of %s for %s", "event_espresso"),$payment->amount(),$primary_registrant->reg_code());
@@ -248,10 +249,10 @@ 
 				$payment->set_status( $this->_pay_model->failed_status() ) ;
 				$payment->set_gateway_response( __( 'No response received from Paypal Pro', 'event_espresso' ) );
 				$payment->set_details($PayPalResult);
-			}else{
+			} else{
 				if($this->_APICallSuccessful($PayPalResult)){
 					$payment->set_status($this->_pay_model->approved_status());
-				}else{
+				} else{
 					$payment->set_status($this->_pay_model->declined_status());
 				}
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
@@ -263,7 +264,7 @@ 
 				$payment->set_extra_accntng($primary_registration_code);
 				$payment->set_details($PayPalResult);
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$payment->set_status($this->_pay_model->failed_status());
 			$payment->set_gateway_response($e->getMessage());
 		}
@@ -325,53 +326,62 @@ 
 
 		// DP Fields
 		$DPFields = isset($DataArray['DPFields']) ? $DataArray['DPFields'] : array();
-		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal)
-			$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+		foreach ($DPFields as $DPFieldsVar => $DPFieldsVal) {
+					$DPFieldsNVP .= '&' . strtoupper($DPFieldsVar) . '=' . urlencode($DPFieldsVal);
+		}
 
 		// CC Details Fields
 		$CCDetails = isset($DataArray['CCDetails']) ? $DataArray['CCDetails'] : array();
-		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal)
-			$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+		foreach ($CCDetails as $CCDetailsVar => $CCDetailsVal) {
+					$CCDetailsNVP .= '&' . strtoupper($CCDetailsVar) . '=' . urlencode($CCDetailsVal);
+		}
 
 		// PayerInfo Type Fields
 		$PayerInfo = isset($DataArray['PayerInfo']) ? $DataArray['PayerInfo'] : array();
-		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal)
-			$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+		foreach ($PayerInfo as $PayerInfoVar => $PayerInfoVal) {
+					$PayerInfoNVP .= '&' . strtoupper($PayerInfoVar) . '=' . urlencode($PayerInfoVal);
+		}
 
 		// Payer Name Fields
 		$PayerName = isset($DataArray['PayerName']) ? $DataArray['PayerName'] : array();
-		foreach ($PayerName as $PayerNameVar => $PayerNameVal)
-			$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+		foreach ($PayerName as $PayerNameVar => $PayerNameVal) {
+					$PayerNameNVP .= '&' . strtoupper($PayerNameVar) . '=' . urlencode($PayerNameVal);
+		}
 
 		// Address Fields (Billing)
 		$BillingAddress = isset($DataArray['BillingAddress']) ? $DataArray['BillingAddress'] : array();
-		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal)
-			$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+		foreach ($BillingAddress as $BillingAddressVar => $BillingAddressVal) {
+					$BillingAddressNVP .= '&' . strtoupper($BillingAddressVar) . '=' . urlencode($BillingAddressVal);
+		}
 
 		// Payment Details Type Fields
 		$PaymentDetails = isset($DataArray['PaymentDetails']) ? $DataArray['PaymentDetails'] : array();
-		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal)
-			$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+		foreach ($PaymentDetails as $PaymentDetailsVar => $PaymentDetailsVal) {
+					$PaymentDetailsNVP .= '&' . strtoupper($PaymentDetailsVar) . '=' . urlencode($PaymentDetailsVal);
+		}
 
 		// Payment Details Item Type Fields
 		$OrderItems = isset($DataArray['OrderItems']) ? $DataArray['OrderItems'] : array();
 		$n = 0;
 		foreach ($OrderItems as $OrderItemsVar => $OrderItemsVal) {
 			$CurrentItem = $OrderItems[$OrderItemsVar];
-			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal)
-				$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+			foreach ($CurrentItem as $CurrentItemVar => $CurrentItemVal) {
+							$OrderItemsNVP .= '&' . strtoupper($CurrentItemVar) . $n . '=' . urlencode($CurrentItemVal);
+			}
 			$n++;
 		}
 
 		// Ship To Address Fields
 		$ShippingAddress = isset($DataArray['ShippingAddress']) ? $DataArray['ShippingAddress'] : array();
-		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal)
-			$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+		foreach ($ShippingAddress as $ShippingAddressVar => $ShippingAddressVal) {
+					$ShippingAddressNVP .= '&' . strtoupper($ShippingAddressVar) . '=' . urlencode($ShippingAddressVal);
+		}
 
 		// 3D Secure Fields
 		$Secure3D = isset($DataArray['Secure3D']) ? $DataArray['Secure3D'] : array();
-		foreach ($Secure3D as $Secure3DVar => $Secure3DVal)
-			$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+		foreach ($Secure3D as $Secure3DVar => $Secure3DVal) {
+					$Secure3DNVP .= '&' . strtoupper($Secure3DVar) . '=' . urlencode($Secure3DVal);
+		}
 
 		// Now that we have each chunk we need to go ahead and append them all together for our entire NVP string
 		$NVPRequest = 'USER=' . $this->_username . '&PWD=' . $this->_password . '&VERSION=64.0' . '&SIGNATURE=' . $this->_signature . $DPFieldsNVP . $CCDetailsNVP . $PayerInfoNVP . $PayerNameNVP . $BillingAddressNVP . $PaymentDetailsNVP . $OrderItemsNVP . $ShippingAddressNVP . $Secure3DNVP;
@@ -500,14 +510,15 @@ 
 			$CurrentError = $Errors[$ErrorVar];
 			foreach ($CurrentError as $CurrentErrorVar => $CurrentErrorVal) {
 				$CurrentVarName = '';
-				if ($CurrentErrorVar == 'L_ERRORCODE')
-					$CurrentVarName = 'Error Code';
-				elseif ($CurrentErrorVar == 'L_SHORTMESSAGE')
-					$CurrentVarName = 'Short Message';
-				elseif ($CurrentErrorVar == 'L_LONGMESSAGE')
-					$CurrentVarName = 'Long Message';
-				elseif ($CurrentErrorVar == 'L_SEVERITYCODE')
-					$CurrentVarName = 'Severity Code';
+				if ($CurrentErrorVar == 'L_ERRORCODE') {
+									$CurrentVarName = 'Error Code';
+				} elseif ($CurrentErrorVar == 'L_SHORTMESSAGE') {
+									$CurrentVarName = 'Short Message';
+				} elseif ($CurrentErrorVar == 'L_LONGMESSAGE') {
+									$CurrentVarName = 'Long Message';
+				} elseif ($CurrentErrorVar == 'L_SEVERITYCODE') {
+									$CurrentVarName = 'Severity Code';
+				}
 
 				$error .= '<br />' . $CurrentVarName . ': ' . $CurrentErrorVal;
 			}

core/admin/EE_Admin_Hooks.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
 
 	/**
 	 * constructor
-	 * @param EE_Admin_Page $admin_page the calling admin_page_object
+	 * @param EE_Admin_Page $adminpage the calling admin_page_object
 	 */
 	public function __construct( EE_Admin_Page $adminpage ) {
 

Spacing +106 added lines, -106 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -209,7 +209,7 @@ 
 	 * constructor
 	 * @param EE_Admin_Page $admin_page the calling admin_page_object
 	 */
-	public function __construct( EE_Admin_Page $adminpage ) {
+	public function __construct(EE_Admin_Page $adminpage) {
 
 		$this->_adminpage_obj = $adminpage;
 		$this->_req_data = array_merge($_GET, $_POST);
@@ -217,11 +217,11 @@ 
 		$this->_set_hooks_properties();
 
 		//first let's verify we're on the right page
-		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) )
+		if ( ! isset($this->_req_data['page']) || (isset($this->_req_data['page']) && $this->_adminpage_obj->page_slug != $this->_req_data['page']))
 			return; //get out nothing more to be done here.
 
 		//allow for extends to modify properties
-		if ( method_exists( $this, '_extend_properties' ) )
+		if (method_exists($this, '_extend_properties'))
 			$this->_extend_properties();
 
 		$this->_set_page_object();
@@ -229,9 +229,9 @@ 
 		$this->_load_custom_methods();
 		$this->_load_routed_hooks();
 
-		add_action( 'admin_enqueue_scripts', array($this, 'enqueue_scripts_styles' ) );
-		add_action( 'admin_enqueue_scripts', array($this, 'add_metaboxes'), 20 );
-		add_action( 'admin_enqueue_scripts', array($this, 'remove_metaboxes'), 15 );
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
+		add_action('admin_enqueue_scripts', array($this, 'add_metaboxes'), 20);
+		add_action('admin_enqueue_scripts', array($this, 'remove_metaboxes'), 15);
 
 		$this->_ajax_hooks();
 
@@ -272,15 +272,15 @@ 
 	 */
 	public function enqueue_scripts_styles() {
 
-		if ( !empty( $this->_scripts_styles ) ) {
+		if ( ! empty($this->_scripts_styles)) {
 			//first let's do all the registrations
-			if ( !isset($this->_scripts_styles['registers'] ) ) {
+			if ( ! isset($this->_scripts_styles['registers'])) {
 				$msg[] = __('There is no "registers" index in the <code>$this->_scripts_styles</code> property.', 'event_espresso');
-				$msg[] = sprintf ( __('Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child', 'event_espresso'), '<strong>' . $this->caller . '</strong>' );
-				throw new EE_Error( implode( '||', $msg ) );
+				$msg[] = sprintf(__('Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child', 'event_espresso'), '<strong>'.$this->caller.'</strong>');
+				throw new EE_Error(implode('||', $msg));
 			}
 
-			foreach( $this->_scripts_styles['registers'] as $ref => $details ) {
+			foreach ($this->_scripts_styles['registers'] as $ref => $details) {
 				$defaults = array(
 					'type' => 'js',
 					'url' => '',
@@ -289,48 +289,48 @@ 
 					'footer' => TRUE
 					);
 				$details = wp_parse_args($details, $defaults);
-				extract( $details );
+				extract($details);
 
 				//let's make sure that we set the 'registers' type if it's not set! We need it later to determine whhich enqueu we do
 				$this->_scripts_styles['registers'][$ref]['type'] = $type;
 
 				//let's make sure we're not missing any REQUIRED parameters
-				if ( empty($url) ) {
-					$msg[] = sprintf( __('Missing the url for the requested %s', 'event_espresso'), $type == 'js' ? 'script' : 'stylesheet' );
-					$msg[] = sprintf( __('Doublecheck your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref', 'event_espresso'), '<strong>' . $this->caller . '</strong>', $ref );
-					throw new EE_Error( implode( '||', $msg ) );
+				if (empty($url)) {
+					$msg[] = sprintf(__('Missing the url for the requested %s', 'event_espresso'), $type == 'js' ? 'script' : 'stylesheet');
+					$msg[] = sprintf(__('Doublecheck your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref', 'event_espresso'), '<strong>'.$this->caller.'</strong>', $ref);
+					throw new EE_Error(implode('||', $msg));
 				}
 				//made it here so let's do the appropriate registration
-				$type == 'js' ? wp_register_script( $ref, $url, $depends, $version, $footer ) : wp_register_style( $ref, $url, $depends, $version );
+				$type == 'js' ? wp_register_script($ref, $url, $depends, $version, $footer) : wp_register_style($ref, $url, $depends, $version);
 			}
 
 			//k now lets do the enqueues
-			if( !isset( $this->_scripts_styles['enqueues'] ) )
-				return;  //not sure if we should throw an error here or not.
-			foreach( $this->_scripts_styles['enqueues'] as $ref => $routes ) {
+			if ( ! isset($this->_scripts_styles['enqueues']))
+				return; //not sure if we should throw an error here or not.
+			foreach ($this->_scripts_styles['enqueues'] as $ref => $routes) {
 				//make sure $routes is an array
 				$routes = (array) $routes;
 
-				if ( in_array($this->_current_route, $routes ) ) {
+				if (in_array($this->_current_route, $routes)) {
 					$this->_scripts_styles['registers'][$ref]['type'] == 'js' ? wp_enqueue_script($ref) : wp_enqueue_style($ref);
 					//if we have a localization for the script let's do that too.
-					if ( isset( $this->_scripts_styles['localize'][$ref] ) ) {
-						foreach ( $this->_scripts_styles['localize'][$ref] as $object_name => $indexes ) {
-							wp_localize_script($ref, $object_name , $this->_scripts_styles['localize'][$ref][$object_name] );
+					if (isset($this->_scripts_styles['localize'][$ref])) {
+						foreach ($this->_scripts_styles['localize'][$ref] as $object_name => $indexes) {
+							wp_localize_script($ref, $object_name, $this->_scripts_styles['localize'][$ref][$object_name]);
 						}
 					}
 				}
 			}
 
 			//let's do the deregisters
-			if ( !isset( $this->_scripts_styles['deregisters'] ) )
+			if ( ! isset($this->_scripts_styles['deregisters']))
 				return;
-			foreach ( $this->_scripts_styles['deregisters'] as $ref => $details ) {
+			foreach ($this->_scripts_styles['deregisters'] as $ref => $details) {
 				$defaults = array(
 					'type' => 'js'
 					);
-				$details = wp_parse_args( $details, $defaults );
-				extract( $details );
+				$details = wp_parse_args($details, $defaults);
+				extract($details);
 
 				$type == 'js' ? wp_deregister_script($ref) : wp_deregister_style($ref);
 
@@ -349,7 +349,7 @@ 
 	 */
 	private function _set_defaults() {
 		$this->_ajax_func = $this->_init_func = $this->_metaboxes = $this->_scripts = $this->_styles = $this->_wp_action_filters_priority = array();
-		$this->_current_route = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
+		$this->_current_route = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'default';
 		$this->caller = get_class($this);
 		$this->_extend = stripos($this->caller, 'Extend') ? TRUE : FALSE;
 	}
@@ -364,35 +364,35 @@ 
 	 */
 	protected function _set_page_object() {
 		//first make sure $this->_name is set
-		if ( empty( $this->_name ) ) {
+		if (empty($this->_name)) {
 			$msg[] = __('We can\'t load the page object', 'event_espresso');
-			$msg[] = sprintf( __("This is because the %s child class has not set the
-				'_name' property", 'event_espresso'), $this->caller );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__("This is because the %s child class has not set the
+				'_name' property", 'event_espresso'), $this->caller);
+			throw new EE_Error(implode('||', $msg));
 		}
 
-		$ref = str_replace('_' , ' ', $this->_name); //take the_message -> the message
-		$ref = str_replace(' ', '_', ucwords($ref) ) . '_Admin_Page'; //take the message -> The_Message
+		$ref = str_replace('_', ' ', $this->_name); //take the_message -> the message
+		$ref = str_replace(' ', '_', ucwords($ref)).'_Admin_Page'; //take the message -> The_Message
 
 		//first default file (if exists)
-		$decaf_file = EE_ADMIN_PAGES . $this->_name . DS . $ref . '.core.php';
-		if ( is_readable( $decaf_file ) )
-		require_once( $decaf_file );
+		$decaf_file = EE_ADMIN_PAGES.$this->_name.DS.$ref.'.core.php';
+		if (is_readable($decaf_file))
+		require_once($decaf_file);
 
 		//now we have to do require for extended file (if needed)
-		if ( $this->_extend ) {
-			require_once( EE_CORE_CAF_ADMIN_EXTEND . $this->_name . DS . 'Extend_' . $ref . '.core.php' );
+		if ($this->_extend) {
+			require_once(EE_CORE_CAF_ADMIN_EXTEND.$this->_name.DS.'Extend_'.$ref.'.core.php');
 		}
 
 
 		//if we've got an extended class we use that!
-		$ref = $this->_extend ? 'Extend_' . $ref : $ref;
+		$ref = $this->_extend ? 'Extend_'.$ref : $ref;
 
 		//let's make sure the class exists
-		if ( !class_exists( $ref ) ) {
+		if ( ! class_exists($ref)) {
 			$msg[] = __('We can\'t load the page object', 'event_espresso');
-			$msg[] = sprintf( __('The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class', 'event_espresso'), $ref );
-			throw new EE_Error( implode( '||', $msg ) );
+			$msg[] = sprintf(__('The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class', 'event_espresso'), $ref);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		$a = new ReflectionClass($ref);
@@ -417,27 +417,27 @@ 
 		$method_callback = $this->_current_route == 'default' ? 'default_callback' : $this->_current_route;
 
 		//these run before the Admin_Page route executes.
-		if ( method_exists( $this, $method_callback ) ) {
-			call_user_func( array( $this, $method_callback) );
+		if (method_exists($this, $method_callback)) {
+			call_user_func(array($this, $method_callback));
 		}
 
 
 		//these run via the _redirect_after_action method in EE_Admin_Page which usually happens after non_UI methods in EE_Admin_Page classes.  There are two redirect actions, the first fires before $query_args might be manipulated by "save and close" actions and the seond fires right before the actual redirect happens.
 		//first the actions
 		//note that these action hooks will have the $query_args value available.
-		$admin_class_name = get_class( $this->_adminpage_obj );
+		$admin_class_name = get_class($this->_adminpage_obj);
 
-		if ( method_exists( $this, '_redirect_action_early_' . $this->_current_route ) ) {
-			add_action( 'AHEE__' . $admin_class_name . '___redirect_after_action__before_redirect_modification_' . $this->_current_route, array( $this, '_redirect_action_early_' . $this->_current_route ), 10 );
+		if (method_exists($this, '_redirect_action_early_'.$this->_current_route)) {
+			add_action('AHEE__'.$admin_class_name.'___redirect_after_action__before_redirect_modification_'.$this->_current_route, array($this, '_redirect_action_early_'.$this->_current_route), 10);
 		}
 
-		if ( method_exists( $this, '_redirect_action_' . $this->_current_route ) ) {
-			add_action( 'AHEE_redirect_' . $admin_class_name . $this->_current_route, array( $this, '_redirect_action_' . $this->_current_route ), 10 );
+		if (method_exists($this, '_redirect_action_'.$this->_current_route)) {
+			add_action('AHEE_redirect_'.$admin_class_name.$this->_current_route, array($this, '_redirect_action_'.$this->_current_route), 10);
 		}
 
 		//let's hook into the _redirect itself and allow for changing where the user goes after redirect.  This will have $query_args and $redirect_url available.
-		if ( method_exists( $this, '_redirect_filter_' . $this->_current_route ) ) {
-			add_filter( 'FHEE_redirect_' . $admin_class_name . $this->_current_route, array( $this, '_redirect_filter_' . $this->_current_route ), 10, 2 );
+		if (method_exists($this, '_redirect_filter_'.$this->_current_route)) {
+			add_filter('FHEE_redirect_'.$admin_class_name.$this->_current_route, array($this, '_redirect_filter_'.$this->_current_route), 10, 2);
 		}
 
 	}
@@ -460,12 +460,12 @@ 
 				'argnum' => 1,
 				'priority' => 10
 				),
-			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug . '_' . $this->_current_route => array(
+			'FHEE_list_table_views_'.$this->_adminpage_obj->page_slug.'_'.$this->_current_route => array(
 				'type' => 'filter',
 				'argnum' => 1,
 				'priority' => 10
 				),
-			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug => array(
+			'FHEE_list_table_views_'.$this->_adminpage_obj->page_slug => array(
 				'type' => 'filter',
 				'argnum' => 1,
 				'priority' => 10
@@ -484,14 +484,14 @@ 
 
 
 
-		foreach ( $hook_filter_array as $hook => $args ) {
-			if ( method_exists( $this, $this->_current_route . '_' . $hook ) ) {
-				if ( isset( $this->_wp_action_filters_priority[$hook] ) )
+		foreach ($hook_filter_array as $hook => $args) {
+			if (method_exists($this, $this->_current_route.'_'.$hook)) {
+				if (isset($this->_wp_action_filters_priority[$hook]))
 					$args['priority'] = $this->_wp_action_filters_priority[$hook];
-				if ( $args['type'] == 'action' )
-					add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				if ($args['type'] == 'action')
+					add_action($hook, array($this, $this->_current_route.'_'.$hook), $args['priority'], $args['argnum']);
 				else
-					add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+					add_filter($hook, array($this, $this->_current_route.'_'.$hook), $args['priority'], $args['argnum']);
 			}
 		}
 
@@ -504,18 +504,18 @@ 
 	 */
 	private function _ajax_hooks() {
 
-		if ( empty( $this->_ajax_func) )
+		if (empty($this->_ajax_func))
 			return; //get out there's nothing to take care of.
 
-		foreach ( $this->_ajax_func as $action => $method ) {
+		foreach ($this->_ajax_func as $action => $method) {
 			//make sure method exists
-			if ( !method_exists($this, $method) ) {
-				$msg[] = __('There is no corresponding method for the hook labeled in the _ajax_func array', 'event_espresso') . '<br />';
-				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
-				throw new EE_Error( implode('||', $msg ) );
+			if ( ! method_exists($this, $method)) {
+				$msg[] = __('There is no corresponding method for the hook labeled in the _ajax_func array', 'event_espresso').'<br />';
+				$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $method, $this->caller);
+				throw new EE_Error(implode('||', $msg));
 			}
 
-			add_action('wp_ajax_' . $action, array( $this, $method ) );
+			add_action('wp_ajax_'.$action, array($this, $method));
 		}
 
 	}
@@ -528,21 +528,21 @@ 
 	 * @return void
 	 */
 	protected function _init_hooks() {
-		if ( empty( $this->_init_func) )
+		if (empty($this->_init_func))
 			return; //get out there's nothing to take care of.
 
 		//We need to determine what page_route we are on!
-		$current_route = isset ( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
+		$current_route = isset ($_REQUEST['action']) ? $_REQUEST['action'] : 'default';
 
-		foreach ( $this->_init_func as $route => $method ) {
+		foreach ($this->_init_func as $route => $method) {
 			//make sure method exists
-			if ( !method_exists($this, $method) ) {
-				$msg[] = __('There is no corresponding method for the hook labeled in the _init_func array', 'event_espresso') . '<br />';
-				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
-				throw new EE_Error( implode('||', $msg ) );
+			if ( ! method_exists($this, $method)) {
+				$msg[] = __('There is no corresponding method for the hook labeled in the _init_func array', 'event_espresso').'<br />';
+				$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $method, $this->caller);
+				throw new EE_Error(implode('||', $msg));
 			}
-			if ( $route == $this->_current_route )
-				add_action('admin_init', array( $this, $method ) );
+			if ($route == $this->_current_route)
+				add_action('admin_init', array($this, $method));
 		}
 
 	}
@@ -557,28 +557,28 @@ 
 	 * @return void
 	 */
 	public function add_metaboxes() {
-		if ( empty( $this->_metaboxes ) )
+		if (empty($this->_metaboxes))
 			return; //get out we don't have any metaboxes to set for this connection
 
-		$this->_handle_metabox_array( $this->_metaboxes );
+		$this->_handle_metabox_array($this->_metaboxes);
 
 	}
 
 
 
-	private function _handle_metabox_array( $boxes, $add = TRUE ) {
+	private function _handle_metabox_array($boxes, $add = TRUE) {
 
-		foreach ( $boxes as $box ) {
-			if ( !isset($box['page_route']) )
+		foreach ($boxes as $box) {
+			if ( ! isset($box['page_route']))
 				continue; //we dont' have a valid array
 
 			//let's make sure $box['page_route'] is an array so the "foreach" will work.
 			$box['page_route'] = (array) $box['page_route'];
 
-			foreach ( $box['page_route'] as $route ) {
-				if ( $route != $this->_current_route )
+			foreach ($box['page_route'] as $route) {
+				if ($route != $this->_current_route)
 					continue; //get out we only add metaboxes for set route.
-				if ( $add )
+				if ($add)
 					$this->_add_metabox($box);
 				else
 					$this->_remove_metabox($box);
@@ -596,10 +596,10 @@ 
 	 */
 	public function remove_metaboxes() {
 
-		if ( empty( $this->_remove_metaboxes ) )
+		if (empty($this->_remove_metaboxes))
 			return; //get out there are no metaboxes to remove
 
-		$this->_handle_metabox_array( $this->_remove_metaboxes, FALSE );
+		$this->_handle_metabox_array($this->_remove_metaboxes, FALSE);
 	}
 
 
@@ -609,53 +609,53 @@ 
 	 * @access private
 	 * @param array $args an array of args that have been set for this metabox by the child class
 	 */
-	private function _add_metabox( $args ) {
+	private function _add_metabox($args) {
 		$current_screen = get_current_screen();
-		$screen_id = is_object( $current_screen ) ? $current_screen->id : NULL;
-		$func = isset( $args['func'] ) ? $args['func'] : 'some_invalid_callback';
+		$screen_id = is_object($current_screen) ? $current_screen->id : NULL;
+		$func = isset($args['func']) ? $args['func'] : 'some_invalid_callback';
 
 		//set defaults
 		$defaults = array(
 			'func' => $func,
-			'id' => $this->caller . '_' . $func . '_metabox',
+			'id' => $this->caller.'_'.$func.'_metabox',
 			'priority' => 'default',
 			'label' => $this->caller,
 			'context' => 'advanced',
 			'callback_args' => array(),
-			'page' => isset( $args['page'] ) ? $args['page'] : $screen_id
+			'page' => isset($args['page']) ? $args['page'] : $screen_id
 			);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 		extract($args);
 
 
 		//make sure method exists
-		if ( !method_exists($this, $func) ) {
-			$msg[] = __('There is no corresponding method to display the metabox content', 'event_espresso') . '<br />';
-			$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $func, $this->caller );
-			throw new EE_Error( implode('||', $msg ) );
+		if ( ! method_exists($this, $func)) {
+			$msg[] = __('There is no corresponding method to display the metabox content', 'event_espresso').'<br />';
+			$msg[] = sprintf(__('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso'), $func, $this->caller);
+			throw new EE_Error(implode('||', $msg));
 		}
 
 		//everything checks out so lets add the metabox
-		add_meta_box( $id, $label, array( $this, $func ), $page, $context, $priority, $callback_args);
+		add_meta_box($id, $label, array($this, $func), $page, $context, $priority, $callback_args);
 	}
 
 
 
-	private function _remove_metabox( $args ) {
+	private function _remove_metabox($args) {
 		$current_screen = get_current_screen();
-		$screen_id = is_object( $current_screen ) ? $current_screen->id : NULL;
-		$func = isset( $args['func'] ) ? $args['func'] : 'some_invalid_callback';
+		$screen_id = is_object($current_screen) ? $current_screen->id : NULL;
+		$func = isset($args['func']) ? $args['func'] : 'some_invalid_callback';
 
 		//set defaults
 		$defaults = array(
-			'id' => isset( $args['id'] ) ? $args['id'] : $this->_current_route . '_' . $this->caller . '_' . $func . '_metabox',
+			'id' => isset($args['id']) ? $args['id'] : $this->_current_route.'_'.$this->caller.'_'.$func.'_metabox',
 			'context' => 'default',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : $screen_id
+			'screen' => isset($args['screen']) ? $args['screen'] : $screen_id
 		);
 
-		$args = wp_parse_args( $args, $defaults );
-		extract( $args );
+		$args = wp_parse_args($args, $defaults);
+		extract($args);
 
 		//everything checks out so lets remove the box!
 		remove_meta_box($id, $screen, $context);

Braces +59 added lines, -35 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -217,12 +218,15 @@ 
 		$this->_set_hooks_properties();
 
 		//first let's verify we're on the right page
-		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) )
-			return; //get out nothing more to be done here.
+		if ( !isset( $this->_req_data['page'] ) || ( isset( $this->_req_data['page'] ) && $this->_adminpage_obj->page_slug != $this->_req_data['page'] ) ) {
+					return;
+		}
+		//get out nothing more to be done here.
 
 		//allow for extends to modify properties
-		if ( method_exists( $this, '_extend_properties' ) )
-			$this->_extend_properties();
+		if ( method_exists( $this, '_extend_properties' ) ) {
+					$this->_extend_properties();
+		}
 
 		$this->_set_page_object();
 		$this->_init_hooks();
@@ -305,8 +309,10 @@ 
 			}
 
 			//k now lets do the enqueues
-			if( !isset( $this->_scripts_styles['enqueues'] ) )
-				return;  //not sure if we should throw an error here or not.
+			if( !isset( $this->_scripts_styles['enqueues'] ) ) {
+							return;
+			}
+			//not sure if we should throw an error here or not.
 			foreach( $this->_scripts_styles['enqueues'] as $ref => $routes ) {
 				//make sure $routes is an array
 				$routes = (array) $routes;
@@ -323,8 +329,9 @@ 
 			}
 
 			//let's do the deregisters
-			if ( !isset( $this->_scripts_styles['deregisters'] ) )
-				return;
+			if ( !isset( $this->_scripts_styles['deregisters'] ) ) {
+							return;
+			}
 			foreach ( $this->_scripts_styles['deregisters'] as $ref => $details ) {
 				$defaults = array(
 					'type' => 'js'
@@ -376,8 +383,9 @@ 
 
 		//first default file (if exists)
 		$decaf_file = EE_ADMIN_PAGES . $this->_name . DS . $ref . '.core.php';
-		if ( is_readable( $decaf_file ) )
-		require_once( $decaf_file );
+		if ( is_readable( $decaf_file ) ) {
+				require_once( $decaf_file );
+		}
 
 		//now we have to do require for extended file (if needed)
 		if ( $this->_extend ) {
@@ -486,12 +494,14 @@ 
 
 		foreach ( $hook_filter_array as $hook => $args ) {
 			if ( method_exists( $this, $this->_current_route . '_' . $hook ) ) {
-				if ( isset( $this->_wp_action_filters_priority[$hook] ) )
-					$args['priority'] = $this->_wp_action_filters_priority[$hook];
-				if ( $args['type'] == 'action' )
-					add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
-				else
-					add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				if ( isset( $this->_wp_action_filters_priority[$hook] ) ) {
+									$args['priority'] = $this->_wp_action_filters_priority[$hook];
+				}
+				if ( $args['type'] == 'action' ) {
+									add_action( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				} else {
+									add_filter( $hook, array( $this, $this->_current_route . '_' . $hook ), $args['priority'], $args['argnum'] );
+				}
 			}
 		}
 
@@ -504,8 +514,10 @@ 
 	 */
 	private function _ajax_hooks() {
 
-		if ( empty( $this->_ajax_func) )
-			return; //get out there's nothing to take care of.
+		if ( empty( $this->_ajax_func) ) {
+					return;
+		}
+		//get out there's nothing to take care of.
 
 		foreach ( $this->_ajax_func as $action => $method ) {
 			//make sure method exists
@@ -528,8 +540,10 @@ 
 	 * @return void
 	 */
 	protected function _init_hooks() {
-		if ( empty( $this->_init_func) )
-			return; //get out there's nothing to take care of.
+		if ( empty( $this->_init_func) ) {
+					return;
+		}
+		//get out there's nothing to take care of.
 
 		//We need to determine what page_route we are on!
 		$current_route = isset ( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'default';
@@ -541,8 +555,9 @@ 
 				$msg[] = sprintf( __('The method name given in the array is %s, check the spelling and make sure it exists in the %s class', 'event_espresso' ), $method, $this->caller );
 				throw new EE_Error( implode('||', $msg ) );
 			}
-			if ( $route == $this->_current_route )
-				add_action('admin_init', array( $this, $method ) );
+			if ( $route == $this->_current_route ) {
+							add_action('admin_init', array( $this, $method ) );
+			}
 		}
 
 	}
@@ -557,8 +572,10 @@ 
 	 * @return void
 	 */
 	public function add_metaboxes() {
-		if ( empty( $this->_metaboxes ) )
-			return; //get out we don't have any metaboxes to set for this connection
+		if ( empty( $this->_metaboxes ) ) {
+					return;
+		}
+		//get out we don't have any metaboxes to set for this connection
 
 		$this->_handle_metabox_array( $this->_metaboxes );
 
@@ -569,19 +586,24 @@ 
 	private function _handle_metabox_array( $boxes, $add = TRUE ) {
 
 		foreach ( $boxes as $box ) {
-			if ( !isset($box['page_route']) )
-				continue; //we dont' have a valid array
+			if ( !isset($box['page_route']) ) {
+							continue;
+			}
+			//we dont' have a valid array
 
 			//let's make sure $box['page_route'] is an array so the "foreach" will work.
 			$box['page_route'] = (array) $box['page_route'];
 
 			foreach ( $box['page_route'] as $route ) {
-				if ( $route != $this->_current_route )
-					continue; //get out we only add metaboxes for set route.
-				if ( $add )
-					$this->_add_metabox($box);
-				else
-					$this->_remove_metabox($box);
+				if ( $route != $this->_current_route ) {
+									continue;
+				}
+				//get out we only add metaboxes for set route.
+				if ( $add ) {
+									$this->_add_metabox($box);
+				} else {
+									$this->_remove_metabox($box);
+				}
 			}
 		}
 	}
@@ -596,8 +618,10 @@ 
 	 */
 	public function remove_metaboxes() {
 
-		if ( empty( $this->_remove_metaboxes ) )
-			return; //get out there are no metaboxes to remove
+		if ( empty( $this->_remove_metaboxes ) ) {
+					return;
+		}
+		//get out there are no metaboxes to remove
 
 		$this->_handle_metabox_array( $this->_remove_metaboxes, FALSE );
 	}

core/admin/EE_Admin_List_Table.core.php

Doc Comments +2 added lines, -2 removed lines

@@ -304,7 +304,7 @@ 
 	/**
 	 * _get_hidden_fields
 	 * returns a html string of hidden fields so if any table filters are used the current view will be respected.
-	 * @return html string
+	 * @return string string
 	 */
 	protected function _get_hidden_fields() {
 		$action = isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : '';
@@ -512,7 +512,7 @@ 
 	 * @since 4.1
 	 * @access public
 	 *
-	 * @param object $item The current item
+	 * @param EE_Message_Template_Group $item The current item
 	 */
 	public function single_row( $item ) {
 		$row_class = $this->_get_row_class( $item );

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
  */
 
 if ( ! class_exists( 'WP_List_Table' )) {
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
 
 abstract class EE_Admin_List_Table extends WP_List_Table {

Spacing +86 added lines, -86 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 
@@ -31,8 +31,8 @@ 
  * ------------------------------------------------------------------------
  */
 
-if ( ! class_exists( 'WP_List_Table' )) {
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+if ( ! class_exists('WP_List_Table')) {
+    require_once(ABSPATH.'wp-admin/includes/class-wp-list-table.php');
 }
 
 abstract class EE_Admin_List_Table extends WP_List_Table {
@@ -223,16 +223,16 @@ 
 	 * constructor
 	 * @param EE_Admin_Page object $admin_page we use this for obtaining everything we need in the list table.
 	 */
-	public function __construct( EE_Admin_Page $admin_page ) {
+	public function __construct(EE_Admin_Page $admin_page) {
 		$this->_admin_page = $admin_page;
 		$this->_req_data = $this->_admin_page->get_request_data();
 		$this->_view = $this->_admin_page->get_view();
-		$this->_views = empty( $this->_views ) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
+		$this->_views = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
 		$this->_current_page = $this->get_pagenum();
-		$this->_screen = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
-		$this->_yes_no = array(  __('No', 'event_espresso'), __('Yes', 'event_espresso'));
+		$this->_screen = $this->_admin_page->get_current_page().'_'.$this->_admin_page->get_current_view();
+		$this->_yes_no = array(__('No', 'event_espresso'), __('Yes', 'event_espresso'));
 
-		$this->_per_page = $this->get_items_per_page( $this->_screen . '_per_page', 10 );
+		$this->_per_page = $this->get_items_per_page($this->_screen.'_per_page', 10);
 
 		$this->_setup_data();
 		$this->_add_view_counts();
@@ -242,7 +242,7 @@ 
 		$this->_set_properties();
 
 		//set primary column
-		add_filter( 'list_table_primary_column', array( $this, 'set_primary_column' ) );
+		add_filter('list_table_primary_column', array($this, 'set_primary_column'));
 
 		//set parent defaults
 		parent::__construct($this->_wp_list_args);
@@ -318,17 +318,17 @@ 
 	 * @return html string
 	 */
 	protected function _get_hidden_fields() {
-		$action = isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : '';
-		$action = empty( $action ) && isset( $this->_req_data['action'] ) ? $this->_req_data['action'] : $action;
+		$action = isset($this->_req_data['route']) ? $this->_req_data['route'] : '';
+		$action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
 		//if action is STILL empty, then we set it to default
-		$action = empty( $action ) ? 'default' : $action;
-		$field = '<input type="hidden" name="page" value="' . $this->_req_data['page'] . '" />' . "\n";
-		$field .= '<input type="hidden" name="route" value="'. $action .'" />' . "\n";/**/
-		$field .= '<input type="hidden" name="perpage" value="' . $this->_per_page . '" />' . "\n";
+		$action = empty($action) ? 'default' : $action;
+		$field = '<input type="hidden" name="page" value="'.$this->_req_data['page'].'" />'."\n";
+		$field .= '<input type="hidden" name="route" value="'.$action.'" />'."\n"; /**/
+		$field .= '<input type="hidden" name="perpage" value="'.$this->_per_page.'" />'."\n";
 
 		$bulk_actions = $this->_get_bulk_actions();
-		foreach ( $bulk_actions as $bulk_action => $label ) {
-			$field .= '<input type="hidden" name="' . $bulk_action . '_nonce" value="' . wp_create_nonce  ( $bulk_action . '_nonce' ) . '" />' . "\n";
+		foreach ($bulk_actions as $bulk_action => $label) {
+			$field .= '<input type="hidden" name="'.$bulk_action.'_nonce" value="'.wp_create_nonce($bulk_action.'_nonce').'" />'."\n";
 		}
 
 		return $field;
@@ -358,15 +358,15 @@ 
 		 *
 		 * @var array
 		 */
-		$_sortable = apply_filters( "FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen );
+		$_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen);
 
 		$sortable = array();
-		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
+		foreach ($_sortable as $id => $data) {
+			if (empty($data))
 				continue;
 
 			//fix for offset errors with WP_List_Table default get_columninfo()
-			if ( is_array($data) ) {
+			if (is_array($data)) {
 				$_data[0] = key($data);
 				$_data[1] = isset($data[1]) ? $data[1] : false;
 			} else {
@@ -375,14 +375,14 @@ 
 
 			$data = (array) $data;
 
-			if ( !isset( $data[1] ) )
+			if ( ! isset($data[1]))
 				$_data[1] = false;
 
 
 			$sortable[$id] = $_data;
 		}
 		$primary = $this->get_primary_column_name();
-		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
+		$this->_column_headers = array($columns, $hidden, $sortable, $primary);
 	}
 
 
@@ -398,11 +398,11 @@ 
 	protected function _get_bulk_actions() {
 		$actions = array();
 		//the _views property should have the bulk_actions, so let's go through and extract them into a properly formatted array for the wp_list_table();
-		foreach ( $this->_views as $view => $args) {
-			if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view )
+		foreach ($this->_views as $view => $args) {
+			if (isset($args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view)
 				//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
-				foreach ( $args['bulk_action'] as $route =>$label ) {
-					if ( $this->_admin_page->check_user_access( $route, true ) ) {
+				foreach ($args['bulk_action'] as $route =>$label) {
+					if ($this->_admin_page->check_user_access($route, true)) {
 						$actions[$route] = $label;
 					}
 				}
@@ -420,18 +420,18 @@ 
 	 */
 	private function _filters() {
 		$classname = get_class($this);
-		$filters = apply_filters( "FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen );
+		$filters = apply_filters("FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen);
 
-		if ( empty( $filters )) {
+		if (empty($filters)) {
 			return;
 		}
-		foreach ( $filters as $filter ) {
+		foreach ($filters as $filter) {
 			echo $filter;
 		}
 		//add filter button at end
-		echo '<input type="submit" class="button-secondary" value="' . __('Filter', 'event_espresso') . '" id="post-query-submit" />';
+		echo '<input type="submit" class="button-secondary" value="'.__('Filter', 'event_espresso').'" id="post-query-submit" />';
 		//add reset filters button at end
-		echo '<a class="button button-secondary"  href="' . $this->_admin_page->get_current_page_view_url() . '" style="display:inline-block">' . __('Reset Filters', 'event_espresso') . '</a>';
+		echo '<a class="button button-secondary"  href="'.$this->_admin_page->get_current_page_view_url().'" style="display:inline-block">'.__('Reset Filters', 'event_espresso').'</a>';
 	}
 
 
@@ -445,8 +445,8 @@ 
 	 * @param string $column_name
 	 * @return string
 	 */
-	public function set_primary_column( $column_name ) {
-		return ! empty( $this->_primary_column ) ? $this->_primary_column : $column_name;
+	public function set_primary_column($column_name) {
+		return ! empty($this->_primary_column) ? $this->_primary_column : $column_name;
 	}
 
 
@@ -465,7 +465,7 @@ 
 			array(
 				'total_items' => $total_items,
 				'per_page' => $this->_per_page,
-				'total_pages' => ceil($total_items / $this->_per_page )
+				'total_pages' => ceil($total_items / $this->_per_page)
 			)
 		);
 	}
@@ -481,7 +481,7 @@ 
 	 *
 	 * @return string html content for the column
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 		/**
 		 * Dynamic hook allowing for adding additional column content in this list table.
 		 * Note that $this->screen->id is in the format
@@ -491,7 +491,7 @@ 
 		 * hook prefix ("event-espresso") will be different.
 		 *
 		 */
-		do_action( 'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id, $item, $this->_screen );
+		do_action('AHEE__EE_Admin_List_Table__column_'.$column_name.'__'.$this->screen->id, $item, $this->_screen);
 	}
 
 
@@ -507,7 +507,7 @@ 
 		 *
 		 * @var array
 		 */
-		$columns = apply_filters( 'FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen );
+		$columns = apply_filters('FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen);
 		return $columns;
 	}
 
@@ -519,18 +519,18 @@ 
 		$views = $this->get_views();
 		$assembled_views = '';
 
-		if ( empty( $views )) {
+		if (empty($views)) {
 			return;
 		}
 		echo "<ul class='subsubsub'>\n";
-		foreach ( $views as $view ) {
-			$count = isset($view['count'] ) && !empty($view['count']) ? absint( $view['count'] )  : 0;
-			if ( isset( $view['slug'] ) && isset( $view['class'] ) && isset( $view['url'] ) && isset( $view['label']) ) {
-				$assembled_views[ $view['slug'] ] = "\t<li class='" . $view['class'] . "'>" . '<a href="' . $view['url'] . '">' . $view['label'] . '</a> <span class="count">(' . $count . ')</span>';
+		foreach ($views as $view) {
+			$count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
+			if (isset($view['slug']) && isset($view['class']) && isset($view['url']) && isset($view['label'])) {
+				$assembled_views[$view['slug']] = "\t<li class='".$view['class']."'>".'<a href="'.$view['url'].'">'.$view['label'].'</a> <span class="count">('.$count.')</span>';
 			}
 		}
 
-		echo is_array( $assembled_views) && ! empty( $assembled_views ) ? implode( " |</li>\n", $assembled_views ) . "</li>\n" : '';
+		echo is_array($assembled_views) && ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views)."</li>\n" : '';
 		echo "</ul>";
 	}
 
@@ -543,10 +543,10 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	public function single_row( $item ) {
-		$row_class = $this->_get_row_class( $item );
-		echo '<tr class="' . esc_attr( $row_class ) . '">';
-		$this->single_row_columns( $item );
+	public function single_row($item) {
+		$row_class = $this->_get_row_class($item);
+		echo '<tr class="'.esc_attr($row_class).'">';
+		$this->single_row_columns($item);
 		echo '</tr>';
 	}
 
@@ -557,13 +557,13 @@ 
 	 * @param  object $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
+	protected function _get_row_class($item) {
 		static $row_class = '';
-		$row_class = ( $row_class == '' ? 'alternate' : '' );
+		$row_class = ($row_class == '' ? 'alternate' : '');
 
 		$new_row_class = $row_class;
 
-		if ( !empty($this->_ajax_sorting_callback) ) {
+		if ( ! empty($this->_ajax_sorting_callback)) {
 			$new_row_class .= ' rowsortable';
 		}
 
@@ -582,13 +582,13 @@ 
 
 	public function get_hidden_columns() {
 		$user_id = get_current_user_id();
-		$has_default = get_user_option('default'. $this->screen->id . 'columnshidden', $user_id);
-		if ( empty( $has_default ) && !empty($this->_hidden_columns ) ) {
-			update_user_option($user_id, 'default'.$this->screen->id . 'columnshidden', TRUE);
-			update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, TRUE );
+		$has_default = get_user_option('default'.$this->screen->id.'columnshidden', $user_id);
+		if (empty($has_default) && ! empty($this->_hidden_columns)) {
+			update_user_option($user_id, 'default'.$this->screen->id.'columnshidden', TRUE);
+			update_user_option($user_id, 'manage'.$this->screen->id.'columnshidden', $this->_hidden_columns, TRUE);
 		}
-		$ref = 'manage' . $this->screen->id . 'columnshidden';
-		$saved_columns = (array) get_user_option( $ref, $user_id );
+		$ref = 'manage'.$this->screen->id.'columnshidden';
+		$saved_columns = (array) get_user_option($ref, $user_id);
 		return $saved_columns;
 	}
 
@@ -603,47 +603,47 @@ 
 	 *
 	 * @param object $item The current item
 	 */
-	public function single_row_columns( $item ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	public function single_row_columns($item) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
 		global $wp_version;
-		$use_hidden_class = version_compare( $wp_version, '4.3-RC', '>=' );
+		$use_hidden_class = version_compare($wp_version, '4.3-RC', '>=');
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 
 			/**
 			 * With WordPress version 4.3.RC+ WordPress started using the hidden css class to control whether columns are
 			 * hidden or not instead of using "display:none;".  This bit of code provides backward compat.
 			 */
-			$hidden_class = $use_hidden_class && in_array( $column_name, $hidden ) ? ' hidden' : '';
-			$style = ! $use_hidden_class && in_array( $column_name, $hidden ) ? ' style="display:none;"' : '';
+			$hidden_class = $use_hidden_class && in_array($column_name, $hidden) ? ' hidden' : '';
+			$style = ! $use_hidden_class && in_array($column_name, $hidden) ? ' style="display:none;"' : '';
 
-			$classes = $column_name . ' column-' . $column_name.$hidden_class;
-			if ( $primary == $column_name ) {
+			$classes = $column_name.' column-'.$column_name.$hidden_class;
+			if ($primary == $column_name) {
 				$classes .= ' has-row-actions column-primary';
 			}
 
-			$data = ' data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
+			$data = ' data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
 			$class = "class='$classes'";
 
 			$attributes = "$class$style$data";
 
-			if ( 'cb' === $column_name ) {
+			if ('cb' === $column_name) {
 				echo '<th scope="row" class="check-column">';
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb($item), $item, $this);
 				echo '</th>';
 			}
-			elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+			elseif (method_exists($this, 'column_'.$column_name)) {
 				echo "<td $attributes>";
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_'.$column_name.'__column_content', call_user_func(array($this, 'column_'.$column_name), $item), $item, $this);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 			else {
 				echo "<td $attributes>";
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default($item, $column_name), $item, $column_name, $this);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 		}
@@ -651,19 +651,19 @@ 
 
 
 
-	public function extra_tablenav( $which ) {
-		if ( $which == 'top' ) {
+	public function extra_tablenav($which) {
+		if ($which == 'top') {
 			$this->_filters();
 			echo $this->_get_hidden_fields();
 			echo '<br class="clear">';
-		}else{
+		} else {
 			echo '<div class="list-table-bottom-buttons alignleft actions">';
-			foreach($this->_bottom_buttons as $type => $action){
-				$route = isset( $action['route'] ) ? $action['route'] : '';
-				$extra_request = isset( $action['extra_request'] ) ? $action['extra_request'] : '';
+			foreach ($this->_bottom_buttons as $type => $action) {
+				$route = isset($action['route']) ? $action['route'] : '';
+				$extra_request = isset($action['extra_request']) ? $action['extra_request'] : '';
 				echo $this->_admin_page->get_action_link_or_button($route, $type, $extra_request);
 			}
-			do_action( 'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen );
+			do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen);
 			echo '</div>';
 		}
 		//echo $this->_entries_per_page_dropdown;
@@ -713,13 +713,13 @@ 
 	 *
 	 * @return string The assembled action elements container.
 	 */
-	protected function _action_string( $action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '' ) {
+	protected function _action_string($action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '') {
 		$content = '';
-		$action_class = ! empty( $action_class ) ? ' class="' . $action_class . '"' : '';
-		$action_id = ! empty( $action_id ) ? ' id="' . $action_id . '"' : '';
-		$content .= ! empty( $action_container ) ? '<' . $action_container . $action_class . $action_id . '>' : '';
-		$content .= apply_filters( 'FHEE__EE_Admin_List_Table___action_string__action_items', $action_items, $item, $this );
-		$content .= ! empty( $container ) ? '</' . $container . '>' : '';
+		$action_class = ! empty($action_class) ? ' class="'.$action_class.'"' : '';
+		$action_id = ! empty($action_id) ? ' id="'.$action_id.'"' : '';
+		$content .= ! empty($action_container) ? '<'.$action_container.$action_class.$action_id.'>' : '';
+		$content .= apply_filters('FHEE__EE_Admin_List_Table___action_string__action_items', $action_items, $item, $this);
+		$content .= ! empty($container) ? '</'.$container.'>' : '';
 		return $content;
 	}
 }

Braces +14 added lines, -12 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 
 /**
@@ -362,8 +363,9 @@ 
 
 		$sortable = array();
 		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
-				continue;
+			if ( empty( $data ) ) {
+							continue;
+			}
 
 			//fix for offset errors with WP_List_Table default get_columninfo()
 			if ( is_array($data) ) {
@@ -375,8 +377,9 @@ 
 
 			$data = (array) $data;
 
-			if ( !isset( $data[1] ) )
-				$_data[1] = false;
+			if ( !isset( $data[1] ) ) {
+							$_data[1] = false;
+			}
 
 
 			$sortable[$id] = $_data;
@@ -399,11 +402,12 @@ 
 		$actions = array();
 		//the _views property should have the bulk_actions, so let's go through and extract them into a properly formatted array for the wp_list_table();
 		foreach ( $this->_views as $view => $args) {
-			if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view )
-				//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
+			if ( isset( $args['bulk_action']) && is_array($args['bulk_action']) && $this->_view == $view ) {
+							//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
 				foreach ( $args['bulk_action'] as $route =>$label ) {
 					if ( $this->_admin_page->check_user_access( $route, true ) ) {
 						$actions[$route] = $label;
+			}
 					}
 				}
 		}
@@ -633,14 +637,12 @@ 
 				echo '<th scope="row" class="check-column">';
 				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this );
 				echo '</th>';
-			}
-			elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+			} elseif ( method_exists( $this, 'column_' . $column_name ) ) {
 				echo "<td $attributes>";
 				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this );
 				echo $this->handle_row_actions( $item, $column_name, $primary );
 				echo "</td>";
-			}
-			else {
+			} else {
 				echo "<td $attributes>";
 				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this );
 				echo $this->handle_row_actions( $item, $column_name, $primary );
@@ -656,7 +658,7 @@ 
 			$this->_filters();
 			echo $this->_get_hidden_fields();
 			echo '<br class="clear">';
-		}else{
+		} else{
 			echo '<div class="list-table-bottom-buttons alignleft actions">';
 			foreach($this->_bottom_buttons as $type => $action){
 				$route = isset( $action['route'] ) ? $action['route'] : '';