eventespresso / event-espresso-core

modules/single_page_checkout/EED_Single_Page_Checkout.module.php

Spacing +261 added lines, -261 removed lines

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

modules/ticket_selector/templates/ticket_selector_chart_iframe.template.php

Indentation -3 removed lines

@@ -25,9 +25,6 @@
 				
 			)
 		);
-
-
-
  * 
  */
 class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage{

modules/gateways/Invoice/lib/templates/receipt_body.template.php

Spacing +64 added lines, -64 removed lines

@@ -36,53 +36,53 @@ 
 						<h2 id="invoice-hdr"><?php _e('Order Confirmation', 'event_espresso')?></h2>
 						<h3 id="invoice-date"><?php _e('Date:', 'event_espresso')?> <span class="plain-text">[registration_date]</span></h3>
 						<h3 id="invoice-txn-id"><?php _e('Transaction ID:', 'event_espresso')?> <span class="plain-text">[transaction_id]</span></h3>
-						<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso')?> <span class="<?php echo $transaction->status_ID()?> plain-text"><?php echo $transaction->pretty_status();?></span></h3>
+						<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso')?> <span class="<?php echo $transaction->status_ID()?> plain-text"><?php echo $transaction->pretty_status(); ?></span></h3>
 					</div>
 				</td>
 			</tr>
 		</table>
 		<div class="events">
-		<?php foreach($events_for_txn as $event_id => $event){
-			?><h3 class="section-title event-name"><img class="icon" src="<?php echo EE_IMAGES_URL.'calendar_year-24x24.png';?>"><?php _e("Event Name:","event_espresso")?> <span class="plain-text"><?php echo $event->name();?></span> <span class="small-text link">[ <a href='<?php echo $event->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></h3>
-			<?php if (strlen($event->description()>1)){?><p class="event-description"><?php $event->description()?></p><?php }?>
+		<?php foreach ($events_for_txn as $event_id => $event) {
+			?><h3 class="section-title event-name"><img class="icon" src="<?php echo EE_IMAGES_URL.'calendar_year-24x24.png'; ?>"><?php _e("Event Name:", "event_espresso")?> <span class="plain-text"><?php echo $event->name(); ?></span> <span class="small-text link">[ <a href='<?php echo $event->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></h3>
+			<?php if (strlen($event->description() > 1)) {?><p class="event-description"><?php $event->description()?></p><?php }?>
 			<ul class="tickets-per-event">
-			<?php foreach($ticket_line_items_per_event[$event_id] as $line_item_id => $line_item){
+			<?php foreach ($ticket_line_items_per_event[$event_id] as $line_item_id => $line_item) {
 				$ticket = $line_item->ticket();
-				$taxable_html = $ticket->taxable() ? '*': '';
+				$taxable_html = $ticket->taxable() ? '*' : '';
 				$subitems = $line_item->children();
-				$ticket_uses = $ticket->get_pretty('TKT_uses',  __("any", "event_espresso"));
+				$ticket_uses = $ticket->get_pretty('TKT_uses', __("any", "event_espresso"));
 			?>
 				<li class="event-ticket">
 					<div class="ticket-details">
 						<table class="invoice-amount">
 							<thead>
 								<tr class="header_row">
-									<th class="name-column"><?php _e("Ticket", "event_espresso");?></th>
-									<th colspan="2" class="desc-column"><?php _e("Description", "event_espresso");?></th>
-									<th class="number-column item_c"><?php _e("Quantity", "event_espresso");?></th>
-									<th class="number-column item_c"><?php _e("Price", "event_espresso");?></th>
-									<th class="number-column item_r"><?php _e("Total", "event_espresso");?></th>
+									<th class="name-column"><?php _e("Ticket", "event_espresso"); ?></th>
+									<th colspan="2" class="desc-column"><?php _e("Description", "event_espresso"); ?></th>
+									<th class="number-column item_c"><?php _e("Quantity", "event_espresso"); ?></th>
+									<th class="number-column item_c"><?php _e("Price", "event_espresso"); ?></th>
+									<th class="number-column item_r"><?php _e("Total", "event_espresso"); ?></th>
 								</tr>
 							</thead>
 							<tbody>
-								<?php if( count($subitems) < 2){?>
+								<?php if (count($subitems) < 2) {?>
 								<tr class="item">
 									<td><?php echo $line_item->name().$taxable_html?></td>
-									<td colspan="2"><?php echo $line_item->desc();?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
+									<td colspan="2"><?php echo $line_item->desc(); ?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
 									<td class="item_c"><?php echo $line_item->quantity()?></td>
 									<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 									<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 								</tr>
-								<?php }else{?>
+								<?php } else {?>
 									<tr class="item">
 										<td class="aln-left"><?php echo $line_item->name().$taxable_html?></td>
-										<td colspan="2"><?php echo $line_item->desc();?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
+										<td colspan="2"><?php echo $line_item->desc(); ?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
 										<td class="item_c"><?php echo $line_item->quantity()?></td>
 										<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 										<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 									</tr>
-									<?php foreach($subitems as $sub_line_item){
-										$is_percent = $sub_line_item->is_percent();?>
+									<?php foreach ($subitems as $sub_line_item) {
+										$is_percent = $sub_line_item->is_percent(); ?>
 										<tr class="subitem-row">
 											<td class="subitem"><?php echo $sub_line_item->name()?></td>
 											<td colspan="2"><?php echo $sub_line_item->desc()?></td>
@@ -93,7 +93,7 @@ 
 									<?php } ?>
 									<tr class="total_tr odd">
 										<td colspan="4"></td>
-										<td class="total" nowrap="nowrap"><?php _e("Ticket Total:", "event_espresso");?></td>
+										<td class="total" nowrap="nowrap"><?php _e("Ticket Total:", "event_espresso"); ?></td>
 										<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 									</tr>
 								<?php }?>
@@ -104,22 +104,22 @@ 
 					<div class="reg-details-for-ticket">
 						<div class="ticket-time-and-place-details">
 							<div class="ticket-time-details">
-								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'clock-16x16.png';?>"><?php echo _n("Date/Time:","Dates/Times:",count($ticket->datetimes()), "event_espresso");?></h4>
+								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'clock-16x16.png'; ?>"><?php echo _n("Date/Time:", "Dates/Times:", count($ticket->datetimes()), "event_espresso"); ?></h4>
 								<ul class="event-dates">
-									<?php foreach($ticket->datetimes_ordered() as $datetime){
+									<?php foreach ($ticket->datetimes_ordered() as $datetime) {
 										/* @var $datetime EE_Datetime */ ?>
 									<li><?php
-										echo $datetime->name() ? '<b>'.$datetime->name().' </b>' : '' ;
-										echo sprintf(__("%s - %s (%s)", "event_espresso"),$datetime->start_date_and_time(),$datetime->end_date_and_time(),$datetime->get_timezone());
+										echo $datetime->name() ? '<b>'.$datetime->name().' </b>' : '';
+										echo sprintf(__("%s - %s (%s)", "event_espresso"), $datetime->start_date_and_time(), $datetime->end_date_and_time(), $datetime->get_timezone());
 										echo $datetime->description() ? '<p class="ticket-note">'.$datetime->description().'</p>' : '' ?></li>
 									<?php }?>
 								</ul>
 							</div>
-							<?php if ($event->venues()){?>
+							<?php if ($event->venues()) {?>
 							<div class="ticket-place-details">
-								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'location-pin-16x16.png';?>"><?php echo _n("Venue:","Venues:",count($event->venues()), "event_espresso");?></h4>
+								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'location-pin-16x16.png'; ?>"><?php echo _n("Venue:", "Venues:", count($event->venues()), "event_espresso"); ?></h4>
 								<ul class="event-venues">
-									<?php foreach($event->venues() as $venue){?>
+									<?php foreach ($event->venues() as $venue) {?>
 									<li><?php echo $venue->name()?> <span class="small-text">[ <a href='<?php echo $venue->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></li>
 									<?php } ?>
 								</ul>
@@ -127,34 +127,34 @@ 
 							<?php }?>
 						</div>
 						<div class="ticket-registrations-area">
-							<h4 class="sub-section-title"><img class="icon" src="<?php echo EE_IMAGES_URL.'users-16x16.png';?>"><?php echo __("Registration Details", "event_espresso");?> <span class="small-text link">[ <a class="print_button noPrint" href="<?php echo $edit_reg_info_url; ?>"><?php _e('edit', 'event_espresso'); ?></a> ]</span></h4>
+							<h4 class="sub-section-title"><img class="icon" src="<?php echo EE_IMAGES_URL.'users-16x16.png'; ?>"><?php echo __("Registration Details", "event_espresso"); ?> <span class="small-text link">[ <a class="print_button noPrint" href="<?php echo $edit_reg_info_url; ?>"><?php _e('edit', 'event_espresso'); ?></a> ]</span></h4>
 							<ul class="ticket-registrations-list">
-								<?php foreach($registrations_per_line_item[$line_item_id] as $registration){
+								<?php foreach ($registrations_per_line_item[$line_item_id] as $registration) {
 									/* @var $registration EE_Registration */
 									$attendee = $registration->attendee();
-									$answers = $registration->answers(array('order_by'=>array('Question.Question_Group_Question.QGQ_order'=>'ASC')));?>
+									$answers = $registration->answers(array('order_by'=>array('Question.Question_Group_Question.QGQ_order'=>'ASC'))); ?>
 								<li class="ticket-registration">
 									<table class="registration-details">
 										<tr class="odd">
-											<th><?php echo 	_e("Registration Code:", "event_espresso");?></th>
-											<td><?php echo $registration->reg_code();?> - <span class="<?php echo $registration->status_ID()?>"><?php echo $registration->pretty_status()?></span></td>
+											<th><?php echo 	_e("Registration Code:", "event_espresso"); ?></th>
+											<td><?php echo $registration->reg_code(); ?> - <span class="<?php echo $registration->status_ID()?>"><?php echo $registration->pretty_status()?></span></td>
 										</tr>
 										<?php
-										foreach($event->question_groups() as $question_group){
-											?><tr><th><?php $question_group->e('QSG_name');?></th><td></td></tr><?php
+										foreach ($event->question_groups() as $question_group) {
+											?><tr><th><?php $question_group->e('QSG_name'); ?></th><td></td></tr><?php
 											$has_personal_info = false;
-											foreach($question_group->questions() as $question){
-												if( in_array($question->system_ID(),$questions_to_skip)){
+											foreach ($question_group->questions() as $question) {
+												if (in_array($question->system_ID(), $questions_to_skip)) {
 													$has_personal_info = true;
 													continue;
 												}
 												?><tr>
 														<th><?php echo $question->display_text()?></th>
-														<td><?php echo $registration->answer_value_to_question($question);?></td>
+														<td><?php echo $registration->answer_value_to_question($question); ?></td>
 												</tr><?php
 											}
-											if($has_personal_info){
-												?><tr><th><?php	_e('Attendee', 'event_espresso');?></th><td><?php echo sprintf(__('%s (%s)', "event_espresso"),$attendee->full_name(),$attendee->email())?></td></tr><?php
+											if ($has_personal_info) {
+												?><tr><th><?php	_e('Attendee', 'event_espresso'); ?></th><td><?php echo sprintf(__('%s (%s)', "event_espresso"), $attendee->full_name(), $attendee->email())?></td></tr><?php
 											}
 										}
 										?>
@@ -171,21 +171,21 @@ 
 		<?php }?>
 		</div>
 		<div class="taxes">
-			<?php if ($tax_total_line_item && $tax_total_line_item->children()){?>
-				<h3 class="section-title"><?php _e("Taxes",'event_espresso')?></h3>
+			<?php if ($tax_total_line_item && $tax_total_line_item->children()) {?>
+				<h3 class="section-title"><?php _e("Taxes", 'event_espresso')?></h3>
 				<table class="invoice-amount">
 
 					<thead>
 						<tr class="header_row">
-							<th class="left ticket_th"><?php _e("Tax Name", "event_espresso");?></th>
-							<th class="left"><?php _e('Description', 'event_espresso');?></th>
+							<th class="left ticket_th"><?php _e("Tax Name", "event_espresso"); ?></th>
+							<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
 							<th class="event_th item_c"><?php _e('Rate', 'event_espresso'); ?></th>
 							<th class="subtotal_th"><?php _e('Tax Amount', 'event_espresso'); ?></th>
 						</tr>
 					</thead>
 					<tbody>
 						<?php
-						foreach($tax_total_line_item->children() as $child_tax){?>
+						foreach ($tax_total_line_item->children() as $child_tax) {?>
 						<tr>
 							<td><?php echo $child_tax->name()?></td>
 							<td><?php echo $child_tax->desc()?></td>
@@ -195,26 +195,26 @@ 
 						<?php } ?>
 						<tr class="total_tr odd">
 							<td class="total_tr" colspan="2"></td>
-							<td class="total"><?php	_e("Tax Total:", "event_espresso");?></td>
+							<td class="total"><?php	_e("Tax Total:", "event_espresso"); ?></td>
 							<td class="item_r"><?php echo $tax_total_line_item->total_no_code()?></td>
 						</tr>
 					</tbody>
 
 				</table>
 			<?php }?>
-			<p><?php _e("* taxable items", "event_espresso");?></p>
+			<p><?php _e("* taxable items", "event_espresso"); ?></p>
 		</div>
 		<div class="grand-total-dv">
-		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"),EEH_Template::format_currency($total_cost));?></h2>
+		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"), EEH_Template::format_currency($total_cost)); ?></h2>
 		</div>
 		<div class="payment-dv">
-			<h3 class="section-title"><?php _e("Payments",'event_espresso')?></h3>
+			<h3 class="section-title"><?php _e("Payments", 'event_espresso')?></h3>
 			<p>[instructions]</p>
 			<table class="invoice-amount">
 				<thead>
 					<tr class="header_row">
 						<th><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></th>
-						<th class='left datetime_th'><?php _e("Date",'event_espresso')?></th>
+						<th class='left datetime_th'><?php _e("Date", 'event_espresso')?></th>
 						<th><span class=""><?php _e('Transaction Id / Cheque #', 'event_espresso'); ?></span></th>
 						<th><span class=""><?php _e('P.O. / S.O.#', 'event_espresso'); ?></span></th>
 						<th><span class=""><?php _e('Status', 'event_espresso'); ?></span></th>
@@ -224,11 +224,11 @@ 
 				<tbody>
 					<?php
 					$c = false;
-					if(!empty($payments)){
+					if ( ! empty($payments)) {
 
-						foreach($payments as $payment){
+						foreach ($payments as $payment) {
 							/* @var $payment EE_Payment */?>
-						<tr class='item <?php echo (($c = !$c) ? ' odd' : '')?>'>
+						<tr class='item <?php echo (($c = ! $c) ? ' odd' : '')?>'>
 							<td><?php $payment->e('PAY_gateway')?></td>
 							<td><?php echo $payment->timestamp()?></td>
 							<td><?php $payment->e('PAY_txn_id_chq_nmbr')?></td>
@@ -237,17 +237,17 @@ 
 							<td class='item_r'><?php echo $payment->amount_no_code()?></td>
 						</tr>
 						<?php }
-					}else{?>
+					} else {?>
 						<tr class='item'>
-							<td class='aln-cntr' colspan="6"><?php _e("No approved payments have been received.",'event_espresso')?> </td>
+							<td class='aln-cntr' colspan="6"><?php _e("No approved payments have been received.", 'event_espresso')?> </td>
 						</tr>
 					<?php }
-					?><tr class="item" ><td class='aln-cntr' colspan="6"><?php if($amount_owed){?><a class="noPrint" href='<?php echo $retry_payment_url?>'><?php _e("Please make a payment.", "event_espresso");}?></a></td></tr>
+					?><tr class="item" ><td class='aln-cntr' colspan="6"><?php if ($amount_owed) {?><a class="noPrint" href='<?php echo $retry_payment_url?>'><?php _e("Please make a payment.", "event_espresso"); }?></a></td></tr>
 				</tbody>
 				<tfoot>
 					<tr class='total_tr'><td colspan="4">&nbsp;</td>
-						<td class="item_r"><?php _e('Total Paid','event_espresso')?></td>
-						<td class="item_r"><?php echo EEH_Template::format_currency($amount_pd,false,false)?> </td>
+						<td class="item_r"><?php _e('Total Paid', 'event_espresso')?></td>
+						<td class="item_r"><?php echo EEH_Template::format_currency($amount_pd, false, false)?> </td>
 					</tr>
 					<?php //echo $discount; ?>
 					<tr class="total_tr odd">
@@ -259,20 +259,20 @@ 
 			</table>
 		</div>
 		<div class="additional-info-dv">
-			<h3 class="section-title"><?php _e("Additional Information:", "event_espresso");?></h3>
+			<h3 class="section-title"><?php _e("Additional Information:", "event_espresso"); ?></h3>
 			<div class="additional-info">
-				<?php if($venues_for_events){?>
-				<h2><?php echo _n("Venue Details:", "Venues Details:", "event_espresso",count($venues_for_events));?></h2>
+				<?php if ($venues_for_events) {?>
+				<h2><?php echo _n("Venue Details:", "Venues Details:", "event_espresso", count($venues_for_events)); ?></h2>
 				<table class="venue-list">
-					<?php foreach($venues_for_events as $venue){?>
+					<?php foreach ($venues_for_events as $venue) {?>
 						<tr class="venue-details">
 							<td class="venue-details-part venue-address-dv">
 								<h3><a href='<?php echo $venue->get_permalink()?>'><?php
 									echo $venue->name()
 								?></a></h3>
 								<p><?php echo $venue->description()?></p>
-								<?php echo  EEH_Address::format($venue);?></td>
-							<?php if($venue->enable_for_gmap()){?>
+								<?php echo  EEH_Address::format($venue); ?></td>
+							<?php if ($venue->enable_for_gmap()) {?>
 								<td class="venue-details-part venue-image-dv"><?php echo EEH_Venue_View::espresso_google_static_map($venue)?></td>
 							<?php } ?>
 						</tr>
@@ -280,8 +280,8 @@ 
 				</table>
 				<?php } ?>
 
-				<?php if($shameless_plug){
-					echo \EEH_Template::powered_by_event_espresso( 'aln-cntr' );
+				<?php if ($shameless_plug) {
+					echo \EEH_Template::powered_by_event_espresso('aln-cntr');
 				} ?>
 			</div>
 		</div>

core/libraries/messages/defaults/default/html_receipt_content.template.php

Spacing +29 added lines, -29 removed lines

@@ -23,15 +23,15 @@ 
 			</td>
 			<td>
 				<div id="invoice-info">
-					<h2 id="invoice-hdr"><?php _e( 'Order Confirmation', 'event_espresso' ) ?></h2>
+					<h2 id="invoice-hdr"><?php _e('Order Confirmation', 'event_espresso') ?></h2>
 
-					<h3 id="invoice-date"><?php _e( 'Date:', 'event_espresso' ) ?>
+					<h3 id="invoice-date"><?php _e('Date:', 'event_espresso') ?>
 						<span class="plain-text">[PRIMARY_REGISTRANT_REGISTRATION_DATE]</span></h3>
 
-					<h3 id="invoice-txn-id"><?php _e( 'Transaction ID:', 'event_espresso' ) ?>
+					<h3 id="invoice-txn-id"><?php _e('Transaction ID:', 'event_espresso') ?>
 						<span class="plain-text">[TXN_ID]</span></h3>
 
-					<h3 id="invoice-txn-status"><?php _e( 'Status:', 'event_espresso' ) ?>
+					<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso') ?>
 						<span class="[TXN_STATUS_ID] plain-text">[TXN_STATUS]</span></h3>
 				</div>
 			</td>
@@ -41,15 +41,15 @@ 
 		[EVENT_LIST]
 	</div>
 	<div class="taxes">
-		<h3 class="section-title"><?php _e( "Additional Charges/Discounts", 'event_espresso' ) ?></h3>
+		<h3 class="section-title"><?php _e("Additional Charges/Discounts", 'event_espresso') ?></h3>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th class="left ticket_th"><?php _e( "Name", "event_espresso" ); ?></th>
-					<th class="left"><?php _e( 'Description', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Quantity', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Unit Price', 'event_espresso' ); ?></th>
-					<th class="subtotal_th"><?php _e( 'Total', 'event_espresso' ); ?></th>
+					<th class="left ticket_th"><?php _e("Name", "event_espresso"); ?></th>
+					<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Quantity', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Unit Price', 'event_espresso'); ?></th>
+					<th class="subtotal_th"><?php _e('Total', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -60,15 +60,15 @@ 
 		</table>
 	</div>
 	<div class="taxes">
-		<h3 class="section-title"><?php _e( "Taxes", 'event_espresso' ) ?></h3>
-		<p><?php printf( __( '%s*%s Taxable items. The total amount collected for taxes is reflected in the total(s) below.', 'event_espresso' ), '<strong>', '</strong>' ); ?></p>
+		<h3 class="section-title"><?php _e("Taxes", 'event_espresso') ?></h3>
+		<p><?php printf(__('%s*%s Taxable items. The total amount collected for taxes is reflected in the total(s) below.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th class="left ticket_th"><?php _e( "Tax Name", "event_espresso" ); ?></th>
-					<th class="left"><?php _e( 'Description', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Rate', 'event_espresso' ); ?></th>
-					<th class="subtotal_th"><?php _e( 'Tax Amount', 'event_espresso' ); ?></th>
+					<th class="left ticket_th"><?php _e("Tax Name", "event_espresso"); ?></th>
+					<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Rate', 'event_espresso'); ?></th>
+					<th class="subtotal_th"><?php _e('Tax Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -79,19 +79,19 @@ 
 		</table>
 	</div>
 	<div class="grand-total-dv">
-		<h2 class="grand-total"><?php printf( __( "Grand Total: %s", "event_espresso" ), '[TOTAL_COST]' ); ?></h2>
+		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"), '[TOTAL_COST]'); ?></h2>
 	</div>
 	<div class="payment-dv">
-		<h3 class="section-title"><?php _e( "Payments", 'event_espresso' ) ?></h3>
+		<h3 class="section-title"><?php _e("Payments", 'event_espresso') ?></h3>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th><span class=""><?php _e( 'Payment Method', 'event_espresso' ); ?></span></th>
-					<th class='left datetime_th'><?php _e( "Date", 'event_espresso' ) ?></th>
-					<th><span class=""><?php _e( 'Transaction Id / Cheque #', 'event_espresso' ); ?></span></th>
-					<th><span class=""><?php _e( 'P.O. / S.O.#', 'event_espresso' ); ?></span></th>
-					<th><span class=""><?php _e( 'Status', 'event_espresso' ); ?></span></th>
-					<th><?php _e( 'Amount', 'event_espresso' ); ?></th>
+					<th><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></th>
+					<th class='left datetime_th'><?php _e("Date", 'event_espresso') ?></th>
+					<th><span class=""><?php _e('Transaction Id / Cheque #', 'event_espresso'); ?></span></th>
+					<th><span class=""><?php _e('P.O. / S.O.#', 'event_espresso'); ?></span></th>
+					<th><span class=""><?php _e('Status', 'event_espresso'); ?></span></th>
+					<th><?php _e('Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -105,21 +105,21 @@ 
 			<tfoot>
 				<tr class='total_tr'>
 					<td colspan="4">&nbsp;</td>
-					<td class="item_r"><?php _e( 'Total Paid', 'event_espresso' ) ?></td>
+					<td class="item_r"><?php _e('Total Paid', 'event_espresso') ?></td>
 					<td class="item_r">[TOTAL_AMOUNT_PAID]</td>
 				</tr>
 				<tr class="total_tr odd">
 					<td colspan="4">&nbsp;</td>
-					<td class="total" id="total_currency"><?php _e( 'Amount Owed:', 'event_espresso' ); ?></td>
+					<td class="total" id="total_currency"><?php _e('Amount Owed:', 'event_espresso'); ?></td>
 					<td class="total">[TOTAL_OWING]</td>
 				</tr>
 			</tfoot>
 		</table>
 	</div>
 	<div class="additional-info-dv">
-		<h3 class="section-title"><?php _e( "Additional Information:", "event_espresso" ); ?></h3>
+		<h3 class="section-title"><?php _e("Additional Information:", "event_espresso"); ?></h3>
 		<div class="additional-info">
-			<h2><?php _e( "Venue Details:", "event_espresso" ); ?></h2>
+			<h2><?php _e("Venue Details:", "event_espresso"); ?></h2>
 			<table class="venue-list">
 				<tr class="venue-details">
 					<td class="venue-details-part venue-address-dv">
@@ -131,7 +131,7 @@ 
 					<td class="venue-details-part venue-image-dv">[GOOGLE_MAP_IMAGE]</td>
 				</tr>
 			</table>
-			<?php echo \EEH_Template::powered_by_event_espresso( 'aln-cntr' ); ?>
+			<?php echo \EEH_Template::powered_by_event_espresso('aln-cntr'); ?>
 		</div>
 	</div>
 </div>

core/admin/EE_Admin.core.php

Spacing +143 added lines, -143 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if (  ! self::$_instance instanceof EE_Admin ) {
+		if ( ! self::$_instance instanceof EE_Admin) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -57,30 +57,30 @@ 
 		// define global EE_Admin constants
 		$this->_define_all_constants();
 		// set autoloaders for our admin page classes based on included path information
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_ADMIN );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_ADMIN);
 		// admin hooks
-		add_filter( 'plugin_action_links', array( $this, 'filter_plugin_actions' ), 10, 2 );
+		add_filter('plugin_action_links', array($this, 'filter_plugin_actions'), 10, 2);
 		// load EE_Request_Handler early
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'get_request' ));
-		add_action( 'AHEE__EE_System__initialize_last', array( $this, 'init' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'get_request'));
+		add_action('AHEE__EE_System__initialize_last', array($this, 'init'));
 		// post shortcode tracking
 		add_action(
 			'AHEE__EE_System__initialize_last',
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'set_hooks_admin' )
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'set_hooks_admin')
 		);
-		add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'route_admin_request' ), 100, 2 );
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 100 );
-		add_action( 'admin_init', array( $this, 'admin_init' ), 100 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ), 20 );
-		add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_action( 'network_admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_filter( 'pre_update_option', array( $this, 'check_for_invalid_datetime_formats' ), 100, 2 );
-		add_filter('admin_footer_text', array( $this, 'espresso_admin_footer' ));
+		add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'route_admin_request'), 100, 2);
+		add_action('wp_loaded', array($this, 'wp_loaded'), 100);
+		add_action('admin_init', array($this, 'admin_init'), 100);
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'), 20);
+		add_action('admin_notices', array($this, 'display_admin_notices'), 10);
+		add_action('network_admin_notices', array($this, 'display_admin_notices'), 10);
+		add_filter('pre_update_option', array($this, 'check_for_invalid_datetime_formats'), 100, 2);
+		add_filter('admin_footer_text', array($this, 'espresso_admin_footer'));
 
 		//reset Environment config (we only do this on admin page loads);
 		EE_Registry::instance()->CFG->environment->recheck_values();
 
-		do_action( 'AHEE__EE_Admin__loaded' );
+		do_action('AHEE__EE_Admin__loaded');
 	}
 
 
@@ -95,11 +95,11 @@ 
 	 * @return void
 	 */
 	private function _define_all_constants() {
-		define( 'EE_ADMIN_URL', EE_PLUGIN_DIR_URL . 'core/admin/' );
-		define( 'EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL . 'admin_pages/' );
-		define( 'EE_ADMIN_TEMPLATE', EE_ADMIN . 'templates' . DS );
-		define( 'WP_ADMIN_PATH', ABSPATH . 'wp-admin/' );
-		define( 'WP_AJAX_URL', admin_url( 'admin-ajax.php' ));
+		define('EE_ADMIN_URL', EE_PLUGIN_DIR_URL.'core/admin/');
+		define('EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL.'admin_pages/');
+		define('EE_ADMIN_TEMPLATE', EE_ADMIN.'templates'.DS);
+		define('WP_ADMIN_PATH', ABSPATH.'wp-admin/');
+		define('WP_AJAX_URL', admin_url('admin-ajax.php'));
 	}
 
 
@@ -112,23 +112,23 @@ 
 	 * @param 	string 	$plugin
 	 * @return 	array
 	 */
-	public function filter_plugin_actions( $links, $plugin ) {
+	public function filter_plugin_actions($links, $plugin) {
 		// set $main_file in stone
 		static $main_file;
 		// if $main_file is not set yet
-		if ( ! $main_file ) {
-			$main_file = plugin_basename( EVENT_ESPRESSO_MAIN_FILE );
+		if ( ! $main_file) {
+			$main_file = plugin_basename(EVENT_ESPRESSO_MAIN_FILE);
 		}
-		 if ( $plugin === $main_file ) {
+		 if ($plugin === $main_file) {
 		 	// compare current plugin to this one
-			if ( EE_Maintenance_Mode::instance()->level() === EE_Maintenance_Mode::level_2_complete_maintenance ) {
-				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">' . __('Maintenance Mode Active', 'event_espresso' ) . '</a>';
-				array_unshift( $links, $maintenance_link );
+			if (EE_Maintenance_Mode::instance()->level() === EE_Maintenance_Mode::level_2_complete_maintenance) {
+				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">'.__('Maintenance Mode Active', 'event_espresso').'</a>';
+				array_unshift($links, $maintenance_link);
 			} else {
-				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">' . __( 'Settings', 'event_espresso' ) . '</a>';
-				$events_link = '<a href="admin.php?page=espresso_events">' . __( 'Events', 'event_espresso' ) . '</a>';
+				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">'.__('Settings', 'event_espresso').'</a>';
+				$events_link = '<a href="admin.php?page=espresso_events">'.__('Events', 'event_espresso').'</a>';
 				// add before other links
-				array_unshift( $links, $org_settings_link, $events_link );
+				array_unshift($links, $org_settings_link, $events_link);
 			}
 		}
 		return $links;
@@ -143,8 +143,8 @@ 
 	 *	@return void
 	 */
 	public function get_request() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_core('CPT_Strategy');
 	}
 
 
@@ -156,11 +156,11 @@ 
 	 * @param array $admin_page_folder_names
 	 * @return array
 	 */
-	public function hide_admin_pages_except_maintenance_mode( $admin_page_folder_names = array() ){
+	public function hide_admin_pages_except_maintenance_mode($admin_page_folder_names = array()) {
 		return array(
-			'maintenance' => EE_ADMIN_PAGES . 'maintenance' . DS,
-			'about' => EE_ADMIN_PAGES . 'about' . DS,
-			'support' => EE_ADMIN_PAGES . 'support' . DS
+			'maintenance' => EE_ADMIN_PAGES.'maintenance'.DS,
+			'about' => EE_ADMIN_PAGES.'about'.DS,
+			'support' => EE_ADMIN_PAGES.'support'.DS
 		);
 	}
 
@@ -174,31 +174,31 @@ 
 	*/
 	public function init() {
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
-		if ( EE_Maintenance_Mode::instance()->models_can_query() ){
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			//ok so we want to enable the entire admin
-			add_action( 'wp_ajax_dismiss_ee_nag_notice', array( $this, 'dismiss_ee_nag_notice_callback' ));
-			add_action( 'admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
-			add_action( 'network_admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
+			add_action('wp_ajax_dismiss_ee_nag_notice', array($this, 'dismiss_ee_nag_notice_callback'));
+			add_action('admin_notices', array($this, 'get_persistent_admin_notices'), 9);
+			add_action('network_admin_notices', array($this, 'get_persistent_admin_notices'), 9);
 			//at a glance dashboard widget
-			add_filter( 'dashboard_glance_items', array( $this, 'dashboard_glance_items' ), 10 );
+			add_filter('dashboard_glance_items', array($this, 'dashboard_glance_items'), 10);
 			//filter for get_edit_post_link used on comments for custom post types
-			add_filter( 'get_edit_post_link', array( $this, 'modify_edit_post_link' ), 10, 2 );
+			add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 2);
 		}
 		// run the admin page factory but ONLY if we are doing an ee admin ajax request
-		if ( !defined('DOING_AJAX') || EE_ADMIN_AJAX ) {
+		if ( ! defined('DOING_AJAX') || EE_ADMIN_AJAX) {
 			try {
 				//this loads the controller for the admin pages which will setup routing etc
-				EE_Registry::instance()->load_core( 'Admin_Page_Loader' );
-			} catch ( EE_Error $e ) {
+				EE_Registry::instance()->load_core('Admin_Page_Loader');
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
-		add_filter( 'content_save_pre', array( $this, 'its_eSpresso' ), 10, 1 );
+		add_filter('content_save_pre', array($this, 'its_eSpresso'), 10, 1);
 		//make sure our CPTs and custom taxonomy metaboxes get shown for first time users
-		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes' ), 10 );
-		add_action('admin_head', array( $this, 'register_custom_nav_menu_boxes' ), 10 );
+		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes'), 10);
+		add_action('admin_head', array($this, 'register_custom_nav_menu_boxes'), 10);
 		//exclude EE critical pages from all nav menus and wp_list_pages
-		add_filter('nav_menu_meta_box_object', array( $this, 'remove_pages_from_nav_menu'), 10 );
+		add_filter('nav_menu_meta_box_object', array($this, 'remove_pages_from_nav_menu'), 10);
 	}
 
 
@@ -211,9 +211,9 @@ 
 	 * @param  object $post_type WP post type object
 	 * @return object            WP post type object
 	 */
-	public function remove_pages_from_nav_menu( $post_type ) {
+	public function remove_pages_from_nav_menu($post_type) {
 		//if this isn't the "pages" post type let's get out
-		if ( $post_type->name !== 'page' ) {
+		if ($post_type->name !== 'page') {
 			return $post_type;
 		}
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
@@ -233,28 +233,28 @@ 
 	 */
 	public function enable_hidden_ee_nav_menu_metaboxes() {
 		global $wp_meta_boxes, $pagenow;
-		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' ) {
+		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php') {
 			return;
 		}
 		$user = wp_get_current_user();
 		//has this been done yet?
-		if ( get_user_option( 'ee_nav_menu_initialized', $user->ID ) ) {
+		if (get_user_option('ee_nav_menu_initialized', $user->ID)) {
 			return;
 		}
 
-		$hidden_meta_boxes = get_user_option( 'metaboxhidden_nav-menus', $user->ID );
-		$initial_meta_boxes = apply_filters( 'FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page' ) );
+		$hidden_meta_boxes = get_user_option('metaboxhidden_nav-menus', $user->ID);
+		$initial_meta_boxes = apply_filters('FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array('nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page'));
 
-		if ( is_array( $hidden_meta_boxes ) ) {
-			foreach ( $hidden_meta_boxes as $key => $meta_box_id ) {
-				if ( in_array( $meta_box_id, $initial_meta_boxes ) ) {
-					unset( $hidden_meta_boxes[ $key ] );
+		if (is_array($hidden_meta_boxes)) {
+			foreach ($hidden_meta_boxes as $key => $meta_box_id) {
+				if (in_array($meta_box_id, $initial_meta_boxes)) {
+					unset($hidden_meta_boxes[$key]);
 				}
 			}
 		}
 
-		update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
-		update_user_option( $user->ID, 'ee_nav_menu_initialized', 1, true );
+		update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
+		update_user_option($user->ID, 'ee_nav_menu_initialized', 1, true);
 	}
 
 
@@ -273,7 +273,7 @@ 
 	 * @return void
 	 */
 	public function register_custom_nav_menu_boxes() {
-		add_meta_box( 'add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array( $this, 'ee_cpt_archive_pages' ), 'nav-menus', 'side', 'core' );
+		add_meta_box('add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array($this, 'ee_cpt_archive_pages'), 'nav-menus', 'side', 'core');
 	}
 
 
@@ -289,16 +289,16 @@ 
 	 *
 	 * @return string  the (maybe) modified link
 	 */
-	public function modify_edit_post_link( $link, $id ) {
-		if ( ! $post = get_post( $id ) ){
+	public function modify_edit_post_link($link, $id) {
+		if ( ! $post = get_post($id)) {
 			return $link;
 		}
-		if ( $post->post_type === 'espresso_attendees' ) {
+		if ($post->post_type === 'espresso_attendees') {
 			$query_args = array(
 				'action' => 'edit_attendee',
 				'post' => $id
 			);
-			return EEH_URL::add_query_args_and_nonce( $query_args, admin_url('admin.php?page=espresso_registrations') );
+			return EEH_URL::add_query_args_and_nonce($query_args, admin_url('admin.php?page=espresso_registrations'));
 		}
 		return $link;
 	}
@@ -310,7 +310,7 @@ 
 		global $nav_menu_selected_id;
 
 		$db_fields = false;
-		$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+		$walker = new Walker_Nav_Menu_Checklist($db_fields);
 		$current_tab = 'event-archives';
 
 		/*if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
@@ -329,9 +329,9 @@ 
 		?>
 		<div id="posttype-extra-nav-menu-pages" class="posttypediv">
 			<ul id="posttype-extra-nav-menu-pages-tabs" class="posttype-tabs add-menu-item-tabs">
-				<li <?php echo ( 'event-archives' === $current_tab ? ' class="tabs"' : '' ); ?>>
-					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) {echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args)));} ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
-						<?php _e( 'Event Archive Pages', 'event_espresso' ); ?>
+				<li <?php echo ('event-archives' === $current_tab ? ' class="tabs"' : ''); ?>>
+					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ($nav_menu_selected_id) {echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); } ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
+						<?php _e('Event Archive Pages', 'event_espresso'); ?>
 					</a>
 				</li>
 			<?php /* // temporarily removing but leaving skeleton in place in case we ever decide to add more tabs.
@@ -349,13 +349,13 @@ 
  			<?php */ ?>
 
 			<div id="tabs-panel-posttype-extra-nav-menu-pages-event-archives" class="tabs-panel <?php
-			echo ( 'event-archives' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('event-archives' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 			?>">
 				<ul id="extra-nav-menu-pageschecklist-event-archives" class="categorychecklist form-no-clear">
 					<?php
 					$pages = $this->_get_extra_nav_menu_pages_items();
 					$args['walker'] = $walker;
-					echo walk_nav_menu_tree( array_map( array( $this, '_setup_extra_nav_menu_pages_items' ), $pages), 0, (object) $args );
+					echo walk_nav_menu_tree(array_map(array($this, '_setup_extra_nav_menu_pages_items'), $pages), 0, (object) $args);
 					?>
 				</ul>
 			</div><!-- /.tabs-panel -->
@@ -363,18 +363,18 @@ 
 			<p class="button-controls">
 				<span class="list-controls">
 					<a href="<?php
-						echo esc_url( add_query_arg(
+						echo esc_url(add_query_arg(
 							array(
 								'extra-nav-menu-pages-tab' => 'event-archives',
 								'selectall' => 1,
 							),
-							remove_query_arg( $removed_args )
+							remove_query_arg($removed_args)
 						));
 					?>#posttype-extra-nav-menu-pages>" class="select-all"><?php _e('Select All'); ?></a>
 				</span>
 
 				<span class="add-to-menu">
-					<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( __( 'Add to Menu' ) ); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e( 'submit-posttype-extra-nav-menu-pages' ); ?>" />
+					<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e(__('Add to Menu')); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e('submit-posttype-extra-nav-menu-pages'); ?>" />
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -395,10 +395,10 @@ 
 	private function _get_extra_nav_menu_pages_items() {
 		$menuitems[] = array(
 			'title' => __('Event List', 'event_espresso'),
-			'url' => get_post_type_archive_link( 'espresso_events' ),
+			'url' => get_post_type_archive_link('espresso_events'),
 			'description' => __('Archive page for all events.', 'event_espresso')
 		);
-		return apply_filters( 'FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems );
+		return apply_filters('FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems);
 	}
 
 
@@ -410,7 +410,7 @@ 
 	 * @param $menu_item_values
 	 * @return stdClass
 	 */
-	private function _setup_extra_nav_menu_pages_items( $menu_item_values ) {
+	private function _setup_extra_nav_menu_pages_items($menu_item_values) {
 		$menu_item = new stdClass();
 		$keys = array(
 			'ID' => 0,
@@ -430,8 +430,8 @@ 
 			'xfn' => ''
 		);
 
-		foreach ( $keys as $key => $value) {
-			$menu_item->{$key} = isset( $menu_item_values[ $key]) ? $menu_item_values[ $key] : $value;
+		foreach ($keys as $key => $value) {
+			$menu_item->{$key} = isset($menu_item_values[$key]) ? $menu_item_values[$key] : $value;
 		}
 		return $menu_item;
 	}
@@ -470,9 +470,9 @@ 
 		 * - check if doing post processing of one of EE CPTs
 		 * - instantiate the corresponding EE CPT model for the post_type being processed.
 		 */
-		if ( isset( $_POST['action'], $_POST['post_type'] ) && $_POST['action'] === 'editpost' ) {
-			EE_Registry::instance()->load_core( 'Register_CPTs' );
-			EE_Register_CPTs::instantiate_cpt_models( $_POST['post_type'] );
+		if (isset($_POST['action'], $_POST['post_type']) && $_POST['action'] === 'editpost') {
+			EE_Registry::instance()->load_core('Register_CPTs');
+			EE_Register_CPTs::instantiate_cpt_models($_POST['post_type']);
 		}
 
 
@@ -481,8 +481,8 @@ 
 		 * 'options-reading.php' core WordPress admin settings page.  This is for user-proofing.
 		 */
 		global $pagenow;
-		if ( $pagenow === 'options-reading.php' ) {
-			add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) );
+		if ($pagenow === 'options-reading.php') {
+			add_filter('wp_dropdown_pages', array($this, 'modify_dropdown_pages'));
 		}
 
 	}
@@ -494,25 +494,25 @@ 
 	 * @param string $output  Current output.
 	 * @return string
 	 */
-	public function modify_dropdown_pages( $output ) {
+	public function modify_dropdown_pages($output) {
 		//get critical pages
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
 
 		//split current output by line break for easier parsing.
-		$split_output = explode( "\n", $output );
+		$split_output = explode("\n", $output);
 
 		//loop through to remove any critical pages from the array.
-		foreach ( $critical_pages as $page_id ) {
-			$needle = 'value="' . $page_id . '"';
-			foreach( $split_output as $key => $haystack ) {
-				if( strpos( $haystack, $needle ) !== false ) {
-					unset( $split_output[$key] );
+		foreach ($critical_pages as $page_id) {
+			$needle = 'value="'.$page_id.'"';
+			foreach ($split_output as $key => $haystack) {
+				if (strpos($haystack, $needle) !== false) {
+					unset($split_output[$key]);
 				}
 			}
 		}
 
 		//replace output with the new contents
-		return implode( "\n", $split_output );
+		return implode("\n", $split_output);
 	}
 
 
@@ -526,36 +526,36 @@ 
 	public function enqueue_admin_scripts() {
 		// this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
 		// Note: the intention of this script is to only do TARGETED injections.  I.E, only injecting on certain script calls.
-		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL.'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		// register cookie script for future dependencies
-		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE );
+		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL.'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE);
 		// jquery_validate loading is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+		if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 			// register jQuery Validate
-			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
+			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
 		}
 		//joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again vai: add_filter('FHEE_load_joyride', '__return_true' );
-		if ( apply_filters( 'FHEE_load_joyride', FALSE ) ) {
+		if (apply_filters('FHEE_load_joyride', FALSE)) {
 			//joyride style
-			wp_register_style('joyride-css', EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css', array(), '2.1');
-			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION );
-			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js', array(), '2.1', TRUE );
+			wp_register_style('joyride-css', EE_THIRD_PARTY_URL.'joyride/joyride-2.1.css', array(), '2.1');
+			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL.'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION);
+			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL.'joyride/modernizr.mq.js', array(), '2.1', TRUE);
 			//joyride JS
-			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE );
+			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL.'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE);
 			// wanna go for a joyride?
 			wp_enqueue_style('ee-joyride-css');
 			wp_enqueue_script('jquery-joyride');
 		}
 		//qtip is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtips', '__return_true' );
-		if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) {
+		if (apply_filters('FHEE_load_qtip', FALSE)) {
 			EEH_Qtip_Loader::instance()->register_and_enqueue();
 		}
 		//accounting.js library
 		// @link http://josscrowcroft.github.io/accounting.js/
-		if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) {
-			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', EE_THIRD_PARTY_URL . 'accounting/accounting.js', array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			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', EE_THIRD_PARTY_URL.'accounting/accounting.js', array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 			// array of settings to get converted to JSON array via wp_localize_script
 			$currency_config = array(
 				'currency' => array(
@@ -602,11 +602,11 @@ 
 	public function get_persistent_admin_notices() {
 		// http://www.example.com/wp-admin/admin.php?page=espresso_general_settings&action=critical_pages&critical_pages_nonce=2831ce0f30
 		$args = array(
-			'page' => EE_Registry::instance()->REQ->is_set( 'page' ) ? EE_Registry::instance()->REQ->get( 'page' ) : '',
-			'action' => EE_Registry::instance()->REQ->is_set( 'action' ) ? EE_Registry::instance()->REQ->get( 'action' ) : '',
+			'page' => EE_Registry::instance()->REQ->is_set('page') ? EE_Registry::instance()->REQ->get('page') : '',
+			'action' => EE_Registry::instance()->REQ->is_set('action') ? EE_Registry::instance()->REQ->get('action') : '',
 		);
-		$return_url = EE_Admin_Page::add_query_args_and_nonce( $args, EE_ADMIN_URL );
-		echo EE_Error::get_persistent_admin_notices( $return_url );
+		$return_url = EE_Admin_Page::add_query_args_and_nonce($args, EE_ADMIN_URL);
+		echo EE_Error::get_persistent_admin_notices($return_url);
 	}
 
 
@@ -627,26 +627,26 @@ 
 	 * @param $elements
 	 * @return array
 	 */
-	public function dashboard_glance_items( $elements ) {
+	public function dashboard_glance_items($elements) {
 		$events = EEM_Event::instance()->count();
-		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_events'), admin_url('admin.php') );
-		$items['events']['text'] = sprintf( _n( '%s Event', '%s Events', $events ), number_format_i18n( $events ) );
+		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events'), admin_url('admin.php'));
+		$items['events']['text'] = sprintf(_n('%s Event', '%s Events', $events), number_format_i18n($events));
 		$items['events']['title'] = __('Click to view all Events', 'event_espresso');
 		$registrations = EEM_Registration::instance()->count(
 			array(
 				array(
-					'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete )
+					'STS_ID' => array('!=', EEM_Registration::status_id_incomplete)
 				)
 			)
 		);
-		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_registrations' ), admin_url('admin.php') );
-		$items['registrations']['text'] = sprintf( _n( '%s Registration', '%s Registrations', $registrations ), number_format_i18n($registrations) );
+		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_registrations'), admin_url('admin.php'));
+		$items['registrations']['text'] = sprintf(_n('%s Registration', '%s Registrations', $registrations), number_format_i18n($registrations));
 		$items['registrations']['title'] = __('Click to view all registrations', 'event_espresso');
 
-		$items = apply_filters( 'FHEE__EE_Admin__dashboard_glance_items__items', $items );
+		$items = apply_filters('FHEE__EE_Admin__dashboard_glance_items__items', $items);
 
-		foreach ( $items as $type => $item_properties ) {
-			$elements[] = sprintf( '<a class="ee-dashboard-link-' . $type . '" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text'] );
+		foreach ($items as $type => $item_properties) {
+			$elements[] = sprintf('<a class="ee-dashboard-link-'.$type.'" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text']);
 		}
 		return $elements;
 	}
@@ -663,31 +663,31 @@ 
 	 * @throws EE_Error
 	 * @return    string
 	 */
-	public function check_for_invalid_datetime_formats( $value, $option ) {
+	public function check_for_invalid_datetime_formats($value, $option) {
 		// check for date_format or time_format
-		switch ( $option ) {
+		switch ($option) {
 			case 'date_format' :
-				$date_time_format = $value . ' ' . get_option('time_format');
+				$date_time_format = $value.' '.get_option('time_format');
 				break;
 			case 'time_format' :
-				$date_time_format = get_option('date_format') . ' ' . $value;
+				$date_time_format = get_option('date_format').' '.$value;
 				break;
 			default :
 				$date_time_format = FALSE;
 		}
 		// do we have a date_time format to check ?
-		if ( $date_time_format ) {
-			$error_msg = EEH_DTT_Helper::validate_format_string( $date_time_format );
+		if ($date_time_format) {
+			$error_msg = EEH_DTT_Helper::validate_format_string($date_time_format);
 
-			if ( is_array( $error_msg ) ) {
-				$msg = '<p>' . sprintf( __( 'The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso' ), date( $date_time_format ) , $date_time_format  ) . '</p><p><ul>';
+			if (is_array($error_msg)) {
+				$msg = '<p>'.sprintf(__('The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso'), date($date_time_format), $date_time_format).'</p><p><ul>';
 
 
-				foreach ( $error_msg as $error ) {
-					$msg .= '<li>' . $error . '</li>';
+				foreach ($error_msg as $error) {
+					$msg .= '<li>'.$error.'</li>';
 				}
 
-				$msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>';
+				$msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>';
 
 				// trigger WP settings error
 				add_settings_error(
@@ -697,7 +697,7 @@ 
 				);
 
 				// set format to something valid
-				switch ( $option ) {
+				switch ($option) {
 					case 'date_format' :
 						$value = 'F j, Y';
 						break;
@@ -719,8 +719,8 @@ 
 	 * @param $content
 	 * @return    string
 	 */
-	public function its_eSpresso( $content ) {
-		return str_replace( '[EXPRESSO_', '[ESPRESSO_', $content );
+	public function its_eSpresso($content) {
+		return str_replace('[EXPRESSO_', '[ESPRESSO_', $content);
 	}
 
 
@@ -732,7 +732,7 @@ 
 	 *  @return 	string
 	 */
 	public function espresso_admin_footer() {
-		return \EEH_Template::powered_by_event_espresso( 'aln-cntr' );
+		return \EEH_Template::powered_by_event_espresso('aln-cntr');
 	}
 
 
@@ -751,12 +751,12 @@ 
 	 * @param array $config
 	 * @return void
 	 */
-	public static function register_ee_admin_page( $page_basename, $page_path, $config = array() ) {
-		EE_Error::doing_it_wrong( __METHOD__, sprintf( __('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3' );
-		if ( class_exists( 'EE_Register_Admin_Page' ) ) {
+	public static function register_ee_admin_page($page_basename, $page_path, $config = array()) {
+		EE_Error::doing_it_wrong(__METHOD__, sprintf(__('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3');
+		if (class_exists('EE_Register_Admin_Page')) {
 			$config['page_path'] = $page_path;
 		}
-		EE_Register_Admin_Page::register( $page_basename, $config );
+		EE_Register_Admin_Page::register($page_basename, $config);
 
 	}
 
@@ -769,7 +769,7 @@ 
 	 * @param  \WP_Post $post
 	 * @return void
 	 */
-	public static function parse_post_content_on_save( $post_ID, $post ) {
+	public static function parse_post_content_on_save($post_ID, $post) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			__(
@@ -778,7 +778,7 @@ 
 			),
 			'4.8.41'
 		);
-		EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save( $post_ID, $post );
+		EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save($post_ID, $post);
 	}
 
 
@@ -791,7 +791,7 @@ 
 	 * @param  $value
 	 * @return void
 	 */
-	public function reset_page_for_posts_on_change( $option, $old_value, $value ) {
+	public function reset_page_for_posts_on_change($option, $old_value, $value) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			__(
@@ -800,7 +800,7 @@ 
 			),
 			'4.8.41'
 		);
-		EventEspresso\core\admin\PostShortcodeTracking::reset_page_for_posts_on_change( $option, $old_value, $value );
+		EventEspresso\core\admin\PostShortcodeTracking::reset_page_for_posts_on_change($option, $old_value, $value);
 	}
 
 }

core/EE_Config.core.php

Spacing +391 added lines, -391 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -121,7 +121,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;
@@ -141,20 +141,20 @@ 
 	 *                               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->_addon_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->update_addon_option_names();
 		}
 		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 {
 			return null;
@@ -169,7 +169,7 @@ 
 	 * @access    private
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Config__construct__begin', $this );
+		do_action('AHEE__EE_Config__construct__begin', $this);
 		// setup empty config classes
 		$this->_initialize_config();
 		// load existing EE site settings
@@ -179,17 +179,17 @@ 
 		//  register shortcodes and modules
 		add_action(
 			'AHEE__EE_System__register_shortcodes_modules_and_widgets',
-			array( $this, 'register_shortcodes_and_modules' ),
+			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';
 	}
@@ -202,7 +202,7 @@ 
 	 * @return string current theme set.
 	 */
 	public static function get_current_theme() {
-		return isset( self::$_instance->template_settings->current_espresso_theme )
+		return isset(self::$_instance->template_settings->current_espresso_theme)
 			? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
 	}
 
@@ -217,7 +217,7 @@ 
 	private function _initialize_config() {
 		EE_Config::trim_log();
 		//set defaults
-		$this->_addon_option_names = get_option( EE_Config::ADDON_OPTION_NAMES, array() );
+		$this->_addon_option_names = get_option(EE_Config::ADDON_OPTION_NAMES, array());
 		$this->addons = new stdClass();
 		// set _module_route_map
 		EE_Config::$_module_route_map = array();
@@ -237,9 +237,9 @@ 
 	 */
 	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',
@@ -247,22 +247,22 @@ 
 				$config,
 				$this
 			);
-			if ( is_object( $settings ) && property_exists( $this, $config ) ) {
-				$this->{$config} = apply_filters( 'FHEE__EE_Config___load_core_config__' . $config, $settings );
+			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);
 	}
 
 
@@ -277,23 +277,23 @@ 
 		$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 = 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 = 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();
@@ -304,15 +304,15 @@ 
 		$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);
 	}
 
 
@@ -327,7 +327,7 @@ 
 		// grab espresso configuration
 		return apply_filters(
 			'FHEE__EE_Config__get_espresso_config__CFG',
-			get_option( EE_Config::OPTION_NAME, array() )
+			get_option(EE_Config::OPTION_NAME, array())
 		);
 	}
 
@@ -341,12 +341,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::OPTION_NAME ) {
+		if ($option === EE_Config::OPTION_NAME) {
 			// 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 (ie: NOT type safe comparison)
-			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,
@@ -361,7 +361,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'));
 			}
 		}
 	}
@@ -375,11 +375,11 @@ 
 	 */
 	protected function _reset_espresso_addon_config() {
 		$this->_addon_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;
 		}
@@ -395,22 +395,22 @@ 
 	 * @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) {
 		// don't allow config updates during WP heartbeats
-		if ( \EE_Registry::instance()->REQ->get( 'action', '' ) === 'heartbeat' ) {
+		if (\EE_Registry::instance()->REQ->get('action', '') === 'heartbeat') {
 			return false;
 		}
 		// 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::OPTION_NAME, $this );
-		EE_Config::log( EE_Config::OPTION_NAME );
+		$saved = update_option(EE_Config::OPTION_NAME, $this);
+		EE_Config::log(EE_Config::OPTION_NAME);
 		// 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,
@@ -421,17 +421,17 @@ 
 		// 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__
@@ -439,9 +439,9 @@ 
 			}
 			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__
@@ -470,16 +470,16 @@ 
 		$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(
 										__(
@@ -495,11 +495,11 @@ 
 						break;
 					// 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' ),
+										__('The "%s" configuration section does not exist.', 'event_espresso'),
 										$section
 									)
 								);
@@ -510,9 +510,9 @@ 
 					// 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(
 										__(
@@ -528,8 +528,8 @@ 
 						break;
 					// 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.',
@@ -542,8 +542,8 @@ 
 						break;
 					// 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.',
@@ -556,8 +556,8 @@ 
 						break;
 					// 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(
 										__(
@@ -573,11 +573,11 @@ 
 						break;
 					// 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
 									)
@@ -586,13 +586,13 @@ 
 							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(
 										__(
@@ -610,12 +610,12 @@ 
 						break;
 					// 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)
 									)
 								);
 							}
@@ -624,7 +624,7 @@ 
 						break;
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		// you have successfully run the gauntlet
@@ -641,8 +641,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));
 	}
 
 
@@ -656,10 +656,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';
 	}
 
 
@@ -674,36 +674,36 @@ 
 	 * @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->_addon_option_names[ $config_option_name ] ) ) {
-			$this->_addon_option_names[ $config_option_name ] = $config_class;
+		if ( ! isset($this->_addon_option_names[$config_option_name])) {
+			$this->_addon_option_names[$config_option_name] = $config_class;
 			$this->update_addon_option_names();
 		}
 		// 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 ) ) {
-			EE_Config::log( $config_option_name );
-			update_option( $config_option_name, $config_obj );
+		if (get_option($config_option_name)) {
+			EE_Config::log($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__
@@ -726,46 +726,46 @@ 
 	 * @param    bool                  $throw_errors
 	 * @return    bool
 	 */
-	public function update_config( $section = '', $name = '', $config_obj = '', $throw_errors = true ) {
+	public function update_config($section = '', $name = '', $config_obj = '', $throw_errors = true) {
 		// don't allow config updates during WP heartbeats
-		if ( \EE_Registry::instance()->REQ->get( 'action', '' ) === 'heartbeat' ) {
+		if (\EE_Registry::instance()->REQ->get('action', '') === 'heartbeat') {
 			return false;
 		}
-		$config_obj = maybe_unserialize( $config_obj );
+		$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 )
+			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->_addon_option_names array
-		if ( ! isset( $this->_addon_option_names[ $config_option_name ] ) ) {
+		if ( ! isset($this->_addon_option_names[$config_option_name])) {
 			// save new config to db
-			if( $this->set_config( $section, $name, $config_class, $config_obj ) ) {
+			if ($this->set_config($section, $name, $config_class, $config_obj)) {
 				return true;
 			}
 		} 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 (NOT type safe comparison)
-			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 ) ) {
-				EE_Config::log( $config_option_name );
+			} else if (update_option($config_option_name, $config_obj)) {
+				EE_Config::log($config_option_name);
 				// 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(
 						__(
@@ -773,7 +773,7 @@ 
 							'event_espresso'
 						),
 						$config_class,
-						'EE_Config->' . $section . '->' . $name
+						'EE_Config->'.$section.'->'.$name
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -795,34 +795,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__
@@ -840,11 +840,11 @@ 
 	 * @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.
-		$config_option = maybe_unserialize( get_option( $config_option_name, array() ) );
-		if ( empty( $config_option ) ) {
-			EE_Config::log( $config_option_name . '-NOT-FOUND' );
+		$config_option = maybe_unserialize(get_option($config_option_name, array()));
+		if (empty($config_option)) {
+			EE_Config::log($config_option_name.'-NOT-FOUND');
 		}
 		return $config_option;
 	}
@@ -856,17 +856,17 @@ 
 	 *
 	 * @param string $config_option_name
 	 */
-	public static function log( $config_option_name = '' ) {
-		if ( ! empty( $config_option_name ) ) {
-			$config_log = get_option( EE_Config::LOG_NAME, array() );
+	public static function log($config_option_name = '') {
+		if ( ! empty($config_option_name)) {
+			$config_log = get_option(EE_Config::LOG_NAME, array());
 			//copy incoming $_REQUEST and sanitize it so we can save it
 			$_request = $_REQUEST;
-			array_walk_recursive( $_request, 'sanitize_text_field' );
-			$config_log[ (string) microtime( true ) ] = array(
+			array_walk_recursive($_request, 'sanitize_text_field');
+			$config_log[(string) microtime(true)] = array(
 				'config_name' => $config_option_name,
 				'request'     => $_request,
 			);
-			update_option( EE_Config::LOG_NAME, $config_log );
+			update_option(EE_Config::LOG_NAME, $config_log);
 		}
 	}
 
@@ -877,12 +877,12 @@ 
 	 * reduces the size of the config log to the length specified by EE_Config::LOG_LENGTH
 	 */
 	public static function trim_log() {
-		$config_log = get_option( EE_Config::LOG_NAME, array() );
-		$log_length = count( $config_log );
-		if ( $log_length > EE_Config::LOG_LENGTH ) {
-			ksort( $config_log );
-			$config_log = array_slice( $config_log, $log_length - EE_Config::LOG_LENGTH, null, true );
-			update_option( EE_Config::LOG_NAME, $config_log );
+		$config_log = get_option(EE_Config::LOG_NAME, array());
+		$log_length = count($config_log);
+		if ($log_length > EE_Config::LOG_LENGTH) {
+			ksort($config_log);
+			$config_log = array_slice($config_log, $log_length - EE_Config::LOG_LENGTH, null, true);
+			update_option(EE_Config::LOG_NAME, $config_log);
 		}
 	}
 
@@ -897,14 +897,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));
 	}
 
 
@@ -960,17 +960,17 @@ 
 			)
 		) {
 			// 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
 			);
-			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
@@ -990,57 +990,57 @@ 
 	 * @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'
 				),
 				$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;
 	}
 
 
@@ -1053,17 +1053,17 @@ 
 	 */
 	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 ) ) {
+		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
@@ -1082,64 +1082,64 @@ 
 	 * @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 = 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'
 				),
 				$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 ) ) {
+		if ( ! class_exists($shortcode_class)) {
 			$msg = sprintf(
-				__( 'The requested %s shortcode class does not exist.', 'event_espresso' ),
+				__('The requested %s shortcode class does not exist.', 'event_espresso'),
 				$shortcode_class
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			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;
 	}
 
@@ -1153,22 +1153,22 @@ 
 	 */
 	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
 		);
-		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'
+					$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);
 				}
 			}
 		}
@@ -1188,39 +1188,39 @@ 
 	 * @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 ) ) {
+		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.',
@@ -1228,19 +1228,19 @@ 
 				),
 				$module
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			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;
+		EE_Registry::instance()->modules->{$module_class} = $module_path.$module_class.$module_ext;
 		do_action(
 			'AHEE__EE_Config__register_module__complete',
 			$module_class,
@@ -1260,26 +1260,26 @@ 
 	 */
 	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' )
+					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'));
 				}
 			}
 		}
@@ -1296,17 +1296,17 @@ 
 	 */
 	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' )
+					array($module_class, 'set_hooks')
 				);
 			}
 		}
@@ -1324,29 +1324,29 @@ 
 	 * @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 ) ) {
+		if ( ! method_exists('EED_'.$module, $method_name)) {
 			$msg = sprintf(
-				__( 'A valid class method for the %s route has not been supplied.', 'event_espresso' ),
+				__('A valid class method for the %s route has not been supplied.', 'event_espresso'),
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			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;
 	}
 
@@ -1360,11 +1360,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 = (string) 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 = (string) 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;
 	}
@@ -1394,49 +1394,49 @@ 
 	 * @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 ) ) {
+	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' ),
+				__('The module route %s for this forward has not been registered.', 'event_espresso'),
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			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] ) ) {
+		if (is_array($forward)) {
+			if ( ! isset($forward[1])) {
 				$msg = sprintf(
-					__( 'A class method for the %s forwarding route has not been supplied.', 'event_espresso' ),
+					__('A class method for the %s forwarding route has not been supplied.', 'event_espresso'),
 					$route
 				);
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
-			if ( ! method_exists( $forward[0], $forward[1] ) ) {
+			if ( ! method_exists($forward[0], $forward[1])) {
 				$msg = sprintf(
-					__( 'The class method %s for the %s forwarding route is in invalid.', 'event_espresso' ),
+					__('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__ );
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
-		} else if ( ! function_exists( $forward ) ) {
+		} else if ( ! function_exists($forward)) {
 			$msg = sprintf(
-				__( 'The function %s for the %s forwarding route is in invalid.', 'event_espresso' ),
+				__('The function %s for the %s forwarding route is in invalid.', 'event_espresso'),
 				$forward,
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			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;
 	}
 
@@ -1452,12 +1452,12 @@ 
 	 * @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 ] ) ) {
+	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 ],
+				EE_Config::$_module_forward_map[$key][$route][$status],
 				$route,
 				$status
 			);
@@ -1479,17 +1479,17 @@ 
 	 * @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 ) ) {
+	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' ),
+				__('The module route %s for this view has not been registered.', 'event_espresso'),
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! is_readable( $view ) ) {
+		if ( ! is_readable($view)) {
 			$msg = sprintf(
 				__(
 					'The %s view file could not be found or is not readable due to file permissions.',
@@ -1497,10 +1497,10 @@ 
 				),
 				$view
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			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;
 	}
 
@@ -1516,12 +1516,12 @@ 
 	 * @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 ] ) ) {
+	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 ],
+				EE_Config::$_module_view_map[$key][$route][$status],
 				$route,
 				$status
 			);
@@ -1532,7 +1532,7 @@ 
 
 
 	public function update_addon_option_names() {
-		update_option( EE_Config::ADDON_OPTION_NAMES, $this->_addon_option_names );
+		update_option(EE_Config::ADDON_OPTION_NAMES, $this->_addon_option_names);
 	}
 
 
@@ -1560,22 +1560,22 @@ 
 	 * @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 ) ) {
+	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 ),
+					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};
 	}
@@ -1584,17 +1584,17 @@ 
 
 	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 ( $this->{$property} === null ) {
+		foreach (get_object_vars($defaults) as $property => $value) {
+			if ($this->{$property} === null) {
 				$this->{$property} = $value;
 			}
 		}
 		//cleanup
-		unset( $defaults );
+		unset($defaults);
 	}
 
 
@@ -1610,7 +1610,7 @@ 
 	 * @param $a
 	 * @return bool
 	 */
-	public function __isset( $a ) {
+	public function __isset($a) {
 		return false;
 	}
 
@@ -1622,7 +1622,7 @@ 
 	 * @param $a
 	 * @return bool
 	 */
-	public function __unset( $a ) {
+	public function __unset($a) {
 		return false;
 	}
 
@@ -1732,7 +1732,7 @@ 
 		$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 = $this->_get_main_ee_ueip_optin();
-		$this->ee_ueip_has_notified = is_main_site() ? get_option( 'ee_ueip_has_notified', false ) : 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();
@@ -1748,9 +1748,9 @@ 
 		$this->thank_you_page_url = '';
 		$this->cancel_page_url = '';
 		//cpt slugs
-		$this->event_cpt_slug = __( 'events', 'event_espresso' );
+		$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;
 		}
@@ -1793,11 +1793,11 @@ 
 	 * @return    string
 	 */
 	public function reg_page_url() {
-		if ( ! $this->reg_page_url ) {
+		if ( ! $this->reg_page_url) {
 			$this->reg_page_url = add_query_arg(
-				array( 'uts' => time() ),
-				get_permalink( $this->reg_page_id )
-			) . '#checkout';
+				array('uts' => time()),
+				get_permalink($this->reg_page_id)
+			).'#checkout';
 		}
 		return $this->reg_page_url;
 	}
@@ -1812,12 +1812,12 @@ 
 	 * @access    public
 	 * @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 );
+	public function txn_page_url($query_args = array()) {
+		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 );
+		if ($query_args) {
+			return add_query_arg($query_args, $this->txn_page_url);
 		} else {
 			return $this->txn_page_url;
 		}
@@ -1833,12 +1833,12 @@ 
 	 * @access    public
 	 * @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 );
+	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 ( $query_args ) {
-			return add_query_arg( $query_args, $this->thank_you_page_url );
+		if ($query_args) {
+			return add_query_arg($query_args, $this->thank_you_page_url);
 		} else {
 			return $this->thank_you_page_url;
 		}
@@ -1853,8 +1853,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;
 	}
@@ -1883,22 +1883,22 @@ 
 	 */
 	protected function _get_main_ee_ueip_optin() {
 		//if this is the main site then we can just bypass our direct query.
-		if ( is_main_site() ) {
-			return get_option( 'ee_ueip_optin', false );
+		if (is_main_site()) {
+			return get_option('ee_ueip_optin', false);
 		}
 
 		//is this already cached for this request?  If so use it.
-		if ( ! empty( EE_Core_Config::$ee_ueip_option ) ) {
+		if ( ! empty(EE_Core_Config::$ee_ueip_option)) {
 			return EE_Core_Config::$ee_ueip_option;
 		}
 
 		global $wpdb;
 		$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;
 		$option = 'ee_ueip_optin';
 
 		//set correct table for query
-		$table_name = $wpdb->get_blog_prefix( $current_main_site_id ) . 'options';
+		$table_name = $wpdb->get_blog_prefix($current_main_site_id).'options';
 
 
 		//rather than getting blog option for the $current_main_site_id, we do a direct $wpdb query because
@@ -1906,20 +1906,20 @@ 
 		//re-constructed on the blog switch.  Note, we are still executing any core wp filters on this option retrieval.
 		//this bit of code is basically a direct copy of get_option without any caching because we are NOT switched to the blog
 		//for the purpose of caching.
-		$pre = apply_filters( 'pre_option_' . $option, false, $option );
-		if ( false !== $pre ) {
+		$pre = apply_filters('pre_option_'.$option, false, $option);
+		if (false !== $pre) {
 			EE_Core_Config::$ee_ueip_option = $pre;
 			return EE_Core_Config::$ee_ueip_option;
 		}
 
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $table_name WHERE option_name = %s LIMIT 1", $option ) );
-		if ( is_object( $row ) ) {
+		$row = $wpdb->get_row($wpdb->prepare("SELECT option_value FROM $table_name WHERE option_name = %s LIMIT 1", $option));
+		if (is_object($row)) {
 			$value = $row->option_value;
 		} else { //option does not exist so use default.
-			return apply_filters( 'default_option_' . $option, false, $option );
+			return apply_filters('default_option_'.$option, false, $option);
 		}
 
-		EE_Core_Config::$ee_ueip_option = apply_filters( 'option_' . $option, maybe_unserialize( $value ), $option );
+		EE_Core_Config::$ee_ueip_option = apply_filters('option_'.$option, maybe_unserialize($value), $option);
 		return EE_Core_Config::$ee_ueip_option;
 	}
 
@@ -1935,7 +1935,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));
 	}
 
 }
@@ -2082,14 +2082,14 @@ 
 	 */
 	public function __construct() {
 		// set default organization settings
-		$this->name = get_bloginfo( 'name' );
+		$this->name = get_bloginfo('name');
 		$this->address_1 = '123 Onna Road';
 		$this->address_2 = 'PO Box 123';
 		$this->city = 'Inna City';
 		$this->STA_ID = 4;
 		$this->CNT_ISO = 'US';
 		$this->zip = '12345';
-		$this->email = get_bloginfo( 'admin_email' );
+		$this->email = get_bloginfo('admin_email');
 		$this->phone = '';
 		$this->vat = '123456789';
 		$this->logo_url = '';
@@ -2176,44 +2176,44 @@ 
 	 * @access    public
 	 * @param string $CNT_ISO
 	 */
-	public function __construct( $CNT_ISO = '' ) {
+	public function __construct($CNT_ISO = '') {
 		// get country code from organization settings or use default
-		$ORG_CNT = isset( EE_Registry::instance()->CFG->organization )
+		$ORG_CNT = isset(EE_Registry::instance()->CFG->organization)
 		           && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config
 			? EE_Registry::instance()->CFG->organization->CNT_ISO
 			: '';
 		// but override if requested
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : $ORG_CNT;
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : $ORG_CNT;
 		// 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 )
+			! empty($CNT_ISO)
 			&& EE_Maintenance_Mode::instance()->models_can_query()
-			&& EEH_Activation::table_exists( EE_Registry::instance()->load_model( 'Country' )->table() )
+			&& 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
 		}
 	}
 }
@@ -2375,7 +2375,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'));
 	}
 
 
@@ -2384,7 +2384,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);
 	}
 
 
@@ -2488,10 +2488,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;
 	}
@@ -2502,10 +2502,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;
 	}
@@ -2516,7 +2516,7 @@ 
 	 * @return string
 	 */
 	public function affiliate_id() {
-		return ! empty( $this->affiliate_id ) ? $this->affiliate_id : 'default';
+		return ! empty($this->affiliate_id) ? $this->affiliate_id : 'default';
 	}
 
 
@@ -2696,21 +2696,21 @@ 
 		$this->use_google_maps = true;
 		$this->google_map_api_key = '';
 		// 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
 	}
 
 }
@@ -2863,7 +2863,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();
 	}
 
@@ -2882,10 +2882,10 @@ 
 	 * @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 )
+	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(
 				__(
@@ -2951,7 +2951,7 @@ 
 	 */
 	public function __construct() {
 		$this->payment_settings = array();
-		$this->active_gateways = array( 'Invoice' => false );
+		$this->active_gateways = array('Invoice' => false);
 	}
 }
 

core/helpers/EEH_Template.helper.php

Spacing +219 added lines, -219 removed lines

@@ -15,7 +15,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_get_template_part' )) {
+if ( ! function_exists('espresso_get_template_part')) {
 	/**
 	 * espresso_get_template_part
 	 * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files
@@ -25,14 +25,14 @@ 
 	 * @param string $name The name of the specialised template.
 	 * @return string        the html output for the formatted money value
 	 */
-	function espresso_get_template_part( $slug = NULL, $name = NULL ) {
-		EEH_Template::get_template_part( $slug, $name );
+	function espresso_get_template_part($slug = NULL, $name = NULL) {
+		EEH_Template::get_template_part($slug, $name);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_get_object_css_class' )) {
+if ( ! function_exists('espresso_get_object_css_class')) {
 	/**
 	 * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed
 	 *
@@ -42,8 +42,8 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	function espresso_get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
-		return EEH_Template::get_object_css_class( $object, $prefix, $suffix );
+	function espresso_get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
+		return EEH_Template::get_object_css_class($object, $prefix, $suffix);
 	}
 }
 
@@ -70,7 +70,7 @@ 
 	 * 	@return boolean
 	 */
 	public static function is_espresso_theme() {
-		return wp_get_theme()->get( 'TextDomain' ) == 'event_espresso' ? TRUE : FALSE;
+		return wp_get_theme()->get('TextDomain') == 'event_espresso' ? TRUE : FALSE;
 	}
 
 	/**
@@ -79,9 +79,9 @@ 
 	 * 	@return void
 	 */
 	public static function load_espresso_theme_functions() {
-		if ( ! defined( 'EE_THEME_FUNCTIONS_LOADED' )) {
-			if ( is_readable( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' )) {
-				require_once( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' );
+		if ( ! defined('EE_THEME_FUNCTIONS_LOADED')) {
+			if (is_readable(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php')) {
+				require_once(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php');
 			}
 		}
 	}
@@ -93,17 +93,17 @@ 
 	 * 	@return array
 	 */
 	public static function get_espresso_themes() {
-		if ( empty( EEH_Template::$_espresso_themes )) {
-			$espresso_themes =  glob( EE_PUBLIC . '*', GLOB_ONLYDIR );
-			if ( empty( $espresso_themes ) ) {
+		if (empty(EEH_Template::$_espresso_themes)) {
+			$espresso_themes = glob(EE_PUBLIC.'*', GLOB_ONLYDIR);
+			if (empty($espresso_themes)) {
 				return array();
 			}
-			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+			if (($key = array_search('global_assets', $espresso_themes)) !== FALSE) {
+			    unset($espresso_themes[$key]);
 			}
 			EEH_Template::$_espresso_themes = array();
-			foreach ( $espresso_themes as $espresso_theme ) {
-				EEH_Template::$_espresso_themes[ basename( $espresso_theme ) ] = $espresso_theme;
+			foreach ($espresso_themes as $espresso_theme) {
+				EEH_Template::$_espresso_themes[basename($espresso_theme)] = $espresso_theme;
 			}
 		}
 		return EEH_Template::$_espresso_themes;
@@ -122,16 +122,16 @@ 
 	 * @param bool   $return_string
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function get_template_part( $slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE  ) {
-		do_action( "get_template_part_{$slug}-{$name}", $slug, $name );
+	public static function get_template_part($slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE) {
+		do_action("get_template_part_{$slug}-{$name}", $slug, $name);
 		$templates = array();
 		$name = (string) $name;
-		if ( $name != '' ) {
+		if ($name != '') {
 			$templates[] = "{$slug}-{$name}.php";
 		}
 		// allow template parts to be turned off via something like: add_filter( 'FHEE__content_espresso_events_tickets_template__display_datetimes', '__return_false' );
-		if ( apply_filters( "FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE )) {
-			EEH_Template::locate_template( $templates, $template_args, TRUE, $return_string );
+		if (apply_filters("FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE)) {
+			EEH_Template::locate_template($templates, $template_args, TRUE, $return_string);
 		}
 	}
 
@@ -182,26 +182,26 @@ 
 	 * 				Used in places where you don't actually load the template, you just want to know if there's a custom version of it.
 	 * @return mixed
 	 */
-	public static function locate_template( $templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE ) {
+	public static function locate_template($templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE) {
 		// first use WP locate_template to check for template in the current theme folder
-		$template_path = locate_template( $templates );
+		$template_path = locate_template($templates);
 
-		if ( $check_if_custom && !empty( $template_path ) )
+		if ($check_if_custom && ! empty($template_path))
 			return TRUE;
 
 		// not in the theme
-		if ( empty( $template_path )) {
+		if (empty($template_path)) {
 			// not even a template to look for ?
-			if ( empty( $templates )) {
+			if (empty($templates)) {
 				// get post_type
-				$post_type = EE_Registry::instance()->REQ->get( 'post_type' );
+				$post_type = EE_Registry::instance()->REQ->get('post_type');
 				// get array of EE Custom Post Types
 				$EE_CPTs = EE_Register_CPTs::get_CPTs();
 				// build template name based on request
-				if ( isset( $EE_CPTs[ $post_type ] )) {
-					$archive_or_single =  is_archive() ? 'archive' : '';
-					$archive_or_single =  is_single() ? 'single' : $archive_or_single;
-					$templates = $archive_or_single . '-' . $post_type . '.php';
+				if (isset($EE_CPTs[$post_type])) {
+					$archive_or_single = is_archive() ? 'archive' : '';
+					$archive_or_single = is_single() ? 'single' : $archive_or_single;
+					$templates = $archive_or_single.'-'.$post_type.'.php';
 				}
 			}
 			// currently active EE template theme
@@ -210,81 +210,81 @@ 
 			// array of paths to folders that may contain templates
 			$template_folder_paths = array(
 				// first check the /wp-content/uploads/espresso/templates/(current EE theme)/  folder for an EE theme template file
-				EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme,
+				EVENT_ESPRESSO_TEMPLATE_DIR.$current_theme,
 				// then in the root of the /wp-content/uploads/espresso/templates/ folder
 				EVENT_ESPRESSO_TEMPLATE_DIR
 			);
 
 			//add core plugin folders for checking only if we're not $check_if_custom
-			if ( ! $check_if_custom ) {
+			if ( ! $check_if_custom) {
 				$core_paths = array(
 					// in the  /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin
-					EE_PUBLIC . $current_theme,
+					EE_PUBLIC.$current_theme,
 					// in the  /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin
-					EE_TEMPLATES . $current_theme,
+					EE_TEMPLATES.$current_theme,
 					// or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/
 					EE_PLUGIN_DIR_PATH
 					);
-				$template_folder_paths = array_merge( $template_folder_paths, $core_paths );
+				$template_folder_paths = array_merge($template_folder_paths, $core_paths);
 			}
 
 			// now filter that array
-			$template_folder_paths = apply_filters( 'FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths );
-			$templates = is_array( $templates ) ? $templates : array( $templates );
-			$template_folder_paths = is_array( $template_folder_paths ) ? $template_folder_paths : array( $template_folder_paths );
+			$template_folder_paths = apply_filters('FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths);
+			$templates = is_array($templates) ? $templates : array($templates);
+			$template_folder_paths = is_array($template_folder_paths) ? $template_folder_paths : array($template_folder_paths);
 			// array to hold all possible template paths
 			$full_template_paths = array();
 
 			// loop through $templates
-			foreach ( $templates as $template ) {
+			foreach ($templates as $template) {
 				// normalize directory separators
-				$template = EEH_File::standardise_directory_separators( $template );
-				$file_name = basename( $template );
-				$template_path_minus_file_name = substr( $template, 0, ( strlen( $file_name ) * -1 ) );
+				$template = EEH_File::standardise_directory_separators($template);
+				$file_name = basename($template);
+				$template_path_minus_file_name = substr($template, 0, (strlen($file_name) * -1));
 				// while looping through all template folder paths
-				foreach ( $template_folder_paths as $template_folder_path ) {
+				foreach ($template_folder_paths as $template_folder_path) {
 					// normalize directory separators
-					$template_folder_path = EEH_File::standardise_directory_separators( $template_folder_path );
+					$template_folder_path = EEH_File::standardise_directory_separators($template_folder_path);
 					// determine if any common base path exists between the two paths
 					$common_base_path = EEH_Template::_find_common_base_path(
-						array( $template_folder_path, $template_path_minus_file_name )
+						array($template_folder_path, $template_path_minus_file_name)
 					);
-					if ( $common_base_path !== '' ) {
+					if ($common_base_path !== '') {
 						// both paths have a common base, so just tack the filename onto our search path
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $file_name;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$file_name;
 					} else {
 						// no common base path, so let's just concatenate
-						$resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $template;
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$template;
 					}
 					// build up our template locations array by adding our resolved paths
 					$full_template_paths[] = $resolved_path;
 				}
 				// if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first
-				array_unshift( $full_template_paths, $template );
+				array_unshift($full_template_paths, $template);
 				// path to the directory of the current theme: /wp-content/themes/(current WP theme)/
-				array_unshift( $full_template_paths, get_stylesheet_directory() . DS . $file_name );
+				array_unshift($full_template_paths, get_stylesheet_directory().DS.$file_name);
 			}
 			// filter final array of full template paths
-			$full_template_paths = apply_filters( 'FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name );
+			$full_template_paths = apply_filters('FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name);
 			// now loop through our final array of template location paths and check each location
-			foreach ( (array)$full_template_paths as $full_template_path ) {
-				if ( is_readable( $full_template_path )) {
-					$template_path = str_replace( array( '\\', '/' ), DIRECTORY_SEPARATOR, $full_template_path );
+			foreach ((array) $full_template_paths as $full_template_path) {
+				if (is_readable($full_template_path)) {
+					$template_path = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $full_template_path);
 					// hook that can be used to display the full template path that will be used
-					do_action( 'AHEE__EEH_Template__locate_template__full_template_path', $template_path );
+					do_action('AHEE__EEH_Template__locate_template__full_template_path', $template_path);
 					break;
 				}
 			}
 		}
 		// if we got it and you want to see it...
-		if ( $template_path && $load && ! $check_if_custom  ) {
-			if ( $return_string ) {
-				return EEH_Template::display_template( $template_path, $template_args, TRUE );
+		if ($template_path && $load && ! $check_if_custom) {
+			if ($return_string) {
+				return EEH_Template::display_template($template_path, $template_args, TRUE);
 			} else {
-				EEH_Template::display_template( $template_path, $template_args, FALSE );
+				EEH_Template::display_template($template_path, $template_args, FALSE);
 			}
 		}
-		return $check_if_custom && ! empty( $template_path ) ? TRUE : $template_path;
+		return $check_if_custom && ! empty($template_path) ? TRUE : $template_path;
 	}
 
 
@@ -297,21 +297,21 @@ 
 	 * @param array $paths
 	 * @return string
 	 */
-	protected static function _find_common_base_path( $paths ) {
+	protected static function _find_common_base_path($paths) {
 		$last_offset = 0;
 		$common_base_path = '';
-		while ( ( $index = strpos( $paths[ 0 ], DS, $last_offset ) ) !== false ) {
+		while (($index = strpos($paths[0], DS, $last_offset)) !== false) {
 			$dir_length = $index - $last_offset + 1;
-			$directory = substr( $paths[ 0 ], $last_offset, $dir_length );
-			foreach ( $paths as $path ) {
-				if ( substr( $path, $last_offset, $dir_length ) != $directory ) {
+			$directory = substr($paths[0], $last_offset, $dir_length);
+			foreach ($paths as $path) {
+				if (substr($path, $last_offset, $dir_length) != $directory) {
 					return $common_base_path;
 				}
 			}
 			$common_base_path .= $directory;
 			$last_offset = $index + 1;
 		}
-		return substr( $common_base_path, 0, -1 );
+		return substr($common_base_path, 0, -1);
 	}
 
 
@@ -323,7 +323,7 @@ 
 	 * @param  boolean    $return_string whether to send output immediately to screen, or capture and return as a string
 	 * @return mixed string
 	 */
-	public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) {
+	public static function display_template($template_path = FALSE, $template_args = array(), $return_string = FALSE) {
 
 		/**
 		 * These two filters are intended for last minute changes to templates being loaded and/or template arg
@@ -334,26 +334,26 @@ 
 		 *
 		 * @since 4.6.0
 		 */
-		$template_path = apply_filters( 'FHEE__EEH_Template__display_template__template_path', $template_path );
-		$template_args = apply_filters( 'FHEE__EEH_Template__display_template__template_args', $template_args );
+		$template_path = apply_filters('FHEE__EEH_Template__display_template__template_path', $template_path);
+		$template_args = apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args);
 
 		// you gimme nuttin - YOU GET NUTTIN !!
-		if ( ! $template_path || ! is_readable( $template_path )) {
+		if ( ! $template_path || ! is_readable($template_path)) {
 			return '';
 		}
 		// if $template_args are not in an array, then make it so
-		if ( ! is_array( $template_args ) && ! is_object( $template_args )) {
-			$template_args = array( $template_args );
+		if ( ! is_array($template_args) && ! is_object($template_args)) {
+			$template_args = array($template_args);
 		}
-		extract( (array) $template_args);
+		extract((array) $template_args);
 
-		if ( $return_string ) {
+		if ($return_string) {
 			// because we want to return a string, we are going to capture the output
 			ob_start();
-			include( $template_path );
+			include($template_path);
 			return ob_get_clean();
 		} else {
-			include( $template_path );
+			include($template_path);
 		}
 		return '';
 	}
@@ -371,27 +371,27 @@ 
 	 * @param  string $suffix added to the end of the generated class
 	 * @return string
 	 */
-	public static function get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) {
+	public static function get_object_css_class($object = NULL, $prefix = '', $suffix = '') {
 		// in the beginning...
-		$prefix = ! empty( $prefix ) ? rtrim( $prefix, '-' ) . '-' : '';
+		$prefix = ! empty($prefix) ? rtrim($prefix, '-').'-' : '';
 		// da muddle
 		$class = '';
 		// the end
-		$suffix = ! empty( $suffix ) ? '-' . ltrim( $suffix, '-' ) : '';
+		$suffix = ! empty($suffix) ? '-'.ltrim($suffix, '-') : '';
 		// is the passed object an EE object ?
-		if ( $object instanceof EE_Base_Class ) {
+		if ($object instanceof EE_Base_Class) {
 			// grab the exact type of object
-			$obj_class = get_class( $object );
+			$obj_class = get_class($object);
 			// depending on the type of object...
-			switch ( $obj_class ) {
+			switch ($obj_class) {
 				// no specifics just yet...
 				default :
-					$class = strtolower( str_replace( '_', '-', $obj_class ));
-					$class .= method_exists( $obj_class, 'name' ) ? '-' . sanitize_title( $object->name() ) : '';
+					$class = strtolower(str_replace('_', '-', $obj_class));
+					$class .= method_exists($obj_class, 'name') ? '-'.sanitize_title($object->name()) : '';
 
 			}
 		}
-		return $prefix . $class . $suffix;
+		return $prefix.$class.$suffix;
 	}
 
 
@@ -407,54 +407,54 @@ 
 	 * @param string      $cur_code_span_class
 	 * @return string        the html output for the formatted money value
 	 */
-	public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' ) {
+	public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code') {
 		// ensure amount was received
-		if ( is_null( $amount ) ) {
-			$msg = __( 'In order to format currency, an amount needs to be passed.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_null($amount)) {
+			$msg = __('In order to format currency, an amount needs to be passed.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return '';
 		}
 		//ensure amount is float
-		$amount = apply_filters( 'FHEE__EEH_Template__format_currency__raw_amount', (float) $amount );
-		$CNT_ISO = apply_filters( 'FHEE__EEH_Template__format_currency__CNT_ISO', $CNT_ISO, $amount );
+		$amount = apply_filters('FHEE__EEH_Template__format_currency__raw_amount', (float) $amount);
+		$CNT_ISO = apply_filters('FHEE__EEH_Template__format_currency__CNT_ISO', $CNT_ISO, $amount);
 		// filter raw amount (allows 0.00 to be changed to "free" for example)
-		$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount', $amount, $return_raw );
+		$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw);
 		// still a number or was amount converted to a string like "free" ?
-		if ( is_float( $amount_formatted )) {
+		if (is_float($amount_formatted)) {
 			// was a country ISO code passed ? if so generate currency config object for that country
-			$mny = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : NULL;
+			$mny = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : NULL;
 			// verify results
-			if ( ! $mny instanceof EE_Currency_Config ) {
+			if ( ! $mny instanceof EE_Currency_Config) {
 				// set default config country currency settings
 				$mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config();
 			}
 			// format float
-			$amount_formatted = number_format( $amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds );
+			$amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds);
 			// add formatting ?
-			if ( ! $return_raw ) {
+			if ( ! $return_raw) {
 				// add currency sign
-				if( $mny->sign_b4 ){
-					if( $amount >= 0 ){
-						$amount_formatted = $mny->sign . $amount_formatted;
-					}else{
-						$amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted );
+				if ($mny->sign_b4) {
+					if ($amount >= 0) {
+						$amount_formatted = $mny->sign.$amount_formatted;
+					} else {
+						$amount_formatted = '-'.$mny->sign.str_replace('-', '', $amount_formatted);
 					}
 
-				}else{
-					$amount_formatted =  $amount_formatted . $mny->sign;
+				} else {
+					$amount_formatted = $amount_formatted.$mny->sign;
 				}
 
 				// filter to allow global setting of display_code
-				$display_code = apply_filters( 'FHEE__EEH_Template__format_currency__display_code', $display_code );
+				$display_code = apply_filters('FHEE__EEH_Template__format_currency__display_code', $display_code);
 
 				// add currency code ?
-				$amount_formatted = $display_code ? $amount_formatted . ' <span class="' . $cur_code_span_class . '">(' . $mny->code . ')</span>' : $amount_formatted;
+				$amount_formatted = $display_code ? $amount_formatted.' <span class="'.$cur_code_span_class.'">('.$mny->code.')</span>' : $amount_formatted;
 			}
 			// filter results
-			$amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw );
+			$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw);
 		}
 		// clean up vars
-		unset( $mny );
+		unset($mny);
 		// return formatted currency amount
 		return $amount_formatted;
 	}
@@ -469,11 +469,11 @@ 
 	 * @param  string  $schema    'UPPER', 'lower', or 'Sentence'
 	 * @return string             The localized label for the status id.
 	 */
-	public static function pretty_status( $status_id, $plural = FALSE, $schema = 'upper' ) {
+	public static function pretty_status($status_id, $plural = FALSE, $schema = 'upper') {
 		/** @type EEM_Status $EEM_Status */
-		$EEM_Status = EE_Registry::instance()->load_model( 'Status' );
-		$status = $EEM_Status->localized_status( array( $status_id => __( 'unknown', 'event_espresso' )), $plural, $schema );
-		return $status[ $status_id ];
+		$EEM_Status = EE_Registry::instance()->load_model('Status');
+		$status = $EEM_Status->localized_status(array($status_id => __('unknown', 'event_espresso')), $plural, $schema);
+		return $status[$status_id];
 	}
 
 
@@ -488,21 +488,21 @@ 
 	 * @param string  $title
 	 * @return string the html output for the button
 	 */
-	public static function get_button_or_link( $url, $label, $class = 'button-primary', $icon = '', $title = '' ) {
+	public static function get_button_or_link($url, $label, $class = 'button-primary', $icon = '', $title = '') {
 		$icon_html = '';
-		if ( ! empty( $icon ) ) {
-			$dashicons = preg_split( "(ee-icon |dashicons )", $icon );
-			$dashicons = array_filter( $dashicons );
-			$count = count( $dashicons );
+		if ( ! empty($icon)) {
+			$dashicons = preg_split("(ee-icon |dashicons )", $icon);
+			$dashicons = array_filter($dashicons);
+			$count = count($dashicons);
 			$icon_html .= $count > 1 ? '<span class="ee-composite-dashicon">' : '';
-			foreach ( $dashicons as $dashicon ) {
-				$type = strpos( $dashicon, 'ee-icon' ) !== false ? 'ee-icon ' : 'dashicons ';
-				$icon_html .= '<span class="' . $type . $dashicon . '"></span>';
+			foreach ($dashicons as $dashicon) {
+				$type = strpos($dashicon, 'ee-icon') !== false ? 'ee-icon ' : 'dashicons ';
+				$icon_html .= '<span class="'.$type.$dashicon.'"></span>';
 			}
 			$icon_html .= $count > 1 ? '</span>' : '';
 		}
-		$label = ! empty( $icon ) ? $icon_html . $label : $label;
-		$button = '<a id="' . sanitize_title_with_dashes($label) . '" href="' . $url . '" class="' . $class . '" title="' . $title . '">' . $label . '</a>';
+		$label = ! empty($icon) ? $icon_html.$label : $label;
+		$button = '<a id="'.sanitize_title_with_dashes($label).'" href="'.$url.'" class="'.$class.'" title="'.$title.'">'.$label.'</a>';
 		return $button;
 	}
 
@@ -519,21 +519,21 @@ 
 	 * @param bool|string $help_text   (optional) send help text you want to use for the link if default not to be used
 	 * @return string              generated link
 	 */
-	public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) {
+	public static function get_help_tab_link($help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE) {
 
-		if ( ! $page )
-			$page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page;
+		if ( ! $page)
+			$page = isset($_REQUEST['page']) && ! empty($_REQUEST['page']) ? sanitize_key($_REQUEST['page']) : $page;
 
-		if ( ! $action )
-			$action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action;
+		if ( ! $action)
+			$action = isset($_REQUEST['action']) && ! empty($_REQUEST['action']) ? sanitize_key($_REQUEST['action']) : $action;
 
 		$action = empty($action) ? 'default' : $action;
 
 
-		$help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id;
-		$icon = !$icon_style ? ' dashicons-editor-help' : $icon_style;
-		$help_text = !$help_text ? '' : $help_text;
-		return '<a id="' . $help_tab_lnk . '" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22' . $icon . '" title="' . esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso') . '" > ' . $help_text . ' </a>';
+		$help_tab_lnk = $page.'-'.$action.'-'.$help_tab_id;
+		$icon = ! $icon_style ? ' dashicons-editor-help' : $icon_style;
+		$help_text = ! $help_text ? '' : $help_text;
+		return '<a id="'.$help_tab_lnk.'" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22'.$icon.'" title="'.esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso').'" > '.$help_text.' </a>';
 	}
 
 
@@ -545,31 +545,31 @@ 
 	 * @param EE_Help_Tour
 	 * @return string         html
 	 */
-	public static function help_tour_stops_generator( EE_Help_Tour $tour ) {
+	public static function help_tour_stops_generator(EE_Help_Tour $tour) {
 		$id = $tour->get_slug();
 		$stops = $tour->get_stops();
 
-		$content = '<ol style="display:none" id="' . $id . '">';
+		$content = '<ol style="display:none" id="'.$id.'">';
 
-		foreach ( $stops as $stop ) {
-			$data_id = !empty( $stop['id'] ) ? ' data-id="' . $stop['id'] . '"' : '';
-			$data_class = empty( $data_id ) && !empty( $stop['class'] ) ? ' data-class="' . $stop['class'] . '"' : '';
+		foreach ($stops as $stop) {
+			$data_id = ! empty($stop['id']) ? ' data-id="'.$stop['id'].'"' : '';
+			$data_class = empty($data_id) && ! empty($stop['class']) ? ' data-class="'.$stop['class'].'"' : '';
 
 			//if container is set to modal then let's make sure we set the options accordingly
-			if ( empty( $data_id ) && empty( $data_class ) ) {
+			if (empty($data_id) && empty($data_class)) {
 				$stop['options']['modal'] = true;
 				$stop['options']['expose'] = true;
 			}
 
-			$custom_class = !empty( $stop['custom_class'] ) ? ' class="' . $stop['custom_class'] . '"' : '';
-			$button_text = !empty( $stop['button_text'] ) ? ' data-button="' . $stop['button_text'] . '"' : '';
+			$custom_class = ! empty($stop['custom_class']) ? ' class="'.$stop['custom_class'].'"' : '';
+			$button_text = ! empty($stop['button_text']) ? ' data-button="'.$stop['button_text'].'"' : '';
 			$inner_content = isset($stop['content']) ? $stop['content'] : '';
 
 			//options
-			if ( isset( $stop['options'] ) && is_array( $stop['options'] ) ) {
+			if (isset($stop['options']) && is_array($stop['options'])) {
 				$options = ' data-options="';
-				foreach ( $stop['options'] as $option => $value ) {
-					$options .= $option . ':' . $value . ';';
+				foreach ($stop['options'] as $option => $value) {
+					$options .= $option.':'.$value.';';
 				}
 				$options .= '"';
 			} else {
@@ -577,7 +577,7 @@ 
 			}
 
 			//let's put all together
-			$content .= '<li' . $data_id . $data_class . $custom_class . $button_text . $options . '>' . $inner_content . '</li>';
+			$content .= '<li'.$data_id.$data_class.$custom_class.$button_text.$options.'>'.$inner_content.'</li>';
 		}
 
 		$content .= '</ol>';
@@ -598,31 +598,31 @@ 
 	 * @throws EE_Error
 	 * @return string               html structure for status.
 	 */
-	public static function status_legend( $status_array, $active_status = '' ) {
-		if ( !is_array( $status_array ) )
-			throw new EE_Error( __('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') );
+	public static function status_legend($status_array, $active_status = '') {
+		if ( ! is_array($status_array))
+			throw new EE_Error(__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso'));
 
 		$setup_array = array();
-		foreach ( $status_array as $item => $status ) {
+		foreach ($status_array as $item => $status) {
 			$setup_array[$item] = array(
-					'class' => 'ee-status-legend ee-status-legend-' . $status,
-					'desc' => EEH_Template::pretty_status( $status, FALSE, 'sentence' ),
+					'class' => 'ee-status-legend ee-status-legend-'.$status,
+					'desc' => EEH_Template::pretty_status($status, FALSE, 'sentence'),
 					'status' => $status
 				);
 		}
 
-		$content = '<div class="ee-list-table-legend-container">' . "\n";
-		$content .= '<h3>' . __('Status Legend', 'event_espresso') . '</h3>' . "\n";
-		$content .= '<dl class="ee-list-table-legend">' . "\n\t";
-		foreach ( $setup_array as $item => $details ) {
+		$content = '<div class="ee-list-table-legend-container">'."\n";
+		$content .= '<h3>'.__('Status Legend', 'event_espresso').'</h3>'."\n";
+		$content .= '<dl class="ee-list-table-legend">'."\n\t";
+		foreach ($setup_array as $item => $details) {
 			$active_class = $active_status == $details['status'] ? ' class="ee-is-active-status"' : '';
-			$content .= '<dt id="ee-legend-item-tooltip-' . $item . '"' . $active_class . '>' . "\n\t\t";
-			$content .= '<span class="' . $details['class'] . '"></span>' . "\n\t\t";
-			$content .= '<span class="ee-legend-description">' . $details['desc'] . '</span>' . "\n\t";
-			$content .= '</dt>' . "\n";
+			$content .= '<dt id="ee-legend-item-tooltip-'.$item.'"'.$active_class.'>'."\n\t\t";
+			$content .= '<span class="'.$details['class'].'"></span>'."\n\t\t";
+			$content .= '<span class="ee-legend-description">'.$details['desc'].'</span>'."\n\t";
+			$content .= '</dt>'."\n";
 		}
-		$content .= '</dl>' . "\n";
-		$content .= '</div>' . "\n";
+		$content .= '</dl>'."\n";
+		$content .= '</div>'."\n";
 		return $content;
 	}
 
@@ -635,8 +635,8 @@ 
 	 * @return string
 	 */
 	public static function layout_array_as_table($data) {
-	if (is_object($data) || $data instanceof __PHP_Incomplete_Class ) {
-		$data = (array)$data;
+	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
+		$data = (array) $data;
 	}
 	ob_start();
 	if (is_array($data)) {
@@ -649,10 +649,10 @@ 
 						?>
 						<tr>
 							<td>
-								<?php echo $data_key;?>
+								<?php echo $data_key; ?>
 							</td>
 							<td>
-								<?php echo self::layout_array_as_table($data_values);?>
+								<?php echo self::layout_array_as_table($data_values); ?>
 							</td>
 						</tr>
 						<?php
@@ -666,7 +666,7 @@ 
 			<ul>
 				<?php
 				foreach ($data as $datum) {
-					echo "<li>"; echo self::layout_array_as_table($datum);echo "</li>";
+					echo "<li>"; echo self::layout_array_as_table($datum); echo "</li>";
 				}?>
 			</ul>
 			<?php
@@ -696,8 +696,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
-		echo self::get_paging_html( $total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label );
+	public static function paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
+		echo self::get_paging_html($total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label);
 	}
 
 
@@ -721,13 +721,13 @@ 
 	 *                                 )
 	 * @return  string
 	 */
-	public static function get_paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) {
+	public static function get_paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) {
 		$page_links = array();
 		$disable_first = $disable_last = '';
 		$total_items = (int) $total_items;
 		$per_page = (int) $per_page;
 		$current = (int) $current;
-		$paged_arg_name = empty( $paged_arg_name ) ? 'paged' : sanitize_key( $paged_arg_name );
+		$paged_arg_name = empty($paged_arg_name) ? 'paged' : sanitize_key($paged_arg_name);
 
 		//filter items_label
 		$items_label = apply_filters(
@@ -735,68 +735,68 @@ 
 			$items_label
 		);
 
-		if ( empty( $items_label )
-		     || ! is_array( $items_label )
-		     || ! isset( $items_label['single'] )
-		     || ! isset( $items_label['plural'] ) ) {
+		if (empty($items_label)
+		     || ! is_array($items_label)
+		     || ! isset($items_label['single'])
+		     || ! isset($items_label['plural'])) {
 			$items_label = array(
-				'single' => __( '1 item', 'event_espresso' ),
-				'plural' => __( '%s items', 'event_espresso' )
+				'single' => __('1 item', 'event_espresso'),
+				'plural' => __('%s items', 'event_espresso')
 			);
 		} else {
 			$items_label = array(
-				'single' => '1 ' . esc_html( $items_label['single'] ),
-				'plural' => '%s ' . esc_html( $items_label['plural'] )
+				'single' => '1 '.esc_html($items_label['single']),
+				'plural' => '%s '.esc_html($items_label['plural'])
 			);
 		}
 
-		$total_pages = ceil( $total_items / $per_page );
+		$total_pages = ceil($total_items / $per_page);
 
-		if ( $total_pages <= 1 )
+		if ($total_pages <= 1)
 			return '';
 
-		$item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single'];
+		$item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single'];
 
-		$output = '<span class="displaying-num">' . $item_label . '</span>';
+		$output = '<span class="displaying-num">'.$item_label.'</span>';
 
-		if ( $current === 1 ) {
+		if ($current === 1) {
 			$disable_first = ' disabled';
 		}
-		if ( $current == $total_pages ) {
+		if ($current == $total_pages) {
 			$disable_last = ' disabled';
 		}
 
-		$page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>",
-			'first-page' . $disable_first,
-			esc_attr__( 'Go to the first page' ),
-			esc_url( remove_query_arg( $paged_arg_name, $url ) ),
+		$page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>",
+			'first-page'.$disable_first,
+			esc_attr__('Go to the first page'),
+			esc_url(remove_query_arg($paged_arg_name, $url)),
 			'&laquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'prev-page' . $disable_first,
-			esc_attr__( 'Go to the previous page' ),
-			esc_url( add_query_arg( $paged_arg_name, max( 1, $current-1 ), $url ) ),
+			'prev-page'.$disable_first,
+			esc_attr__('Go to the previous page'),
+			esc_url(add_query_arg($paged_arg_name, max(1, $current - 1), $url)),
 			'&lsaquo;'
 		);
 
-		if ( ! $show_num_field ) {
+		if ( ! $show_num_field) {
 			$html_current_page = $current;
 		} else {
-			$html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
-				esc_attr__( 'Current page' ),
+			$html_current_page = sprintf("<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
+				esc_attr__('Current page'),
 				$current,
-				strlen( $total_pages )
+				strlen($total_pages)
 			);
 		}
 
 		$html_total_pages = sprintf(
 			'<span class="total-pages">%s</span>',
-			number_format_i18n( $total_pages )
+			number_format_i18n($total_pages)
 		);
 		$page_links[] = sprintf(
-			_x( '%3$s%1$s of %2$s%4$s', 'paging' ),
+			_x('%3$s%1$s of %2$s%4$s', 'paging'),
 			$html_current_page,
 			$html_total_pages,
 			'<span class="paging-input">',
@@ -805,29 +805,29 @@ 
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'next-page' . $disable_last,
-			esc_attr__( 'Go to the next page' ),
-			esc_url( add_query_arg( $paged_arg_name, min( $total_pages, $current+1 ), $url ) ),
+			'next-page'.$disable_last,
+			esc_attr__('Go to the next page'),
+			esc_url(add_query_arg($paged_arg_name, min($total_pages, $current + 1), $url)),
 			'&rsaquo;'
 		);
 
 		$page_links[] = sprintf(
 			'<a class="%s" title="%s" href="%s">%s</a>',
-			'last-page' . $disable_last,
-			esc_attr__( 'Go to the last page' ),
-			esc_url( add_query_arg( $paged_arg_name, $total_pages, $url ) ),
+			'last-page'.$disable_last,
+			esc_attr__('Go to the last page'),
+			esc_url(add_query_arg($paged_arg_name, $total_pages, $url)),
 			'&raquo;'
 		);
 
-		$output .= "\n" . '<span class="pagination-links">' . join( "\n", $page_links ) . '</span>';
+		$output .= "\n".'<span class="pagination-links">'.join("\n", $page_links).'</span>';
 		// set page class
-		if ( $total_pages ) {
+		if ($total_pages) {
 			$page_class = $total_pages < 2 ? ' one-page' : '';
 		} else {
 			$page_class = ' no-pages';
 		}
 
-		return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>';
+		return '<div class="tablenav"><div class="tablenav-pages'.$page_class.'">'.$output.'</div></div>';
 	}
 
 
@@ -837,18 +837,18 @@ 
 	 * @param string $wrap_id
 	 * @return string
 	 */
-	public static function powered_by_event_espresso( $wrap_class = '', $wrap_id = '' ) {
-		$attributes = ! empty( $wrap_id ) ? " id=\"{$wrap_id}\"" : '';
-		$attributes .= ! empty( $wrap_class )
+	public static function powered_by_event_espresso($wrap_class = '', $wrap_id = '') {
+		$attributes = ! empty($wrap_id) ? " id=\"{$wrap_id}\"" : '';
+		$attributes .= ! empty($wrap_class)
 		? " class=\"{$wrap_class} powered-by-event-espresso-credit\""
 		: ' class="powered-by-event-espresso-credit"';
 
 		$url = add_query_arg(
-			array( 'ap_id' => EE_Registry::instance()->CFG->admin->affiliate_id() ),
+			array('ap_id' => EE_Registry::instance()->CFG->admin->affiliate_id()),
 			'https://eventespresso.com/'
 		);
-		$url = apply_filters( 'FHEE__EEH_Template__powered_by_event_espresso__url', $url );
-		$powered_by = is_admin() && ! ( defined('DOING_AJAX') && DOING_AJAX )
+		$url = apply_filters('FHEE__EEH_Template__powered_by_event_espresso__url', $url);
+		$powered_by = is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX)
 			? EVENT_ESPRESSO_POWERED_BY
 			: 'Event Espresso';
 		return (string) apply_filters(
@@ -862,7 +862,7 @@ 
 			'" target="_blank">',
 			'</a>',
 			"<a href=\"{$url}\" title=\"",
-			'" target="_blank">' . $powered_by . '</a></div>'
+			'" target="_blank">'.$powered_by.'</a></div>'
 			)
 		);
 	}
@@ -882,7 +882,7 @@ 
 //add_filter( 'FHEE__EEH_Template__format_currency__amount', 'convert_zero_to_free', 10, 2 );
 
 
-if ( ! function_exists( 'espresso_pagination' ) ) {
+if ( ! function_exists('espresso_pagination')) {
 	/**
 	 *    espresso_pagination
 	 *
@@ -894,21 +894,21 @@ 
 		$big = 999999999; // need an unlikely integer
 		$pagination = paginate_links(
 		array(
-		'base'         => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+		'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 		'format'       => '?paged=%#%',
-		'current'      => max( 1, get_query_var( 'paged' ) ),
+		'current'      => max(1, get_query_var('paged')),
 		'total'        => $wp_query->max_num_pages,
 		'show_all'     => true,
 		'end_size'     => 10,
 		'mid_size'     => 6,
 		'prev_next'    => true,
-		'prev_text'    => __( '&lsaquo; PREV', 'event_espresso' ),
-		'next_text'    => __( 'NEXT &rsaquo;', 'event_espresso' ),
+		'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
+		'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
 		'type'         => 'plain',
 		'add_args'     => false,
 		'add_fragment' => ''
 		)
 		);
-		echo ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
+		echo ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
 	}
 }
\ No newline at end of file