eventespresso / event-espresso-core

caffeinated/modules/events_archive_caff/EED_Events_Archive_Caff.module.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Doc Comments +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 	 *  @access 	public
 	 *  @param    EE_Template_Config $CFG
 	 *  @param 	array $REQ
-	 *  @return    EE_Events_Archive_Config
+	 *  @return    EE_Template_Config
 	 */
 	public static function update_template_settings( $CFG, $REQ ) {
 		$config = new EE_Events_Archive_Config();

Spacing +53 added lines, -53 removed lines

@@ -28,7 +28,7 @@ 
 	 * @return EED_Events_Archive_Caff
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -49,13 +49,13 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define( 'EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
-		define( 'EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Events_Archive_Caff', 'template_settings_form' ), 10 );
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Events_Archive_Caff', 'update_template_settings' ), 10, 2 );
+		define('EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
+		define('EVENT_ARCHIVE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Events_Archive_Caff', 'template_settings_form'), 10);
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Events_Archive_Caff', 'update_template_settings'), 10, 2);
 		// AJAX
-		add_action( 'wp_ajax_espresso_update_event_archive_order', array( 'EED_Events_Archive_Caff', 'update_event_archive_order' ) );
-		add_action( 'wp_ajax_nopriv_espresso_update_event_archive_order', array( 'EED_Events_Archive_Caff', 'update_event_archive_order' ) );
+		add_action('wp_ajax_espresso_update_event_archive_order', array('EED_Events_Archive_Caff', 'update_event_archive_order'));
+		add_action('wp_ajax_nopriv_espresso_update_event_archive_order', array('EED_Events_Archive_Caff', 'update_event_archive_order'));
 	}
 
 
@@ -68,7 +68,7 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 
@@ -83,33 +83,33 @@ 
 	 */
 	public static function template_settings_form() {
 		// grab general settings admin page and remove the existing hook callback
-		$gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object( 'general_settings' );
-		if ( $gen_set_admin instanceof General_Settings_Admin_Page ) {
-			remove_action( 'AHEE__template_settings__template__before_settings_form', array( $gen_set_admin, 'template_settings_caff_features' ), 100 );
+		$gen_set_admin = EE_Registry::instance()->LIB->EE_Admin_Page_Loader->get_admin_page_object('general_settings');
+		if ($gen_set_admin instanceof General_Settings_Admin_Page) {
+			remove_action('AHEE__template_settings__template__before_settings_form', array($gen_set_admin, 'template_settings_caff_features'), 100);
 		}
 		// first just grab the template settings
 		$config = EE_Registry::instance()->CFG->template_settings;
 		// then if the Event Archive config is valid, use that, else create a new one
-		$config = isset( $config->EED_Events_Archive ) && $config->EED_Events_Archive instanceof EE_Events_Archive_Config ? $config->EED_Events_Archive : new EE_Events_Archive_Config();
-		$config = apply_filters( 'FHEE__EED_Events_Archive__template_settings_form__event_list_config', $config );
-		$config->display_status_banner = isset( $config->display_status_banner ) ? $config->display_status_banner : 0;
-		$config->display_description = isset( $config->display_description ) ? $config->display_description : 1;
-		$config->display_ticket_selector = isset( $config->display_ticket_selector ) ? $config->display_ticket_selector : 0;
-		$config->display_datetimes = isset( $config->display_datetimes ) ? $config->display_datetimes : 1;
-		$config->display_venue = isset( $config->display_venue ) ? $config->display_venue : 0;
-		$config->display_expired_events = isset( $config->display_expired_events ) ? $config->display_expired_events : 0;
+		$config = isset($config->EED_Events_Archive) && $config->EED_Events_Archive instanceof EE_Events_Archive_Config ? $config->EED_Events_Archive : new EE_Events_Archive_Config();
+		$config = apply_filters('FHEE__EED_Events_Archive__template_settings_form__event_list_config', $config);
+		$config->display_status_banner = isset($config->display_status_banner) ? $config->display_status_banner : 0;
+		$config->display_description = isset($config->display_description) ? $config->display_description : 1;
+		$config->display_ticket_selector = isset($config->display_ticket_selector) ? $config->display_ticket_selector : 0;
+		$config->display_datetimes = isset($config->display_datetimes) ? $config->display_datetimes : 1;
+		$config->display_venue = isset($config->display_venue) ? $config->display_venue : 0;
+		$config->display_expired_events = isset($config->display_expired_events) ? $config->display_expired_events : 0;
 		// display order options
-		$config->use_sortable_display_order = isset( $config->use_sortable_display_order  )? $config->use_sortable_display_order : false;
-		$config->display_order_tickets = isset( $config->display_order_tickets  )? $config->display_order_tickets : 100;
-		$config->display_order_datetimes = isset( $config->display_order_datetimes  )? $config->display_order_datetimes : 110;
-		$config->display_order_event = isset( $config->display_order_event  )? $config->display_order_event : 120;
-		$config->display_order_venue = isset( $config->display_order_venue  )? $config->display_order_venue : 130;
+		$config->use_sortable_display_order = isset($config->use_sortable_display_order) ? $config->use_sortable_display_order : false;
+		$config->display_order_tickets = isset($config->display_order_tickets) ? $config->display_order_tickets : 100;
+		$config->display_order_datetimes = isset($config->display_order_datetimes) ? $config->display_order_datetimes : 110;
+		$config->display_order_event = isset($config->display_order_event) ? $config->display_order_event : 120;
+		$config->display_order_venue = isset($config->display_order_venue) ? $config->display_order_venue : 130;
 		// get template parts
-		$template_parts = EED_Events_Archive::instance()->initialize_template_parts( $config );
+		$template_parts = EED_Events_Archive::instance()->initialize_template_parts($config);
 		// convert to array so that we can add more properties
-		$config = get_object_vars( $config );
-		$config[ 'event_archive_display_order' ] = $template_parts->generate_sortable_list_of_template_parts( 'event-archive-sortable-js', '', 'archive-sortable-li archive-sortable-js' );
-		EEH_Template::display_template( EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH . 'admin-event-list-settings.template.php', $config );
+		$config = get_object_vars($config);
+		$config['event_archive_display_order'] = $template_parts->generate_sortable_list_of_template_parts('event-archive-sortable-js', '', 'archive-sortable-li archive-sortable-js');
+		EEH_Template::display_template(EVENTS_ARCHIVE_CAFF_TEMPLATES_PATH.'admin-event-list-settings.template.php', $config);
 	}
 
 
@@ -125,24 +125,24 @@ 
 	 *  @param 	array $REQ
 	 *  @return    EE_Events_Archive_Config
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
+	public static function update_template_settings($CFG, $REQ) {
 		$config = new EE_Events_Archive_Config();
 		// unless we are resetting the config...
-		if ( ! isset( $REQ['EED_Events_Archive_reset_event_list_settings'] ) || absint( $REQ['EED_Events_Archive_reset_event_list_settings'] ) !== 1 ) {
-			$config->display_status_banner = isset( $REQ['EED_Events_Archive_display_status_banner'] ) ? absint( $REQ['EED_Events_Archive_display_status_banner'] ) : 0;
-			$config->display_description = isset( $REQ['EED_Events_Archive_display_description'] ) ? absint( $REQ['EED_Events_Archive_display_description'] ) : 1;
-			$config->display_ticket_selector = isset( $REQ['EED_Events_Archive_display_ticket_selector'] ) ? absint( $REQ['EED_Events_Archive_display_ticket_selector'] ) : 0;
-			$config->display_datetimes = isset( $REQ['EED_Events_Archive_display_datetimes'] ) ? absint( $REQ['EED_Events_Archive_display_datetimes'] ) : 1;
-			$config->display_venue = isset( $REQ['EED_Events_Archive_display_venue'] ) ? absint( $REQ['EED_Events_Archive_display_venue'] ) : 0;
-			$config->display_expired_events = isset( $REQ['EED_Events_Archive_display_expired_events'] ) ? absint( $REQ['EED_Events_Archive_display_expired_events'] ) : 0;
-			$config->use_sortable_display_order = isset( $REQ['EED_Events_Archive_use_sortable_display_order'] ) ? absint( $REQ['EED_Events_Archive_use_sortable_display_order'] ) : 0;
-			$config->display_order_tickets = isset( $CFG->EED_Events_Archive->display_order_tickets ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_tickets : 100;
-			$config->display_order_datetimes = isset( $CFG->EED_Events_Archive->display_order_datetimes ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_datetimes : 110;
-			$config->display_order_event = isset( $CFG->EED_Events_Archive->display_order_event ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_event : 120;
-			$config->display_order_venue = isset( $CFG->EED_Events_Archive->display_order_venue ) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_venue : 130;
+		if ( ! isset($REQ['EED_Events_Archive_reset_event_list_settings']) || absint($REQ['EED_Events_Archive_reset_event_list_settings']) !== 1) {
+			$config->display_status_banner = isset($REQ['EED_Events_Archive_display_status_banner']) ? absint($REQ['EED_Events_Archive_display_status_banner']) : 0;
+			$config->display_description = isset($REQ['EED_Events_Archive_display_description']) ? absint($REQ['EED_Events_Archive_display_description']) : 1;
+			$config->display_ticket_selector = isset($REQ['EED_Events_Archive_display_ticket_selector']) ? absint($REQ['EED_Events_Archive_display_ticket_selector']) : 0;
+			$config->display_datetimes = isset($REQ['EED_Events_Archive_display_datetimes']) ? absint($REQ['EED_Events_Archive_display_datetimes']) : 1;
+			$config->display_venue = isset($REQ['EED_Events_Archive_display_venue']) ? absint($REQ['EED_Events_Archive_display_venue']) : 0;
+			$config->display_expired_events = isset($REQ['EED_Events_Archive_display_expired_events']) ? absint($REQ['EED_Events_Archive_display_expired_events']) : 0;
+			$config->use_sortable_display_order = isset($REQ['EED_Events_Archive_use_sortable_display_order']) ? absint($REQ['EED_Events_Archive_use_sortable_display_order']) : 0;
+			$config->display_order_tickets = isset($CFG->EED_Events_Archive->display_order_tickets) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_tickets : 100;
+			$config->display_order_datetimes = isset($CFG->EED_Events_Archive->display_order_datetimes) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_datetimes : 110;
+			$config->display_order_event = isset($CFG->EED_Events_Archive->display_order_event) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_event : 120;
+			$config->display_order_venue = isset($CFG->EED_Events_Archive->display_order_venue) && $config->use_sortable_display_order ? $CFG->EED_Events_Archive->display_order_venue : 130;
 		}
 		$CFG->EED_Events_Archive = $config;
-		do_action( 'AHEE__EED_Events_Archive__update_template_settings__after_update', $CFG, $REQ );
+		do_action('AHEE__EED_Events_Archive__update_template_settings__after_update', $CFG, $REQ);
 		return $CFG;
 	}
 
@@ -156,12 +156,12 @@ 
 	 */
 	public static function update_event_archive_order() {
 		$config_saved = false;
-		$template_parts = sanitize_text_field( $_POST[ 'elements' ] );
-		if ( ! empty( $template_parts ) ) {
-			$template_parts = explode( ',', trim( $template_parts, ',' ) );
-			foreach ( $template_parts as $key => $template_part ) {
+		$template_parts = sanitize_text_field($_POST['elements']);
+		if ( ! empty($template_parts)) {
+			$template_parts = explode(',', trim($template_parts, ','));
+			foreach ($template_parts as $key => $template_part) {
 				$template_part = "display_order_$template_part";
-				$priority = ( $key * 10 ) + 100;
+				$priority = ($key * 10) + 100;
 				if (
 					property_exists(
 						EE_Registry::instance()->CFG->template_settings->EED_Events_Archive,
@@ -170,16 +170,16 @@ 
 				) {
 					EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->$template_part = $priority;
 				}
-				do_action( "AHEE__EED_Events_Archive__update_event_archive_order__$template_part", $priority );
+				do_action("AHEE__EED_Events_Archive__update_event_archive_order__$template_part", $priority);
 			}
-			$config_saved = EE_Registry::instance()->CFG->update_espresso_config( false, false );
+			$config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
 		}
-		if ( $config_saved ) {
-			EE_Error::add_success( __( 'Display Order has been successfully updated.', 'event_espresso' ) );
+		if ($config_saved) {
+			EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
 		} else {
-			EE_Error::add_error( __( 'Display Order was not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Display Order was not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		echo wp_json_encode( EE_Error::get_notices( false ) );
+		echo wp_json_encode(EE_Error::get_notices(false));
 		exit();
 	}
 

caffeinated/payment_methods/Aim/EE_PMT_Aim.pm.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +47 added lines, -47 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 EE_PMT_Aim extends EE_PMT_Base{
+class EE_PMT_Aim extends EE_PMT_Base {
 
 
 	/**
@@ -37,7 +37,7 @@ 
 		require_once($this->file_folder().'EEG_Aim.gateway.php');
 		$this->_gateway = new EEG_AIM();
 		$this->_pretty_name = __("Authorize.net AIM", 'event_espresso');
-		$this->_default_description = __( 'Please provide the following billing information.', 'event_espresso' );
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
 		$this->_requires_https = true;
 		parent::__construct($pm_instance);
 	}
@@ -47,60 +47,60 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return EE_Billing_Info_Form
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
-		$billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance,array(
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
+		$billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, array(
 			'name'=>'AIM_Form',
 			'subsections'=>array(
 				'credit_card'=>new EE_Credit_Card_Input(array(
 					'required'=>true,
-					'html_label_text' => __( 'Card Number', 'event_espresso' )
+					'html_label_text' => __('Card Number', 'event_espresso')
 				)),
 				'exp_month'=>new EE_Credit_Card_Month_Input(true, array(
 					'required'=>true,
-					'html_label_text' => __( 'Expiry Month', 'event_espresso' )
+					'html_label_text' => __('Expiry Month', 'event_espresso')
 				)),
-				'exp_year'=>new EE_Credit_Card_Year_Input( array( 
+				'exp_year'=>new EE_Credit_Card_Year_Input(array( 
 					'required'=>true,
-					'html_label_text' => __( 'Expiry Year', 'event_espresso' ) 
+					'html_label_text' => __('Expiry Year', 'event_espresso') 
 				)),
-				'cvv'=>new EE_CVV_Input( array(
+				'cvv'=>new EE_CVV_Input(array(
 					'required'=>true,
-					'html_label_text' => __( 'CVV', 'event_espresso' ) ) ),
+					'html_label_text' => __('CVV', 'event_espresso') )),
 			)
 		));
-		$billing_form->add_subsections( array(
-			'company' => new EE_Text_Input( array(
+		$billing_form->add_subsections(array(
+			'company' => new EE_Text_Input(array(
 				'html_label_text' => __('Company', 'event_espresso')
 			))
-		), 'email', false );
+		), 'email', false);
 		$billing_form->add_subsections( 
 				array(
-					'fax' => new EE_Text_Input( array(
+					'fax' => new EE_Text_Input(array(
 						'html_label_text' => __('Fax', 'event_espresso')
 					))
 				), 
 				'phone', 
 				false );
 		$settings_form = $this->settings_form();
-		if( $settings_form->get_input( 'excluded_billing_inputs' ) instanceof EE_Checkbox_Multi_Input ) {
-				$billing_form->exclude( $settings_form->get_input( 'excluded_billing_inputs' )->normalized_value() );
+		if ($settings_form->get_input('excluded_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
+				$billing_form->exclude($settings_form->get_input('excluded_billing_inputs')->normalized_value());
 		}
-		if( $settings_form->get_input( 'required_billing_inputs' ) instanceof EE_Checkbox_Multi_Input ) {
+		if ($settings_form->get_input('required_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
 			$required_inputs = array_merge( 
 					array(
 						'credit_card',
 						'exp_month',
 						'exp_year' ),
-					$settings_form->get_input( 'required_billing_inputs' )->normalized_value() );
-			foreach( $billing_form->inputs() as $input_name => $input ) {
-				if( in_array( $input_name, $required_inputs ) ) {
-					$input->set_required( true );
+					$settings_form->get_input('required_billing_inputs')->normalized_value() );
+			foreach ($billing_form->inputs() as $input_name => $input) {
+				if (in_array($input_name, $required_inputs)) {
+					$input->set_required(true);
 				} else {
-					$input->set_required( false );
+					$input->set_required(false);
 				}
 			}
 		}
-		return $this->apply_billing_form_debug_settings( $billing_form );
+		return $this->apply_billing_form_debug_settings($billing_form);
 	}
 
 
@@ -112,19 +112,19 @@ 
 	 * @param \EE_Billing_Info_Form $billing_form
 	 * @return \EE_Billing_Info_Form
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
-		if ( $this->_pm_instance->debug_mode() || $this->_pm_instance->get_extra_meta( 'test_transactions', TRUE, FALSE )) {
-			$billing_form->get_input( 'credit_card' )->set_default( '4007000000027' );
-			$billing_form->get_input( 'exp_year' )->set_default( '2020' );
-			if( $billing_form->get_subsection( 'cvv' ) instanceof EE_Form_Input_Base ) {
-				$billing_form->get_input( 'cvv' )->set_default(( '123' ));
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
+		if ($this->_pm_instance->debug_mode() || $this->_pm_instance->get_extra_meta('test_transactions', TRUE, FALSE)) {
+			$billing_form->get_input('credit_card')->set_default('4007000000027');
+			$billing_form->get_input('exp_year')->set_default('2020');
+			if ($billing_form->get_subsection('cvv') instanceof EE_Form_Input_Base) {
+				$billing_form->get_input('cvv')->set_default(('123'));
 			}
 			$billing_form->add_subsections(
-				array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+				array('fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html()),
 				'credit_card'
 			);
 			$billing_form->add_subsections(
-				array( 'debug_content' => new EE_Form_Section_HTML_From_Template( dirname(__FILE__).DS.'templates'.DS.'authorize_net_aim_debug_info.template.php' )),
+				array('debug_content' => new EE_Form_Section_HTML_From_Template(dirname(__FILE__).DS.'templates'.DS.'authorize_net_aim_debug_info.template.php')),
 				'first_name'
 			);
 		}
@@ -144,17 +144,17 @@ 
 				'extra_meta_inputs'=>array(
 					'login_id'=>new EE_Text_Input(
 						array(
-							'html_label_text'=>  sprintf( __("Authorize.net API Login ID %s", "event_espresso"),  $this->get_help_tab_link() ),
+							'html_label_text'=>  sprintf(__("Authorize.net API Login ID %s", "event_espresso"), $this->get_help_tab_link()),
 							'required' => true )
 					),
 					'transaction_key'=>new EE_Text_Input(
 						array(
-							'html_label_text'=> sprintf( __("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link() ),
+							'html_label_text'=> sprintf(__("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link()),
 							'required' => true )
 					),
 					'test_transactions'=>new EE_Yes_No_Input(
 						array(
-							'html_label_text'=>  sprintf( __("Send test transactions? %s", 'event_espresso'),  $this->get_help_tab_link() ),
+							'html_label_text'=>  sprintf(__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
 							'html_help_text'=>  __("Send test transactions, even to live server", 'event_espresso'),
 							'default' => false,
 							'required' => true
@@ -163,7 +163,7 @@ 
 					'excluded_billing_inputs' => new EE_Checkbox_Multi_Input( 
 							$billing_input_names,
 					array( 
-						'html_label_text' => sprintf( __("Excluded Payment Form Fields %s", 'event_espresso'),  $this->get_help_tab_link() ),
+						'html_label_text' => sprintf(__("Excluded Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
 						'default' => array(
 							'company',
 							'fax',
@@ -172,10 +172,10 @@ 
 					'required_billing_inputs' => new EE_Checkbox_Multi_Input( 
 							$billing_input_names,
 							array(
-								'html_label_text' => sprintf( __("Required Payment Form Fields %s", 'event_espresso'),  $this->get_help_tab_link() ),
+								'html_label_text' => sprintf(__("Required Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
 								'default' => array_diff(
-											array_keys( $billing_input_names ),
-											array( 'address2', 'phone', 'company', 'fax' )
+											array_keys($billing_input_names),
+											array('address2', 'phone', 'company', 'fax')
 								),
 								'html_help_text' => __('Note: if fields are excluded they cannot be required.', 'event_espresso')
 							)),
@@ -191,10 +191,10 @@ 
 	 */
 	public function billing_input_names() {
 		return array(
-			'first_name' => __( 'First Name', 'event_espresso' ),
+			'first_name' => __('First Name', 'event_espresso'),
 			'last_name' => __('Last Name', 'event_espresso'),
-			'email' => __( 'Email', 'event_espresso' ),
-			'company' => __( 'Company', 'event_espresso' ),
+			'email' => __('Email', 'event_espresso'),
+			'company' => __('Company', 'event_espresso'),
 			'address' => __('Address', 'event_espresso'),
 			'address2' => __('Address2', 'event_espresso'),
 			'city' => __('City', 'event_espresso'),
@@ -202,7 +202,7 @@ 
 			'country' => __('Country', 'event_espresso'),
 			'zip' =>  __('Zip', 'event_espresso'),
 			'phone' => __('Phone', 'event_espresso'),
-			'fax' => __( 'Fax', 'event_espresso' ),
+			'fax' => __('Fax', 'event_espresso'),
 			'cvv' => __('CVV', 'event_espresso')
 		);
 	}
@@ -213,10 +213,10 @@ 
 	 * @param type $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
+	protected function _get_billing_values_from_form($billing_form) {
 		$all_billing_values_empty = array();
-		foreach( array_keys( $this->billing_input_names() ) as $input_name ) {
-			$all_billing_values_empty[ $input_name ] = '';
+		foreach (array_keys($this->billing_input_names()) as $input_name) {
+			$all_billing_values_empty[$input_name] = '';
 		}
 		return array_merge(
 				$all_billing_values_empty,
@@ -231,7 +231,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 				'title' => __('Authorize.net AIM Settings', 'event_espresso'),

core/CPTs/EE_CPT_Event_Strategy.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +35 added lines, -35 removed lines

@@ -39,9 +39,9 @@ 
 	 * @param 	array 	$arguments
 	 * @return 	\EE_CPT_Event_Strategy
 	 */
-	public function __construct( $arguments = array() ) {
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
+	public function __construct($arguments = array()) {
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
 
 		// !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
 		// here's the list of available filters in the WP_Query object
@@ -55,10 +55,10 @@ 
 		// 'posts_fields'
 		// 'posts_join'
 		$this->_add_filters();
-		if ( $WP_Query instanceof WP_Query ) {
-			$WP_Query->is_espresso_event_single = is_singular() && isset( $WP_Query->query->post_type ) && $WP_Query->query->post_type == 'espresso_events' ? TRUE : FALSE;
+		if ($WP_Query instanceof WP_Query) {
+			$WP_Query->is_espresso_event_single = is_singular() && isset($WP_Query->query->post_type) && $WP_Query->query->post_type == 'espresso_events' ? TRUE : FALSE;
 			$WP_Query->is_espresso_event_archive = is_post_type_archive('espresso_events') ? TRUE : FALSE;
-			$WP_Query->is_espresso_event_taxonomy = is_tax( 'espresso_event_categories' ) ? TRUE : FALSE;
+			$WP_Query->is_espresso_event_taxonomy = is_tax('espresso_event_categories') ? TRUE : FALSE;
 		}
 
 	}
@@ -70,13 +70,13 @@ 
 	 * (which will get removed in case the next call to get_posts ISN'T
 	 * for event CPTs)
 	 */
-	protected function _add_filters(){
-		add_filter( 'posts_fields', array( $this, 'posts_fields' ), 1, 2 );
-		add_filter( 'posts_join', array( $this, 'posts_join' ), 1, 2 );
-		add_filter( 'posts_where', array( $this, 'posts_where' ), 10, 2 );
-		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
-		add_filter( 'posts_orderby', array( $this, 'posts_orderby' ), 1, 2 );
-		add_filter( 'posts_groupby', array( $this, 'posts_groupby' ), 1, 2 );
+	protected function _add_filters() {
+		add_filter('posts_fields', array($this, 'posts_fields'), 1, 2);
+		add_filter('posts_join', array($this, 'posts_join'), 1, 2);
+		add_filter('posts_where', array($this, 'posts_where'), 10, 2);
+		add_filter('the_posts', array($this, 'the_posts'), 1, 2);
+		add_filter('posts_orderby', array($this, 'posts_orderby'), 1, 2);
+		add_filter('posts_groupby', array($this, 'posts_groupby'), 1, 2);
 	}
 
 
@@ -86,13 +86,13 @@ 
 	 * This is to avoid applying this CPT strategy for other posts or CPTs (eg,
 	 * we don't want to join to the datetime table when querying for venues, do we!?)
 	 */
-	protected function _remove_filters(){
-		remove_filter( 'posts_fields', array( $this, 'posts_fields' ), 1 );
-		remove_filter( 'posts_join', array( $this, 'posts_join' ), 1 );
-		remove_filter( 'posts_where', array( $this, 'posts_where' ), 10 );
-		remove_filter( 'the_posts', array( $this, 'the_posts' ), 1 );
-		remove_filter( 'posts_orderby', array( $this, 'posts_orderby' ), 1 );
-		remove_filter( 'posts_groupby', array( $this, 'posts_groupby' ), 1 );
+	protected function _remove_filters() {
+		remove_filter('posts_fields', array($this, 'posts_fields'), 1);
+		remove_filter('posts_join', array($this, 'posts_join'), 1);
+		remove_filter('posts_where', array($this, 'posts_where'), 10);
+		remove_filter('the_posts', array($this, 'the_posts'), 1);
+		remove_filter('posts_orderby', array($this, 'posts_orderby'), 1);
+		remove_filter('posts_groupby', array($this, 'posts_groupby'), 1);
 	}
 
 
@@ -105,7 +105,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public function posts_fields( $SQL, WP_Query $wp_query ) {
+	public function posts_fields($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -116,11 +116,11 @@ 
 			)
 		) {
 			// adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
-			$SQL .= ', ' . EEM_Datetime::instance()->table() . '.* ' ;
-			if ( $wp_query->is_espresso_event_archive || $wp_query->is_espresso_event_taxonomy ) {
+			$SQL .= ', '.EEM_Datetime::instance()->table().'.* ';
+			if ($wp_query->is_espresso_event_archive || $wp_query->is_espresso_event_taxonomy) {
 				// because we only want to retrieve the next upcoming datetime for each event:
 				// add something like ", MIN( wp_esp_datetime.DTT_EVT_start ) as event_start_date " to WP Query SELECT statement
-				$SQL .= ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ' ;
+				$SQL .= ', MIN( '.EEM_Datetime::instance()->table().'.DTT_EVT_start ) as event_start_date ';
 			}
 		}
 		return $SQL;
@@ -137,7 +137,7 @@ 
 	 * @internal  param \WP_Query $WP_Query
 	 * @return    string
 	 */
-	public function posts_join( $SQL, WP_Query $wp_query ) {
+	public function posts_join($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -148,7 +148,7 @@ 
 			)
 		) {
 			// adds something like " LEFT JOIN wp_esp_datetime ON ( wp_esp_datetime.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
-			$SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . EEM_Event::instance()->table() . '.ID = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name() . ' ) ';
+			$SQL .= ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.EEM_Event::instance()->table().'.ID = '.EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name().' ) ';
 		}
 		return $SQL;
 	}
@@ -163,7 +163,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public function posts_where( $SQL, WP_Query $wp_query ) {
+	public function posts_where($SQL, WP_Query $wp_query) {
 //		global $wpdb;
 		if (
 			$wp_query instanceof WP_Query
@@ -173,8 +173,8 @@ 
 				|| $wp_query->is_espresso_event_taxonomy
 			)
 		) {
-			if ( ! isset( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive ) || ! isset( EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events ) || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events ) {
-				$SQL .=  ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . current_time( 'mysql', true ) . '" ';
+			if ( ! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive) || ! isset(EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events) || ! EE_Registry::instance()->CFG->template_settings->EED_Events_Archive->display_expired_events) {
+				$SQL .= ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > "'.current_time('mysql', true).'" ';
 			}
 		}
 		return $SQL;
@@ -190,7 +190,7 @@ 
 	 * @param 	WP_Query $wp_query
 	 * @return 	string
 	 */
-	public function posts_orderby( $SQL, WP_Query $wp_query ) {
+	public function posts_orderby($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -214,7 +214,7 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public function posts_groupby( $SQL, WP_Query $wp_query ) {
+	public function posts_groupby($SQL, WP_Query $wp_query) {
 		if (
 			$wp_query instanceof WP_Query
 			&&
@@ -227,7 +227,7 @@ 
 			// we're joining to the datetimes table, where there can be MANY datetimes for a single event, but we want to only show each event only once
 			// (whereas if we didn't group them by the post's ID, then we would end up with many repeats)
 			global $wpdb;
-			$SQL = $wpdb->posts . '.ID ';
+			$SQL = $wpdb->posts.'.ID ';
 		}
 		return $SQL;
 	}
@@ -242,8 +242,8 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    array
 	 */
-	public function the_posts( $posts, WP_Query $wp_query ) {
-		if ( $wp_query instanceof WP_Query && isset( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'espresso_events' ) {
+	public function the_posts($posts, WP_Query $wp_query) {
+		if ($wp_query instanceof WP_Query && isset($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'espresso_events') {
 			// automagically load the EEH_Event_View helper so that it's functions are available
 			EE_Registry::instance()->load_helper('Event_View');
 		}
@@ -262,7 +262,7 @@ 
 	 * @param      $single
 	 * @return    string
 	 */
-	public function get_EE_post_type_metadata( $meta_value = NULL, $post_id, $meta_key, $single ) {
+	public function get_EE_post_type_metadata($meta_value = NULL, $post_id, $meta_key, $single) {
 		return $meta_value;
 	}
 

core/EES_Shortcode.shortcode.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +19 added lines, -19 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public abstract function run( WP $WP );
+	public abstract function run(WP $WP);
 
 
 
@@ -54,7 +54,7 @@ 
 	 *  @param		array 	$attributes
 	 *  @return 	mixed
 	 */
-	public abstract function process_shortcode( $attributes = array() );
+	public abstract function process_shortcode($attributes = array());
 
 
 
@@ -65,13 +65,13 @@ 
 	 * @param 	string $shortcode_class
 	 * @return 	\EES_Shortcode
 	 */
-	final public static function instance( $shortcode_class = NULL ) {
-		$shortcode_class = ! empty( $shortcode_class ) ? $shortcode_class : get_called_class();
-		if ( $shortcode_class == 'EES_Shortcode' || empty( $shortcode_class )) {
+	final public static function instance($shortcode_class = NULL) {
+		$shortcode_class = ! empty($shortcode_class) ? $shortcode_class : get_called_class();
+		if ($shortcode_class == 'EES_Shortcode' || empty($shortcode_class)) {
 			return NULL;
 		}
-		$shortcode = str_replace( 'EES_', '', strtoupper( $shortcode_class ));
-		$shortcode_obj = isset( EE_Registry::instance()->shortcodes->{$shortcode} ) ? EE_Registry::instance()->shortcodes->{$shortcode} : NULL;
+		$shortcode = str_replace('EES_', '', strtoupper($shortcode_class));
+		$shortcode_obj = isset(EE_Registry::instance()->shortcodes->{$shortcode} ) ? EE_Registry::instance()->shortcodes->{$shortcode} : NULL;
 		return $shortcode_obj instanceof $shortcode_class || $shortcode_class == 'self' ? $shortcode_obj : new $shortcode_class();
 	}
 
@@ -86,23 +86,23 @@ 
 	 * @param 	$attributes
 	 * @return 	mixed
 	 */
-	final public static function fallback_shortcode_processor( $attributes ) {
-		if ( EE_Maintenance_Mode::disable_frontend_for_maintenance() ) {
+	final public static function fallback_shortcode_processor($attributes) {
+		if (EE_Maintenance_Mode::disable_frontend_for_maintenance()) {
 			return null;
 		}
 		// what shortcode was actually parsed ?
 		$shortcode_class = get_called_class();
 		// notify rest of system that fallback processor was triggered
-		add_filter( 'FHEE__fallback_shortcode_processor__' . $shortcode_class, '__return_true' );
+		add_filter('FHEE__fallback_shortcode_processor__'.$shortcode_class, '__return_true');
 		// get instance of actual shortcode
-		$shortcode_obj = self::instance( $shortcode_class );
+		$shortcode_obj = self::instance($shortcode_class);
 		// verify class
-		if ( $shortcode_obj instanceof EES_Shortcode ) {
+		if ($shortcode_obj instanceof EES_Shortcode) {
 			global $wp;
-			$shortcode_obj->run( $wp );
+			$shortcode_obj->run($wp);
 			// set attributes and run the shortcode
-			$shortcode_obj->_attributes = (array)$attributes;
-			return $shortcode_obj->process_shortcode( $shortcode_obj->_attributes );
+			$shortcode_obj->_attributes = (array) $attributes;
+			return $shortcode_obj->process_shortcode($shortcode_obj->_attributes);
 		} else {
 			return NULL;
 		}
@@ -118,7 +118,7 @@ 
 	 * @param 	$attributes
 	 * @return 	string
 	 */
-	final public static function invalid_shortcode_processor( $attributes ) {
+	final public static function invalid_shortcode_processor($attributes) {
 		return '';
 	}
 
@@ -132,11 +132,11 @@ 
 	 */
 	final public function __construct() {
 		// get classname, remove EES_prefix, and convert to UPPERCASE
-		$shortcode = strtoupper( str_replace( 'EES_', '', get_class( $this )));
+		$shortcode = strtoupper(str_replace('EES_', '', get_class($this)));
 		// assign shortcode to the preferred callback, which overwrites the "fallback shortcode processor" assigned earlier
-		add_shortcode( $shortcode, array( $this, 'process_shortcode' ));
+		add_shortcode($shortcode, array($this, 'process_shortcode'));
 		// make sure system knows this is an EE page
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 	}
 
 

core/EE_Base.core.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 *		@ override magic methods
 	 *		@ return void
 	 */	
-	public function __set($a,$b) { return FALSE; }
+	public function __set($a, $b) { return FALSE; }
 	public function __get($a) { return FALSE; }
 	public function __isset($a) { return FALSE; }
 	public function __unset($a) { return FALSE; }

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

core/EE_Config.core.php

Braces +6 added lines, -4 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');
+}
 /**
  *
  * Class EE_Payment_Method_Manager
@@ -139,7 +141,7 @@ 
 		if(isset($this->_payment_method_types[$payment_method_name])){
 			require_once($this->_payment_method_types[$payment_method_name]);
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -159,7 +161,7 @@ 
 				$payment_methods[] = $this->payment_method_class_from_type($classname);
 			}
 			return $payment_methods;
-		}else{
+		} else{
 			return array_keys($this->_payment_method_types);
 		}
 	}
@@ -242,7 +244,7 @@ 
 				}
 			}
 
-		}else{
+		} else{
 			$payment_method->set_active();
 			$payment_method->save();
 		}

Indentation +140 added lines, -140 removed lines

@@ -89,10 +89,10 @@ 
 	public $map_settings = null;
 
 	/**
-	*
-	* @deprecated
-	* @var EE_Gateway_Config
-	*/
+	 *
+	 * @deprecated
+	 * @var EE_Gateway_Config
+	 */
 	public $gateway = null;
 
 	/**
@@ -582,7 +582,7 @@ 
 
 	/**
 	 *    update_config
-         * Important: the config object must ALREADY be set, otherwise this will produce an error.
+	 * Important: the config object must ALREADY be set, otherwise this will produce an error.
 	 *
 	 * @access    public
 	 * @param    string                 $section
@@ -1606,51 +1606,51 @@ 
 class EE_Organization_Config extends EE_Config_Base {
 
 	/**
-	* @var string  $name
-	* eg EE4.1
-	*/
+	 * @var string  $name
+	 * eg EE4.1
+	 */
 	public $name;
 
 	/**
-	* @var string $address_1
-	* eg 123 Onna Road
-	*/
+	 * @var string $address_1
+	 * eg 123 Onna Road
+	 */
 	public $address_1;
 
 	/**
-	* @var string $address_2
-	* eg PO Box 123
-	*/
+	 * @var string $address_2
+	 * eg PO Box 123
+	 */
 	public $address_2;
 
 	/**
-	* @var string $city
-	* eg Inna City
-	*/
+	 * @var string $city
+	 * eg Inna City
+	 */
 	public $city;
 
 	/**
-	* @var int $STA_ID
-	* eg 4
-	*/
+	 * @var int $STA_ID
+	 * eg 4
+	 */
 	public $STA_ID;
 
 	/**
-	* @var string  $CNT_ISO
-	* eg US
-	*/
+	 * @var string  $CNT_ISO
+	 * eg US
+	 */
 	public $CNT_ISO;
 
 	/**
-	* @var string $zip
-	* eg 12345  or V1A 2B3
-	*/
+	 * @var string $zip
+	 * eg 12345  or V1A 2B3
+	 */
 	public $zip;
 
 	/**
-	* @var string  $email
-	* eg support@eventespresso.com
-	*/
+	 * @var string  $email
+	 * eg support@eventespresso.com
+	 */
 	public $email;
 
 
@@ -1669,9 +1669,9 @@ 
 	public $vat;
 
 	/**
-	* @var string  $logo_url
-	* eg http://www.somedomain.com/wp-content/uploads/kittehs.jpg
-	*/
+	 * @var string  $logo_url
+	 * eg http://www.somedomain.com/wp-content/uploads/kittehs.jpg
+	 */
 	public $logo_url;
 
 
@@ -1765,55 +1765,55 @@ 
 class EE_Currency_Config extends EE_Config_Base {
 
 	/**
-	* @var string  $code
-	* eg 'US'
-	*/
+	 * @var string  $code
+	 * eg 'US'
+	 */
 	public $code;
 
 	/**
-	* @var string $name
-	* eg 'Dollar'
-	*/
+	 * @var string $name
+	 * eg 'Dollar'
+	 */
 	public $name;
 
 	/**
-	* plural name
-	* @var string $plural
-	* eg 'Dollars'
-	*/
+	 * plural name
+	 * @var string $plural
+	 * eg 'Dollars'
+	 */
 	public $plural;
 
 	/**
-	* currency sign
-	* @var string  $sign
-	* eg '$'
-	*/
+	 * currency sign
+	 * @var string  $sign
+	 * eg '$'
+	 */
 	public $sign;
 
 	/**
-	* Whether the currency sign should come before the number or not
-	* @var boolean $sign_b4
-	*/
+	 * Whether the currency sign should come before the number or not
+	 * @var boolean $sign_b4
+	 */
 	public $sign_b4;
 
 	/**
-	* How many digits should come after the decimal place
-	* @var int $dec_plc
-	*/
+	 * How many digits should come after the decimal place
+	 * @var int $dec_plc
+	 */
 	public $dec_plc;
 
 	/**
-	* Symbol to use for decimal mark
-	* @var string $dec_mrk
-	* eg '.'
-	*/
+	 * Symbol to use for decimal mark
+	 * @var string $dec_mrk
+	 * eg '.'
+	 */
 	public $dec_mrk;
 
 	/**
-	* Symbol to use for thousands
-	* @var string $thsnds
-	* eg ','
-	*/
+	 * Symbol to use for thousands
+	 * @var string $thsnds
+	 * eg ','
+	 */
 	public $thsnds;
 
 
@@ -1881,13 +1881,13 @@ 
 	 * 	whether or not to show alternate payment options during the reg process if payment status is pending
 	 * @var boolean $show_pending_payment_options
 	 */
-      public $show_pending_payment_options;
+	  public $show_pending_payment_options;
 
 	/**
 	 * Whether to skip the registration confirmation page
 	 * @var boolean $skip_reg_confirmation
 	 */
-      public $skip_reg_confirmation;
+	  public $skip_reg_confirmation;
 
 	/**
 	 * an array of SPCO reg steps where:
@@ -1898,64 +1898,64 @@ 
 	 * 			"slug" => the URL param used to trigger the reg step
 	 * @var array $reg_steps
 	 */
-      public $reg_steps;
+	  public $reg_steps;
 
 	/**
 	 * Whether registration confirmation should be the last page of SPCO
 	 * @var boolean $reg_confirmation_last
 	 */
-      public $reg_confirmation_last;
+	  public $reg_confirmation_last;
 
 	  /**
 	   * Whether or not to enable the EE Bot Trap
 	   * @var boolean $use_bot_trap
 	   */
-      public $use_bot_trap;
+	  public $use_bot_trap;
 
 	  /**
 	   * Whether or not to encrypt some data sent by the EE Bot Trap
 	   * @var boolean $use_encryption
 	   */
-      public $use_encryption;
+	  public $use_encryption;
 
 	  /**
 	   * Whether or not to use ReCaptcha
 	   * @var boolean $use_captcha
 	   */
-      public $use_captcha;
+	  public $use_captcha;
 
 	  /**
 	   * ReCaptcha Theme
 	   * @var string $recaptcha_theme
 	   * 	options: 'dark	', 'light'
 	   */
-      public $recaptcha_theme;
+	  public $recaptcha_theme;
 
 	  /**
 	   * ReCaptcha Type
 	   * @var string $recaptcha_type
 	   * 	options: 'audio', 'image'
 	   */
-      public $recaptcha_type;
+	  public $recaptcha_type;
 
 	  /**
 	   * ReCaptcha language
 	   * @var string $recaptcha_language
 	   * eg 'en'
 	   */
-      public $recaptcha_language;
+	  public $recaptcha_language;
 
 	  /**
 	   * ReCaptcha public key
 	   * @var string $recaptcha_publickey
 	   */
-      public $recaptcha_publickey;
+	  public $recaptcha_publickey;
 
 	  /**
 	   * ReCaptcha private key
 	   * @var string $recaptcha_privatekey
 	   */
-      public $recaptcha_privatekey;
+	  public $recaptcha_privatekey;
 
 	/**
 	 * ReCaptcha width
@@ -2021,58 +2021,58 @@ 
 class EE_Admin_Config extends EE_Config_Base {
 
 	/**
-	* @var boolean $use_personnel_manager
-	*/
+	 * @var boolean $use_personnel_manager
+	 */
 	public $use_personnel_manager;
 
 	/**
-	* @var boolean $use_dashboard_widget
-	*/
+	 * @var boolean $use_dashboard_widget
+	 */
 	public $use_dashboard_widget;
 
 	/**
-	* @var int $events_in_dashboard
-	*/
+	 * @var int $events_in_dashboard
+	 */
 	public $events_in_dashboard;
 
 	/**
-	* @var boolean $use_event_timezones
-	*/
+	 * @var boolean $use_event_timezones
+	 */
 	public $use_event_timezones;
 
 	/**
-	* @var boolean $use_full_logging
-	*/
+	 * @var boolean $use_full_logging
+	 */
 	public $use_full_logging;
 
 	/**
-	* @var string $log_file_name
-	*/
+	 * @var string $log_file_name
+	 */
 	public $log_file_name;
 
 	/**
-	* @var string $debug_file_name
-	*/
+	 * @var string $debug_file_name
+	 */
 	public $debug_file_name;
 
 	/**
-	* @var boolean $use_remote_logging
-	*/
+	 * @var boolean $use_remote_logging
+	 */
 	public $use_remote_logging;
 
 	/**
-	* @var string $remote_logging_url
-	*/
+	 * @var string $remote_logging_url
+	 */
 	public $remote_logging_url;
 
 	/**
-	* @var boolean $show_reg_footer
-	*/
+	 * @var boolean $show_reg_footer
+	 */
 	public $show_reg_footer;
 
 	/**
-	* @var string $affiliate_id
-	*/
+	 * @var string $affiliate_id
+	 */
 	public $affiliate_id;
 
 
@@ -2146,43 +2146,43 @@ 
 class EE_Template_Config extends EE_Config_Base {
 
 	/**
-	* @var boolean $enable_default_style
-	*/
+	 * @var boolean $enable_default_style
+	 */
 	public $enable_default_style;
 
 	/**
-	* @var string $custom_style_sheet
-	*/
+	 * @var string $custom_style_sheet
+	 */
 	public $custom_style_sheet;
 
 	/**
-	* @var boolean $display_address_in_regform
-	*/
+	 * @var boolean $display_address_in_regform
+	 */
 	public $display_address_in_regform;
 
 	/**
-	* @var int $display_description_on_multi_reg_page
-	*/
+	 * @var int $display_description_on_multi_reg_page
+	 */
 	public $display_description_on_multi_reg_page;
 
 	/**
-	* @var boolean $use_custom_templates
-	*/
+	 * @var boolean $use_custom_templates
+	 */
 	public $use_custom_templates;
 
 	/**
-	* @var string $current_espresso_theme
-	*/
+	 * @var string $current_espresso_theme
+	 */
 	public $current_espresso_theme;
 
 	/**
-	* @var EE_Event_Single_Config $EED_Event_Single
-	*/
+	 * @var EE_Event_Single_Config $EED_Event_Single
+	 */
 	public $EED_Event_Single;
 
 	/**
-	* @var EE_Events_Archive_Config $EED_Events_Archive
-	*/
+	 * @var EE_Events_Archive_Config $EED_Events_Archive
+	 */
 	public $EED_Events_Archive;
 
 
@@ -2215,78 +2215,78 @@ 
 class EE_Map_Config extends EE_Config_Base {
 
 	/**
-	* @var boolean $use_google_maps
-	*/
+	 * @var boolean $use_google_maps
+	 */
 	public $use_google_maps;
 
 	/**
-	* @var int $event_details_map_width
-	*/
+	 * @var int $event_details_map_width
+	 */
 	public $event_details_map_width;
 
 	/**
-	* @var int $event_details_map_height
-	*/
+	 * @var int $event_details_map_height
+	 */
 	public $event_details_map_height;
 
 	/**
-	* @var int $event_details_map_zoom
-	*/
+	 * @var int $event_details_map_zoom
+	 */
 	public $event_details_map_zoom;
 
 	/**
-	* @var boolean $event_details_display_nav
-	*/
+	 * @var boolean $event_details_display_nav
+	 */
 	public $event_details_display_nav;
 
 	/**
-	* @var boolean $event_details_nav_size
-	*/
+	 * @var boolean $event_details_nav_size
+	 */
 	public $event_details_nav_size;
 
 	/**
-	* @var string $event_details_control_type
-	*/
+	 * @var string $event_details_control_type
+	 */
 	public $event_details_control_type;
 
 	/**
-	* @var string $event_details_map_align
-	*/
+	 * @var string $event_details_map_align
+	 */
 	public $event_details_map_align;
 
 	/**
-	* @var int $event_list_map_width
-	*/
+	 * @var int $event_list_map_width
+	 */
 	public $event_list_map_width;
 
 	/**
-	* @var int $event_list_map_height
-	*/
+	 * @var int $event_list_map_height
+	 */
 	public $event_list_map_height;
 
 	/**
-	* @var int $event_list_map_zoom
-	*/
+	 * @var int $event_list_map_zoom
+	 */
 	public $event_list_map_zoom;
 
 	/**
-	* @var boolean $event_list_display_nav
-	*/
+	 * @var boolean $event_list_display_nav
+	 */
 	public $event_list_display_nav;
 
 	/**
-	* @var boolean $event_list_nav_size
-	*/
+	 * @var boolean $event_list_nav_size
+	 */
 	public $event_list_nav_size;
 
 	/**
-	* @var string $event_list_control_type
-	*/
+	 * @var string $event_list_control_type
+	 */
 	public $event_list_control_type;
 
 	/**
-	* @var string $event_list_map_align
-	*/
+	 * @var string $event_list_map_align
+	 */
 	public $event_list_map_align;
 
 

Doc Comments +6 added lines, -6 removed lines

@@ -363,7 +363,7 @@ 
 	 *    update_espresso_config
 	 *
 	 * @access   public
-	 * @return   bool
+	 * @return   boolean|null
 	 */
 	protected function  _reset_espresso_addon_config() {
 		$this->_config_option_names = array();
@@ -443,7 +443,7 @@ 
 	 * @param    string                $name
 	 * @param    string                $config_class
 	 * @param    EE_Config_Base 	$config_obj
-	 * @param    array                 $tests_to_run
+	 * @param    integer[]                 $tests_to_run
 	 * @param    bool                  $display_errors
 	 * @return    bool    TRUE on success, FALSE on fail
 	 */
@@ -1592,7 +1592,7 @@ 
 
 
 	/**
-	 * @return array
+	 * @return integer[]
 	 */
 	public function get_critical_pages_array() {
 		return array(
@@ -1605,7 +1605,7 @@ 
 
 
 	/**
-	 * @return array
+	 * @return string[]
 	 */
 	public function get_critical_pages_shortcodes_array() {
 		return array(
@@ -1928,7 +1928,7 @@ 
 	 *    class constructor
 	 *
 	 * @access    public
-	 * @param null $CNT_ISO
+	 * @param string $CNT_ISO
 	 * @return \EE_Currency_Config
 	 */
 	public function __construct( $CNT_ISO = NULL ) {
@@ -2567,7 +2567,7 @@ 
 	 *
 	 * @param int $input_count the count of input vars.
 	 *
-	 * @return array {
+	 * @return string {
 	 *         An array that represents whether available space and if no available space the error message.
 	 *         @type bool $has_space		whether more inputs can be added.
 	 *         @type string $msg 		Any message to be displayed.

Spacing +398 added lines, -398 removed lines

@@ -128,7 +128,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Config ) {
+		if ( ! self::$_instance instanceof EE_Config) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -145,22 +145,22 @@ 
 	 * not be ready to instantiate EE_Config currently (eg if the site was put into maintenance mode)
 	 * @return EE_Config
 	 */
-	public static function reset( $hard_reset = FALSE, $reinstantiate = TRUE ){
-		if ( $hard_reset ) {
+	public static function reset($hard_reset = FALSE, $reinstantiate = TRUE) {
+		if ($hard_reset) {
 			self::$_instance->_config_option_names = array();
 			self::$_instance->_initialize_config();
 			self::$_instance->update_espresso_config();
 		}
-		if( self::$_instance instanceof EE_Config ){
+		if (self::$_instance instanceof EE_Config) {
 			self::$_instance->shutdown();
 		}
 		self::$_instance = NULL;
 		//we don't need to reset the static properties imo because those should
 		//only change when a module is added or removed. Currently we don't
 		//support removing a module during a request when it previously existed
-		if( $reinstantiate ){
+		if ($reinstantiate) {
 			return self::instance();
-		}else{
+		} else {
 			return NULL;
 		}
 	}
@@ -174,8 +174,8 @@ 
 	 * @return \EE_Config
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Config__construct__begin',$this );
-		$this->_config_option_names = get_option( 'ee_config_option_names', array() );
+		do_action('AHEE__EE_Config__construct__begin', $this);
+		$this->_config_option_names = get_option('ee_config_option_names', array());
 		// setup empty config classes
 		$this->_initialize_config();
 		// load existing EE site settings
@@ -183,15 +183,15 @@ 
 		// confirm everything loaded correctly and set filtered defaults if not
 		$this->_verify_config();
 		//  register shortcodes and modules
-		add_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets', array( $this, 'register_shortcodes_and_modules' ), 999 );
+		add_action('AHEE__EE_System__register_shortcodes_modules_and_widgets', array($this, 'register_shortcodes_and_modules'), 999);
 		//  initialize shortcodes and modules
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'initialize_shortcodes_and_modules' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'initialize_shortcodes_and_modules'));
 		// register widgets
-		add_action( 'widgets_init', array( $this, 'widgets_init' ), 10 );
+		add_action('widgets_init', array($this, 'widgets_init'), 10);
 		// shutdown
-		add_action( 'shutdown', array( $this, 'shutdown' ), 10 );
+		add_action('shutdown', array($this, 'shutdown'), 10);
 		// construct__end hook
-		do_action( 'AHEE__EE_Config__construct__end',$this );
+		do_action('AHEE__EE_Config__construct__end', $this);
 		// hardcoded hack
 		$this->template_settings->current_espresso_theme = 'Espresso_Arabica_2014';
 	}
@@ -204,7 +204,7 @@ 
 	 * @return string current theme set.
 	 */
 	public static function get_current_theme() {
-		return isset( self::$_instance->template_settings->current_espresso_theme ) ? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
+		return isset(self::$_instance->template_settings->current_espresso_theme) ? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
 	}
 
 
@@ -238,27 +238,27 @@ 
 	 */
 	private function _load_core_config() {
 		// load_core_config__start hook
-		do_action( 'AHEE__EE_Config___load_core_config__start', $this );
+		do_action('AHEE__EE_Config___load_core_config__start', $this);
 		$espresso_config = $this->get_espresso_config();
-		foreach ( $espresso_config as $config => $settings ) {
+		foreach ($espresso_config as $config => $settings) {
 			// load_core_config__start hook
-			$settings = apply_filters( 'FHEE__EE_Config___load_core_config__config_settings', $settings, $config, $this );
-			if ( is_object( $settings ) && property_exists( $this, $config ) ) {
-				$this->{$config} = apply_filters( 'FHEE__EE_Config___load_core_config__' . $config, $settings );
+			$settings = apply_filters('FHEE__EE_Config___load_core_config__config_settings', $settings, $config, $this);
+			if (is_object($settings) && property_exists($this, $config)) {
+				$this->{$config} = apply_filters('FHEE__EE_Config___load_core_config__'.$config, $settings);
 				//call configs populate method to ensure any defaults are set for empty values.
-				if ( method_exists( $settings, 'populate' ) ) {
+				if (method_exists($settings, 'populate')) {
 					$this->{$config}->populate();
 				}
-				if ( method_exists( $settings, 'do_hooks' ) ) {
+				if (method_exists($settings, 'do_hooks')) {
 					$this->{$config}->do_hooks();
 				}
 			}
 		}
-		if ( apply_filters( 'FHEE__EE_Config___load_core_config__update_espresso_config', FALSE ) ) {
+		if (apply_filters('FHEE__EE_Config___load_core_config__update_espresso_config', FALSE)) {
 			$this->update_espresso_config();
 		}
 		// load_core_config__end hook
-		do_action( 'AHEE__EE_Config___load_core_config__end', $this );
+		do_action('AHEE__EE_Config___load_core_config__end', $this);
 	}
 
 
@@ -272,40 +272,40 @@ 
 	protected function _verify_config() {
 
 		$this->core = $this->core instanceof EE_Core_Config
-			? $this->core  : new EE_Core_Config();
-		$this->core = apply_filters( 'FHEE__EE_Config___initialize_config__core', $this->core );
+			? $this->core : new EE_Core_Config();
+		$this->core = apply_filters('FHEE__EE_Config___initialize_config__core', $this->core);
 
 		$this->organization = $this->organization instanceof EE_Organization_Config
-			? $this->organization  : new EE_Organization_Config();
-		$this->organization = apply_filters( 'FHEE__EE_Config___initialize_config__organization', $this->organization );
+			? $this->organization : new EE_Organization_Config();
+		$this->organization = apply_filters('FHEE__EE_Config___initialize_config__organization', $this->organization);
 
 		$this->currency = $this->currency instanceof EE_Currency_Config
 			? $this->currency : new EE_Currency_Config();
-		$this->currency = apply_filters( 'FHEE__EE_Config___initialize_config__currency', $this->currency );
+		$this->currency = apply_filters('FHEE__EE_Config___initialize_config__currency', $this->currency);
 
 		$this->registration = $this->registration instanceof EE_Registration_Config
 			? $this->registration : new EE_Registration_Config();
-		$this->registration = apply_filters( 'FHEE__EE_Config___initialize_config__registration', $this->registration );
+		$this->registration = apply_filters('FHEE__EE_Config___initialize_config__registration', $this->registration);
 
 		$this->admin = $this->admin instanceof EE_Admin_Config
 			? $this->admin : new EE_Admin_Config();
-		$this->admin = apply_filters( 'FHEE__EE_Config___initialize_config__admin', $this->admin );
+		$this->admin = apply_filters('FHEE__EE_Config___initialize_config__admin', $this->admin);
 
 		$this->template_settings = $this->template_settings instanceof EE_Template_Config
 			? $this->template_settings : new EE_Template_Config();
-		$this->template_settings = apply_filters( 'FHEE__EE_Config___initialize_config__template_settings', $this->template_settings );
+		$this->template_settings = apply_filters('FHEE__EE_Config___initialize_config__template_settings', $this->template_settings);
 
 		$this->map_settings = $this->map_settings instanceof EE_Map_Config
 			? $this->map_settings : new EE_Map_Config();
-		$this->map_settings = apply_filters( 'FHEE__EE_Config___initialize_config__map_settings', $this->map_settings );
+		$this->map_settings = apply_filters('FHEE__EE_Config___initialize_config__map_settings', $this->map_settings);
 
 		$this->environment = $this->environment instanceof EE_Environment_Config
 			? $this->environment : new EE_Environment_Config();
-		$this->environment = apply_filters( 'FHEE__EE_Config___initialize_config__environment', $this->environment );
+		$this->environment = apply_filters('FHEE__EE_Config___initialize_config__environment', $this->environment);
 
 		$this->gateway = $this->gateway instanceof EE_Gateway_Config
 			? $this->gateway : new EE_Gateway_Config();
-		$this->gateway = apply_filters( 'FHEE__EE_Config___initialize_config__gateway', $this->gateway );
+		$this->gateway = apply_filters('FHEE__EE_Config___initialize_config__gateway', $this->gateway);
 
 	}
 
@@ -319,7 +319,7 @@ 
 	 */
 	public function get_espresso_config() {
 		// grab espresso configuration
-		return apply_filters( 'FHEE__EE_Config__get_espresso_config__CFG', get_option( 'ee_config', array() ));
+		return apply_filters('FHEE__EE_Config__get_espresso_config__CFG', get_option('ee_config', array()));
 	}
 
 
@@ -332,12 +332,12 @@ 
 	 * @param        $old_value
 	 * @param        $value
 	 */
-	public function double_check_config_comparison( $option = '', $old_value, $value ) {
+	public function double_check_config_comparison($option = '', $old_value, $value) {
 		// make sure we're checking the ee config
-		if ( $option == 'ee_config' ) {
+		if ($option == 'ee_config') {
 			// run a loose comparison of the old value against the new value for type and properties,
 			// but NOT exact instance like WP update_option does
-			if ( $value != $old_value ) {
+			if ($value != $old_value) {
 				// if they are NOT the same, then remove the hook,
 				// which means the subsequent update results will be based solely on the update query results
 				// the reason we do this is because, as stated above,
@@ -352,7 +352,7 @@ 
 				// the string it sees in the db looks the same as the new one it has been passed!!!
 				// This results in the query returning an "affected rows" value of ZERO,
 				// which gets returned immediately by WP update_option and looks like an error.
-				remove_action( 'update_option', array( $this, 'check_config_updated' ));
+				remove_action('update_option', array($this, 'check_config_updated'));
 			}
 		}
 	}
@@ -367,11 +367,11 @@ 
 	 */
 	protected function  _reset_espresso_addon_config() {
 		$this->_config_option_names = array();
-		foreach( $this->addons as $addon_name => $addon_config_obj ) {
-			$addon_config_obj = maybe_unserialize( $addon_config_obj );
-			$config_class = get_class( $addon_config_obj );
-			if ( $addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class ) {
-				$this->update_config( 'addons', $addon_name, $addon_config_obj, FALSE );
+		foreach ($this->addons as $addon_name => $addon_config_obj) {
+			$addon_config_obj = maybe_unserialize($addon_config_obj);
+			$config_class = get_class($addon_config_obj);
+			if ($addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class) {
+				$this->update_config('addons', $addon_name, $addon_config_obj, FALSE);
 			}
 			$this->addons->{$addon_name} = NULL;
 		}
@@ -387,17 +387,17 @@ 
 	 * @param   bool $add_error
 	 * @return   bool
 	 */
-	public function  update_espresso_config( $add_success = FALSE, $add_error = TRUE ) {
+	public function  update_espresso_config($add_success = FALSE, $add_error = TRUE) {
 		// commented out the following re: https://events.codebasehq.com/projects/event-espresso/tickets/8197
 		//$clone = clone( self::$_instance );
 		//self::$_instance = NULL;
-		do_action( 'AHEE__EE_Config__update_espresso_config__begin',$this );
+		do_action('AHEE__EE_Config__update_espresso_config__begin', $this);
 		$this->_reset_espresso_addon_config();
 		// hook into update_option because that happens AFTER the ( $value === $old_value ) conditional
 		// but BEFORE the actual update occurs
-		add_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1, 3 );
+		add_action('update_option', array($this, 'double_check_config_comparison'), 1, 3);
 		// now update "ee_config"
-		$saved = update_option( 'ee_config', $this );
+		$saved = update_option('ee_config', $this);
 		// if not saved... check if the hook we just added still exists;
 		// if it does, it means one of two things:
 		// 		that update_option bailed at the ( $value === $old_value ) conditional,
@@ -408,25 +408,25 @@ 
 		// but just means no update occurred, so don't display an error to the user.
 		// BUT... if update_option returns FALSE, AND the hook is missing,
 		// then it means that something truly went wrong
-		$saved = ! $saved ? has_action( 'update_option', array( $this, 'double_check_config_comparison' )) : $saved;
+		$saved = ! $saved ? has_action('update_option', array($this, 'double_check_config_comparison')) : $saved;
 		// remove our action since we don't want it in the system anymore
-		remove_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1 );
-		do_action( 'AHEE__EE_Config__update_espresso_config__end', $this, $saved );
+		remove_action('update_option', array($this, 'double_check_config_comparison'), 1);
+		do_action('AHEE__EE_Config__update_espresso_config__end', $this, $saved);
 		//self::$_instance = $clone;
 		//unset( $clone );
 		// if config remains the same or was updated successfully
-		if ( $saved ) {
-			if ( $add_success ) {
+		if ($saved) {
+			if ($add_success) {
 				EE_Error::add_success(
-					__( 'The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso' ),
+					__('The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 			return TRUE;
 		} else {
-			if ( $add_error ) {
+			if ($add_error) {
 				EE_Error::add_error(
-					__( 'The Event Espresso Configuration Settings were not updated.', 'event_espresso' ),
+					__('The Event Espresso Configuration Settings were not updated.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -452,20 +452,20 @@ 
 		$name = '',
 		$config_class = '',
 		$config_obj = NULL,
-		$tests_to_run = array( 1, 2, 3, 4, 5, 6, 7, 8 ),
+		$tests_to_run = array(1, 2, 3, 4, 5, 6, 7, 8),
 		$display_errors = TRUE
 	) {
 		try {
-			foreach ( $tests_to_run as $test ) {
-				switch ( $test ) {
+			foreach ($tests_to_run as $test) {
+				switch ($test) {
 
 					// TEST #1 : check that section was set
 					case 1 :
-						if ( empty( $section ) ) {
-							if ( $display_errors ) {
+						if (empty($section)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'No configuration section has been provided while attempting to save "%s".', 'event_espresso' ),
+										__('No configuration section has been provided while attempting to save "%s".', 'event_espresso'),
 										$config_class
 									)
 								);
@@ -476,11 +476,11 @@ 
 
 					// TEST #2 : check that settings section exists
 					case 2 :
-						if ( ! isset( $this->{$section} ) ) {
-							if ( $display_errors ) {
+						if ( ! isset($this->{$section} )) {
+							if ($display_errors) {
 								throw new EE_Error(
-									sprintf( __( 'The "%s" configuration section does not exist.', 'event_espresso' ),
-											 $section )
+									sprintf(__('The "%s" configuration section does not exist.', 'event_espresso'),
+											 $section)
 								);
 							}
 							return false;
@@ -490,12 +490,12 @@ 
 					// TEST #3 : check that section is the proper format
 					case 3 :
 						if (
-							! ( $this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass )
+							! ($this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass)
 						) {
-							if ( $display_errors ) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" configuration settings have not been formatted correctly.', 'event_espresso' ),
+										__('The "%s" configuration settings have not been formatted correctly.', 'event_espresso'),
 										$section
 									)
 								);
@@ -506,10 +506,10 @@ 
 
 					// TEST #4 : check that config section name has been set
 					case 4 :
-						if ( empty( $name ) ) {
-							if ( $display_errors ) {
+						if (empty($name)) {
+							if ($display_errors) {
 								throw new EE_Error(
-									__( 'No name has been provided for the specific configuration section.', 'event_espresso' )
+									__('No name has been provided for the specific configuration section.', 'event_espresso')
 								);
 							}
 							return false;
@@ -518,10 +518,10 @@ 
 
 					// TEST #5 : check that a config class name has been set
 					case 5 :
-						if ( empty( $config_class ) ) {
-							if ( $display_errors ) {
+						if (empty($config_class)) {
+							if ($display_errors) {
 								throw new EE_Error(
-									__( 'No class name has been provided for the specific configuration section.', 'event_espresso' )
+									__('No class name has been provided for the specific configuration section.', 'event_espresso')
 								);
 							}
 							return false;
@@ -530,11 +530,11 @@ 
 
 					// TEST #6 : verify config class is accessible
 					case 6 :
-						if ( ! class_exists( $config_class ) ) {
-							if ( $display_errors ) {
+						if ( ! class_exists($config_class)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" class does not exist. Please ensure that an autoloader has been set for it.', 'event_espresso' ),
+										__('The "%s" class does not exist. Please ensure that an autoloader has been set for it.', 'event_espresso'),
 										$config_class
 									)
 								);
@@ -545,11 +545,11 @@ 
 
 					// TEST #7 : check that config has even been set
 					case 7 :
-						if ( ! isset( $this->{$section}->{$name} ) ) {
-							if ( $display_errors ) {
+						if ( ! isset($this->{$section}->{$name} )) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'No configuration has been set for "%1$s->%2$s".', 'event_espresso' ),
+										__('No configuration has been set for "%1$s->%2$s".', 'event_espresso'),
 										$section,
 										$name
 									)
@@ -558,17 +558,17 @@ 
 							return false;
 						} else {
 							// and make sure it's not serialized
-							$this->{$section}->{$name} = maybe_unserialize( $this->{$section}->{$name} );
+							$this->{$section}->{$name} = maybe_unserialize($this->{$section}->{$name} );
 						}
 						break;
 
 					// TEST #8 : check that config is the requested type
 					case 8 :
-						if ( ! $this->{$section}->{$name} instanceof $config_class ) {
-							if ( $display_errors ) {
+						if ( ! $this->{$section}->{$name} instanceof $config_class) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The configuration for "%1$s->%2$s" is not of the "%3$s" class.', 'event_espresso' ),
+										__('The configuration for "%1$s->%2$s" is not of the "%3$s" class.', 'event_espresso'),
 										$section,
 										$name,
 										$config_class
@@ -581,12 +581,12 @@ 
 
 					// TEST #9 : verify config object
 					case 9 :
-						if ( ! $config_obj instanceof EE_Config_Base ) {
-							if ( $display_errors ) {
+						if ( ! $config_obj instanceof EE_Config_Base) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" class is not an instance of EE_Config_Base.', 'event_espresso' ),
-										print_r( $config_obj, true )
+										__('The "%s" class is not an instance of EE_Config_Base.', 'event_espresso'),
+										print_r($config_obj, true)
 									)
 								);
 							}
@@ -597,7 +597,7 @@ 
 				}
 			}
 
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		// you have successfully run the gauntlet
@@ -614,8 +614,8 @@ 
 	 * @param        string          $name
 	 * @return        string
 	 */
-	private function _generate_config_option_name( $section = '', $name = '' ) {
-		return 'ee_config-' . strtolower( $section . '-' . str_replace( array( 'EE_', 'EED_' ), '', $name ) );
+	private function _generate_config_option_name($section = '', $name = '') {
+		return 'ee_config-'.strtolower($section.'-'.str_replace(array('EE_', 'EED_'), '', $name));
 	}
 
 
@@ -629,10 +629,10 @@ 
 	 * @param 	string $name
 	 * @return 	string
 	 */
-	private function _set_config_class( $config_class = '', $name = '' ) {
-		return ! empty( $config_class )
+	private function _set_config_class($config_class = '', $name = '') {
+		return ! empty($config_class)
 			? $config_class
-			: str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $name ) ) ) . '_Config';
+			: str_replace(' ', '_', ucwords(str_replace('_', ' ', $name))).'_Config';
 	}
 
 
@@ -646,34 +646,34 @@ 
 	 * @param 	EE_Config_Base $config_obj
 	 * @return 	EE_Config_Base
 	 */
-	public function set_config( $section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = null ) {
+	public function set_config($section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = null) {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6, and 7 to verify all config params are set and valid
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, null, array( 1, 2, 3, 4, 5, 6 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, null, array(1, 2, 3, 4, 5, 6))) {
 			return null;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// if the config option name hasn't been added yet to the list of option names we're tracking, then do so now
-		if ( ! isset( $this->_config_option_names[ $config_option_name ] )) {
-			$this->_config_option_names[ $config_option_name ] = $config_class;
+		if ( ! isset($this->_config_option_names[$config_option_name])) {
+			$this->_config_option_names[$config_option_name] = $config_class;
 		}
 		// verify the incoming config object but suppress errors
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), false )) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), false)) {
 			$config_obj = new $config_class();
 		}
-		if ( get_option( $config_option_name ) ) {
-			update_option( $config_option_name, $config_obj );
+		if (get_option($config_option_name)) {
+			update_option($config_option_name, $config_obj);
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		} else {
 			// create a wp-option for this config
-			if ( add_option( $config_option_name, $config_obj, '', 'no' )) {
-				$this->{$section}->{$name} = maybe_unserialize( $config_obj );
+			if (add_option($config_option_name, $config_obj, '', 'no')) {
+				$this->{$section}->{$name} = maybe_unserialize($config_obj);
 				return $this->{$section}->{$name};
 			} else {
 				EE_Error::add_error(
-					sprintf( __( 'The "%s" could not be saved to the database.', 'event_espresso' ), $config_class ),
+					sprintf(__('The "%s" could not be saved to the database.', 'event_espresso'), $config_class),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				return null;
@@ -694,37 +694,37 @@ 
 	 * @param 	bool 					$throw_errors
 	 * @return 	bool
 	 */
-	public function update_config( $section = '', $name = '', $config_obj = '', $throw_errors = true ) {
-		$config_obj = maybe_unserialize( $config_obj );
+	public function update_config($section = '', $name = '', $config_obj = '', $throw_errors = true) {
+		$config_obj = maybe_unserialize($config_obj);
 		// get class name of the incoming object
-		$config_class = get_class( $config_obj );
+		$config_class = get_class($config_obj);
 		// run tests 1-5 and 9 to verify config
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 1, 2, 3, 4, 7, 9 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, $config_obj, array(1, 2, 3, 4, 7, 9))) {
 			return false;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// check if config object has been added to db by seeing if config option name is in $this->_config_option_names array
-		if ( ! isset( $this->_config_option_names[ $config_option_name ] )) {
+		if ( ! isset($this->_config_option_names[$config_option_name])) {
 			// save new config to db
-			return $this->set_config( $section, $name, $config_class, $config_obj );
+			return $this->set_config($section, $name, $config_class, $config_obj);
 		} else {
 			// first check if the record already exists
-			$existing_config = get_option( $config_option_name );
-			$config_obj = serialize( $config_obj );
+			$existing_config = get_option($config_option_name);
+			$config_obj = serialize($config_obj);
 			// just return if db record is already up to date
-			if ( $existing_config == $config_obj ) {
+			if ($existing_config == $config_obj) {
 				$this->{$section}->{$name} = $config_obj;
 				return true;
-			} else if ( update_option( $config_option_name, $config_obj )) {
+			} else if (update_option($config_option_name, $config_obj)) {
 				// update wp-option for this config class
 				$this->{$section}->{$name} = $config_obj;
 				return true;
-			} elseif ( $throw_errors ) {
+			} elseif ($throw_errors) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'The "%1$s" object stored at"%2$s" was not successfully updated in the database.', 'event_espresso' ),
+						__('The "%1$s" object stored at"%2$s" was not successfully updated in the database.', 'event_espresso'),
 						$config_class,
-						'EE_Config->' . $section . '->' . $name
+						'EE_Config->'.$section.'->'.$name
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
@@ -744,34 +744,34 @@ 
 	 * @param 	string 	$config_class
 	 * @return 	mixed EE_Config_Base | NULL
 	 */
-	public function get_config( $section = '', $name = '', $config_class = '' ) {
+	public function get_config($section = '', $name = '', $config_class = '') {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6 and 7 to verify that all params have been set
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, NULL, array( 1, 2, 3, 4, 5, 6 ))) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, NULL, array(1, 2, 3, 4, 5, 6))) {
 			return NULL;
 		}
 		// now test if the requested config object exists, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, NULL, array( 7, 8 ), FALSE )) {
+		if ($this->_verify_config_params($section, $name, $config_class, NULL, array(7, 8), FALSE)) {
 			// config already exists, so pass it back
 			return $this->{$section}->{$name};
 		}
 		// load config option from db if it exists
-		$config_obj = $this->get_config_option( $this->_generate_config_option_name( $section, $name ));
+		$config_obj = $this->get_config_option($this->_generate_config_option_name($section, $name));
 		// verify the newly retrieved config object, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), FALSE )) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), FALSE)) {
 			// config is good, so set it and pass it back
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		}
 		// oops! $config_obj is not already set and does not exist in the db, so create a new one
-		$config_obj =$this->set_config( $section, $name, $config_class );
+		$config_obj = $this->set_config($section, $name, $config_class);
 		// verify the newly created config object
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ))) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9))) {
 			return $this->{$section}->{$name};
 		} else {
 			EE_Error::add_error(
-				sprintf( __( 'The "%s" could not be retrieved from the database.', 'event_espresso' ), $config_class ),
+				sprintf(__('The "%s" could not be retrieved from the database.', 'event_espresso'), $config_class),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -786,9 +786,9 @@ 
 	 * @param 	string 	$config_option_name
 	 * @return 	mixed EE_Config_Base | FALSE
 	 */
-	public function get_config_option( $config_option_name = '' ) {
+	public function get_config_option($config_option_name = '') {
 		// retrieve the wp-option for this config class.
-		return maybe_unserialize( get_option( $config_option_name ));
+		return maybe_unserialize(get_option($config_option_name));
 	}
 
 
@@ -801,45 +801,45 @@ 
 	 * @param $page_for_posts
 	 * @return    void
 	 */
-	public function update_post_shortcodes( $page_for_posts = '' ) {
+	public function update_post_shortcodes($page_for_posts = '') {
 		// make sure page_for_posts is set
-		$page_for_posts = ! empty( $page_for_posts ) ? $page_for_posts : EE_Config::get_page_for_posts();
+		$page_for_posts = ! empty($page_for_posts) ? $page_for_posts : EE_Config::get_page_for_posts();
 		// critical page shortcodes that we do NOT want added to the Posts page (blog)
 		$critical_shortcodes = $this->core->get_critical_pages_shortcodes_array();
 		// allow others to mess stuff up :D
-		do_action( 'AHEE__EE_Config__update_post_shortcodes', $this->core->post_shortcodes, $page_for_posts );
+		do_action('AHEE__EE_Config__update_post_shortcodes', $this->core->post_shortcodes, $page_for_posts);
 		// verify that post_shortcodes is set
-		$this->core->post_shortcodes = isset( $this->core->post_shortcodes ) && is_array( $this->core->post_shortcodes ) ? $this->core->post_shortcodes : array();
+		$this->core->post_shortcodes = isset($this->core->post_shortcodes) && is_array($this->core->post_shortcodes) ? $this->core->post_shortcodes : array();
 		// cycle thru post_shortcodes
-		foreach( $this->core->post_shortcodes as $post_name => $shortcodes ){
+		foreach ($this->core->post_shortcodes as $post_name => $shortcodes) {
 			// are there any shortcodes to track ?
-			if ( ! empty( $shortcodes )) {
+			if ( ! empty($shortcodes)) {
 				// loop thru list of tracked shortcodes
-				foreach( $shortcodes as $shortcode => $post_id ) {
+				foreach ($shortcodes as $shortcode => $post_id) {
 					// if shortcode is for a critical page, BUT this is NOT the corresponding critical page for that shortcode
-					if ( isset( $critical_shortcodes[ $post_id ] ) && $post_name == $page_for_posts ) {
+					if (isset($critical_shortcodes[$post_id]) && $post_name == $page_for_posts) {
 						// then remove this shortcode, because we don't want critical page shortcodes like ESPRESSO_TXN_PAGE running on the "Posts Page" (blog)
-						unset( $this->core->post_shortcodes[ $post_name ][ $shortcode ] );
+						unset($this->core->post_shortcodes[$post_name][$shortcode]);
 					}
 					// skip the posts page, because we want all shortcodes registered for it
-					if ( $post_name == $page_for_posts ) {
+					if ($post_name == $page_for_posts) {
 						continue;
 					}
 					// make sure post still exists
-					$post = get_post( $post_id );
-					if ( $post ) {
+					$post = get_post($post_id);
+					if ($post) {
 						// check that the post name matches what we have saved
-						if ( $post->post_name == $post_name ) {
+						if ($post->post_name == $post_name) {
 							// if so, then break before hitting the unset below
 							continue;
 						}
 					}
 					// we don't like missing posts around here >:(
-					unset( $this->core->post_shortcodes[ $post_name ] );
+					unset($this->core->post_shortcodes[$post_name]);
 				}
 			} else {
 				// you got no shortcodes to keep track of !
-				unset( $this->core->post_shortcodes[ $post_name ] );
+				unset($this->core->post_shortcodes[$post_name]);
 			}
 		}
 		//only show errors
@@ -858,14 +858,14 @@ 
 	 *  @return 	string
 	 */
 	public static function get_page_for_posts() {
-		$page_for_posts = get_option( 'page_for_posts' );
-		if ( ! $page_for_posts ) {
+		$page_for_posts = get_option('page_for_posts');
+		if ( ! $page_for_posts) {
 			return 'posts';
 		}
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT post_name from $wpdb->posts WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-		return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ));
+		return $wpdb->get_var($wpdb->prepare($SQL, $page_for_posts));
 	}
 
 
@@ -882,7 +882,7 @@ 
 	 */
 	public function register_shortcodes_and_modules() {
 		// allow shortcodes to register with WP and to set hooks for the rest of the system
-		EE_Registry::instance()->shortcodes =$this->_register_shortcodes();
+		EE_Registry::instance()->shortcodes = $this->_register_shortcodes();
 		// allow modules to set hooks for the rest of the system
 		EE_Registry::instance()->modules = $this->_register_modules();
 	}
@@ -914,21 +914,21 @@ 
 	public function widgets_init() {
 		//only init widgets on admin pages when not in complete maintenance, and
 		//on frontend when not in any maintenance mode
-		if (( is_admin() && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance)  || ! EE_Maintenance_Mode::instance()->level() ) {
+		if ((is_admin() && EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) || ! EE_Maintenance_Mode::instance()->level()) {
 			// grab list of installed widgets
-			$widgets_to_register = glob( EE_WIDGETS . '*', GLOB_ONLYDIR );
+			$widgets_to_register = glob(EE_WIDGETS.'*', GLOB_ONLYDIR);
 			// filter list of modules to register
-			$widgets_to_register = apply_filters( 'FHEE__EE_Config__register_widgets__widgets_to_register', $widgets_to_register );
+			$widgets_to_register = apply_filters('FHEE__EE_Config__register_widgets__widgets_to_register', $widgets_to_register);
 
-			if ( ! empty( $widgets_to_register ) ) {
+			if ( ! empty($widgets_to_register)) {
 				// cycle thru widget folders
-				foreach ( $widgets_to_register as $widget_path ) {
+				foreach ($widgets_to_register as $widget_path) {
 					// add to list of installed widget modules
-					EE_Config::register_ee_widget( $widget_path );
+					EE_Config::register_ee_widget($widget_path);
 				}
 			}
 			// filter list of installed modules
-			EE_Registry::instance()->widgets = apply_filters( 'FHEE__EE_Config__register_widgets__installed_widgets', EE_Registry::instance()->widgets );
+			EE_Registry::instance()->widgets = apply_filters('FHEE__EE_Config__register_widgets__installed_widgets', EE_Registry::instance()->widgets);
 		}
 	}
 
@@ -941,54 +941,54 @@ 
 	 *  @param 	string 	$widget_path - full path up to and including widget folder
 	 *  @return 	void
 	 */
-	public static function register_ee_widget( $widget_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_widget__begin', $widget_path );
+	public static function register_ee_widget($widget_path = NULL) {
+		do_action('AHEE__EE_Config__register_widget__begin', $widget_path);
 		$widget_ext = '.widget.php';
 		// make all separators match
-		$widget_path = rtrim( str_replace( '/\\', DS, $widget_path ), DS );
+		$widget_path = rtrim(str_replace('/\\', DS, $widget_path), DS);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $widget_path, $widget_ext ) !== FALSE ) {
+		if (strpos($widget_path, $widget_ext) !== FALSE) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$file_name = explode( '.', basename( $widget_path ));
+			$file_name = explode('.', basename($widget_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$widget = strpos( $file_name[0], 'EEW_' ) === 0 ? substr( $file_name[0], 4 ) : $file_name[0];
+			$widget = strpos($file_name[0], 'EEW_') === 0 ? substr($file_name[0], 4) : $file_name[0];
 			// sanitize shortcode directory name
-			$widget = sanitize_key( $widget );
+			$widget = sanitize_key($widget);
 			// now we need to rebuild the shortcode path
-			$widget_path = explode( DS, $widget_path );
+			$widget_path = explode(DS, $widget_path);
 			// remove last segment
-			array_pop( $widget_path );
+			array_pop($widget_path);
 			// glue it back together
-			$widget_path = implode( DS, $widget_path );
+			$widget_path = implode(DS, $widget_path);
 		} else {
 			// grab and sanitize widget directory name
-			$widget = sanitize_key( basename( $widget_path ));
+			$widget = sanitize_key(basename($widget_path));
 		}
 		// create classname from widget directory name
-		$widget = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $widget )));
+		$widget = str_replace(' ', '_', ucwords(str_replace('_', ' ', $widget)));
 		// add class prefix
-		$widget_class = 'EEW_' . $widget;
+		$widget_class = 'EEW_'.$widget;
 		// does the widget exist ?
-		if ( ! is_readable( $widget_path . DS . $widget_class . $widget_ext )) {
+		if ( ! is_readable($widget_path.DS.$widget_class.$widget_ext)) {
 			$msg = sprintf(
-				__( 'The requested %s widget file could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso' ),
+				__('The requested %s widget file could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s', 'event_espresso'),
 				$widget_class,
-				$widget_path . DS . $widget_class . $widget_ext
+				$widget_path.DS.$widget_class.$widget_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		// load the widget class file
-		require_once( $widget_path . DS . $widget_class . $widget_ext );
+		require_once($widget_path.DS.$widget_class.$widget_ext);
 		// verify that class exists
-		if ( ! class_exists( $widget_class )) {
-			$msg = sprintf( __( 'The requested %s widget class does not exist.', 'event_espresso' ), $widget_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($widget_class)) {
+			$msg = sprintf(__('The requested %s widget class does not exist.', 'event_espresso'), $widget_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
-		register_widget( $widget_class );
+		register_widget($widget_class);
 		// add to array of registered widgets
-		EE_Registry::instance()->widgets->{$widget_class} = $widget_path . DS . $widget_class . $widget_ext;
+		EE_Registry::instance()->widgets->{$widget_class} = $widget_path.DS.$widget_class.$widget_ext;
 	}
 
 
@@ -1001,18 +1001,18 @@ 
 	 */
 	private function _register_shortcodes() {
 		// grab list of installed shortcodes
-		$shortcodes_to_register = glob( EE_SHORTCODES . '*', GLOB_ONLYDIR );
+		$shortcodes_to_register = glob(EE_SHORTCODES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$shortcodes_to_register = apply_filters( 'FHEE__EE_Config__register_shortcodes__shortcodes_to_register', $shortcodes_to_register );
-		if ( ! empty( $shortcodes_to_register ) ) {
+		$shortcodes_to_register = apply_filters('FHEE__EE_Config__register_shortcodes__shortcodes_to_register', $shortcodes_to_register);
+		if ( ! empty($shortcodes_to_register)) {
 			// cycle thru shortcode folders
-			foreach ( $shortcodes_to_register as $shortcode_path ) {
+			foreach ($shortcodes_to_register as $shortcode_path) {
 				// add to list of installed shortcode modules
-				EE_Config::register_shortcode( $shortcode_path );
+				EE_Config::register_shortcode($shortcode_path);
 			}
 		}
 		// filter list of installed modules
-		return apply_filters( 'FHEE__EE_Config___register_shortcodes__installed_shortcodes', EE_Registry::instance()->shortcodes );
+		return apply_filters('FHEE__EE_Config___register_shortcodes__installed_shortcodes', EE_Registry::instance()->shortcodes);
 	}
 
 
@@ -1024,56 +1024,56 @@ 
 	 *  @param 	string 		$shortcode_path - full path up to and including shortcode folder
 	 *  @return 	bool
 	 */
-	public static function register_shortcode( $shortcode_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_shortcode__begin',$shortcode_path );
+	public static function register_shortcode($shortcode_path = NULL) {
+		do_action('AHEE__EE_Config__register_shortcode__begin', $shortcode_path);
 		$shortcode_ext = '.shortcode.php';
 		// make all separators match
-		$shortcode_path = str_replace( array( '\\', '/' ), DS, $shortcode_path );
+		$shortcode_path = str_replace(array('\\', '/'), DS, $shortcode_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $shortcode_path, $shortcode_ext ) !== FALSE ) {
+		if (strpos($shortcode_path, $shortcode_ext) !== FALSE) {
 			// grab shortcode file name from directory name and break apart at dots
-			$shortcode_file = explode( '.', basename( $shortcode_path ));
+			$shortcode_file = explode('.', basename($shortcode_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$shortcode = strpos( $shortcode_file[0], 'EES_' ) === 0 ? substr( $shortcode_file[0], 4 ) : $shortcode_file[0];
+			$shortcode = strpos($shortcode_file[0], 'EES_') === 0 ? substr($shortcode_file[0], 4) : $shortcode_file[0];
 			// sanitize shortcode directory name
-			$shortcode = sanitize_key( $shortcode );
+			$shortcode = sanitize_key($shortcode);
 			// now we need to rebuild the shortcode path
-			$shortcode_path = explode( DS, $shortcode_path );
+			$shortcode_path = explode(DS, $shortcode_path);
 			// remove last segment
-			array_pop( $shortcode_path );
+			array_pop($shortcode_path);
 			// glue it back together
-			$shortcode_path = implode( DS, $shortcode_path ) . DS;
+			$shortcode_path = implode(DS, $shortcode_path).DS;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize shortcode directory name
-			$shortcode = sanitize_key( basename( $shortcode_path ));
-			$shortcode_path = rtrim( $shortcode_path, DS ) . DS;
+			$shortcode = sanitize_key(basename($shortcode_path));
+			$shortcode_path = rtrim($shortcode_path, DS).DS;
 		}
 		// create classname from shortcode directory or file name
-		$shortcode = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $shortcode )));
+		$shortcode = str_replace(' ', '_', ucwords(str_replace('_', ' ', $shortcode)));
 		// add class prefix
-		$shortcode_class = 'EES_' . $shortcode;
+		$shortcode_class = 'EES_'.$shortcode;
 		// does the shortcode exist ?
-		if ( ! is_readable( $shortcode_path . DS . $shortcode_class . $shortcode_ext )) {
+		if ( ! is_readable($shortcode_path.DS.$shortcode_class.$shortcode_ext)) {
 			$msg = sprintf(
-				__( 'The requested %s shortcode file could not be found or is not readable due to file permissions. It should be in %s', 'event_espresso' ),
+				__('The requested %s shortcode file could not be found or is not readable due to file permissions. It should be in %s', 'event_espresso'),
 				$shortcode_class,
-				$shortcode_path . DS . $shortcode_class . $shortcode_ext
+				$shortcode_path.DS.$shortcode_class.$shortcode_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// load the shortcode class file
-		require_once( $shortcode_path . $shortcode_class . $shortcode_ext );
+		require_once($shortcode_path.$shortcode_class.$shortcode_ext);
 		// verify that class exists
-		if ( ! class_exists( $shortcode_class )) {
-			$msg = sprintf( __( 'The requested %s shortcode class does not exist.', 'event_espresso' ), $shortcode_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($shortcode_class)) {
+			$msg = sprintf(__('The requested %s shortcode class does not exist.', 'event_espresso'), $shortcode_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		$shortcode = strtoupper( $shortcode );
+		$shortcode = strtoupper($shortcode);
 		// add to array of registered shortcodes
-		EE_Registry::instance()->shortcodes->{$shortcode} = $shortcode_path . $shortcode_class . $shortcode_ext;
+		EE_Registry::instance()->shortcodes->{$shortcode} = $shortcode_path.$shortcode_class.$shortcode_ext;
 		return TRUE;
 	}
 
@@ -1088,23 +1088,23 @@ 
 	 */
 	private function _register_modules() {
 		// grab list of installed modules
-		$modules_to_register = glob( EE_MODULES . '*', GLOB_ONLYDIR );
+		$modules_to_register = glob(EE_MODULES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
-		$modules_to_register = apply_filters( 'FHEE__EE_Config__register_modules__modules_to_register', $modules_to_register );
+		$modules_to_register = apply_filters('FHEE__EE_Config__register_modules__modules_to_register', $modules_to_register);
 
 
-		if ( ! empty( $modules_to_register ) ) {
+		if ( ! empty($modules_to_register)) {
 			// loop through folders
-			foreach ( $modules_to_register as $module_path ) {
+			foreach ($modules_to_register as $module_path) {
 				/**TEMPORARILY EXCLUDE gateways from modules for time being**/
-				if ( $module_path != EE_MODULES . 'zzz-copy-this-module-template' && $module_path != EE_MODULES . 'gateways' ) {
+				if ($module_path != EE_MODULES.'zzz-copy-this-module-template' && $module_path != EE_MODULES.'gateways') {
 					// add to list of installed modules
-					EE_Config::register_module( $module_path );
+					EE_Config::register_module($module_path);
 				}
 			}
 		}
 		// filter list of installed modules
-		return apply_filters( 'FHEE__EE_Config___register_modules__installed_modules', EE_Registry::instance()->modules );
+		return apply_filters('FHEE__EE_Config___register_modules__installed_modules', EE_Registry::instance()->modules);
 	}
 
 
@@ -1117,54 +1117,54 @@ 
 	 *  @param 	string 		$module_path - full path up to and including module folder
 	 *  @return 	bool
 	 */
-	public static function register_module( $module_path = NULL ) {
-		do_action( 'AHEE__EE_Config__register_module__begin', $module_path );
+	public static function register_module($module_path = NULL) {
+		do_action('AHEE__EE_Config__register_module__begin', $module_path);
 		$module_ext = '.module.php';
 		// make all separators match
-		$module_path = str_replace( array( '\\', '/' ), DS, $module_path );
+		$module_path = str_replace(array('\\', '/'), DS, $module_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $module_path, $module_ext ) !== FALSE ) {
+		if (strpos($module_path, $module_ext) !== FALSE) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$module_file = explode( '.', basename( $module_path ));
+			$module_file = explode('.', basename($module_path));
 			// now we need to rebuild the shortcode path
-			$module_path = explode( DS, $module_path );
+			$module_path = explode(DS, $module_path);
 			// remove last segment
-			array_pop( $module_path );
+			array_pop($module_path);
 			// glue it back together
-			$module_path = implode( DS, $module_path ) . DS;
+			$module_path = implode(DS, $module_path).DS;
 			// take first segment from file name pieces and sanitize it
-			$module = preg_replace( '/[^a-zA-Z0-9_\-]/', '', $module_file[0] );
+			$module = preg_replace('/[^a-zA-Z0-9_\-]/', '', $module_file[0]);
 			// ensure class prefix is added
-			$module_class = strpos( $module, 'EED_' ) !== 0 ? 'EED_' . $module : $module;
+			$module_class = strpos($module, 'EED_') !== 0 ? 'EED_'.$module : $module;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize module name
-			$module = strtolower( basename( $module_path ));
-			$module = preg_replace( '/[^a-z0-9_\-]/', '', $module);
+			$module = strtolower(basename($module_path));
+			$module = preg_replace('/[^a-z0-9_\-]/', '', $module);
 			// like trailingslashit()
-			$module_path = rtrim( $module_path, DS ) . DS;
+			$module_path = rtrim($module_path, DS).DS;
 			// create classname from module directory name
-			$module = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $module )));
+			$module = str_replace(' ', '_', ucwords(str_replace('_', ' ', $module)));
 			// add class prefix
-			$module_class = 'EED_' . $module;
+			$module_class = 'EED_'.$module;
 		}
 		// does the module exist ?
-		if ( ! is_readable( $module_path . DS . $module_class . $module_ext )) {
-			$msg = sprintf( __( 'The requested %s module file could not be found or is not readable due to file permissions.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_readable($module_path.DS.$module_class.$module_ext)) {
+			$msg = sprintf(__('The requested %s module file could not be found or is not readable due to file permissions.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// load the module class file
-		require_once( $module_path . $module_class . $module_ext );
+		require_once($module_path.$module_class.$module_ext);
 		// verify that class exists
-		if ( ! class_exists( $module_class )) {
-			$msg = sprintf( __( 'The requested %s module class does not exist.', 'event_espresso' ), $module_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_class)) {
+			$msg = sprintf(__('The requested %s module class does not exist.', 'event_espresso'), $module_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// add to array of registered modules
-		EE_Registry::instance()->modules->{$module_class} = $module_path . $module_class . $module_ext;
-		do_action( 'AHEE__EE_Config__register_module__complete', $module_class, EE_Registry::instance()->modules->{$module_class} );
+		EE_Registry::instance()->modules->{$module_class} = $module_path.$module_class.$module_ext;
+		do_action('AHEE__EE_Config__register_module__complete', $module_class, EE_Registry::instance()->modules->{$module_class} );
 		return TRUE;
 	}
 
@@ -1178,23 +1178,23 @@ 
 	 */
 	private function _initialize_shortcodes() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path ) {
+		foreach (EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path) {
 			// add class prefix
-			$shortcode_class = 'EES_' . $shortcode;
+			$shortcode_class = 'EES_'.$shortcode;
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $shortcode_class, 'set_hooks_admin' ));
+				call_user_func(array($shortcode_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
-				add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array( $shortcode_class,'set_hooks' ));
+				add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array($shortcode_class, 'set_hooks'));
 				// convert classname to UPPERCASE and create WP shortcode.
-				$shortcode_tag = strtoupper( $shortcode );
+				$shortcode_tag = strtoupper($shortcode);
 				// but first check if the shortcode has already been added before assigning 'fallback_shortcode_processor'
-				if ( ! shortcode_exists( $shortcode_tag )) {
+				if ( ! shortcode_exists($shortcode_tag)) {
 					// NOTE: this shortcode declaration will get overridden if the shortcode is successfully detected in the post content in EE_Front_Controller->_initialize_shortcodes()
-					add_shortcode( $shortcode_tag, array( $shortcode_class, 'fallback_shortcode_processor' ));
+					add_shortcode($shortcode_tag, array($shortcode_class, 'fallback_shortcode_processor'));
 				}
 			}
 		}
@@ -1211,15 +1211,15 @@ 
 	 */
 	private function _initialize_modules() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->modules as $module_class => $module_path ) {
+		foreach (EE_Registry::instance()->modules as $module_class => $module_path) {
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $module_class, 'set_hooks_admin' ));
+				call_user_func(array($module_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
-				add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array( $module_class,'set_hooks' ));
+				add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', array($module_class, 'set_hooks'));
 			}
 		}
 	}
@@ -1237,26 +1237,26 @@ 
 	 *  @param 	string 		$key - url param key indicating a route is being called
 	 *  @return 	bool
 	 */
-	public static function register_route( $route = NULL, $module = NULL, $method_name = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_route__begin', $route, $module, $method_name );
-		$module = str_replace( 'EED_', '', $module );
-		$module_class = 'EED_' . $module;
-		if ( ! isset( EE_Registry::instance()->modules->{$module_class} )) {
-			$msg = sprintf( __( 'The module %s has not been registered.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_route($route = NULL, $module = NULL, $method_name = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_route__begin', $route, $module, $method_name);
+		$module = str_replace('EED_', '', $module);
+		$module_class = 'EED_'.$module;
+		if ( ! isset(EE_Registry::instance()->modules->{$module_class} )) {
+			$msg = sprintf(__('The module %s has not been registered.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( empty( $route )) {
-			$msg = sprintf( __( 'No route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($route)) {
+			$msg = sprintf(__('No route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( ! method_exists ( 'EED_' . $module, $method_name )) {
-			$msg = sprintf( __( 'A valid class method for the %s route has not been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! method_exists('EED_'.$module, $method_name)) {
+			$msg = sprintf(__('A valid class method for the %s route has not been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_route_map[ $key ][ $route ] = array( 'EED_' . $module, $method_name );
+		EE_Config::$_module_route_map[$key][$route] = array('EED_'.$module, $method_name);
 		return TRUE;
 	}
 
@@ -1270,11 +1270,11 @@ 
 	 *  @param 	string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_route( $route = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_route__begin',$route );
-		$route = apply_filters( 'FHEE__EE_Config__get_route',$route );
-		if ( isset( EE_Config::$_module_route_map[ $key ][ $route ] )) {
-			return EE_Config::$_module_route_map[ $key ][ $route ];
+	public static function get_route($route = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_route__begin', $route);
+		$route = apply_filters('FHEE__EE_Config__get_route', $route);
+		if (isset(EE_Config::$_module_route_map[$key][$route])) {
+			return EE_Config::$_module_route_map[$key][$route];
 		}
 		return NULL;
 	}
@@ -1303,35 +1303,35 @@ 
 	 * @param    string 		$key - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_forward( $route = NULL, $status = 0, $forward = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_forward',$route,$status,$forward );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) ||  empty( $route )) {
-			$msg = sprintf( __( 'The module route %s for this forward has not been registered.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_forward($route = NULL, $status = 0, $forward = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_forward', $route, $status, $forward);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
+			$msg = sprintf(__('The module route %s for this forward has not been registered.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( empty( $forward )) {
-			$msg = sprintf( __( 'No forwarding route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($forward)) {
+			$msg = sprintf(__('No forwarding route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( is_array( $forward )) {
-			if ( ! isset( $forward[1] )) {
-				$msg = sprintf( __( 'A class method for the %s forwarding route has not been supplied.', 'event_espresso' ), $route );
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_array($forward)) {
+			if ( ! isset($forward[1])) {
+				$msg = sprintf(__('A class method for the %s forwarding route has not been supplied.', 'event_espresso'), $route);
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
-			if ( ! method_exists( $forward[0], $forward[1] )) {
-				$msg = sprintf( __( 'The class method %s for the %s forwarding route is in invalid.', 'event_espresso' ), $forward[1], $route );
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! method_exists($forward[0], $forward[1])) {
+				$msg = sprintf(__('The class method %s for the %s forwarding route is in invalid.', 'event_espresso'), $forward[1], $route);
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
-		} else if ( ! function_exists( $forward )) {
-			$msg = sprintf( __( 'The function %s for the %s forwarding route is in invalid.', 'event_espresso' ), $forward, $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		} else if ( ! function_exists($forward)) {
+			$msg = sprintf(__('The function %s for the %s forwarding route is in invalid.', 'event_espresso'), $forward, $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_forward_map[ $key ][ $route ][ absint( $status ) ] = $forward;
+		EE_Config::$_module_forward_map[$key][$route][absint($status)] = $forward;
 		return TRUE;
 	}
 
@@ -1346,10 +1346,10 @@ 
 	 *  @param    string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_forward( $route = NULL, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_forward__begin',$route,$status );
-		if ( isset( EE_Config::$_module_forward_map[ $key ][ $route ][ $status ] )) {
-			return apply_filters( 'FHEE__EE_Config__get_forward', EE_Config::$_module_forward_map[ $key ][ $route ][ $status ], $route,$status );
+	public static function get_forward($route = NULL, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_forward__begin', $route, $status);
+		if (isset(EE_Config::$_module_forward_map[$key][$route][$status])) {
+			return apply_filters('FHEE__EE_Config__get_forward', EE_Config::$_module_forward_map[$key][$route][$status], $route, $status);
 		}
 		return NULL;
 	}
@@ -1366,19 +1366,19 @@ 
 	 * @param    string 		$key - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_view( $route = NULL, $status = 0, $view = NULL, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_view__begin',$route,$status,$view );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) ||  empty( $route )) {
-			$msg = sprintf( __( 'The module route %s for this view has not been registered.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_view($route = NULL, $status = 0, $view = NULL, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_view__begin', $route, $status, $view);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
+			$msg = sprintf(__('The module route %s for this view has not been registered.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		if ( ! is_readable( $view )) {
-			$msg = sprintf( __( 'The %s view file could not be found or is not readable due to file permissions.', 'event_espresso' ), $view );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! is_readable($view)) {
+			$msg = sprintf(__('The %s view file could not be found or is not readable due to file permissions.', 'event_espresso'), $view);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
-		EE_Config::$_module_view_map[ $key ][ $route ][ absint( $status ) ] = $view;
+		EE_Config::$_module_view_map[$key][$route][absint($status)] = $view;
 		return TRUE;
 	}
 
@@ -1395,10 +1395,10 @@ 
 	 *  @param    string 		$key - url param key indicating a route is being called
 	 *  @return 	string
 	 */
-	public static function get_view( $route = NULL, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_view__begin',$route,$status );
-		if ( isset( EE_Config::$_module_view_map[ $key ][ $route ][ $status ] )) {
-			return apply_filters( 'FHEE__EE_Config__get_view', EE_Config::$_module_view_map[ $key ][ $route ][ $status ], $route,$status );
+	public static function get_view($route = NULL, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_view__begin', $route, $status);
+		if (isset(EE_Config::$_module_view_map[$key][$route][$status])) {
+			return apply_filters('FHEE__EE_Config__get_view', EE_Config::$_module_view_map[$key][$route][$status], $route, $status);
 		}
 		return NULL;
 	}
@@ -1406,7 +1406,7 @@ 
 
 
 	public function shutdown() {
-		update_option( 'ee_config_option_names', $this->_config_option_names );
+		update_option('ee_config_option_names', $this->_config_option_names);
 	}
 
 
@@ -1422,7 +1422,7 @@ 
  * magic functions in use, except we'll allow them to magically set and get stuff...
  * basically, they should just be well-defined stdClasses
  */
-class EE_Config_Base{
+class EE_Config_Base {
 
 	/**
 	 * Utility function for escaping the value of a property and returning.
@@ -1431,13 +1431,13 @@ 
 	 * @return mixed if a detected type found return the escaped value, otherwise just the raw value is returned.
 	 * @throws \EE_Error
 	 */
-	public function get_pretty( $property ) {
-		if ( ! property_exists( $this, $property ) ) {
-			throw new EE_Error( sprintf( __('%1$s::get_pretty() has been called with the property %2$s which does not exist on the %1$s config class.', 'event_espresso' ), get_class( $this ), $property ) );
+	public function get_pretty($property) {
+		if ( ! property_exists($this, $property)) {
+			throw new EE_Error(sprintf(__('%1$s::get_pretty() has been called with the property %2$s which does not exist on the %1$s config class.', 'event_espresso'), get_class($this), $property));
 		}
 		//just handling escaping of strings for now.
-		if ( is_string( $this->{$property} ) ) {
-			return stripslashes( $this->{$property} );
+		if (is_string($this->{$property} )) {
+			return stripslashes($this->{$property} );
 		}
 		return $this->{$property};
 	}
@@ -1446,19 +1446,19 @@ 
 
 	public function populate() {
 		//grab defaults via a new instance of this class.
-		$class_name = get_class( $this );
+		$class_name = get_class($this);
 		$defaults = new $class_name;
 
 		//loop through the properties for this class and see if they are set.  If they are NOT, then grab the
 		//default from our $defaults object.
-		foreach ( get_object_vars( $defaults ) as $property => $value ) {
-			if ( is_null( $this->{$property} ) ) {
+		foreach (get_object_vars($defaults) as $property => $value) {
+			if (is_null($this->{$property} )) {
 				$this->{$property} = $value;
 			}
 		}
 
 		//cleanup
-		unset( $defaults );
+		unset($defaults);
 	}
 
 
@@ -1550,12 +1550,12 @@ 
 	 */
 	public function __construct() {
 		$current_network_main_site = is_multisite() ? get_current_site() : NULL;
-		$current_main_site_id = !empty( $current_network_main_site ) ? $current_network_main_site->blog_id : 1;
+		$current_main_site_id = ! empty($current_network_main_site) ? $current_network_main_site->blog_id : 1;
 		// set default organization settings
 		$this->current_blog_id = get_current_blog_id();
 		$this->current_blog_id = $this->current_blog_id === NULL ? 1 : $this->current_blog_id;
-		$this->ee_ueip_optin = is_main_site() ? get_option( 'ee_ueip_optin', TRUE ) : get_blog_option( $current_main_site_id, 'ee_ueip_optin', TRUE );
-		$this->ee_ueip_has_notified = is_main_site() ? get_option( 'ee_ueip_has_notified', FALSE ) : TRUE;
+		$this->ee_ueip_optin = is_main_site() ? get_option('ee_ueip_optin', TRUE) : get_blog_option($current_main_site_id, 'ee_ueip_optin', TRUE);
+		$this->ee_ueip_has_notified = is_main_site() ? get_option('ee_ueip_has_notified', FALSE) : TRUE;
 		$this->post_shortcodes = array();
 		$this->module_route_map = array();
 		$this->module_forward_map = array();
@@ -1574,7 +1574,7 @@ 
 		$this->event_cpt_slug = __('events', 'event_espresso');
 
 		//ueip constant check
-		if ( defined( 'EE_DISABLE_UXIP' ) && EE_DISABLE_UXIP ) {
+		if (defined('EE_DISABLE_UXIP') && EE_DISABLE_UXIP) {
 			$this->ee_ueip_optin = FALSE;
 			$this->ee_ueip_has_notified = TRUE;
 		}
@@ -1614,8 +1614,8 @@ 
 	 *  @return 	string
 	 */
 	public function reg_page_url() {
-		if ( ! $this->reg_page_url ) {
-			$this->reg_page_url = get_permalink( $this->reg_page_id ) . '#checkout';
+		if ( ! $this->reg_page_url) {
+			$this->reg_page_url = get_permalink($this->reg_page_id).'#checkout';
 		}
 		return $this->reg_page_url;
 	}
@@ -1628,12 +1628,12 @@ 
 	 *  @return 	string
 	 */
 	public function txn_page_url($query_args = array()) {
-		if ( ! $this->txn_page_url ) {
-			$this->txn_page_url = get_permalink( $this->txn_page_id );
+		if ( ! $this->txn_page_url) {
+			$this->txn_page_url = get_permalink($this->txn_page_id);
 		}
-		if($query_args){
-			return add_query_arg($query_args,$this->txn_page_url);
-		}else{
+		if ($query_args) {
+			return add_query_arg($query_args, $this->txn_page_url);
+		} else {
 			return $this->txn_page_url;
 		}
 	}
@@ -1645,12 +1645,12 @@ 
 	 *  @return 	string
 	 */
 	public function thank_you_page_url($query_args = array()) {
-		if ( ! $this->thank_you_page_url ) {
-			$this->thank_you_page_url = get_permalink( $this->thank_you_page_id );
+		if ( ! $this->thank_you_page_url) {
+			$this->thank_you_page_url = get_permalink($this->thank_you_page_id);
 		}
-		if($query_args){
-			return add_query_arg($query_args,$this->thank_you_page_url);
-		}else{
+		if ($query_args) {
+			return add_query_arg($query_args, $this->thank_you_page_url);
+		} else {
 			return $this->thank_you_page_url;
 		}
 	}
@@ -1661,8 +1661,8 @@ 
 	 *  @return 	string
 	 */
 	public function cancel_page_url() {
-		if ( ! $this->cancel_page_url ) {
-			$this->cancel_page_url = get_permalink( $this->cancel_page_id );
+		if ( ! $this->cancel_page_url) {
+			$this->cancel_page_url = get_permalink($this->cancel_page_id);
 		}
 		return $this->cancel_page_url;
 	}
@@ -1690,7 +1690,7 @@ 
 		//reset all url properties
 		$this->_reset_urls();
 		//return what to save to db
-		return array_keys( get_object_vars( $this ) );
+		return array_keys(get_object_vars($this));
 	}
 
 }
@@ -1922,39 +1922,39 @@ 
 	 * @param null $CNT_ISO
 	 * @return \EE_Currency_Config
 	 */
-	public function __construct( $CNT_ISO = NULL ) {
+	public function __construct($CNT_ISO = NULL) {
 
 		// get country code from organization settings or use default
-		$ORG_CNT = isset( EE_Registry::instance()->CFG->organization ) && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ? EE_Registry::instance()->CFG->organization->CNT_ISO : NULL;
+		$ORG_CNT = isset(EE_Registry::instance()->CFG->organization) && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ? EE_Registry::instance()->CFG->organization->CNT_ISO : NULL;
 		// but override if requested
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : $ORG_CNT;
-		EE_Registry::instance()->load_helper( 'Activation' );
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : $ORG_CNT;
+		EE_Registry::instance()->load_helper('Activation');
 		// so if that all went well, and we are not in M-Mode (cuz you can't query the db in M-Mode) and double-check the countries table exists
-		if ( ! empty( $CNT_ISO ) && EE_Maintenance_Mode::instance()->models_can_query() && EEH_Activation::table_exists( EE_Registry::instance()->load_model( 'Country' )->table() ) ) {
+		if ( ! empty($CNT_ISO) && EE_Maintenance_Mode::instance()->models_can_query() && EEH_Activation::table_exists(EE_Registry::instance()->load_model('Country')->table())) {
 			// retrieve the country settings from the db, just in case they have been customized
-			$country = EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $CNT_ISO );
-			if ( $country instanceof EE_Country ) {
-				$this->code = $country->currency_code(); 	// currency code: USD, CAD, EUR
-				$this->name = $country->currency_name_single();	// Dollar
-				$this->plural = $country->currency_name_plural(); 	// Dollars
-				$this->sign =  $country->currency_sign(); 			// currency sign: $
-				$this->sign_b4 = $country->currency_sign_before(); 		// currency sign before or after: $TRUE  or  FALSE$
-				$this->dec_plc = $country->currency_decimal_places();	// decimal places: 2 = 0.00  3 = 0.000
-				$this->dec_mrk = $country->currency_decimal_mark();	// decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-				$this->thsnds = $country->currency_thousands_separator();	// thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($CNT_ISO);
+			if ($country instanceof EE_Country) {
+				$this->code = $country->currency_code(); // currency code: USD, CAD, EUR
+				$this->name = $country->currency_name_single(); // Dollar
+				$this->plural = $country->currency_name_plural(); // Dollars
+				$this->sign = $country->currency_sign(); // currency sign: $
+				$this->sign_b4 = $country->currency_sign_before(); // currency sign before or after: $TRUE  or  FALSE$
+				$this->dec_plc = $country->currency_decimal_places(); // decimal places: 2 = 0.00  3 = 0.000
+				$this->dec_mrk = $country->currency_decimal_mark(); // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+				$this->thsnds = $country->currency_thousands_separator(); // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 			}
 		}
 		// fallback to hardcoded defaults, in case the above failed
-		if ( empty( $this->code )) {
+		if (empty($this->code)) {
 			// set default currency settings
-			$this->code = 'USD'; 	// currency code: USD, CAD, EUR
-			$this->name = __( 'Dollar', 'event_espresso' ); 	// Dollar
-			$this->plural = __( 'Dollars', 'event_espresso' ); 	// Dollars
-			$this->sign =  '$'; 	// currency sign: $
-			$this->sign_b4 = TRUE; 	// currency sign before or after: $TRUE  or  FALSE$
-			$this->dec_plc = 2; 	// decimal places: 2 = 0.00  3 = 0.000
-			$this->dec_mrk = '.'; 	// decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-			$this->thsnds = ','; 	// thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$this->code = 'USD'; // currency code: USD, CAD, EUR
+			$this->name = __('Dollar', 'event_espresso'); // Dollar
+			$this->plural = __('Dollars', 'event_espresso'); // Dollars
+			$this->sign = '$'; // currency sign: $
+			$this->sign_b4 = TRUE; // currency sign before or after: $TRUE  or  FALSE$
+			$this->dec_plc = 2; // decimal places: 2 = 0.00  3 = 0.000
+			$this->dec_mrk = '.'; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+			$this->thsnds = ','; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 		}
 	}
 }
@@ -2094,7 +2094,7 @@ 
 	 * @since 4.8.8.rc.019
 	 */
 	public function do_hooks() {
-		add_action( 'AHEE__EE_Config___load_core_config__end', array( $this, 'set_default_reg_status_on_EEM_Event' ));
+		add_action('AHEE__EE_Config___load_core_config__end', array($this, 'set_default_reg_status_on_EEM_Event'));
 	}
 
 
@@ -2102,7 +2102,7 @@ 
 	 * @return void
 	 */
 	public function set_default_reg_status_on_EEM_Event() {
-		EEM_Event::set_default_reg_status( $this->default_STS_ID );
+		EEM_Event::set_default_reg_status($this->default_STS_ID);
 	}
 
 
@@ -2207,10 +2207,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function log_file_name( $reset = FALSE ) {
-		if ( empty( $this->log_file_name ) || $reset ) {
-			$this->log_file_name = sanitize_key( 'espresso_log_' . md5( uniqid( '', TRUE ))) . '.txt';
-			EE_Config::instance()->update_espresso_config( FALSE, FALSE );
+	public function log_file_name($reset = FALSE) {
+		if (empty($this->log_file_name) || $reset) {
+			$this->log_file_name = sanitize_key('espresso_log_'.md5(uniqid('', TRUE))).'.txt';
+			EE_Config::instance()->update_espresso_config(FALSE, FALSE);
 		}
 		return $this->log_file_name;
 	}
@@ -2222,10 +2222,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function debug_file_name( $reset = FALSE ) {
-		if ( empty( $this->debug_file_name ) || $reset ) {
-			$this->debug_file_name = sanitize_key( 'espresso_debug_' . md5( uniqid( '', TRUE ))) . '.txt';
-			EE_Config::instance()->update_espresso_config( FALSE, FALSE );
+	public function debug_file_name($reset = FALSE) {
+		if (empty($this->debug_file_name) || $reset) {
+			$this->debug_file_name = sanitize_key('espresso_debug_'.md5(uniqid('', TRUE))).'.txt';
+			EE_Config::instance()->update_espresso_config(FALSE, FALSE);
 		}
 		return $this->debug_file_name;
 	}
@@ -2398,21 +2398,21 @@ 
 		// set default map settings
 		$this->use_google_maps = TRUE;
 		// for event details pages (reg page)
-		$this->event_details_map_width = 585; 			// ee_map_width_single
-		$this->event_details_map_height = 362; 			// ee_map_height_single
-		$this->event_details_map_zoom = 14; 			// ee_map_zoom_single
-		$this->event_details_display_nav = TRUE; 			// ee_map_nav_display_single
-		$this->event_details_nav_size = FALSE; 			// ee_map_nav_size_single
-		$this->event_details_control_type = 'default'; 		// ee_map_type_control_single
-		$this->event_details_map_align = 'center'; 			// ee_map_align_single
+		$this->event_details_map_width = 585; // ee_map_width_single
+		$this->event_details_map_height = 362; // ee_map_height_single
+		$this->event_details_map_zoom = 14; // ee_map_zoom_single
+		$this->event_details_display_nav = TRUE; // ee_map_nav_display_single
+		$this->event_details_nav_size = FALSE; // ee_map_nav_size_single
+		$this->event_details_control_type = 'default'; // ee_map_type_control_single
+		$this->event_details_map_align = 'center'; // ee_map_align_single
 		// for event list pages
-		$this->event_list_map_width = 300; 			// ee_map_width
-		$this->event_list_map_height = 185; 		// ee_map_height
-		$this->event_list_map_zoom = 12; 			// ee_map_zoom
-		$this->event_list_display_nav = FALSE; 		// ee_map_nav_display
-		$this->event_list_nav_size = TRUE; 			// ee_map_nav_size
-		$this->event_list_control_type = 'dropdown'; 		// ee_map_type_control
-		$this->event_list_map_align = 'center'; 			// ee_map_align
+		$this->event_list_map_width = 300; // ee_map_width
+		$this->event_list_map_height = 185; // ee_map_height
+		$this->event_list_map_zoom = 12; // ee_map_zoom
+		$this->event_list_display_nav = FALSE; // ee_map_nav_display
+		$this->event_list_nav_size = TRUE; // ee_map_nav_size
+		$this->event_list_control_type = 'dropdown'; // ee_map_type_control
+		$this->event_list_map_align = 'center'; // ee_map_align
 	}
 
 }
@@ -2423,7 +2423,7 @@ 
 /**
  * stores Events_Archive settings
  */
-class EE_Events_Archive_Config extends EE_Config_Base{
+class EE_Events_Archive_Config extends EE_Config_Base {
 
 	public $display_status_banner;
 	public $display_description;
@@ -2442,7 +2442,7 @@ 
 	/**
 	 *	class constructor
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->display_status_banner = 0;
 		$this->display_description = 1;
 		$this->display_ticket_selector = 0;
@@ -2462,7 +2462,7 @@ 
 /**
  * Stores Event_Single_Config settings
  */
-class EE_Event_Single_Config extends EE_Config_Base{
+class EE_Event_Single_Config extends EE_Config_Base {
 
 	public $display_status_banner_single;
 	public $display_venue;
@@ -2491,7 +2491,7 @@ 
 /**
  * Stores Ticket_Selector_Config settings
  */
-class EE_Ticket_Selector_Config extends EE_Config_Base{
+class EE_Ticket_Selector_Config extends EE_Config_Base {
 	public $show_ticket_sale_columns;
 	public $show_ticket_details;
 	public $show_expired_tickets;
@@ -2545,7 +2545,7 @@ 
 	 * @return void
 	 */
 	protected function _set_php_values() {
-		$this->php->max_input_vars = ini_get( 'max_input_vars' );
+		$this->php->max_input_vars = ini_get('max_input_vars');
 		$this->php->version = phpversion();
 	}
 
@@ -2564,9 +2564,9 @@ 
 	 *         @type string $msg 		Any message to be displayed.
 	 * }
 	 */
-	public function max_input_vars_limit_check( $input_count = 0 ) {
-		if ( ! empty( $this->php->max_input_vars ) && ( $input_count >= $this->php->max_input_vars ) && ( PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >=9 ) ) {
-			return  sprintf( __('The maximum number of inputs on this page has been exceeded.  You cannot add anymore items (i.e. tickets, datetimes, custom fields) on this page because of your servers PHP "max_input_vars" setting.%1$sThere are %2$d inputs and the maximum amount currently allowed by your server is %3$d.', 'event_espresso'), '<br>', $input_count, $this->php->max_input_vars);
+	public function max_input_vars_limit_check($input_count = 0) {
+		if ( ! empty($this->php->max_input_vars) && ($input_count >= $this->php->max_input_vars) && (PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >= 9)) {
+			return  sprintf(__('The maximum number of inputs on this page has been exceeded.  You cannot add anymore items (i.e. tickets, datetimes, custom fields) on this page because of your servers PHP "max_input_vars" setting.%1$sThere are %2$d inputs and the maximum amount currently allowed by your server is %3$d.', 'event_espresso'), '<br>', $input_count, $this->php->max_input_vars);
 		} else {
 			return '';
 		}
@@ -2601,7 +2601,7 @@ 
  * stores payment gateway info
  * @deprecated
  */
-class EE_Gateway_Config extends EE_Config_Base{
+class EE_Gateway_Config extends EE_Config_Base {
 
 	/**
 	 * Array with keys that are payment gateways slugs, and values are arrays
@@ -2623,9 +2623,9 @@ 
 	 *	class constructor
 	 * @deprecated
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->payment_settings = array();
-		$this->active_gateways = array( 'Invoice' => FALSE );
+		$this->active_gateways = array('Invoice' => FALSE);
 	}
 }
 

core/EE_Encryption.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * Event Espresso

Spacing +63 added lines, -63 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
  * EE_Encryption class
  *
@@ -29,8 +29,8 @@ 
 	 * @return \EE_Encryption
 	 */
   private function __construct() {
-		define( 'ESPRESSO_ENCRYPT', true );
-		if ( ! function_exists( 'mcrypt_encrypt' ) ) {
+		define('ESPRESSO_ENCRYPT', true);
+		if ( ! function_exists('mcrypt_encrypt')) {
 			$this->_use_mcrypt = false;
 		}
 	}
@@ -42,9 +42,9 @@ 
 	 *	@access public
 	 * @return \EE_Encryption
 	 */
-	public static function instance ( ) {
+	public static function instance( ) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Encryption ) {
+		if ( ! self::$_instance instanceof EE_Encryption) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -59,15 +59,15 @@ 
 	 */
 	public  function get_encryption_key() {
 		// if encryption key has not been set
-		if ( empty( $this->_encryption_key )) {
+		if (empty($this->_encryption_key)) {
 			// retrieve encryption_key from db
-			$this->_encryption_key = get_option( 'ee_encryption_key', '' );
+			$this->_encryption_key = get_option('ee_encryption_key', '');
 			// WHAT?? No encryption_key in the db ??
-			if ( $this->_encryption_key == '' ) {
+			if ($this->_encryption_key == '') {
 				// let's make one. And md5 it to make it just the right size for a key
-				$new_key =  md5( self::generate_random_string() );
+				$new_key = md5(self::generate_random_string());
 				// now save it to the db for later
-				add_option( 'ee_encryption_key', $new_key );
+				add_option('ee_encryption_key', $new_key);
 				// here's the key - FINALLY !
 				$this->_encryption_key = $new_key;
 			}
@@ -83,15 +83,15 @@ 
 	 * @param string $text_string  - the text to be encrypted
 	 * @return string
 	 */
-	public function encrypt ( $text_string = '' ) {
+	public function encrypt($text_string = '') {
 		// you give me nothing??? GET OUT !
-		if  ( empty( $text_string ))  {
+		if (empty($text_string)) {
 			return $text_string;
 		}
-		if ( $this->_use_mcrypt ) {
-			$encrypted_text = $this->m_encrypt( $text_string );
+		if ($this->_use_mcrypt) {
+			$encrypted_text = $this->m_encrypt($text_string);
 		} else {
-			$encrypted_text = $this->acme_encrypt( $text_string );
+			$encrypted_text = $this->acme_encrypt($text_string);
 		}
 		return $encrypted_text;
 	}
@@ -104,16 +104,16 @@ 
 	 * @param string $encrypted_text - the text to be decrypted
 	 * @return string
 	 */
-	public function decrypt  ( $encrypted_text = '' )  {
+	public function decrypt($encrypted_text = '') {
 		// you give me nothing??? GET OUT !
-		if  ( empty( $encrypted_text ))  {
+		if (empty($encrypted_text)) {
 			return $encrypted_text;
 		}
 		// if PHP's mcrypt functions are installed then we'll use them
-		if ( $this->_use_mcrypt ) {
-			$decrypted_text = $this->m_decrypt( $encrypted_text );
+		if ($this->_use_mcrypt) {
+			$decrypted_text = $this->m_decrypt($encrypted_text);
 		} else {
-			$decrypted_text = $this->acme_decrypt( $encrypted_text );
+			$decrypted_text = $this->acme_decrypt($encrypted_text);
 		}
 		return $decrypted_text;
  	}
@@ -128,15 +128,15 @@ 
 	 * @internal param $string - the text to be encoded
 	 * @return string
 	 */
-	public function base64_url_encode ( $text_string = '' ) {
+	public function base64_url_encode($text_string = '') {
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return $text_string;
 		}
 		// encode
-		$encoded_string = base64_encode ( $text_string );
+		$encoded_string = base64_encode($text_string);
 		// remove chars to make encoding more URL friendly
-		$encoded_string = strtr ( $encoded_string, '+/=', '-_,' );
+		$encoded_string = strtr($encoded_string, '+/=', '-_,');
 		return $encoded_string;
 	}
 
@@ -150,15 +150,15 @@ 
 	 * @internal param $string - the text to be decoded
 	 * @return string
 	 */
-	public function base64_url_decode ( $encoded_string = '' ) {
+	public function base64_url_decode($encoded_string = '') {
 		// you give me nothing??? GET OUT !
-		if  ( ! $encoded_string )  {
+		if ( ! $encoded_string) {
 			return $encoded_string;
 		}
 		// replace previously removed characters
-		$encoded_string = strtr ( $encoded_string, '-_,', '+/=' );
+		$encoded_string = strtr($encoded_string, '-_,', '+/=');
 		// decode
-		$decoded_string = base64_decode ( $encoded_string );
+		$decoded_string = base64_decode($encoded_string);
 		return $decoded_string;
 	}
 
@@ -171,19 +171,19 @@ 
 	 * @internal param $string - the text to be encrypted
 	 * @return string
 	 */
-	private function m_encrypt  ( $text_string = '' ) {
+	private function m_encrypt($text_string = '') {
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return $text_string;
 		}
 		// get the initialization vector size
-		$iv_size = mcrypt_get_iv_size ( MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB );
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
 		// initialization vector
-		$iv = mcrypt_create_iv ( $iv_size, MCRYPT_RAND );
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
 		// encrypt it
-		$encrypted_text = mcrypt_encrypt ( MCRYPT_RIJNDAEL_256, $this->get_encryption_key(), $text_string, MCRYPT_MODE_ECB, $iv );
+		$encrypted_text = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $this->get_encryption_key(), $text_string, MCRYPT_MODE_ECB, $iv);
 		// trim and encode
-		$encrypted_text = trim ( base64_encode( $encrypted_text ) );
+		$encrypted_text = trim(base64_encode($encrypted_text));
 		return $encrypted_text;
 	}
 
@@ -196,19 +196,19 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function m_decrypt  ( $encrypted_text = '' )  {
+	private function m_decrypt($encrypted_text = '') {
 		// you give me nothing??? GET OUT !
-		if  ( ! $encrypted_text )  {
+		if ( ! $encrypted_text) {
 			return $encrypted_text;
 		}
 		// decode
-		$encrypted_text = base64_decode ( $encrypted_text );
+		$encrypted_text = base64_decode($encrypted_text);
 		// get the initialization vector size
-		$iv_size = mcrypt_get_iv_size ( MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB );
-		$iv = mcrypt_create_iv ( $iv_size, MCRYPT_RAND );
+		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
 		// decrypt it
-		$decrypted_text = mcrypt_decrypt ( MCRYPT_RIJNDAEL_256, $this->get_encryption_key(), $encrypted_text, MCRYPT_MODE_ECB, $iv );
-		$decrypted_text = trim ( $decrypted_text );
+		$decrypted_text = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $this->get_encryption_key(), $encrypted_text, MCRYPT_MODE_ECB, $iv);
+		$decrypted_text = trim($decrypted_text);
 		return $decrypted_text;
 	}
 
@@ -222,18 +222,18 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function acme_encrypt ( $text_string = '' ) {
+	private function acme_encrypt($text_string = '') {
 		// you give me nothing??? GET OUT !
-		if  ( ! $text_string )  {
+		if ( ! $text_string) {
 			return $text_string;
 		}
-		$key_bits = str_split ( str_pad ( '', strlen( $text_string ), $this->get_encryption_key(), STR_PAD_RIGHT ));
-		$string_bits = str_split( $text_string );
-		foreach ( $string_bits as $k =>$v ) {
-			$temp = ord( $v ) + ord ( $key_bits[$k] );
-			$string_bits[$k] = chr ( $temp > 255 ? ( $temp - 256 ) : $temp );
+		$key_bits = str_split(str_pad('', strlen($text_string), $this->get_encryption_key(), STR_PAD_RIGHT));
+		$string_bits = str_split($text_string);
+		foreach ($string_bits as $k =>$v) {
+			$temp = ord($v) + ord($key_bits[$k]);
+			$string_bits[$k] = chr($temp > 255 ? ($temp - 256) : $temp);
 		}
-		$encrypted = base64_encode( join( '', $string_bits ) );
+		$encrypted = base64_encode(join('', $string_bits));
 		return $encrypted;
 	}
 
@@ -247,19 +247,19 @@ 
 	 * @internal param $string - the text to be decrypted
 	 * @return string
 	 */
-	private function acme_decrypt ( $encrypted_text = false ) {
+	private function acme_decrypt($encrypted_text = false) {
 		// you give me nothing??? GET OUT !
-		if  ( ! $encrypted_text )  {
+		if ( ! $encrypted_text) {
 			return false;
 		}
-		$encrypted_text = base64_decode ( $encrypted_text );
-		$key_bits = str_split ( str_pad ( '', strlen ( $encrypted_text ), $this->get_encryption_key(), STR_PAD_RIGHT ));
-		$string_bits = str_split ( $encrypted_text );
-		foreach ( $string_bits as $k => $v ) {
-			$temp = ord ( $v ) - ord ( $key_bits[$k] );
-			$string_bits[$k] = chr ( $temp < 0 ? ( $temp + 256 ) : $temp );
+		$encrypted_text = base64_decode($encrypted_text);
+		$key_bits = str_split(str_pad('', strlen($encrypted_text), $this->get_encryption_key(), STR_PAD_RIGHT));
+		$string_bits = str_split($encrypted_text);
+		foreach ($string_bits as $k => $v) {
+			$temp = ord($v) - ord($key_bits[$k]);
+			$string_bits[$k] = chr($temp < 0 ? ($temp + 256) : $temp);
 		}
-		$decrypted = join( '', $string_bits );
+		$decrypted = join('', $string_bits);
 		return $decrypted;
 	}
 
@@ -273,13 +273,13 @@ 
 	 * @internal param $string - number of characters for random string
 	 * @return string
 	 */
-	public function generate_random_string ( $length = 40 ) {
-		$iterations = ceil ( $length / 40 );
+	public function generate_random_string($length = 40) {
+		$iterations = ceil($length / 40);
 		$random_string = '';
-		for ($i = 0; $i < $iterations; $i ++) {
-			$random_string .= sha1( microtime(TRUE) . mt_rand( 10000, 90000 ));
+		for ($i = 0; $i < $iterations; $i++) {
+			$random_string .= sha1(microtime(TRUE).mt_rand(10000, 90000));
 		}
-		$random_string =  substr( $random_string, 0, $length );
+		$random_string = substr($random_string, 0, $length);
 		return $random_string;
 	}
 

core/EE_Error.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Doc Comments +5 added lines, -5 removed lines

@@ -88,7 +88,7 @@ 
 	/**
 	 *    error_handler
 	 * @access public
-	 * @param $code
+	 * @param integer $code
 	 * @param $message
 	 * @param $file
 	 * @param $line
@@ -189,7 +189,7 @@ 
 	/**
 	 *    _format_error
 	 * @access private
-	 * @param $code
+	 * @param string $code
 	 * @param $message
 	 * @param $file
 	 * @param $line
@@ -942,7 +942,7 @@ 
 	 *
 	 * @access    public
 	 * @param string $return_url
-	 * @return    array
+	 * @return    string
 	 */
 	public static function get_persistent_admin_notices( $return_url = '' ) {
 		$notices = '';
@@ -967,7 +967,7 @@ 
 	 *
 	 * @access 	public
 	 * @param 	bool $force_print
-	 * @return 	void
+	 * @return 	null|string
 	 */
 	private static function _print_scripts( $force_print = FALSE ) {
 		if (( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' )) && ! $force_print ) {
@@ -1105,7 +1105,7 @@ 
 	
 	/**
 	 * Like get_notices, but returns an array of all the notices of the given type.
-	 * @return array {
+	 * @return boolean {
 	 *	@type array $success all the success messages
 	 *	@type array $errors all the error messages
 	 *	@type array $attention all the attention messages

Indentation +175 added lines, -175 removed lines

@@ -5,65 +5,65 @@ 
 	register_shutdown_function( array( 'EE_Error', 'fatal_error_handler' ));
 }
 /**
- *
- * Error Handling Class
- *
- * @package			Event Espresso
- * @subpackage		includes/classes/EE_Exceptions.class.php
- * @author				Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 *
+	 * Error Handling Class
+	 *
+	 * @package			Event Espresso
+	 * @subpackage		includes/classes/EE_Exceptions.class.php
+	 * @author				Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EE_Error extends Exception {
 
 
 	/**
-	* 	name of the file to log exceptions to
-	* 	@access	private
-    *	@var string
-	*/
+	 * 	name of the file to log exceptions to
+	 * 	@access	private
+	 *	@var string
+	 */
 	private static $_exception_log_file = 'espresso_error_log.txt';
 
 	/**
-	* 	the exception
-	* 	@access	private
-    *	@var object
-	*/
+	 * 	the exception
+	 * 	@access	private
+	 *	@var object
+	 */
 	private $_exception;
 
 	/**
-	* 	stores details for all exception
-	* 	@access	private
-    *	@var array
-	*/
+	 * 	stores details for all exception
+	 * 	@access	private
+	 *	@var array
+	 */
 	private static $_all_exceptions = array();
 
 	/**
-	* 	tracks number of errors
-	* 	@access	private
-    *	@var int
-	*/
+	 * 	tracks number of errors
+	 * 	@access	private
+	 *	@var int
+	 */
 	private static $_error_count = 0;
 
 	/**
-	* 	has JS been loaded ?
-	* 	@access	private
-    *	@var boolean
-	*/
+	 * 	has JS been loaded ?
+	 * 	@access	private
+	 *	@var boolean
+	 */
 	private static $_js_loaded = FALSE;
 
 	/**
-	* 	has shutdown action been added ?
-	* 	@access	private
-    *	@var boolean
-	*/
+	 * 	has shutdown action been added ?
+	 * 	@access	private
+	 *	@var boolean
+	 */
 	private static $_action_added = FALSE;
 
 	/**
-	* 	has shutdown action been added ?
-	* 	@access	private
-    *	@var boolean
-	*/
+	 * 	has shutdown action been added ?
+	 * 	@access	private
+	 *	@var boolean
+	 */
 	private static $_espresso_notices = array( 'success' => FALSE, 'errors' => FALSE, 'attention' => FALSE );
 
 
@@ -71,10 +71,10 @@ 
 
 
 	/**
-	*	@override default exception handling
-	*	@access public
-	*	@echo string
-	*/
+	 *	@override default exception handling
+	 *	@access public
+	 *	@echo string
+	 */
 	function __construct( $message, $code = 0, Exception $previous = NULL ) {
 		if ( version_compare( phpversion(), '5.3.0', '<' )) {
 			parent::__construct( $message, $code );
@@ -173,10 +173,10 @@ 
 
 
 	/**
-	*	fatal_error_handler
-	*	@access public
-	*	@return void
-	*/
+	 *	fatal_error_handler
+	 *	@access public
+	 *	@return void
+	 */
 	public static function fatal_error_handler() {
 		$last_error = error_get_last();
 		if ( $last_error['type'] === E_ERROR ) {
@@ -221,11 +221,11 @@ 
 
 
 	/**
-	*	_add_actions
-	*	@access public
-	*	@return void
-	*/
-    public function get_error() {
+	 *	_add_actions
+	 *	@access public
+	 *	@return void
+	 */
+	public function get_error() {
 
 		if( apply_filters( 'FHEE__EE_Error__get_error__show_normal_exceptions', FALSE ) ){
 			throw $this;
@@ -255,22 +255,22 @@ 
 
 
 	/**
-	*	has_error
-	*	@access public
-	*	@return boolean
-	*/
-    public static function has_error(){
+	 *	has_error
+	 *	@access public
+	 *	@return boolean
+	 */
+	public static function has_error(){
 		return self::$_error_count ? TRUE : FALSE;
 	}
 
 
 
 	/**
-	*	display_errors
-	*	@access public
-	*	@echo string
-	*/
-    public function display_errors(){
+	 *	display_errors
+	 *	@access public
+	 *	@echo string
+	 */
+	public function display_errors(){
 
 		$trace_details = '';
 
@@ -342,7 +342,7 @@ 
 			// process trace info
 			if ( empty( $ex['trace'] )) {
 
-	            $trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' );
+				$trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' );
 
 			} else {
 
@@ -394,7 +394,7 @@ 
 					$function_dsply = ! empty( $function ) ? $function : '&nbsp;';
 					$args_dsply = ! empty( $args ) ? '( ' . $args . ' )' : '';
 
-		              $trace_details .= '
+					  $trace_details .= '
 					<tr>
 						<td align="right" class="' . $zebra . '">' . $nmbr_dsply . '</td>
 						<td align="right" class="' . $zebra . '">' . $line_dsply . '</td>
@@ -406,7 +406,7 @@ 
 
 				}
 
-	            $trace_details .= '
+				$trace_details .= '
 			 </table>
 			</div>';
 
@@ -486,12 +486,12 @@ 
 
 
 	/**
-	*	generate string from exception trace args
-	*
-	*	@access private
-	*	@ param array $arguments
-	*	@ return string
-	*/
+	 *	generate string from exception trace args
+	 *
+	 *	@access private
+	 *	@ param array $arguments
+	 *	@ return string
+	 */
 	private function _convert_args_to_string ( $arguments = array(), $array = FALSE ) {
 
 		$arg_string = '';
@@ -535,15 +535,15 @@ 
 
 
 	/**
-	* 	add error message
-	*
-	*	@access public
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add error message
+	 *
+	 *	@access public
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	public static function add_error( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		self::_add_notice ( 'errors', $msg, $file, $func, $line );
 		self::$_error_count++;
@@ -554,15 +554,15 @@ 
 
 
 	/**
-	* 	add success message
-	*
-	*	@access public
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add success message
+	 *
+	 *	@access public
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	public static function add_success( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		self::_add_notice ( 'success', $msg, $file, $func, $line );
 	}
@@ -572,15 +572,15 @@ 
 
 
 	/**
-	* 	add attention message
-	*
-	*	@access public
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add attention message
+	 *
+	 *	@access public
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	public static function add_attention( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		self::_add_notice ( 'attention', $msg, $file, $func, $line );
 	}
@@ -590,16 +590,16 @@ 
 
 
 	/**
-	* 	add success message
-	*
-	*	@access public
-	* 	@param		string		$type	whether the message is for a success or error notification
-	* 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
-	* 	@param		string		$file		the file that the error occurred in - just use __FILE__
-	* 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
-	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
-	* 	@return 		void
-	*/
+	 * 	add success message
+	 *
+	 *	@access public
+	 * 	@param		string		$type	whether the message is for a success or error notification
+	 * 	@param		string		$msg	the message to display to users or developers - adding a double pipe || (OR) creates separate messages for user || dev
+	 * 	@param		string		$file		the file that the error occurred in - just use __FILE__
+	 * 	@param		string		$func	the function/method that the error occurred in - just use __FUNCTION__
+	 * 	@param		string		$line	the line number where the error occurred - just use __LINE__
+	 * 	@return 		void
+	 */
 	private static function _add_notice( $type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
 		if ( empty( $msg )) {
 			EE_Error::doing_it_wrong(
@@ -648,11 +648,11 @@ 
 
 
 	/**
-	* 	in some case it may be necessary to overwrite the existing success messages
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	in some case it may be necessary to overwrite the existing success messages
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function overwrite_success() {
 		self::$_espresso_notices['success'] = FALSE;
 	}
@@ -662,11 +662,11 @@ 
 
 
 	/**
-	* 	in some case it may be necessary to overwrite the existing attention messages
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	in some case it may be necessary to overwrite the existing attention messages
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function overwrite_attention() {
 		self::$_espresso_notices['attention'] = FALSE;
 	}
@@ -676,11 +676,11 @@ 
 
 
 	/**
-	* 	in some case it may be necessary to overwrite the existing error messages
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	in some case it may be necessary to overwrite the existing error messages
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function overwrite_errors() {
 		self::$_espresso_notices['errors'] = FALSE;
 	}
@@ -688,24 +688,24 @@ 
 
 
 	/**
-	*	reset_notices
-	*	@access private
-	*	@return void
-	*/
+	 *	reset_notices
+	 *	@access private
+	 *	@return void
+	 */
 	public static function reset_notices(){
-    	self::$_espresso_notices['success'] = FALSE;
-    	self::$_espresso_notices['attention'] = FALSE;
-    	self::$_espresso_notices['errors'] = FALSE;
-    }
+		self::$_espresso_notices['success'] = FALSE;
+		self::$_espresso_notices['attention'] = FALSE;
+		self::$_espresso_notices['errors'] = FALSE;
+	}
 
 
 
 	/**
-	*	has_errors
-	*	@access public
-	*	@return int
-	*/
-    public static function has_notices(){
+	 *	has_errors
+	 *	@access public
+	 *	@return int
+	 */
+	public static function has_notices(){
 		$has_notices = 0;
 		// check for success messages
 		$has_notices = self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] ) ? 3 : $has_notices;
@@ -719,15 +719,15 @@ 
 
 
 	/**
-	* 	compile all error or success messages into one string
-	*	@see EE_Error::get_raw_notices if you want the raw notices without any preparations made to them
-	*
-	*	@access public
-	* 	@param		boolean		$format_output		whether or not to format the messages for display in the WP admin
-	* 	@param		boolean		$save_to_transient	whether or not to save notices to the db for retrieval on next request - ONLY do this just before redirecting
-	* 	@param		boolean		$remove_empty		whether or not to unset empty messages
-	* 	@return 		array
-	*/
+	 * 	compile all error or success messages into one string
+	 *	@see EE_Error::get_raw_notices if you want the raw notices without any preparations made to them
+	 *
+	 *	@access public
+	 * 	@param		boolean		$format_output		whether or not to format the messages for display in the WP admin
+	 * 	@param		boolean		$save_to_transient	whether or not to save notices to the db for retrieval on next request - ONLY do this just before redirecting
+	 * 	@param		boolean		$remove_empty		whether or not to unset empty messages
+	 * 	@return 		array
+	 */
 	public static function get_notices( $format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE ) {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 
@@ -839,14 +839,14 @@ 
 
 
 	/**
-	* 	add_persistent_admin_notice
-	*
-	*	@access 	public
-	* 	@param		string	$pan_name	the name, or key of the Persistent Admin Notice to be stored
-	* 	@param		string	$pan_message	the message to be stored persistently until dismissed
-	* 	@param bool $force_update allows one to enforce the reappearance of a persistent message.
-	* 	@return 		void
-	*/
+	 * 	add_persistent_admin_notice
+	 *
+	 *	@access 	public
+	 * 	@param		string	$pan_name	the name, or key of the Persistent Admin Notice to be stored
+	 * 	@param		string	$pan_message	the message to be stored persistently until dismissed
+	 * 	@param bool $force_update allows one to enforce the reappearance of a persistent message.
+	 * 	@return 		void
+	 */
 	public static function add_persistent_admin_notice( $pan_name = '', $pan_message, $force_update = FALSE ) {
 		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
 			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
@@ -910,9 +910,9 @@ 
 	 * 	display_persistent_admin_notices
 	 *
 	 *  	@access 	public
-	* 	@param		string	$pan_name	the name, or key of the Persistent Admin Notice to be stored
-	* 	@param		string	$pan_name	the message to be stored persistently until dismissed
-	* 	@param		string	$return_url	URL to go back to aftger nag notice is dismissed
+	 * 	@param		string	$pan_name	the name, or key of the Persistent Admin Notice to be stored
+	 * 	@param		string	$pan_name	the message to be stored persistently until dismissed
+	 * 	@param		string	$return_url	URL to go back to aftger nag notice is dismissed
 	 *  	@return 		string
 	 */
 	public static function display_persistent_admin_notices( $pan_name = '', $pan_message = '', $return_url = '' ) {
@@ -1001,11 +1001,11 @@ 
 
 
 	/**
-	* 	enqueue_error_scripts
-	*
-	*	@access public
-	* 	@return 		void
-	*/
+	 * 	enqueue_error_scripts
+	 *
+	 *	@access public
+	 * 	@return 		void
+	 */
 	public static function enqueue_error_scripts() {
 		self::_print_scripts();
 	}
@@ -1013,15 +1013,15 @@ 
 
 
 	/**
-	*	create error code from filepath, function name,
-	*	and line number where exception or error was thrown
-	*
-	*	@access public
-	*	@ param string $file
-	*	@ param string $func
-	*	@ param string $line
-	*	@ return string
-	*/
+	 *	create error code from filepath, function name,
+	 *	and line number where exception or error was thrown
+	 *
+	 *	@access public
+	 *	@ param string $file
+	 *	@ param string $func
+	 *	@ param string $line
+	 *	@ return string
+	 */
 	public static function generate_error_code ( $file = '', $func = '', $line = '' ) {
 		$file = explode( '.', basename( $file ));
 		$error_code = ! empty( $file[0] ) ? $file[0] : '';
@@ -1035,13 +1035,13 @@ 
 
 
 	/**
-	*	write exception details to log file
-	*
-	*	@access public
-	*	@ param timestamp $time
-	*	@ param object $ex
-	*	@ return void
-	*/
+	 *	write exception details to log file
+	 *
+	 *	@access public
+	 *	@ param timestamp $time
+	 *	@ param object $ex
+	 *	@ return void
+	 */
 	public function write_to_error_log ( $time = FALSE, $ex = FALSE, $clear = FALSE ) {
 
 		if ( ! $ex ) {

Spacing +237 added lines, -237 removed lines

@@ -1,8 +1,8 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 // if you're a dev and want to receive all errors via email add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE );
-if ( defined( 'WP_DEBUG' ) && WP_DEBUG === TRUE && defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS === TRUE ) {
-	set_error_handler( array( 'EE_Error', 'error_handler' ));
-	register_shutdown_function( array( 'EE_Error', 'fatal_error_handler' ));
+if (defined('WP_DEBUG') && WP_DEBUG === TRUE && defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS === TRUE) {
+	set_error_handler(array('EE_Error', 'error_handler'));
+	register_shutdown_function(array('EE_Error', 'fatal_error_handler'));
 }
 /**
  *
@@ -64,7 +64,7 @@ 
 	* 	@access	private
     *	@var boolean
 	*/
-	private static $_espresso_notices = array( 'success' => FALSE, 'errors' => FALSE, 'attention' => FALSE );
+	private static $_espresso_notices = array('success' => FALSE, 'errors' => FALSE, 'attention' => FALSE);
 
 
 
@@ -75,11 +75,11 @@ 
 	*	@access public
 	*	@echo string
 	*/
-	function __construct( $message, $code = 0, Exception $previous = NULL ) {
-		if ( version_compare( phpversion(), '5.3.0', '<' )) {
-			parent::__construct( $message, $code );
+	function __construct($message, $code = 0, Exception $previous = NULL) {
+		if (version_compare(phpversion(), '5.3.0', '<')) {
+			parent::__construct($message, $code);
 		} else {
-			parent::__construct( $message, $code, $previous );
+			parent::__construct($message, $code, $previous);
 		}
 	}
 
@@ -94,10 +94,10 @@ 
 	 * @param $line
 	 * @return void
 	 */
-	public static function error_handler( $code, $message, $file, $line ) {
-		$type = EE_Error::error_type( $code );
+	public static function error_handler($code, $message, $file, $line) {
+		$type = EE_Error::error_type($code);
 		$site = site_url();
-		switch ( $site ) {
+		switch ($site) {
 			case 'http://ee4.eventespresso.com/' :
 			case 'http://ee4decaf.eventespresso.com/' :
 			case 'http://ee4hf.eventespresso.com/' :
@@ -110,16 +110,16 @@ 
 				$to = 'developers@eventespresso.com';
 				break;
 			default :
-				$to = get_option( 'admin_email' );
+				$to = get_option('admin_email');
 		}
-		$subject = $type . ' ' . $message . ' in ' . EVENT_ESPRESSO_VERSION . ' on ' . site_url();
-		$msg = EE_Error::_format_error( $type, $message, $file, $line );
-		if ( function_exists( 'wp_mail' )) {
-			add_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' ));
-			wp_mail( $to, $subject, $msg );
+		$subject = $type.' '.$message.' in '.EVENT_ESPRESSO_VERSION.' on '.site_url();
+		$msg = EE_Error::_format_error($type, $message, $file, $line);
+		if (function_exists('wp_mail')) {
+			add_filter('wp_mail_content_type', array('EE_Error', 'set_content_type'));
+			wp_mail($to, $subject, $msg);
 		}
 		echo '<div id="message" class="espresso-notices error"><p>';
-		echo $type . ': ' . $message . '<br />' . $file . ' line ' . $line;
+		echo $type.': '.$message.'<br />'.$file.' line '.$line;
 		echo '<br /></p></div>';
 	}
 
@@ -132,8 +132,8 @@ 
 	 * @param $code
 	 * @return string
 	 */
-	public static function error_type( $code ) {
-		switch( $code ) {
+	public static function error_type($code) {
+		switch ($code) {
 			case E_ERROR: // 1 //
 			return 'E_ERROR';
 			case E_WARNING: // 2 //
@@ -179,8 +179,8 @@ 
 	*/
 	public static function fatal_error_handler() {
 		$last_error = error_get_last();
-		if ( $last_error['type'] === E_ERROR ) {
-			EE_Error::error_handler( E_ERROR, $last_error['message'], $last_error['file'], $last_error['line'] );
+		if ($last_error['type'] === E_ERROR) {
+			EE_Error::error_handler(E_ERROR, $last_error['message'], $last_error['file'], $last_error['line']);
 		}
 	}
 
@@ -195,7 +195,7 @@ 
 	 * @param $line
 	 * @return string
 	 */
-	private static function _format_error( $code, $message, $file, $line ) {
+	private static function _format_error($code, $message, $file, $line) {
 		$html  = "<table cellpadding='5'><thead bgcolor='#f8f8f8'><th>Item</th><th align='left'>Details</th></thead><tbody>";
 		$html .= "<tr valign='top'><td><b>Code</b></td><td>$code</td></tr>";
 		$html .= "<tr valign='top'><td><b>Error</b></td><td>$message</td></tr>";
@@ -213,7 +213,7 @@ 
 	 * @param $content_type
 	 * @return string
 	 */
-	public static function set_content_type( $content_type ) {
+	public static function set_content_type($content_type) {
 		return 'text/html';
 	}
 
@@ -227,24 +227,24 @@ 
 	*/
     public function get_error() {
 
-		if( apply_filters( 'FHEE__EE_Error__get_error__show_normal_exceptions', FALSE ) ){
+		if (apply_filters('FHEE__EE_Error__get_error__show_normal_exceptions', FALSE)) {
 			throw $this;
 		}
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $this->getMessage() );
+		$msg = explode('||', $this->getMessage());
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 
 		// add details to _all_exceptions array
 		$x_time = time();
-		self::$_all_exceptions[ $x_time ]['name'] 	= get_class( $this );
-		self::$_all_exceptions[ $x_time ]['file'] 		= $this->getFile();
-		self::$_all_exceptions[ $x_time ]['line'] 		= $this->getLine();
-		self::$_all_exceptions[ $x_time ]['msg'] 	= $msg;
-		self::$_all_exceptions[ $x_time ]['code'] 	= $this->getCode();
-		self::$_all_exceptions[ $x_time ]['trace'] 	= $this->getTrace();
-		self::$_all_exceptions[ $x_time ]['string'] 	= $this->getTraceAsString();
+		self::$_all_exceptions[$x_time]['name'] = get_class($this);
+		self::$_all_exceptions[$x_time]['file'] 		= $this->getFile();
+		self::$_all_exceptions[$x_time]['line'] 		= $this->getLine();
+		self::$_all_exceptions[$x_time]['msg'] = $msg;
+		self::$_all_exceptions[$x_time]['code'] = $this->getCode();
+		self::$_all_exceptions[$x_time]['trace'] 	= $this->getTrace();
+		self::$_all_exceptions[$x_time]['string'] = $this->getTraceAsString();
 		self::$_error_count++;
 
 		//add_action( 'shutdown', array( $this, 'display_errors' ));
@@ -259,7 +259,7 @@ 
 	*	@access public
 	*	@return boolean
 	*/
-    public static function has_error(){
+    public static function has_error() {
 		return self::$_error_count ? TRUE : FALSE;
 	}
 
@@ -270,7 +270,7 @@ 
 	*	@access public
 	*	@echo string
 	*/
-    public function display_errors(){
+    public function display_errors() {
 
 		$trace_details = '';
 
@@ -331,18 +331,18 @@ 
 </style>
 <div id="ee-error-message" class="error">';
 
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$output .= '
 	<p>';
 		}
 
 		// cycle thru errors
-		foreach ( self::$_all_exceptions as $time => $ex ) {
+		foreach (self::$_all_exceptions as $time => $ex) {
 
 			// process trace info
-			if ( empty( $ex['trace'] )) {
+			if (empty($ex['trace'])) {
 
-	            $trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' );
+	            $trace_details .= __('Sorry, but no trace information was available for this exception.', 'event_espresso');
 
 			} else {
 
@@ -357,50 +357,50 @@ 
 					<th scope="col" align="left">Method( arguments )</th>
 				</tr>';
 
-				$last_on_stack = count( $ex['trace'] ) - 1;
+				$last_on_stack = count($ex['trace']) - 1;
 				// reverse array so that stack is in proper chronological order
-				$sorted_trace = array_reverse( $ex['trace'] );
+				$sorted_trace = array_reverse($ex['trace']);
 
-				foreach ( $sorted_trace as $nmbr => $trace ) {
+				foreach ($sorted_trace as $nmbr => $trace) {
 
-					$file = isset( $trace['file'] ) ? $trace['file'] : '' ;
-					$class = isset( $trace['class'] ) ? $trace['class'] : '';
-					$type = isset( $trace['type'] ) ? $trace['type'] : '';
-					$function = isset( $trace['function'] ) ? $trace['function'] : '';
-					$args = isset( $trace['args'] ) ? $this->_convert_args_to_string( $trace['args'] ) : '';
-					$line = isset( $trace['line'] ) ? $trace['line'] : '';
+					$file = isset($trace['file']) ? $trace['file'] : '';
+					$class = isset($trace['class']) ? $trace['class'] : '';
+					$type = isset($trace['type']) ? $trace['type'] : '';
+					$function = isset($trace['function']) ? $trace['function'] : '';
+					$args = isset($trace['args']) ? $this->_convert_args_to_string($trace['args']) : '';
+					$line = isset($trace['line']) ? $trace['line'] : '';
 					$zebra = $nmbr % 2 ? ' odd' : '';
 
-					if ( empty( $file ) && ! empty( $class )) {
-						$a = new ReflectionClass( $class );
+					if (empty($file) && ! empty($class)) {
+						$a = new ReflectionClass($class);
 						$file = $a->getFileName();
-						if ( empty( $line ) && ! empty( $function )) {
-							$b = new ReflectionMethod( $class, $function );
+						if (empty($line) && ! empty($function)) {
+							$b = new ReflectionMethod($class, $function);
 							$line = $b->getStartLine();
 						}
 					}
 
-					if ( $nmbr == $last_on_stack ) {
+					if ($nmbr == $last_on_stack) {
 						$file = $ex['file'] != '' ? $ex['file'] : $file;
 						$line = $ex['line'] != '' ? $ex['line'] : $line;
-						$error_code = self::generate_error_code ( $file, $trace['function'], $line );
+						$error_code = self::generate_error_code($file, $trace['function'], $line);
 					}
 
-					$nmbr_dsply = ! empty( $nmbr ) ? $nmbr : '&nbsp;';
-					$line_dsply = ! empty( $line ) ? $line : '&nbsp;';
-					$file_dsply = ! empty( $file ) ? $file : '&nbsp;';
-					$class_dsply = ! empty( $class ) ? $class : '&nbsp;';
-					$type_dsply = ! empty( $type ) ? $type : '&nbsp;';
-					$function_dsply = ! empty( $function ) ? $function : '&nbsp;';
-					$args_dsply = ! empty( $args ) ? '( ' . $args . ' )' : '';
+					$nmbr_dsply = ! empty($nmbr) ? $nmbr : '&nbsp;';
+					$line_dsply = ! empty($line) ? $line : '&nbsp;';
+					$file_dsply = ! empty($file) ? $file : '&nbsp;';
+					$class_dsply = ! empty($class) ? $class : '&nbsp;';
+					$type_dsply = ! empty($type) ? $type : '&nbsp;';
+					$function_dsply = ! empty($function) ? $function : '&nbsp;';
+					$args_dsply = ! empty($args) ? '( '.$args.' )' : '';
 
 		              $trace_details .= '
 					<tr>
-						<td align="right" class="' . $zebra . '">' . $nmbr_dsply . '</td>
-						<td align="right" class="' . $zebra . '">' . $line_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $file_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $class_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $type_dsply . $function_dsply . $args_dsply . '</td>
+						<td align="right" class="' . $zebra.'">'.$nmbr_dsply.'</td>
+						<td align="right" class="' . $zebra.'">'.$line_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$file_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$class_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$type_dsply.$function_dsply.$args_dsply.'</td>
 					</tr>';
 
 
@@ -415,9 +415,9 @@ 
 			$ex['code'] = $ex['code'] ? $ex['code'] : $error_code;
 
 			// add generic non-identifying messages for non-privileged uesrs
-			if ( ! WP_DEBUG ) {
+			if ( ! WP_DEBUG) {
 
-				$output .= '<span class="ee-error-user-msg-spn">' . trim( $ex['msg'] )  . '</span> &nbsp; <sup>' . $ex['code'] . '</sup><br />';
+				$output .= '<span class="ee-error-user-msg-spn">'.trim($ex['msg']).'</span> &nbsp; <sup>'.$ex['code'].'</sup><br />';
 
 			} else {
 
@@ -425,24 +425,24 @@ 
 				$output .= '
 		<div class="ee-error-dev-msg-dv">
 			<p class="ee-error-dev-msg-pg">
-				<strong class="ee-error-dev-msg-str">An ' . $ex['name'] . ' exception was thrown!</strong>  &nbsp; <span>code: ' . $ex['code'] . '</span><br />
-				<span class="big-text">"' . trim( $ex['msg'] ) . '"</span><br/>
-				<a id="display-ee-error-trace-' . self::$_error_count . $time . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-' . self::$_error_count . $time . '">
-					' . __( 'click to view backtrace and class/method details', 'event_espresso' ) . '
+				<strong class="ee-error-dev-msg-str">An ' . $ex['name'].' exception was thrown!</strong>  &nbsp; <span>code: '.$ex['code'].'</span><br />
+				<span class="big-text">"' . trim($ex['msg']).'"</span><br/>
+				<a id="display-ee-error-trace-' . self::$_error_count.$time.'" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-'.self::$_error_count.$time.'">
+					' . __('click to view backtrace and class/method details', 'event_espresso').'
 				</a><br />
 				<span class="small-text lt-grey-text">'.$ex['file'].' &nbsp; ( line no: '.$ex['line'].' )</span>
 			</p>
-			<div id="ee-error-trace-' . self::$_error_count . $time . '-dv" class="ee-error-trace-dv" style="display: none;">
+			<div id="ee-error-trace-' . self::$_error_count.$time.'-dv" class="ee-error-trace-dv" style="display: none;">
 				' . $trace_details;
 
-				if ( ! empty( $class )) {
+				if ( ! empty($class)) {
 					$output .= '
 				<div style="padding:3px; margin:0 0 1em; border:1px solid #666; background:#fff; border-radius:3px;">
 					<div style="padding:1em 2em; border:1px solid #666; background:#f9f9f9;">
 						<h3>Class Details</h3>';
-						$a = new ReflectionClass( $class );
+						$a = new ReflectionClass($class);
 						$output .= '
-						<pre>' . $a . '</pre>
+						<pre>' . $a.'</pre>
 					</div>
 				</div>';
 				}
@@ -454,14 +454,14 @@ 
 
 			}
 
-			$this->write_to_error_log( $time, $ex );
+			$this->write_to_error_log($time, $ex);
 
 		}
 
 		// remove last linebreak
-		$output = substr( $output, 0, ( count( $output ) - 7 ));
+		$output = substr($output, 0, (count($output) - 7));
 
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$output .= '
 	</p>';
 		}
@@ -469,10 +469,10 @@ 
 		$output .= '
 </div>';
 
-		$output .= self::_print_scripts( TRUE );
+		$output .= self::_print_scripts(TRUE);
 
-		if ( defined( 'DOING_AJAX' )) {
-			echo json_encode( array( 'error' => $output ));
+		if (defined('DOING_AJAX')) {
+			echo json_encode(array('error' => $output));
 			exit();
 		}
 
@@ -492,29 +492,29 @@ 
 	*	@ param array $arguments
 	*	@ return string
 	*/
-	private function _convert_args_to_string ( $arguments = array(), $array = FALSE ) {
+	private function _convert_args_to_string($arguments = array(), $array = FALSE) {
 
 		$arg_string = '';
-		if ( ! empty( $arguments )) {
+		if ( ! empty($arguments)) {
 
 			$args = array();
 
-			foreach ( $arguments as $arg ) {
+			foreach ($arguments as $arg) {
 
-				if ( ! empty( $arg )) {
+				if ( ! empty($arg)) {
 
-					if ( is_string( $arg )) {
-						$args[] = " '" . $arg . "'";
-					} elseif ( is_array( $arg )) {
-						$args[] = 'ARRAY(' . $this->_convert_args_to_string( $arg, TRUE );
-					} elseif ( is_null( $arg )) {
+					if (is_string($arg)) {
+						$args[] = " '".$arg."'";
+					} elseif (is_array($arg)) {
+						$args[] = 'ARRAY('.$this->_convert_args_to_string($arg, TRUE);
+					} elseif (is_null($arg)) {
 						$args[] = ' NULL';
-					} elseif ( is_bool( $arg )) {
-						$args[] = ( $arg ) ? ' TRUE' : ' FALSE';
-					} elseif ( is_object( $arg )) {
-						$args[] = ' OBJECT ' . get_class( $arg );
-					} elseif ( is_resource( $arg )) {
-						$args[] = get_resource_type( $arg );
+					} elseif (is_bool($arg)) {
+						$args[] = ($arg) ? ' TRUE' : ' FALSE';
+					} elseif (is_object($arg)) {
+						$args[] = ' OBJECT '.get_class($arg);
+					} elseif (is_resource($arg)) {
+						$args[] = get_resource_type($arg);
 					} else {
 						$args[] = $arg;
 					}
@@ -522,9 +522,9 @@ 
 				}
 
 			}
-			$arg_string = implode( ', ', $args );
+			$arg_string = implode(', ', $args);
 		}
-		if ( $array ) {
+		if ($array) {
 			$arg_string .= ' )';
 		}
 		return $arg_string;
@@ -544,8 +544,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_error( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'errors', $msg, $file, $func, $line );
+	public static function add_error($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('errors', $msg, $file, $func, $line);
 		self::$_error_count++;
 	}
 
@@ -563,8 +563,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_success( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'success', $msg, $file, $func, $line );
+	public static function add_success($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('success', $msg, $file, $func, $line);
 	}
 
 
@@ -581,8 +581,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_attention( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'attention', $msg, $file, $func, $line );
+	public static function add_attention($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('attention', $msg, $file, $func, $line);
 	}
 
 
@@ -600,12 +600,12 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	private static function _add_notice( $type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		if ( empty( $msg )) {
+	private static function _add_notice($type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		if (empty($msg)) {
 			EE_Error::doing_it_wrong(
-				'EE_Error::add_' . $type . '()',
+				'EE_Error::add_'.$type.'()',
 				sprintf(
-					__( 'Notifications are not much use without a message! Please add a message to the EE_Error::add_%s() call made in %s on line %d', 'event_espresso' ),
+					__('Notifications are not much use without a message! Please add a message to the EE_Error::add_%s() call made in %s on line %d', 'event_espresso'),
 					$type,
 					$file,
 					$line
@@ -613,32 +613,32 @@ 
 				EVENT_ESPRESSO_VERSION
 			);
 		}
-		if ( $type == 'errors' && ( empty( $file ) || empty( $func ) || empty( $line ))) {
+		if ($type == 'errors' && (empty($file) || empty($func) || empty($line))) {
 			EE_Error::doing_it_wrong(
 				'EE_Error::add_error()',
-				__('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso' ),
+				__('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso'),
 				EVENT_ESPRESSO_VERSION
 			);
 		}
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $msg );
+		$msg = explode('||', $msg);
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 		// add notice if message exists
-		if ( ! empty( $msg )) {
+		if ( ! empty($msg)) {
 			// get error code
-			$notice_code = EE_Error::generate_error_code( $file, $func, $line );
-			if ( WP_DEBUG && $type == 'errors' ) {
-				$msg .= '<br/><span class="tiny-text">' . $notice_code . '</span>';
+			$notice_code = EE_Error::generate_error_code($file, $func, $line);
+			if (WP_DEBUG && $type == 'errors') {
+				$msg .= '<br/><span class="tiny-text">'.$notice_code.'</span>';
 			}
 			// add notice. Index by code if it's not blank
-			if( $notice_code ) {
-				self::$_espresso_notices[ $type ][ $notice_code ] = $msg;
+			if ($notice_code) {
+				self::$_espresso_notices[$type][$notice_code] = $msg;
 			} else {
-				self::$_espresso_notices[ $type ][] = $msg;
+				self::$_espresso_notices[$type][] = $msg;
 			}
-			add_action( 'wp_footer', array( 'EE_Error', 'enqueue_error_scripts' ), 1 );
+			add_action('wp_footer', array('EE_Error', 'enqueue_error_scripts'), 1);
 		}
 
 	}
@@ -692,7 +692,7 @@ 
 	*	@access private
 	*	@return void
 	*/
-	public static function reset_notices(){
+	public static function reset_notices() {
     	self::$_espresso_notices['success'] = FALSE;
     	self::$_espresso_notices['attention'] = FALSE;
     	self::$_espresso_notices['errors'] = FALSE;
@@ -705,14 +705,14 @@ 
 	*	@access public
 	*	@return int
 	*/
-    public static function has_notices(){
+    public static function has_notices() {
 		$has_notices = 0;
 		// check for success messages
-		$has_notices = self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] ) ? 3 : $has_notices;
+		$has_notices = self::$_espresso_notices['success'] && ! empty(self::$_espresso_notices['success']) ? 3 : $has_notices;
 		// check for attention messages
-		$has_notices = self::$_espresso_notices['attention'] && ! empty(  self::$_espresso_notices['attention'] ) ? 2 : $has_notices;
+		$has_notices = self::$_espresso_notices['attention'] && ! empty(self::$_espresso_notices['attention']) ? 2 : $has_notices;
 		// check for error messages
-		$has_notices = self::$_espresso_notices['errors'] && ! empty(  self::$_espresso_notices['errors'] ) ? 1 : $has_notices;
+		$has_notices = self::$_espresso_notices['errors'] && ! empty(self::$_espresso_notices['errors']) ? 1 : $has_notices;
 		return $has_notices;
 	}
 
@@ -728,8 +728,8 @@ 
 	* 	@param		boolean		$remove_empty		whether or not to unset empty messages
 	* 	@return 		array
 	*/
-	public static function get_notices( $format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+	public static function get_notices($format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$success_messages = '';
 		$attention_messages = '';
@@ -739,44 +739,44 @@ 
 		// EEH_Debug_Tools::printr( self::$_espresso_notices, 'espresso_notices  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
 		// either save notices to the db
-		if ( $save_to_transient ) {
-			update_option( 'ee_notices', self::$_espresso_notices );
+		if ($save_to_transient) {
+			update_option('ee_notices', self::$_espresso_notices);
 			return;
 		}
 		// grab any notices that have been previously saved
-		if ( $notices = get_option( 'ee_notices', FALSE )) {
-			foreach ( $notices as $type => $notice ) {
-				if ( is_array( $notice ) && ! empty( $notice )) {
+		if ($notices = get_option('ee_notices', FALSE)) {
+			foreach ($notices as $type => $notice) {
+				if (is_array($notice) && ! empty($notice)) {
 					// make sure that existsing notice type is an array
-					self::$_espresso_notices[ $type ] =  is_array( self::$_espresso_notices[ $type ] ) && ! empty( self::$_espresso_notices[ $type ] ) ? self::$_espresso_notices[ $type ] : array();
+					self::$_espresso_notices[$type] = is_array(self::$_espresso_notices[$type]) && ! empty(self::$_espresso_notices[$type]) ? self::$_espresso_notices[$type] : array();
 					// merge stored notices with any newly created ones
-					self::$_espresso_notices[ $type ] = array_merge( self::$_espresso_notices[ $type ], $notice );
+					self::$_espresso_notices[$type] = array_merge(self::$_espresso_notices[$type], $notice);
 					$print_scripts = TRUE;
 				}
 			}
 			// now clear any stored notices
-			update_option( 'ee_notices', FALSE );
+			update_option('ee_notices', FALSE);
 		}
 
 		// check for success messages
-		if ( self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] )) {
+		if (self::$_espresso_notices['success'] && ! empty(self::$_espresso_notices['success'])) {
 			// combine messages
-			$success_messages .= implode( self::$_espresso_notices['success'], '<br />' );
+			$success_messages .= implode(self::$_espresso_notices['success'], '<br />');
 			$print_scripts = TRUE;
 		}
 
 		// check for attention messages
-		if ( self::$_espresso_notices['attention'] && ! empty(  self::$_espresso_notices['attention'] ) ) {
+		if (self::$_espresso_notices['attention'] && ! empty(self::$_espresso_notices['attention'])) {
 			// combine messages
-			$attention_messages .= implode( self::$_espresso_notices['attention'], '<br />' );
+			$attention_messages .= implode(self::$_espresso_notices['attention'], '<br />');
 			$print_scripts = TRUE;
 		}
 
 		// check for error messages
-		if ( self::$_espresso_notices['errors'] && ! empty(  self::$_espresso_notices['errors'] ) ) {
-			$error_messages .= count( self::$_espresso_notices['errors'] ) > 1 ? __( 'The following errors have occurred:<br />', 'event_espresso' ) : __( 'An error has occurred:<br />', 'event_espresso' );
+		if (self::$_espresso_notices['errors'] && ! empty(self::$_espresso_notices['errors'])) {
+			$error_messages .= count(self::$_espresso_notices['errors']) > 1 ? __('The following errors have occurred:<br />', 'event_espresso') : __('An error has occurred:<br />', 'event_espresso');
 			// combine messages
-			$error_messages .= implode( self::$_espresso_notices['errors'], '<br />' );
+			$error_messages .= implode(self::$_espresso_notices['errors'], '<br />');
 			$print_scripts = TRUE;
 		}
 
@@ -790,21 +790,21 @@ 
 				$css_id = is_admin() ? 'message' : 'espresso-notices-success';
 				$css_class = is_admin() ? 'updated fade' : 'success fade-away';
 				//showMessage( $success_messages );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $success_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$success_messages.'</p>'.$close.'</div>';
 			}
 
 			if ($attention_messages != '') {
 				$css_id = is_admin() ? 'message' : 'espresso-notices-attention';
 				$css_class = is_admin() ? 'updated ee-notices-attention' : 'attention fade-away';
 				//showMessage( $error_messages, TRUE );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $attention_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$attention_messages.'</p>'.$close.'</div>';
 			}
 
 			if ($error_messages != '') {
 				$css_id = is_admin() ? 'message' : 'espresso-notices-error';
 				$css_class = is_admin() ? 'error' : 'error fade-away';
 				//showMessage( $error_messages, TRUE );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $error_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$error_messages.'</p>'.$close.'</div>';
 			}
 
 			$notices .= '</div>';
@@ -817,7 +817,7 @@ 
 					'errors' => $error_messages
 			);
 
-			if ( $remove_empty ) {
+			if ($remove_empty) {
 				// remove empty notices
 				foreach ($notices as $type => $notice) {
 					if (empty($notice)) {
@@ -827,7 +827,7 @@ 
 			}
 		}
 
-		if ( $print_scripts ) {
+		if ($print_scripts) {
 			self::_print_scripts();
 		}
 
@@ -847,17 +847,17 @@ 
 	* 	@param bool $force_update allows one to enforce the reappearance of a persistent message.
 	* 	@return 		void
 	*/
-	public static function add_persistent_admin_notice( $pan_name = '', $pan_message, $force_update = FALSE ) {
-		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
-			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
+	public static function add_persistent_admin_notice($pan_name = '', $pan_message, $force_update = FALSE) {
+		if ( ! empty($pan_name) && ! empty($pan_message)) {
+			$persistent_admin_notices = get_option('ee_pers_admin_notices', array());
 			//maybe initialize persistent_admin_notices
-			if ( empty( $persistent_admin_notices )) {
-				add_option( 'ee_pers_admin_notices', array(), '', 'no' );
+			if (empty($persistent_admin_notices)) {
+				add_option('ee_pers_admin_notices', array(), '', 'no');
 			}
-			$pan_name = sanitize_key( $pan_name );
-			if ( ! array_key_exists( $pan_name, $persistent_admin_notices ) || $force_update ) {
-				$persistent_admin_notices[ $pan_name ] = $pan_message;
-				update_option( 'ee_pers_admin_notices', $persistent_admin_notices );
+			$pan_name = sanitize_key($pan_name);
+			if ( ! array_key_exists($pan_name, $persistent_admin_notices) || $force_update) {
+				$persistent_admin_notices[$pan_name] = $pan_message;
+				update_option('ee_pers_admin_notices', $persistent_admin_notices);
 			}
 		}
 	}
@@ -873,34 +873,34 @@ 
 	 * @param bool          $return_immediately
 	 * @return        void
 	 */
-	public static function dismiss_persistent_admin_notice( $pan_name = '', $purge = FALSE, $return_immediately = FALSE ) {
-		$pan_name = EE_Registry::instance()->REQ->is_set( 'ee_nag_notice' ) ? EE_Registry::instance()->REQ->get( 'ee_nag_notice' ) : $pan_name;
-		if ( ! empty( $pan_name )) {
-			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
+	public static function dismiss_persistent_admin_notice($pan_name = '', $purge = FALSE, $return_immediately = FALSE) {
+		$pan_name = EE_Registry::instance()->REQ->is_set('ee_nag_notice') ? EE_Registry::instance()->REQ->get('ee_nag_notice') : $pan_name;
+		if ( ! empty($pan_name)) {
+			$persistent_admin_notices = get_option('ee_pers_admin_notices', array());
 			// check if notice we wish to dismiss is actually in the $persistent_admin_notices array
-			if ( is_array( $persistent_admin_notices ) && isset( $persistent_admin_notices[ $pan_name ] )) {
+			if (is_array($persistent_admin_notices) && isset($persistent_admin_notices[$pan_name])) {
 				// completely delete nag notice, or just NULL message so that it can NOT be added again ?
-				if ( $purge ) {
-					unset( $persistent_admin_notices[ $pan_name ] );
+				if ($purge) {
+					unset($persistent_admin_notices[$pan_name]);
 				} else {
-					$persistent_admin_notices[ $pan_name ] = NULL;
+					$persistent_admin_notices[$pan_name] = NULL;
 				}
-				if ( update_option( 'ee_pers_admin_notices', $persistent_admin_notices ) === FALSE ) {
-					EE_Error::add_error( sprintf( __( 'The persistent admin notice for "%s" could not be deleted.', 'event_espresso' ), $pan_name ), __FILE__, __FUNCTION__, __LINE__ );
+				if (update_option('ee_pers_admin_notices', $persistent_admin_notices) === FALSE) {
+					EE_Error::add_error(sprintf(__('The persistent admin notice for "%s" could not be deleted.', 'event_espresso'), $pan_name), __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
-		if ( $return_immediately ) {
+		if ($return_immediately) {
 			return;
-		} else if ( EE_Registry::instance()->REQ->ajax ) {
+		} else if (EE_Registry::instance()->REQ->ajax) {
 			// grab any notices and concatenate into string
-			echo json_encode( array( 'errors' => implode( '<br />', EE_Error::get_notices( FALSE ))));
+			echo json_encode(array('errors' => implode('<br />', EE_Error::get_notices(FALSE))));
 			exit();
 		} else {
 			// save errors to a transient to be displayed on next request (after redirect)
-			EE_Error::get_notices( FALSE, TRUE );
-			$return_url = EE_Registry::instance()->REQ->is_set( 'return_url' ) ? EE_Registry::instance()->REQ->get( 'return_url' ) : '';
-			wp_safe_redirect( urldecode( $return_url ));
+			EE_Error::get_notices(FALSE, TRUE);
+			$return_url = EE_Registry::instance()->REQ->is_set('return_url') ? EE_Registry::instance()->REQ->get('return_url') : '';
+			wp_safe_redirect(urldecode($return_url));
 		}
 	}
 
@@ -915,20 +915,20 @@ 
 	* 	@param		string	$return_url	URL to go back to aftger nag notice is dismissed
 	 *  	@return 		string
 	 */
-	public static function display_persistent_admin_notices( $pan_name = '', $pan_message = '', $return_url = '' ) {
-		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
+	public static function display_persistent_admin_notices($pan_name = '', $pan_message = '', $return_url = '') {
+		if ( ! empty($pan_name) && ! empty($pan_message)) {
 			$args = array(
 				'nag_notice' => $pan_name,
-				'return_url' => urlencode( $return_url ),
+				'return_url' => urlencode($return_url),
 				'ajax_url' => WP_AJAX_URL,
-				'unknown_error' => __( 'An unknown error has occurred on the server while attempting to dismiss this notice.', 'event_espresso' )
+				'unknown_error' => __('An unknown error has occurred on the server while attempting to dismiss this notice.', 'event_espresso')
 			);
-			wp_localize_script( 'espresso_core', 'ee_dismiss', $args );
+			wp_localize_script('espresso_core', 'ee_dismiss', $args);
 			return '
-			<div id="' . $pan_name . '" class="espresso-notices updated ee-nag-notice clearfix" style="border-left: 4px solid #fcb93c;">
-				<p>' . $pan_message . '</p>
-				<a class="dismiss-ee-nag-notice hide-if-no-js" style="float: right; cursor: pointer; text-decoration:none;" rel="' . $pan_name . '">
-					<span class="dashicons dashicons-dismiss" style="position:relative; top:-1px; margin-right:.25em;"></span>'.__( 'Dismiss', 'event_espresso' ) .'
+			<div id="' . $pan_name.'" class="espresso-notices updated ee-nag-notice clearfix" style="border-left: 4px solid #fcb93c;">
+				<p>' . $pan_message.'</p>
+				<a class="dismiss-ee-nag-notice hide-if-no-js" style="float: right; cursor: pointer; text-decoration:none;" rel="' . $pan_name.'">
+					<span class="dashicons dashicons-dismiss" style="position:relative; top:-1px; margin-right:.25em;"></span>'.__('Dismiss', 'event_espresso').'
 				</a>
 				<div style="clear:both;"></div>
 			</div>';
@@ -944,24 +944,24 @@ 
 	 * @param string $return_url
 	 * @return    array
 	 */
-	public static function get_persistent_admin_notices( $return_url = '' ) {
+	public static function get_persistent_admin_notices($return_url = '') {
 		$notices = '';
 		// check for persistent admin notices
 		//filter the list though so plugins can notify the admin in a different way if they want
 		$persistent_admin_notices = apply_filters( 
 			'FHEE__EE_Error__get_persistent_admin_notices',
-			get_option( 'ee_pers_admin_notices', FALSE ),
+			get_option('ee_pers_admin_notices', FALSE),
 			'ee_pers_admin_notices',
 			$return_url
 		);
-		if ( $persistent_admin_notices ) {
+		if ($persistent_admin_notices) {
 			// load scripts
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'ee_error_js' );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('ee_error_js');
 			// and display notices
-			foreach( $persistent_admin_notices as $pan_name => $pan_message ) {
-				$notices .= self::display_persistent_admin_notices( $pan_name, $pan_message, $return_url );
+			foreach ($persistent_admin_notices as $pan_name => $pan_message) {
+				$notices .= self::display_persistent_admin_notices($pan_name, $pan_message, $return_url);
 			}
 		}
 		return $notices;
@@ -976,26 +976,26 @@ 
 	 * @param 	bool $force_print
 	 * @return 	void
 	 */
-	private static function _print_scripts( $force_print = FALSE ) {
-		if (( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' )) && ! $force_print ) {
-			if ( wp_script_is( 'ee_error_js', 'enqueued' )) {
+	private static function _print_scripts($force_print = FALSE) {
+		if ((did_action('admin_enqueue_scripts') || did_action('wp_enqueue_scripts')) && ! $force_print) {
+			if (wp_script_is('ee_error_js', 'enqueued')) {
 				return;
-			} else if ( wp_script_is( 'ee_error_js', 'registered' )) {
-				add_filter( 'FHEE_load_css', '__return_true' );
-				add_filter( 'FHEE_load_js', '__return_true' );
-				wp_enqueue_script( 'ee_error_js' );
-				wp_localize_script( 'ee_error_js','ee_settings', array( 'wp_debug'=>WP_DEBUG ));
+			} else if (wp_script_is('ee_error_js', 'registered')) {
+				add_filter('FHEE_load_css', '__return_true');
+				add_filter('FHEE_load_js', '__return_true');
+				wp_enqueue_script('ee_error_js');
+				wp_localize_script('ee_error_js', 'ee_settings', array('wp_debug'=>WP_DEBUG));
 			}
 		} else {
 			return '
 <script>
 /* <![CDATA[ */
-var ee_settings = {"wp_debug":"' . WP_DEBUG . '"};
+var ee_settings = {"wp_debug":"' . WP_DEBUG.'"};
 /* ]]> */
 </script>
-<script src="' . includes_url() . 'js/jquery/jquery.js" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
+<script src="' . includes_url().'js/jquery/jquery.js" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
 ';
 
 		}
@@ -1029,11 +1029,11 @@ 
 	*	@ param string $line
 	*	@ return string
 	*/
-	public static function generate_error_code ( $file = '', $func = '', $line = '' ) {
-		$file = explode( '.', basename( $file ));
-		$error_code = ! empty( $file[0] ) ? $file[0] : '';
-		$error_code .= ! empty( $func ) ? ' - ' . $func : '';
-		$error_code .= ! empty( $line ) ? ' - ' . $line : '';
+	public static function generate_error_code($file = '', $func = '', $line = '') {
+		$file = explode('.', basename($file));
+		$error_code = ! empty($file[0]) ? $file[0] : '';
+		$error_code .= ! empty($func) ? ' - '.$func : '';
+		$error_code .= ! empty($line) ? ' - '.$line : '';
 		return $error_code;
 	}
 
@@ -1049,37 +1049,37 @@ 
 	*	@ param object $ex
 	*	@ return void
 	*/
-	public function write_to_error_log ( $time = FALSE, $ex = FALSE, $clear = FALSE ) {
+	public function write_to_error_log($time = FALSE, $ex = FALSE, $clear = FALSE) {
 
-		if ( ! $ex ) {
+		if ( ! $ex) {
 			return;
 		}
 
-		if ( ! $time ) {
+		if ( ! $time) {
 			$time = time();
 		}
 
-		$exception_log = '----------------------------------------------------------------------------------------' . PHP_EOL;
-		$exception_log .= '[' . date( 'Y-m-d H:i:s', $time ) . ']  Exception Details' . PHP_EOL;
-		$exception_log .= 'Message: ' . $ex['msg'] . PHP_EOL;
-		$exception_log .= 'Code: '. $ex['code'] . PHP_EOL;
-		$exception_log .= 'File: '. $ex['file'] . PHP_EOL;
-		$exception_log .= 'Line No: ' . $ex['line'] . PHP_EOL;
-		$exception_log .= 'Stack trace: ' . PHP_EOL;
-		$exception_log .= $ex['string'] . PHP_EOL;
-		$exception_log .= '----------------------------------------------------------------------------------------' . PHP_EOL;
-
-		EE_Registry::instance()->load_helper( 'File' );
+		$exception_log = '----------------------------------------------------------------------------------------'.PHP_EOL;
+		$exception_log .= '['.date('Y-m-d H:i:s', $time).']  Exception Details'.PHP_EOL;
+		$exception_log .= 'Message: '.$ex['msg'].PHP_EOL;
+		$exception_log .= 'Code: '.$ex['code'].PHP_EOL;
+		$exception_log .= 'File: '.$ex['file'].PHP_EOL;
+		$exception_log .= 'Line No: '.$ex['line'].PHP_EOL;
+		$exception_log .= 'Stack trace: '.PHP_EOL;
+		$exception_log .= $ex['string'].PHP_EOL;
+		$exception_log .= '----------------------------------------------------------------------------------------'.PHP_EOL;
+
+		EE_Registry::instance()->load_helper('File');
 		try {
-			EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file );
-			EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' ); 
-			if ( ! $clear ) {
+			EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file);
+			EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs'); 
+			if ( ! $clear) {
 				//get existing log file and append new log info
-				$exception_log = EEH_File::get_file_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file ) . $exception_log;
+				$exception_log = EEH_File::get_file_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file).$exception_log;
 			}
-			EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file, $exception_log );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Event Espresso error logging could not be setup because: %s', 'event_espresso' ), $e->getMessage() ));
+			EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file, $exception_log);
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Event Espresso error logging could not be setup because: %s', 'event_espresso'), $e->getMessage()));
 			return;
 		}
 
@@ -1103,10 +1103,10 @@ 
 	 * @param int     $error_type
 	 * @return void
 	 */
-	public static function doing_it_wrong( $function, $message, $version, $error_type = E_USER_NOTICE ) {
-		if ( defined('WP_DEBUG') && WP_DEBUG ) {
+	public static function doing_it_wrong($function, $message, $version, $error_type = E_USER_NOTICE) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			EE_Registry::instance()->load_helper('Debug_Tools');
-			EEH_Debug_Tools::instance()->doing_it_wrong( $function, $message, $version, $error_type );
+			EEH_Debug_Tools::instance()->doing_it_wrong($function, $message, $version, $error_type);
 		}
 	}
 	
@@ -1138,13 +1138,13 @@ 
  */
 function espresso_error_enqueue_scripts() {
 	// js for error handling
-	wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, FALSE );
-	wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, FALSE );
+	wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, FALSE);
+	wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, FALSE);
 }
-if ( is_admin() ) {
-	add_action( 'admin_enqueue_scripts', 'espresso_error_enqueue_scripts', 2 );
+if (is_admin()) {
+	add_action('admin_enqueue_scripts', 'espresso_error_enqueue_scripts', 2);
 } else {
-	add_action( 'wp_enqueue_scripts', 'espresso_error_enqueue_scripts', 2 );
+	add_action('wp_enqueue_scripts', 'espresso_error_enqueue_scripts', 2);
 }
 
 

core/EE_Front_Controller.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +122 added lines, -122 removed lines

@@ -61,7 +61,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof  EE_Front_Controller )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof  EE_Front_Controller)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -79,37 +79,37 @@ 
 	 */
 	private function __construct() {
 		// make sure template tags are loaded immediately so that themes don't break
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'load_espresso_template_tags' ), 10 );
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'load_espresso_template_tags'), 10);
 		// determine how to integrate WP_Query with the EE models
-		add_action( 'AHEE__EE_System__initialize', array( $this, 'employ_CPT_Strategy' ));
+		add_action('AHEE__EE_System__initialize', array($this, 'employ_CPT_Strategy'));
 		// load other resources and begin to actually run shortcodes and modules
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 5 );
+		add_action('wp_loaded', array($this, 'wp_loaded'), 5);
 		// analyse the incoming WP request
-		add_action( 'parse_request', array( $this, 'get_request' ), 1, 1 );
+		add_action('parse_request', array($this, 'get_request'), 1, 1);
 		// process any content shortcodes
-		add_action( 'parse_request', array( $this, '_initialize_shortcodes' ), 5 );
+		add_action('parse_request', array($this, '_initialize_shortcodes'), 5);
 		// process request with module factory
-		add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 10, 1 );
+		add_action('pre_get_posts', array($this, 'pre_get_posts'), 10, 1);
 		// before headers sent
-		add_action( 'wp', array( $this, 'wp' ), 5 );
+		add_action('wp', array($this, 'wp'), 5);
 		// load css and js
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 1 );
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 1);
 		// header
-		add_action('wp_head', array( $this, 'header_meta_tag' ), 5 );
-		add_filter( 'template_include', array( $this, 'template_include' ), 1 );
+		add_action('wp_head', array($this, 'header_meta_tag'), 5);
+		add_filter('template_include', array($this, 'template_include'), 1);
 		// display errors
-		add_action('loop_start', array( $this, 'display_errors' ), 2 );
+		add_action('loop_start', array($this, 'display_errors'), 2);
 		// the content
-		add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 );
+		add_filter('the_content', array($this, 'the_content'), 5, 1);
 		//exclude our private cpt comments
-		add_filter( 'comments_clauses', array( $this, 'filter_wp_comments'), 10, 1 );
+		add_filter('comments_clauses', array($this, 'filter_wp_comments'), 10, 1);
 		//make sure any ajax requests will respect the url schema when requests are made against admin-ajax.php (http:// or https://)
-		add_filter( 'admin_url', array( $this, 'maybe_force_admin_ajax_ssl' ), 200, 1 );
+		add_filter('admin_url', array($this, 'maybe_force_admin_ajax_ssl'), 200, 1);
 		// action hook EE
-		do_action( 'AHEE__EE_Front_Controller__construct__done',$this );
+		do_action('AHEE__EE_Front_Controller__construct__done', $this);
 		// for checking that browser cookies are enabled
-		if ( apply_filters( 'FHEE__EE_Front_Controller____construct__set_test_cookie', true )) {
-			setcookie( 'ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/' );
+		if (apply_filters('FHEE__EE_Front_Controller____construct__set_test_cookie', true)) {
+			setcookie('ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/');
 		}
 	}
 
@@ -129,8 +129,8 @@ 
 	 * 	@return void
 	 */
 	public function load_espresso_template_tags() {
-		if ( is_readable( EE_PUBLIC . 'template_tags.php' )) {
-			require_once( EE_PUBLIC . 'template_tags.php' );
+		if (is_readable(EE_PUBLIC.'template_tags.php')) {
+			require_once(EE_PUBLIC.'template_tags.php');
 		}
 	}
 
@@ -145,12 +145,12 @@ 
 	 * @param  array $clauses array of comment clauses setup by WP_Comment_Query
 	 * @return array array of comment clauses with modifications.
 	 */
-	public function filter_wp_comments( $clauses ) {
+	public function filter_wp_comments($clauses) {
 		global $wpdb;
-		if ( strpos( $clauses['join'], $wpdb->posts ) !== FALSE ) {
+		if (strpos($clauses['join'], $wpdb->posts) !== FALSE) {
 			$cpts = EE_Register_CPTs::get_private_CPTs();
-			foreach ( $cpts as $cpt => $details ) {
-				$clauses['where'] .= $wpdb->prepare( " AND $wpdb->posts.post_type != %s", $cpt );
+			foreach ($cpts as $cpt => $details) {
+				$clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt);
 			}
 		}
 		return $clauses;
@@ -167,8 +167,8 @@ 
 	 *  @return 	void
 	 */
 	public function employ_CPT_Strategy() {
-		if ( apply_filters( 'FHEE__EE_Front_Controller__employ_CPT_Strategy',true) ){
-			EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		if (apply_filters('FHEE__EE_Front_Controller__employ_CPT_Strategy', true)) {
+			EE_Registry::instance()->load_core('CPT_Strategy');
 		}
 	}
 
@@ -180,9 +180,9 @@ 
 	 * @param  string $url    incoming url
 	 * @return string         final assembled url
 	 */
-	public function maybe_force_admin_ajax_ssl( $url ) {
-		if ( is_ssl() && preg_match( '/admin-ajax.php/', $url )) {
-			$url = str_replace( 'http://', 'https://', $url );
+	public function maybe_force_admin_ajax_ssl($url) {
+		if (is_ssl() && preg_match('/admin-ajax.php/', $url)) {
+			$url = str_replace('http://', 'https://', $url);
 		}
 		return $url;
 	}
@@ -219,12 +219,12 @@ 
 	 * @param WP $WP
 	 * @return void
 	 */
-	public function get_request( WP $WP ) {
-		do_action( 'AHEE__EE_Front_Controller__get_request__start' );
+	public function get_request(WP $WP) {
+		do_action('AHEE__EE_Front_Controller__get_request__start');
 		/** @var EE_Request_Handler $Request_Handler */
-		$Request_Handler = EE_Registry::instance()->load_core( 'Request_Handler' );
-		$Request_Handler->parse_request( $WP );
-		do_action( 'AHEE__EE_Front_Controller__get_request__complete' );
+		$Request_Handler = EE_Registry::instance()->load_core('Request_Handler');
+		$Request_Handler->parse_request($WP);
+		do_action('AHEE__EE_Front_Controller__get_request__complete');
 	}
 
 
@@ -236,22 +236,22 @@ 
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function _initialize_shortcodes( WP $WP ) {
-		do_action( 'AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this );
+	public function _initialize_shortcodes(WP $WP) {
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this);
 		// grab post_name from request
-		$current_post = apply_filters( 'FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name', EE_Registry::instance()->REQ->get( 'post_name' ));
+		$current_post = apply_filters('FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name', EE_Registry::instance()->REQ->get('post_name'));
 		// if it's not set, then check if frontpage is blog
-		if ( empty( $current_post ) && get_option( 'show_on_front' ) == 'posts' ) {
+		if (empty($current_post) && get_option('show_on_front') == 'posts') {
 			// yup.. this is the posts page, prepare to load all shortcode modules
 			$current_post = 'posts';
-		} else if ( empty( $current_post ) && get_option( 'show_on_front' ) == 'page' ) {
+		} else if (empty($current_post) && get_option('show_on_front') == 'page') {
 			// some other page is set as the homepage
-			$page_on_front = get_option( 'page_on_front' );
-			if ( $page_on_front ) {
+			$page_on_front = get_option('page_on_front');
+			if ($page_on_front) {
 				// k now we need to find the post_name for this page
 				global $wpdb;
 				$SQL = "SELECT post_name from $wpdb->posts WHERE post_type='page' AND post_status='publish' AND ID=%d";
-				$page_on_front = $wpdb->get_var( $wpdb->prepare( $SQL, $page_on_front ));
+				$page_on_front = $wpdb->get_var($wpdb->prepare($SQL, $page_on_front));
 				// set the current post slug to what it actually is
 				$current_post = $page_on_front ? $page_on_front : $current_post;
 			}
@@ -259,58 +259,58 @@ 
 		// where are posts being displayed ?
 		$page_for_posts = EE_Config::get_page_for_posts();
 		// in case $current_post is hierarchical like: /parent-page/current-page
-		$current_post = basename( $current_post );
+		$current_post = basename($current_post);
 		// are we on a category page?
-		$term_exists = is_array( term_exists( $current_post, 'category' )) || array_key_exists( 'category_name', $WP->query_vars );
+		$term_exists = is_array(term_exists($current_post, 'category')) || array_key_exists('category_name', $WP->query_vars);
 		// make sure shortcodes are set
-		if ( isset( EE_Registry::instance()->CFG->core->post_shortcodes )) {
+		if (isset(EE_Registry::instance()->CFG->core->post_shortcodes)) {
 			// d( EE_Registry::instance()->CFG->core->post_shortcodes );
 			// cycle thru all posts with shortcodes set
-			foreach ( EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $post_shortcodes ) {
+			foreach (EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $post_shortcodes) {
 				// filter shortcodes so
-				$post_shortcodes = apply_filters( 'FHEE__Front_Controller__initialize_shortcodes__post_shortcodes', $post_shortcodes );
+				$post_shortcodes = apply_filters('FHEE__Front_Controller__initialize_shortcodes__post_shortcodes', $post_shortcodes);
 				// now cycle thru shortcodes
-				foreach ( $post_shortcodes as $shortcode_class => $post_id ) {
+				foreach ($post_shortcodes as $shortcode_class => $post_id) {
 					// are we on this page, or on the blog page, or an EE CPT category page ?
-					if ( $current_post == $post_name || $term_exists ) {
+					if ($current_post == $post_name || $term_exists) {
 						// verify shortcode is in list of registered shortcodes
-						if ( ! isset( EE_Registry::instance()->shortcodes->{$shortcode_class} )) {
-							if ( $current_post != $page_for_posts && current_user_can( 'edit_post', $post_id )) {
-								$msg = sprintf( __( 'The [%s] shortcode has not been properly registered or the corresponding addon/module is not active for some reason. Either fix/remove the shortcode from the post, or activate the addon/module the shortcode is associated with.', 'event_espresso' ), $shortcode_class );
-								EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
-								add_filter( 'FHEE_run_EE_the_content', '__return_true' );
+						if ( ! isset(EE_Registry::instance()->shortcodes->{$shortcode_class} )) {
+							if ($current_post != $page_for_posts && current_user_can('edit_post', $post_id)) {
+								$msg = sprintf(__('The [%s] shortcode has not been properly registered or the corresponding addon/module is not active for some reason. Either fix/remove the shortcode from the post, or activate the addon/module the shortcode is associated with.', 'event_espresso'), $shortcode_class);
+								EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+								add_filter('FHEE_run_EE_the_content', '__return_true');
 							}
-							add_shortcode( $shortcode_class, array( 'EES_Shortcode', 'invalid_shortcode_processor' ));
+							add_shortcode($shortcode_class, array('EES_Shortcode', 'invalid_shortcode_processor'));
 							continue;
 						}
 						// is this : a shortcodes set exclusively for this post, or for the home page, or a category, or a taxonomy ?
-						if ( isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $current_post ] ) || $term_exists || $current_post == $page_for_posts ) {
+						if (isset(EE_Registry::instance()->CFG->core->post_shortcodes[$current_post]) || $term_exists || $current_post == $page_for_posts) {
 							// let's pause to reflect on this...
-							$sc_reflector = new ReflectionClass( 'EES_' . $shortcode_class );
+							$sc_reflector = new ReflectionClass('EES_'.$shortcode_class);
 							// ensure that class is actually a shortcode
-							if ( ! $sc_reflector->isSubclassOf( 'EES_Shortcode' ) && defined( 'WP_DEBUG' ) && WP_DEBUG === TRUE ) {
-								$msg = sprintf( __( 'The requested %s shortcode is not of the class "EES_Shortcode". Please check your files.', 'event_espresso' ), $shortcode_class );
-								EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
-								add_filter( 'FHEE_run_EE_the_content', '__return_true' );
+							if ( ! $sc_reflector->isSubclassOf('EES_Shortcode') && defined('WP_DEBUG') && WP_DEBUG === TRUE) {
+								$msg = sprintf(__('The requested %s shortcode is not of the class "EES_Shortcode". Please check your files.', 'event_espresso'), $shortcode_class);
+								EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+								add_filter('FHEE_run_EE_the_content', '__return_true');
 								continue;
 							}
 							// and pass the request object to the run method
 							EE_Registry::instance()->shortcodes->{$shortcode_class} = $sc_reflector->newInstance();
 							// fire the shortcode class's run method, so that it can activate resources
-							EE_Registry::instance()->shortcodes->{$shortcode_class}->run( $WP );
+							EE_Registry::instance()->shortcodes->{$shortcode_class}->run($WP);
 						}
 					// if this is NOT the "Posts page" and we have a valid entry for the "Posts page" in our tracked post_shortcodes array
-					} else if ( $post_name != $page_for_posts && isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] )) {
+					} else if ($post_name != $page_for_posts && isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts])) {
 						// and the shortcode is not being tracked for this page
-						if ( ! isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] )) {
+						if ( ! isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$shortcode_class])) {
 							// then remove the "fallback" shortcode processor
-							remove_shortcode( $shortcode_class );
+							remove_shortcode($shortcode_class);
 						}
 					}
 				}
 			}
 		}
-		do_action( 'AHEE__EE_Front_Controller__initialize_shortcodes__end', $this );
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__end', $this);
 	}
 
 
@@ -322,20 +322,20 @@ 
 	 * @param   WP_Query    $WP_Query
 	 * @return    void
 	 */
-	public function pre_get_posts( $WP_Query ) {
+	public function pre_get_posts($WP_Query) {
 		// only load Module_Request_Router if this is the main query
-		if ( $WP_Query->is_main_query() ) {
+		if ($WP_Query->is_main_query()) {
 			// load module request router
-			$Module_Request_Router = EE_Registry::instance()->load_core( 'Module_Request_Router' );
+			$Module_Request_Router = EE_Registry::instance()->load_core('Module_Request_Router');
 			// verify object
-			if ( $Module_Request_Router instanceof EE_Module_Request_Router ) {
+			if ($Module_Request_Router instanceof EE_Module_Request_Router) {
 				// cycle thru module routes
-				while ( $route = $Module_Request_Router->get_route( $WP_Query )) {
+				while ($route = $Module_Request_Router->get_route($WP_Query)) {
 					// determine module and method for route
-					$module = $Module_Request_Router->resolve_route( $route[0], $route[1] );
-					if( $module instanceof EED_Module ) {
+					$module = $Module_Request_Router->resolve_route($route[0], $route[1]);
+					if ($module instanceof EED_Module) {
 						// get registered view for route
-						$this->_template_path = $Module_Request_Router->get_view( $route );
+						$this->_template_path = $Module_Request_Router->get_view($route);
 						// grab module name
 						$module_name = $module->module_name();
 						// map the module to the module objects
@@ -362,7 +362,7 @@ 
 	 *  @return 	void
 	 */
 	public function wp() {
-		EE_Registry::instance()->load_helper( 'Template' );
+		EE_Registry::instance()->load_helper('Template');
 	}
 
 
@@ -380,30 +380,30 @@ 
 	public function wp_enqueue_scripts() {
 
 		// css is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_css', '__return_false' );
-		if ( apply_filters( 'FHEE_load_css', TRUE ) ) {
+		if (apply_filters('FHEE_load_css', TRUE)) {
 
 			EE_Registry::instance()->CFG->template_settings->enable_default_style = TRUE;
 			//Load the ThemeRoller styles if enabled
-			if ( isset( EE_Registry::instance()->CFG->template_settings->enable_default_style ) && EE_Registry::instance()->CFG->template_settings->enable_default_style ) {
+			if (isset(EE_Registry::instance()->CFG->template_settings->enable_default_style) && EE_Registry::instance()->CFG->template_settings->enable_default_style) {
 
 				//Load custom style sheet if available
-				if ( isset( EE_Registry::instance()->CFG->template_settings->custom_style_sheet )) {
-					wp_register_style('espresso_custom_css', EVENT_ESPRESSO_UPLOAD_URL . 'css/' . EE_Registry::instance()->CFG->template_settings->custom_style_sheet, EVENT_ESPRESSO_VERSION );
+				if (isset(EE_Registry::instance()->CFG->template_settings->custom_style_sheet)) {
+					wp_register_style('espresso_custom_css', EVENT_ESPRESSO_UPLOAD_URL.'css/'.EE_Registry::instance()->CFG->template_settings->custom_style_sheet, EVENT_ESPRESSO_VERSION);
 					wp_enqueue_style('espresso_custom_css');
 				}
 
-				EE_Registry::instance()->load_helper( 'File' );
-				if ( is_readable( EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css' )) {
-					wp_register_style( 'espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION );
+				EE_Registry::instance()->load_helper('File');
+				if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR.'css/style.css')) {
+					wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION);
 				} else {
-					wp_register_style( 'espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css', array( 'dashicons' ), EVENT_ESPRESSO_VERSION );
+					wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css', array('dashicons'), EVENT_ESPRESSO_VERSION);
 				}
 				wp_enqueue_style('espresso_default');
 
-				if ( is_readable( get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css' )) {
-					wp_register_style( 'espresso_style', get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+				if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'style.css')) {
+					wp_register_style('espresso_style', get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'style.css', array('dashicons', 'espresso_default'));
 				} else {
-					wp_register_style( 'espresso_style', EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
+					wp_register_style('espresso_style', EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'style.css', array('dashicons', 'espresso_default'));
 				}
 
 			}
@@ -411,29 +411,29 @@ 
 		}
 
 		// js is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_js', '__return_false' );
-		if ( apply_filters( 'FHEE_load_js', TRUE ) ) {
+		if (apply_filters('FHEE_load_js', TRUE)) {
 
-			wp_enqueue_script( 'jquery' );
+			wp_enqueue_script('jquery');
 			//let's make sure that all required scripts have been setup
-			if ( function_exists( 'wp_script_is' )) {
-				if ( ! wp_script_is( 'jquery' )) {
+			if (function_exists('wp_script_is')) {
+				if ( ! wp_script_is('jquery')) {
 					$msg = sprintf(
-						__( '%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.', 'event_espresso' ),
+						__('%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.', 'event_espresso'),
 						'<em><br />',
 						'</em>'
 					);
-					EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 			// load core js
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'espresso_core' );
-			wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('espresso_core');
+			wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
 
 		}
 
 		//qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-		if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) {
+		if (apply_filters('FHEE_load_qtip', FALSE)) {
 			EE_Registry::instance()->load_helper('Qtip_Loader');
 			EEH_Qtip_Loader::instance()->register_and_enqueue();
 		}
@@ -441,11 +441,11 @@ 
 
 		//accounting.js library
 		// @link http://josscrowcroft.github.io/accounting.js/
-		if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) {
-			$acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js';
-			wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee-accounting-core', $acct_js, array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			$acct_js = EE_THIRD_PARTY_URL.'accounting/accounting.js';
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 
 			$currency_config = array(
 				'currency' => array(
@@ -468,21 +468,21 @@ 
 			wp_localize_script('ee-accounting', 'EE_ACCOUNTING_CFG', $currency_config);
 		}
 
-		if ( ! function_exists( 'wp_head' )) {
+		if ( ! function_exists('wp_head')) {
 			$msg = sprintf(
-				__( '%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso' ),
+				__('%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso'),
 				'<em><br />',
 				'</em>'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( ! function_exists( 'wp_footer' )) {
+		if ( ! function_exists('wp_footer')) {
 			$msg = sprintf(
-				__( '%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso' ),
+				__('%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.', 'event_espresso'),
 				'<em><br />',
 				'</em>'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
 	}
@@ -496,7 +496,7 @@ 
 	 *  @return 	void
 	 */
 	public function header_meta_tag() {
-		print( apply_filters("FHEE__EE_Front_Controller__header_meta_tag","<meta name='generator' content='Event Espresso Version " . EVENT_ESPRESSO_VERSION . "' />"));
+		print(apply_filters("FHEE__EE_Front_Controller__header_meta_tag", "<meta name='generator' content='Event Espresso Version ".EVENT_ESPRESSO_VERSION."' />"));
 	}
 
 
@@ -510,9 +510,9 @@ 
 	 * @param   $the_content
 	 * @return    string
 	 */
-	public function the_content( $the_content ) {
+	public function the_content($the_content) {
 		// nothing gets loaded at this point unless other systems turn this hookpoint on by using:  add_filter( 'FHEE_run_EE_the_content', '__return_true' );
-		if ( apply_filters( 'FHEE_run_EE_the_content', FALSE ) ) {
+		if (apply_filters('FHEE_run_EE_the_content', FALSE)) {
 		}
 		return $the_content;
 	}
@@ -537,9 +537,9 @@ 
 	 */
 	public function display_errors() {
 		static $shown_already = FALSE;
-		do_action( 'AHEE__EE_Front_Controller__display_errors__begin' );
+		do_action('AHEE__EE_Front_Controller__display_errors__begin');
 		if (
-			apply_filters( 'FHEE__EE_Front_Controller__display_errors', TRUE )
+			apply_filters('FHEE__EE_Front_Controller__display_errors', TRUE)
 			&& ! $shown_already
 			&& is_main_query()
 			&& ! is_feed()
@@ -548,10 +548,10 @@ 
 		) {
 			echo EE_Error::get_notices();
 			$shown_already = TRUE;
-			EE_Registry::instance()->load_helper( 'Template' );
-			EEH_Template::display_template( EE_TEMPLATES . 'espresso-ajax-notices.template.php' );
+			EE_Registry::instance()->load_helper('Template');
+			EEH_Template::display_template(EE_TEMPLATES.'espresso-ajax-notices.template.php');
 		}
-		do_action( 'AHEE__EE_Front_Controller__display_errors__end' );
+		do_action('AHEE__EE_Front_Controller__display_errors__end');
 	}
 
 
@@ -566,12 +566,12 @@ 
 	 * @param   string $template_include_path
 	 * @return    string
 	 */
-	public function template_include( $template_include_path = NULL ) {
-		if ( EE_Registry::instance()->REQ->is_espresso_page() ) {
-			$this->_template_path = ! empty( $this->_template_path ) ? basename( $this->_template_path ) : basename( $template_include_path );
-			$template_path = EEH_Template::locate_template( $this->_template_path, array(), false );
-			$this->_template_path = ! empty( $template_path ) ? $template_path : $template_include_path;
-			$this->_template = basename( $this->_template_path );
+	public function template_include($template_include_path = NULL) {
+		if (EE_Registry::instance()->REQ->is_espresso_page()) {
+			$this->_template_path = ! empty($this->_template_path) ? basename($this->_template_path) : basename($template_include_path);
+			$template_path = EEH_Template::locate_template($this->_template_path, array(), false);
+			$this->_template_path = ! empty($template_path) ? $template_path : $template_include_path;
+			$this->_template = basename($this->_template_path);
 			return $this->_template_path;
 		}
 		return $template_include_path;
@@ -586,7 +586,7 @@ 
 	 * @param bool $with_path
 	 * @return    string
 	 */
-	public function get_selected_template( $with_path = FALSE ) {
+	public function get_selected_template($with_path = FALSE) {
 		return $with_path ? $this->_template_path : $this->_template;
 	}