eventespresso / event-espresso-core

core/db_models/EEM_Change_Log.model.php

Spacing +23 added lines, -23 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 EEM_Change_Log extends EEM_Base{
+class EEM_Change_Log extends EEM_Base {
 
 	/**
 	 * the related object was created log type
@@ -68,19 +68,19 @@ 
 	 *	@access protected
 	 *	@return EEM_Change_Log
 	 */
-	protected function __construct( $timezone = null ){
+	protected function __construct($timezone = null) {
 		global $current_user;
-		$this->singular_item = __('Log','event_espresso');
-		$this->plural_item = __('Logs','event_espresso');
+		$this->singular_item = __('Log', 'event_espresso');
+		$this->plural_item = __('Logs', 'event_espresso');
 		$this->_tables = array(
 			'Log'=> new EE_Primary_Table('esp_log', 'LOG_ID')
 		);
 		$models_this_can_attach_to = array_keys(EE_Registry::instance()->non_abstract_db_models);
 		$this->_fields = array(
 			'Log'=>array(
-				'LOG_ID'=> new EE_Primary_Key_Int_Field('LOG_ID', __('Log ID','event_espresso')),
-				'LOG_time'=>new EE_Datetime_Field('LOG_time', __("Log Time", 'event_espresso'), false, EE_Datetime_Field::now ),
-				'OBJ_ID'=>new EE_Foreign_Key_String_Field('OBJ_ID', __("Object ID (int or string)", 'event_espresso'), true, NULL,$models_this_can_attach_to),
+				'LOG_ID'=> new EE_Primary_Key_Int_Field('LOG_ID', __('Log ID', 'event_espresso')),
+				'LOG_time'=>new EE_Datetime_Field('LOG_time', __("Log Time", 'event_espresso'), false, EE_Datetime_Field::now),
+				'OBJ_ID'=>new EE_Foreign_Key_String_Field('OBJ_ID', __("Object ID (int or string)", 'event_espresso'), true, NULL, $models_this_can_attach_to),
 				'OBJ_type'=>new EE_Any_Foreign_Model_Name_Field('OBJ_type', __("Object Type", 'event_espresso'), true, NULL, $models_this_can_attach_to),
 				'LOG_type'=>new EE_Enum_Text_Field('LOG_type', __("Type of log entry", "event_espresso"), false, self::type_debug,
 						array(
@@ -92,24 +92,24 @@ 
 							self::type_gateway=> __("Gateway Interaction (IPN or Direct Payment)", 'event_espresso'),
 							)),
 				'LOG_message'=>new EE_Maybe_Serialized_Text_Field('LOG_message', __("Log Message (body)", 'event_espresso'), true),
-				'LOG_wp_user' => new EE_WP_User_Field('LOG_wp_user', __("User who was logged in while this occurred", 'event_espresso'), true ),
+				'LOG_wp_user' => new EE_WP_User_Field('LOG_wp_user', __("User who was logged in while this occurred", 'event_espresso'), true),
 
 			));
 		$this->_model_relations = array();
-		foreach($models_this_can_attach_to as $model){
-			if( $model == 'WP_User' ){
-				$this->_model_relations[ $model ] = new EE_Belongs_To_Relation();
-			}elseif( $model != 'Change_Log' ) {
+		foreach ($models_this_can_attach_to as $model) {
+			if ($model == 'WP_User') {
+				$this->_model_relations[$model] = new EE_Belongs_To_Relation();
+			}elseif ($model != 'Change_Log') {
 				$this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
 			}
 		}
 		//use completely custom caps for this
 		$this->_cap_restriction_generators = false;
 		//caps-wise this is all-or-nothing: if you have the default role you can access anything, otherwise nothing
-		foreach( $this->_cap_contexts_to_cap_action_map as $cap_context => $action ) {
-			$this->_cap_restrictions[ $cap_context ][ EE_Restriction_Generator_Base::get_default_restrictions_cap() ] = new EE_Return_None_Where_Conditions();
+		foreach ($this->_cap_contexts_to_cap_action_map as $cap_context => $action) {
+			$this->_cap_restrictions[$cap_context][EE_Restriction_Generator_Base::get_default_restrictions_cap()] = new EE_Return_None_Where_Conditions();
 		}
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 	/**
@@ -119,11 +119,11 @@ 
 	 * @param EE_Base_Class $related_model_obj
 	 * @return EE_Change_Log
 	 */
-	public function log($log_type,$message,$related_model_obj){
-		if($related_model_obj instanceof EE_Base_Class){
+	public function log($log_type, $message, $related_model_obj) {
+		if ($related_model_obj instanceof EE_Base_Class) {
 			$obj_id = $related_model_obj->ID();
 			$obj_type = $related_model_obj->get_model()->get_this_model_name();
-		}else{
+		} else {
 			$obj_id = NULL;
 			$obj_type = NULL;
 		}
@@ -147,9 +147,9 @@ 
 	 * @throws EE_Error
 	 * @return EE_Change_Log
 	 */
-	public function gateway_log( $message, $related_obj_id, $related_obj_type ){
-		if( ! EE_Registry::instance()->is_model_name($related_obj_type)){
-			throw new EE_Error(sprintf(__("'%s' is not a model name. A model name must be provided when making a gateway log. Eg, 'Payment', 'Payment_Method', etc", "event_espresso"),$related_obj_type));
+	public function gateway_log($message, $related_obj_id, $related_obj_type) {
+		if ( ! EE_Registry::instance()->is_model_name($related_obj_type)) {
+			throw new EE_Error(sprintf(__("'%s' is not a model name. A model name must be provided when making a gateway log. Eg, 'Payment', 'Payment_Method', etc", "event_espresso"), $related_obj_type));
 		}
 		$log = EE_Change_Log::new_instance(array(
 				'LOG_type'=>EEM_Change_Log::type_gateway,
@@ -168,7 +168,7 @@ 
 	 * @param array $query_params @see EEM_Base::get_all
 	 * @return array of arrays
 	 */
-	public function get_all_efficiently($query_params){
+	public function get_all_efficiently($query_params) {
 		return $this->_get_all_wpdb_results($query_params);
 	}
 

core/db_models/EEM_Attendee.model.php

Spacing +55 added lines, -55 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 /**
  *
@@ -21,60 +21,60 @@ 
 	 * Please instead use the EEM_Attendee::system_question_* constants
 	 * @deprecated
 	 */
-	const fname_question_id=1;
+	const fname_question_id = 1;
 
 	/**
 	 * @deprecated
 	 */
-	const lname_question_id=2;
+	const lname_question_id = 2;
 
 
 	/**
 	 * @deprecated
 	 */
-	const email_question_id=3;
+	const email_question_id = 3;
 
 
 	/**
 	 * @deprecated
 	 */
-	const address_question_id=4;
+	const address_question_id = 4;
 
 
 	/**
 	 * @deprecated
 	 */
-	const address2_question_id=5;
+	const address2_question_id = 5;
 
 
 	/**
 	 * @deprecated
 	 */
-	const city_question_id=6;
+	const city_question_id = 6;
 
 
 	/**
 	 * @deprecated
 	 */
-	const state_question_id=7;
+	const state_question_id = 7;
 
 
 	/**
 	 * @deprecated
 	 */
-	const country_question_id=8;
+	const country_question_id = 8;
 
 
 	/**
 	 * @deprecated
 	 */
-	const zip_question_id=9;
+	const zip_question_id = 9;
 
 
 	/**
 	 * @deprecated
 	 */
-	const phone_question_id=10;
+	const phone_question_id = 10;
 
 	/**
 	 * When looking for questions that correspond to attendee fields,
@@ -119,9 +119,9 @@ 
 	 * @access protected
 	 * @param null $timezone
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Attendee','event_espresso');
-		$this->plural_item = __('Attendees','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Attendee', 'event_espresso');
+		$this->plural_item = __('Attendees', 'event_espresso');
 		$this->_tables = array(
 			'Attendee_CPT'=> new EE_Primary_Table('posts', 'ID'),
 			'Attendee_Meta'=>new EE_Secondary_Table('esp_attendee_meta', 'ATTM_ID', 'ATT_ID')
@@ -132,38 +132,38 @@ 
 				'ATT_full_name'=>new EE_Plain_Text_Field('post_title', __("Attendee Full Name", "event_espresso"), false, __("Unknown", "event_espresso")),
 				'ATT_bio'=>new EE_Post_Content_Field('post_content', __("Attendee Biography", "event_espresso"), false, __("No Biography Provided", "event_espresso")),
 				'ATT_slug'=>new EE_Slug_Field('post_name', __("Attendee URL Slug", "event_espresso"), false),
-				'ATT_created'=>new EE_Datetime_Field('post_date', __("Time Attendee Created", "event_espresso"), false, EE_Datetime_Field::now ),
+				'ATT_created'=>new EE_Datetime_Field('post_date', __("Time Attendee Created", "event_espresso"), false, EE_Datetime_Field::now),
 				'ATT_short_bio'=>new EE_Simple_HTML_Field('post_excerpt', __("Attendee Short Biography", "event_espresso"), true, __("No Biography Provided", "event_espresso")),
-				'ATT_modified'=>new EE_Datetime_Field('post_modified', __("Time Attendee Last Modified", "event_espresso"), FALSE, EE_Datetime_Field::now ),
-				'ATT_author'=>new EE_WP_User_Field('post_author', __("Creator ID of the first Event attended", "event_espresso"), false ),
+				'ATT_modified'=>new EE_Datetime_Field('post_modified', __("Time Attendee Last Modified", "event_espresso"), FALSE, EE_Datetime_Field::now),
+				'ATT_author'=>new EE_WP_User_Field('post_author', __("Creator ID of the first Event attended", "event_espresso"), false),
 				'ATT_parent'=>new EE_DB_Only_Int_Field('post_parent', __("Parent Attendee (unused)", "event_espresso"), false, 0),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_attendees'),// EE_DB_Only_Text_Field('post_type', __("Post Type of Attendee", "event_espresso"), false,'espresso_attendees'),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_attendees'), // EE_DB_Only_Text_Field('post_type', __("Post Type of Attendee", "event_espresso"), false,'espresso_attendees'),
 				'status' => new EE_WP_Post_Status_Field('post_status', __('Attendee Status', 'event_espresso'), false, 'publish')
 			),
 			'Attendee_Meta'=>array(
-				'ATTM_ID'=> new EE_DB_Only_Int_Field('ATTM_ID', __('Attendee Meta Row ID','event_espresso'), false),
+				'ATTM_ID'=> new EE_DB_Only_Int_Field('ATTM_ID', __('Attendee Meta Row ID', 'event_espresso'), false),
 				'ATT_ID_fk'=>new EE_DB_Only_Int_Field('ATT_ID', __("Foreign Key to Attendee in Post Table", "event_espresso"), false),
-				'ATT_fname'=>new EE_Plain_Text_Field('ATT_fname', __('First Name','event_espresso'), true, ''),
-				'ATT_lname'=>new EE_Plain_Text_Field('ATT_lname', __('Last Name','event_espresso'), true, ''),
-				'ATT_address'=>new EE_Plain_Text_Field('ATT_address', __('Address Part 1','event_espresso'), true, ''),
-				'ATT_address2'=>new EE_Plain_Text_Field('ATT_address2', __('Address Part 2','event_espresso'), true, ''),
-				'ATT_city'=>new EE_Plain_Text_Field('ATT_city', __('City','event_espresso'), true, ''),
-				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __('State','event_espresso'), true,0,'State'),
-				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __('Country','event_espresso'), true,'','Country'),
-				'ATT_zip'=>new EE_Plain_Text_Field('ATT_zip', __('ZIP/Postal Code','event_espresso'), true, ''),
-				'ATT_email'=>new EE_Email_Field('ATT_email', __('Email Address','event_espresso'), true, ''),
-				'ATT_phone'=>new EE_Plain_Text_Field('ATT_phone', __('Phone','event_espresso'), true, '')
+				'ATT_fname'=>new EE_Plain_Text_Field('ATT_fname', __('First Name', 'event_espresso'), true, ''),
+				'ATT_lname'=>new EE_Plain_Text_Field('ATT_lname', __('Last Name', 'event_espresso'), true, ''),
+				'ATT_address'=>new EE_Plain_Text_Field('ATT_address', __('Address Part 1', 'event_espresso'), true, ''),
+				'ATT_address2'=>new EE_Plain_Text_Field('ATT_address2', __('Address Part 2', 'event_espresso'), true, ''),
+				'ATT_city'=>new EE_Plain_Text_Field('ATT_city', __('City', 'event_espresso'), true, ''),
+				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __('State', 'event_espresso'), true, 0, 'State'),
+				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __('Country', 'event_espresso'), true, '', 'Country'),
+				'ATT_zip'=>new EE_Plain_Text_Field('ATT_zip', __('ZIP/Postal Code', 'event_espresso'), true, ''),
+				'ATT_email'=>new EE_Email_Field('ATT_email', __('Email Address', 'event_espresso'), true, ''),
+				'ATT_phone'=>new EE_Plain_Text_Field('ATT_phone', __('Phone', 'event_espresso'), true, '')
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
 			'State'=>new EE_Belongs_To_Relation(),
 			'Country'=>new EE_Belongs_To_Relation(),
-			'Event'=>new EE_HABTM_Relation('Registration', FALSE ),
+			'Event'=>new EE_HABTM_Relation('Registration', FALSE),
 			'WP_User' => new EE_Belongs_To_Relation(),
-			'Message' => new EE_Has_Many_Any_Relation( false ) //allow deletion of attendees even if they have messages in the queue for them.
+			'Message' => new EE_Has_Many_Any_Relation(false) //allow deletion of attendees even if they have messages in the queue for them.
 		);
 		$this->_caps_slug = 'contacts';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 
@@ -173,8 +173,8 @@ 
 	 * @param string $system_question_string
 	 * @return string|null if not found
 	 */
-	public function get_attendee_field_for_system_question( $system_question_string ) {
-		return isset( $this->_system_question_to_attendee_field_name[ $system_question_string ] ) ? $this->_system_question_to_attendee_field_name[ $system_question_string ] : null;
+	public function get_attendee_field_for_system_question($system_question_string) {
+		return isset($this->_system_question_to_attendee_field_name[$system_question_string]) ? $this->_system_question_to_attendee_field_name[$system_question_string] : null;
 	}
 
 
@@ -185,8 +185,8 @@ 
 	 * @param EE_Transaction/int $transaction_id_or_obj EE_Transaction or its ID
 	 * @return EE_Attendee[]
 	 */
-	public function get_attendees_for_transaction( $transaction_id_or_obj ){
-		return $this->get_all( array( array(
+	public function get_attendees_for_transaction($transaction_id_or_obj) {
+		return $this->get_all(array(array(
 			  'Registration.Transaction.TXN_ID' => $transaction_id_or_obj instanceof EE_Transaction ? $transaction_id_or_obj->ID() : $transaction_id_or_obj
 		  )));
 	}
@@ -201,9 +201,9 @@ 
 	*		@return 		mixed		array on success, FALSE on fail
 	 * 		@deprecated
 	*/
-	public function get_attendee_by_ID( $ATT_ID = FALSE ) {
+	public function get_attendee_by_ID($ATT_ID = FALSE) {
 		// retrieve a particular EE_Attendee
-		return $this->get_one_by_ID( $ATT_ID );
+		return $this->get_one_by_ID($ATT_ID);
 	}
 
 
@@ -216,14 +216,14 @@ 
 	* 		@param		array $where_cols_n_values
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_attendee( $where_cols_n_values = array() ) {
+	public function get_attendee($where_cols_n_values = array()) {
 
-		if ( empty( $where_cols_n_values )) {
+		if (empty($where_cols_n_values)) {
 			return FALSE;
 		}
-		$attendee = $this->get_all( array($where_cols_n_values ));
-		if ( ! empty( $attendee )) {
-			return array_shift( $attendee );
+		$attendee = $this->get_all(array($where_cols_n_values));
+		if ( ! empty($attendee)) {
+			return array_shift($attendee);
 		} else {
 			return FALSE;
 		}
@@ -239,20 +239,20 @@ 
 	 * @param array $where_cols_n_values
 	 * @return bool|mixed
 	 */
-	public function find_existing_attendee( $where_cols_n_values = NULL ) {
+	public function find_existing_attendee($where_cols_n_values = NULL) {
 		// search by combo of first and last names plus the email address
-		$attendee_data_keys = array( 'ATT_fname' => $this->_ATT_fname, 'ATT_lname' => $this->_ATT_lname, 'ATT_email' => $this->_ATT_email );
+		$attendee_data_keys = array('ATT_fname' => $this->_ATT_fname, 'ATT_lname' => $this->_ATT_lname, 'ATT_email' => $this->_ATT_email);
 		// no search params means attendee object already exists.
-		$where_cols_n_values = is_array( $where_cols_n_values ) && ! empty( $where_cols_n_values ) ? $where_cols_n_values : $attendee_data_keys;
+		$where_cols_n_values = is_array($where_cols_n_values) && ! empty($where_cols_n_values) ? $where_cols_n_values : $attendee_data_keys;
 		$valid_data = TRUE;
 		// check for required values
-		$valid_data = isset( $where_cols_n_values['ATT_fname'] ) && ! empty( $where_cols_n_values['ATT_fname'] ) ? $valid_data : FALSE;
-		$valid_data = isset( $where_cols_n_values['ATT_lname'] ) && ! empty( $where_cols_n_values['ATT_lname'] ) ? $valid_data : FALSE;
-		$valid_data = isset( $where_cols_n_values['ATT_email'] ) && ! empty( $where_cols_n_values['ATT_email'] ) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_fname']) && ! empty($where_cols_n_values['ATT_fname']) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_lname']) && ! empty($where_cols_n_values['ATT_lname']) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_email']) && ! empty($where_cols_n_values['ATT_email']) ? $valid_data : FALSE;
 
-		if ( $valid_data ) {
-			$attendee = $this->get_attendee( $where_cols_n_values );
-			if ( $attendee instanceof EE_Attendee ) {
+		if ($valid_data) {
+			$attendee = $this->get_attendee($where_cols_n_values);
+			if ($attendee instanceof EE_Attendee) {
 				return $attendee;
 			}
 		}
@@ -270,12 +270,12 @@ 
              * @param  array $ids array of EE_Registration ids
              * @return  EE_Attendee[]
              */
-            public function get_array_of_contacts_from_reg_ids( $ids ) {
+            public function get_array_of_contacts_from_reg_ids($ids) {
                 $ids = (array) $ids;
                 $_where = array(
-                    'Registration.REG_ID' => array( 'in', $ids )
+                    'Registration.REG_ID' => array('in', $ids)
                     );
-                return $this->get_all( array( $_where ) );
+                return $this->get_all(array($_where));
             }
 
 

core/EE_System.core.php

Spacing +268 added lines, -268 removed lines

@@ -88,10 +88,10 @@ 
 	 * @param  \EE_Registry        $Registry
 	 * @return \EE_System
 	 */
-	public static function instance( EE_Registry $Registry = null ) {
+	public static function instance(EE_Registry $Registry = null) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_System ) {
-			self::$_instance = new self( $Registry );
+		if ( ! self::$_instance instanceof EE_System) {
+			self::$_instance = new self($Registry);
 		}
 		return self::$_instance;
 	}
@@ -101,11 +101,11 @@ 
 	 * resets the instance and returns it
 	 * @return EE_System
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance->_req_type = NULL;
 
 		//make sure none of the old hooks are left hanging around
-		remove_all_actions( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' );
+		remove_all_actions('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 
 		//we need to reset the migration manager in order for it to detect DMSs properly
 		EE_Data_Migration_Manager::reset();
@@ -125,28 +125,28 @@ 
 	 * @access private
 	 * @param  \EE_Registry        $Registry
 	 */
-	private function __construct( EE_Registry $Registry ) {
+	private function __construct(EE_Registry $Registry) {
 		$this->registry = $Registry;
-		do_action( 'AHEE__EE_System__construct__begin', $this );
+		do_action('AHEE__EE_System__construct__begin', $this);
 		// allow addons to load first so that they can register autoloaders, set hooks for running DMS's, etc
-		add_action( 'AHEE__EE_Bootstrap__load_espresso_addons', array( $this, 'load_espresso_addons' ) );
+		add_action('AHEE__EE_Bootstrap__load_espresso_addons', array($this, 'load_espresso_addons'));
 		// when an ee addon is activated, we want to call the core hook(s) again
 		// because the newly-activated addon didn't get a chance to run at all
-		add_action( 'activate_plugin', array( $this, 'load_espresso_addons' ), 1 );
+		add_action('activate_plugin', array($this, 'load_espresso_addons'), 1);
 		// detect whether install or upgrade
-		add_action( 'AHEE__EE_Bootstrap__detect_activations_or_upgrades', array( $this, 'detect_activations_or_upgrades' ), 3 );
+		add_action('AHEE__EE_Bootstrap__detect_activations_or_upgrades', array($this, 'detect_activations_or_upgrades'), 3);
 		// load EE_Config, EE_Textdomain, etc
-		add_action( 'AHEE__EE_Bootstrap__load_core_configuration', array( $this, 'load_core_configuration' ), 5 );
+		add_action('AHEE__EE_Bootstrap__load_core_configuration', array($this, 'load_core_configuration'), 5);
 		// load EE_Config, EE_Textdomain, etc
-		add_action( 'AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets', array( $this, 'register_shortcodes_modules_and_widgets' ), 7 );
+		add_action('AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets', array($this, 'register_shortcodes_modules_and_widgets'), 7);
 		// you wanna get going? I wanna get going... let's get going!
-		add_action( 'AHEE__EE_Bootstrap__brew_espresso', array( $this, 'brew_espresso' ), 9 );
+		add_action('AHEE__EE_Bootstrap__brew_espresso', array($this, 'brew_espresso'), 9);
 		//other housekeeping
 		//exclude EE critical pages from wp_list_pages
-		add_filter( 'wp_list_pages_excludes', array( $this, 'remove_pages_from_wp_list_pages' ), 10 );
+		add_filter('wp_list_pages_excludes', array($this, 'remove_pages_from_wp_list_pages'), 10);
 		// ALL EE Addons should use the following hook point to attach their initial setup too
 		// it's extremely important for EE Addons to register any class autoloaders so that they can be available when the EE_Config loads
-		do_action( 'AHEE__EE_System__construct__complete', $this );
+		do_action('AHEE__EE_System__construct__complete', $this);
 	}
 
 
@@ -166,30 +166,30 @@ 
 	public function load_espresso_addons() {
 		// set autoloaders for all of the classes implementing EEI_Plugin_API
 		// which provide helpers for EE plugin authors to more easily register certain components with EE.
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'plugin_api' );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'plugin_api');
 		//load and setup EE_Capabilities
-		$this->registry->load_core( 'Capabilities' );
+		$this->registry->load_core('Capabilities');
 		//caps need to be initialized on every request so that capability maps are set.
 		//@see https://events.codebasehq.com/projects/event-espresso/tickets/8674
 		$this->registry->CAP->init_caps();
-		do_action( 'AHEE__EE_System__load_espresso_addons' );
+		do_action('AHEE__EE_System__load_espresso_addons');
 		//if the WP API basic auth plugin isn't already loaded, load it now.
 		//We want it for mobile apps. Just include the entire plugin
 		//also, don't load the basic auth when a plugin is getting activated, because
 		//it could be the basic auth plugin, and it doesn't check if its methods are already defined
 		//and causes a fatal error
-		if( !function_exists( 'json_basic_auth_handler' )
-			&& ! function_exists( 'json_basic_auth_error' )
+		if ( ! function_exists('json_basic_auth_handler')
+			&& ! function_exists('json_basic_auth_error')
 			&& ! (
-				isset( $_GET[ 'action'] )
-				&& in_array( $_GET[ 'action' ], array( 'activate', 'activate-selected' ) )
+				isset($_GET['action'])
+				&& in_array($_GET['action'], array('activate', 'activate-selected'))
 			)
 			&& ! (
-				isset( $_GET['activate' ] )
-				&& $_GET['activate' ] === 'true'
+				isset($_GET['activate'])
+				&& $_GET['activate'] === 'true'
 			)
 		) {
-			include_once EE_THIRD_PARTY . 'wp-api-basic-auth' . DS . 'basic-auth.php';
+			include_once EE_THIRD_PARTY.'wp-api-basic-auth'.DS.'basic-auth.php';
 		}
 	}
 
@@ -205,10 +205,10 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function detect_activations_or_upgrades(){
+	public function detect_activations_or_upgrades() {
 		//first off: let's make sure to handle core
 		$this->detect_if_activation_or_upgrade();
-		foreach($this->registry->addons as $addon){
+		foreach ($this->registry->addons as $addon) {
 			//detect teh request type for that addon
 			$addon->detect_activation_or_upgrade();
 		}
@@ -229,41 +229,41 @@ 
 		do_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin');
 
 		// load M-Mode class
-		$this->registry->load_core( 'Maintenance_Mode' );
+		$this->registry->load_core('Maintenance_Mode');
 		// check if db has been updated, or if its a brand-new installation
 
 		$espresso_db_update = $this->fix_espresso_db_upgrade_option();
-		$request_type =  $this->detect_req_type($espresso_db_update);
+		$request_type = $this->detect_req_type($espresso_db_update);
 		//EEH_Debug_Tools::printr( $request_type, '$request_type', __FILE__, __LINE__ );
 
-		switch($request_type){
+		switch ($request_type) {
 			case EE_System::req_type_new_activation:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__new_activation' );
-				$this->_handle_core_version_change( $espresso_db_update );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__new_activation');
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_reactivation:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__reactivation' );
-				$this->_handle_core_version_change( $espresso_db_update );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__reactivation');
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_upgrade:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__upgrade' );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__upgrade');
 				//migrations may be required now that we've upgraded
 				EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-				$this->_handle_core_version_change( $espresso_db_update );
+				$this->_handle_core_version_change($espresso_db_update);
 //				echo "done upgrade";die;
 				break;
 			case EE_System::req_type_downgrade:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__downgrade' );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__downgrade');
 				//its possible migrations are no longer required
 				EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-				$this->_handle_core_version_change( $espresso_db_update );
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_normal:
 			default:
 //				$this->_maybe_redirect_to_ee_about();
 				break;
 		}
-		do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__complete' );
+		do_action('AHEE__EE_System__detect_if_activation_or_upgrade__complete');
 	}
 
 	/**
@@ -271,10 +271,10 @@ 
 	 * initializing the database later during the request
 	 * @param array $espresso_db_update
 	 */
-	protected function _handle_core_version_change( $espresso_db_update ){
-		$this->update_list_of_installed_versions( $espresso_db_update );
+	protected function _handle_core_version_change($espresso_db_update) {
+		$this->update_list_of_installed_versions($espresso_db_update);
 		//get ready to verify the DB is ok (provided we aren't in maintenance mode, of course)
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ));
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -289,44 +289,44 @@ 
 	 * @internal param array $espresso_db_update_value the value of the WordPress option. If not supplied, fetches it from the options table
 	 * @return array the correct value of 'espresso_db_upgrade', after saving it, if it needed correction
 	 */
-	private function fix_espresso_db_upgrade_option($espresso_db_update = null){
-		do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update );
-		if( ! $espresso_db_update){
-			$espresso_db_update = get_option( 'espresso_db_update' );
+	private function fix_espresso_db_upgrade_option($espresso_db_update = null) {
+		do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update);
+		if ( ! $espresso_db_update) {
+			$espresso_db_update = get_option('espresso_db_update');
 		}
 		// check that option is an array
-		if( ! is_array( $espresso_db_update )) {
+		if ( ! is_array($espresso_db_update)) {
 			// if option is FALSE, then it never existed
-			if ( $espresso_db_update === FALSE ) {
+			if ($espresso_db_update === FALSE) {
 				// make $espresso_db_update an array and save option with autoload OFF
-				$espresso_db_update =  array();
-				add_option( 'espresso_db_update', $espresso_db_update, '', 'no' );
+				$espresso_db_update = array();
+				add_option('espresso_db_update', $espresso_db_update, '', 'no');
 			} else {
 				// option is NOT FALSE but also is NOT an array, so make it an array and save it
-				$espresso_db_update =  array( $espresso_db_update=>array() );
-				update_option( 'espresso_db_update', $espresso_db_update );
+				$espresso_db_update = array($espresso_db_update=>array());
+				update_option('espresso_db_update', $espresso_db_update);
 			}
-		}else{
+		} else {
 			$corrected_db_update = array();
 			//if IS an array, but is it an array where KEYS are version numbers, and values are arrays?
-			foreach($espresso_db_update as $should_be_version_string => $should_be_array){
-				if(is_int($should_be_version_string) && ! is_array($should_be_array)){
+			foreach ($espresso_db_update as $should_be_version_string => $should_be_array) {
+				if (is_int($should_be_version_string) && ! is_array($should_be_array)) {
 					//the key is an int, and the value IS NOT an array
 					//so it must be numerically-indexed, where values are versions installed...
 					//fix it!
 					$version_string = $should_be_array;
 					$corrected_db_update[$version_string] = array('unknown-date');
-				}else{
+				} else {
 					//ok it checks out
 					$corrected_db_update[$should_be_version_string] = $should_be_array;
 				}
 			}
 			$espresso_db_update = $corrected_db_update;
-			update_option( 'espresso_db_update', $espresso_db_update );
+			update_option('espresso_db_update', $espresso_db_update);
 
 		}
 
-		do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update );
+		do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update);
 		return $espresso_db_update;
 	}
 
@@ -346,34 +346,34 @@ 
 	 * so we prefer to only do it when necessary
 	 * @return void
 	 */
-	public function initialize_db_if_no_migrations_required( $initialize_addons_too = FALSE, $verify_schema = true ){
+	public function initialize_db_if_no_migrations_required($initialize_addons_too = FALSE, $verify_schema = true) {
 		$request_type = $this->detect_req_type();
 		//only initialize system if we're not in maintenance mode.
-		if( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ){
-			update_option( 'ee_flush_rewrite_rules', TRUE );
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			update_option('ee_flush_rewrite_rules', TRUE);
 
-			if( $verify_schema ) {
+			if ($verify_schema) {
 				EEH_Activation::initialize_db_and_folders();
 			}
 			EEH_Activation::initialize_db_content();
 			EEH_Activation::system_initialization();
-			if( $initialize_addons_too ) {
+			if ($initialize_addons_too) {
 				$this->initialize_addons();
 			}
-		}else{
-			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( 'Core' );
+		} else {
+			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for('Core');
 		}
-		if ( $request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade ) {
-			add_action( 'AHEE__EE_System__initialize_last', array( $this, 'redirect_to_about_ee' ), 9 );
+		if ($request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade) {
+			add_action('AHEE__EE_System__initialize_last', array($this, 'redirect_to_about_ee'), 9);
 		}
 	}
 
 	/**
 	 * Initializes the db for all registered addons
 	 */
-	public function initialize_addons(){
+	public function initialize_addons() {
 		//foreach registered addon, make sure its db is up-to-date too
-		foreach($this->registry->addons as $addon){
+		foreach ($this->registry->addons as $addon) {
 			$addon->initialize_db_if_no_migrations_required();
 		}
 	}
@@ -385,16 +385,16 @@ 
 	 * @param 	string 	$current_version_to_add 	version to be added to the version history
 	 * @return 	boolean success as to whether or not this option was changed
 	 */
-	public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) {
-		if( ! $version_history ) {
+	public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) {
+		if ( ! $version_history) {
 			$version_history = $this->fix_espresso_db_upgrade_option($version_history);
 		}
-		if( $current_version_to_add == NULL){
+		if ($current_version_to_add == NULL) {
 			$current_version_to_add = espresso_version();
 		}
-		$version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() );
+		$version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time());
 		// re-save
-		return update_option( 'espresso_db_update', $version_history );
+		return update_option('espresso_db_update', $version_history);
 	}
 
 
@@ -411,10 +411,10 @@ 
 	 *                            but still know if this is a new install or not
 	 * @return int one of the constants on EE_System::req_type_
 	 */
-	public function detect_req_type( $espresso_db_update = NULL ){
-		if ( $this->_req_type === NULL ){
-			$espresso_db_update = ! empty( $espresso_db_update ) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option();
-			$this->_req_type = $this->detect_req_type_given_activation_history( $espresso_db_update, 'ee_espresso_activation', espresso_version() );
+	public function detect_req_type($espresso_db_update = NULL) {
+		if ($this->_req_type === NULL) {
+			$espresso_db_update = ! empty($espresso_db_update) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option();
+			$this->_req_type = $this->detect_req_type_given_activation_history($espresso_db_update, 'ee_espresso_activation', espresso_version());
 		}
 		return $this->_req_type;
 	}
@@ -430,39 +430,39 @@ 
 	 * @param string $version_to_upgrade_to the version that was just upgraded to (for core that will be espresso_version())
 	 * @return int one of the constants on EE_System::req_type_*
 	 */
-	public static function detect_req_type_given_activation_history( $activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to ){
-		$version_is_higher = self::_new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to );
-		if( $activation_history_for_addon ){
+	public static function detect_req_type_given_activation_history($activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to) {
+		$version_is_higher = self::_new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to);
+		if ($activation_history_for_addon) {
 			//it exists, so this isn't a completely new install
 			//check if this version already in that list of previously installed versions
-			if ( ! isset( $activation_history_for_addon[ $version_to_upgrade_to ] )) {
+			if ( ! isset($activation_history_for_addon[$version_to_upgrade_to])) {
 				//it a version we haven't seen before
-				if( $version_is_higher === 1 ){
+				if ($version_is_higher === 1) {
 					$req_type = EE_System::req_type_upgrade;
-				}else{
+				} else {
 					$req_type = EE_System::req_type_downgrade;
 				}
-				delete_option( $activation_indicator_option_name );
+				delete_option($activation_indicator_option_name);
 			} else {
 				// its not an update. maybe a reactivation?
-				if( get_option( $activation_indicator_option_name, FALSE ) ){
-					if ( $version_is_higher === -1 ){
+				if (get_option($activation_indicator_option_name, FALSE)) {
+					if ($version_is_higher === -1) {
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					}elseif ($version_is_higher === 0) {
 						//we've seen this version before, but it's an activation. must be a reactivation
 						$req_type = EE_System::req_type_reactivation;
-					}else{//$version_is_higher === 1
+					} else {//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
-					delete_option( $activation_indicator_option_name );
+					delete_option($activation_indicator_option_name);
 				} else {
 					//we've seen this version before and the activation indicate doesn't show it was just activated
-					if ( $version_is_higher === -1 ){
+					if ($version_is_higher === -1) {
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					}elseif ($version_is_higher === 0) {
 						//we've seen this version before and it's not an activation. its normal request
 						$req_type = EE_System::req_type_normal;
-					}else{//$version_is_higher === 1
+					} else {//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
 				}
@@ -470,7 +470,7 @@ 
 		} else {
 			//brand new install
 			$req_type = EE_System::req_type_new_activation;
-			delete_option( $activation_indicator_option_name );
+			delete_option($activation_indicator_option_name);
 		}
 		return $req_type;
 	}
@@ -488,30 +488,30 @@ 
 	 *		0 if $version_to_upgrade_to MATCHES (reactivation or normal request);
 	 *		1 if $version_to_upgrade_to is HIGHER (upgrade) ;
 	 */
-	protected static function _new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to ){
+	protected static function _new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to) {
 		//find the most recently-activated version
 		$most_recently_active_version_activation = '1970-01-01 00:00:00';
 		$most_recently_active_version = '0.0.0.dev.000';
-		if( is_array( $activation_history_for_addon ) ){
-			foreach( $activation_history_for_addon as $version => $times_activated ){
+		if (is_array($activation_history_for_addon)) {
+			foreach ($activation_history_for_addon as $version => $times_activated) {
 				//check there is a record of when this version was activated. Otherwise,
 				//mark it as unknown
-				if( ! $times_activated ){
-					$times_activated = array( 'unknown-date');
+				if ( ! $times_activated) {
+					$times_activated = array('unknown-date');
 				}
-				if( is_string( $times_activated ) ){
-					$times_activated = array( $times_activated );
+				if (is_string($times_activated)) {
+					$times_activated = array($times_activated);
 				}
-				foreach( $times_activated as $an_activation ){
-					if( $an_activation != 'unknown-date' &&
-							$an_activation > $most_recently_active_version_activation  ){
+				foreach ($times_activated as $an_activation) {
+					if ($an_activation != 'unknown-date' &&
+							$an_activation > $most_recently_active_version_activation) {
 						$most_recently_active_version = $version;
 						$most_recently_active_version_activation = $an_activation == 'unknown-date' ? '1970-01-01 00:00:00' : $an_activation;
 					}
 				}
 			}
 		}
-		return version_compare( $version_to_upgrade_to, $most_recently_active_version );
+		return version_compare($version_to_upgrade_to, $most_recently_active_version);
 	}
 
 
@@ -521,24 +521,24 @@ 
 	 * @return void
 	 */
 	public function redirect_to_about_ee() {
-		$notices = EE_Error::get_notices( FALSE );
+		$notices = EE_Error::get_notices(FALSE);
 		//if current user is an admin and it's not an ajax request
 		if (
-			$this->registry->CAP->current_user_can( 'manage_options', 'espresso_about_default' )
-			&& ! ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-			&& ! isset( $notices[ 'errors' ] )
+			$this->registry->CAP->current_user_can('manage_options', 'espresso_about_default')
+			&& ! (defined('DOING_AJAX') && DOING_AJAX)
+			&& ! isset($notices['errors'])
 		) {
-			$query_params =  array( 'page' => 'espresso_about' );
+			$query_params = array('page' => 'espresso_about');
 
-			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation ) {
+			if (EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation) {
 			    $query_params['new_activation'] = TRUE;
 			}
 
-			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation ) {
+			if (EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation) {
 			    $query_params['reactivation'] = TRUE;
 			}
-			$url = add_query_arg( $query_params, admin_url( 'admin.php' ) );
-			wp_safe_redirect( $url );
+			$url = add_query_arg($query_params, admin_url('admin.php'));
+			wp_safe_redirect($url);
 			exit();
 		}
 	}
@@ -552,31 +552,31 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_core_configuration(){
-		do_action( 'AHEE__EE_System__load_core_configuration__begin', $this );
-		$this->registry->load_core( 'EE_Load_Textdomain' );
+	public function load_core_configuration() {
+		do_action('AHEE__EE_System__load_core_configuration__begin', $this);
+		$this->registry->load_core('EE_Load_Textdomain');
 		//load textdomain
 		EE_Load_Textdomain::load_textdomain();
 		// load and setup EE_Config and EE_Network_Config
-		$this->registry->load_core( 'Config' );
-		$this->registry->load_core( 'Network_Config' );
+		$this->registry->load_core('Config');
+		$this->registry->load_core('Network_Config');
 		// setup autoloaders
 		// enable logging?
-		if ( $this->registry->CFG->admin->use_full_logging ) {
-			$this->registry->load_core( 'Log' );
+		if ($this->registry->CFG->admin->use_full_logging) {
+			$this->registry->load_core('Log');
 		}
 		// check for activation errors
-		$activation_errors = get_option( 'ee_plugin_activation_errors', FALSE );
-		if ( $activation_errors ) {
-			EE_Error::add_error( $activation_errors, __FILE__, __FUNCTION__, __LINE__ );
-			update_option( 'ee_plugin_activation_errors', FALSE );
+		$activation_errors = get_option('ee_plugin_activation_errors', FALSE);
+		if ($activation_errors) {
+			EE_Error::add_error($activation_errors, __FILE__, __FUNCTION__, __LINE__);
+			update_option('ee_plugin_activation_errors', FALSE);
 		}
 		// get model names
 		$this->_parse_model_names();
 
 		//load caf stuff a chance to play during the activation process too.
 		$this->_maybe_brew_regular();
-		do_action( 'AHEE__EE_System__load_core_configuration__complete', $this );
+		do_action('AHEE__EE_System__load_core_configuration__complete', $this);
 	}
 
 
@@ -585,23 +585,23 @@ 
 	 *
 	 * @return void
 	 */
-	private function _parse_model_names(){
+	private function _parse_model_names() {
 		//get all the files in the EE_MODELS folder that end in .model.php
-		$models = glob( EE_MODELS.'*.model.php');
+		$models = glob(EE_MODELS.'*.model.php');
 		$model_names = array();
 		$non_abstract_db_models = array();
-		foreach( $models as $model ){
+		foreach ($models as $model) {
 			// get model classname
-			$classname = EEH_File::get_classname_from_filepath_with_standard_filename( $model );
-			$short_name = str_replace( 'EEM_', '', $classname );
+			$classname = EEH_File::get_classname_from_filepath_with_standard_filename($model);
+			$short_name = str_replace('EEM_', '', $classname);
 			$reflectionClass = new ReflectionClass($classname);
-			if( $reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()){
-				$non_abstract_db_models[ $short_name ] = $classname;
+			if ($reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()) {
+				$non_abstract_db_models[$short_name] = $classname;
 			}
-			$model_names[ $short_name ] = $classname;
+			$model_names[$short_name] = $classname;
 		}
-		$this->registry->models = apply_filters( 'FHEE__EE_System__parse_model_names', $model_names );
-		$this->registry->non_abstract_db_models = apply_filters( 'FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models );
+		$this->registry->models = apply_filters('FHEE__EE_System__parse_model_names', $model_names);
+		$this->registry->non_abstract_db_models = apply_filters('FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models);
 	}
 
 
@@ -611,8 +611,8 @@ 
 	 * @return void
 	 */
 	private function _maybe_brew_regular() {
-		if (( ! defined( 'EE_DECAF' ) ||  EE_DECAF !== TRUE ) && is_readable( EE_CAFF_PATH . 'brewing_regular.php' )) {
-			require_once EE_CAFF_PATH . 'brewing_regular.php';
+		if (( ! defined('EE_DECAF') || EE_DECAF !== TRUE) && is_readable(EE_CAFF_PATH.'brewing_regular.php')) {
+			require_once EE_CAFF_PATH.'brewing_regular.php';
 		}
 	}
 
@@ -629,9 +629,9 @@ 
 	 * @return void
 	 */
 	public function register_shortcodes_modules_and_widgets() {
-		do_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets' );
+		do_action('AHEE__EE_System__register_shortcodes_modules_and_widgets');
 		// check for addons using old hookpoint
-		if ( has_action( 'AHEE__EE_System__register_shortcodes_modules_and_addons' )) {
+		if (has_action('AHEE__EE_System__register_shortcodes_modules_and_addons')) {
 			$this->_incompatible_addon_error();
 		}
 	}
@@ -645,19 +645,19 @@ 
 	*/
 	private function _incompatible_addon_error() {
 		// get array of classes hooking into here
-		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook( 'AHEE__EE_System__register_shortcodes_modules_and_addons' );
-		if ( ! empty( $class_names )) {
-			$msg = __( 'The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso' );
+		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook('AHEE__EE_System__register_shortcodes_modules_and_addons');
+		if ( ! empty($class_names)) {
+			$msg = __('The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso');
 			$msg .= '<ul>';
-			foreach ( $class_names as $class_name ) {
-				$msg .= '<li><b>Event Espresso - ' . str_replace( array( 'EE_', 'EEM_', 'EED_', 'EES_', 'EEW_' ), '', $class_name ) . '</b></li>';
+			foreach ($class_names as $class_name) {
+				$msg .= '<li><b>Event Espresso - '.str_replace(array('EE_', 'EEM_', 'EED_', 'EES_', 'EEW_'), '', $class_name).'</b></li>';
 			}
 			$msg .= '</ul>';
-			$msg .= __( 'Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso' );
+			$msg .= __('Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso');
 			// save list of incompatible addons to wp-options for later use
-			add_option( 'ee_incompatible_addons', $class_names, '', 'no' );
-			if ( is_admin() ) {
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			add_option('ee_incompatible_addons', $class_names, '', 'no');
+			if (is_admin()) {
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
 	}
@@ -674,26 +674,26 @@ 
 	 *
 	 * @return void
 	 */
-	public function brew_espresso(){
-		do_action( 'AHEE__EE_System__brew_espresso__begin', $this );
+	public function brew_espresso() {
+		do_action('AHEE__EE_System__brew_espresso__begin', $this);
 		// load some final core systems
-		add_action( 'init', array( $this, 'set_hooks_for_core' ), 1 );
-		add_action( 'init', array( $this, 'perform_activations_upgrades_and_migrations' ), 3 );
-		add_action( 'init', array( $this, 'load_CPTs_and_session' ), 5 );
-		add_action( 'init', array( $this, 'load_controllers' ), 7 );
-		add_action( 'init', array( $this, 'core_loaded_and_ready' ), 9 );
-		add_action( 'init', array( $this, 'initialize' ), 10 );
-		add_action( 'init', array( $this, 'initialize_last' ), 100 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 25 );
-		add_action('admin_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 25 );
-		add_action( 'admin_bar_menu', array( $this, 'espresso_toolbar_items' ), 100 );
-
-		if ( is_admin() && apply_filters( 'FHEE__EE_System__brew_espresso__load_pue', TRUE )  ) {
+		add_action('init', array($this, 'set_hooks_for_core'), 1);
+		add_action('init', array($this, 'perform_activations_upgrades_and_migrations'), 3);
+		add_action('init', array($this, 'load_CPTs_and_session'), 5);
+		add_action('init', array($this, 'load_controllers'), 7);
+		add_action('init', array($this, 'core_loaded_and_ready'), 9);
+		add_action('init', array($this, 'initialize'), 10);
+		add_action('init', array($this, 'initialize_last'), 100);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 25);
+		add_action('admin_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 25);
+		add_action('admin_bar_menu', array($this, 'espresso_toolbar_items'), 100);
+
+		if (is_admin() && apply_filters('FHEE__EE_System__brew_espresso__load_pue', TRUE)) {
 			// pew pew pew
-			$this->registry->load_core( 'PUE' );
-			do_action( 'AHEE__EE_System__brew_espresso__after_pue_init' );
+			$this->registry->load_core('PUE');
+			do_action('AHEE__EE_System__brew_espresso__after_pue_init');
 		}
-		do_action( 'AHEE__EE_System__brew_espresso__complete', $this );
+		do_action('AHEE__EE_System__brew_espresso__complete', $this);
 	}
 
 
@@ -707,7 +707,7 @@ 
 	 */
 	public function set_hooks_for_core() {
 		$this->_deactivate_incompatible_addons();
-		do_action( 'AHEE__EE_System__set_hooks_for_core' );
+		do_action('AHEE__EE_System__set_hooks_for_core');
 	}
 
 
@@ -716,15 +716,15 @@ 
 	 * Using the information gathered in EE_System::_incompatible_addon_error,
 	 * deactivates any addons considered incompatible with the current version of EE
 	 */
-	private function _deactivate_incompatible_addons(){
-		$incompatible_addons = get_option( 'ee_incompatible_addons', array() );
-		if ( ! empty( $incompatible_addons )) {
-			$active_plugins = get_option( 'active_plugins', array() );
-			foreach ( $active_plugins as $active_plugin ) {
-				foreach ( $incompatible_addons as $incompatible_addon ) {
-					if ( strpos( $active_plugin,  $incompatible_addon ) !== FALSE ) {
-						unset( $_GET['activate'] );
-						espresso_deactivate_plugin( $active_plugin );
+	private function _deactivate_incompatible_addons() {
+		$incompatible_addons = get_option('ee_incompatible_addons', array());
+		if ( ! empty($incompatible_addons)) {
+			$active_plugins = get_option('active_plugins', array());
+			foreach ($active_plugins as $active_plugin) {
+				foreach ($incompatible_addons as $incompatible_addon) {
+					if (strpos($active_plugin, $incompatible_addon) !== FALSE) {
+						unset($_GET['activate']);
+						espresso_deactivate_plugin($active_plugin);
 					}
 				}
 			}
@@ -741,10 +741,10 @@ 
 	 */
 	public function perform_activations_upgrades_and_migrations() {
 		//first check if we had previously attempted to setup EE's directories but failed
-		if( EEH_Activation::upload_directories_incomplete() ) {
+		if (EEH_Activation::upload_directories_incomplete()) {
 			EEH_Activation::create_upload_directories();
 		}
-		do_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' );
+		do_action('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 	}
 
 
@@ -756,10 +756,10 @@ 
 	 *  	@return 	void
 	 */
 	public function load_CPTs_and_session() {
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__start' );
+		do_action('AHEE__EE_System__load_CPTs_and_session__start');
 		// register Custom Post Types
-		$this->registry->load_core( 'Register_CPTs' );
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__complete' );
+		$this->registry->load_core('Register_CPTs');
+		do_action('AHEE__EE_System__load_CPTs_and_session__complete');
 	}
 
 
@@ -774,16 +774,16 @@ 
 	* @return void
 	*/
 	public function load_controllers() {
-		do_action( 'AHEE__EE_System__load_controllers__start' );
+		do_action('AHEE__EE_System__load_controllers__start');
 		// let's get it started
-		if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level() ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_front_controllers' );
-			$this->registry->load_core( 'Front_Controller', array(), false, true );
-		} else if ( ! EE_FRONT_AJAX ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_admin_controllers' );
-			EE_Registry::instance()->load_core( 'Admin' );
+		if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level()) {
+			do_action('AHEE__EE_System__load_controllers__load_front_controllers');
+			$this->registry->load_core('Front_Controller', array(), false, true);
+		} else if ( ! EE_FRONT_AJAX) {
+			do_action('AHEE__EE_System__load_controllers__load_admin_controllers');
+			EE_Registry::instance()->load_core('Admin');
 		}
-		do_action( 'AHEE__EE_System__load_controllers__complete' );
+		do_action('AHEE__EE_System__load_controllers__complete');
 	}
 
 
@@ -797,9 +797,9 @@ 
 	* @return void
 	*/
 	public function core_loaded_and_ready() {
-		do_action( 'AHEE__EE_System__core_loaded_and_ready' );
-		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
-		$this->registry->load_core( 'Session' );
+		do_action('AHEE__EE_System__core_loaded_and_ready');
+		do_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons');
+		$this->registry->load_core('Session');
 		//		add_action( 'wp_loaded', array( $this, 'set_hooks_for_shortcodes_modules_and_addons' ), 1 );
 	}
 
@@ -814,7 +814,7 @@ 
 	* @return void
 	*/
 	public function initialize() {
-		do_action( 'AHEE__EE_System__initialize' );
+		do_action('AHEE__EE_System__initialize');
 	}
 
 
@@ -828,7 +828,7 @@ 
 	* @return void
 	*/
 	public function initialize_last() {
-		do_action( 'AHEE__EE_System__initialize_last' );
+		do_action('AHEE__EE_System__initialize_last');
 	}
 
 
@@ -860,21 +860,21 @@ 
 	*/
 	public static function do_not_cache() {
 		// set no cache constants
-		if ( ! defined( 'DONOTCACHEPAGE' ) ) {
-			define( 'DONOTCACHEPAGE', true );
+		if ( ! defined('DONOTCACHEPAGE')) {
+			define('DONOTCACHEPAGE', true);
 		}
-		if ( ! defined( 'DONOTCACHCEOBJECT' ) ) {
-			define( 'DONOTCACHCEOBJECT', true );
+		if ( ! defined('DONOTCACHCEOBJECT')) {
+			define('DONOTCACHCEOBJECT', true);
 		}
-		if ( ! defined( 'DONOTCACHEDB' ) ) {
-			define( 'DONOTCACHEDB', true );
+		if ( ! defined('DONOTCACHEDB')) {
+			define('DONOTCACHEDB', true);
 		}
 		// add no cache headers
-		add_action( 'send_headers' , array( 'EE_System', 'nocache_headers' ), 10 );
+		add_action('send_headers', array('EE_System', 'nocache_headers'), 10);
 		// plus a little extra for nginx and Google Chrome
-		add_filter( 'nocache_headers', array( 'EE_System', 'extra_nocache_headers' ), 10, 1 );
+		add_filter('nocache_headers', array('EE_System', 'extra_nocache_headers'), 10, 1);
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
-		remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head' );
+		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
 
 
@@ -886,7 +886,7 @@ 
 	 * @param $headers
 	 * @return    array
 	 */
-	public static function extra_nocache_headers ( $headers ) {
+	public static function extra_nocache_headers($headers) {
 		// for NGINX
 		$headers['X-Accel-Expires'] = 0;
 		// plus extra for Google Chrome since it doesn't seem to respect "no-cache", but WILL respect "no-store"
@@ -915,14 +915,14 @@ 
 	 * @param  WP_Admin_Bar $admin_bar
 	 * @return void
 	 */
-	public function espresso_toolbar_items( WP_Admin_Bar $admin_bar ) {
+	public function espresso_toolbar_items(WP_Admin_Bar $admin_bar) {
 
 		// if in full M-Mode, or its an AJAX request, or user is NOT an admin
-		if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined( 'DOING_AJAX' ) || ! $this->registry->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_top_level' )) {
+		if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined('DOING_AJAX') || ! $this->registry->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_top_level')) {
 			return;
 		}
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$menu_class = 'espresso_menu_item_class';
 		//we don't use the constants EVENTS_ADMIN_URL or REG_ADMIN_URL
 		//because they're only defined in each of their respective constructors
@@ -934,20 +934,20 @@ 
 		//Top Level
 		$admin_bar->add_menu(array(
 				'id' => 'espresso-toolbar',
-				'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">' . _x('Event Espresso', 'admin bar menu group label', 'event_espresso') . '</span>',
+				'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">'._x('Event Espresso', 'admin bar menu group label', 'event_espresso').'</span>',
 				'href' => $events_admin_url,
 				'meta' => array(
 						'title' => __('Event Espresso', 'event_espresso'),
-						'class' => $menu_class . 'first'
+						'class' => $menu_class.'first'
 				),
 		));
 
 		//Events
-		if ( $this->registry->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Events', 'event_espresso' ),
+					'title' => __('Events', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('Events', 'event_espresso'),
@@ -958,13 +958,13 @@ 
 		}
 
 
-		if ( $this->registry->CAP->current_user_can( 'ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new')) {
 			//Events Add New
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-new',
 					'parent' => 'espresso-toolbar-events',
 					'title' => __('Add New', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'create_new' ), $events_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'create_new'), $events_admin_url),
 					'meta' => array(
 							'title' => __('Add New', 'event_espresso'),
 							'target' => '',
@@ -973,18 +973,18 @@ 
 			));
 		}
 
-		if ( is_single() && ( get_post_type() == 'espresso_events' ) ) {
+		if (is_single() && (get_post_type() == 'espresso_events')) {
 
 			//Current post
 			global $post;
 
-	    	if ( $this->registry->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) {
+	    	if ($this->registry->CAP->current_user_can('ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID)) {
 				//Events Edit Current Event
 				$admin_bar->add_menu(array(
 						'id' => 'espresso-toolbar-events-edit',
 						'parent' => 'espresso-toolbar-events',
 						'title' => __('Edit Event', 'event_espresso'),
-						'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$post->ID ), $events_admin_url ),
+						'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$post->ID), $events_admin_url),
 						'meta' => array(
 								'title' => __('Edit Event', 'event_espresso'),
 								'target' => '',
@@ -996,11 +996,11 @@ 
 		}
 
 		//Events View
-		if ( $this->registry->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-view',
 					'parent' => 'espresso-toolbar-events',
-					'title' => __( 'View', 'event_espresso' ),
+					'title' => __('View', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('View', 'event_espresso'),
@@ -1010,12 +1010,12 @@ 
 			));
 		}
 
-		if ( $this->registry->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all')) {
 			//Events View All
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-all',
 					'parent' => 'espresso-toolbar-events-view',
-					'title' => __( 'All', 'event_espresso' ),
+					'title' => __('All', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('All', 'event_espresso'),
@@ -1026,13 +1026,13 @@ 
 		}
 
 
-		if ( $this->registry->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today')) {
 			//Events View Today
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-today',
 					'parent' => 'espresso-toolbar-events-view',
 					'title' => __('Today', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $events_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $events_admin_url),
 					'meta' => array(
 							'title' => __('Today', 'event_espresso'),
 							'target' => '',
@@ -1042,13 +1042,13 @@ 
 		}
 
 
-		if ( $this->registry->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month')) {
 			//Events View This Month
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-month',
 					'parent' => 'espresso-toolbar-events-view',
-					'title' => __( 'This Month', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $events_admin_url ),
+					'title' => __('This Month', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $events_admin_url),
 					'meta' => array(
 							'title' => __('This Month', 'event_espresso'),
 							'target' => '',
@@ -1058,11 +1058,11 @@ 
 		}
 
 		//Registration Overview
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Registrations', 'event_espresso' ),
+					'title' => __('Registrations', 'event_espresso'),
 					'href' => $reg_admin_url,
 					'meta' => array(
 							'title' => __('Registrations', 'event_espresso'),
@@ -1073,12 +1073,12 @@ 
 		}
 
 		//Registration Overview Today
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today',
 					'parent' => 'espresso-toolbar-registrations',
-					'title' => __( 'Today', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $reg_admin_url ),
+					'title' => __('Today', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Today', 'event_espresso'),
 							'target' => '',
@@ -1088,14 +1088,14 @@ 
 		}
 
 		//Registration Overview Today Completed
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-approved',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ),
+					'title' => __('Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Approved', 'event_espresso' ),
+							'title' => __('Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1103,14 +1103,14 @@ 
 		}
 
 		//Registration Overview Today Pending\
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-pending',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Pending', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ),
+					'title' => __('Pending', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Pending Payment', 'event_espresso' ),
+							'title' => __('Pending Payment', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1118,14 +1118,14 @@ 
 		}
 
 		//Registration Overview Today Incomplete
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-not-approved',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Not Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ),
+					'title' => __('Not Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Not Approved', 'event_espresso' ),
+							'title' => __('Not Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1133,12 +1133,12 @@ 
 		}
 
 		//Registration Overview Today Incomplete
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-cancelled',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Cancelled', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ),
+					'title' => __('Cancelled', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Cancelled', 'event_espresso'),
 							'target' => '',
@@ -1148,12 +1148,12 @@ 
 		}
 
 		//Registration Overview This Month
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month',
 					'parent' => 'espresso-toolbar-registrations',
-					'title' => __( 'This Month', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $reg_admin_url ),
+					'title' => __('This Month', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $reg_admin_url),
 					'meta' => array(
 							'title' => __('This Month', 'event_espresso'),
 							'target' => '',
@@ -1163,12 +1163,12 @@ 
 		}
 
 		//Registration Overview This Month Approved
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-approved',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ),
+					'title' => __('Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Approved', 'event_espresso'),
 							'target' => '',
@@ -1178,12 +1178,12 @@ 
 		}
 
 		//Registration Overview This Month Pending
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-pending',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Pending', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ),
+					'title' => __('Pending', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Pending', 'event_espresso'),
 							'target' => '',
@@ -1193,14 +1193,14 @@ 
 		}
 
 		//Registration Overview This Month Not Approved
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-not-approved',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Not Approved', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ),
+					'title' => __('Not Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Not Approved', 'event_espresso' ),
+							'title' => __('Not Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1209,12 +1209,12 @@ 
 
 
 		//Registration Overview This Month Cancelled
-		if ( $this->registry->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-cancelled',
 					'parent' => 'espresso-toolbar-registrations-month',
 					'title' => __('Cancelled', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Cancelled', 'event_espresso'),
 							'target' => '',
@@ -1224,11 +1224,11 @@ 
 		}
 
 		//Extensions & Services
-		if ( $this->registry->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_espresso-toolbar-extensions-and-services' ) ) {
+		if ($this->registry->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_espresso-toolbar-extensions-and-services')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-extensions-and-services',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Extensions & Services', 'event_espresso' ),
+					'title' => __('Extensions & Services', 'event_espresso'),
 					'href' => $extensions_admin_url,
 					'meta' => array(
 							'title' => __('Extensions & Services', 'event_espresso'),
@@ -1250,8 +1250,8 @@ 
 	 * @param  array  $exclude_array any existing pages being excluded are in this array.
 	 * @return array
 	 */
-	public function remove_pages_from_wp_list_pages( $exclude_array ) {
-		return  array_merge( $exclude_array, $this->registry->CFG->core->get_critical_pages_array() );
+	public function remove_pages_from_wp_list_pages($exclude_array) {
+		return  array_merge($exclude_array, $this->registry->CFG->core->get_critical_pages_array());
 	}
 
 
@@ -1271,12 +1271,12 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// unlike other systems, EE_System_scripts loading is turned ON by default, but prior to the init hook, can be turned off via: add_filter( 'FHEE_load_EE_System_scripts', '__return_false' );
-		if ( apply_filters( 'FHEE_load_EE_System_scripts', TRUE ) ) {
+		if (apply_filters('FHEE_load_EE_System_scripts', TRUE)) {
 			// jquery_validate loading is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-			if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+			if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 				// register jQuery Validate and additional methods
-				wp_register_script( 'jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery' ), '1.15.0', TRUE );
-				wp_register_script( 'jquery-validate-extra-methods', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.additional-methods.min.js', array( 'jquery', 'jquery-validate' ), '1.15.0', TRUE );
+				wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
+				wp_register_script('jquery-validate-extra-methods', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.additional-methods.min.js', array('jquery', 'jquery-validate'), '1.15.0', TRUE);
 			}
 		}
 	}

core/libraries/form_sections/strategies/display/EE_Select2_Display_Strategy.strategy.php

Spacing +13 added lines, -13 removed lines

@@ -12,7 +12,7 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Select2_Display_Strategy extends EE_Select_Display_Strategy{
+class EE_Select2_Display_Strategy extends EE_Select_Display_Strategy {
 
 	/**
 	 * Arguments that will be passed into the select2 javascript constructor
@@ -25,7 +25,7 @@ 
 	 * @param array $select2_js_args pass in the EXACT array of JS arguments you want
 	 * to pass into the select2 js/html input. See https://select2.github.io
 	 */
-	public function __construct( $select2_js_args = array() ) {
+	public function __construct($select2_js_args = array()) {
 		$this->_select2_js_args = $select2_js_args;
 		parent::__construct();
 	}
@@ -37,12 +37,12 @@ 
 	public function enqueue_js() {
 		// need to first deregister the select2 script in case some other plugin **cough cough Toolset Types cough**
 		// is carelessly registering an older version of Select2 on admin pages that don't even belong to them
-		wp_deregister_script( 'select2' );
-		wp_deregister_style( 'select2' );
-		wp_register_script( 'select2', EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js', array(), '4.0.2', true );
-		wp_register_style( 'select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all' );
-		wp_enqueue_script( 'form_section_select2_init', EE_GLOBAL_ASSETS_URL . 'scripts/form_section_select2_init.js', array( 'select2' ), '1.0.0', true );
-		wp_enqueue_style( 'select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all' );
+		wp_deregister_script('select2');
+		wp_deregister_style('select2');
+		wp_register_script('select2', EE_GLOBAL_ASSETS_URL.'scripts/select2.min.js', array(), '4.0.2', true);
+		wp_register_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
+		wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL.'scripts/form_section_select2_init.js', array('select2'), '1.0.0', true);
+		wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	 * Sets the exact js args which will be passed into the select2 js/html input
 	 * @param array $js_args
 	 */
-	public function set_js_args( $js_args ) {
+	public function set_js_args($js_args) {
 		$this->_select2_js_args = $js_args;
 	}
 
@@ -66,12 +66,12 @@ 
 	 * @param array $other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $other_js_data = array() ) {
-		$other_js_data = parent::get_other_js_data( $other_js_data );
-		if( ! isset( $other_js_data[ 'select2s' ] ) ) {
+	public function get_other_js_data($other_js_data = array()) {
+		$other_js_data = parent::get_other_js_data($other_js_data);
+		if ( ! isset($other_js_data['select2s'])) {
 			$other_js_data['select2s'] = array();
 		}
-		$other_js_data[ 'select2s' ][ $this->_input->html_id() ] = $this->get_js_args();
+		$other_js_data['select2s'][$this->_input->html_id()] = $this->get_js_args();
 		return $other_js_data;
 	}
 }
\ No newline at end of file

core/domain/services/registration/CreateRegistrationService.php

Indentation +86 added lines, -86 removed lines

@@ -7,7 +7,7 @@ 
 use EventEspresso\core\exceptions\UnexpectedEntityException;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -24,97 +24,97 @@ 
 {
 
 
-    /**
-     * @param \EE_Event       $event
-     * @param \EE_Transaction $transaction
-     * @param \EE_Ticket      $ticket
-     * @param \EE_Line_Item   $ticket_line_item
-     * @param                 $reg_count
-     * @param                 $reg_group_size
-     * @return \EE_Registration
-     * @throws \EE_Error
-     * @throws UnexpectedEntityException
-     */
-    public function create(
-        \EE_Event $event,
-        \EE_Transaction $transaction,
-        \EE_Ticket $ticket,
-        \EE_Line_Item $ticket_line_item,
-        $reg_count,
-        $reg_group_size
-    ) {
-        $registrations = $transaction->registrations();
-        $reg_count = $reg_count ? $reg_count : count($registrations) + 1;
-        $reg_url_link = new RegUrlLink($reg_count, $ticket_line_item);
-        $reg_code = new RegCode($reg_url_link, $transaction, $ticket);
-        // generate new EE_Registration
-        $registration = \EE_Registration::new_instance(
-            array(
-                'EVT_ID'          => $event->ID(),
-                'TXN_ID'          => $transaction->ID(),
-                'TKT_ID'          => $ticket->ID(),
-                'STS_ID'          => \EEM_Registration::status_id_incomplete,
-                'REG_final_price' => $this->resolveFinalPrice($transaction, $ticket, $ticket_line_item),
-                'REG_session'     => \EE_Registry::instance()->SSN->id(),
-                'REG_count'       => $reg_count,
-                'REG_group_size'  => $reg_group_size ? $reg_group_size : $this->incrementRegCount($registrations),
-                'REG_url_link'    => $reg_url_link,
-                'REG_code'        => $reg_code,
-            )
-        );
-        if ( ! $registration instanceof \EE_Registration) {
-            throw new UnexpectedEntityException($registration, 'EE_Registration');
-        }
-        $registration->save();
-        $registration->_add_relation_to($event, 'Event', array(), $event->ID());
-        $registration->_add_relation_to($ticket, 'Ticket', array(), $ticket->ID());
-        $transaction->_add_relation_to($registration, 'Registration', array(), $registration->ID());
-        $registration->save();
-        return $registration;
-    }
+	/**
+	 * @param \EE_Event       $event
+	 * @param \EE_Transaction $transaction
+	 * @param \EE_Ticket      $ticket
+	 * @param \EE_Line_Item   $ticket_line_item
+	 * @param                 $reg_count
+	 * @param                 $reg_group_size
+	 * @return \EE_Registration
+	 * @throws \EE_Error
+	 * @throws UnexpectedEntityException
+	 */
+	public function create(
+		\EE_Event $event,
+		\EE_Transaction $transaction,
+		\EE_Ticket $ticket,
+		\EE_Line_Item $ticket_line_item,
+		$reg_count,
+		$reg_group_size
+	) {
+		$registrations = $transaction->registrations();
+		$reg_count = $reg_count ? $reg_count : count($registrations) + 1;
+		$reg_url_link = new RegUrlLink($reg_count, $ticket_line_item);
+		$reg_code = new RegCode($reg_url_link, $transaction, $ticket);
+		// generate new EE_Registration
+		$registration = \EE_Registration::new_instance(
+			array(
+				'EVT_ID'          => $event->ID(),
+				'TXN_ID'          => $transaction->ID(),
+				'TKT_ID'          => $ticket->ID(),
+				'STS_ID'          => \EEM_Registration::status_id_incomplete,
+				'REG_final_price' => $this->resolveFinalPrice($transaction, $ticket, $ticket_line_item),
+				'REG_session'     => \EE_Registry::instance()->SSN->id(),
+				'REG_count'       => $reg_count,
+				'REG_group_size'  => $reg_group_size ? $reg_group_size : $this->incrementRegCount($registrations),
+				'REG_url_link'    => $reg_url_link,
+				'REG_code'        => $reg_code,
+			)
+		);
+		if ( ! $registration instanceof \EE_Registration) {
+			throw new UnexpectedEntityException($registration, 'EE_Registration');
+		}
+		$registration->save();
+		$registration->_add_relation_to($event, 'Event', array(), $event->ID());
+		$registration->_add_relation_to($ticket, 'Ticket', array(), $ticket->ID());
+		$transaction->_add_relation_to($registration, 'Registration', array(), $registration->ID());
+		$registration->save();
+		return $registration;
+	}
 
 
 
-    /**
-     * @param \EE_Transaction $transaction
-     * @param \EE_Ticket      $ticket
-     * @param \EE_Line_Item   $ticket_line_item
-     * @return float
-     */
-    protected function resolveFinalPrice(
-        \EE_Transaction $transaction,
-        \EE_Ticket $ticket,
-        \EE_Line_Item $ticket_line_item
-    ) {
-        $final_price = \EEH_Line_Item::calculate_final_price_for_ticket_line_item(
-            $transaction->total_line_item(),
-            $ticket_line_item
-        );
-        $final_price = $final_price !== null ? $final_price : $ticket->get_ticket_total_with_taxes();
-        return (float)$final_price;
-    }
+	/**
+	 * @param \EE_Transaction $transaction
+	 * @param \EE_Ticket      $ticket
+	 * @param \EE_Line_Item   $ticket_line_item
+	 * @return float
+	 */
+	protected function resolveFinalPrice(
+		\EE_Transaction $transaction,
+		\EE_Ticket $ticket,
+		\EE_Line_Item $ticket_line_item
+	) {
+		$final_price = \EEH_Line_Item::calculate_final_price_for_ticket_line_item(
+			$transaction->total_line_item(),
+			$ticket_line_item
+		);
+		$final_price = $final_price !== null ? $final_price : $ticket->get_ticket_total_with_taxes();
+		return (float)$final_price;
+	}
 
 
 
-    /**
-     * @param  \EE_Registration[] $registrations
-     * @param  boolean            $update_existing_registrations
-     * @return int
-     * @throws \EE_Error
-     */
-    protected function incrementRegCount(array $registrations, $update_existing_registrations = true)
-    {
-        $new_reg_count = count($registrations) + 1;
-        if ($update_existing_registrations) {
-            foreach ($registrations as $registration) {
-                if ($registration instanceof \EE_Registration) {
-                    $registration->set_count($new_reg_count);
-                    $registration->save();
-                }
-            }
-        }
-        return $new_reg_count;
-    }
+	/**
+	 * @param  \EE_Registration[] $registrations
+	 * @param  boolean            $update_existing_registrations
+	 * @return int
+	 * @throws \EE_Error
+	 */
+	protected function incrementRegCount(array $registrations, $update_existing_registrations = true)
+	{
+		$new_reg_count = count($registrations) + 1;
+		if ($update_existing_registrations) {
+			foreach ($registrations as $registration) {
+				if ($registration instanceof \EE_Registration) {
+					$registration->set_count($new_reg_count);
+					$registration->save();
+				}
+			}
+		}
+		return $new_reg_count;
+	}
 
 
 }

modules/single_page_checkout/EED_Single_Page_Checkout.module.php

Indentation +19 added lines, -19 removed lines

@@ -822,12 +822,12 @@ 
 			if ( $registration instanceof EE_Registration ) {
 				// we display all attendee info for the primary registrant
 				if ( $this->checkout->reg_url_link === $registration->reg_url_link()
-				     && $registration->is_primary_registrant()
+					 && $registration->is_primary_registrant()
 				) {
 					$this->checkout->primary_revisit = true;
 					break;
 				} else if ( $this->checkout->revisit
-				            && $this->checkout->reg_url_link !== $registration->reg_url_link()
+							&& $this->checkout->reg_url_link !== $registration->reg_url_link()
 				) {
 					// but hide info if it doesn't belong to you
 					$transaction->clear_cache( 'Registration', $registration->ID() );
@@ -859,23 +859,23 @@ 
 				//do the following for each ticket of this type they selected
 				for ( $x = 1; $x <= $line_item->quantity(); $x++ ) {
 					$att_nmbr++;
-                    /** @var EventEspresso\core\services\commands\registration\CreateRegistrationCommand $CreateRegistrationCommand */
-                    $CreateRegistrationCommand = EE_Registry::instance()
-                        ->create(
-                           'EventEspresso\core\services\commands\registration\CreateRegistrationCommand',
-                           array(
-	                           $transaction,
-	                           $line_item,
-	                           $att_nmbr,
-	                           $this->checkout->total_ticket_count
-                           )
-                        );
-                    // override capabilities for frontend registrations
-                    if ( ! is_admin()) {
-                        $CreateRegistrationCommand->setCapCheck(
-	                        new PublicCapabilities( '', 'create_new_registration' )
-                        );
-                    }
+					/** @var EventEspresso\core\services\commands\registration\CreateRegistrationCommand $CreateRegistrationCommand */
+					$CreateRegistrationCommand = EE_Registry::instance()
+						->create(
+						   'EventEspresso\core\services\commands\registration\CreateRegistrationCommand',
+						   array(
+							   $transaction,
+							   $line_item,
+							   $att_nmbr,
+							   $this->checkout->total_ticket_count
+						   )
+						);
+					// override capabilities for frontend registrations
+					if ( ! is_admin()) {
+						$CreateRegistrationCommand->setCapCheck(
+							new PublicCapabilities( '', 'create_new_registration' )
+						);
+					}
 					$registration = EE_Registry::instance()->BUS->execute( $CreateRegistrationCommand );
 					if ( ! $registration instanceof EE_Registration ) {
 						throw new InvalidEntityException( $registration, 'EE_Registration' );

Doc Comments +2 added lines, -2 removed lines

@@ -690,7 +690,7 @@ 
 	 * _get_transaction_and_cart_for_previous_visit
 	 *
 	 * @access private
-	 * 	@return mixed EE_Transaction|NULL
+	 * 	@return EE_Transaction|null EE_Transaction|NULL
 	 */
 	private function _get_transaction_and_cart_for_previous_visit() {
 		/** @var $TXN_model EEM_Transaction */
@@ -768,7 +768,7 @@ 
 	 * 	generates a new EE_Transaction object and adds it to the $_transaction property.
 	 *
 	 * 	@access private
-	 * 	@return mixed EE_Transaction|NULL
+	 * 	@return EE_Transaction|null EE_Transaction|NULL
 	 */
 	private function _initialize_transaction() {
 		try {

Spacing +261 added lines, -261 removed lines

@@ -1,7 +1,7 @@ 
 <?php use EventEspresso\core\domain\services\capabilities\PublicCapabilities;
 use EventEspresso\core\exceptions\InvalidEntityException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * Single Page Checkout (SPCO)
  *
@@ -50,8 +50,8 @@ 
 	 * @return EED_Single_Page_Checkout
 	 */
 	public static function instance() {
-		add_filter( 'EED_Single_Page_Checkout__SPCO_active', '__return_true' );
-		return parent::get_instance( __CLASS__ );
+		add_filter('EED_Single_Page_Checkout__SPCO_active', '__return_true');
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -96,22 +96,22 @@ 
 	 */
 	public static function set_hooks_admin() {
 		EED_Single_Page_Checkout::set_definitions();
-		if ( defined( 'DOING_AJAX' )) {
+		if (defined('DOING_AJAX')) {
 			// going to start an output buffer in case anything gets accidentally output that might disrupt our JSON response
 			ob_start();
 			EED_Single_Page_Checkout::load_request_handler();
 			EED_Single_Page_Checkout::load_reg_steps();
 		} else {
 			// hook into the top of pre_get_posts to set the reg step routing, which gives other modules or plugins a chance to modify the reg steps, but just before the routes get called
-			add_action( 'pre_get_posts', array( 'EED_Single_Page_Checkout', 'load_reg_steps' ), 1 );
+			add_action('pre_get_posts', array('EED_Single_Page_Checkout', 'load_reg_steps'), 1);
 		}
 		// set ajax hooks
-		add_action( 'wp_ajax_process_reg_step', array( 'EED_Single_Page_Checkout', 'process_reg_step' ));
-		add_action( 'wp_ajax_nopriv_process_reg_step', array( 'EED_Single_Page_Checkout', 'process_reg_step' ));
-		add_action( 'wp_ajax_display_spco_reg_step', array( 'EED_Single_Page_Checkout', 'display_reg_step' ));
-		add_action( 'wp_ajax_nopriv_display_spco_reg_step', array( 'EED_Single_Page_Checkout', 'display_reg_step' ));
-		add_action( 'wp_ajax_update_reg_step', array( 'EED_Single_Page_Checkout', 'update_reg_step' ));
-		add_action( 'wp_ajax_nopriv_update_reg_step', array( 'EED_Single_Page_Checkout', 'update_reg_step' ));
+		add_action('wp_ajax_process_reg_step', array('EED_Single_Page_Checkout', 'process_reg_step'));
+		add_action('wp_ajax_nopriv_process_reg_step', array('EED_Single_Page_Checkout', 'process_reg_step'));
+		add_action('wp_ajax_display_spco_reg_step', array('EED_Single_Page_Checkout', 'display_reg_step'));
+		add_action('wp_ajax_nopriv_display_spco_reg_step', array('EED_Single_Page_Checkout', 'display_reg_step'));
+		add_action('wp_ajax_update_reg_step', array('EED_Single_Page_Checkout', 'update_reg_step'));
+		add_action('wp_ajax_nopriv_update_reg_step', array('EED_Single_Page_Checkout', 'update_reg_step'));
 	}
 
 
@@ -122,8 +122,8 @@ 
 	 * @param string $ajax_action
 	 * @throws \EE_Error
 	 */
-	public static function process_ajax_request( $ajax_action ) {
-		EE_Registry::instance()->REQ->set( 'action', $ajax_action );
+	public static function process_ajax_request($ajax_action) {
+		EE_Registry::instance()->REQ->set('action', $ajax_action);
 		EED_Single_Page_Checkout::instance()->_initialize();
 	}
 
@@ -135,7 +135,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function display_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'display_spco_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('display_spco_reg_step');
 	}
 
 
@@ -146,7 +146,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function process_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'process_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('process_reg_step');
 	}
 
 
@@ -157,7 +157,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function update_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('update_reg_step');
 	}
 
 
@@ -170,7 +170,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function update_checkout() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_checkout' );
+		EED_Single_Page_Checkout::process_ajax_request('update_checkout');
 	}
 
 
@@ -183,8 +183,8 @@ 
 	 */
 	public static function load_request_handler() {
 		// load core Request_Handler class
-		if ( ! isset( EE_Registry::instance()->REQ )) {
-			EE_Registry::instance()->load_core( 'Request_Handler' );
+		if ( ! isset(EE_Registry::instance()->REQ)) {
+			EE_Registry::instance()->load_core('Request_Handler');
 		}
 	}
 
@@ -198,14 +198,14 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function set_definitions() {
-		define( 'SPCO_BASE_PATH', rtrim( str_replace( array( '\\', '/' ), DS, plugin_dir_path( __FILE__ )), DS ) . DS );
-		define( 'SPCO_CSS_URL', plugin_dir_url( __FILE__ ) . 'css' . DS );
-		define( 'SPCO_IMG_URL', plugin_dir_url( __FILE__ ) . 'img' . DS );
-		define( 'SPCO_JS_URL', plugin_dir_url( __FILE__ ) . 'js' . DS );
-		define( 'SPCO_INC_PATH', SPCO_BASE_PATH . 'inc' . DS );
-		define( 'SPCO_REG_STEPS_PATH', SPCO_BASE_PATH . 'reg_steps' . DS );
-		define( 'SPCO_TEMPLATES_PATH', SPCO_BASE_PATH . 'templates' . DS );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( SPCO_BASE_PATH, TRUE );
+		define('SPCO_BASE_PATH', rtrim(str_replace(array('\\', '/'), DS, plugin_dir_path(__FILE__)), DS).DS);
+		define('SPCO_CSS_URL', plugin_dir_url(__FILE__).'css'.DS);
+		define('SPCO_IMG_URL', plugin_dir_url(__FILE__).'img'.DS);
+		define('SPCO_JS_URL', plugin_dir_url(__FILE__).'js'.DS);
+		define('SPCO_INC_PATH', SPCO_BASE_PATH.'inc'.DS);
+		define('SPCO_REG_STEPS_PATH', SPCO_BASE_PATH.'reg_steps'.DS);
+		define('SPCO_TEMPLATES_PATH', SPCO_BASE_PATH.'templates'.DS);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(SPCO_BASE_PATH, TRUE);
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 */
 	public static function load_reg_steps() {
 		static $reg_steps_loaded = FALSE;
-		if ( $reg_steps_loaded ) {
+		if ($reg_steps_loaded) {
 			return;
 		}
 		// filter list of reg_steps
@@ -229,24 +229,24 @@ 
 			EED_Single_Page_Checkout::get_reg_steps()
 		);
 		// sort by key (order)
-		ksort( $reg_steps_to_load );
+		ksort($reg_steps_to_load);
 		// loop through folders
-		foreach ( $reg_steps_to_load as $order => $reg_step ) {
+		foreach ($reg_steps_to_load as $order => $reg_step) {
 			// we need a
-			if ( isset( $reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'] )) {
+			if (isset($reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'])) {
 				// copy over to the reg_steps_array
-				EED_Single_Page_Checkout::$_reg_steps_array[ $order ] = $reg_step;
+				EED_Single_Page_Checkout::$_reg_steps_array[$order] = $reg_step;
 				// register custom key route for each reg step
 				// ie: step=>"slug" - this is the entire reason we load the reg steps array now
-				EE_Config::register_route( $reg_step['slug'], 'EED_Single_Page_Checkout', 'run', 'step' );
+				EE_Config::register_route($reg_step['slug'], 'EED_Single_Page_Checkout', 'run', 'step');
 				// add AJAX or other hooks
-				if ( isset( $reg_step['has_hooks'] ) && $reg_step['has_hooks'] ) {
+				if (isset($reg_step['has_hooks']) && $reg_step['has_hooks']) {
 					// setup autoloaders if necessary
-					if ( ! class_exists( $reg_step['class_name'] )) {
-						EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $reg_step['file_path'], TRUE );
+					if ( ! class_exists($reg_step['class_name'])) {
+						EEH_Autoloader::register_autoloaders_for_each_file_in_folder($reg_step['file_path'], TRUE);
 					}
-					if ( is_callable( $reg_step['class_name'], 'set_hooks' )) {
-						call_user_func( array( $reg_step['class_name'], 'set_hooks' ));
+					if (is_callable($reg_step['class_name'], 'set_hooks')) {
+						call_user_func(array($reg_step['class_name'], 'set_hooks'));
 					}
 				}
 			}
@@ -265,28 +265,28 @@ 
 	 */
 	public static function get_reg_steps() {
 		$reg_steps = EE_Registry::instance()->CFG->registration->reg_steps;
-		if ( empty( $reg_steps )) {
+		if (empty($reg_steps)) {
 			$reg_steps = array(
 				10 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'attendee_information',
+					'file_path' => SPCO_REG_STEPS_PATH.'attendee_information',
 					'class_name' => 'EE_SPCO_Reg_Step_Attendee_Information',
 					'slug' => 'attendee_information',
 					'has_hooks' => FALSE
 				),
 				20 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'registration_confirmation',
+					'file_path' => SPCO_REG_STEPS_PATH.'registration_confirmation',
 					'class_name' => 'EE_SPCO_Reg_Step_Registration_Confirmation',
 					'slug' => 'registration_confirmation',
 					'has_hooks' => FALSE
 				),
 				30 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'payment_options',
+					'file_path' => SPCO_REG_STEPS_PATH.'payment_options',
 					'class_name' => 'EE_SPCO_Reg_Step_Payment_Options',
 					'slug' => 'payment_options',
 					'has_hooks' => TRUE
 				),
 				999 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'finalize_registration',
+					'file_path' => SPCO_REG_STEPS_PATH.'finalize_registration',
 					'class_name' => 'EE_SPCO_Reg_Step_Finalize_Registration',
 					'slug' => 'finalize_registration',
 					'has_hooks' => FALSE
@@ -307,9 +307,9 @@ 
 	 */
 	public static function registration_checkout_for_admin() {
 		EED_Single_Page_Checkout::load_reg_steps();
-		EE_Registry::instance()->REQ->set( 'step', 'attendee_information' );
-		EE_Registry::instance()->REQ->set( 'action', 'display_spco_reg_step' );
-		EE_Registry::instance()->REQ->set( 'process_form_submission', false );
+		EE_Registry::instance()->REQ->set('step', 'attendee_information');
+		EE_Registry::instance()->REQ->set('action', 'display_spco_reg_step');
+		EE_Registry::instance()->REQ->set('process_form_submission', false);
 		EED_Single_Page_Checkout::instance()->_initialize();
 		EED_Single_Page_Checkout::instance()->_display_spco_reg_form();
 		return EE_Registry::instance()->REQ->get_output();
@@ -326,15 +326,15 @@ 
 	 */
 	public static function process_registration_from_admin() {
 		EED_Single_Page_Checkout::load_reg_steps();
-		EE_Registry::instance()->REQ->set( 'step', 'attendee_information' );
-		EE_Registry::instance()->REQ->set( 'action', 'process_reg_step' );
-		EE_Registry::instance()->REQ->set( 'process_form_submission', true );
+		EE_Registry::instance()->REQ->set('step', 'attendee_information');
+		EE_Registry::instance()->REQ->set('action', 'process_reg_step');
+		EE_Registry::instance()->REQ->set('process_form_submission', true);
 		EED_Single_Page_Checkout::instance()->_initialize();
-		if ( EED_Single_Page_Checkout::instance()->checkout->current_step->completed() ) {
-			$final_reg_step = end( EED_Single_Page_Checkout::instance()->checkout->reg_steps );
-			if ( $final_reg_step instanceof EE_SPCO_Reg_Step_Finalize_Registration ) {
-				EED_Single_Page_Checkout::instance()->checkout->set_reg_step_initiated( $final_reg_step );
-				if ( $final_reg_step->process_reg_step() ) {
+		if (EED_Single_Page_Checkout::instance()->checkout->current_step->completed()) {
+			$final_reg_step = end(EED_Single_Page_Checkout::instance()->checkout->reg_steps);
+			if ($final_reg_step instanceof EE_SPCO_Reg_Step_Finalize_Registration) {
+				EED_Single_Page_Checkout::instance()->checkout->set_reg_step_initiated($final_reg_step);
+				if ($final_reg_step->process_reg_step()) {
 					$final_reg_step->set_completed();
 					EED_Single_Page_Checkout::instance()->checkout->update_txn_reg_steps_array();
 					return EED_Single_Page_Checkout::instance()->checkout->transaction;
@@ -354,11 +354,11 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	public function run( $WP_Query ) {
+	public function run($WP_Query) {
 		if (
 			$WP_Query instanceof WP_Query
 			&& $WP_Query->is_main_query()
-			&& apply_filters( 'FHEE__EED_Single_Page_Checkout__run', true )
+			&& apply_filters('FHEE__EED_Single_Page_Checkout__run', true)
 		) {
 			$this->_initialize();
 		}
@@ -374,8 +374,8 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	public static function init( $WP_Query ) {
-		EED_Single_Page_Checkout::instance()->run( $WP_Query );
+	public static function init($WP_Query) {
+		EED_Single_Page_Checkout::instance()->run($WP_Query);
 	}
 
 
@@ -389,34 +389,34 @@ 
 	 */
 	private function _initialize() {
 		// ensure SPCO doesn't run twice
-		if ( EED_Single_Page_Checkout::$_initialized ) {
+		if (EED_Single_Page_Checkout::$_initialized) {
 			return;
 		}
 		try {
 			// setup the EE_Checkout object
 			$this->checkout = $this->_initialize_checkout();
 			// filter checkout
-			$this->checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___initialize__checkout', $this->checkout );
+			$this->checkout = apply_filters('FHEE__EED_Single_Page_Checkout___initialize__checkout', $this->checkout);
 			// get the $_GET
 			$this->_get_request_vars();
 			// filter continue_reg
-			$this->checkout->continue_reg = apply_filters( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', TRUE, $this->checkout );
+			$this->checkout->continue_reg = apply_filters('FHEE__EED_Single_Page_Checkout__init___continue_reg', TRUE, $this->checkout);
 			// load the reg steps array
-			if ( ! $this->_load_and_instantiate_reg_steps() ) {
+			if ( ! $this->_load_and_instantiate_reg_steps()) {
 				EED_Single_Page_Checkout::$_initialized = true;
 				return;
 			}
 			// set the current step
-			$this->checkout->set_current_step( $this->checkout->step );
+			$this->checkout->set_current_step($this->checkout->step);
 			// and the next step
 			$this->checkout->set_next_step();
 			// was there already a valid transaction in the checkout from the session ?
-			if ( ! $this->checkout->transaction instanceof EE_Transaction ) {
+			if ( ! $this->checkout->transaction instanceof EE_Transaction) {
 				// get transaction from db or session
 				$this->checkout->transaction = $this->checkout->reg_url_link && ! is_admin()
 					? $this->_get_transaction_and_cart_for_previous_visit()
 					: $this->_get_cart_for_current_session_and_setup_new_transaction();
-				if ( ! $this->checkout->transaction instanceof EE_Transaction ) {
+				if ( ! $this->checkout->transaction instanceof EE_Transaction) {
 					// add some style and make it dance
 					$this->checkout->transaction = EE_Transaction::new_instance();
 					$this->add_styles_and_scripts();
@@ -424,10 +424,10 @@ 
 					return;
 				}
 				// and the registrations for the transaction
-				$this->_get_registrations( $this->checkout->transaction );
+				$this->_get_registrations($this->checkout->transaction);
 			}
 			// verify that everything has been setup correctly
-			if ( ! $this->_final_verifications() ) {
+			if ( ! $this->_final_verifications()) {
 				EED_Single_Page_Checkout::$_initialized = true;
 				return;
 			}
@@ -452,9 +452,9 @@ 
 			// set no cache headers and constants
 			EE_System::do_not_cache();
 			// add anchor
-			add_action( 'loop_start', array( $this, 'set_checkout_anchor' ), 1 );
-		} catch ( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+			add_action('loop_start', array($this, 'set_checkout_anchor'), 1);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -472,20 +472,20 @@ 
 		// look in session for existing checkout
 		$checkout = EE_Registry::instance()->SSN->checkout();
 		// verify
-		if ( ! $checkout instanceof EE_Checkout ) {
+		if ( ! $checkout instanceof EE_Checkout) {
 			// instantiate EE_Checkout object for handling the properties of the current checkout process
-			$checkout = EE_Registry::instance()->load_file( SPCO_INC_PATH, 'EE_Checkout', 'class', array(), FALSE  );
+			$checkout = EE_Registry::instance()->load_file(SPCO_INC_PATH, 'EE_Checkout', 'class', array(), FALSE);
 		} else {
-			if ( $checkout->current_step->is_final_step() && $checkout->exit_spco() === true )  {
+			if ($checkout->current_step->is_final_step() && $checkout->exit_spco() === true) {
 				$this->unlock_transaction();
-				wp_safe_redirect( $checkout->redirect_url );
+				wp_safe_redirect($checkout->redirect_url);
 				exit();
 			}
 		}
-		$checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___initialize_checkout__checkout', $checkout );
+		$checkout = apply_filters('FHEE__EED_Single_Page_Checkout___initialize_checkout__checkout', $checkout);
 		// verify again
-		if ( ! $checkout instanceof EE_Checkout ) {
-			throw new EE_Error( __( 'The EE_Checkout class could not be loaded.', 'event_espresso' ) );
+		if ( ! $checkout instanceof EE_Checkout) {
+			throw new EE_Error(__('The EE_Checkout class could not be loaded.', 'event_espresso'));
 		}
 		// reset anything that needs a clean slate for each request
 		$checkout->reset_for_current_request();
@@ -505,24 +505,24 @@ 
 		// load classes
 		EED_Single_Page_Checkout::load_request_handler();
 		//make sure this request is marked as belonging to EE
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 		// which step is being requested ?
-		$this->checkout->step = EE_Registry::instance()->REQ->get( 'step', $this->_get_first_step() );
+		$this->checkout->step = EE_Registry::instance()->REQ->get('step', $this->_get_first_step());
 		// which step is being edited ?
-		$this->checkout->edit_step = EE_Registry::instance()->REQ->get( 'edit_step', '' );
+		$this->checkout->edit_step = EE_Registry::instance()->REQ->get('edit_step', '');
 		// and what we're doing on the current step
-		$this->checkout->action = EE_Registry::instance()->REQ->get( 'action', 'display_spco_reg_step' );
+		$this->checkout->action = EE_Registry::instance()->REQ->get('action', 'display_spco_reg_step');
 		// returning to edit ?
-		$this->checkout->reg_url_link = EE_Registry::instance()->REQ->get( 'e_reg_url_link', '' );
+		$this->checkout->reg_url_link = EE_Registry::instance()->REQ->get('e_reg_url_link', '');
 		// or some other kind of revisit ?
-		$this->checkout->revisit = EE_Registry::instance()->REQ->get( 'revisit', FALSE );
+		$this->checkout->revisit = EE_Registry::instance()->REQ->get('revisit', FALSE);
 		// and whether or not to generate a reg form for this request
-		$this->checkout->generate_reg_form = EE_Registry::instance()->REQ->get( 'generate_reg_form', TRUE ); 		// TRUE 	FALSE
+		$this->checkout->generate_reg_form = EE_Registry::instance()->REQ->get('generate_reg_form', TRUE); // TRUE 	FALSE
 		// and whether or not to process a reg form submission for this request
-		$this->checkout->process_form_submission = EE_Registry::instance()->REQ->get( 'process_form_submission', FALSE ); 		// TRUE 	FALSE
+		$this->checkout->process_form_submission = EE_Registry::instance()->REQ->get('process_form_submission', FALSE); // TRUE 	FALSE
 		$this->checkout->process_form_submission = $this->checkout->action !== 'display_spco_reg_step'
 			? $this->checkout->process_form_submission
-			: FALSE; 		// TRUE 	FALSE
+			: FALSE; // TRUE 	FALSE
 		// $this->_display_request_vars();
 	}
 
@@ -535,17 +535,17 @@ 
 	 * @return    void
 	 */
 	protected function _display_request_vars() {
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			return;
 		}
-		EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->step, '$this->checkout->step', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->edit_step, '$this->checkout->edit_step', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->action, '$this->checkout->action', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->reg_url_link, '$this->checkout->reg_url_link', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->revisit, '$this->checkout->revisit', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->generate_reg_form, '$this->checkout->generate_reg_form', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->process_form_submission, '$this->checkout->process_form_submission', __FILE__, __LINE__ );
+		EEH_Debug_Tools::printr($_REQUEST, '$_REQUEST', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->step, '$this->checkout->step', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->edit_step, '$this->checkout->edit_step', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->action, '$this->checkout->action', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->reg_url_link, '$this->checkout->reg_url_link', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->revisit, '$this->checkout->revisit', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->generate_reg_form, '$this->checkout->generate_reg_form', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->process_form_submission, '$this->checkout->process_form_submission', __FILE__, __LINE__);
 	}
 
 
@@ -559,8 +559,8 @@ 
 	 * @return    array
 	 */
 	private function _get_first_step() {
-		$first_step = reset( EED_Single_Page_Checkout::$_reg_steps_array );
-		return isset( $first_step['slug'] ) ? $first_step['slug'] : 'attendee_information';
+		$first_step = reset(EED_Single_Page_Checkout::$_reg_steps_array);
+		return isset($first_step['slug']) ? $first_step['slug'] : 'attendee_information';
 	}
 
 
@@ -576,27 +576,27 @@ 
 	private function _load_and_instantiate_reg_steps() {
 		// have reg_steps already been instantiated ?
 		if (
-			empty( $this->checkout->reg_steps ) ||
-			apply_filters( 'FHEE__Single_Page_Checkout__load_reg_steps__reload_reg_steps', false, $this->checkout )
+			empty($this->checkout->reg_steps) ||
+			apply_filters('FHEE__Single_Page_Checkout__load_reg_steps__reload_reg_steps', false, $this->checkout)
 		) {
 			// if not, then loop through raw reg steps array
-			foreach ( EED_Single_Page_Checkout::$_reg_steps_array as $order => $reg_step ) {
-				if ( ! $this->_load_and_instantiate_reg_step( $reg_step, $order )) {
+			foreach (EED_Single_Page_Checkout::$_reg_steps_array as $order => $reg_step) {
+				if ( ! $this->_load_and_instantiate_reg_step($reg_step, $order)) {
 					return false;
 				}
 			}
 			EE_Registry::instance()->CFG->registration->skip_reg_confirmation = TRUE;
 			EE_Registry::instance()->CFG->registration->reg_confirmation_last = TRUE;
 			// skip the registration_confirmation page ?
-			if ( EE_Registry::instance()->CFG->registration->skip_reg_confirmation ) {
+			if (EE_Registry::instance()->CFG->registration->skip_reg_confirmation) {
 				// just remove it from the reg steps array
-				$this->checkout->remove_reg_step( 'registration_confirmation', false );
+				$this->checkout->remove_reg_step('registration_confirmation', false);
 			} else if (
-				isset( $this->checkout->reg_steps['registration_confirmation'] )
+				isset($this->checkout->reg_steps['registration_confirmation'])
 				&& EE_Registry::instance()->CFG->registration->reg_confirmation_last
 			) {
 				// set the order to something big like 100
-				$this->checkout->set_reg_step_order( 'registration_confirmation', 100 );
+				$this->checkout->set_reg_step_order('registration_confirmation', 100);
 			}
 			// filter the array for good luck
 			$this->checkout->reg_steps = apply_filters(
@@ -606,13 +606,13 @@ 
 			// finally re-sort based on the reg step class order properties
 			$this->checkout->sort_reg_steps();
 		} else {
-			foreach ( $this->checkout->reg_steps as $reg_step ) {
+			foreach ($this->checkout->reg_steps as $reg_step) {
 				// set all current step stati to FALSE
-				$reg_step->set_is_current_step( FALSE );
+				$reg_step->set_is_current_step(FALSE);
 			}
 		}
-		if ( empty( $this->checkout->reg_steps )) {
-			EE_Error::add_error( __( 'No Reg Steps were loaded..', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+		if (empty($this->checkout->reg_steps)) {
+			EE_Error::add_error(__('No Reg Steps were loaded..', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 			// make reg step details available to JS
@@ -630,10 +630,10 @@ 
 	 * @param int   $order
 	 * @return bool
 	 */
-	private function _load_and_instantiate_reg_step( $reg_step = array(), $order = 0 ) {
+	private function _load_and_instantiate_reg_step($reg_step = array(), $order = 0) {
 
 		// we need a file_path, class_name, and slug to add a reg step
-		if ( isset( $reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'] )) {
+		if (isset($reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'])) {
 			// if editing a specific step, but this is NOT that step... (and it's not the 'finalize_registration' step)
 			if (
 				$this->checkout->reg_url_link
@@ -651,26 +651,26 @@ 
 				FALSE
 			);
 			// did we gets the goods ?
-			if ( $reg_step_obj instanceof EE_SPCO_Reg_Step ) {
+			if ($reg_step_obj instanceof EE_SPCO_Reg_Step) {
 				// set reg step order based on config
-				$reg_step_obj->set_order( $order );
+				$reg_step_obj->set_order($order);
 				// add instantiated reg step object to the master reg steps array
-				$this->checkout->add_reg_step( $reg_step_obj );
+				$this->checkout->add_reg_step($reg_step_obj);
 			} else {
 				EE_Error::add_error(
-					__( 'The current step could not be set.', 'event_espresso' ),
+					__('The current step could not be set.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				return false;
 			}
 		} else {
-			if ( WP_DEBUG ) {
+			if (WP_DEBUG) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'A registration step could not be loaded. One or more of the following data points is invalid:%4$s%5$sFile Path: %1$s%6$s%5$sClass Name: %2$s%6$s%5$sSlug: %3$s%6$s%7$s', 'event_espresso' ),
-						isset( $reg_step['file_path'] ) ? $reg_step['file_path'] : '',
-						isset( $reg_step['class_name'] ) ? $reg_step['class_name'] : '',
-						isset( $reg_step['slug'] ) ? $reg_step['slug'] : '',
+						__('A registration step could not be loaded. One or more of the following data points is invalid:%4$s%5$sFile Path: %1$s%6$s%5$sClass Name: %2$s%6$s%5$sSlug: %3$s%6$s%7$s', 'event_espresso'),
+						isset($reg_step['file_path']) ? $reg_step['file_path'] : '',
+						isset($reg_step['class_name']) ? $reg_step['class_name'] : '',
+						isset($reg_step['slug']) ? $reg_step['slug'] : '',
 						'<ul>',
 						'<li>',
 						'</li>',
@@ -694,16 +694,16 @@ 
 	 */
 	private function _get_transaction_and_cart_for_previous_visit() {
 		/** @var $TXN_model EEM_Transaction */
-		$TXN_model = EE_Registry::instance()->load_model( 'Transaction' );
+		$TXN_model = EE_Registry::instance()->load_model('Transaction');
 		// because the reg_url_link is present in the request, this is a return visit to SPCO, so we'll get the transaction data from the db
-		$transaction = $TXN_model->get_transaction_from_reg_url_link( $this->checkout->reg_url_link );
+		$transaction = $TXN_model->get_transaction_from_reg_url_link($this->checkout->reg_url_link);
 		// verify transaction
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			// and get the cart that was used for that transaction
-			$this->checkout->cart = $this->_get_cart_for_transaction( $transaction );
+			$this->checkout->cart = $this->_get_cart_for_transaction($transaction);
 			return $transaction;
 		} else {
-			EE_Error::add_error( __( 'Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 	}
@@ -717,8 +717,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	private function _get_cart_for_transaction( $transaction ) {
-		return $this->checkout->get_cart_for_transaction( $transaction );
+	private function _get_cart_for_transaction($transaction) {
+		return $this->checkout->get_cart_for_transaction($transaction);
 	}
 
 
@@ -730,8 +730,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	public function get_cart_for_transaction( EE_Transaction $transaction ) {
-		return $this->checkout->get_cart_for_transaction( $transaction );
+	public function get_cart_for_transaction(EE_Transaction $transaction) {
+		return $this->checkout->get_cart_for_transaction($transaction);
 	}
 
 
@@ -747,17 +747,17 @@ 
 	private function _get_cart_for_current_session_and_setup_new_transaction() {
 		//  if there's no transaction, then this is the FIRST visit to SPCO
 		// so load up the cart ( passing nothing for the TXN because it doesn't exist yet )
-		$this->checkout->cart = $this->_get_cart_for_transaction( NULL );
+		$this->checkout->cart = $this->_get_cart_for_transaction(NULL);
 		// and then create a new transaction
 		$transaction = $this->_initialize_transaction();
 		// verify transaction
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			// save it so that we have an ID for other objects to use
 			$transaction->save();
 			// and save TXN data to the cart
-			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn( $transaction->ID() );
+			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn($transaction->ID());
 		} else {
-			EE_Error::add_error( __( 'A Valid Transaction could not be initialized.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('A Valid Transaction could not be initialized.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $transaction;
 	}
@@ -785,8 +785,8 @@ 
 					'STS_ID'        => EEM_Transaction::failed_status_code,
 				)
 			);
-		} catch( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return NULL;
 	}
@@ -801,38 +801,38 @@ 
 	 * @return EE_Cart
 	 * @throws \EE_Error
 	 */
-	private function _get_registrations( EE_Transaction $transaction ) {
+	private function _get_registrations(EE_Transaction $transaction) {
 		// first step: grab the registrants  { : o
-		$registrations = $transaction->registrations( $this->checkout->reg_cache_where_params, true );
+		$registrations = $transaction->registrations($this->checkout->reg_cache_where_params, true);
 		// verify registrations have been set
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// if no cached registrations, then check the db
-			$registrations = $transaction->registrations( $this->checkout->reg_cache_where_params, false );
+			$registrations = $transaction->registrations($this->checkout->reg_cache_where_params, false);
 			// still nothing ? well as long as this isn't a revisit
-			if ( empty( $registrations ) && ! $this->checkout->revisit ) {
+			if (empty($registrations) && ! $this->checkout->revisit) {
 				// generate new registrations from scratch
-				$registrations = $this->_initialize_registrations( $transaction );
+				$registrations = $this->_initialize_registrations($transaction);
 			}
 		}
 		// sort by their original registration order
-		usort( $registrations, array( 'EED_Single_Page_Checkout', 'sort_registrations_by_REG_count' ));
+		usort($registrations, array('EED_Single_Page_Checkout', 'sort_registrations_by_REG_count'));
 		// then loop thru the array
-		foreach ( $registrations as $registration ) {
+		foreach ($registrations as $registration) {
 			// verify each registration
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				// we display all attendee info for the primary registrant
-				if ( $this->checkout->reg_url_link === $registration->reg_url_link()
+				if ($this->checkout->reg_url_link === $registration->reg_url_link()
 				     && $registration->is_primary_registrant()
 				) {
 					$this->checkout->primary_revisit = true;
 					break;
-				} else if ( $this->checkout->revisit
+				} else if ($this->checkout->revisit
 				            && $this->checkout->reg_url_link !== $registration->reg_url_link()
 				) {
 					// but hide info if it doesn't belong to you
-					$transaction->clear_cache( 'Registration', $registration->ID() );
+					$transaction->clear_cache('Registration', $registration->ID());
 				}
-				$this->checkout->set_reg_status_updated( $registration->ID(), false );
+				$this->checkout->set_reg_status_updated($registration->ID(), false);
 			}
 		}
 	}
@@ -847,17 +847,17 @@ 
 	 * @return    array
 	 * @throws \EE_Error
 	 */
-	private function _initialize_registrations( EE_Transaction $transaction ) {
+	private function _initialize_registrations(EE_Transaction $transaction) {
 		$att_nmbr = 0;
 		$registrations = array();
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			$this->checkout->total_ticket_count = $this->checkout->cart->all_ticket_quantity_count();
 			// now let's add the cart items to the $transaction
-			foreach ( $this->checkout->cart->get_tickets() as $line_item ) {
+			foreach ($this->checkout->cart->get_tickets() as $line_item) {
 				//do the following for each ticket of this type they selected
-				for ( $x = 1; $x <= $line_item->quantity(); $x++ ) {
+				for ($x = 1; $x <= $line_item->quantity(); $x++) {
 					$att_nmbr++;
                     /** @var EventEspresso\core\services\commands\registration\CreateRegistrationCommand $CreateRegistrationCommand */
                     $CreateRegistrationCommand = EE_Registry::instance()
@@ -873,17 +873,17 @@ 
                     // override capabilities for frontend registrations
                     if ( ! is_admin()) {
                         $CreateRegistrationCommand->setCapCheck(
-	                        new PublicCapabilities( '', 'create_new_registration' )
+	                        new PublicCapabilities('', 'create_new_registration')
                         );
                     }
-					$registration = EE_Registry::instance()->BUS->execute( $CreateRegistrationCommand );
-					if ( ! $registration instanceof EE_Registration ) {
-						throw new InvalidEntityException( $registration, 'EE_Registration' );
+					$registration = EE_Registry::instance()->BUS->execute($CreateRegistrationCommand);
+					if ( ! $registration instanceof EE_Registration) {
+						throw new InvalidEntityException($registration, 'EE_Registration');
 					}
-					$registrations[ $registration->ID() ] = $registration;
+					$registrations[$registration->ID()] = $registration;
 				}
 			}
-			$registration_processor->fix_reg_final_price_rounding_issue( $transaction );
+			$registration_processor->fix_reg_final_price_rounding_issue($transaction);
 		}
 		return $registrations;
 	}
@@ -898,12 +898,12 @@ 
 	 * @param EE_Registration $reg_B
 	 * @return int
 	 */
-	public static function sort_registrations_by_REG_count( EE_Registration $reg_A, EE_Registration $reg_B ) {
+	public static function sort_registrations_by_REG_count(EE_Registration $reg_A, EE_Registration $reg_B) {
 		// this shouldn't ever happen within the same TXN, but oh well
-		if ( $reg_A->count() === $reg_B->count() ) {
+		if ($reg_A->count() === $reg_B->count()) {
 			return 0;
 		}
-		return ( $reg_A->count() > $reg_B->count() ) ? 1 : -1;
+		return ($reg_A->count() > $reg_B->count()) ? 1 : -1;
 	}
 
 
@@ -918,21 +918,21 @@ 
 	 */
 	private function _final_verifications() {
 		// filter checkout
-		$this->checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___final_verifications__checkout', $this->checkout );
+		$this->checkout = apply_filters('FHEE__EED_Single_Page_Checkout___final_verifications__checkout', $this->checkout);
 		//verify that current step is still set correctly
-		if ( ! $this->checkout->current_step instanceof EE_SPCO_Reg_Step ) {
-			EE_Error::add_error( __( 'We\'re sorry but the registration process can not proceed because one or more registration steps were not setup correctly. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->checkout->current_step instanceof EE_SPCO_Reg_Step) {
+			EE_Error::add_error(__('We\'re sorry but the registration process can not proceed because one or more registration steps were not setup correctly. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// if returning to SPCO, then verify that primary registrant is set
-		if ( ! empty( $this->checkout->reg_url_link )) {
+		if ( ! empty($this->checkout->reg_url_link)) {
 			$valid_registrant = $this->checkout->transaction->primary_registration();
-			if ( ! $valid_registrant instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'We\'re sorry but there appears to be an error with the "reg_url_link" or the primary registrant for this transaction. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! $valid_registrant instanceof EE_Registration) {
+				EE_Error::add_error(__('We\'re sorry but there appears to be an error with the "reg_url_link" or the primary registrant for this transaction. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 			$valid_registrant = null;
-			foreach ( $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ) as $registration ) {
+			foreach ($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params) as $registration) {
 				if (
 					$registration instanceof EE_Registration
 					&& $registration->reg_url_link() === $this->checkout->reg_url_link
@@ -940,9 +940,9 @@ 
 					$valid_registrant = $registration;
 				}
 			}
-			if ( ! $valid_registrant instanceof EE_Registration ) {
+			if ( ! $valid_registrant instanceof EE_Registration) {
 				// hmmm... maybe we have the wrong session because the user is opening multiple tabs ?
-				if ( EED_Single_Page_Checkout::$_checkout_verified ) {
+				if (EED_Single_Page_Checkout::$_checkout_verified) {
 					// clear the session, mark the checkout as unverified, and try again
 					EE_Registry::instance()->SSN->clear_session();
 					EED_Single_Page_Checkout::$_initialized = false;
@@ -951,13 +951,13 @@ 
 					EE_Error::reset_notices();
 					return false;
 				}
-				EE_Error::add_error( __( 'We\'re sorry but there appears to be an error with the "reg_url_link" or the transaction itself. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('We\'re sorry but there appears to be an error with the "reg_url_link" or the transaction itself. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
 		// now that things have been kinda sufficiently verified,
 		// let's add the checkout to the session so that's available other systems
-		EE_Registry::instance()->SSN->set_checkout( $this->checkout );
+		EE_Registry::instance()->SSN->set_checkout($this->checkout);
 		return true;
 	}
 
@@ -972,15 +972,15 @@ 
 	 * @param bool $reinitializing
 	 * @throws \EE_Error
 	 */
-	private function _initialize_reg_steps( $reinitializing = false ) {
-		$this->checkout->set_reg_step_initiated( $this->checkout->current_step );
+	private function _initialize_reg_steps($reinitializing = false) {
+		$this->checkout->set_reg_step_initiated($this->checkout->current_step);
 		// loop thru all steps to call their individual "initialize" methods and set i18n strings for JS
-		foreach ( $this->checkout->reg_steps as $reg_step ) {
-			if ( ! $reg_step->initialize_reg_step() ) {
+		foreach ($this->checkout->reg_steps as $reg_step) {
+			if ( ! $reg_step->initialize_reg_step()) {
 				// if not initialized then maybe this step is being removed...
-				if ( ! $reinitializing && $reg_step->is_current_step() ) {
+				if ( ! $reinitializing && $reg_step->is_current_step()) {
 					// if it was the current step, then we need to start over here
-					$this->_initialize_reg_steps( true );
+					$this->_initialize_reg_steps(true);
 					return;
 				}
 				continue;
@@ -989,13 +989,13 @@ 
 			$reg_step->enqueue_styles_and_scripts();
 			// i18n
 			$reg_step->translate_js_strings();
-			if ( $reg_step->is_current_step() ) {
+			if ($reg_step->is_current_step()) {
 				// the text that appears on the reg step form submit button
 				$reg_step->set_submit_button_text();
 			}
 		}
 		// dynamically creates hook point like: AHEE__Single_Page_Checkout___initialize_reg_step__attendee_information
-		do_action( "AHEE__Single_Page_Checkout___initialize_reg_step__{$this->checkout->current_step->slug()}", $this->checkout->current_step );
+		do_action("AHEE__Single_Page_Checkout___initialize_reg_step__{$this->checkout->current_step->slug()}", $this->checkout->current_step);
 	}
 
 
@@ -1008,43 +1008,43 @@ 
 	 */
 	private function _check_form_submission() {
 		//does this request require the reg form to be generated ?
-		if ( $this->checkout->generate_reg_form ) {
+		if ($this->checkout->generate_reg_form) {
 			// ever heard that song by Blue Rodeo ?
 			try {
 				$this->checkout->current_step->reg_form = $this->checkout->current_step->generate_reg_form();
 				// if not displaying a form, then check for form submission
-				if ( $this->checkout->process_form_submission && $this->checkout->current_step->reg_form->was_submitted() ) {
+				if ($this->checkout->process_form_submission && $this->checkout->current_step->reg_form->was_submitted()) {
 					// clear out any old data in case this step is being run again
-					$this->checkout->current_step->set_valid_data( array() );
+					$this->checkout->current_step->set_valid_data(array());
 					// capture submitted form data
 					$this->checkout->current_step->reg_form->receive_form_submission(
-						apply_filters( 'FHEE__Single_Page_Checkout___check_form_submission__request_params', EE_Registry::instance()->REQ->params(), $this->checkout )
+						apply_filters('FHEE__Single_Page_Checkout___check_form_submission__request_params', EE_Registry::instance()->REQ->params(), $this->checkout)
 					);
 					// validate submitted form data
-					if ( ! $this->checkout->continue_reg && ! $this->checkout->current_step->reg_form->is_valid() ) {
+					if ( ! $this->checkout->continue_reg && ! $this->checkout->current_step->reg_form->is_valid()) {
 						// thou shall not pass !!!
 						$this->checkout->continue_reg = FALSE;
 						// any form validation errors?
-						if ( $this->checkout->current_step->reg_form->submission_error_message() !== '' ) {
+						if ($this->checkout->current_step->reg_form->submission_error_message() !== '') {
 							$submission_error_messages = array();
 							// bad, bad, bad registrant
-							foreach( $this->checkout->current_step->reg_form->get_validation_errors_accumulated() as $validation_error ){
-								if ( $validation_error instanceof EE_Validation_Error ) {
+							foreach ($this->checkout->current_step->reg_form->get_validation_errors_accumulated() as $validation_error) {
+								if ($validation_error instanceof EE_Validation_Error) {
 									$submission_error_messages[] = sprintf(
-										__( '%s : %s', 'event_espresso' ),
+										__('%s : %s', 'event_espresso'),
 										$validation_error->get_form_section()->html_label_text(),
 										$validation_error->getMessage()
 									);
 								}
 							}
-							EE_Error::add_error( implode( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ );
+							EE_Error::add_error(implode('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__);
 						}
 						// well not really... what will happen is we'll just get redirected back to redo the current step
 						$this->go_to_next_step();
 						return;
 					}
 				}
-			} catch( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
@@ -1061,22 +1061,22 @@ 
 	 */
 	private function _process_form_action() {
 		// what cha wanna do?
-		switch( $this->checkout->action ) {
+		switch ($this->checkout->action) {
 			// AJAX next step reg form
 			case 'display_spco_reg_step' :
 				$this->checkout->redirect = FALSE;
-				if ( EE_Registry::instance()->REQ->ajax ) {
-					$this->checkout->json_response->set_reg_step_html( $this->checkout->current_step->display_reg_form() );
+				if (EE_Registry::instance()->REQ->ajax) {
+					$this->checkout->json_response->set_reg_step_html($this->checkout->current_step->display_reg_form());
 				}
 				break;
 
 			default :
 				// meh... do one of those other steps first
-				if ( ! empty( $this->checkout->action ) && is_callable( array( $this->checkout->current_step, $this->checkout->action ))) {
+				if ( ! empty($this->checkout->action) && is_callable(array($this->checkout->current_step, $this->checkout->action))) {
 					// dynamically creates hook point like: AHEE__Single_Page_Checkout__before_attendee_information__process_reg_step
-					do_action( "AHEE__Single_Page_Checkout__before_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step );
+					do_action("AHEE__Single_Page_Checkout__before_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step);
 					// call action on current step
-					if ( call_user_func( array( $this->checkout->current_step, $this->checkout->action )) ) {
+					if (call_user_func(array($this->checkout->current_step, $this->checkout->action))) {
 						// good registrant, you get to proceed
 						if (
 							$this->checkout->current_step->success_message() !== ''
@@ -1087,7 +1087,7 @@ 
 						) {
 								EE_Error::add_success(
 									$this->checkout->current_step->success_message()
-									. '<br />' . $this->checkout->next_step->_instructions()
+									. '<br />'.$this->checkout->next_step->_instructions()
 								);
 
 						}
@@ -1095,12 +1095,12 @@ 
 						$this->_setup_redirect();
 					}
 					// dynamically creates hook point like: AHEE__Single_Page_Checkout__after_payment_options__process_reg_step
-					do_action( "AHEE__Single_Page_Checkout__after_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step );
+					do_action("AHEE__Single_Page_Checkout__after_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step);
 
 				} else {
 					EE_Error::add_error(
 						sprintf(
-							__( 'The requested form action "%s" does not exist for the current "%s" registration step.', 'event_espresso' ),
+							__('The requested form action "%s" does not exist for the current "%s" registration step.', 'event_espresso'),
 							$this->checkout->action,
 							$this->checkout->current_step->name()
 						),
@@ -1126,10 +1126,10 @@ 
 	public function add_styles_and_scripts() {
 		// i18n
 		$this->translate_js_strings();
-		if ( $this->checkout->admin_request ) {
-			add_action('admin_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10 );
+		if ($this->checkout->admin_request) {
+			add_action('admin_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10);
 		} else {
-			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles_and_scripts' ), 10 );
+			add_action('wp_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10);
 		}
 	}
 
@@ -1145,42 +1145,42 @@ 
 		EE_Registry::$i18n_js_strings['revisit'] = $this->checkout->revisit;
 		EE_Registry::$i18n_js_strings['e_reg_url_link'] = $this->checkout->reg_url_link;
 		EE_Registry::$i18n_js_strings['server_error'] = __('An unknown error occurred on the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['invalid_json_response'] = __( 'An invalid response was returned from the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['validation_error'] = __( 'There appears to be a problem with the form validation configuration! Please check the admin settings or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __( 'There appears to be a problem with the payment method configuration! Please refresh the page and try again or contact support.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['invalid_json_response'] = __('An invalid response was returned from the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['validation_error'] = __('There appears to be a problem with the form validation configuration! Please check the admin settings or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __('There appears to be a problem with the payment method configuration! Please refresh the page and try again or contact support.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['reg_step_error'] = __('This registration step could not be completed. Please refresh the page and try again.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['invalid_coupon'] = __('We\'re sorry but that coupon code does not appear to be valid. If this is incorrect, please contact the site administrator.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['process_registration'] = sprintf( __( 'Please wait while we process your registration.%sDo not refresh the page or navigate away while this is happening.%sThank you for your patience.', 'event_espresso' ), '<br/>', '<br/>' );
-		EE_Registry::$i18n_js_strings['language'] = get_bloginfo( 'language' );
+		EE_Registry::$i18n_js_strings['process_registration'] = sprintf(__('Please wait while we process your registration.%sDo not refresh the page or navigate away while this is happening.%sThank you for your patience.', 'event_espresso'), '<br/>', '<br/>');
+		EE_Registry::$i18n_js_strings['language'] = get_bloginfo('language');
 		EE_Registry::$i18n_js_strings['EESID'] = EE_Registry::instance()->SSN->id();
 		EE_Registry::$i18n_js_strings['currency'] = EE_Registry::instance()->CFG->currency;
 		EE_Registry::$i18n_js_strings['datepicker_yearRange'] = '-150:+20';
-		EE_Registry::$i18n_js_strings['timer_years'] = __( 'years', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_months'] = __( 'months', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_weeks'] = __( 'weeks', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_days'] = __( 'days', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_hours'] = __( 'hours', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_minutes'] = __( 'minutes', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_seconds'] = __( 'seconds', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_year'] = __( 'year', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_month'] = __( 'month', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_week'] = __( 'week', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_day'] = __( 'day', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_hour'] = __( 'hour', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_minute'] = __( 'minute', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_second'] = __( 'second', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['timer_years'] = __('years', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_months'] = __('months', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_weeks'] = __('weeks', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_days'] = __('days', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_hours'] = __('hours', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_minutes'] = __('minutes', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_seconds'] = __('seconds', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_year'] = __('year', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_month'] = __('month', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_week'] = __('week', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_day'] = __('day', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_hour'] = __('hour', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_minute'] = __('minute', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_second'] = __('second', 'event_espresso');
 		EE_Registry::$i18n_js_strings['registration_expiration_notice'] = sprintf(
-			__( '%1$sWe\'re sorry, but your registration time has expired.%2$s%3$s%4$sIf you still wish to complete your registration, please return to the %5$sEvent List%6$sEvent List%7$s and reselect your tickets if available. Please except our apologies for any inconvenience this may have caused.%8$s', 'event_espresso' ),
+			__('%1$sWe\'re sorry, but your registration time has expired.%2$s%3$s%4$sIf you still wish to complete your registration, please return to the %5$sEvent List%6$sEvent List%7$s and reselect your tickets if available. Please except our apologies for any inconvenience this may have caused.%8$s', 'event_espresso'),
 			'<h4 class="important-notice">',
 			'</h4>',
 			'<br />',
 			'<p>',
-			'<a href="'. get_post_type_archive_link( 'espresso_events' ) . '" title="',
+			'<a href="'.get_post_type_archive_link('espresso_events').'" title="',
 			'">',
 			'</a>',
 			'</p>'
 		);
-		EE_Registry::$i18n_js_strings[ 'ajax_submit' ] = apply_filters( 'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit', true );
+		EE_Registry::$i18n_js_strings['ajax_submit'] = apply_filters('FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit', true);
 	}
 
 
@@ -1193,25 +1193,25 @@ 
 	 */
 	public function enqueue_styles_and_scripts() {
 		// load css
-		wp_register_style( 'single_page_checkout', SPCO_CSS_URL . 'single_page_checkout.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'single_page_checkout' );
+		wp_register_style('single_page_checkout', SPCO_CSS_URL.'single_page_checkout.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('single_page_checkout');
 		// load JS
-		wp_register_script( 'jquery_plugin', EE_THIRD_PARTY_URL . 'jquery	.plugin.min.js', array( 'jquery' ), '1.0.1', TRUE );
-		wp_register_script( 'jquery_countdown', EE_THIRD_PARTY_URL . 'jquery	.countdown.min.js', array( 'jquery_plugin' ), '2.0.2', TRUE );
-		wp_register_script( 'single_page_checkout', SPCO_JS_URL . 'single_page_checkout.js', array( 'espresso_core', 'underscore', 'ee_form_section_validation', 'jquery_countdown' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'single_page_checkout' );
+		wp_register_script('jquery_plugin', EE_THIRD_PARTY_URL.'jquery	.plugin.min.js', array('jquery'), '1.0.1', TRUE);
+		wp_register_script('jquery_countdown', EE_THIRD_PARTY_URL.'jquery	.countdown.min.js', array('jquery_plugin'), '2.0.2', TRUE);
+		wp_register_script('single_page_checkout', SPCO_JS_URL.'single_page_checkout.js', array('espresso_core', 'underscore', 'ee_form_section_validation', 'jquery_countdown'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('single_page_checkout');
 
 		/**
 		 * global action hook for enqueueing styles and scripts with
 		 * spco calls.
 		 */
-		do_action( 'AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts', $this );
+		do_action('AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts', $this);
 
 		/**
 		 * dynamic action hook for enqueueing styles and scripts with spco calls.
 		 * The hook will end up being something like AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__attendee_information
 		 */
-		do_action( 'AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__' . $this->checkout->current_step->slug(), $this );
+		do_action('AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__'.$this->checkout->current_step->slug(), $this);
 
 	}
 
@@ -1226,19 +1226,19 @@ 
 	 */
 	private function _display_spco_reg_form() {
 		// if registering via the admin, just display the reg form for the current step
-		if ( $this->checkout->admin_request ) {
-			EE_Registry::instance()->REQ->add_output( $this->checkout->current_step->display_reg_form() );
+		if ($this->checkout->admin_request) {
+			EE_Registry::instance()->REQ->add_output($this->checkout->current_step->display_reg_form());
 		} else {
 			// add powered by EE msg
-			add_action( 'AHEE__SPCO__reg_form_footer', array( 'EED_Single_Page_Checkout', 'display_registration_footer' ));
+			add_action('AHEE__SPCO__reg_form_footer', array('EED_Single_Page_Checkout', 'display_registration_footer'));
 
-			$empty_cart = count( $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ) ) < 1 ? true : false;
+			$empty_cart = count($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params)) < 1 ? true : false;
 			$cookies_not_set_msg = '';
-			if ( $empty_cart && ! isset( $_COOKIE[ 'ee_cookie_test' ] ) ) {
+			if ($empty_cart && ! isset($_COOKIE['ee_cookie_test'])) {
 				$cookies_not_set_msg = apply_filters(
 					'FHEE__Single_Page_Checkout__display_spco_reg_form__cookies_not_set_msg',
 					sprintf(
-						__( '%1$s%3$sIt appears your browser is not currently set to accept Cookies%4$s%5$sIn order to register for events, you need to enable cookies.%7$sIf you require assistance, then click the following link to learn how to %8$senable cookies%9$s%6$s%2$s', 'event_espresso' ),
+						__('%1$s%3$sIt appears your browser is not currently set to accept Cookies%4$s%5$sIn order to register for events, you need to enable cookies.%7$sIf you require assistance, then click the following link to learn how to %8$senable cookies%9$s%6$s%2$s', 'event_espresso'),
 						'<div class="ee-attention">',
 						'</div>',
 						'<h6 class="important-notice">',
@@ -1258,7 +1258,7 @@ 
 					'layout_strategy' =>
 						new EE_Template_Layout(
 							array(
-								'layout_template_file' 			=> SPCO_TEMPLATES_PATH . 'registration_page_wrapper.template.php',
+								'layout_template_file' 			=> SPCO_TEMPLATES_PATH.'registration_page_wrapper.template.php',
 								'template_args' => array(
 									'empty_cart' 		=> $empty_cart,
 									'revisit' 				=> $this->checkout->revisit,
@@ -1267,8 +1267,8 @@ 
 									'empty_msg' 		=> apply_filters(
 										'FHEE__Single_Page_Checkout__display_spco_reg_form__empty_msg',
 										sprintf(
-											__( 'You need to %1$sReturn to Events list%2$sselect at least one event%3$s before you can proceed with the registration process.', 'event_espresso' ),
-											'<a href="' . get_post_type_archive_link( 'espresso_events' ) . '" title="',
+											__('You need to %1$sReturn to Events list%2$sselect at least one event%3$s before you can proceed with the registration process.', 'event_espresso'),
+											'<a href="'.get_post_type_archive_link('espresso_events').'" title="',
 											'">',
 											'</a>'
 										)
@@ -1276,14 +1276,14 @@ 
 									'cookies_not_set_msg' 		=> $cookies_not_set_msg,
 									'registration_time_limit' 	=> $this->checkout->get_registration_time_limit(),
 									'session_expiration' 			=>
-										gmdate( 'M d, Y H:i:s', EE_Registry::instance()->SSN->expiration() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) )
+										gmdate('M d, Y H:i:s', EE_Registry::instance()->SSN->expiration() + (get_option('gmt_offset') * HOUR_IN_SECONDS))
 							)
 						)
 					)
 				)
 			);
 			// load template and add to output sent that gets filtered into the_content()
-			EE_Registry::instance()->REQ->add_output( $this->checkout->registration_form->get_html_and_js() );
+			EE_Registry::instance()->REQ->add_output($this->checkout->registration_form->get_html_and_js());
 		}
 	}
 
@@ -1297,8 +1297,8 @@ 
 	 * @internal  param string $label
 	 * @return        string
 	 */
-	public function add_extra_finalize_registration_inputs( $next_step ) {
-		if ( $next_step === 'finalize_registration' ) {
+	public function add_extra_finalize_registration_inputs($next_step) {
+		if ($next_step === 'finalize_registration') {
 			echo '<div id="spco-extra-finalize_registration-inputs-dv"></div>';
 		}
 	}
@@ -1320,13 +1320,13 @@ 
 		) {
 			add_filter(
 				'FHEE__EEH_Template__powered_by_event_espresso__url',
-				function( $url) {
-					return apply_filters( 'FHEE__EE_Front_Controller__registration_footer__url', $url );
+				function($url) {
+					return apply_filters('FHEE__EE_Front_Controller__registration_footer__url', $url);
 				}
 			);
 			echo apply_filters(
 				'FHEE__EE_Front_Controller__display_registration_footer',
-				\EEH_Template::powered_by_event_espresso( '', 'espresso-registration-footer-dv' )
+				\EEH_Template::powered_by_event_espresso('', 'espresso-registration-footer-dv')
 			);
 		}
 		return '';
@@ -1342,7 +1342,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public function unlock_transaction() {
-		if ( $this->checkout->transaction instanceof EE_Transaction ) {
+		if ($this->checkout->transaction instanceof EE_Transaction) {
 			$this->checkout->transaction->unlock();
 		}
 	}
@@ -1357,12 +1357,12 @@ 
 	 * @return 	array
 	 */
 	private function _setup_redirect() {
-		if ( $this->checkout->continue_reg && $this->checkout->next_step instanceof EE_SPCO_Reg_Step ) {
+		if ($this->checkout->continue_reg && $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
 			$this->checkout->redirect = TRUE;
-			if ( empty( $this->checkout->redirect_url )) {
+			if (empty($this->checkout->redirect_url)) {
 				$this->checkout->redirect_url = $this->checkout->next_step->reg_step_url();
 			}
-			$this->checkout->redirect_url = apply_filters( 'FHEE__EED_Single_Page_Checkout___setup_redirect__checkout_redirect_url', $this->checkout->redirect_url, $this->checkout );
+			$this->checkout->redirect_url = apply_filters('FHEE__EED_Single_Page_Checkout___setup_redirect__checkout_redirect_url', $this->checkout->redirect_url, $this->checkout);
 		}
 	}
 
@@ -1376,9 +1376,9 @@ 
 	 * @throws \EE_Error
 	 */
 	public function go_to_next_step() {
-		if ( EE_Registry::instance()->REQ->ajax ) {
+		if (EE_Registry::instance()->REQ->ajax) {
 			// capture contents of output buffer we started earlier in the request, and insert into JSON response
-			$this->checkout->json_response->set_unexpected_errors( ob_get_clean() );
+			$this->checkout->json_response->set_unexpected_errors(ob_get_clean());
 		}
 		$this->unlock_transaction();
 		// just return for these conditions
@@ -1407,7 +1407,7 @@ 
 	 */
 	protected function _handle_json_response() {
 		// if this is an ajax request
-		if ( EE_Registry::instance()->REQ->ajax ) {
+		if (EE_Registry::instance()->REQ->ajax) {
 			// DEBUG LOG
 			//$this->checkout->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -1420,7 +1420,7 @@ 
 			$this->checkout->json_response->set_registration_time_limit(
 				$this->checkout->get_registration_time_limit()
 			);
-			$this->checkout->json_response->set_payment_amount( $this->checkout->amount_owing );
+			$this->checkout->json_response->set_payment_amount($this->checkout->amount_owing);
 			// just send the ajax (
 			$json_response = apply_filters(
 				'FHEE__EE_Single_Page_Checkout__JSON_response',
@@ -1441,9 +1441,9 @@ 
 	 */
 	protected function _handle_html_redirects() {
 		// going somewhere ?
-		if ( $this->checkout->redirect && ! empty( $this->checkout->redirect_url ) ) {
+		if ($this->checkout->redirect && ! empty($this->checkout->redirect_url)) {
 			// store notices in a transient
-			EE_Error::get_notices( false, true, true );
+			EE_Error::get_notices(false, true, true);
 			// DEBUG LOG
 			//$this->checkout->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -1453,7 +1453,7 @@ 
 			//		'headers_list'    => headers_list(),
 			//	)
 			//);
-			wp_safe_redirect( $this->checkout->redirect_url );
+			wp_safe_redirect($this->checkout->redirect_url);
 			exit();
 		}
 	}

core/db_models/EEM_Line_Item.model.php

Spacing +59 added lines, -59 removed lines

@@ -105,41 +105,41 @@ 
 	 * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 * @return \EEM_Line_Item
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Line Item','event_espresso');
-		$this->plural_item = __('Line Items','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Line Item', 'event_espresso');
+		$this->plural_item = __('Line Items', 'event_espresso');
 
 		$this->_tables = array(
-			'Line_Item'=>new EE_Primary_Table('esp_line_item','LIN_ID')
+			'Line_Item'=>new EE_Primary_Table('esp_line_item', 'LIN_ID')
 		);
-		$line_items_can_be_for = apply_filters( 'FHEE__EEM_Line_Item__line_items_can_be_for', array('Ticket','Price', 'Event' ) );
+		$line_items_can_be_for = apply_filters('FHEE__EEM_Line_Item__line_items_can_be_for', array('Ticket', 'Price', 'Event'));
 		$this->_fields = array(
 			'Line_Item' => array(
-				'LIN_ID' 				=> new EE_Primary_Key_Int_Field( 'LIN_ID', __( "ID", "event_espresso" ) ),
-				'LIN_code' 			=> new EE_Slug_Field( 'LIN_code', __( "Code for index into Cart", "event_espresso" ), TRUE ),
-				'TXN_ID' 				=> new EE_Foreign_Key_Int_Field( 'TXN_ID', __( "Transaction ID", "event_espresso" ), TRUE, NULL, 'Transaction' ),
-				'LIN_name' 			=> new EE_Full_HTML_Field( 'LIN_name', __( "Line Item Name", "event_espresso" ), FALSE, '' ),
-				'LIN_desc' 			=> new EE_Full_HTML_Field( 'LIN_desc', __( "Line Item Description", "event_espresso" ), TRUE ),
-				'LIN_unit_price' 	=> new EE_Money_Field( 'LIN_unit_price', __( "Unit Price", "event_espresso" ), FALSE, 0 ),
-				'LIN_percent' 		=> new EE_Float_Field( 'LIN_percent', __( "Percent", "event_espresso" ), FALSE, 0 ),
-				'LIN_is_taxable' 	=> new EE_Boolean_Field( 'LIN_is_taxable', __( "Taxable", "event_espresso" ), FALSE, FALSE ),
-				'LIN_order' 			=> new EE_Integer_Field( 'LIN_order', __( "Order of Application towards total of parent", "event_espresso" ), FALSE, 1 ),
-				'LIN_total' 			=> new EE_Money_Field( 'LIN_total', __( "Total (unit price x quantity)", "event_espresso" ), FALSE, 0 ),
-				'LIN_quantity' 	=> new EE_Integer_Field( 'LIN_quantity', __( "Quantity", "event_espresso" ), TRUE, 1 ),
-				'LIN_parent' 		=> new EE_Integer_Field( 'LIN_parent', __( "Parent ID (this item goes towards that Line Item's total)", "event_espresso" ), TRUE, NULL ),
-				'LIN_type' 			=> new EE_Enum_Text_Field( 'LIN_type', __( "Type", "event_espresso" ), FALSE, 'line-item', array(
+				'LIN_ID' 				=> new EE_Primary_Key_Int_Field('LIN_ID', __("ID", "event_espresso")),
+				'LIN_code' 			=> new EE_Slug_Field('LIN_code', __("Code for index into Cart", "event_espresso"), TRUE),
+				'TXN_ID' 				=> new EE_Foreign_Key_Int_Field('TXN_ID', __("Transaction ID", "event_espresso"), TRUE, NULL, 'Transaction'),
+				'LIN_name' 			=> new EE_Full_HTML_Field('LIN_name', __("Line Item Name", "event_espresso"), FALSE, ''),
+				'LIN_desc' 			=> new EE_Full_HTML_Field('LIN_desc', __("Line Item Description", "event_espresso"), TRUE),
+				'LIN_unit_price' 	=> new EE_Money_Field('LIN_unit_price', __("Unit Price", "event_espresso"), FALSE, 0),
+				'LIN_percent' 		=> new EE_Float_Field('LIN_percent', __("Percent", "event_espresso"), FALSE, 0),
+				'LIN_is_taxable' 	=> new EE_Boolean_Field('LIN_is_taxable', __("Taxable", "event_espresso"), FALSE, FALSE),
+				'LIN_order' 			=> new EE_Integer_Field('LIN_order', __("Order of Application towards total of parent", "event_espresso"), FALSE, 1),
+				'LIN_total' 			=> new EE_Money_Field('LIN_total', __("Total (unit price x quantity)", "event_espresso"), FALSE, 0),
+				'LIN_quantity' 	=> new EE_Integer_Field('LIN_quantity', __("Quantity", "event_espresso"), TRUE, 1),
+				'LIN_parent' 		=> new EE_Integer_Field('LIN_parent', __("Parent ID (this item goes towards that Line Item's total)", "event_espresso"), TRUE, NULL),
+				'LIN_type' 			=> new EE_Enum_Text_Field('LIN_type', __("Type", "event_espresso"), FALSE, 'line-item', array(
 						self::type_line_item		=>  __("Line Item", "event_espresso"),
 						self::type_sub_line_item	=>  __("Sub-Item", "event_espresso"),
 						self::type_sub_total		=>  __("Subtotal", "event_espresso"),
 						self::type_tax_sub_total 	=> __("Tax Subtotal", "event_espresso"),
 						self::type_tax					=>  __("Tax", "event_espresso"),
 						self::type_total				=>  __("Total", "event_espresso"),
-						self::type_cancellation	=> __( 'Cancellation', 'event_espresso' )
+						self::type_cancellation	=> __('Cancellation', 'event_espresso')
 					)
 				),
-				'OBJ_ID' 					=> new EE_Foreign_Key_Int_Field( 'OBJ_ID', __( 'ID of Item purchased.', 'event_espresso' ), TRUE, NULL, $line_items_can_be_for ),
-				'OBJ_type'				=>new EE_Any_Foreign_Model_Name_Field( 'OBJ_type', __( "Model Name this Line Item is for", "event_espresso" ), TRUE, NULL, $line_items_can_be_for ),
-				'LIN_timestamp' => new EE_Datetime_Field('LIN_timestamp', __('When the line item was created','event_espresso'), false, EE_Datetime_Field::now, $timezone ),
+				'OBJ_ID' 					=> new EE_Foreign_Key_Int_Field('OBJ_ID', __('ID of Item purchased.', 'event_espresso'), TRUE, NULL, $line_items_can_be_for),
+				'OBJ_type'				=>new EE_Any_Foreign_Model_Name_Field('OBJ_type', __("Model Name this Line Item is for", "event_espresso"), TRUE, NULL, $line_items_can_be_for),
+				'LIN_timestamp' => new EE_Datetime_Field('LIN_timestamp', __('When the line item was created', 'event_espresso'), false, EE_Datetime_Field::now, $timezone),
 			)
 		);
 		$this->_model_relations = array(
@@ -150,7 +150,7 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Transaction.Registration.Event';
 		$this->_caps_slug = 'transactions';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -161,9 +161,9 @@ 
 	 * @param EE_Transaction|int $transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_of_type_for_transaction( $line_item_type, $transaction ){
-		$transaction = EEM_Transaction::instance()->ensure_is_ID( $transaction );
-		return $this->get_all( array( array(
+	public function get_all_of_type_for_transaction($line_item_type, $transaction) {
+		$transaction = EEM_Transaction::instance()->ensure_is_ID($transaction);
+		return $this->get_all(array(array(
 			'LIN_type' => $line_item_type,
 			'TXN_ID' => $transaction
 		)));
@@ -177,14 +177,14 @@ 
 	 * @param EE_Transaction|int $transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_non_ticket_line_items_for_transaction( $transaction ) {
-		$transaction = EEM_Transaction::instance()->ensure_is_ID( $transaction );
-		return $this->get_all( array( array(
+	public function get_all_non_ticket_line_items_for_transaction($transaction) {
+		$transaction = EEM_Transaction::instance()->ensure_is_ID($transaction);
+		return $this->get_all(array(array(
 			'LIN_type' => self::type_line_item,
 			'TXN_ID' => $transaction,
 			'OR' => array(
-				'OBJ_type*notticket' => array( '!=', 'Ticket'),
-				'OBJ_type*null' => array( 'IS_NULL' ))
+				'OBJ_type*notticket' => array('!=', 'Ticket'),
+				'OBJ_type*null' => array('IS_NULL'))
 		)));
 	}
 
@@ -194,7 +194,7 @@ 
 	 * because if there are spam bots afoot there will be LOTS of line items
 	 * @return int count of how many deleted
 	 */
-	public function delete_line_items_with_no_transaction(){
+	public function delete_line_items_with_no_transaction() {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$time_to_leave_alone = apply_filters(
@@ -202,13 +202,13 @@ 
 		);
 		$query = $wpdb->prepare(
 				'DELETE li
-				FROM ' . $this->table() . ' li
-				LEFT JOIN ' . EEM_Transaction::instance()->table(). ' t ON li.TXN_ID = t.TXN_ID
+				FROM ' . $this->table().' li
+				LEFT JOIN ' . EEM_Transaction::instance()->table().' t ON li.TXN_ID = t.TXN_ID
 				WHERE t.TXN_ID IS NULL AND li.LIN_timestamp < %s',
 				// use GMT time because that's what TXN_timestamps are in
-				gmdate(  'Y-m-d H:i:s', time() - $time_to_leave_alone )
+				gmdate('Y-m-d H:i:s', time() - $time_to_leave_alone)
 				);
-		return $wpdb->query( $query );
+		return $wpdb->query($query);
 	}
 
 
@@ -221,10 +221,10 @@ 
 	 * @param \EE_Base_Class $object
 	 * @return EE_Line_Item[]
 	 */
-	public function get_line_item_for_transaction_object( $TXN_ID, EE_Base_Class $object ){
-		return $this->get_all( array( array(
+	public function get_line_item_for_transaction_object($TXN_ID, EE_Base_Class $object) {
+		return $this->get_all(array(array(
 			'TXN_ID' 		=> $TXN_ID,
-			'OBJ_type' 	=> str_replace( 'EE_', '', get_class( $object )),
+			'OBJ_type' 	=> str_replace('EE_', '', get_class($object)),
 			'OBJ_ID' 		=> $object->ID()
 		)));
 	}
@@ -240,16 +240,16 @@ 
 	 * @param array $OBJ_IDs
 	 * @return EE_Line_Item[]
 	 */
-	public function get_object_line_items_for_transaction( $TXN_ID, $OBJ_type = 'Event', $OBJ_IDs = array() ){
+	public function get_object_line_items_for_transaction($TXN_ID, $OBJ_type = 'Event', $OBJ_IDs = array()) {
 		$query_params = array(
 			'OBJ_type' 	=> $OBJ_type,
 			// if incoming $OBJ_IDs is an array, then make sure it is formatted correctly for the query
-			'OBJ_ID' 		=> is_array( $OBJ_IDs ) && ! isset( $OBJ_IDs['IN'] ) ? array( 'IN', $OBJ_IDs ) : $OBJ_IDs
+			'OBJ_ID' 		=> is_array($OBJ_IDs) && ! isset($OBJ_IDs['IN']) ? array('IN', $OBJ_IDs) : $OBJ_IDs
 		);
-		if ( $TXN_ID ) {
+		if ($TXN_ID) {
 			$query_params['TXN_ID'] = $TXN_ID;
 		}
-		return $this->get_all( array( $query_params ));
+		return $this->get_all(array($query_params));
 	}
 
 
@@ -260,13 +260,13 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_ticket_line_items_for_transaction( EE_Transaction $transaction ) {
-		return $this->get_all( array(
+	public function get_all_ticket_line_items_for_transaction(EE_Transaction $transaction) {
+		return $this->get_all(array(
 		   array(
 			   'TXN_ID'   => $transaction->ID(),
 			   'OBJ_type' => 'Ticket',
 		   )
-	   ) );
+	   ));
 	}
 
 
@@ -278,14 +278,14 @@ 
 	 * @param int $TKT_ID
 	 * @return \EE_Line_Item
 	 */
-	public function get_ticket_line_item_for_transaction( $TXN_ID, $TKT_ID ) {
-		return $this->get_one( array(
+	public function get_ticket_line_item_for_transaction($TXN_ID, $TKT_ID) {
+		return $this->get_one(array(
 		   array(
-			   'TXN_ID'   => EEM_Transaction::instance()->ensure_is_ID( $TXN_ID ),
+			   'TXN_ID'   => EEM_Transaction::instance()->ensure_is_ID($TXN_ID),
 			   'OBJ_ID'   => $TKT_ID,
 			   'OBJ_type' => 'Ticket',
 		   )
-	   ) );
+	   ));
 	}
 
 
@@ -300,8 +300,8 @@ 
 	 * @param EE_Promotion $promotion
 	 * @return EE_Line_Item
 	 */
-	public function get_existing_promotion_line_item( EE_Line_Item $parent_line_item, EE_Promotion $promotion ) {
-		return $this->get_one( array(
+	public function get_existing_promotion_line_item(EE_Line_Item $parent_line_item, EE_Promotion $promotion) {
+		return $this->get_one(array(
 			array(
 				'TXN_ID' 			=> $parent_line_item->TXN_ID(),
 				'LIN_parent' 	=> $parent_line_item->ID(),
@@ -322,8 +322,8 @@ 
 	 * @param EE_Line_Item $parent_line_item
 	 * @return EE_Line_Item[]
 	 */
-	public function get_all_promotion_line_items( EE_Line_Item $parent_line_item ) {
-		return $this->get_all( array(
+	public function get_all_promotion_line_items(EE_Line_Item $parent_line_item) {
+		return $this->get_all(array(
 			array(
 				'TXN_ID' 			=> $parent_line_item->TXN_ID(),
 				'LIN_parent' 	=> $parent_line_item->ID(),
@@ -340,8 +340,8 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Line_ITem
 	 */
-	public function get_line_item_for_registration( EE_Registration $registration ) {
-		return $this->get_one( $this->line_item_for_registration_query_params( $registration ));
+	public function get_line_item_for_registration(EE_Registration $registration) {
+		return $this->get_one($this->line_item_for_registration_query_params($registration));
 	}
 
 	/**
@@ -350,14 +350,14 @@ 
 	 * @param array $original_query_params any extra query params you'd like to be merged with
 	 * @return array like EEM_Base::get_all()'s $query_params
 	 */
-	public function line_item_for_registration_query_params( EE_Registration $registration, $original_query_params = array() ) {
-		return array_replace_recursive( $original_query_params, array(
+	public function line_item_for_registration_query_params(EE_Registration $registration, $original_query_params = array()) {
+		return array_replace_recursive($original_query_params, array(
 			array(
 				'OBJ_ID' => $registration->ticket_ID(),
 				'OBJ_type' => 'Ticket',
 				'TXN_ID' => $registration->transaction_ID()
 			)
-		) );
+		));
 	}
 
 

core/admin/EE_Admin_Page.core.php

Indentation +55 added lines, -56 removed lines

@@ -1311,8 +1311,8 @@ 
 	 * 		verifies user access for this admin page
 	 * 		@param string $route_to_check if present then the capability for the route matching this string is checked.
 	 * 		@param bool   $verify_only Default is FALSE which means if user check fails then wp_die().  Otherwise just return false if verify fail.
-	*		@return 		BOOL|wp_die()
-	*/
+	 *		@return 		BOOL|wp_die()
+	 */
 	public function check_user_access( $route_to_check = '', $verify_only = FALSE ) {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$route_to_check = empty( $route_to_check ) ? $this->_req_action : $route_to_check;
@@ -1698,11 +1698,11 @@ 
 
 
 	/**
-	*		admin_footer_scripts_eei18n_js_strings
-	*
-	*		@access 		public
-	*		@return 		void
-	*/
+	 *		admin_footer_scripts_eei18n_js_strings
+	 *
+	 *		@access 		public
+	 *		@return 		void
+	 */
 	public function admin_footer_scripts_eei18n_js_strings() {
 
 		EE_Registry::$i18n_js_strings['ajax_url'] = WP_AJAX_URL;
@@ -1758,11 +1758,11 @@ 
 
 
 	/**
-	*		load enhanced xdebug styles for ppl with failing eyesight
-	*
-	*		@access 		public
-	*		@return 		void
-	*/
+	 *		load enhanced xdebug styles for ppl with failing eyesight
+	 *
+	 *		@access 		public
+	 *		@return 		void
+	 */
 	public function add_xdebug_style() {
 		echo '<style>.xdebug-error { font-size:1.5em; }</style>';
 	}
@@ -1819,9 +1819,9 @@ 
 
 	/**
 	 * 		set current view for List Table
-	*		@access public
-	*		@return array
-	*/
+	 *		@access public
+	 *		@return array
+	 */
 	protected function _set_list_table_view() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
@@ -1910,7 +1910,7 @@ 
 	 * @access protected
 	 * @param int $max_entries total number of rows in the table
 	 * @return string
-	*/
+	 */
 	protected function _entries_per_page_dropdown( $max_entries = FALSE ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -1955,9 +1955,9 @@ 
 
 	/**
 	 * 		_set_search_attributes
-	*		@access 		protected
-	*		@return 		void
-	*/
+	 *		@access 		protected
+	 *		@return 		void
+	 */
 	public function _set_search_attributes() {
 		$this->_template_args['search']['btn_label'] = sprintf( __( 'Search %s', 'event_espresso' ), empty( $this->_search_btn_label ) ? $this->page_label : $this->_search_btn_label );
 		$this->_template_args['search']['callback'] = 'search_' . $this->page_slug;
@@ -1977,7 +1977,7 @@ 
 	 * @link http://codex.wordpress.org/Function_Reference/add_meta_box
 	 * @access private
 	 * @return void
-	*/
+	 */
 	private function _add_registered_meta_boxes() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
@@ -2209,7 +2209,6 @@ 
 	 * Note: currently there is no validation for this.  However if you want the delete button, the
 	 * save, and save and close buttons to work properly, then you will want to include a
 	 * values for the name and id arguments.
-
 	 *
 *@todo  Add in validation for name/id arguments.
 	 * @param    string  $name                    key used for the action ID (i.e. event_id)
@@ -2268,9 +2267,9 @@ 
 
 	/**
 	 * 		displays an error message to ppl who have javascript disabled
-	*		@access 		private
-	*		@return 		string
-	*/
+	 *		@access 		private
+	 *		@return 		string
+	 */
 	private function _display_no_javascript_warning() {
 		?>
 		<noscript>
@@ -2293,9 +2292,9 @@ 
 
 	/**
 	 * 		displays espresso success and/or error notices
-	*		@access 		private
-	*		@return 		string
-	*/
+	 *		@access 		private
+	 *		@return 		string
+	 */
 	private function _display_espresso_notices() {
 		$notices = $this->_get_transient( TRUE );
 		echo stripslashes($notices);
@@ -2307,10 +2306,10 @@ 
 
 
 	/**
-	*		spinny things pacify the masses
-	*		@access private
-	*		@return string
-	*/
+	 *		spinny things pacify the masses
+	 *		@access private
+	 *		@return string
+	 */
 	protected function _add_admin_page_ajax_loading_img() {
 		?>
 			<div id="espresso-ajax-loading" class="ajax-loading-grey">
@@ -2324,10 +2323,10 @@ 
 
 
 	/**
-	*		add admin page overlay for modal boxes
-	*		@access private
-	*		@return string
-	*/
+	 *		add admin page overlay for modal boxes
+	 *		@access private
+	 *		@return string
+	 */
 	protected function _add_admin_page_overlay() {
 		?>
 		<div id="espresso-admin-page-overlay-dv" class=""></div>
@@ -2389,10 +2388,10 @@ 
 
 
 	/**
-	*		generates  HTML wrapper for an admin details page
-	*		@access public
-	*		@return void
-	*/
+	 *		generates  HTML wrapper for an admin details page
+	 *		@access public
+	 *		@return void
+	 */
 	public function display_admin_page_with_sidebar() {
 
 		$this->_display_admin_page(TRUE);
@@ -2402,10 +2401,10 @@ 
 
 
 	/**
-	*		generates  HTML wrapper for an admin details page (except no sidebar)
-	*		@access public
-	*		@return void
-	*/
+	 *		generates  HTML wrapper for an admin details page (except no sidebar)
+	 *		@access public
+	 *		@return void
+	 */
 	public function display_admin_page_with_no_sidebar() {
 		$this->_display_admin_page();
 	}
@@ -2662,11 +2661,11 @@ 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
 		if ( NULL === error_get_last() || ! headers_sent() )
 			header('Content-Type: application/json; charset=UTF-8');
-                if( function_exists( 'wp_json_encode' ) ) {
-                    echo wp_json_encode( $json );
-                } else {
-                    echo json_encode( $json );
-                }
+				if( function_exists( 'wp_json_encode' ) ) {
+					echo wp_json_encode( $json );
+				} else {
+					echo json_encode( $json );
+				}
 		exit();
 	}
 
@@ -2705,11 +2704,11 @@ 
 
 
 	/**
-	*		generates  HTML wrapper with Tabbed nav for an admin page
-	*		@access public
-	*		@param  boolean $about whether to use the special about page wrapper or default.
-	*		@return void
-	*/
+	 *		generates  HTML wrapper with Tabbed nav for an admin page
+	 *		@access public
+	 *		@param  boolean $about whether to use the special about page wrapper or default.
+	 *		@return void
+	 */
 	public function admin_page_wrapper($about = FALSE) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -2766,9 +2765,9 @@ 
 	 */
 	private function _sort_nav_tabs( $a, $b ) {
 		if ($a['order'] == $b['order']) {
-	        return 0;
-	    }
-	    return ($a['order'] < $b['order']) ? -1 : 1;
+			return 0;
+		}
+		return ($a['order'] < $b['order']) ? -1 : 1;
 	}
 
 

Doc Comments +4 added lines, -5 removed lines

@@ -482,7 +482,7 @@ 
 	 *
 	 * @final
 	 * @access protected
-	 * @return void
+	 * @return false|null
 	 */
 	final protected function _page_setup() {
 
@@ -817,7 +817,7 @@ 
 	/**
 	 * this method simply verifies a given route and makes sure its an actual route available for the loaded page
 	 * @param  string $route the route name we're verifying
-	 * @return mixed  (bool|Exception)      we'll throw an exception if this isn't a valid route.
+	 * @return boolean  (bool|Exception)      we'll throw an exception if this isn't a valid route.
 	 */
 	protected function _verify_route( $route ) {
 		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
@@ -3417,7 +3417,7 @@ 
 
 
 	/**
-	 * @return mixed
+	 * @return string[]
 	 */
 	public function default_espresso_metaboxes() {
 		return $this->_default_espresso_metaboxes;
@@ -3435,7 +3435,7 @@ 
 
 
 	/**
-	 * @return mixed
+	 * @return string
 	 */
 	public function wp_page_slug() {
 		return $this->_wp_page_slug;
@@ -3448,7 +3448,6 @@ 
 	 *
 	 * @access 	protected
 	 * @param string $tab
-	 * @param array $data
 	 * @param string $file	file where error occurred
 	 * @param string $func function  where error occurred
 	 * @param string $line	line no where error occurred

Spacing +609 added lines, -609 removed lines

@@ -158,9 +158,9 @@ 
 	 * 		@param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * 		@access public
 	 */
-	public function __construct( $routing = TRUE ) {
+	public function __construct($routing = TRUE) {
 
-		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false )
+		if (strpos($this->_get_dir(), 'caffeinated') !== false)
 			$this->_is_caf = TRUE;
 
 		$this->_yes_no_values = array(
@@ -171,7 +171,7 @@ 
 
 
 		//set the _req_data property.
-		$this->_req_data = array_merge( $_GET, $_POST );
+		$this->_req_data = array_merge($_GET, $_POST);
 
 
 		//routing enabled?
@@ -192,7 +192,7 @@ 
 		$this->_do_other_page_hooks();
 
 		//This just allows us to have extending clases do something specific before the parent constructor runs _page_setup.
-		if ( method_exists( $this, '_before_page_setup' ) )
+		if (method_exists($this, '_before_page_setup'))
 			$this->_before_page_setup();
 
 		//set up page dependencies
@@ -461,16 +461,16 @@ 
 	 */
 	protected function _global_ajax_hooks() {
 		//for lazy loading of metabox content
-		add_action( 'wp_ajax_espresso-ajax-content', array( $this, 'ajax_metabox_content'), 10 );
+		add_action('wp_ajax_espresso-ajax-content', array($this, 'ajax_metabox_content'), 10);
 	}
 
 
 
 	public function ajax_metabox_content() {
-		$contentid = isset( $this->_req_data['contentid'] ) ? $this->_req_data['contentid'] : '';
-		$url = isset( $this->_req_data['contenturl'] ) ? $this->_req_data['contenturl'] : '';
+		$contentid = isset($this->_req_data['contentid']) ? $this->_req_data['contentid'] : '';
+		$url = isset($this->_req_data['contenturl']) ? $this->_req_data['contenturl'] : '';
 
-		self::cached_rss_display( $contentid, $url );
+		self::cached_rss_display($contentid, $url);
 		wp_die();
 	}
 
@@ -489,87 +489,87 @@ 
 		//requires?
 
 		//admin_init stuff - global - we're setting this REALLY early so if EE_Admin pages have to hook into other WP pages they can.  But keep in mind, not everything is available from the EE_Admin Page object at this point.
-		add_action( 'admin_init', array( $this, 'admin_init_global' ), 5 );
+		add_action('admin_init', array($this, 'admin_init_global'), 5);
 
 
 		//next verify if we need to load anything...
-		$this->_current_page = !empty( $_GET['page'] ) ? sanitize_key( $_GET['page'] ) : '';
-		$this->page_folder = strtolower( str_replace( '_Admin_Page', '', str_replace( 'Extend_', '', get_class($this) ) ) );
+		$this->_current_page = ! empty($_GET['page']) ? sanitize_key($_GET['page']) : '';
+		$this->page_folder = strtolower(str_replace('_Admin_Page', '', str_replace('Extend_', '', get_class($this))));
 
 		global $ee_menu_slugs;
 		$ee_menu_slugs = (array) $ee_menu_slugs;
 
-		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) return FALSE;
+		if (( ! $this->_current_page || ! isset($ee_menu_slugs[$this->_current_page])) && ! defined('DOING_AJAX')) return FALSE;
 
 
 		// becuz WP List tables have two duplicate select inputs for choosing bulk actions, we need to copy the action from the second to the first
-		if ( isset( $this->_req_data['action2'] ) && $this->_req_data['action'] == -1 ) {
-			$this->_req_data['action'] = ! empty( $this->_req_data['action2'] ) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action'];
+		if (isset($this->_req_data['action2']) && $this->_req_data['action'] == -1) {
+			$this->_req_data['action'] = ! empty($this->_req_data['action2']) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action'];
 		}
 		// then set blank or -1 action values to 'default'
-		$this->_req_action = isset( $this->_req_data['action'] ) && ! empty( $this->_req_data['action'] ) && $this->_req_data['action'] != -1 ? sanitize_key( $this->_req_data['action'] ) : 'default';
+		$this->_req_action = isset($this->_req_data['action']) && ! empty($this->_req_data['action']) && $this->_req_data['action'] != -1 ? sanitize_key($this->_req_data['action']) : 'default';
 
 		//if action is 'default' after the above BUT we have  'route' var set, then let's use the route as the action.  This covers cases where we're coming in from a list table that isn't on the default route.
-		$this->_req_action = $this->_req_action == 'default' && isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : $this->_req_action;
+		$this->_req_action = $this->_req_action == 'default' && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action;
 
 		//however if we are doing_ajax and we've got a 'route' set then that's what the req_action will be
 		$this->_req_action = defined('DOING_AJAX') && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action;
 
 		$this->_current_view = $this->_req_action;
-		$this->_req_nonce = $this->_req_action . '_nonce';
+		$this->_req_nonce = $this->_req_action.'_nonce';
 		$this->_define_page_props();
 
-		$this->_current_page_view_url = add_query_arg( array( 'page' => $this->_current_page, 'action' => $this->_current_view ),  $this->_admin_base_url );
+		$this->_current_page_view_url = add_query_arg(array('page' => $this->_current_page, 'action' => $this->_current_view), $this->_admin_base_url);
 
 		//default things
-		$this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box' );
+		$this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box');
 
 		//set page configs
 		$this->_set_page_routes();
 		$this->_set_page_config();
 
 		//let's include any referrer data in our default_query_args for this route for "stickiness".
-		if ( isset( $this->_req_data['wp_referer'] ) ) {
+		if (isset($this->_req_data['wp_referer'])) {
 			$this->_default_route_query_args['wp_referer'] = $this->_req_data['wp_referer'];
 		}
 
 		//for caffeinated and other extended functionality.  If there is a _extend_page_config method then let's run that to modify the all the various page configuration arrays
-		if ( method_exists( $this, '_extend_page_config' ) )
+		if (method_exists($this, '_extend_page_config'))
 			$this->_extend_page_config();
 
 		//for CPT and other extended functionality. If there is an _extend_page_config_for_cpt then let's run that to modify all the various page configuration arrays.
-		if ( method_exists( $this, '_extend_page_config_for_cpt' ) )
+		if (method_exists($this, '_extend_page_config_for_cpt'))
 			$this->_extend_page_config_for_cpt();
 
 		//filter routes and page_config so addons can add their stuff. Filtering done per class
-		$this->_page_routes = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_routes', $this->_page_routes, $this );
-		$this->_page_config = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_config', $this->_page_config, $this );
+		$this->_page_routes = apply_filters('FHEE__'.get_class($this).'__page_setup__page_routes', $this->_page_routes, $this);
+		$this->_page_config = apply_filters('FHEE__'.get_class($this).'__page_setup__page_config', $this->_page_config, $this);
 
 
 		//if AHEE__EE_Admin_Page__route_admin_request_$this->_current_view method is present then we call it hooked into the AHEE__EE_Admin_Page__route_admin_request action
-		if ( method_exists( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ) ) {
-			add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ), 10, 2 );
+		if (method_exists($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view)) {
+			add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view), 10, 2);
 		}
 
 
 		//next route only if routing enabled
-		if ( $this->_routing && !defined('DOING_AJAX') ) {
+		if ($this->_routing && ! defined('DOING_AJAX')) {
 
 			$this->_verify_routes();
 
 			//next let's just check user_access and kill if no access
 			$this->check_user_access();
 
-			if ( $this->_is_UI_request ) {
+			if ($this->_is_UI_request) {
 				//admin_init stuff - global, all views for this page class, specific view
-				add_action( 'admin_init', array( $this, 'admin_init' ), 10 );
-				if ( method_exists( $this, 'admin_init_' . $this->_current_view )) {
-					add_action( 'admin_init', array( $this, 'admin_init_' . $this->_current_view ), 15 );
+				add_action('admin_init', array($this, 'admin_init'), 10);
+				if (method_exists($this, 'admin_init_'.$this->_current_view)) {
+					add_action('admin_init', array($this, 'admin_init_'.$this->_current_view), 15);
 				}
 
 			} else {
 				//hijack regular WP loading and route admin request immediately
-				@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+				@ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT));
 				$this->route_admin_request();
 			}
 		}
@@ -586,18 +586,18 @@ 
 	 * @return void
 	 */
 	private function _do_other_page_hooks() {
-		$registered_pages = apply_filters( 'FHEE_do_other_page_hooks_' . $this->page_slug, array() );
+		$registered_pages = apply_filters('FHEE_do_other_page_hooks_'.$this->page_slug, array());
 
-		foreach ( $registered_pages as $page ) {
+		foreach ($registered_pages as $page) {
 
 			//now let's setup the file name and class that should be present
 			$classname = str_replace('.class.php', '', $page);
 
 			//autoloaders should take care of loading file
-			if ( !class_exists( $classname ) ) {
-				$error_msg[] = sprintf( __('Something went wrong with loading the %s admin hooks page.', 'event_espresso' ), $page);
-				$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname );
-				throw new EE_Error( implode( '||', $error_msg ));
+			if ( ! class_exists($classname)) {
+				$error_msg[] = sprintf(__('Something went wrong with loading the %s admin hooks page.', 'event_espresso'), $page);
+				$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname);
+				throw new EE_Error(implode('||', $error_msg));
 			}
 
 			$a = new ReflectionClass($classname);
@@ -612,7 +612,7 @@ 
 	public function load_page_dependencies() {
 		try {
 			$this->_load_page_dependencies();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -630,16 +630,16 @@ 
 		$this->_current_screen = get_current_screen();
 
 		//load admin_notices - global, page class, and view specific
-		add_action( 'admin_notices', array( $this, 'admin_notices_global'), 5 );
-		add_action( 'admin_notices', array( $this, 'admin_notices' ), 10 );
-		if ( method_exists( $this, 'admin_notices_' . $this->_current_view ) ) {
-			add_action( 'admin_notices', array( $this, 'admin_notices_' . $this->_current_view ), 15 );
+		add_action('admin_notices', array($this, 'admin_notices_global'), 5);
+		add_action('admin_notices', array($this, 'admin_notices'), 10);
+		if (method_exists($this, 'admin_notices_'.$this->_current_view)) {
+			add_action('admin_notices', array($this, 'admin_notices_'.$this->_current_view), 15);
 		}
 
 		//load network admin_notices - global, page class, and view specific
-		add_action( 'network_admin_notices', array( $this, 'network_admin_notices_global'), 5 );
-		if ( method_exists( $this, 'network_admin_notices_' . $this->_current_view ) ) {
-			add_action( 'network_admin_notices', array( $this, 'network_admin_notices_' . $this->_current_view ) );
+		add_action('network_admin_notices', array($this, 'network_admin_notices_global'), 5);
+		if (method_exists($this, 'network_admin_notices_'.$this->_current_view)) {
+			add_action('network_admin_notices', array($this, 'network_admin_notices_'.$this->_current_view));
 		}
 
 		//this will save any per_page screen options if they are present
@@ -655,8 +655,8 @@ 
 		//add screen options - global, page child class, and view specific
 		$this->_add_global_screen_options();
 		$this->_add_screen_options();
-		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
+		if (method_exists($this, '_add_screen_options_'.$this->_current_view))
+			call_user_func(array($this, '_add_screen_options_'.$this->_current_view));
 
 
 		//add help tab(s) and tours- set via page_config and qtips.
@@ -667,33 +667,33 @@ 
 		//add feature_pointers - global, page child class, and view specific
 		$this->_add_feature_pointers();
 		$this->_add_global_feature_pointers();
-		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
+		if (method_exists($this, '_add_feature_pointer_'.$this->_current_view))
+			call_user_func(array($this, '_add_feature_pointer_'.$this->_current_view));
 
 		//enqueue scripts/styles - global, page class, and view specific
-		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5 );
-		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10 );
-		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) )
-			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
+		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5);
+		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10);
+		if (method_exists($this, 'load_scripts_styles_'.$this->_current_view))
+			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_'.$this->_current_view), 15);
 
-		add_action('admin_enqueue_scripts', array( $this, 'admin_footer_scripts_eei18n_js_strings' ), 100 );
+		add_action('admin_enqueue_scripts', array($this, 'admin_footer_scripts_eei18n_js_strings'), 100);
 
 		//admin_print_footer_scripts - global, page child class, and view specific.  NOTE, despite the name, whenever possible, scripts should NOT be loaded using this.  In most cases that's doing_it_wrong().  But adding hidden container elements etc. is a good use case. Notice the late priority we're giving these
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_global' ), 99 );
-		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts' ), 100 );
-		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) )
-			add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_global'), 99);
+		add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts'), 100);
+		if (method_exists($this, 'admin_footer_scripts_'.$this->_current_view))
+			add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_'.$this->_current_view), 101);
 
 		//admin footer scripts
-		add_action('admin_footer', array( $this, 'admin_footer_global' ), 99 );
-		add_action('admin_footer', array( $this, 'admin_footer'), 100 );
-		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) )
-			add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
+		add_action('admin_footer', array($this, 'admin_footer_global'), 99);
+		add_action('admin_footer', array($this, 'admin_footer'), 100);
+		if (method_exists($this, 'admin_footer_'.$this->_current_view))
+			add_action('admin_footer', array($this, 'admin_footer_'.$this->_current_view), 101);
 
 
-		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug );
+		do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug);
 		//targeted hook
-		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load__' . $this->page_slug . '__' . $this->_req_action );
+		do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load__'.$this->page_slug.'__'.$this->_req_action);
 
 	}
 
@@ -708,7 +708,7 @@ 
 	private function _set_defaults() {
 		$this->_current_screen = $this->_admin_page_title = $this->_req_action = $this->_req_nonce = $this->_event = $this->_template_path = $this->_column_template_path = NULL;
 
-		$this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config =  $this->_default_route_query_args = array();
+		$this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config = $this->_default_route_query_args = array();
 
 		$this->default_nav_tab_name = 'overview';
 
@@ -735,7 +735,7 @@ 
 	public function route_admin_request() {
 		try {
 			$this->_route_admin_request();
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 	}
@@ -746,7 +746,7 @@ 
 		$this->_wp_page_slug = $wp_page_slug;
 
 		//if in network admin then we need to append "-network" to the page slug. Why? Because that's how WP rolls...
-		if ( is_network_admin() ) {
+		if (is_network_admin()) {
 			$this->_wp_page_slug .= '-network';
 		}
 	}
@@ -758,53 +758,53 @@ 
 	 * @access protected
 	 */
 	protected function _verify_routes() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		if ( !$this->_current_page && !defined( 'DOING_AJAX')) return;
+		if ( ! $this->_current_page && ! defined('DOING_AJAX')) return;
 
 		$this->_route = FALSE;
 		$func = FALSE;
 		$args = array();
 
 		// check that the page_routes array is not empty
-		if ( empty( $this->_page_routes )) {
+		if (empty($this->_page_routes)) {
 			// user error msg
-			$error_msg = sprintf( __('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title );
+			$error_msg = sprintf(__('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . __( ' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso' );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.__(' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso');
+			throw new EE_Error($error_msg);
 		}
 
 		// and that the requested page route exists
-		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
-			$this->_route = $this->_page_routes[ $this->_req_action ];
+		if (array_key_exists($this->_req_action, $this->_page_routes)) {
+			$this->_route = $this->_page_routes[$this->_req_action];
 			$this->_route_config = isset($this->_page_config[$this->_req_action]) ? $this->_page_config[$this->_req_action] : array();
 		} else {
 			// user error msg
-			$error_msg =  sprintf( __( 'The requested page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('The requested page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . sprintf( __( ' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso' ), $this->_req_action );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.sprintf(__(' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso'), $this->_req_action);
+			throw new EE_Error($error_msg);
 		}
 
 		// and that a default route exists
-		if ( ! array_key_exists( 'default', $this->_page_routes )) {
+		if ( ! array_key_exists('default', $this->_page_routes)) {
 			// user error msg
-			$error_msg = sprintf( __( 'A default page route has not been set for the % admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('A default page route has not been set for the % admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . __( ' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso' );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.__(' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso');
+			throw new EE_Error($error_msg);
 		}
 
 
 		//first lets' catch if the UI request has EVER been set.
-		if ( $this->_is_UI_request === NULL ) {
+		if ($this->_is_UI_request === NULL) {
 			//lets set if this is a UI request or not.
-			$this->_is_UI_request = ( ! isset( $this->_req_data['noheader'] ) || $this->_req_data['noheader'] !== TRUE ) ? TRUE : FALSE;
+			$this->_is_UI_request = ( ! isset($this->_req_data['noheader']) || $this->_req_data['noheader'] !== TRUE) ? TRUE : FALSE;
 
 
 			//wait a minute... we might have a noheader in the route array
-			$this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader'] ) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request;
+			$this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader']) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request;
 		}
 
 		$this->_set_current_labels();
@@ -819,15 +819,15 @@ 
 	 * @param  string $route the route name we're verifying
 	 * @return mixed  (bool|Exception)      we'll throw an exception if this isn't a valid route.
 	 */
-	protected function _verify_route( $route ) {
-		if ( array_key_exists( $this->_req_action, $this->_page_routes )) {
+	protected function _verify_route($route) {
+		if (array_key_exists($this->_req_action, $this->_page_routes)) {
 			return true;
 		} else {
 			// user error msg
-			$error_msg =  sprintf( __( 'The given page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title );
+			$error_msg = sprintf(__('The given page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title);
 			// developer error msg
-			$error_msg .=  '||' . $error_msg . sprintf( __( ' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso' ), $route );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.$error_msg.sprintf(__(' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso'), $route);
+			throw new EE_Error($error_msg);
 		}
 	}
 
@@ -841,18 +841,18 @@ 
 	 * @param  string $nonce_ref The nonce reference string (name0)
 	 * @return mixed (bool|die)
 	 */
-	protected function _verify_nonce( $nonce, $nonce_ref ) {
+	protected function _verify_nonce($nonce, $nonce_ref) {
 		// verify nonce against expected value
-		if ( ! wp_verify_nonce( $nonce, $nonce_ref) ) {
+		if ( ! wp_verify_nonce($nonce, $nonce_ref)) {
 			// these are not the droids you are looking for !!!
-			$msg = sprintf(__('%sNonce Fail.%s' , 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>' );
-			if ( WP_DEBUG ) {
-				$msg .= "\n  " . sprintf( __('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso' ), __CLASS__  );
+			$msg = sprintf(__('%sNonce Fail.%s', 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>');
+			if (WP_DEBUG) {
+				$msg .= "\n  ".sprintf(__('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso'), __CLASS__);
 			}
-			if ( ! defined( 'DOING_AJAX' )) {
-				wp_die( $msg );
+			if ( ! defined('DOING_AJAX')) {
+				wp_die($msg);
 			} else {
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 				$this->_return_json();
 			}
 		}
@@ -870,63 +870,63 @@ 
 	 * @return void
 	 */
 	protected function _route_admin_request() {
-		if (  ! $this->_is_UI_request )
+		if ( ! $this->_is_UI_request)
 			$this->_verify_routes();
 
-		$nonce_check = isset( $this->_route_config['require_nonce'] ) ? $this->_route_config['require_nonce'] : TRUE;
+		$nonce_check = isset($this->_route_config['require_nonce']) ? $this->_route_config['require_nonce'] : TRUE;
 
-		if ( $this->_req_action != 'default' && $nonce_check ) {
+		if ($this->_req_action != 'default' && $nonce_check) {
 			// set nonce from post data
-			$nonce = isset($this->_req_data[ $this->_req_nonce  ]) ? sanitize_text_field( $this->_req_data[ $this->_req_nonce  ] ) : '';
-			$this->_verify_nonce( $nonce, $this->_req_nonce );
+			$nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : '';
+			$this->_verify_nonce($nonce, $this->_req_nonce);
 		}
 		//set the nav_tabs array but ONLY if this is  UI_request
-		if ( $this->_is_UI_request )
+		if ($this->_is_UI_request)
 			$this->_set_nav_tabs();
 
 		// grab callback function
-		$func = is_array( $this->_route ) ? $this->_route['func'] : $this->_route;
+		$func = is_array($this->_route) ? $this->_route['func'] : $this->_route;
 
 		// check if callback has args
-		$args = is_array( $this->_route ) && isset( $this->_route['args'] ) ? $this->_route['args'] : array();
+		$args = is_array($this->_route) && isset($this->_route['args']) ? $this->_route['args'] : array();
 
 		$error_msg = '';
 
 		//action right before calling route (hook is something like 'AHEE__Registrations_Admin_Page__route_admin_request')
-		if ( !did_action('AHEE__EE_Admin_Page__route_admin_request')) {
-			do_action( 'AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this );
+		if ( ! did_action('AHEE__EE_Admin_Page__route_admin_request')) {
+			do_action('AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this);
 		}
 
 		//right before calling the route, let's remove _wp_http_referer from the $_SERVER[REQUEST_URI] global (its now in _req_data for route processing).
-		$_SERVER['REQUEST_URI'] = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		$_SERVER['REQUEST_URI'] = remove_query_arg('_wp_http_referer', wp_unslash($_SERVER['REQUEST_URI']));
 
-		if ( ! empty( $func )) {
+		if ( ! empty($func)) {
 			$base_call = $addon_call = FALSE;
 			//try to access page route via this class
-			if ( ! is_array( $func ) && method_exists( $this, $func ) && ( $base_call = call_user_func_array( array( $this, &$func  ), $args ) ) === FALSE ) {
+			if ( ! is_array($func) && method_exists($this, $func) && ($base_call = call_user_func_array(array($this, &$func), $args)) === FALSE) {
 				// user error msg
-				$error_msg =  __( 'An error occurred. The  requested page route could not be found.', 'event_espresso' );
+				$error_msg = __('An error occurred. The  requested page route could not be found.', 'event_espresso');
 				// developer error msg
-				$error_msg .= '||' . sprintf( __( 'Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso' ), $func );
+				$error_msg .= '||'.sprintf(__('Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso'), $func);
 			}
 
 			//for pluggability by addons first let's see if just the function exists (this will also work in the case where $func is an array indicating class/method)
 			$args['admin_page_object'] = $this; //send along this admin page object for access by addons.
 
-			if ( $base_call === FALSE && ( $addon_call = call_user_func_array( $func, $args ) )=== FALSE ) {
-				$error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso' );
-				$error_msg .= '||' . sprintf( __('Page route "%s" could not be called.  Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func );
+			if ($base_call === FALSE && ($addon_call = call_user_func_array($func, $args)) === FALSE) {
+				$error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso');
+				$error_msg .= '||'.sprintf(__('Page route "%s" could not be called.  Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func);
 			}
 
 
-			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE )
-				throw new EE_Error( $error_msg );
+			if ( ! empty($error_msg) && $base_call === FALSE && $addon_call === FALSE)
+				throw new EE_Error($error_msg);
 		}
 
 		//if we've routed and this route has a no headers route AND a sent_headers_route, then we need to reset the routing properties to the new route.
 		//now if UI request is FALSE and noheader is true AND we have a headers_sent_route in the route array then let's set UI_request to true because the no header route has a second func after headers have been sent.
-		if ( $this->_is_UI_request === FALSE && is_array( $this->_route) && ! empty( $this->_route['headers_sent_route'] ) ) {
-			$this->_reset_routing_properties( $this->_route['headers_sent_route'] );
+		if ($this->_is_UI_request === FALSE && is_array($this->_route) && ! empty($this->_route['headers_sent_route'])) {
+			$this->_reset_routing_properties($this->_route['headers_sent_route']);
 		}
 	}
 
@@ -942,7 +942,7 @@ 
 	 * @param  string    $new_route   New (non header) route to redirect to.
 	 * @return   void
 	 */
-	protected function _reset_routing_properties( $new_route ) {
+	protected function _reset_routing_properties($new_route) {
 		$this->_is_UI_request = TRUE;
 		//now we set the current route to whatever the headers_sent_route is set at
 		$this->_req_data['action'] = $new_route;
@@ -988,23 +988,23 @@ 
 	 * @param   bool    $exclude_nonce  If true, the the nonce will be excluded from the generated nonce.
 	 * 	@return string
 	 */
-	public static function add_query_args_and_nonce( $args = array(), $url = false, $sticky = false, $exclude_nonce = false ) {
+	public static function add_query_args_and_nonce($args = array(), $url = false, $sticky = false, $exclude_nonce = false) {
 
 		//if there is a _wp_http_referer include the values from the request but only if sticky = true
-		if ( $sticky ) {
+		if ($sticky) {
 			$request = $_REQUEST;
-			unset( $request['_wp_http_referer'] );
-			unset( $request['wp_referer'] );
-			foreach ( $request as $key => $value ) {
+			unset($request['_wp_http_referer']);
+			unset($request['wp_referer']);
+			foreach ($request as $key => $value) {
 				//do not add nonces
-				if ( strpos( $key, 'nonce' ) !== false ) {
+				if (strpos($key, 'nonce') !== false) {
 					continue;
 				}
-				$args['wp_referer[' . $key . ']'] = $value;
+				$args['wp_referer['.$key.']'] = $value;
 			}
 		}
 
-		return EEH_URL::add_query_args_and_nonce( $args, $url, $exclude_nonce );
+		return EEH_URL::add_query_args_and_nonce($args, $url, $exclude_nonce);
 	}
 
 
@@ -1020,8 +1020,8 @@ 
 	 * @uses EEH_Template::get_help_tab_link()
 	 * @return string              generated link
 	 */
-	protected function _get_help_tab_link( $help_tab_id, $icon_style = FALSE, $help_text = FALSE ) {
-		return EEH_Template::get_help_tab_link( $help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text );
+	protected function _get_help_tab_link($help_tab_id, $icon_style = FALSE, $help_text = FALSE) {
+		return EEH_Template::get_help_tab_link($help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text);
 	}
 
 
@@ -1038,30 +1038,30 @@ 
 	 */
 	protected function _add_help_tabs() {
 		$tour_buttons = '';
-		if ( isset( $this->_page_config[$this->_req_action] ) ) {
+		if (isset($this->_page_config[$this->_req_action])) {
 			$config = $this->_page_config[$this->_req_action];
 
 			//is there a help tour for the current route?  if there is let's setup the tour buttons
-			if ( isset( $this->_help_tour[$this->_req_action]) ) {
+			if (isset($this->_help_tour[$this->_req_action])) {
 				$tb = array();
 				$tour_buttons = '<div class="ee-abs-container"><div class="ee-help-tour-restart-buttons">';
-				foreach ( $this->_help_tour['tours'] as $tour ) {
+				foreach ($this->_help_tour['tours'] as $tour) {
 					//if this is the end tour then we don't need to setup a button
-					if ( $tour instanceof EE_Help_Tour_final_stop )
+					if ($tour instanceof EE_Help_Tour_final_stop)
 						continue;
-					$tb[] = '<button id="trigger-tour-' . $tour->get_slug() . '" class="button-primary trigger-ee-help-tour">' . $tour->get_label() . '</button>';
+					$tb[] = '<button id="trigger-tour-'.$tour->get_slug().'" class="button-primary trigger-ee-help-tour">'.$tour->get_label().'</button>';
 				}
 				$tour_buttons .= implode('<br />', $tb);
 				$tour_buttons .= '</div></div>';
 			}
 
 			// let's see if there is a help_sidebar set for the current route and we'll set that up for usage as well.
-			if ( is_array( $config ) && isset( $config['help_sidebar'] ) ) {
+			if (is_array($config) && isset($config['help_sidebar'])) {
 				//check that the callback given is valid
-				if ( !method_exists($this, $config['help_sidebar'] ) )
-					throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
+				if ( ! method_exists($this, $config['help_sidebar']))
+					throw new EE_Error(sprintf(__('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this)));
 
-				$content = apply_filters( 'FHEE__' . get_class($this) . '__add_help_tabs__help_sidebar', call_user_func( array( $this, $config['help_sidebar'] ) ) );
+				$content = apply_filters('FHEE__'.get_class($this).'__add_help_tabs__help_sidebar', call_user_func(array($this, $config['help_sidebar'])));
 
 				$content .= $tour_buttons; //add help tour buttons.
 
@@ -1070,49 +1070,49 @@ 
 			}
 
 			//if we DON'T have config help sidebar and there ARE toure buttons then we'll just add the tour buttons to the sidebar.
-			if ( !isset( $config['help_sidebar'] ) && !empty( $tour_buttons ) ) {
+			if ( ! isset($config['help_sidebar']) && ! empty($tour_buttons)) {
 				$this->_current_screen->set_help_sidebar($tour_buttons);
 			}
 
 			//handle if no help_tabs are set so the sidebar will still show for the help tour buttons
-			if ( !isset( $config['help_tabs'] ) && !empty($tour_buttons) ) {
+			if ( ! isset($config['help_tabs']) && ! empty($tour_buttons)) {
 				$_ht['id'] = $this->page_slug;
 				$_ht['title'] = __('Help Tours', 'event_espresso');
-				$_ht['content'] = '<p>' . __('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso') . '</p>';
+				$_ht['content'] = '<p>'.__('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso').'</p>';
 				$this->_current_screen->add_help_tab($_ht);
 				}/**/
 
 
-			if ( !isset( $config['help_tabs'] ) ) return; //no help tabs for this route
+			if ( ! isset($config['help_tabs'])) return; //no help tabs for this route
 
-			foreach ( (array) $config['help_tabs'] as $tab_id => $cfg ) {
+			foreach ((array) $config['help_tabs'] as $tab_id => $cfg) {
 				//we're here so there ARE help tabs!
 
 				//make sure we've got what we need
-				if ( !isset( $cfg['title'] ) )
-					throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
+				if ( ! isset($cfg['title']))
+					throw new EE_Error(__('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso'));
 
 
-				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) )
-					throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
+				if ( ! isset($cfg['filename']) && ! isset($cfg['callback']) && ! isset($cfg['content']))
+					throw new EE_Error(__('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso'));
 
 
 
 				//first priority goes to content.
-				if ( !empty($cfg['content'] ) ) {
-					$content = !empty($cfg['content']) ? $cfg['content'] : NULL;
+				if ( ! empty($cfg['content'])) {
+					$content = ! empty($cfg['content']) ? $cfg['content'] : NULL;
 
 				//second priority goes to filename
-				} else if ( !empty($cfg['filename'] ) ) {
-					$file_path = $this->_get_dir() . '/help_tabs/' . $cfg['filename'] . '.help_tab.php';
+				} else if ( ! empty($cfg['filename'])) {
+					$file_path = $this->_get_dir().'/help_tabs/'.$cfg['filename'].'.help_tab.php';
 
 
 					//it's possible that the file is located on decaf route (and above sets up for caf route, if this is the case then lets check decaf route too)
-					$file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tabs/' . $cfg['filename'] . '.help_tab.php' : $file_path;
+					$file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES.basename($this->_get_dir()).'/help_tabs/'.$cfg['filename'].'.help_tab.php' : $file_path;
 
 					//if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error.
-					if ( !is_readable($file_path) && !isset($cfg['callback']) ) {
-						EE_Error::add_error( sprintf( __('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content.  Please check that the string you set for the help tab on this route (%s) is the correct spelling.  The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path ), __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! is_readable($file_path) && ! isset($cfg['callback'])) {
+						EE_Error::add_error(sprintf(__('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content.  Please check that the string you set for the help tab on this route (%s) is the correct spelling.  The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path), __FILE__, __FUNCTION__, __LINE__);
 						return;
 					}
 					$template_args['admin_page_obj'] = $this;
@@ -1123,21 +1123,21 @@ 
 
 
 				//check if callback is valid
-				if ( empty($content) && ( !isset($cfg['callback']) || !method_exists( $this, $cfg['callback'] ) ) ) {
-					EE_Error::add_error( sprintf( __('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content.  Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title'] ), __FILE__, __FUNCTION__, __LINE__ );
+				if (empty($content) && ( ! isset($cfg['callback']) || ! method_exists($this, $cfg['callback']))) {
+					EE_Error::add_error(sprintf(__('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content.  Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title']), __FILE__, __FUNCTION__, __LINE__);
 					return;
 				}
 
 				//setup config array for help tab method
-				$id = $this->page_slug . '-' . $this->_req_action . '-' . $tab_id;
+				$id = $this->page_slug.'-'.$this->_req_action.'-'.$tab_id;
 				$_ht = array(
 					'id' => $id,
 					'title' => $cfg['title'],
-					'callback' => isset( $cfg['callback'] ) && empty($content) ? array( $this, $cfg['callback'] ) : NULL,
+					'callback' => isset($cfg['callback']) && empty($content) ? array($this, $cfg['callback']) : NULL,
 					'content' => $content
 					);
 
-				$this->_current_screen->add_help_tab( $_ht );
+				$this->_current_screen->add_help_tab($_ht);
 			}
 		}
 	}
@@ -1157,49 +1157,49 @@ 
 		$this->_help_tour = array();
 
 		//exit early if help tours are turned off globally
-		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) )
+		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || (defined('EE_DISABLE_HELP_TOURS') && EE_DISABLE_HELP_TOURS))
 			return;
 
 		//loop through _page_config to find any help_tour defined
-		foreach ( $this->_page_config as $route => $config ) {
+		foreach ($this->_page_config as $route => $config) {
 			//we're only going to set things up for this route
-			if ( $route !== $this->_req_action )
+			if ($route !== $this->_req_action)
 				continue;
 
-			if ( isset( $config['help_tour'] ) ) {
+			if (isset($config['help_tour'])) {
 
-				foreach( $config['help_tour'] as $tour ) {
-					$file_path = $this->_get_dir() . '/help_tours/' . $tour . '.class.php';
+				foreach ($config['help_tour'] as $tour) {
+					$file_path = $this->_get_dir().'/help_tours/'.$tour.'.class.php';
 					//let's see if we can get that file... if not its possible this is a decaf route not set in caffienated so lets try and get the caffeinated equivalent
-					$file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tours/' . $tour . '.class.php' : $file_path;
+					$file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES.basename($this->_get_dir()).'/help_tours/'.$tour.'.class.php' : $file_path;
 
 					//if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error.
-					if ( !is_readable($file_path) ) {
-						EE_Error::add_error( sprintf( __('The file path given for the help tour (%s) is not a valid path.  Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour ), __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! is_readable($file_path)) {
+						EE_Error::add_error(sprintf(__('The file path given for the help tour (%s) is not a valid path.  Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour), __FILE__, __FUNCTION__, __LINE__);
 						return;
 					}
 
 					require_once $file_path;
-					if ( !class_exists( $tour ) ) {
-						$error_msg[] = sprintf( __('Something went wrong with loading the %s Help Tour Class.', 'event_espresso' ), $tour);
-						$error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this) );
-						throw new EE_Error( implode( '||', $error_msg ));
+					if ( ! class_exists($tour)) {
+						$error_msg[] = sprintf(__('Something went wrong with loading the %s Help Tour Class.', 'event_espresso'), $tour);
+						$error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this));
+						throw new EE_Error(implode('||', $error_msg));
 					}
 					$a = new ReflectionClass($tour);
 					$tour_obj = $a->newInstance($this->_is_caf);
 
 					$tours[] = $tour_obj;
-					$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $tour_obj );
+					$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($tour_obj);
 				}
 
 				//let's inject the end tour stop element common to all pages... this will only get seen once per machine.
 				$end_stop_tour = new EE_Help_Tour_final_stop($this->_is_caf);
 				$tours[] = $end_stop_tour;
-				$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $end_stop_tour );
+				$this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($end_stop_tour);
 			}
 		}
 
-		if ( !empty( $tours ) )
+		if ( ! empty($tours))
 			$this->_help_tour['tours'] = $tours;
 
 		//thats it!  Now that the $_help_tours property is set (or not) the scripts and html should be taken care of automatically.
@@ -1215,12 +1215,12 @@ 
 	 * @return void
 	 */
 	protected function _add_qtips() {
-		if ( isset( $this->_route_config['qtips'] ) ) {
+		if (isset($this->_route_config['qtips'])) {
 			$qtips = (array) $this->_route_config['qtips'];
 			//load qtip loader
 			$path = array(
-				$this->_get_dir() . '/qtips/',
-				EE_ADMIN_PAGES . basename($this->_get_dir()) . '/qtips/'
+				$this->_get_dir().'/qtips/',
+				EE_ADMIN_PAGES.basename($this->_get_dir()).'/qtips/'
 				);
 			EEH_Qtip_Loader::instance()->register($qtips, $path);
 		}
@@ -1237,41 +1237,41 @@ 
 	 * @return void
 	 */
 	protected function _set_nav_tabs() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$i = 0;
-		foreach ( $this->_page_config as $slug => $config ) {
-			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) )
+		foreach ($this->_page_config as $slug => $config) {
+			if ( ! is_array($config) || (is_array($config) && (isset($config['nav']) && ! $config['nav']) || ! isset($config['nav'])))
 				continue; //no nav tab for this config
 
 			//check for persistent flag
-			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action )
+			if (isset($config['nav']['persistent']) && ! $config['nav']['persistent'] && $slug !== $this->_req_action)
 				continue; //nav tab is only to appear when route requested.
 
-			if ( ! $this->check_user_access( $slug, TRUE ) )
+			if ( ! $this->check_user_access($slug, TRUE))
 				continue; //no nav tab becasue current user does not have access.
 
-			$css_class = isset( $config['css_class'] ) ? $config['css_class'] . ' ' : '';
+			$css_class = isset($config['css_class']) ? $config['css_class'].' ' : '';
 			$this->_nav_tabs[$slug] = array(
-				'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce( array( 'action'=>$slug ), $this->_admin_base_url ),
-				'link_text' => isset( $config['nav']['label'] ) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug ) ),
-				'css_class' => $this->_req_action == $slug ? $css_class . 'nav-tab-active' : $css_class,
-				'order' => isset( $config['nav']['order'] ) ? $config['nav']['order'] : $i
+				'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce(array('action'=>$slug), $this->_admin_base_url),
+				'link_text' => isset($config['nav']['label']) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug)),
+				'css_class' => $this->_req_action == $slug ? $css_class.'nav-tab-active' : $css_class,
+				'order' => isset($config['nav']['order']) ? $config['nav']['order'] : $i
 				);
 			$i++;
 		}
 
 		//if $this->_nav_tabs is empty then lets set the default
-		if ( empty( $this->_nav_tabs ) ) {
+		if (empty($this->_nav_tabs)) {
 			$this->_nav_tabs[$this->default_nav_tab_name] = array(
 				'url' => $this->admin_base_url,
-				'link_text' => ucwords( str_replace( '_', ' ', $this->default_nav_tab_name ) ),
+				'link_text' => ucwords(str_replace('_', ' ', $this->default_nav_tab_name)),
 				'css_class' => 'nav-tab-active',
 				'order' => 10
 				);
 		}
 
 		//now let's sort the tabs according to order
-		usort( $this->_nav_tabs, array($this, '_sort_nav_tabs' ));
+		usort($this->_nav_tabs, array($this, '_sort_nav_tabs'));
 
 	}
 
@@ -1287,10 +1287,10 @@ 
 	 * @return void
 	 */
 	private function _set_current_labels() {
-		if ( is_array($this->_route_config) && isset($this->_route_config['labels']) ) {
-			foreach ( $this->_route_config['labels'] as $label => $text ) {
-				if ( is_array($text) ) {
-					foreach ( $text as $sublabel => $subtext ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['labels'])) {
+			foreach ($this->_route_config['labels'] as $label => $text) {
+				if (is_array($text)) {
+					foreach ($text as $sublabel => $subtext) {
 						$this->_labels[$label][$sublabel] = $subtext;
 					}
 				} else {
@@ -1311,24 +1311,24 @@ 
 	 * 		@param bool   $verify_only Default is FALSE which means if user check fails then wp_die().  Otherwise just return false if verify fail.
 	*		@return 		BOOL|wp_die()
 	*/
-	public function check_user_access( $route_to_check = '', $verify_only = FALSE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$route_to_check = empty( $route_to_check ) ? $this->_req_action : $route_to_check;
-		$capability = ! empty( $route_to_check ) && isset( $this->_page_routes[$route_to_check] ) && is_array( $this->_page_routes[$route_to_check] ) && ! empty( $this->_page_routes[$route_to_check]['capability'] ) ? $this->_page_routes[$route_to_check]['capability'] : NULL;
+	public function check_user_access($route_to_check = '', $verify_only = FALSE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$route_to_check = empty($route_to_check) ? $this->_req_action : $route_to_check;
+		$capability = ! empty($route_to_check) && isset($this->_page_routes[$route_to_check]) && is_array($this->_page_routes[$route_to_check]) && ! empty($this->_page_routes[$route_to_check]['capability']) ? $this->_page_routes[$route_to_check]['capability'] : NULL;
 
-		if ( empty( $capability ) && empty( $route_to_check )  ) {
-			$capability = is_array( $this->_route ) && empty( $this->_route['capability'] ) ? 'manage_options' : $this->_route['capability'];
+		if (empty($capability) && empty($route_to_check)) {
+			$capability = is_array($this->_route) && empty($this->_route['capability']) ? 'manage_options' : $this->_route['capability'];
 		} else {
-			$capability = empty( $capability ) ? 'manage_options' : $capability;
+			$capability = empty($capability) ? 'manage_options' : $capability;
 		}
 
-		$id = is_array( $this->_route ) && ! empty( $this->_route['obj_id'] ) ? $this->_route['obj_id'] : 0;
+		$id = is_array($this->_route) && ! empty($this->_route['obj_id']) ? $this->_route['obj_id'] : 0;
 
-		if (( ! function_exists( 'is_admin' ) || ! EE_Registry::instance()->CAP->current_user_can( $capability, $this->page_slug . '_' . $route_to_check, $id ) ) && ! defined( 'DOING_AJAX')) {
-			if ( $verify_only ) {
+		if (( ! function_exists('is_admin') || ! EE_Registry::instance()->CAP->current_user_can($capability, $this->page_slug.'_'.$route_to_check, $id)) && ! defined('DOING_AJAX')) {
+			if ($verify_only) {
 				return FALSE;
 			} else {
-				wp_die( __('You do not have access to this route.', 'event_espresso' ) );
+				wp_die(__('You do not have access to this route.', 'event_espresso'));
 			}
 		}
 		return TRUE;
@@ -1405,7 +1405,7 @@ 
 		$this->_add_admin_page_overlay();
 
 		//if metaboxes are present we need to add the nonce field
-		if ( ( isset($this->_route_config['metaboxes']) || ( isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes'] ) || isset($this->_route_config['list_table']) ) ) {
+		if ((isset($this->_route_config['metaboxes']) || (isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes']) || isset($this->_route_config['list_table']))) {
 			wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
 			wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
 		}
@@ -1424,19 +1424,19 @@ 
 	 */
 	public function admin_footer_global() {
 		//dialog container for dialog helper
-		$d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">' . "\n";
+		$d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">'."\n";
 		$d_cont .= '<div class="ee-notices"></div>';
 		$d_cont .= '<div class="ee-admin-dialog-container-inner-content"></div>';
 		$d_cont .= '</div>';
 		echo $d_cont;
 
 		//help tour stuff?
-		if ( isset( $this->_help_tour[$this->_req_action] ) ) {
+		if (isset($this->_help_tour[$this->_req_action])) {
 			echo implode('<br />', $this->_help_tour[$this->_req_action]);
 		}
 
 		//current set timezone for timezone js
-		echo '<span id="current_timezone" class="hidden">' . EEH_DTT_Helper::get_timezone() . '</span>';
+		echo '<span id="current_timezone" class="hidden">'.EEH_DTT_Helper::get_timezone().'</span>';
 	}
 
 
@@ -1460,18 +1460,18 @@ 
 	 * @access protected
 	 * @return string content
 	 */
-	protected function _set_help_popup_content( $help_array = array(), $display = FALSE ) {
+	protected function _set_help_popup_content($help_array = array(), $display = FALSE) {
 		$content = '';
 
-		$help_array = empty( $help_array ) ? $this->_get_help_content() : $help_array;
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_help_popup.template.php';
+		$help_array = empty($help_array) ? $this->_get_help_content() : $help_array;
+		$template_path = EE_ADMIN_TEMPLATE.'admin_help_popup.template.php';
 
 
 		//loop through the array and setup content
-		foreach ( $help_array as $trigger => $help ) {
+		foreach ($help_array as $trigger => $help) {
 			//make sure the array is setup properly
-			if ( !isset($help['title']) || !isset($help['content'] ) ) {
-				throw new EE_Error( __('Does not look like the popup content array has been setup correctly.  Might want to double check that.  Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso') );
+			if ( ! isset($help['title']) || ! isset($help['content'])) {
+				throw new EE_Error(__('Does not look like the popup content array has been setup correctly.  Might want to double check that.  Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso'));
 			}
 
 			//we're good so let'd setup the template vars and then assign parsed template content to our content.
@@ -1481,10 +1481,10 @@ 
 				'help_popup_content' => $help['content']
 				);
 
-			$content .= EEH_Template::display_template( $template_path, $template_args, TRUE );
+			$content .= EEH_Template::display_template($template_path, $template_args, TRUE);
 		}
 
-		if ( $display )
+		if ($display)
 			echo $content;
 		else
 			return $content;
@@ -1501,18 +1501,18 @@ 
 	 */
 	private function _get_help_content() {
 		//what is the method we're looking for?
-		$method_name = '_help_popup_content_' . $this->_req_action;
+		$method_name = '_help_popup_content_'.$this->_req_action;
 
 		//if method doesn't exist let's get out.
-		if ( !method_exists( $this, $method_name ) )
+		if ( ! method_exists($this, $method_name))
 			return array();
 
 		//k we're good to go let's retrieve the help array
-		$help_array = call_user_func( array( $this, $method_name ) );
+		$help_array = call_user_func(array($this, $method_name));
 
 		//make sure we've got an array!
-		if ( !is_array($help_array) ) {
-			throw new EE_Error( __('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso' ) );
+		if ( ! is_array($help_array)) {
+			throw new EE_Error(__('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso'));
 		}
 
 		return $help_array;
@@ -1534,27 +1534,27 @@ 
 	 * @param array $dimensions an array of dimensions for the box (array(h,w))
 	 * @return string
 	 */
-	protected function _set_help_trigger( $trigger_id, $display = TRUE, $dimensions = array( '400', '640') ) {
+	protected function _set_help_trigger($trigger_id, $display = TRUE, $dimensions = array('400', '640')) {
 
-		if ( defined('DOING_AJAX') ) return;
+		if (defined('DOING_AJAX')) return;
 
 		//let's check and see if there is any content set for this popup.  If there isn't then we'll include a default title and content so that developers know something needs to be corrected
 		$help_array = $this->_get_help_content();
 		$help_content = '';
 
-		if ( empty( $help_array ) || !isset( $help_array[$trigger_id] ) ) {
+		if (empty($help_array) || ! isset($help_array[$trigger_id])) {
 			$help_array[$trigger_id] = array(
 				'title' => __('Missing Content', 'event_espresso'),
 				'content' => __('A trigger has been set that doesn\'t have any corresponding content. Make sure you have set the help content. (see the "_set_help_popup_content" method in the EE_Admin_Page for instructions.)', 'event_espresso')
 				);
-			$help_content = $this->_set_help_popup_content( $help_array, FALSE );
+			$help_content = $this->_set_help_popup_content($help_array, FALSE);
 		}
 
 		//let's setup the trigger
-		$content = '<a class="ee-dialog" href="?height='. $dimensions[0] . '&width=' . $dimensions[1] . '&inlineId=' . $trigger_id . '" target="_blank"><span class="question ee-help-popup-question"></span></a>';
-		$content = $content . $help_content;
+		$content = '<a class="ee-dialog" href="?height='.$dimensions[0].'&width='.$dimensions[1].'&inlineId='.$trigger_id.'" target="_blank"><span class="question ee-help-popup-question"></span></a>';
+		$content = $content.$help_content;
 
-		if ( $display )
+		if ($display)
 			echo $content;
 		else
 			return $content;
@@ -1611,15 +1611,15 @@ 
 	public function load_global_scripts_styles() {
 		/** STYLES **/
 		// add debugging styles
-		if ( WP_DEBUG ) {
-			add_action('admin_head', array( $this, 'add_xdebug_style' ));
+		if (WP_DEBUG) {
+			add_action('admin_head', array($this, 'add_xdebug_style'));
 		}
 
 		//register all styles
-		wp_register_style( 'espresso-ui-theme', EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(),EVENT_ESPRESSO_VERSION );
-		wp_register_style('ee-admin-css', EE_ADMIN_URL . 'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('espresso-ui-theme', EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_register_style('ee-admin-css', EE_ADMIN_URL.'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION);
 		//helpers styles
-		wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION);
 		//enqueue global styles
 		wp_enqueue_style('ee-admin-css');
 
@@ -1627,66 +1627,66 @@ 
 		/** SCRIPTS **/
 
 		//register all scripts
-		wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script('ee-dialog', EE_ADMIN_URL . 'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script('ee_admin_js', EE_ADMIN_URL . 'assets/ee-admin-page.js', array( 'espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true );
+		wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-dialog', EE_ADMIN_URL.'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee_admin_js', EE_ADMIN_URL.'assets/ee-admin-page.js', array('espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true);
 
-		wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL . 'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true );
+		wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL.'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true);
 		// register jQuery Validate - see /includes/functions/wp_hooks.php
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
+		add_filter('FHEE_load_jquery_validate', '__return_true');
 		add_filter('FHEE_load_joyride', '__return_true');
 
 		//script for sorting tables
-		wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL . "assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL."assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
 		//script for parsing uri's
-		wp_register_script( 'ee-parse-uri', EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-parse-uri', EE_GLOBAL_ASSETS_URL.'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE);
 		//and parsing associative serialized form elements
-		wp_register_script( 'ee-serialize-full-array', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-serialize-full-array', EE_GLOBAL_ASSETS_URL.'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		//helpers scripts
-		wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-moment-core', EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-moment', EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_register_script( 'ee-datepicker', EE_ADMIN_URL . 'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon','ee-moment'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-moment-core', EE_THIRD_PARTY_URL.'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-moment', EE_THIRD_PARTY_URL.'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('ee-datepicker', EE_ADMIN_URL.'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon', 'ee-moment'), EVENT_ESPRESSO_VERSION, TRUE);
 
 		//google charts
-		wp_register_script( 'google-charts', 'https://www.gstatic.com/charts/loader.js', array(), EVENT_ESPRESSO_VERSION, false );
+		wp_register_script('google-charts', 'https://www.gstatic.com/charts/loader.js', array(), EVENT_ESPRESSO_VERSION, false);
 
 		//enqueue global scripts
 
 		//taking care of metaboxes
-		if ( ( isset($this->_route_config['metaboxes'] ) || isset($this->_route_config['has_metaboxes']) ) && empty( $this->_cpt_route) ) {
+		if ((isset($this->_route_config['metaboxes']) || isset($this->_route_config['has_metaboxes'])) && empty($this->_cpt_route)) {
 			wp_enqueue_script('dashboard');
 		}
 
 		//enqueue thickbox for ee help popups.  default is to enqueue unless its explicitly set to false since we're assuming all EE pages will have popups
-		if ( ! isset( $this->_route_config['has_help_popups']) || ( isset( $this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'] ) ) {
+		if ( ! isset($this->_route_config['has_help_popups']) || (isset($this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'])) {
 			wp_enqueue_script('ee_admin_js');
 			wp_enqueue_style('ee-admin-css');
 		}
 
 
 		//localize script for ajax lazy loading
-		$lazy_loader_container_ids = apply_filters( 'FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content') );
-		wp_localize_script( 'ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids);
+		$lazy_loader_container_ids = apply_filters('FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content'));
+		wp_localize_script('ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids);
 
 
 		/**
 		 * help tour stuff
 		 */
-		if ( !empty( $this->_help_tour ) ) {
+		if ( ! empty($this->_help_tour)) {
 
 			//register the js for kicking things off
-			wp_enqueue_script('ee-help-tour', EE_ADMIN_URL . 'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE );
+			wp_enqueue_script('ee-help-tour', EE_ADMIN_URL.'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE);
 
 			//setup tours for the js tour object
-			foreach ( $this->_help_tour['tours'] as $tour ) {
+			foreach ($this->_help_tour['tours'] as $tour) {
 				$tours[] = array(
 					'id' => $tour->get_slug(),
 					'options' => $tour->get_options()
 					);
 			}
 
-			wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours ) );
+			wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours));
 
 			//admin_footer_global will take care of making sure our help_tour skeleton gets printed via the info stored in $this->_help_tour
 		}
@@ -1704,52 +1704,52 @@ 
 	public function admin_footer_scripts_eei18n_js_strings() {
 
 		EE_Registry::$i18n_js_strings['ajax_url'] = WP_AJAX_URL;
-		EE_Registry::$i18n_js_strings['confirm_delete'] = __( 'Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA associated with this item!!!\nThis can NOT be undone!!!', 'event_espresso' );
-
-		EE_Registry::$i18n_js_strings['January'] = __( 'January', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['February'] = __( 'February', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['March'] = __( 'March', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['April'] = __( 'April', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['June'] = __( 'June', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['July'] = __( 'July', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['August'] = __( 'August', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['September'] = __( 'September', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['October'] = __( 'October', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['November'] = __( 'November', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['December'] = __( 'December', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jan'] = __( 'Jan', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Feb'] = __( 'Feb', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Mar'] = __( 'Mar', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Apr'] = __( 'Apr', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jun'] = __( 'Jun', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Jul'] = __( 'Jul', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Aug'] = __( 'Aug', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sep'] = __( 'Sep', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Oct'] = __( 'Oct', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Nov'] = __( 'Nov', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Dec'] = __( 'Dec', 'event_espresso' );
-
-		EE_Registry::$i18n_js_strings['Sunday'] = __( 'Sunday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Monday'] = __( 'Monday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Tuesday'] = __( 'Tuesday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Wednesday'] = __( 'Wednesday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Thursday'] = __( 'Thursday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Friday'] = __( 'Friday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Saturday'] = __( 'Saturday', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sun'] = __( 'Sun', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Mon'] = __( 'Mon', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Tue'] = __( 'Tue', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Wed'] = __( 'Wed', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Thu'] = __( 'Thu', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Fri'] = __( 'Fri', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['Sat'] = __( 'Sat', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['confirm_delete'] = __('Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA associated with this item!!!\nThis can NOT be undone!!!', 'event_espresso');
+
+		EE_Registry::$i18n_js_strings['January'] = __('January', 'event_espresso');
+		EE_Registry::$i18n_js_strings['February'] = __('February', 'event_espresso');
+		EE_Registry::$i18n_js_strings['March'] = __('March', 'event_espresso');
+		EE_Registry::$i18n_js_strings['April'] = __('April', 'event_espresso');
+		EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso');
+		EE_Registry::$i18n_js_strings['June'] = __('June', 'event_espresso');
+		EE_Registry::$i18n_js_strings['July'] = __('July', 'event_espresso');
+		EE_Registry::$i18n_js_strings['August'] = __('August', 'event_espresso');
+		EE_Registry::$i18n_js_strings['September'] = __('September', 'event_espresso');
+		EE_Registry::$i18n_js_strings['October'] = __('October', 'event_espresso');
+		EE_Registry::$i18n_js_strings['November'] = __('November', 'event_espresso');
+		EE_Registry::$i18n_js_strings['December'] = __('December', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jan'] = __('Jan', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Feb'] = __('Feb', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Mar'] = __('Mar', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Apr'] = __('Apr', 'event_espresso');
+		EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jun'] = __('Jun', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Jul'] = __('Jul', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Aug'] = __('Aug', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sep'] = __('Sep', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Oct'] = __('Oct', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Nov'] = __('Nov', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Dec'] = __('Dec', 'event_espresso');
+
+		EE_Registry::$i18n_js_strings['Sunday'] = __('Sunday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Monday'] = __('Monday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Tuesday'] = __('Tuesday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Wednesday'] = __('Wednesday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Thursday'] = __('Thursday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Friday'] = __('Friday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Saturday'] = __('Saturday', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sun'] = __('Sun', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Mon'] = __('Mon', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Tue'] = __('Tue', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Wed'] = __('Wed', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Thu'] = __('Thu', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Fri'] = __('Fri', 'event_espresso');
+		EE_Registry::$i18n_js_strings['Sat'] = __('Sat', 'event_espresso');
 
 		//setting on espresso_core instead of ee_admin_js because espresso_core is enqueued by the maintenance
 		//admin page when in maintenance mode and ee_admin_js is not loaded then.  This works everywhere else because
 		//espresso_core is listed as a dependency of ee_admin_js.
-		wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings );
+		wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
 
 	}
 
@@ -1783,23 +1783,23 @@ 
 	protected function _set_list_table() {
 
 		//first is this a list_table view?
-		if ( !isset($this->_route_config['list_table']) )
+		if ( ! isset($this->_route_config['list_table']))
 			return; //not a list_table view so get out.
 
 		//list table functions are per view specific (because some admin pages might have more than one listtable!)
 
-		if ( call_user_func( array( $this, '_set_list_table_views_' . $this->_req_action ) ) === FALSE ) {
+		if (call_user_func(array($this, '_set_list_table_views_'.$this->_req_action)) === FALSE) {
 			//user error msg
-			$error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso' );
+			$error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso');
 			//developer error msg
-			$error_msg .= '||' . sprintf( __('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso' ), $this->_req_action, '_set_list_table_views_' . $this->_req_action );
-			throw new EE_Error( $error_msg );
+			$error_msg .= '||'.sprintf(__('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso'), $this->_req_action, '_set_list_table_views_'.$this->_req_action);
+			throw new EE_Error($error_msg);
 		}
 
 		//let's provide the ability to filter the views per PAGE AND ROUTE, per PAGE, and globally
-		$this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug . '_' . $this->_req_action, $this->_views );
-		$this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug, $this->_views );
-		$this->_views = apply_filters( 'FHEE_list_table_views', $this->_views );
+		$this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug.'_'.$this->_req_action, $this->_views);
+		$this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug, $this->_views);
+		$this->_views = apply_filters('FHEE_list_table_views', $this->_views);
 
 		$this->_set_list_table_view();
 		$this->_set_list_table_object();
@@ -1821,14 +1821,14 @@ 
 	*		@return array
 	*/
 	protected function _set_list_table_view() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 
 		// looking at active items or dumpster diving ?
-		if ( ! isset( $this->_req_data['status'] ) || ! array_key_exists( $this->_req_data['status'], $this->_views )) {
-			$this->_view = isset( $this->_views['in_use'] ) ? 'in_use' : 'all';
+		if ( ! isset($this->_req_data['status']) || ! array_key_exists($this->_req_data['status'], $this->_views)) {
+			$this->_view = isset($this->_views['in_use']) ? 'in_use' : 'all';
 		} else {
-			$this->_view = sanitize_key( $this->_req_data['status'] );
+			$this->_view = sanitize_key($this->_req_data['status']);
 		}
 	}
 
@@ -1841,8 +1841,8 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _set_list_table_object() {
-		if ( isset( $this->_route_config['list_table'] ) ) {
-			if ( ! class_exists( $this->_route_config['list_table'] ) ) {
+		if (isset($this->_route_config['list_table'])) {
+			if ( ! class_exists($this->_route_config['list_table'])) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -1850,12 +1850,12 @@ 
 							'event_espresso'
 						),
 						$this->_route_config['list_table'],
-						get_class( $this )
+						get_class($this)
 					)
 				);
 			}
 			$list_table = $this->_route_config['list_table'];
-			$this->_list_table_object = new $list_table( $this );
+			$this->_list_table_object = new $list_table($this);
 		}
 	}
 
@@ -1872,27 +1872,27 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_list_table_view_RLs( $extra_query_args = array() ) {
+	public function get_list_table_view_RLs($extra_query_args = array()) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		if ( empty( $this->_views )) {
+		if (empty($this->_views)) {
 			$this->_views = array();
 		}
 
 		// cycle thru views
-		foreach ( $this->_views as $key => $view ) {
+		foreach ($this->_views as $key => $view) {
 			$query_args = array();
 			// check for current view
-			$this->_views[ $key ]['class'] = $this->_view == $view['slug'] ? 'current' : '';
+			$this->_views[$key]['class'] = $this->_view == $view['slug'] ? 'current' : '';
 			$query_args['action'] = $this->_req_action;
-			$query_args[$this->_req_action.'_nonce'] = wp_create_nonce( $query_args['action'] . '_nonce' );
+			$query_args[$this->_req_action.'_nonce'] = wp_create_nonce($query_args['action'].'_nonce');
 			$query_args['status'] = $view['slug'];
 			//merge any other arguments sent in.
-			if ( isset( $extra_query_args[$view['slug']] ) ) {
-				$query_args = array_merge( $query_args, $extra_query_args[$view['slug']] );
+			if (isset($extra_query_args[$view['slug']])) {
+				$query_args = array_merge($query_args, $extra_query_args[$view['slug']]);
 			}
-			$this->_views[ $key ]['url'] = EE_Admin_Page::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
+			$this->_views[$key]['url'] = EE_Admin_Page::add_query_args_and_nonce($query_args, $this->_admin_base_url);
 		}
 
 		return $this->_views;
@@ -1909,15 +1909,15 @@ 
 	 * @param int $max_entries total number of rows in the table
 	 * @return string
 	*/
-	protected function _entries_per_page_dropdown( $max_entries = FALSE ) {
+	protected function _entries_per_page_dropdown($max_entries = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$values = array( 10, 25, 50, 100 );
-		$per_page = ( ! empty( $this->_req_data['per_page'] )) ? absint( $this->_req_data['per_page'] ) : 10;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$values = array(10, 25, 50, 100);
+		$per_page = ( ! empty($this->_req_data['per_page'])) ? absint($this->_req_data['per_page']) : 10;
 
-		if ( $max_entries ) {
+		if ($max_entries) {
 			$values[] = $max_entries;
-			sort( $values );
+			sort($values);
 		}
 
 		$entries_per_page_dropdown = '
@@ -1926,15 +1926,15 @@ 
 					Show
 					<select id="entries-per-page-slct" name="entries-per-page-slct">';
 
-		foreach ( $values as $value ) {
-			if ( $value < $max_entries ) {
-				$selected = $value == $per_page ?  ' selected="' . $per_page . '"' : '';
+		foreach ($values as $value) {
+			if ($value < $max_entries) {
+				$selected = $value == $per_page ? ' selected="'.$per_page.'"' : '';
 				$entries_per_page_dropdown .= '
 						<option value="'.$value.'"'.$selected.'>'.$value.'&nbsp;&nbsp;</option>';
 			}
 		}
 
-		$selected = $max_entries == $per_page ?  ' selected="' . $per_page . '"' : '';
+		$selected = $max_entries == $per_page ? ' selected="'.$per_page.'"' : '';
 		$entries_per_page_dropdown .= '
 						<option value="'.$max_entries.'"'.$selected.'>All&nbsp;&nbsp;</option>';
 
@@ -1957,8 +1957,8 @@ 
 	*		@return 		void
 	*/
 	public function _set_search_attributes() {
-		$this->_template_args['search']['btn_label'] = sprintf( __( 'Search %s', 'event_espresso' ), empty( $this->_search_btn_label ) ? $this->page_label : $this->_search_btn_label );
-		$this->_template_args['search']['callback'] = 'search_' . $this->page_slug;
+		$this->_template_args['search']['btn_label'] = sprintf(__('Search %s', 'event_espresso'), empty($this->_search_btn_label) ? $this->page_label : $this->_search_btn_label);
+		$this->_template_args['search']['callback'] = 'search_'.$this->page_slug;
 	}
 
 	/*** END LIST TABLE METHODS **/
@@ -1977,10 +1977,10 @@ 
 	 * @return void
 	*/
 	private function _add_registered_meta_boxes() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//we only add meta boxes if the page_route calls for it
-		if ( is_array( $this->_route_config ) && isset( $this->_route_config['metaboxes'] )
+		if (is_array($this->_route_config) && isset($this->_route_config['metaboxes'])
 			 && is_array(
 			 $this->_route_config['metaboxes']
 			 )
@@ -1988,27 +1988,27 @@ 
 			// this simply loops through the callbacks provided
 			// and checks if there is a corresponding callback registered by the child
 			// if there is then we go ahead and process the metabox loader.
-			foreach ( $this->_route_config['metaboxes'] as $metabox_callback ) {
+			foreach ($this->_route_config['metaboxes'] as $metabox_callback) {
 				// first check for Closures
-				if ( $metabox_callback instanceof Closure ) {
+				if ($metabox_callback instanceof Closure) {
 					$result = $metabox_callback();
-				} else if ( is_array( $metabox_callback ) && isset( $metabox_callback[0], $metabox_callback[1] ) ) {
-					$result = call_user_func( array( $metabox_callback[0], $metabox_callback[1] ) );
+				} else if (is_array($metabox_callback) && isset($metabox_callback[0], $metabox_callback[1])) {
+					$result = call_user_func(array($metabox_callback[0], $metabox_callback[1]));
 				} else {
-					$result = call_user_func( array( $this, &$metabox_callback ) );
+					$result = call_user_func(array($this, &$metabox_callback));
 				}
-				if ( $result === FALSE ) {
+				if ($result === FALSE) {
 					// user error msg
-					$error_msg =  __( 'An error occurred. The  requested metabox could not be found.', 'event_espresso' );
+					$error_msg = __('An error occurred. The  requested metabox could not be found.', 'event_espresso');
 					// developer error msg
-					$error_msg .= '||' . sprintf(
+					$error_msg .= '||'.sprintf(
 						__(
 							'The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.',
 							'event_espresso'
 						),
 						$metabox_callback
 					);
-					throw new EE_Error( $error_msg );
+					throw new EE_Error($error_msg);
 				}
 			}
 		}
@@ -2025,17 +2025,17 @@ 
 	 * @return void
 	 */
 	private function _add_screen_columns() {
-		if ( is_array($this->_route_config) && isset( $this->_route_config['columns'] ) && is_array($this->_route_config['columns']) && count( $this->_route_config['columns'] == 2 ) ) {
+		if (is_array($this->_route_config) && isset($this->_route_config['columns']) && is_array($this->_route_config['columns']) && count($this->_route_config['columns'] == 2)) {
 
-			add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1] ) );
+			add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1]));
 			$this->_template_args['num_columns'] = $this->_route_config['columns'][0];
 			$screen_id = $this->_current_screen->id;
 			$screen_columns = (int) get_user_option("screen_layout_$screen_id");
-			$total_columns = !empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1];
-			$this->_template_args['current_screen_widget_class'] = 'columns-' . $total_columns;
+			$total_columns = ! empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1];
+			$this->_template_args['current_screen_widget_class'] = 'columns-'.$total_columns;
 			$this->_template_args['current_page'] = $this->_wp_page_slug;
 			$this->_template_args['screen'] = $this->_current_screen;
-			$this->_column_template_path = EE_ADMIN_TEMPLATE . 'admin_details_metabox_column_wrapper.template.php';
+			$this->_column_template_path = EE_ADMIN_TEMPLATE.'admin_details_metabox_column_wrapper.template.php';
 
 			//finally if we don't have has_metaboxes set in the route config let's make sure it IS set other wise the necessary hidden fields for this won't be loaded.
 			$this->_route_config['has_metaboxes'] = TRUE;
@@ -2052,11 +2052,11 @@ 
 	 */
 
 	private function _espresso_news_post_box() {
-		$news_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __( 'New @ Event Espresso', 'event_espresso' ) );
-		add_meta_box( 'espresso_news_post_box', $news_box_title, array(
+		$news_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('New @ Event Espresso', 'event_espresso'));
+		add_meta_box('espresso_news_post_box', $news_box_title, array(
 			$this,
 			'espresso_news_post_box'
-		), $this->_wp_page_slug, 'side' );
+		), $this->_wp_page_slug, 'side');
 	}
 
 
@@ -2064,14 +2064,14 @@ 
 	 * Code for setting up espresso ratings request metabox.
 	 */
 	protected function _espresso_ratings_request() {
-		if ( ! apply_filters( 'FHEE_show_ratings_request_meta_box', true ) ) {
+		if ( ! apply_filters('FHEE_show_ratings_request_meta_box', true)) {
 			return '';
 		}
-		$ratings_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso') );
-		add_meta_box( 'espresso_ratings_request', $ratings_box_title, array(
+		$ratings_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso'));
+		add_meta_box('espresso_ratings_request', $ratings_box_title, array(
 			$this,
 			'espresso_ratings_request'
-		), $this->_wp_page_slug, 'side' );
+		), $this->_wp_page_slug, 'side');
 	}
 
 
@@ -2079,34 +2079,34 @@ 
 	 * Code for setting up espresso ratings request metabox content.
 	 */
 	public function espresso_ratings_request() {
-		$template_path = EE_ADMIN_TEMPLATE . 'espresso_ratings_request_content.template.php';
-		EEH_Template::display_template( $template_path, array() );
+		$template_path = EE_ADMIN_TEMPLATE.'espresso_ratings_request_content.template.php';
+		EEH_Template::display_template($template_path, array());
 	}
 
 
 
 
-	public static function cached_rss_display( $rss_id, $url ) {
-		$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
-		$doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX );
-		$pre = '<div class="espresso-rss-display">' . "\n\t";
-		$pre .= '<span id="' . $rss_id . '_url" class="hidden">' . $url . '</span>';
-		$post = '</div>' . "\n";
+	public static function cached_rss_display($rss_id, $url) {
+		$loading = '<p class="widget-loading hide-if-no-js">'.__('Loading&#8230;').'</p><p class="hide-if-js">'.__('This widget requires JavaScript.').'</p>';
+		$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
+		$pre = '<div class="espresso-rss-display">'."\n\t";
+		$pre .= '<span id="'.$rss_id.'_url" class="hidden">'.$url.'</span>';
+		$post = '</div>'."\n";
 
-		$cache_key = 'ee_rss_' . md5( $rss_id );
-		if ( FALSE != ( $output = get_transient( $cache_key ) ) ) {
-			echo $pre . $output . $post;
+		$cache_key = 'ee_rss_'.md5($rss_id);
+		if (FALSE != ($output = get_transient($cache_key))) {
+			echo $pre.$output.$post;
 			return TRUE;
 		}
 
-		if ( ! $doing_ajax ) {
-			echo $pre . $loading . $post;
+		if ( ! $doing_ajax) {
+			echo $pre.$loading.$post;
 			return FALSE;
 		}
 
 		ob_start();
-		wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5) );
-		set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS );
+		wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5));
+		set_transient($cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS);
 		return TRUE;
 
 	}
@@ -2118,13 +2118,13 @@ 
 	  	<div id="espresso_news_post_box_content" class="infolinks">
 	  		<?php
 	  		// Get RSS Feed(s)
-	  		$feed_url = apply_filters( 'FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/' );
+	  		$feed_url = apply_filters('FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/');
 	  		$url = urlencode($feed_url);
-	  		self::cached_rss_display( 'espresso_news_post_box_content', $url );
+	  		self::cached_rss_display('espresso_news_post_box_content', $url);
 
 	  		?>
 	  	</div>
-	  	<?php do_action( 'AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?>
+	  	<?php do_action('AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?>
 	  </div>
 		<?php
 	}
@@ -2145,32 +2145,32 @@ 
 
 	protected function _espresso_sponsors_post_box() {
 
-		$show_sponsors = apply_filters( 'FHEE_show_sponsors_meta_box', TRUE );
-		if ( $show_sponsors )
-			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
+		$show_sponsors = apply_filters('FHEE_show_sponsors_meta_box', TRUE);
+		if ($show_sponsors)
+			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array($this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
 	}
 
 
 	public function espresso_sponsors_post_box() {
-		$templatepath = EE_ADMIN_TEMPLATE . 'admin_general_metabox_contents_espresso_sponsors.template.php';
-		EEH_Template::display_template( $templatepath );
+		$templatepath = EE_ADMIN_TEMPLATE.'admin_general_metabox_contents_espresso_sponsors.template.php';
+		EEH_Template::display_template($templatepath);
 	}
 
 
 
 	private function _publish_post_box() {
-		$meta_box_ref = 'espresso_' . $this->page_slug . '_editor_overview';
+		$meta_box_ref = 'espresso_'.$this->page_slug.'_editor_overview';
 
 		//if there is a array('label' => array('publishbox' => 'some title') ) present in the _page_config array then we'll use that for the metabox label.  Otherwise we'll just use publish (publishbox itself could be an array of labels indexed by routes)
-		if ( !empty( $this->_labels['publishbox'] ) ) {
-			$box_label = is_array( $this->_labels['publishbox'] ) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
+		if ( ! empty($this->_labels['publishbox'])) {
+			$box_label = is_array($this->_labels['publishbox']) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox'];
 		} else {
 			$box_label = __('Publish', 'event_espresso');
 		}
 
-		$box_label = apply_filters( 'FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this );
+		$box_label = apply_filters('FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this);
 
-		add_meta_box( $meta_box_ref, $box_label, array( $this, 'editor_overview' ), $this->_current_screen->id, 'side', 'high' );
+		add_meta_box($meta_box_ref, $box_label, array($this, 'editor_overview'), $this->_current_screen->id, 'side', 'high');
 
 	}
 
@@ -2178,9 +2178,9 @@ 
 
 	public function editor_overview() {
 		//if we have extra content set let's add it in if not make sure its empty
-		$this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : '';
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_details_publish_metabox.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : '';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_details_publish_metabox.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 	}
 
 
@@ -2196,8 +2196,8 @@ 
 	 * @see $this->_set_publish_post_box_vars for param details
 	 * @since 4.6.0
 	 */
-	public function set_publish_post_box_vars( $name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true ) {
-		$this->_set_publish_post_box_vars( $name, $id, $delete, $save_close_redirect_URL, $both_btns );
+	public function set_publish_post_box_vars($name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true) {
+		$this->_set_publish_post_box_vars($name, $id, $delete, $save_close_redirect_URL, $both_btns);
 	}
 
 
@@ -2225,17 +2225,17 @@ 
 		$both_btns = true
 	) {
 		// if Save & Close, use a custom redirect URL or default to the main page?
-		$save_close_redirect_URL = ! empty( $save_close_redirect_URL ) ? $save_close_redirect_URL : $this->_admin_base_url;
+		$save_close_redirect_URL = ! empty($save_close_redirect_URL) ? $save_close_redirect_URL : $this->_admin_base_url;
 		// create the Save & Close and Save buttons
-		$this->_set_save_buttons( $both_btns, array(), array(), $save_close_redirect_URL );
+		$this->_set_save_buttons($both_btns, array(), array(), $save_close_redirect_URL);
 		//if we have extra content set let's add it in if not make sure its empty
-		$this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : '';
+		$this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : '';
 
 
-		if ( $delete && ! empty( $id )  ) {
+		if ($delete && ! empty($id)) {
 			//make sure we have a default if just true is sent.
 			$delete = ! empty($delete) ? $delete : 'delete';
-			$delete_link_args = array( $name => $id );
+			$delete_link_args = array($name => $id);
 			$delete = $this->get_action_link_or_button(
 				$delete,
 				$delete,
@@ -2246,8 +2246,8 @@ 
 			);
 		}
 
-		$this->_template_args['publish_delete_link'] = !empty( $id ) ? $delete : '';
-		if ( ! empty( $name ) && ! empty( $id ) ) {
+		$this->_template_args['publish_delete_link'] = ! empty($id) ? $delete : '';
+		if ( ! empty($name) && ! empty($id)) {
 			$hidden_field_arr[$name] = array(
 				'type' => 'hidden',
 				'value' => $id
@@ -2257,7 +2257,7 @@ 
 			$hf = '';
 		}
 		// add hidden field
-		$this->_template_args['publish_hidden_fields'] = ! empty( $hf ) ? $hf[$name]['field'] : $hf;
+		$this->_template_args['publish_hidden_fields'] = ! empty($hf) ? $hf[$name]['field'] : $hf;
 
 	}
 
@@ -2274,8 +2274,8 @@ 
 		<noscript>
 			<div id="no-js-message" class="error">
 				<p style="font-size:1.3em;">
-					<span style="color:red;"><?php _e( 'Warning!', 'event_espresso' ); ?></span>
-					<?php _e( 'Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso' ); ?>
+					<span style="color:red;"><?php _e('Warning!', 'event_espresso'); ?></span>
+					<?php _e('Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso'); ?>
 				</p>
 			</div>
 		</noscript>
@@ -2295,7 +2295,7 @@ 
 	*		@return 		string
 	*/
 	private function _display_espresso_notices() {
-		$notices = $this->_get_transient( TRUE );
+		$notices = $this->_get_transient(TRUE);
 		echo stripslashes($notices);
 	}
 
@@ -2347,11 +2347,11 @@ 
 	 * @param string  $priority      give this metabox a priority (using accepted priorities for wp meta boxes)
 	 * @param boolean $create_func   default is true.  Basically we can say we don't WANT to have the runtime function created but just set our own callback for wp's add_meta_box.
 	 */
-	public function _add_admin_page_meta_box( $action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, $callback );
+	public function _add_admin_page_meta_box($action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, $callback);
 
 		//if we have empty callback args and we want to automatically create the metabox callback then we need to make sure the callback args are generated.
-		if ( empty( $callback_args ) && $create_func ) {
+		if (empty($callback_args) && $create_func) {
 			$callback_args = array(
 				'template_path' => $this->_template_path,
 				'template_args' => $this->_template_args,
@@ -2361,7 +2361,7 @@ 
 		//if $create_func is true (default) then we automatically create the function for displaying the actual meta box.  If false then we take the $callback reference passed through and use it instead (so callers can define their own callback function/method if they wish)
 		$call_back_func = $create_func ? create_function('$post, $metabox', 'do_action( "AHEE_log", __FILE__, __FUNCTION__, ""); echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );') : $callback;
 
-		add_meta_box( str_replace( '_', '-', $action ) . '-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args );
+		add_meta_box(str_replace('_', '-', $action).'-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args);
 	}
 
 
@@ -2374,7 +2374,7 @@ 
 	 */
 	public function display_admin_page_with_metabox_columns() {
 		$this->_template_args['post_body_content'] = $this->_template_args['admin_page_content'];
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $this->_column_template_path, $this->_template_args, TRUE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_column_template_path, $this->_template_args, TRUE);
 
 		//the final wrapper
 		$this->admin_page_wrapper();
@@ -2417,7 +2417,7 @@ 
 	 * @return void
 	 */
 	public function display_about_admin_page() {
-		$this->_display_admin_page( FALSE, TRUE );
+		$this->_display_admin_page(FALSE, TRUE);
 	}
 
 
@@ -2433,26 +2433,26 @@ 
 	 * @return void
 	 */
 	private function _display_admin_page($sidebar = false, $about = FALSE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//custom remove metaboxes hook to add or remove any metaboxes to/from Admin pages.
-		do_action( 'AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes' );
+		do_action('AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes');
 
 		// set current wp page slug - looks like: event-espresso_page_event_categories
 		// keep in mind "event-espresso" COULD be something else if the top level menu label has been translated.
 		$this->_template_args['current_page'] = $this->_wp_page_slug;
 
-		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar.template.php';
+		$template_path = $sidebar ? EE_ADMIN_TEMPLATE.'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar.template.php';
 
-		if ( defined('DOING_AJAX' ) )
-			$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
+		if (defined('DOING_AJAX'))
+			$template_path = EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar_ajax.template.php';
 
-		$template_path = !empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
+		$template_path = ! empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
 
-		$this->_template_args['post_body_content'] = isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '';
+		$this->_template_args['post_body_content'] = isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '';
 		$this->_template_args['before_admin_page_content'] = isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : '';
 		$this->_template_args['after_admin_page_content'] = isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : '';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 
 		// the final template wrapper
@@ -2470,7 +2470,7 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function display_admin_caf_preview_page( $utm_campaign_source = '', $display_sidebar = TRUE ) {
+	public function display_admin_caf_preview_page($utm_campaign_source = '', $display_sidebar = TRUE) {
 		//let's generate a default preview action button if there isn't one already present.
 		$this->_labels['buttons']['buy_now'] = __('Upgrade Now', 'event_espresso');
 		$buy_now_url = add_query_arg(
@@ -2483,7 +2483,7 @@ 
 			),
 		'http://eventespresso.com/pricing/'
 		);
-		$this->_template_args['preview_action_button'] = ! isset( $this->_template_args['preview_action_button'] )
+		$this->_template_args['preview_action_button'] = ! isset($this->_template_args['preview_action_button'])
 			? $this->get_action_link_or_button(
 				'',
 				'buy_now',
@@ -2493,13 +2493,13 @@ 
 				true
 			)
 			: $this->_template_args['preview_action_button'];
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_caf_full_page_preview.template.php';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_caf_full_page_preview.template.php';
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
 			$template_path,
 			$this->_template_args,
 			true
 		);
-		$this->_display_admin_page( $display_sidebar );
+		$this->_display_admin_page($display_sidebar);
 	}
 
 
@@ -2533,49 +2533,49 @@ 
 	 * @param boolean $sidebar whether to display with sidebar or not.
 	 * @return void
 	 */
-	private function _display_admin_list_table_page( $sidebar = false ) {
+	private function _display_admin_list_table_page($sidebar = false) {
 		//setup search attributes
 		$this->_set_search_attributes();
 		$this->_template_args['current_page'] = $this->_wp_page_slug;
-		$template_path = EE_ADMIN_TEMPLATE . 'admin_list_wrapper.template.php';
+		$template_path = EE_ADMIN_TEMPLATE.'admin_list_wrapper.template.php';
 
-		$this->_template_args['table_url'] = defined( 'DOING_AJAX')
-			? add_query_arg( array( 'noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url )
-			: add_query_arg( array( 'route' => $this->_req_action), $this->_admin_base_url);
+		$this->_template_args['table_url'] = defined('DOING_AJAX')
+			? add_query_arg(array('noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url)
+			: add_query_arg(array('route' => $this->_req_action), $this->_admin_base_url);
 		$this->_template_args['list_table'] = $this->_list_table_object;
 		$this->_template_args['current_route'] = $this->_req_action;
-		$this->_template_args['list_table_class'] = get_class( $this->_list_table_object );
+		$this->_template_args['list_table_class'] = get_class($this->_list_table_object);
 
 		$ajax_sorting_callback = $this->_list_table_object->get_ajax_sorting_callback();
-		if( ! empty( $ajax_sorting_callback )) {
+		if ( ! empty($ajax_sorting_callback)) {
 			$sortable_list_table_form_fields = wp_nonce_field(
-				$ajax_sorting_callback . '_nonce',
-				$ajax_sorting_callback . '_nonce',
+				$ajax_sorting_callback.'_nonce',
+				$ajax_sorting_callback.'_nonce',
 				FALSE,
 				FALSE
 			);
 //			$reorder_action = 'espresso_' . $ajax_sorting_callback . '_nonce';
 //			$sortable_list_table_form_fields = wp_nonce_field( $reorder_action, 'ajax_table_sort_nonce', FALSE, FALSE );
-			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="' . $this->page_slug .'" />';
-			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="' . $ajax_sorting_callback . '" />';
+			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="'.$this->page_slug.'" />';
+			$sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="'.$ajax_sorting_callback.'" />';
 		} else {
 			$sortable_list_table_form_fields = '';
 		}
 
 		$this->_template_args['sortable_list_table_form_fields'] = $sortable_list_table_form_fields;
-		$hidden_form_fields = isset( $this->_template_args['list_table_hidden_fields'] ) ? $this->_template_args['list_table_hidden_fields'] : '';
-		$nonce_ref = $this->_req_action . '_nonce';
-		$hidden_form_fields .= '<input type="hidden" name="' . $nonce_ref . '" value="' . wp_create_nonce( $nonce_ref ) . '">';
+		$hidden_form_fields = isset($this->_template_args['list_table_hidden_fields']) ? $this->_template_args['list_table_hidden_fields'] : '';
+		$nonce_ref = $this->_req_action.'_nonce';
+		$hidden_form_fields .= '<input type="hidden" name="'.$nonce_ref.'" value="'.wp_create_nonce($nonce_ref).'">';
 		$this->_template_args['list_table_hidden_fields'] = $hidden_form_fields;
 
 		//display message about search results?
 		$this->_template_args['before_list_table'] .= apply_filters(
 			'FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg',
-			! empty( $this->_req_data['s'] )
-				? '<p class="ee-search-results">' . sprintf(
-					__( 'Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso' ),
-					trim( $this->_req_data['s'], '%' )
-					) . '</p>'
+			! empty($this->_req_data['s'])
+				? '<p class="ee-search-results">'.sprintf(
+					__('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'),
+					trim($this->_req_data['s'], '%')
+					).'</p>'
 				: '',
 			$this->page_slug,
 			$this->_req_data,
@@ -2587,7 +2587,7 @@ 
 			true
 		);
 		// the final template wrapper
-		if ( $sidebar )
+		if ($sidebar)
 			$this->display_admin_page_with_sidebar();
 		else
 			$this->display_admin_page_with_no_sidebar();
@@ -2610,9 +2610,9 @@ 
 	 * @param  array $items  see above for format of array
 	 * @return string        html string of legend
 	 */
-	protected function _display_legend( $items ) {
-		$this->_template_args['items'] = apply_filters( 'FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this );
-		$legend_template = EE_ADMIN_TEMPLATE . 'admin_details_legend.template.php';
+	protected function _display_legend($items) {
+		$this->_template_args['items'] = apply_filters('FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this);
+		$legend_template = EE_ADMIN_TEMPLATE.'admin_details_legend.template.php';
 		return EEH_Template::display_template($legend_template, $this->_template_args, TRUE);
 	}
 
@@ -2637,33 +2637,33 @@ 
 	 *
 	 * @return void
 	 */
-	protected function _return_json( $sticky_notices = false ) {
+	protected function _return_json($sticky_notices = false) {
 
 		//make sure any EE_Error notices have been handled.
-		$this->_process_notices( array(), true, $sticky_notices );
+		$this->_process_notices(array(), true, $sticky_notices);
 
 
-		$data = isset( $this->_template_args['data'] ) ? $this->_template_args['data'] : array();
+		$data = isset($this->_template_args['data']) ? $this->_template_args['data'] : array();
 		unset($this->_template_args['data']);
 		$json = array(
-			'error' => isset( $this->_template_args['error'] ) ? $this->_template_args['error'] : false,
-			'success' => isset( $this->_template_args['success'] ) ? $this->_template_args['success'] : false,
-			'errors' => isset( $this->_template_args['errors'] ) ? $this->_template_args['errors'] : false,
-			'attention' => isset( $this->_template_args['attention'] ) ? $this->_template_args['attention'] : false,
+			'error' => isset($this->_template_args['error']) ? $this->_template_args['error'] : false,
+			'success' => isset($this->_template_args['success']) ? $this->_template_args['success'] : false,
+			'errors' => isset($this->_template_args['errors']) ? $this->_template_args['errors'] : false,
+			'attention' => isset($this->_template_args['attention']) ? $this->_template_args['attention'] : false,
 			'notices' => EE_Error::get_notices(),
-			'content' => isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '',
-			'data' => array_merge( $data, array('template_args' => $this->_template_args ) ),
+			'content' => isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '',
+			'data' => array_merge($data, array('template_args' => $this->_template_args)),
 			'isEEajax' => TRUE //special flag so any ajax.Success methods in js can identify this return package as a EEajax package.
 			);
 
 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
-		if ( NULL === error_get_last() || ! headers_sent() )
+		if (NULL === error_get_last() || ! headers_sent())
 			header('Content-Type: application/json; charset=UTF-8');
-                if( function_exists( 'wp_json_encode' ) ) {
-                    echo wp_json_encode( $json );
+                if (function_exists('wp_json_encode')) {
+                    echo wp_json_encode($json);
                 } else {
-                    echo json_encode( $json );
+                    echo json_encode($json);
                 }
 		exit();
 	}
@@ -2677,11 +2677,11 @@ 
 	 * @throws EE_Error
 	 */
 	public function return_json() {
-		if ( defined('DOING_AJAX') && DOING_AJAX )
+		if (defined('DOING_AJAX') && DOING_AJAX)
 			$this->_return_json();
 
 		else {
-			throw new EE_Error( sprintf( __('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__ ) );
+			throw new EE_Error(sprintf(__('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__));
 		}
 	}
 
@@ -2694,7 +2694,7 @@ 
 	 *
 	 * @access   public
 	 */
-	public function set_hook_object( EE_Admin_Hooks $hook_obj ) {
+	public function set_hook_object(EE_Admin_Hooks $hook_obj) {
 		$this->_hook_obj = $hook_obj;
 	}
 
@@ -2710,33 +2710,33 @@ 
 	*/
 	public function admin_page_wrapper($about = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$this->_nav_tabs = $this->_get_main_nav_tabs();
 
 		$this->_template_args['nav_tabs'] = $this->_nav_tabs;
 		$this->_template_args['admin_page_title'] = $this->_admin_page_title;
 
-		$this->_template_args['before_admin_page_content'] = apply_filters( 'FHEE_before_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['before_admin_page_content'] ) ? $this->_template_args['before_admin_page_content'] : '');
-		$this->_template_args['after_admin_page_content'] = apply_filters( 'FHEE_after_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['after_admin_page_content'] ) ? $this->_template_args['after_admin_page_content'] : '');
+		$this->_template_args['before_admin_page_content'] = apply_filters('FHEE_before_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : '');
+		$this->_template_args['after_admin_page_content'] = apply_filters('FHEE_after_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : '');
 
 		$this->_template_args['after_admin_page_content'] .= $this->_set_help_popup_content();
 
 
 
 		// load settings page wrapper template
-		$template_path = !defined( 'DOING_AJAX' ) ? EE_ADMIN_TEMPLATE . 'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_wrapper_ajax.template.php';
+		$template_path = ! defined('DOING_AJAX') ? EE_ADMIN_TEMPLATE.'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_wrapper_ajax.template.php';
 
 		//about page?
-		$template_path = $about ? EE_ADMIN_TEMPLATE . 'about_admin_wrapper.template.php' : $template_path;
+		$template_path = $about ? EE_ADMIN_TEMPLATE.'about_admin_wrapper.template.php' : $template_path;
 
 
-		if ( defined( 'DOING_AJAX' ) ) {
-			$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		if (defined('DOING_AJAX')) {
+			$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 			$this->_return_json();
 		} else {
-			EEH_Template::display_template( $template_path, $this->_template_args );
+			EEH_Template::display_template($template_path, $this->_template_args);
 		}
 
 	}
@@ -2762,7 +2762,7 @@ 
 	 * @param $b
 	 * @return int
 	 */
-	private function _sort_nav_tabs( $a, $b ) {
+	private function _sort_nav_tabs($a, $b) {
 		if ($a['order'] == $b['order']) {
 	        return 0;
 	    }
@@ -2782,7 +2782,7 @@ 
 	 * 	@uses EEH_Form_Fields::get_form_fields (/helper/EEH_Form_Fields.helper.php)
 	 * 	@uses EEH_Form_Fields::get_form_fields_array (/helper/EEH_Form_Fields.helper.php)
 	 */
-	protected function _generate_admin_form_fields( $input_vars = array(), $generator = 'string', $id = FALSE ) {
+	protected function _generate_admin_form_fields($input_vars = array(), $generator = 'string', $id = FALSE) {
 		$content = $generator == 'string' ? EEH_Form_Fields::get_form_fields($input_vars, $id) : EEH_Form_Fields::get_form_fields_array($input_vars);
 		return $content;
 	}
@@ -2804,25 +2804,25 @@ 
 	 * @param array $actions if included allows us to set the actions that each button will carry out (i.e. via the "name" value in the button).  We can also use this to just dump default actions by submitting some other value.
 	 * @param bool|string|null $referrer if false then we just do the default action on save and close.  Other wise it will use the $referrer string. IF null, then we don't do ANYTHING on save and close (normal form handling).
 	 */
-	protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL ) {
+	protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL) {
 		//make sure $text and $actions are in an array
 		$text = (array) $text;
 		$actions = (array) $actions;
 		$referrer_url = empty($referrer) ? '' : $referrer;
-		$referrer_url = ! $referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $_SERVER['REQUEST_URI'] .'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $referrer .'" />';
+		$referrer_url = ! $referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$_SERVER['REQUEST_URI'].'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$referrer.'" />';
 
-		$button_text = !empty($text) ? $text : array( __('Save', 'event_espresso'), __('Save and Close', 'event_espresso') );
-		$default_names = array( 'save', 'save_and_close' );
+		$button_text = ! empty($text) ? $text : array(__('Save', 'event_espresso'), __('Save and Close', 'event_espresso'));
+		$default_names = array('save', 'save_and_close');
 
 		//add in a hidden index for the current page (so save and close redirects properly)
 		$this->_template_args['save_buttons'] = $referrer_url;
 
-		foreach ( $button_text as $key => $button ) {
+		foreach ($button_text as $key => $button) {
 			$ref = $default_names[$key];
-			$id = $this->_current_view . '_' . $ref;
-			$name = !empty($actions) ? $actions[$key] : $ref;
-			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary ' . $ref . '" value="' . $button . '" name="' . $name . '" id="' . $id . '" />';
-			if ( !$both ) break;
+			$id = $this->_current_view.'_'.$ref;
+			$name = ! empty($actions) ? $actions[$key] : $ref;
+			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary '.$ref.'" value="'.$button.'" name="'.$name.'" id="'.$id.'" />';
+			if ( ! $both) break;
 		}
 
 	}
@@ -2837,8 +2837,8 @@ 
 	 * @param string $route
 	 * @param array  $additional_hidden_fields
 	 */
-	public function set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) {
-		$this->_set_add_edit_form_tags( $route, $additional_hidden_fields );
+	public function set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) {
+		$this->_set_add_edit_form_tags($route, $additional_hidden_fields);
 	}
 
 
@@ -2851,30 +2851,30 @@ 
 	 * @param array $additional_hidden_fields any additional hidden fields required in the form header
 	 * @return void
 	 */
-	protected function _set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) {
+	protected function _set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) {
 
-		if ( empty( $route )) {
+		if (empty($route)) {
 			$user_msg = __('An error occurred. No action was set for this page\'s form.', 'event_espresso');
-			$dev_msg = $user_msg . "\n" . sprintf( __('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__ );
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$dev_msg = $user_msg."\n".sprintf(__('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__);
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// open form
-		$this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="' . $this->_admin_base_url . '" id="' . $route . '_event_form" >';
+		$this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="'.$this->_admin_base_url.'" id="'.$route.'_event_form" >';
 		// add nonce
-		$nonce = wp_nonce_field( $route . '_nonce', $route . '_nonce', FALSE, FALSE );
+		$nonce = wp_nonce_field($route.'_nonce', $route.'_nonce', FALSE, FALSE);
 //		$nonce = wp_nonce_field( $route . '_nonce', '_wpnonce', FALSE, FALSE );
-		$this->_template_args['before_admin_page_content'] .= "\n\t" . $nonce;
+		$this->_template_args['before_admin_page_content'] .= "\n\t".$nonce;
 		// add REQUIRED form action
 		$hidden_fields = array(
-				'action' => array( 'type' => 'hidden', 'value' => $route ),
+				'action' => array('type' => 'hidden', 'value' => $route),
 			);
 		// merge arrays
-		$hidden_fields = is_array( $additional_hidden_fields) ? array_merge( $hidden_fields, $additional_hidden_fields ) : $hidden_fields;
+		$hidden_fields = is_array($additional_hidden_fields) ? array_merge($hidden_fields, $additional_hidden_fields) : $hidden_fields;
 		// generate form fields
-		$form_fields = $this->_generate_admin_form_fields( $hidden_fields, 'array' );
+		$form_fields = $this->_generate_admin_form_fields($hidden_fields, 'array');
 		// add fields to form
-		foreach ( (array)$form_fields as $field_name => $form_field ) {
-			$this->_template_args['before_admin_page_content'] .= "\n\t" . $form_field['field'];
+		foreach ((array) $form_fields as $field_name => $form_field) {
+			$this->_template_args['before_admin_page_content'] .= "\n\t".$form_field['field'];
 		}
 
 		// close form
@@ -2891,8 +2891,8 @@ 
 	 * @see EE_Admin_Page::_redirect_after_action() for params.
 	 * @since 4.5.0
 	 */
-	public function redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) {
-		$this->_redirect_after_action( $success, $what, $action_desc, $query_args, $override_overwrite );
+	public function redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) {
+		$this->_redirect_after_action($success, $what, $action_desc, $query_args, $override_overwrite);
 	}
 
 
@@ -2908,38 +2908,38 @@ 
 	 *	@access protected
 	 *	@return void
 	 */
-	protected function _redirect_after_action( $success = 0, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) {
+	protected function _redirect_after_action($success = 0, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//class name for actions/filters.
 		$classname = get_class($this);
 
 		//set redirect url. Note if there is a "page" index in the $query_args then we go with vanilla admin.php route, otherwise we go with whatever is set as the _admin_base_url
-		$redirect_url = isset( $query_args['page'] ) ? admin_url('admin.php') : $this->_admin_base_url;
-		$notices = EE_Error::get_notices( FALSE );
+		$redirect_url = isset($query_args['page']) ? admin_url('admin.php') : $this->_admin_base_url;
+		$notices = EE_Error::get_notices(FALSE);
 
 		// overwrite default success messages //BUT ONLY if overwrite not overridden
-		if ( ! $override_overwrite || ! empty( $notices['errors'] )) {
+		if ( ! $override_overwrite || ! empty($notices['errors'])) {
 			EE_Error::overwrite_success();
 		}
-		if ( ! empty( $what ) && ! empty( $action_desc ) ) {
+		if ( ! empty($what) && ! empty($action_desc)) {
 			// how many records affected ? more than one record ? or just one ?
-			if ( $success > 1 && empty( $notices[ 'errors' ] ) ) {
+			if ($success > 1 && empty($notices['errors'])) {
 				// set plural msg
 				EE_Error::add_success(
 					sprintf(
-						__( 'The "%s" have been successfully %s.', 'event_espresso' ),
+						__('The "%s" have been successfully %s.', 'event_espresso'),
 						$what,
 						$action_desc
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
-			} else if ( $success == 1 && empty( $notices[ 'errors' ] ) ) {
+			} else if ($success == 1 && empty($notices['errors'])) {
 				// set singular msg
 				EE_Error::add_success(
 					sprintf(
-						__( 'The "%s" has been successfully %s.', 'event_espresso' ),
+						__('The "%s" has been successfully %s.', 'event_espresso'),
 						$what,
 						$action_desc
 					),
@@ -2948,7 +2948,7 @@ 
 			}
 		}
 		// check that $query_args isn't something crazy
-		if ( ! is_array( $query_args )) {
+		if ( ! is_array($query_args)) {
 			$query_args = array();
 		}
 
@@ -2961,36 +2961,36 @@ 
 		 * @param array $query_args   The original query_args array coming into the
 		 *                          		method.
 		 */
-		do_action( 'AHEE__' . $classname . '___redirect_after_action__before_redirect_modification_' . $this->_req_action, $query_args );
+		do_action('AHEE__'.$classname.'___redirect_after_action__before_redirect_modification_'.$this->_req_action, $query_args);
 
 		//calculate where we're going (if we have a "save and close" button pushed)
-		if ( isset($this->_req_data['save_and_close'] ) && isset($this->_req_data['save_and_close_referrer'] ) ) {
+		if (isset($this->_req_data['save_and_close']) && isset($this->_req_data['save_and_close_referrer'])) {
 			// even though we have the save_and_close referrer, we need to parse the url for the action in order to generate a nonce
-			$parsed_url = parse_url( $this->_req_data['save_and_close_referrer'] );
+			$parsed_url = parse_url($this->_req_data['save_and_close_referrer']);
 			// regenerate query args array from referrer URL
-			parse_str( $parsed_url['query'], $query_args );
+			parse_str($parsed_url['query'], $query_args);
 			// correct page and action will be in the query args now
-			$redirect_url = admin_url( 'admin.php' );
+			$redirect_url = admin_url('admin.php');
 		}
 
 		//merge any default query_args set in _default_route_query_args property
-		if ( ! empty( $this->_default_route_query_args ) && ! $this->_is_UI_request ) {
+		if ( ! empty($this->_default_route_query_args) && ! $this->_is_UI_request) {
 			$args_to_merge = array();
-			foreach ( $this->_default_route_query_args as $query_param => $query_value ) {
+			foreach ($this->_default_route_query_args as $query_param => $query_value) {
 				//is there a wp_referer array in our _default_route_query_args property?
-				if ( $query_param == 'wp_referer'  ) {
+				if ($query_param == 'wp_referer') {
 					$query_value = (array) $query_value;
-					foreach ( $query_value as $reference => $value ) {
-						if ( strpos( $reference, 'nonce' ) !== false ) {
+					foreach ($query_value as $reference => $value) {
+						if (strpos($reference, 'nonce') !== false) {
 							continue;
 						}
 
 						//finally we will override any arguments in the referer with
 						//what might be set on the _default_route_query_args array.
-						if ( isset( $this->_default_route_query_args[$reference] ) ) {
-							$args_to_merge[$reference] = urlencode( $this->_default_route_query_args[$reference] );
+						if (isset($this->_default_route_query_args[$reference])) {
+							$args_to_merge[$reference] = urlencode($this->_default_route_query_args[$reference]);
 						} else {
-							$args_to_merge[$reference] = urlencode( $value );
+							$args_to_merge[$reference] = urlencode($value);
 						}
 					}
 					continue;
@@ -3001,7 +3001,7 @@ 
 
 			//now let's merge these arguments but override with what was specifically sent in to the
 			//redirect.
-			$query_args = array_merge( $args_to_merge, $query_args );
+			$query_args = array_merge($args_to_merge, $query_args);
 		}
 
 		$this->_process_notices($query_args);
@@ -3010,19 +3010,19 @@ 
 		// generate redirect url
 
 		// if redirecting to anything other than the main page, add a nonce
-		if ( isset( $query_args['action'] )) {
+		if (isset($query_args['action'])) {
 			// manually generate wp_nonce and merge that with the query vars becuz the wp_nonce_url function wrecks havoc on some vars
-			$query_args['_wpnonce'] = wp_create_nonce( $query_args['action'] . '_nonce' );
+			$query_args['_wpnonce'] = wp_create_nonce($query_args['action'].'_nonce');
 		}
 
 		//we're adding some hooks and filters in here for processing any things just before redirects (example: an admin page has done an insert or update and we want to run something after that).
-		do_action( 'AHEE_redirect_' . $classname . $this->_req_action, $query_args );
+		do_action('AHEE_redirect_'.$classname.$this->_req_action, $query_args);
 
-		$redirect_url = apply_filters( 'FHEE_redirect_' . $classname . $this->_req_action, self::add_query_args_and_nonce( $query_args, $redirect_url ), $query_args );
+		$redirect_url = apply_filters('FHEE_redirect_'.$classname.$this->_req_action, self::add_query_args_and_nonce($query_args, $redirect_url), $query_args);
 
 
 		// check if we're doing ajax.  If we are then lets just return the results and js can handle how it wants.
-		if ( defined('DOING_AJAX' ) ) {
+		if (defined('DOING_AJAX')) {
 			$default_data = array(
 				'close' => TRUE,
 				'redirect_url' => $redirect_url,
@@ -3031,11 +3031,11 @@ 
 				);
 
 			$this->_template_args['success'] = $success;
-			$this->_template_args['data'] = !empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data'] ): $default_data;
+			$this->_template_args['data'] = ! empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data']) : $default_data;
 			$this->_return_json();
 		}
 
-		wp_safe_redirect( $redirect_url );
+		wp_safe_redirect($redirect_url);
 		exit();
 	}
 
@@ -3051,30 +3051,30 @@ 
 	 * @param bool    $sticky_notices      This is used to flag that regardless of whether this is doing_ajax or not, we still save a transient for the notice.
 	 * @return void
 	 */
-	protected function _process_notices( $query_args = array(), $skip_route_verify = FALSE , $sticky_notices = TRUE ) {
+	protected function _process_notices($query_args = array(), $skip_route_verify = FALSE, $sticky_notices = TRUE) {
 
 		//first let's set individual error properties if doing_ajax and the properties aren't already set.
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-			$notices = EE_Error::get_notices( false );
-			if ( empty( $this->_template_args['success'] ) ) {
-				$this->_template_args['success'] = isset( $notices['success'] ) ? $notices['success'] : false;
+		if (defined('DOING_AJAX') && DOING_AJAX) {
+			$notices = EE_Error::get_notices(false);
+			if (empty($this->_template_args['success'])) {
+				$this->_template_args['success'] = isset($notices['success']) ? $notices['success'] : false;
 			}
 
-			if ( empty( $this->_template_args['errors'] ) ) {
-				$this->_template_args['errors'] = isset( $notices['errors'] ) ? $notices['errors'] : false;
+			if (empty($this->_template_args['errors'])) {
+				$this->_template_args['errors'] = isset($notices['errors']) ? $notices['errors'] : false;
 			}
 
-			if ( empty( $this->_template_args['attention'] ) ) {
-				$this->_template_args['attention'] = isset( $notices['attention'] ) ? $notices['attention'] : false;
+			if (empty($this->_template_args['attention'])) {
+				$this->_template_args['attention'] = isset($notices['attention']) ? $notices['attention'] : false;
 			}
 		}
 
 		$this->_template_args['notices'] = EE_Error::get_notices();
 
 		//IF this isn't ajax we need to create a transient for the notices using the route (however, overridden if $sticky_notices == true)
-		if ( ! defined( 'DOING_AJAX' ) || $sticky_notices ) {
-			$route = isset( $query_args['action'] ) ? $query_args['action'] : 'default';
-			$this->_add_transient( $route, $this->_template_args['notices'], TRUE, $skip_route_verify );
+		if ( ! defined('DOING_AJAX') || $sticky_notices) {
+			$route = isset($query_args['action']) ? $query_args['action'] : 'default';
+			$this->_add_transient($route, $this->_template_args['notices'], TRUE, $skip_route_verify);
 		}
 	}
 
@@ -3104,7 +3104,7 @@ 
 		$exclude_nonce = false
 	) {
 		//first let's validate the action (if $base_url is FALSE otherwise validation will happen further along)
-		if ( empty( $base_url ) && ! isset( $this->_page_routes[ $action ] ) ) {
+		if (empty($base_url) && ! isset($this->_page_routes[$action])) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -3115,7 +3115,7 @@ 
 				)
 			);
 		}
-		if ( ! isset( $this->_labels['buttons'][ $type ] ) ) {
+		if ( ! isset($this->_labels['buttons'][$type])) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -3127,8 +3127,8 @@ 
 			);
 		}
 		//finally check user access for this button.
-		$has_access = $this->check_user_access( $action, true );
-		if ( ! $has_access ) {
+		$has_access = $this->check_user_access($action, true);
+		if ( ! $has_access) {
 			return '';
 		}
 		$_base_url = ! $base_url ? $this->_admin_base_url : $base_url;
@@ -3136,11 +3136,11 @@ 
 			'action' => $action
 		);
 		//merge extra_request args but make sure our original action takes precedence and doesn't get overwritten.
-		if ( ! empty( $extra_request ) ) {
-			$query_args = array_merge( $extra_request, $query_args );
+		if ( ! empty($extra_request)) {
+			$query_args = array_merge($extra_request, $query_args);
 		}
-		$url = self::add_query_args_and_nonce( $query_args, $_base_url, false, $exclude_nonce );
-		return EEH_Template::get_button_or_link( $url, $this->_labels['buttons'][ $type ], $class );
+		$url = self::add_query_args_and_nonce($query_args, $_base_url, false, $exclude_nonce);
+		return EEH_Template::get_button_or_link($url, $this->_labels['buttons'][$type], $class);
 	}
 
 
@@ -3155,11 +3155,11 @@ 
 		$args = array(
 			'label' => $this->_admin_page_title,
 			'default' => 10,
-			'option' => $this->_current_page . '_' . $this->_current_view . '_per_page'
+			'option' => $this->_current_page.'_'.$this->_current_view.'_per_page'
 			);
 		//ONLY add the screen option if the user has access to it.
-		if ( $this->check_user_access( $this->_current_view, true ) ) {
-			add_screen_option( $option, $args );
+		if ($this->check_user_access($this->_current_view, true)) {
+			add_screen_option($option, $args);
 		}
 	}
 
@@ -3175,36 +3175,36 @@ 
 	 * @return void
 	 */
 	private function _set_per_page_screen_options() {
-		if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
-			check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
+		if (isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options'])) {
+			check_admin_referer('screen-options-nonce', 'screenoptionnonce');
 
-			if ( !$user = wp_get_current_user() )
+			if ( ! $user = wp_get_current_user())
 			return;
 			$option = $_POST['wp_screen_options']['option'];
 			$value = $_POST['wp_screen_options']['value'];
 
-			if ( $option != sanitize_key( $option ) )
+			if ($option != sanitize_key($option))
 				return;
 
 			$map_option = $option;
 
 			$option = str_replace('-', '_', $option);
 
-			switch ( $map_option ) {
-				case $this->_current_page . '_' .  $this->_current_view . '_per_page':
+			switch ($map_option) {
+				case $this->_current_page.'_'.$this->_current_view.'_per_page':
 					$value = (int) $value;
-					if ( $value < 1 || $value > 999 )
+					if ($value < 1 || $value > 999)
 						return;
 					break;
 				default:
-					$value = apply_filters( 'FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value );
-					if ( false === $value )
+					$value = apply_filters('FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value);
+					if (false === $value)
 						return;
 					break;
 			}
 
 			update_user_meta($user->ID, $option, $value);
-			wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
+			wp_safe_redirect(remove_query_arg(array('pagenum', 'apage', 'paged'), wp_get_referer()));
 			exit;
 		}
 	}
@@ -3215,8 +3215,8 @@ 
 	 * This just allows for setting the $_template_args property if it needs to be set outside the object
 	 * @param array $data array that will be assigned to template args.
 	 */
-	public function set_template_args( $data ) {
-		$this->_template_args = array_merge( $this->_template_args, (array) $data );
+	public function set_template_args($data) {
+		$this->_template_args = array_merge($this->_template_args, (array) $data);
 	}
 
 
@@ -3232,26 +3232,26 @@ 
 	 * @param bool $skip_route_verify Used to indicate we want to skip route verification.  This is usually ONLY used when we are adding a transient before page_routes have been defined.
 	 * @return void
 	 */
-	protected function _add_transient( $route, $data, $notices = FALSE, $skip_route_verify = FALSE ) {
+	protected function _add_transient($route, $data, $notices = FALSE, $skip_route_verify = FALSE) {
 		$user_id = get_current_user_id();
 
-		if ( !$skip_route_verify )
+		if ( ! $skip_route_verify)
 			$this->_verify_route($route);
 
 
 		//now let's set the string for what kind of transient we're setting
-		$transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id;
-		$data = $notices ? array( 'notices' => $data ) : $data;
+		$transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id;
+		$data = $notices ? array('notices' => $data) : $data;
 		//is there already a transient for this route?  If there is then let's ADD to that transient
-		$existing = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient );
-		if ( $existing ) {
-			$data = array_merge( (array) $data, (array) $existing );
+		$existing = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient);
+		if ($existing) {
+			$data = array_merge((array) $data, (array) $existing);
 		}
 
-		if ( is_multisite() && is_network_admin() ) {
-			set_site_transient( $transient, $data, 8 );
+		if (is_multisite() && is_network_admin()) {
+			set_site_transient($transient, $data, 8);
 		} else {
-			set_transient( $transient, $data, 8 );
+			set_transient($transient, $data, 8);
 		}
 	}
 
@@ -3263,18 +3263,18 @@ 
 	 * @param bool $notices true we get notices transient. False we just return normal route transient
 	 * @return mixed data
 	 */
-	protected function _get_transient( $notices = FALSE, $route = FALSE ) {
+	protected function _get_transient($notices = FALSE, $route = FALSE) {
 		$user_id = get_current_user_id();
-		$route = !$route ? $this->_req_action : $route;
-		$transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id;
-		$data = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient );
+		$route = ! $route ? $this->_req_action : $route;
+		$transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id;
+		$data = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient);
 		//delete transient after retrieval (just in case it hasn't expired);
-		if ( is_multisite() && is_network_admin() ) {
-			delete_site_transient( $transient );
+		if (is_multisite() && is_network_admin()) {
+			delete_site_transient($transient);
 		} else {
-			delete_transient( $transient );
+			delete_transient($transient);
 		}
-		return $notices && isset( $data['notices'] ) ? $data['notices'] : $data;
+		return $notices && isset($data['notices']) ? $data['notices'] : $data;
 	}
 
 
@@ -3291,12 +3291,12 @@ 
 
 		//retrieve all existing transients
 		$query = "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%rte_tx_%' OR option_name LIKE '%rte_n_tx_%'";
-		if ( $results = $wpdb->get_results( $query ) ) {
-			foreach ( $results as $result ) {
-				$transient = str_replace( '_transient_', '', $result->option_name );
-				get_transient( $transient );
-				if ( is_multisite() && is_network_admin() ) {
-					get_site_transient( $transient );
+		if ($results = $wpdb->get_results($query)) {
+			foreach ($results as $result) {
+				$transient = str_replace('_transient_', '', $result->option_name);
+				get_transient($transient);
+				if (is_multisite() && is_network_admin()) {
+					get_site_transient($transient);
 				}
 			}
 		}
@@ -3454,23 +3454,23 @@ 
 	 * @param string $line	line no where error occurred
 	 * @return boolean
 	 */
-	protected function _update_espresso_configuration( $tab, $config, $file = '', $func = '', $line = '' ) {
+	protected function _update_espresso_configuration($tab, $config, $file = '', $func = '', $line = '') {
 
 		//remove any options that are NOT going to be saved with the config settings.
-		if ( isset( $config->core->ee_ueip_optin ) ) {
+		if (isset($config->core->ee_ueip_optin)) {
 			$config->core->ee_ueip_has_notified = TRUE;
 			// TODO: remove the following two lines and make sure values are migrated from 3.1
-			update_option( 'ee_ueip_optin', $config->core->ee_ueip_optin);
-			update_option( 'ee_ueip_has_notified', TRUE );
+			update_option('ee_ueip_optin', $config->core->ee_ueip_optin);
+			update_option('ee_ueip_has_notified', TRUE);
 		}
 		// and save it (note we're also doing the network save here)
-		$net_saved = is_main_site() ? EE_Network_Config::instance()->update_config( FALSE, FALSE ) : TRUE;
-		$config_saved = EE_Config::instance()->update_espresso_config( FALSE, FALSE );
-		if ( $config_saved && $net_saved ) {
-			EE_Error::add_success( sprintf( __('"%s" have been successfully updated.', 'event_espresso'), $tab ));
+		$net_saved = is_main_site() ? EE_Network_Config::instance()->update_config(FALSE, FALSE) : TRUE;
+		$config_saved = EE_Config::instance()->update_espresso_config(FALSE, FALSE);
+		if ($config_saved && $net_saved) {
+			EE_Error::add_success(sprintf(__('"%s" have been successfully updated.', 'event_espresso'), $tab));
 			return TRUE;
 		} else {
-			EE_Error::add_error( sprintf( __('The "%s" were not updated.', 'event_espresso'), $tab ), $file, $func, $line  );
+			EE_Error::add_error(sprintf(__('The "%s" were not updated.', 'event_espresso'), $tab), $file, $func, $line);
 			return FALSE;
 		}
 	}
@@ -3483,7 +3483,7 @@ 
 	 * Returns an array to be used for EE_FOrm_Fields.helper.php's select_input as the $values argument.
 	 * @return array
 	 */
-	public function get_yes_no_values(){
+	public function get_yes_no_values() {
 		return $this->_yes_no_values;
 	}
 
@@ -3505,8 +3505,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _next_link( $url, $class = 'dashicons dashicons-arrow-right' ) {
-		return '<a class="' . $class . '" href="' . $url . '"></a>';
+	protected function _next_link($url, $class = 'dashicons dashicons-arrow-right') {
+		return '<a class="'.$class.'" href="'.$url.'"></a>';
 	}
 
 
@@ -3520,8 +3520,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function _previous_link( $url, $class = 'dashicons dashicons-arrow-left' ) {
-		return '<a class="' . $class . '" href="' . $url . '"></a>';
+	protected function _previous_link($url, $class = 'dashicons dashicons-arrow-left') {
+		return '<a class="'.$class.'" href="'.$url.'"></a>';
 	}
 
 
@@ -3540,8 +3540,8 @@ 
 	 * @return bool success/fail
 	 */
 	protected function _process_resend_registration() {
-		$this->_template_args['success'] = EED_Messages::process_resend( $this->_req_data );
-		do_action( 'AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data );
+		$this->_template_args['success'] = EED_Messages::process_resend($this->_req_data);
+		do_action('AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data);
 		return $this->_template_args['success'];
 	}
 
@@ -3554,11 +3554,11 @@ 
 	 * @param \EE_Payment $payment
 	 * @return bool success/fail
 	 */
-	protected function _process_payment_notification( EE_Payment $payment ) {
-		add_filter( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', '__return_true' );
-		do_action( 'AHEE__EE_Admin_Page___process_admin_payment_notification', $payment );
-		$this->_template_args['success'] = apply_filters( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', false, $payment );
-		return $this->_template_args[ 'success' ];
+	protected function _process_payment_notification(EE_Payment $payment) {
+		add_filter('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', '__return_true');
+		do_action('AHEE__EE_Admin_Page___process_admin_payment_notification', $payment);
+		$this->_template_args['success'] = apply_filters('FHEE__EE_Admin_Page___process_admin_payment_notification__success', false, $payment);
+		return $this->_template_args['success'];
 	}
 
 

Braces +137 added lines, -86 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
  *
@@ -160,8 +162,9 @@ 
 	 */
 	public function __construct( $routing = TRUE ) {
 
-		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false )
-			$this->_is_caf = TRUE;
+		if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false ) {
+					$this->_is_caf = TRUE;
+		}
 
 		$this->_yes_no_values = array(
 			array('id' => TRUE, 'text' => __('Yes', 'event_espresso')),
@@ -192,8 +195,9 @@ 
 		$this->_do_other_page_hooks();
 
 		//This just allows us to have extending clases do something specific before the parent constructor runs _page_setup.
-		if ( method_exists( $this, '_before_page_setup' ) )
-			$this->_before_page_setup();
+		if ( method_exists( $this, '_before_page_setup' ) ) {
+					$this->_before_page_setup();
+		}
 
 		//set up page dependencies
 		$this->_page_setup();
@@ -499,7 +503,9 @@ 
 		global $ee_menu_slugs;
 		$ee_menu_slugs = (array) $ee_menu_slugs;
 
-		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) return FALSE;
+		if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) {
+			return FALSE;
+		}
 
 
 		// becuz WP List tables have two duplicate select inputs for choosing bulk actions, we need to copy the action from the second to the first
@@ -534,12 +540,14 @@ 
 		}
 
 		//for caffeinated and other extended functionality.  If there is a _extend_page_config method then let's run that to modify the all the various page configuration arrays
-		if ( method_exists( $this, '_extend_page_config' ) )
-			$this->_extend_page_config();
+		if ( method_exists( $this, '_extend_page_config' ) ) {
+					$this->_extend_page_config();
+		}
 
 		//for CPT and other extended functionality. If there is an _extend_page_config_for_cpt then let's run that to modify all the various page configuration arrays.
-		if ( method_exists( $this, '_extend_page_config_for_cpt' ) )
-			$this->_extend_page_config_for_cpt();
+		if ( method_exists( $this, '_extend_page_config_for_cpt' ) ) {
+					$this->_extend_page_config_for_cpt();
+		}
 
 		//filter routes and page_config so addons can add their stuff. Filtering done per class
 		$this->_page_routes = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_routes', $this->_page_routes, $this );
@@ -655,8 +663,9 @@ 
 		//add screen options - global, page child class, and view specific
 		$this->_add_global_screen_options();
 		$this->_add_screen_options();
-		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
+		if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) ) {
+					call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) );
+		}
 
 
 		//add help tab(s) and tours- set via page_config and qtips.
@@ -667,28 +676,32 @@ 
 		//add feature_pointers - global, page child class, and view specific
 		$this->_add_feature_pointers();
 		$this->_add_global_feature_pointers();
-		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) )
-			call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
+		if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) ) {
+					call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) );
+		}
 
 		//enqueue scripts/styles - global, page class, and view specific
 		add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5 );
 		add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10 );
-		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) )
-			add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
+		if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) ) {
+					add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 );
+		}
 
 		add_action('admin_enqueue_scripts', array( $this, 'admin_footer_scripts_eei18n_js_strings' ), 100 );
 
 		//admin_print_footer_scripts - global, page child class, and view specific.  NOTE, despite the name, whenever possible, scripts should NOT be loaded using this.  In most cases that's doing_it_wrong().  But adding hidden container elements etc. is a good use case. Notice the late priority we're giving these
 		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_global' ), 99 );
 		add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts' ), 100 );
-		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) )
-			add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
+		if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) ) {
+					add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 );
+		}
 
 		//admin footer scripts
 		add_action('admin_footer', array( $this, 'admin_footer_global' ), 99 );
 		add_action('admin_footer', array( $this, 'admin_footer'), 100 );
-		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) )
-			add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
+		if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) ) {
+					add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 );
+		}
 
 
 		do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug );
@@ -760,7 +773,9 @@ 
 	protected function _verify_routes() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
-		if ( !$this->_current_page && !defined( 'DOING_AJAX')) return;
+		if ( !$this->_current_page && !defined( 'DOING_AJAX')) {
+			return;
+		}
 
 		$this->_route = FALSE;
 		$func = FALSE;
@@ -870,8 +885,9 @@ 
 	 * @return void
 	 */
 	protected function _route_admin_request() {
-		if (  ! $this->_is_UI_request )
-			$this->_verify_routes();
+		if (  ! $this->_is_UI_request ) {
+					$this->_verify_routes();
+		}
 
 		$nonce_check = isset( $this->_route_config['require_nonce'] ) ? $this->_route_config['require_nonce'] : TRUE;
 
@@ -881,8 +897,9 @@ 
 			$this->_verify_nonce( $nonce, $this->_req_nonce );
 		}
 		//set the nav_tabs array but ONLY if this is  UI_request
-		if ( $this->_is_UI_request )
-			$this->_set_nav_tabs();
+		if ( $this->_is_UI_request ) {
+					$this->_set_nav_tabs();
+		}
 
 		// grab callback function
 		$func = is_array( $this->_route ) ? $this->_route['func'] : $this->_route;
@@ -919,8 +936,9 @@ 
 			}
 
 
-			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE )
-				throw new EE_Error( $error_msg );
+			if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE ) {
+							throw new EE_Error( $error_msg );
+			}
 		}
 
 		//if we've routed and this route has a no headers route AND a sent_headers_route, then we need to reset the routing properties to the new route.
@@ -1047,8 +1065,9 @@ 
 				$tour_buttons = '<div class="ee-abs-container"><div class="ee-help-tour-restart-buttons">';
 				foreach ( $this->_help_tour['tours'] as $tour ) {
 					//if this is the end tour then we don't need to setup a button
-					if ( $tour instanceof EE_Help_Tour_final_stop )
-						continue;
+					if ( $tour instanceof EE_Help_Tour_final_stop ) {
+											continue;
+					}
 					$tb[] = '<button id="trigger-tour-' . $tour->get_slug() . '" class="button-primary trigger-ee-help-tour">' . $tour->get_label() . '</button>';
 				}
 				$tour_buttons .= implode('<br />', $tb);
@@ -1058,8 +1077,9 @@ 
 			// let's see if there is a help_sidebar set for the current route and we'll set that up for usage as well.
 			if ( is_array( $config ) && isset( $config['help_sidebar'] ) ) {
 				//check that the callback given is valid
-				if ( !method_exists($this, $config['help_sidebar'] ) )
-					throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
+				if ( !method_exists($this, $config['help_sidebar'] ) ) {
+									throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option.  However the callback given (%s) is not a valid callback.  Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) );
+				}
 
 				$content = apply_filters( 'FHEE__' . get_class($this) . '__add_help_tabs__help_sidebar', call_user_func( array( $this, $config['help_sidebar'] ) ) );
 
@@ -1083,18 +1103,23 @@ 
 				}/**/
 
 
-			if ( !isset( $config['help_tabs'] ) ) return; //no help tabs for this route
+			if ( !isset( $config['help_tabs'] ) ) {
+				return;
+			}
+			//no help tabs for this route
 
 			foreach ( (array) $config['help_tabs'] as $tab_id => $cfg ) {
 				//we're here so there ARE help tabs!
 
 				//make sure we've got what we need
-				if ( !isset( $cfg['title'] ) )
-					throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
+				if ( !isset( $cfg['title'] ) ) {
+									throw new EE_Error( __('The _page_config array is not set up properly for help tabs.  It is missing a title', 'event_espresso') );
+				}
 
 
-				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) )
-					throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
+				if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) ) {
+									throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') );
+				}
 
 
 
@@ -1157,14 +1182,16 @@ 
 		$this->_help_tour = array();
 
 		//exit early if help tours are turned off globally
-		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) )
-			return;
+		if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) ) {
+					return;
+		}
 
 		//loop through _page_config to find any help_tour defined
 		foreach ( $this->_page_config as $route => $config ) {
 			//we're only going to set things up for this route
-			if ( $route !== $this->_req_action )
-				continue;
+			if ( $route !== $this->_req_action ) {
+							continue;
+			}
 
 			if ( isset( $config['help_tour'] ) ) {
 
@@ -1199,8 +1226,9 @@ 
 			}
 		}
 
-		if ( !empty( $tours ) )
-			$this->_help_tour['tours'] = $tours;
+		if ( !empty( $tours ) ) {
+					$this->_help_tour['tours'] = $tours;
+		}
 
 		//thats it!  Now that the $_help_tours property is set (or not) the scripts and html should be taken care of automatically.
 	}
@@ -1240,15 +1268,21 @@ 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$i = 0;
 		foreach ( $this->_page_config as $slug => $config ) {
-			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) )
-				continue; //no nav tab for this config
+			if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) ) {
+							continue;
+			}
+			//no nav tab for this config
 
 			//check for persistent flag
-			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action )
-				continue; //nav tab is only to appear when route requested.
+			if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action ) {
+							continue;
+			}
+			//nav tab is only to appear when route requested.
 
-			if ( ! $this->check_user_access( $slug, TRUE ) )
-				continue; //no nav tab becasue current user does not have access.
+			if ( ! $this->check_user_access( $slug, TRUE ) ) {
+							continue;
+			}
+			//no nav tab becasue current user does not have access.
 
 			$css_class = isset( $config['css_class'] ) ? $config['css_class'] . ' ' : '';
 			$this->_nav_tabs[$slug] = array(
@@ -1484,10 +1518,11 @@ 
 			$content .= EEH_Template::display_template( $template_path, $template_args, TRUE );
 		}
 
-		if ( $display )
-			echo $content;
-		else
-			return $content;
+		if ( $display ) {
+					echo $content;
+		} else {
+					return $content;
+		}
 	}
 
 
@@ -1504,8 +1539,9 @@ 
 		$method_name = '_help_popup_content_' . $this->_req_action;
 
 		//if method doesn't exist let's get out.
-		if ( !method_exists( $this, $method_name ) )
-			return array();
+		if ( !method_exists( $this, $method_name ) ) {
+					return array();
+		}
 
 		//k we're good to go let's retrieve the help array
 		$help_array = call_user_func( array( $this, $method_name ) );
@@ -1536,7 +1572,9 @@ 
 	 */
 	protected function _set_help_trigger( $trigger_id, $display = TRUE, $dimensions = array( '400', '640') ) {
 
-		if ( defined('DOING_AJAX') ) return;
+		if ( defined('DOING_AJAX') ) {
+			return;
+		}
 
 		//let's check and see if there is any content set for this popup.  If there isn't then we'll include a default title and content so that developers know something needs to be corrected
 		$help_array = $this->_get_help_content();
@@ -1554,10 +1592,11 @@ 
 		$content = '<a class="ee-dialog" href="?height='. $dimensions[0] . '&width=' . $dimensions[1] . '&inlineId=' . $trigger_id . '" target="_blank"><span class="question ee-help-popup-question"></span></a>';
 		$content = $content . $help_content;
 
-		if ( $display )
-			echo $content;
-		else
-			return $content;
+		if ( $display ) {
+					echo $content;
+		} else {
+					return $content;
+		}
 	}
 
 
@@ -1783,8 +1822,10 @@ 
 	protected function _set_list_table() {
 
 		//first is this a list_table view?
-		if ( !isset($this->_route_config['list_table']) )
-			return; //not a list_table view so get out.
+		if ( !isset($this->_route_config['list_table']) ) {
+					return;
+		}
+		//not a list_table view so get out.
 
 		//list table functions are per view specific (because some admin pages might have more than one listtable!)
 
@@ -2146,8 +2187,9 @@ 
 	protected function _espresso_sponsors_post_box() {
 
 		$show_sponsors = apply_filters( 'FHEE_show_sponsors_meta_box', TRUE );
-		if ( $show_sponsors )
-			add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
+		if ( $show_sponsors ) {
+					add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side');
+		}
 	}
 
 
@@ -2444,8 +2486,9 @@ 
 
 		$template_path = $sidebar ?  EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar.template.php';
 
-		if ( defined('DOING_AJAX' ) )
-			$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
+		if ( defined('DOING_AJAX' ) ) {
+					$template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php';
+		}
 
 		$template_path = !empty($this->_column_template_path) ? $this->_column_template_path : $template_path;
 
@@ -2587,10 +2630,11 @@ 
 			true
 		);
 		// the final template wrapper
-		if ( $sidebar )
-			$this->display_admin_page_with_sidebar();
-		else
-			$this->display_admin_page_with_no_sidebar();
+		if ( $sidebar ) {
+					$this->display_admin_page_with_sidebar();
+		} else {
+					$this->display_admin_page_with_no_sidebar();
+		}
 	}
 
 
@@ -2658,8 +2702,9 @@ 
 
 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
-		if ( NULL === error_get_last() || ! headers_sent() )
-			header('Content-Type: application/json; charset=UTF-8');
+		if ( NULL === error_get_last() || ! headers_sent() ) {
+					header('Content-Type: application/json; charset=UTF-8');
+		}
                 if( function_exists( 'wp_json_encode' ) ) {
                     echo wp_json_encode( $json );
                 } else {
@@ -2677,10 +2722,9 @@ 
 	 * @throws EE_Error
 	 */
 	public function return_json() {
-		if ( defined('DOING_AJAX') && DOING_AJAX )
-			$this->_return_json();
-
-		else {
+		if ( defined('DOING_AJAX') && DOING_AJAX ) {
+					$this->_return_json();
+		} else {
 			throw new EE_Error( sprintf( __('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__ ) );
 		}
 	}
@@ -2822,7 +2866,9 @@ 
 			$id = $this->_current_view . '_' . $ref;
 			$name = !empty($actions) ? $actions[$key] : $ref;
 			$this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary ' . $ref . '" value="' . $button . '" name="' . $name . '" id="' . $id . '" />';
-			if ( !$both ) break;
+			if ( !$both ) {
+				break;
+			}
 		}
 
 	}
@@ -3178,13 +3224,15 @@ 
 		if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
 			check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
 
-			if ( !$user = wp_get_current_user() )
-			return;
+			if ( !$user = wp_get_current_user() ) {
+						return;
+			}
 			$option = $_POST['wp_screen_options']['option'];
 			$value = $_POST['wp_screen_options']['value'];
 
-			if ( $option != sanitize_key( $option ) )
-				return;
+			if ( $option != sanitize_key( $option ) ) {
+							return;
+			}
 
 			$map_option = $option;
 
@@ -3193,13 +3241,15 @@ 
 			switch ( $map_option ) {
 				case $this->_current_page . '_' .  $this->_current_view . '_per_page':
 					$value = (int) $value;
-					if ( $value < 1 || $value > 999 )
-						return;
+					if ( $value < 1 || $value > 999 ) {
+											return;
+					}
 					break;
 				default:
 					$value = apply_filters( 'FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value );
-					if ( false === $value )
-						return;
+					if ( false === $value ) {
+											return;
+					}
 					break;
 			}
 
@@ -3235,8 +3285,9 @@ 
 	protected function _add_transient( $route, $data, $notices = FALSE, $skip_route_verify = FALSE ) {
 		$user_id = get_current_user_id();
 
-		if ( !$skip_route_verify )
-			$this->_verify_route($route);
+		if ( !$skip_route_verify ) {
+					$this->_verify_route($route);
+		}
 
 
 		//now let's set the string for what kind of transient we're setting

core/services/commands/CommandHandler.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 namespace EventEspresso\core\services\commands;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }