eventespresso / event-espresso-core

core/EE_System.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -613,7 +613,7 @@
 	 * so that it will be done when migrations are finished
 	 * @param boolean $initialize_addons_too if true, we double-check addons' database tables etc too;
 	 *		however,
-	 * @param boolean $verify_db_schema if true will re-check the database tables have the correct schema. This is a resource-intensive job
+	 * @param boolean $verify_schema if true will re-check the database tables have the correct schema. This is a resource-intensive job
 	 * so we prefer to only do it when necessary
 	 * @return void
 	 */

Braces +11 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -578,7 +580,7 @@ 
 				$espresso_db_update =  array( $espresso_db_update=>array() );
 				update_option( 'espresso_db_update', $espresso_db_update );
 			}
-		}else{
+		} else{
 			$corrected_db_update = array();
 			//if IS an array, but is it an array where KEYS are version numbers, and values are arrays?
 			foreach($espresso_db_update as $should_be_version_string => $should_be_array){
@@ -588,7 +590,7 @@ 
 					//fix it!
 					$version_string = $should_be_array;
 					$corrected_db_update[$version_string] = array('unknown-date');
-				}else{
+				} else{
 					//ok it checks out
 					$corrected_db_update[$should_be_version_string] = $should_be_array;
 				}
@@ -633,7 +635,7 @@ 
 					$addon->initialize_db_if_no_migrations_required();
 				}
 			}
-		}else{
+		} else{
 			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( 'Core' );
 		}
 		if ( $request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade ) {
@@ -703,7 +705,7 @@ 
 				//it a version we haven't seen before
 				if( $version_is_higher === 1 ){
 					$req_type = EE_System::req_type_upgrade;
-				}else{
+				} else{
 					$req_type = EE_System::req_type_downgrade;
 				}
 				delete_option( $activation_indicator_option_name );
@@ -712,10 +714,10 @@ 
 				if( get_option( $activation_indicator_option_name, FALSE ) ){
 					if ( $version_is_higher === -1 ){
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					} elseif( $version_is_higher === 0 ){
 						//we've seen this version before, but it's an activation. must be a reactivation
 						$req_type = EE_System::req_type_reactivation;
-					}else{//$version_is_higher === 1
+					} else{//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
 					delete_option( $activation_indicator_option_name );
@@ -723,10 +725,10 @@ 
 					//we've seen this version before and the activation indicate doesn't show it was just activated
 					if ( $version_is_higher === -1 ){
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					} elseif( $version_is_higher === 0 ){
 						//we've seen this version before and it's not an activation. its normal request
 						$req_type = EE_System::req_type_normal;
-					}else{//$version_is_higher === 1
+					} else{//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
 				}

Spacing +303 added lines, -303 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof  EE_System )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof  EE_System)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -98,12 +98,12 @@ 
 	 * resets the instance and returns it
 	 * @return EE_System
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance->_req_type = NULL;
 		//we need to reset the migration manager in order for it to detect DMSs properly
 		EE_Data_Migration_Manager::reset();
 		//make sure none of the old hooks are left hanging around
-		remove_all_actions( 'AHEE__EE_System__perform_activations_upgrades_and_migrations');
+		remove_all_actions('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 		self::instance()->detect_activations_or_upgrades();
 		self::instance()->perform_activations_upgrades_and_migrations();
 		return self::instance();
@@ -124,72 +124,72 @@ 
 	 * @return \EE_System
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_System__construct__begin',$this );
+		do_action('AHEE__EE_System__construct__begin', $this);
 		// check required WP version
-		if ( ! $this->_minimum_wp_version_required() ) {
-			unset( $_GET['activate'] );
-			add_action( 'admin_notices', array( $this, 'minimum_wp_version_error' ), 1 );
+		if ( ! $this->_minimum_wp_version_required()) {
+			unset($_GET['activate']);
+			add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1);
 			return;
 		}
 		// check required PHP version
-		if ( ! $this->minimum_php_version_required() ) {
-			unset( $_GET['activate'] );
-			add_action( 'admin_notices', array( $this, 'minimum_php_version_error' ), 1 );
+		if ( ! $this->minimum_php_version_required()) {
+			unset($_GET['activate']);
+			add_action('admin_notices', array($this, 'minimum_php_version_error'), 1);
 			return;
 		}
 		// check recommended WP version
-		if ( ! $this->_minimum_wp_version_recommended() ) {
+		if ( ! $this->_minimum_wp_version_recommended()) {
 			$this->_display_minimum_recommended_wp_version_notice();
 		}
 		// check recommended PHP version
-		if ( ! $this->_minimum_php_version_recommended() ) {
+		if ( ! $this->_minimum_php_version_recommended()) {
 			$this->_display_minimum_recommended_php_version_notice();
 		}
 
 		//all the below should ONLY run if minimum php version requirement is met
-		if ( $this->minimum_php_version_required() ) {
+		if ($this->minimum_php_version_required()) {
 			$this->display_alpha_banner_warning();
 			// central repository for classes
 			$this->_load_registry();
 			// workarounds for PHP < 5.3
 			$this->_load_class_tools();
 			// load a few helper files
-			EE_Registry::instance()->load_helper( 'File' );
-			EE_Registry::instance()->load_helper( 'Autoloader', array(), false );
+			EE_Registry::instance()->load_helper('File');
+			EE_Registry::instance()->load_helper('Autoloader', array(), false);
 			// instantiate PSR4 autoloader
-			require_once( EE_CORE . 'Psr4Autoloader.php' );
+			require_once(EE_CORE.'Psr4Autoloader.php');
 			$psr4_loader = new \EventEspresso\Core\Psr4Autoloader;
 			// register the autoloader
 			$psr4_loader->register();
 			// register the base directories for the namespace prefix
-			$psr4_loader->addNamespace( 'EventEspresso', EE_PLUGIN_DIR_PATH );
-			require_once EE_CORE . 'EE_Deprecated.core.php';
+			$psr4_loader->addNamespace('EventEspresso', EE_PLUGIN_DIR_PATH);
+			require_once EE_CORE.'EE_Deprecated.core.php';
 			// load interfaces
-			require_once EE_CORE . 'EEI_Interfaces.php';
-			require_once EE_LIBRARIES . 'payment_methods' . DS . 'EEI_Payment_Method_Interfaces.php';
+			require_once EE_CORE.'EEI_Interfaces.php';
+			require_once EE_LIBRARIES.'payment_methods'.DS.'EEI_Payment_Method_Interfaces.php';
 			// WP cron jobs
-			EE_Registry::instance()->load_core( 'Cron_Tasks' );
+			EE_Registry::instance()->load_core('Cron_Tasks');
 
 			// allow addons to load first so that they can register autoloaders, set hooks for running DMS's, etc
-			add_action( 'plugins_loaded', array( $this, 'load_espresso_addons' ), 1 );
+			add_action('plugins_loaded', array($this, 'load_espresso_addons'), 1);
 			// when an ee addon is activated, we want to call the core hook(s) again
 			// because the newly-activated addon didn't get a chance to run at all
-			add_action( 'activate_plugin', array( $this, 'load_espresso_addons' ), 1 );
+			add_action('activate_plugin', array($this, 'load_espresso_addons'), 1);
 			// detect whether install or upgrade
-			add_action( 'plugins_loaded', array( $this, 'detect_activations_or_upgrades' ), 3 );
+			add_action('plugins_loaded', array($this, 'detect_activations_or_upgrades'), 3);
 			// load EE_Config, EE_Textdomain, etc
-			add_action( 'plugins_loaded', array( $this, 'load_core_configuration' ), 5 );
+			add_action('plugins_loaded', array($this, 'load_core_configuration'), 5);
 			// load EE_Config, EE_Textdomain, etc
-			add_action( 'plugins_loaded', array( $this, 'register_shortcodes_modules_and_widgets' ), 7 );
+			add_action('plugins_loaded', array($this, 'register_shortcodes_modules_and_widgets'), 7);
 			// you wanna get going? I wanna get going... let's get going!
-			add_action( 'plugins_loaded', array( $this, 'brew_espresso' ), 9 );
+			add_action('plugins_loaded', array($this, 'brew_espresso'), 9);
 
 			//other housekeeping
 			//exclude EE critical pages from wp_list_pages
-			add_filter( 'wp_list_pages_excludes', array( $this, 'remove_pages_from_wp_list_pages' ), 10 );
+			add_filter('wp_list_pages_excludes', array($this, 'remove_pages_from_wp_list_pages'), 10);
 			// ALL EE Addons should use the following hook point to attach their initial setup too
 			// it's extremely important for EE Addons to register any class autoloaders so that they can be available when the EE_Config loads
-			do_action( 'AHEE__EE_System__construct__complete', $this );
+			do_action('AHEE__EE_System__construct__complete', $this);
 		}
 	}
 
@@ -205,22 +205,22 @@ 
 	 */
 	public function display_alpha_banner_warning() {
 		// skip AJAX requests
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			return;
 		}
 		// skip stable releases
-		if ( strpos( EVENT_ESPRESSO_VERSION, '.alpha' ) === false ) {
+		if (strpos(EVENT_ESPRESSO_VERSION, '.alpha') === false) {
 			return;
 		}
 		// post release candidate warning
-		if ( is_admin() ) {
-			add_action( 'admin_notices', array( $this, 'alpha_banner_admin_notice' ), -999 );
+		if (is_admin()) {
+			add_action('admin_notices', array($this, 'alpha_banner_admin_notice'), -999);
 		} else {
 			// site admin has authorized use of non-stable release candidate for production
-			if ( defined( 'ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE' ) && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE ) {
+			if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) {
 				return;
 			}
-			add_action( 'shutdown', array( $this, 'alpha_banner_warning_notice' ), 10 );
+			add_action('shutdown', array($this, 'alpha_banner_warning_notice'), 10);
 		}
 	}
 
@@ -236,7 +236,7 @@ 
 	public function alpha_banner_admin_notice() {
 		EE_Error::add_attention(
 			sprintf(
-				__( 'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', 'event_espresso' ),
+				__('This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', 'event_espresso'),
 				'<strong>',
 				'</strong>'
 			),
@@ -255,11 +255,11 @@ 
 	 */
 	public function alpha_banner_warning_notice() {
 		global $pagenow;
-		if ( in_array( $pagenow, array( 'wp-login.php', 'wp-register.php' ) ) ) {
+		if (in_array($pagenow, array('wp-login.php', 'wp-register.php'))) {
 			return;
 		}
 		printf(
-			__( '%1$sThis version of Event Espresso is for testing and/or evaluation purposes only. It is %2$snot%3$s considered a stable release and should therefore %2$snot%3$s be activated on a live or production website.%4$s', 'event_espresso' ),
+			__('%1$sThis version of Event Espresso is for testing and/or evaluation purposes only. It is %2$snot%3$s considered a stable release and should therefore %2$snot%3$s be activated on a live or production website.%4$s', 'event_espresso'),
 			'<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>',
 			'<strong>',
 			'</strong>',
@@ -276,9 +276,9 @@ 
 	 * @param string $min_version
 	 * @return boolean
 	 */
-	private function _check_wp_version( $min_version = EE_MIN_WP_VER_REQUIRED ) {
+	private function _check_wp_version($min_version = EE_MIN_WP_VER_REQUIRED) {
 		global $wp_version;
-		return version_compare( $wp_version, $min_version, '>=' ) ? TRUE : FALSE;
+		return version_compare($wp_version, $min_version, '>=') ? TRUE : FALSE;
 	}
 
 	/**
@@ -288,7 +288,7 @@ 
 	 * 	@return boolean
 	 */
 	private function _minimum_wp_version_required() {
-		return $this->_check_wp_version( EE_MIN_WP_VER_REQUIRED );
+		return $this->_check_wp_version(EE_MIN_WP_VER_REQUIRED);
 	}
 
 	/**
@@ -298,7 +298,7 @@ 
 	 * 	@return boolean
 	 */
 	private function _minimum_wp_version_recommended() {
-		return $this->_check_wp_version( EE_MIN_WP_VER_RECOMMENDED );
+		return $this->_check_wp_version(EE_MIN_WP_VER_RECOMMENDED);
 	}
 
 
@@ -310,8 +310,8 @@ 
 	 * @param string $min_version
 	 * @return boolean
 	 */
-	private function _check_php_version( $min_version = EE_MIN_PHP_VER_RECOMMENDED ) {
-		return version_compare( PHP_VERSION, $min_version, '>=' ) ? TRUE : FALSE;
+	private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED) {
+		return version_compare(PHP_VERSION, $min_version, '>=') ? TRUE : FALSE;
 	}
 
 	/**
@@ -320,7 +320,7 @@ 
 	 * 	@return boolean
 	 */
 	public function minimum_php_version_required() {
-		return $this->_check_php_version( EE_MIN_PHP_VER_REQUIRED );
+		return $this->_check_php_version(EE_MIN_PHP_VER_REQUIRED);
 	}
 
 	/**
@@ -330,7 +330,7 @@ 
 	 * 	@return boolean
 	 */
 	private function _minimum_php_version_recommended() {
-		return $this->_check_php_version( EE_MIN_PHP_VER_RECOMMENDED );
+		return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED);
 	}
 
 
@@ -347,7 +347,7 @@ 
 		<p>
 		<?php
 		printf(
-			__( 'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ),
+			__('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'),
 			EE_MIN_WP_VER_REQUIRED,
 			$wp_version,
 			'<br/>',
@@ -357,7 +357,7 @@ 
 		</p>
 		</div>
 		<?php
-		EE_System::deactivate_plugin( EE_PLUGIN_BASENAME );
+		EE_System::deactivate_plugin(EE_PLUGIN_BASENAME);
 	}
 
 
@@ -373,7 +373,7 @@ 
 		<p>
 		<?php
 		printf(
-			__( 'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on supported versions of PHP, please go to %4$s, or %5$s to download the latest stable versions.', 'event_espresso' ),
+			__('We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on supported versions of PHP, please go to %4$s, or %5$s to download the latest stable versions.', 'event_espresso'),
 			EE_MIN_PHP_VER_REQUIRED,
 			PHP_VERSION,
 			'<br/>',
@@ -384,7 +384,7 @@ 
 		</p>
 		</div>
 		<?php
-		deactivate_plugins( EE_PLUGIN_BASENAME );
+		deactivate_plugins(EE_PLUGIN_BASENAME);
 	}
 
 
@@ -398,9 +398,9 @@ 
 	private function _display_minimum_recommended_wp_version_notice() {
 		global $wp_version;
 		EE_Error::add_persistent_admin_notice(
-			'wp_version_' . str_replace( '.', '-', EE_MIN_WP_VER_RECOMMENDED ) . '_recommended',
+			'wp_version_'.str_replace('.', '-', EE_MIN_WP_VER_RECOMMENDED).'_recommended',
 			sprintf(
-				__( 'Event Espresso recommends WordPress version %1$s or greater in order for everything to operate properly. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ),
+				__('Event Espresso recommends WordPress version %1$s or greater in order for everything to operate properly. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'),
 				EE_MIN_WP_VER_RECOMMENDED,
 				$wp_version,
 				'<br/>',
@@ -419,9 +419,9 @@ 
 	 */
 	private function _display_minimum_recommended_php_version_notice() {
 		EE_Error::add_persistent_admin_notice(
-			'php_version_' . str_replace( '.', '-', EE_MIN_PHP_VER_RECOMMENDED ) . '_recommended',
+			'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended',
 			sprintf(
-				__( 'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on supported versions of PHP, please go to %4$s, or %5$s to download the latest stable versions.', 'event_espresso' ),
+				__('Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on supported versions of PHP, please go to %4$s, or %5$s to download the latest stable versions.', 'event_espresso'),
 				EE_MIN_PHP_VER_RECOMMENDED,
 				PHP_VERSION,
 				'<br/>',
@@ -440,12 +440,12 @@ 
 	 * 	@return void
 	 */
 	private function _load_registry() {
-		if ( is_readable( EE_CORE . 'EE_Registry.core.php' )) {
-			require_once( EE_CORE . 'EE_Registry.core.php' );
+		if (is_readable(EE_CORE.'EE_Registry.core.php')) {
+			require_once(EE_CORE.'EE_Registry.core.php');
 		} else {
-			$msg = __( 'The EE_Registry core class could not be loaded.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
-			wp_die( EE_Error::get_notices() );
+			$msg = __('The EE_Registry core class could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			wp_die(EE_Error::get_notices());
 		}
 	}
 
@@ -457,11 +457,11 @@ 
 	 * 	@return void
 	 */
 	private function _load_class_tools() {
-		if ( is_readable( EE_HELPERS . 'EEH_Class_Tools.helper.php' )) {
-			require_once( EE_HELPERS . 'EEH_Class_Tools.helper.php' );
+		if (is_readable(EE_HELPERS.'EEH_Class_Tools.helper.php')) {
+			require_once(EE_HELPERS.'EEH_Class_Tools.helper.php');
 		} else {
-			$msg = __( 'The EEH_Class_Tools helper could not be loaded.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			$msg = __('The EEH_Class_Tools helper could not be loaded.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -478,10 +478,10 @@ 
 	public function load_espresso_addons() {
 		// set autoloaders for all of the classes implementing EEI_Plugin_API
 		// which provide helpers for EE plugin authors to more easily register certain components with EE.
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'plugin_api' );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'plugin_api');
 		//load and setup EE_Capabilities
-		EE_Registry::instance()->load_core( 'Capabilities' );
-		do_action( 'AHEE__EE_System__load_espresso_addons' );
+		EE_Registry::instance()->load_core('Capabilities');
+		do_action('AHEE__EE_System__load_espresso_addons');
 	}
 
 
@@ -489,10 +489,10 @@ 
 	 * Checks for activation or upgrade of core first; then also checks if any registered
 	 * addons have been activated or upgraded
 	 */
-	public function detect_activations_or_upgrades(){
+	public function detect_activations_or_upgrades() {
 		//first off: let's make sure to handle core
 		$this->detect_if_activation_or_upgrade();
-		foreach(EE_Registry::instance()->addons as $addon){
+		foreach (EE_Registry::instance()->addons as $addon) {
 			//detect teh request type for that addon
 			$addon->detect_activation_or_upgrade();
 		}
@@ -510,44 +510,44 @@ 
 		do_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin');
 
 		// load M-Mode class
-		EE_Registry::instance()->load_core( 'Maintenance_Mode' );
+		EE_Registry::instance()->load_core('Maintenance_Mode');
 		// check if db has been updated, or if its a brand-new installation
 
 		$espresso_db_update = $this->fix_espresso_db_upgrade_option();
-		$request_type =  $this->detect_req_type($espresso_db_update);
+		$request_type = $this->detect_req_type($espresso_db_update);
 		//EEH_Debug_Tools::printr( $request_type, '$request_type', __FILE__, __LINE__ );
-		if( $request_type != EE_System::req_type_normal){
+		if ($request_type != EE_System::req_type_normal) {
 			EE_Registry::instance()->load_helper('Activation');
 		}
 
-		switch($request_type){
+		switch ($request_type) {
 			case EE_System::req_type_new_activation:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__new_activation' );
-				$this->_handle_core_version_change( $espresso_db_update );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__new_activation');
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_reactivation:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__reactivation' );
-				$this->_handle_core_version_change( $espresso_db_update );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__reactivation');
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_upgrade:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__upgrade' );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__upgrade');
 				//migrations may be required now that we've upgraded
 				EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-				$this->_handle_core_version_change( $espresso_db_update );
+				$this->_handle_core_version_change($espresso_db_update);
 //				echo "done upgrade";die;
 				break;
 			case EE_System::req_type_downgrade:
-				do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__downgrade' );
+				do_action('AHEE__EE_System__detect_if_activation_or_upgrade__downgrade');
 				//its possible migrations are no longer required
 				EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
-				$this->_handle_core_version_change( $espresso_db_update );
+				$this->_handle_core_version_change($espresso_db_update);
 				break;
 			case EE_System::req_type_normal:
 			default:
 //				$this->_maybe_redirect_to_ee_about();
 				break;
 		}
-		do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__complete' );
+		do_action('AHEE__EE_System__detect_if_activation_or_upgrade__complete');
 	}
 
 	/**
@@ -555,10 +555,10 @@ 
 	 * initializing the database later during the request
 	 * @param array $espresso_db_update
 	 */
-	protected function _handle_core_version_change( $espresso_db_update ){
-		$this->update_list_of_installed_versions( $espresso_db_update );
+	protected function _handle_core_version_change($espresso_db_update) {
+		$this->update_list_of_installed_versions($espresso_db_update);
 		//get ready to verify the DB is ok (provided we aren't in maintenance mode, of course)
-		add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' ));
+		add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required'));
 	}
 
 
@@ -573,44 +573,44 @@ 
 	 * @internal param array $espresso_db_update_value the value of the WordPress option. If not supplied, fetches it from the options table
 	 * @return array the correct value of 'espresso_db_upgrade', after saving it, if it needed correction
 	 */
-	private function fix_espresso_db_upgrade_option($espresso_db_update = null){
-		do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update );
-		if( ! $espresso_db_update){
-			$espresso_db_update = get_option( 'espresso_db_update' );
+	private function fix_espresso_db_upgrade_option($espresso_db_update = null) {
+		do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update);
+		if ( ! $espresso_db_update) {
+			$espresso_db_update = get_option('espresso_db_update');
 		}
 		// check that option is an array
-		if( ! is_array( $espresso_db_update )) {
+		if ( ! is_array($espresso_db_update)) {
 			// if option is FALSE, then it never existed
-			if ( $espresso_db_update === FALSE ) {
+			if ($espresso_db_update === FALSE) {
 				// make $espresso_db_update an array and save option with autoload OFF
-				$espresso_db_update =  array();
-				add_option( 'espresso_db_update', $espresso_db_update, '', 'no' );
+				$espresso_db_update = array();
+				add_option('espresso_db_update', $espresso_db_update, '', 'no');
 			} else {
 				// option is NOT FALSE but also is NOT an array, so make it an array and save it
-				$espresso_db_update =  array( $espresso_db_update=>array() );
-				update_option( 'espresso_db_update', $espresso_db_update );
+				$espresso_db_update = array($espresso_db_update=>array());
+				update_option('espresso_db_update', $espresso_db_update);
 			}
-		}else{
+		} else {
 			$corrected_db_update = array();
 			//if IS an array, but is it an array where KEYS are version numbers, and values are arrays?
-			foreach($espresso_db_update as $should_be_version_string => $should_be_array){
-				if(is_int($should_be_version_string) && ! is_array($should_be_array)){
+			foreach ($espresso_db_update as $should_be_version_string => $should_be_array) {
+				if (is_int($should_be_version_string) && ! is_array($should_be_array)) {
 					//the key is an int, and the value IS NOT an array
 					//so it must be numerically-indexed, where values are versions installed...
 					//fix it!
 					$version_string = $should_be_array;
 					$corrected_db_update[$version_string] = array('unknown-date');
-				}else{
+				} else {
 					//ok it checks out
 					$corrected_db_update[$should_be_version_string] = $should_be_array;
 				}
 			}
 			$espresso_db_update = $corrected_db_update;
-			update_option( 'espresso_db_update', $espresso_db_update );
+			update_option('espresso_db_update', $espresso_db_update);
 
 		}
 
-		do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update );
+		do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update);
 		return $espresso_db_update;
 	}
 
@@ -629,27 +629,27 @@ 
 	 * so we prefer to only do it when necessary
 	 * @return void
 	 */
-	public function initialize_db_if_no_migrations_required( $initialize_addons_too = FALSE, $verify_schema = true ){
+	public function initialize_db_if_no_migrations_required($initialize_addons_too = FALSE, $verify_schema = true) {
 		$request_type = $this->detect_req_type();
 		//only initialize system if we're not in maintenance mode.
-		if( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ){
-			update_option( 'ee_flush_rewrite_rules', TRUE );
+		if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) {
+			update_option('ee_flush_rewrite_rules', TRUE);
 			EEH_Activation::system_initialization();
-			if( $verify_schema ) {
+			if ($verify_schema) {
 				EEH_Activation::initialize_db_and_folders();
 			}
 			EEH_Activation::initialize_db_content();
-			if( $initialize_addons_too ) {
+			if ($initialize_addons_too) {
 				//foreach registered addon, make sure its db is up-to-date too
-				foreach(EE_Registry::instance()->addons as $addon){
+				foreach (EE_Registry::instance()->addons as $addon) {
 					$addon->initialize_db_if_no_migrations_required();
 				}
 			}
-		}else{
-			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( 'Core' );
+		} else {
+			EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for('Core');
 		}
-		if ( $request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade ) {
-			add_action( 'AHEE__EE_System__load_CPTs_and_session__start', array( $this, 'redirect_to_about_ee' ), 9 );
+		if ($request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade) {
+			add_action('AHEE__EE_System__load_CPTs_and_session__start', array($this, 'redirect_to_about_ee'), 9);
 		}
 	}
 
@@ -661,16 +661,16 @@ 
 	 * @param 	string 	$current_version_to_add 	version to be added to the version history
 	 * @return 	boolean success as to whether or not this option was changed
 	 */
-	public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) {
-		if( ! $version_history ) {
+	public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) {
+		if ( ! $version_history) {
 			$version_history = $this->fix_espresso_db_upgrade_option($version_history);
 		}
-		if( $current_version_to_add == NULL){
+		if ($current_version_to_add == NULL) {
 			$current_version_to_add = espresso_version();
 		}
-		$version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() );
+		$version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time());
 		// re-save
-		return update_option( 'espresso_db_update', $version_history );
+		return update_option('espresso_db_update', $version_history);
 	}
 
 
@@ -687,10 +687,10 @@ 
 	 *                            but still know if this is a new install or not
 	 * @return int one of the constants on EE_System::req_type_
 	 */
-	public function detect_req_type( $espresso_db_update = NULL ){
-		if ( $this->_req_type === NULL ){
-			$espresso_db_update = ! empty( $espresso_db_update ) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option();
-			$this->_req_type = $this->detect_req_type_given_activation_history( $espresso_db_update, 'ee_espresso_activation', espresso_version() );
+	public function detect_req_type($espresso_db_update = NULL) {
+		if ($this->_req_type === NULL) {
+			$espresso_db_update = ! empty($espresso_db_update) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option();
+			$this->_req_type = $this->detect_req_type_given_activation_history($espresso_db_update, 'ee_espresso_activation', espresso_version());
 		}
 		return $this->_req_type;
 	}
@@ -706,39 +706,39 @@ 
 	 * @param string $version_to_upgrade_to the version that was just upgraded to (for core that will be espresso_version())
 	 * @return int one of the constants on EE_System::req_type_*
 	 */
-	public static function detect_req_type_given_activation_history( $activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to ){
-		$version_is_higher = self::_new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to );
-		if( $activation_history_for_addon ){
+	public static function detect_req_type_given_activation_history($activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to) {
+		$version_is_higher = self::_new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to);
+		if ($activation_history_for_addon) {
 			//it exists, so this isn't a completely new install
 			//check if this version already in that list of previously installed versions
-			if ( ! isset( $activation_history_for_addon[ $version_to_upgrade_to ] )) {
+			if ( ! isset($activation_history_for_addon[$version_to_upgrade_to])) {
 				//it a version we haven't seen before
-				if( $version_is_higher === 1 ){
+				if ($version_is_higher === 1) {
 					$req_type = EE_System::req_type_upgrade;
-				}else{
+				} else {
 					$req_type = EE_System::req_type_downgrade;
 				}
-				delete_option( $activation_indicator_option_name );
+				delete_option($activation_indicator_option_name);
 			} else {
 				// its not an update. maybe a reactivation?
-				if( get_option( $activation_indicator_option_name, FALSE ) ){
-					if ( $version_is_higher === -1 ){
+				if (get_option($activation_indicator_option_name, FALSE)) {
+					if ($version_is_higher === -1) {
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					}elseif ($version_is_higher === 0) {
 						//we've seen this version before, but it's an activation. must be a reactivation
 						$req_type = EE_System::req_type_reactivation;
-					}else{//$version_is_higher === 1
+					} else {//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
-					delete_option( $activation_indicator_option_name );
+					delete_option($activation_indicator_option_name);
 				} else {
 					//we've seen this version before and the activation indicate doesn't show it was just activated
-					if ( $version_is_higher === -1 ){
+					if ($version_is_higher === -1) {
 						$req_type = EE_System::req_type_downgrade;
-					}elseif( $version_is_higher === 0 ){
+					}elseif ($version_is_higher === 0) {
 						//we've seen this version before and it's not an activation. its normal request
 						$req_type = EE_System::req_type_normal;
-					}else{//$version_is_higher === 1
+					} else {//$version_is_higher === 1
 						$req_type = EE_System::req_type_upgrade;
 					}
 				}
@@ -746,7 +746,7 @@ 
 		} else {
 			//brand new install
 			$req_type = EE_System::req_type_new_activation;
-			delete_option( $activation_indicator_option_name );
+			delete_option($activation_indicator_option_name);
 		}
 		return $req_type;
 	}
@@ -764,30 +764,30 @@ 
 	 *		0 if $version_to_upgrade_to MATCHES (reactivation or normal request);
 	 *		1 if $version_to_upgrade_to is HIGHER (upgrade) ;
 	 */
-	protected static function _new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to ){
+	protected static function _new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to) {
 		//find the most recently-activated version
 		$most_recently_active_version_activation = '1970-01-01 00:00:00';
 		$most_recently_active_version = '0.0.0.dev.000';
-		if( is_array( $activation_history_for_addon ) ){
-			foreach( $activation_history_for_addon as $version => $times_activated ){
+		if (is_array($activation_history_for_addon)) {
+			foreach ($activation_history_for_addon as $version => $times_activated) {
 				//check there is a record of when this version was activated. Otherwise,
 				//mark it as unknown
-				if( ! $times_activated ){
-					$times_activated = array( 'unknown-date');
+				if ( ! $times_activated) {
+					$times_activated = array('unknown-date');
 				}
-				if( is_string( $times_activated ) ){
-					$times_activated = array( $times_activated );
+				if (is_string($times_activated)) {
+					$times_activated = array($times_activated);
 				}
-				foreach( $times_activated as $an_activation ){
-					if( $an_activation != 'unknown-date' &&
-							$an_activation > $most_recently_active_version_activation  ){
+				foreach ($times_activated as $an_activation) {
+					if ($an_activation != 'unknown-date' &&
+							$an_activation > $most_recently_active_version_activation) {
 						$most_recently_active_version = $version;
 						$most_recently_active_version_activation = $an_activation == 'unknown-date' ? '1970-01-01 00:00:00' : $an_activation;
 					}
 				}
 			}
 		}
-		return version_compare( $version_to_upgrade_to, $most_recently_active_version );
+		return version_compare($version_to_upgrade_to, $most_recently_active_version);
 	}
 
 
@@ -797,20 +797,20 @@ 
 	 * @return void
 	 */
 	public function redirect_to_about_ee() {
-		$notices = EE_Error::get_notices( FALSE );
+		$notices = EE_Error::get_notices(FALSE);
 		//if current user is an admin and it's not an ajax request
-		if(EE_Registry::instance()->CAP->current_user_can( 'manage_options', 'espresso_about_default' ) && ! ( defined('DOING_AJAX') && DOING_AJAX  ) && ! isset( $notices[ 'errors' ] ) ){
-			$query_params =  array( 'page' => 'espresso_about' );
+		if (EE_Registry::instance()->CAP->current_user_can('manage_options', 'espresso_about_default') && ! (defined('DOING_AJAX') && DOING_AJAX) && ! isset($notices['errors'])) {
+			$query_params = array('page' => 'espresso_about');
 
-			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation ) {
+			if (EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation) {
 			    $query_params['new_activation'] = TRUE;
 			}
 
-			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation ) {
+			if (EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation) {
 			    $query_params['reactivation'] = TRUE;
 			}
-			$url = add_query_arg( $query_params, admin_url( 'admin.php' ) );
-			wp_safe_redirect( $url );
+			$url = add_query_arg($query_params, admin_url('admin.php'));
+			wp_safe_redirect($url);
 			exit();
 		}
 	}
@@ -821,31 +821,31 @@ 
 	 *
 	 * @return void
 	 */
-	public function load_core_configuration(){
-		do_action( 'AHEE__EE_System__load_core_configuration__begin', $this );
-		EE_Registry::instance()->load_core( 'EE_Load_Textdomain' );
+	public function load_core_configuration() {
+		do_action('AHEE__EE_System__load_core_configuration__begin', $this);
+		EE_Registry::instance()->load_core('EE_Load_Textdomain');
 		//load textdomain
 		EE_Load_Textdomain::load_textdomain();
 		// load and setup EE_Config and EE_Network_Config
-		EE_Registry::instance()->load_core( 'Config' );
-		EE_Registry::instance()->load_core( 'Network_Config' );
+		EE_Registry::instance()->load_core('Config');
+		EE_Registry::instance()->load_core('Network_Config');
 		// setup autoloaders
 		// enable logging?
-		if ( EE_Registry::instance()->CFG->admin->use_full_logging ) {
-			EE_Registry::instance()->load_core( 'Log' );
+		if (EE_Registry::instance()->CFG->admin->use_full_logging) {
+			EE_Registry::instance()->load_core('Log');
 		}
 		// check for activation errors
-		$activation_errors = get_option( 'ee_plugin_activation_errors', FALSE );
-		if ( $activation_errors ) {
-			EE_Error::add_error( $activation_errors, __FILE__, __FUNCTION__, __LINE__ );
-			update_option( 'ee_plugin_activation_errors', FALSE );
+		$activation_errors = get_option('ee_plugin_activation_errors', FALSE);
+		if ($activation_errors) {
+			EE_Error::add_error($activation_errors, __FILE__, __FUNCTION__, __LINE__);
+			update_option('ee_plugin_activation_errors', FALSE);
 		}
 		// get model names
 		$this->_parse_model_names();
 
 		//load caf stuff a chance to play during the activation process too.
 		$this->_maybe_brew_regular();
-		do_action( 'AHEE__EE_System__load_core_configuration__complete', $this );
+		do_action('AHEE__EE_System__load_core_configuration__complete', $this);
 	}
 
 
@@ -854,23 +854,23 @@ 
 	 *
 	 * @return void
 	 */
-	private function _parse_model_names(){
+	private function _parse_model_names() {
 		//get all the files in the EE_MODELS folder that end in .model.php
-		$models = glob( EE_MODELS.'*.model.php');
+		$models = glob(EE_MODELS.'*.model.php');
 		$model_names = array();
 		$non_abstract_db_models = array();
-		foreach( $models as $model ){
+		foreach ($models as $model) {
 			// get model classname
-			$classname = EEH_File::get_classname_from_filepath_with_standard_filename( $model );
-			$shortname = str_replace( 'EEM_', '', $classname );
+			$classname = EEH_File::get_classname_from_filepath_with_standard_filename($model);
+			$shortname = str_replace('EEM_', '', $classname);
 			$reflectionClass = new ReflectionClass($classname);
-			if( $reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()){
+			if ($reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()) {
 				$non_abstract_db_models[$shortname] = $classname;
 			}
-			$model_names[ $shortname ] = $classname;
+			$model_names[$shortname] = $classname;
 		}
-		EE_Registry::instance()->models = apply_filters( 'FHEE__EE_System__parse_model_names', $model_names );
-		EE_Registry::instance()->non_abstract_db_models = apply_filters( 'FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models );
+		EE_Registry::instance()->models = apply_filters('FHEE__EE_System__parse_model_names', $model_names);
+		EE_Registry::instance()->non_abstract_db_models = apply_filters('FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models);
 	}
 
 
@@ -880,8 +880,8 @@ 
 	 * @return void
 	 */
 	private function _maybe_brew_regular() {
-		if (( ! defined( 'EE_DECAF' ) ||  EE_DECAF !== TRUE ) && is_readable( EE_CAFF_PATH . 'brewing_regular.php' )) {
-			require_once EE_CAFF_PATH . 'brewing_regular.php';
+		if (( ! defined('EE_DECAF') || EE_DECAF !== TRUE) && is_readable(EE_CAFF_PATH.'brewing_regular.php')) {
+			require_once EE_CAFF_PATH.'brewing_regular.php';
 		}
 	}
 
@@ -896,9 +896,9 @@ 
 	* @return void
 	*/
 	public function register_shortcodes_modules_and_widgets() {
-		do_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets' );
+		do_action('AHEE__EE_System__register_shortcodes_modules_and_widgets');
 		// check for addons using old hookpoint
-		if ( has_action( 'AHEE__EE_System__register_shortcodes_modules_and_addons' )) {
+		if (has_action('AHEE__EE_System__register_shortcodes_modules_and_addons')) {
 			$this->_incompatible_addon_error();
 		}
 	}
@@ -912,19 +912,19 @@ 
 	*/
 	private function _incompatible_addon_error() {
 		// get array of classes hooking into here
-		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook( 'AHEE__EE_System__register_shortcodes_modules_and_addons' );
-		if ( ! empty( $class_names )) {
-			$msg = __( 'The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso' );
+		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook('AHEE__EE_System__register_shortcodes_modules_and_addons');
+		if ( ! empty($class_names)) {
+			$msg = __('The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso');
 			$msg .= '<ul>';
-			foreach ( $class_names as $class_name ) {
-				$msg .= '<li><b>Event Espresso - ' . str_replace( array( 'EE_', 'EEM_', 'EED_', 'EES_', 'EEW_' ), '', $class_name ) . '</b></li>';
+			foreach ($class_names as $class_name) {
+				$msg .= '<li><b>Event Espresso - '.str_replace(array('EE_', 'EEM_', 'EED_', 'EES_', 'EEW_'), '', $class_name).'</b></li>';
 			}
 			$msg .= '</ul>';
-			$msg .= __( 'Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso' );
+			$msg .= __('Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso');
 			// save list of incompatible addons to wp-options for later use
-			add_option( 'ee_incompatible_addons', $class_names, '', 'no' );
-			if ( is_admin() ) {
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			add_option('ee_incompatible_addons', $class_names, '', 'no');
+			if (is_admin()) {
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
 	}
@@ -940,25 +940,25 @@ 
 	 *
 	 * @return void
 	 */
-	public function brew_espresso(){
-		do_action( 'AHEE__EE_System__brew_espresso__begin', $this );
+	public function brew_espresso() {
+		do_action('AHEE__EE_System__brew_espresso__begin', $this);
 		// load some final core systems
-		add_action( 'init', array( $this, 'set_hooks_for_core' ), 1 );
-		add_action( 'init', array( $this, 'perform_activations_upgrades_and_migrations' ), 3 );
-		add_action( 'init', array( $this, 'load_CPTs_and_session' ), 5 );
-		add_action( 'init', array( $this, 'load_controllers' ), 7 );
-		add_action( 'init', array( $this, 'core_loaded_and_ready' ), 9 );
-		add_action( 'init', array( $this, 'initialize' ), 10 );
-		add_action( 'init', array( $this, 'initialize_last' ), 100 );
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 25 );
-		add_action( 'admin_bar_menu', array( $this, 'espresso_toolbar_items' ), 100 );
-
-		if ( is_admin() && apply_filters( 'FHEE__EE_System__brew_espresso__load_pue', TRUE )  ) {
+		add_action('init', array($this, 'set_hooks_for_core'), 1);
+		add_action('init', array($this, 'perform_activations_upgrades_and_migrations'), 3);
+		add_action('init', array($this, 'load_CPTs_and_session'), 5);
+		add_action('init', array($this, 'load_controllers'), 7);
+		add_action('init', array($this, 'core_loaded_and_ready'), 9);
+		add_action('init', array($this, 'initialize'), 10);
+		add_action('init', array($this, 'initialize_last'), 100);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 25);
+		add_action('admin_bar_menu', array($this, 'espresso_toolbar_items'), 100);
+
+		if (is_admin() && apply_filters('FHEE__EE_System__brew_espresso__load_pue', TRUE)) {
 			// pew pew pew
-			EE_Registry::instance()->load_core( 'PUE' );
-			do_action( 'AHEE__EE_System__brew_espresso__after_pue_init' );
+			EE_Registry::instance()->load_core('PUE');
+			do_action('AHEE__EE_System__brew_espresso__after_pue_init');
 		}
-		do_action( 'AHEE__EE_System__brew_espresso__complete', $this );
+		do_action('AHEE__EE_System__brew_espresso__complete', $this);
 	}
 
 
@@ -972,7 +972,7 @@ 
 	 */
 	public function set_hooks_for_core() {
 		$this->_deactivate_incompatible_addons();
-		do_action( 'AHEE__EE_System__set_hooks_for_core' );
+		do_action('AHEE__EE_System__set_hooks_for_core');
 	}
 
 
@@ -981,15 +981,15 @@ 
 	 * Using the information gathered in EE_System::_incompatible_addon_error,
 	 * deactivates any addons considered incompatible with the current version of EE
 	 */
-	private function _deactivate_incompatible_addons(){
-		$incompatible_addons = get_option( 'ee_incompatible_addons', array() );
-		if ( ! empty( $incompatible_addons )) {
-			$active_plugins = get_option( 'active_plugins', array() );
-			foreach ( $active_plugins as $active_plugin ) {
-				foreach ( $incompatible_addons as $incompatible_addon ) {
-					if ( strpos( $active_plugin,  $incompatible_addon ) !== FALSE ) {
-						unset( $_GET['activate'] );
-						EE_System::deactivate_plugin( $active_plugin );
+	private function _deactivate_incompatible_addons() {
+		$incompatible_addons = get_option('ee_incompatible_addons', array());
+		if ( ! empty($incompatible_addons)) {
+			$active_plugins = get_option('active_plugins', array());
+			foreach ($active_plugins as $active_plugin) {
+				foreach ($incompatible_addons as $incompatible_addon) {
+					if (strpos($active_plugin, $incompatible_addon) !== FALSE) {
+						unset($_GET['activate']);
+						EE_System::deactivate_plugin($active_plugin);
 					}
 				}
 			}
@@ -1006,11 +1006,11 @@ 
 	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
 	 * @return    void
 	 */
-	public static function deactivate_plugin( $plugin_basename = '' ) {
-		if ( ! function_exists( 'deactivate_plugins' )) {
-			require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+	public static function deactivate_plugin($plugin_basename = '') {
+		if ( ! function_exists('deactivate_plugins')) {
+			require_once(ABSPATH.'wp-admin/includes/plugin.php');
 		}
-		deactivate_plugins( $plugin_basename );
+		deactivate_plugins($plugin_basename);
 	}
 
 
@@ -1022,7 +1022,7 @@ 
 	 *  	@return 	void
 	 */
 	public function perform_activations_upgrades_and_migrations() {
-		do_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' );
+		do_action('AHEE__EE_System__perform_activations_upgrades_and_migrations');
 	}
 
 
@@ -1038,11 +1038,11 @@ 
 //		EEM_Datetime::instance()->show_next_x_db_queries();
 //		$ds = EEM_Datetime::instance()->get_datetimes_for_event_ordered_by_start_time($e->ID(),false);
 //
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__start' );
+		do_action('AHEE__EE_System__load_CPTs_and_session__start');
 		// register Custom Post Types
-		EE_Registry::instance()->load_core( 'Register_CPTs' );
+		EE_Registry::instance()->load_core('Register_CPTs');
 //		EE_Registry::instance()->load_core( 'Session' );
-		do_action( 'AHEE__EE_System__load_CPTs_and_session__complete' );
+		do_action('AHEE__EE_System__load_CPTs_and_session__complete');
 	}
 
 
@@ -1057,16 +1057,16 @@ 
 	* @return void
 	*/
 	public function load_controllers() {
-		do_action( 'AHEE__EE_System__load_controllers__start' );
+		do_action('AHEE__EE_System__load_controllers__start');
 		// let's get it started
-		if ( ! is_admin() && !  EE_Maintenance_Mode::instance()->level() ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_front_controllers' );
-			EE_Registry::instance()->load_core( 'Front_Controller' );
-		} else if ( ! EE_FRONT_AJAX ) {
-			do_action( 'AHEE__EE_System__load_controllers__load_admin_controllers' );
-			EE_Registry::instance()->load_core( 'Admin' );
+		if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level()) {
+			do_action('AHEE__EE_System__load_controllers__load_front_controllers');
+			EE_Registry::instance()->load_core('Front_Controller');
+		} else if ( ! EE_FRONT_AJAX) {
+			do_action('AHEE__EE_System__load_controllers__load_admin_controllers');
+			EE_Registry::instance()->load_core('Admin');
 		}
-		do_action( 'AHEE__EE_System__load_controllers__complete' );
+		do_action('AHEE__EE_System__load_controllers__complete');
 	}
 
 
@@ -1080,10 +1080,10 @@ 
 	* @return void
 	*/
 	public function core_loaded_and_ready() {
-		do_action( 'AHEE__EE_System__core_loaded_and_ready' );
-		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
+		do_action('AHEE__EE_System__core_loaded_and_ready');
+		do_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons');
 //		add_action( 'wp_loaded', array( $this, 'set_hooks_for_shortcodes_modules_and_addons' ), 1 );
-		EE_Registry::instance()->load_core( 'Session' );
+		EE_Registry::instance()->load_core('Session');
 	}
 
 
@@ -1097,7 +1097,7 @@ 
 	* @return void
 	*/
 	public function initialize() {
-		do_action( 'AHEE__EE_System__initialize' );
+		do_action('AHEE__EE_System__initialize');
 //		EE_Cron_Tasks::check_for_abandoned_transactions( 802 );
 	}
 
@@ -1112,7 +1112,7 @@ 
 	* @return void
 	*/
 	public function initialize_last() {
-		do_action( 'AHEE__EE_System__initialize_last' );
+		do_action('AHEE__EE_System__initialize_last');
 	}
 
 
@@ -1144,21 +1144,21 @@ 
 	*/
 	public static function do_not_cache() {
 		// set no cache constants
-		if ( ! defined( 'DONOTCACHEPAGE' ) ) {
-			define( 'DONOTCACHEPAGE', true );
+		if ( ! defined('DONOTCACHEPAGE')) {
+			define('DONOTCACHEPAGE', true);
 		}
-		if ( ! defined( 'DONOTCACHCEOBJECT' ) ) {
-			define( 'DONOTCACHCEOBJECT', true );
+		if ( ! defined('DONOTCACHCEOBJECT')) {
+			define('DONOTCACHCEOBJECT', true);
 		}
-		if ( ! defined( 'DONOTCACHEDB' ) ) {
-			define( 'DONOTCACHEDB', true );
+		if ( ! defined('DONOTCACHEDB')) {
+			define('DONOTCACHEDB', true);
 		}
 		// add no cache headers
-		add_action( 'send_headers' , array( 'EE_System', 'nocache_headers' ), 10 );
+		add_action('send_headers', array('EE_System', 'nocache_headers'), 10);
 		// plus a little extra for nginx
-		add_filter( 'nocache_headers', array( 'EE_System', 'nocache_headers_nginx' ), 10, 1 );
+		add_filter('nocache_headers', array('EE_System', 'nocache_headers_nginx'), 10, 1);
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
-		remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head' );
+		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
 
 
@@ -1170,7 +1170,7 @@ 
 	 * @param $headers
 	 * @return    array
 	 */
-	public static function nocache_headers_nginx ( $headers ) {
+	public static function nocache_headers_nginx($headers) {
 		$headers['X-Accel-Expires'] = 0;
 		return $headers;
 	}
@@ -1196,15 +1196,15 @@ 
 	 * @param $admin_bar
 	 * @return    void
 	 */
-	public function espresso_toolbar_items( $admin_bar ) {
+	public function espresso_toolbar_items($admin_bar) {
 
 		// if in full M-Mode, or its an AJAX request, or user is NOT an admin
-		if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined( 'DOING_AJAX' ) || ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_top_level' )) {
+		if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined('DOING_AJAX') || ! EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_top_level')) {
 			return;
 		}
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		EE_Registry::instance()->load_helper( 'URL' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		EE_Registry::instance()->load_helper('URL');
 		$menu_class = 'espresso_menu_item_class';
 		//we don't use the constants EVENTS_ADMIN_URL or REG_ADMIN_URL
 		//because they're only defined in each of their respective constructors
@@ -1215,20 +1215,20 @@ 
 		//Top Level
 		$admin_bar->add_menu(array(
 				'id' => 'espresso-toolbar',
-				'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">' . _x('Event Espresso', 'admin bar menu group label', 'event_espresso') . '</span>',
+				'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">'._x('Event Espresso', 'admin bar menu group label', 'event_espresso').'</span>',
 				'href' => $events_admin_url,
 				'meta' => array(
 						'title' => __('Event Espresso', 'event_espresso'),
-						'class' => $menu_class . 'first'
+						'class' => $menu_class.'first'
 				),
 		));
 
 		//Events
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Events', 'event_espresso' ),
+					'title' => __('Events', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('Events', 'event_espresso'),
@@ -1239,13 +1239,13 @@ 
 		}
 
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new')) {
 			//Events Add New
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-new',
 					'parent' => 'espresso-toolbar-events',
 					'title' => __('Add New', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'create_new' ), $events_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'create_new'), $events_admin_url),
 					'meta' => array(
 							'title' => __('Add New', 'event_espresso'),
 							'target' => '',
@@ -1255,11 +1255,11 @@ 
 		}
 
 		//Events View
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-view',
 					'parent' => 'espresso-toolbar-events',
-					'title' => __( 'View', 'event_espresso' ),
+					'title' => __('View', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('View', 'event_espresso'),
@@ -1269,12 +1269,12 @@ 
 			));
 		}
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all')) {
 			//Events View All
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-all',
 					'parent' => 'espresso-toolbar-events-view',
-					'title' => __( 'All', 'event_espresso' ),
+					'title' => __('All', 'event_espresso'),
 					'href' => $events_admin_url,
 					'meta' => array(
 							'title' => __('All', 'event_espresso'),
@@ -1285,13 +1285,13 @@ 
 		}
 
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today')) {
 			//Events View Today
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-today',
 					'parent' => 'espresso-toolbar-events-view',
 					'title' => __('Today', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $events_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $events_admin_url),
 					'meta' => array(
 							'title' => __('Today', 'event_espresso'),
 							'target' => '',
@@ -1301,13 +1301,13 @@ 
 		}
 
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month')) {
 			//Events View This Month
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-events-month',
 					'parent' => 'espresso-toolbar-events-view',
-					'title' => __( 'This Month', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $events_admin_url ),
+					'title' => __('This Month', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $events_admin_url),
 					'meta' => array(
 							'title' => __('This Month', 'event_espresso'),
 							'target' => '',
@@ -1317,11 +1317,11 @@ 
 		}
 
 		//Registration Overview
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations',
 					'parent' => 'espresso-toolbar',
-					'title' => __( 'Registrations', 'event_espresso' ),
+					'title' => __('Registrations', 'event_espresso'),
 					'href' => $reg_admin_url,
 					'meta' => array(
 							'title' => __('Registrations', 'event_espresso'),
@@ -1332,12 +1332,12 @@ 
 		}
 
 		//Registration Overview Today
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today',
 					'parent' => 'espresso-toolbar-registrations',
-					'title' => __( 'Today', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $reg_admin_url ),
+					'title' => __('Today', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Today', 'event_espresso'),
 							'target' => '',
@@ -1347,14 +1347,14 @@ 
 		}
 
 		//Registration Overview Today Completed
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-approved',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ),
+					'title' => __('Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Approved', 'event_espresso' ),
+							'title' => __('Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1362,14 +1362,14 @@ 
 		}
 
 		//Registration Overview Today Pending\
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-pending',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Pending', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ),
+					'title' => __('Pending', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Pending Payment', 'event_espresso' ),
+							'title' => __('Pending Payment', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1377,14 +1377,14 @@ 
 		}
 
 		//Registration Overview Today Incomplete
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-not-approved',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Not Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ),
+					'title' => __('Not Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Not Approved', 'event_espresso' ),
+							'title' => __('Not Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1392,12 +1392,12 @@ 
 		}
 
 		//Registration Overview Today Incomplete
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-today-cancelled',
 					'parent' => 'espresso-toolbar-registrations-today',
-					'title' => __( 'Cancelled', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ),
+					'title' => __('Cancelled', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Cancelled', 'event_espresso'),
 							'target' => '',
@@ -1407,12 +1407,12 @@ 
 		}
 
 		//Registration Overview This Month
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month',
 					'parent' => 'espresso-toolbar-registrations',
-					'title' => __( 'This Month', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $reg_admin_url ),
+					'title' => __('This Month', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $reg_admin_url),
 					'meta' => array(
 							'title' => __('This Month', 'event_espresso'),
 							'target' => '',
@@ -1422,12 +1422,12 @@ 
 		}
 
 		//Registration Overview This Month Approved
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-approved',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Approved', 'event_espresso' ),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ),
+					'title' => __('Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Approved', 'event_espresso'),
 							'target' => '',
@@ -1437,12 +1437,12 @@ 
 		}
 
 		//Registration Overview This Month Pending
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-pending',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Pending', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ),
+					'title' => __('Pending', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Pending', 'event_espresso'),
 							'target' => '',
@@ -1452,14 +1452,14 @@ 
 		}
 
 		//Registration Overview This Month Not Approved
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-not-approved',
 					'parent' => 'espresso-toolbar-registrations-month',
-					'title' => __( 'Not Approved', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ),
+					'title' => __('Not Approved', 'event_espresso'),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url),
 					'meta' => array(
-							'title' => __('Not Approved', 'event_espresso' ),
+							'title' => __('Not Approved', 'event_espresso'),
 							'target' => '',
 							'class' => $menu_class
 					),
@@ -1468,12 +1468,12 @@ 
 
 
 		//Registration Overview This Month Cancelled
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled')) {
 			$admin_bar->add_menu(array(
 					'id' => 'espresso-toolbar-registrations-month-cancelled',
 					'parent' => 'espresso-toolbar-registrations-month',
 					'title' => __('Cancelled', 'event_espresso'),
-					'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ),
+					'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url),
 					'meta' => array(
 							'title' => __('Cancelled', 'event_espresso'),
 							'target' => '',
@@ -1494,8 +1494,8 @@ 
 	 * @param  array  $exclude_array any existing pages being excluded are in this array.
 	 * @return array
 	 */
-	public function remove_pages_from_wp_list_pages( $exclude_array ) {
-		return  array_merge( $exclude_array, EE_Registry::instance()->CFG->core->get_critical_pages_array() );
+	public function remove_pages_from_wp_list_pages($exclude_array) {
+		return  array_merge($exclude_array, EE_Registry::instance()->CFG->core->get_critical_pages_array());
 	}
 
 
@@ -1515,11 +1515,11 @@ 
 	 */
 	public function wp_enqueue_scripts() {
 		// unlike other systems, EE_System_scripts loading is turned ON by default, but prior to the init hook, can be turned off via: add_filter( 'FHEE_load_EE_System_scripts', '__return_false' );
-		if ( apply_filters( 'FHEE_load_EE_System_scripts', TRUE ) ) {
+		if (apply_filters('FHEE_load_EE_System_scripts', TRUE)) {
 			// jquery_validate loading is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-			if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+			if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 				// register jQuery Validate
-				wp_register_script( 'jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.11.1', TRUE );
+				wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.11.1', TRUE);
 			}
 		}
 	}

Indentation +73 added lines, -73 removed lines

@@ -468,13 +468,13 @@ 
 
 
 	/**
-	* load_espresso_addons
-	*
-	* allow addons to load first so that they can set hooks for running DMS's, etc
-	*
-	* @access public
-	* @return void
-	*/
+	 * load_espresso_addons
+	 *
+	 * allow addons to load first so that they can set hooks for running DMS's, etc
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function load_espresso_addons() {
 		// set autoloaders for all of the classes implementing EEI_Plugin_API
 		// which provide helpers for EE plugin authors to more easily register certain components with EE.
@@ -498,14 +498,14 @@ 
 		}
 	}
 	/**
-	* detect_if_activation_or_upgrade
-	*
-	* Takes care of detecting whether this is a brand new install or code upgrade,
-	* and either setting up the DB or setting up maintenance mode etc.
-	*
-	* @access private
-	* @return void
-	*/
+	 * detect_if_activation_or_upgrade
+	 *
+	 * Takes care of detecting whether this is a brand new install or code upgrade,
+	 * and either setting up the DB or setting up maintenance mode etc.
+	 *
+	 * @access private
+	 * @return void
+	 */
 	public function detect_if_activation_or_upgrade() {
 		do_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin');
 
@@ -803,11 +803,11 @@ 
 			$query_params =  array( 'page' => 'espresso_about' );
 
 			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation ) {
-			    $query_params['new_activation'] = TRUE;
+				$query_params['new_activation'] = TRUE;
 			}
 
 			if ( EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation ) {
-			    $query_params['reactivation'] = TRUE;
+				$query_params['reactivation'] = TRUE;
 			}
 			$url = add_query_arg( $query_params, admin_url( 'admin.php' ) );
 			wp_safe_redirect( $url );
@@ -888,13 +888,13 @@ 
 
 
 	/**
-	* register_shortcodes_modules_and_widgets
-	*
-	* generate lists of shortcodes and modules, then verify paths and classes
-	*
-	* @access public
-	* @return void
-	*/
+	 * register_shortcodes_modules_and_widgets
+	 *
+	 * generate lists of shortcodes and modules, then verify paths and classes
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function register_shortcodes_modules_and_widgets() {
 		do_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets' );
 		// check for addons using old hookpoint
@@ -905,11 +905,11 @@ 
 
 
 	/**
-	* _incompatible_addon_error
-	*
-	* @access public
-	* @return void
-	*/
+	 * _incompatible_addon_error
+	 *
+	 * @access public
+	 * @return void
+	 */
 	private function _incompatible_addon_error() {
 		// get array of classes hooking into here
 		$class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook( 'AHEE__EE_System__register_shortcodes_modules_and_addons' );
@@ -1048,14 +1048,14 @@ 
 
 
 	/**
-	* load_controllers
-	*
-	* this is the best place to load any additional controllers that needs access to EE core.
-	* it is expected that all basic core EE systems, that are not dependant on the current request are loaded at this time
-	*
-	* @access public
-	* @return void
-	*/
+	 * load_controllers
+	 *
+	 * this is the best place to load any additional controllers that needs access to EE core.
+	 * it is expected that all basic core EE systems, that are not dependant on the current request are loaded at this time
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function load_controllers() {
 		do_action( 'AHEE__EE_System__load_controllers__start' );
 		// let's get it started
@@ -1072,13 +1072,13 @@ 
 
 
 	/**
-	* core_loaded_and_ready
-	*
-	* all of the basic EE core should be loaded at this point and available regardless of M-Mode
-	*
-	* @access public
-	* @return void
-	*/
+	 * core_loaded_and_ready
+	 *
+	 * all of the basic EE core should be loaded at this point and available regardless of M-Mode
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function core_loaded_and_ready() {
 		do_action( 'AHEE__EE_System__core_loaded_and_ready' );
 		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
@@ -1089,13 +1089,13 @@ 
 
 
 	/**
-	* initialize
-	*
-	* this is the best place to begin initializing client code
-	*
-	* @access public
-	* @return void
-	*/
+	 * initialize
+	 *
+	 * this is the best place to begin initializing client code
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function initialize() {
 		do_action( 'AHEE__EE_System__initialize' );
 //		EE_Cron_Tasks::check_for_abandoned_transactions( 802 );
@@ -1104,13 +1104,13 @@ 
 
 
 	/**
-	* initialize_last
-	*
-	* this is run really late during the WP init hookpoint, and ensures that mostly everything else that needs to initialize has done so
-	*
-	* @access public
-	* @return void
-	*/
+	 * initialize_last
+	 *
+	 * this is run really late during the WP init hookpoint, and ensures that mostly everything else that needs to initialize has done so
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function initialize_last() {
 		do_action( 'AHEE__EE_System__initialize_last' );
 	}
@@ -1119,14 +1119,14 @@ 
 
 
 	/**
-	* set_hooks_for_shortcodes_modules_and_addons
-	*
-	* this is the best place for other systems to set callbacks for hooking into other parts of EE
-	* this happens at the very beginning of the wp_loaded hookpoint
-	*
-	* @access public
-	* @return void
-	*/
+	 * set_hooks_for_shortcodes_modules_and_addons
+	 *
+	 * this is the best place for other systems to set callbacks for hooking into other parts of EE
+	 * this happens at the very beginning of the wp_loaded hookpoint
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function set_hooks_for_shortcodes_modules_and_addons() {
 //		do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' );
 	}
@@ -1135,13 +1135,13 @@ 
 
 
 	/**
-	* do_not_cache
-	*
-	* sets no cache headers and defines no cache constants for WP plugins
-	*
-	* @access public
-	* @return void
-	*/
+	 * do_not_cache
+	 *
+	 * sets no cache headers and defines no cache constants for WP plugins
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public static function do_not_cache() {
 		// set no cache constants
 		if ( ! defined( 'DONOTCACHEPAGE' ) ) {

core/helpers/EEH_Event_Query.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 	 *
 	 * @access    private
 	 * @param string $sort
-	 * @return    array
+	 * @return    string
 	 */
 	private static function _sort( $sort = 'ASC' ) {
 		$sort = EE_Registry::instance()->REQ->is_set( 'event_query_sort' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'event_query_sort' ) ) : $sort;

Spacing +117 added lines, -117 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');
 }
 /**
  * Event Espresso
@@ -85,7 +85,7 @@ 
 	 */
 	public static function add_query_filters() {
 		//add query filters
-		add_action( 'pre_get_posts', array( 'EEH_Event_Query', 'filter_query_parts' ), 10, 1 );
+		add_action('pre_get_posts', array('EEH_Event_Query', 'filter_query_parts'), 10, 1);
 	}
 
 
@@ -97,8 +97,8 @@ 
 	 * @param \WP_Query $WP_Query
 	 * @return bool
 	 */
-	public static function apply_query_filters( WP_Query $WP_Query ) {
-		return ( isset( $WP_Query->query, $WP_Query->query['post_type'] ) && $WP_Query->query['post_type'] == 'espresso_events' ) ||  apply_filters( 'FHEE__EEH_Event_Query__apply_query_filters', false ) ? true : false;
+	public static function apply_query_filters(WP_Query $WP_Query) {
+		return (isset($WP_Query->query, $WP_Query->query['post_type']) && $WP_Query->query['post_type'] == 'espresso_events') || apply_filters('FHEE__EEH_Event_Query__apply_query_filters', false) ? true : false;
 	}
 
 
@@ -108,15 +108,15 @@ 
 	 * @access    public
 	 * @param \WP_Query $WP_Query
 	 */
-	public static function filter_query_parts( WP_Query $WP_Query ) {
+	public static function filter_query_parts(WP_Query $WP_Query) {
 		//ONLY add our filters if this isn't the main wp_query, because if this is the main wp_query we already have our cpt strategies take care of adding things in.
-		if ( $WP_Query instanceof WP_Query && ! $WP_Query->is_main_query() ) {
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_main_query()) {
 			// build event list query
-			add_filter( 'posts_fields', array( 'EEH_Event_Query', 'posts_fields' ), 10, 2 );
-			add_filter( 'posts_join', array( 'EEH_Event_Query', 'posts_join' ), 10, 2 );
-			add_filter( 'posts_where', array( 'EEH_Event_Query', 'posts_where' ), 10, 2 );
-			add_filter( 'posts_orderby', array( 'EEH_Event_Query', 'posts_orderby' ), 10, 2 );
-			add_filter( 'posts_clauses_request', array( 'EEH_Event_Query', 'posts_clauses' ), 10, 2 );
+			add_filter('posts_fields', array('EEH_Event_Query', 'posts_fields'), 10, 2);
+			add_filter('posts_join', array('EEH_Event_Query', 'posts_join'), 10, 2);
+			add_filter('posts_where', array('EEH_Event_Query', 'posts_where'), 10, 2);
+			add_filter('posts_orderby', array('EEH_Event_Query', 'posts_orderby'), 10, 2);
+			add_filter('posts_clauses_request', array('EEH_Event_Query', 'posts_clauses'), 10, 2);
 		}
 	}
 
@@ -131,13 +131,13 @@ 
 	 * @param string $orderby
 	 * @param string $sort
 	 */
-	public static function set_query_params( $month = '', $category = '', $show_expired = FALSE, $orderby = 'start_date', $sort = 'ASC' ) {
+	public static function set_query_params($month = '', $category = '', $show_expired = FALSE, $orderby = 'start_date', $sort = 'ASC') {
 		self::$_query_params = array();
-		EEH_Event_Query::$_event_query_month = EEH_Event_Query::_display_month( $month );
-		EEH_Event_Query::$_event_query_category = EEH_Event_Query::_event_category_slug( $category );
-		EEH_Event_Query::$_event_query_show_expired = EEH_Event_Query::_show_expired( $show_expired );
-		EEH_Event_Query::$_event_query_orderby = EEH_Event_Query::_orderby( $orderby );
-		EEH_Event_Query::$_event_query_sort = EEH_Event_Query::_sort( $sort );
+		EEH_Event_Query::$_event_query_month = EEH_Event_Query::_display_month($month);
+		EEH_Event_Query::$_event_query_category = EEH_Event_Query::_event_category_slug($category);
+		EEH_Event_Query::$_event_query_show_expired = EEH_Event_Query::_show_expired($show_expired);
+		EEH_Event_Query::$_event_query_orderby = EEH_Event_Query::_orderby($orderby);
+		EEH_Event_Query::$_event_query_sort = EEH_Event_Query::_sort($sort);
 	}
 
 
@@ -149,8 +149,8 @@ 
 	 * @param string $month
 	 * @return    string
 	 */
-	private static function _display_month( $month = '' ) {
-		return EE_Registry::instance()->REQ->is_set( 'event_query_month' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'event_query_month' ) ) : $month;
+	private static function _display_month($month = '') {
+		return EE_Registry::instance()->REQ->is_set('event_query_month') ? sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month')) : $month;
 	}
 
 
@@ -162,8 +162,8 @@ 
 	 * @param string $category
 	 * @return    string
 	 */
-	private static function _event_category_slug( $category = '' ) {
-		return EE_Registry::instance()->REQ->is_set( 'event_query_category' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'event_query_category' ) ) : $category;
+	private static function _event_category_slug($category = '') {
+		return EE_Registry::instance()->REQ->is_set('event_query_category') ? sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_category')) : $category;
 	}
 
 
@@ -175,10 +175,10 @@ 
 	 * @param bool $show_expired
 	 * @return    boolean
 	 */
-	private static function _show_expired( $show_expired = FALSE ) {
+	private static function _show_expired($show_expired = FALSE) {
 		// override default expired option if set via filter
-		$_event_query_show_expired =EE_Registry::instance()->REQ->is_set( 'event_query_show_expired' ) ? EE_Registry::instance()->REQ->get( 'event_query_show_expired' ) : $show_expired;
-		return filter_var( $_event_query_show_expired, FILTER_VALIDATE_BOOLEAN );
+		$_event_query_show_expired = EE_Registry::instance()->REQ->is_set('event_query_show_expired') ? EE_Registry::instance()->REQ->get('event_query_show_expired') : $show_expired;
+		return filter_var($_event_query_show_expired, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -190,10 +190,10 @@ 
 	 * @param    string $orderby
 	 * @return    array
 	 */
-	private static function _orderby( $orderby = 'start_date' ) {
-		$event_query_orderby = EE_Registry::instance()->REQ->is_set( 'event_query_orderby' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'event_query_orderby' ) ) : $orderby;
-		$event_query_orderby = is_array( $event_query_orderby ) ? $event_query_orderby : explode( ',', $event_query_orderby );
-		$event_query_orderby = array_map( 'trim', $event_query_orderby );
+	private static function _orderby($orderby = 'start_date') {
+		$event_query_orderby = EE_Registry::instance()->REQ->is_set('event_query_orderby') ? sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_orderby')) : $orderby;
+		$event_query_orderby = is_array($event_query_orderby) ? $event_query_orderby : explode(',', $event_query_orderby);
+		$event_query_orderby = array_map('trim', $event_query_orderby);
 		return $event_query_orderby;
 	}
 
@@ -206,9 +206,9 @@ 
 	 * @param string $sort
 	 * @return    array
 	 */
-	private static function _sort( $sort = 'ASC' ) {
-		$sort = EE_Registry::instance()->REQ->is_set( 'event_query_sort' ) ? sanitize_text_field( EE_Registry::instance()->REQ->get( 'event_query_sort' ) ) : $sort;
-		return in_array( $sort, array( 'ASC', 'asc', 'DESC', 'desc' )) ? strtoupper( $sort ) : 'ASC';
+	private static function _sort($sort = 'ASC') {
+		$sort = EE_Registry::instance()->REQ->is_set('event_query_sort') ? sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_sort')) : $sort;
+		return in_array($sort, array('ASC', 'asc', 'DESC', 'desc')) ? strtoupper($sort) : 'ASC';
 	}
 
 
@@ -221,8 +221,8 @@ 
 	 *
 	 * @return array   array of clauses
 	 */
-	public static function posts_clauses( $clauses, WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_clauses($clauses, WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			$clauses['distinct'] = "DISTINCT";
 		}
 		return $clauses;
@@ -238,10 +238,10 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public static function posts_fields( $SQL, WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_fields($SQL, WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			// adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
-			$SQL .= EEH_Event_Query::posts_fields_sql_for_orderby( EEH_Event_Query::$_event_query_orderby );
+			$SQL .= EEH_Event_Query::posts_fields_sql_for_orderby(EEH_Event_Query::$_event_query_orderby);
 		}
 		return $SQL;
 	}
@@ -256,29 +256,29 @@ 
 	 * @internal  param bool|string $mixed $join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
 	 * @return    string
 	 */
-	public static function posts_fields_sql_for_orderby( $orderby_params = array() ) {
-		$SQL= '';
-		foreach( (array)$orderby_params as $orderby ) {
-			switch ( $orderby ) {
+	public static function posts_fields_sql_for_orderby($orderby_params = array()) {
+		$SQL = '';
+		foreach ((array) $orderby_params as $orderby) {
+			switch ($orderby) {
 
 				case 'ticket_start' :
-					$SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_start_date' ;
+					$SQL .= ', '.EEM_Ticket::instance()->table().'.TKT_start_date';
 					break;
 
 				case 'ticket_end' :
-					$SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_end_date' ;
+					$SQL .= ', '.EEM_Ticket::instance()->table().'.TKT_end_date';
 					break;
 
 				case 'venue_title' :
-					$SQL .= ', Venue.post_title AS venue_title' ;
+					$SQL .= ', Venue.post_title AS venue_title';
 					break;
 
 				case 'city' :
-					$SQL .= ', ' . EEM_Venue::instance()->second_table() . '.VNU_city' ;
+					$SQL .= ', '.EEM_Venue::instance()->second_table().'.VNU_city';
 					break;
 
 				case 'state' :
-					$SQL .= ', ' . EEM_State::instance()->table() . '.STA_name' ;
+					$SQL .= ', '.EEM_State::instance()->table().'.STA_name';
 					break;
 
 			}
@@ -296,12 +296,12 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public static function posts_join( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_join($SQL = '', WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			// Category
-			$SQL = EEH_Event_Query::posts_join_sql_for_show_expired( $SQL, EEH_Event_Query::$_event_query_show_expired );
-			$SQL = EEH_Event_Query::posts_join_sql_for_terms( $SQL, EEH_Event_Query::$_event_query_category );
-			$SQL = EEH_Event_Query::posts_join_for_orderby( $SQL, EEH_Event_Query::$_event_query_orderby );
+			$SQL = EEH_Event_Query::posts_join_sql_for_show_expired($SQL, EEH_Event_Query::$_event_query_show_expired);
+			$SQL = EEH_Event_Query::posts_join_sql_for_terms($SQL, EEH_Event_Query::$_event_query_category);
+			$SQL = EEH_Event_Query::posts_join_for_orderby($SQL, EEH_Event_Query::$_event_query_orderby);
 		}
 		return $SQL;
 	}
@@ -316,11 +316,11 @@ 
 	 * @param    boolean $show_expired if TRUE, then displayed past events
 	 * @return string
 	 */
-	public static function posts_join_sql_for_show_expired( $SQL = '', $show_expired = FALSE ) {
-		if ( ! $show_expired ) {
-			$join = EEM_Event::instance()->table() . '.ID = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
-			if ( strpos( $SQL, $join ) === FALSE ) {
-				$SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' ) ';
+	public static function posts_join_sql_for_show_expired($SQL = '', $show_expired = FALSE) {
+		if ( ! $show_expired) {
+			$join = EEM_Event::instance()->table().'.ID = '.EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name();
+			if (strpos($SQL, $join) === FALSE) {
+				$SQL .= ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' ) ';
 			}
 		}
 		return $SQL;
@@ -336,8 +336,8 @@ 
 	 * @param 	string $join_terms pass TRUE or term string, doesn't really matter since this value doesn't really get used for anything yet
 	 * @return 	string
 	 */
-	public static function posts_join_sql_for_terms( $SQL = '', $join_terms = '' ) {
-		if ( ! empty( $join_terms ) ) {
+	public static function posts_join_sql_for_terms($SQL = '', $join_terms = '') {
+		if ( ! empty($join_terms)) {
 			global $wpdb;
 			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
 			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -357,25 +357,25 @@ 
 	 * @param 	array $orderby_params
 	 * @return 	string
 	 */
-	public static function posts_join_for_orderby( $SQL = '', $orderby_params = array() ) {
-		foreach ( (array)$orderby_params as $orderby ) {
-			switch ( $orderby ) {
+	public static function posts_join_for_orderby($SQL = '', $orderby_params = array()) {
+		foreach ((array) $orderby_params as $orderby) {
+			switch ($orderby) {
 				case 'ticket_start' :
 				case 'ticket_end' :
-					$SQL .= EEH_Event_Query::_posts_join_for_datetime( $SQL, EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name() );
-					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table() . ' ON (' . EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name() . ' = ' . EEM_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name() . ' )';
+					$SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Datetime_Ticket::instance()->table().'.'.EEM_Datetime::instance()->primary_key_name());
+					$SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table().' ON ('.EEM_Datetime_Ticket::instance()->table().'.'.EEM_Ticket::instance()->primary_key_name().' = '.EEM_Ticket::instance()->table().'.'.EEM_Ticket::instance()->primary_key_name().' )';
 					break;
 				case 'venue_title' :
 				case 'city' :
-					$SQL .= EEH_Event_Query::_posts_join_for_event_venue( $SQL );
+					$SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
 					break;
 				case 'state' :
-					$SQL .= EEH_Event_Query::_posts_join_for_event_venue( $SQL );
-					$SQL .= EEH_Event_Query::_posts_join_for_venue_state( $SQL );
+					$SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
+					$SQL .= EEH_Event_Query::_posts_join_for_venue_state($SQL);
 					break;
 				case 'start_date' :
 				default :
-					$SQL .= EEH_Event_Query::_posts_join_for_datetime( $SQL, EEM_Event::instance()->table() . '.ID' );
+					$SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table().'.ID');
 					break;
 
 			}
@@ -393,11 +393,11 @@ 
 	 * @param string $join
 	 * @return string
 	 */
-	protected static function _posts_join_for_datetime( $SQL = '', $join = '' ) {
-		if ( ! empty( $join )) {
-			$join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
-			if ( strpos( $SQL, $join ) === FALSE ) {
-				return ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' )';
+	protected static function _posts_join_for_datetime($SQL = '', $join = '') {
+		if ( ! empty($join)) {
+			$join .= ' = '.EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name();
+			if (strpos($SQL, $join) === FALSE) {
+				return ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' )';
 			}
 		}
 		return '';
@@ -412,13 +412,13 @@ 
 	 * @param string $SQL
 	 * @return string
 	 */
-	protected static function _posts_join_for_event_venue( $SQL = '' ) {
+	protected static function _posts_join_for_event_venue($SQL = '') {
 		// Event Venue table name
 		$event_venue_table = EEM_Event_Venue::instance()->table();
 		// generate conditions for:  Event <=> Event Venue  JOIN clause
-		$event_to_event_venue_join = EEM_Event::instance()->table() . '.ID = ' . $event_venue_table . '.' . EEM_Event::instance()->primary_key_name();
+		$event_to_event_venue_join = EEM_Event::instance()->table().'.ID = '.$event_venue_table.'.'.EEM_Event::instance()->primary_key_name();
 		// don't add joins if they have already been added
-		if ( strpos( $SQL, $event_to_event_venue_join ) === FALSE ) {
+		if (strpos($SQL, $event_to_event_venue_join) === FALSE) {
 			// Venue table name
 			$venue_table = EEM_Venue::instance()->table();
 			// Venue table pk
@@ -431,10 +431,10 @@ 
 			$venue_SQL .= " LEFT JOIN $venue_table as Venue ON ( $event_venue_table.$venue_table_pk = Venue.ID )";
 			// generate JOIN clause for: Venue <=> Venue Meta
 			$venue_SQL .= " LEFT JOIN $venue_meta_table ON ( Venue.ID = $venue_meta_table.$venue_table_pk )";
-			unset( $event_venue_table, $event_to_event_venue_join, $venue_table, $venue_table_pk, $venue_meta_table );
+			unset($event_venue_table, $event_to_event_venue_join, $venue_table, $venue_table_pk, $venue_meta_table);
 			return $venue_SQL;
 		}
-		unset( $event_venue_table, $event_to_event_venue_join );
+		unset($event_venue_table, $event_to_event_venue_join);
 		return '';
 	}
 
@@ -447,7 +447,7 @@ 
 	 * @param string $SQL
 	 * @return string
 	 */
-	protected static function _posts_join_for_venue_state( $SQL = '' ) {
+	protected static function _posts_join_for_venue_state($SQL = '') {
 		// Venue Meta table name
 		$venue_meta_table = EEM_Venue::instance()->second_table();
 		// State table name
@@ -455,16 +455,16 @@ 
 		// State table pk
 		$state_table_pk = EEM_State::instance()->primary_key_name();
 		// verify vars
-		if ( $venue_meta_table && $state_table && $state_table_pk ) {
+		if ($venue_meta_table && $state_table && $state_table_pk) {
 			// like: wp_esp_venue_meta.STA_ID = wp_esp_state.STA_ID
 			$join = "$venue_meta_table.$state_table_pk = $state_table.$state_table_pk";
 			// don't add join if it has already been added
-			if ( strpos( $SQL, $join ) === FALSE ) {
-				unset( $state_table_pk, $venue_meta_table, $venue_table_pk );
+			if (strpos($SQL, $join) === FALSE) {
+				unset($state_table_pk, $venue_meta_table, $venue_table_pk);
 				return " LEFT JOIN $state_table ON ( $join )";
 			}
 		}
-		unset( $join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk );
+		unset($join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk);
 		return '';
 	}
 
@@ -478,14 +478,14 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public static function posts_where( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
+	public static function posts_where($SQL = '', WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
 			// Show Expired ?
-			$SQL .= EEH_Event_Query::posts_where_sql_for_show_expired( EEH_Event_Query::$_event_query_show_expired  );
+			$SQL .= EEH_Event_Query::posts_where_sql_for_show_expired(EEH_Event_Query::$_event_query_show_expired);
 			// Category
-			$SQL .= EEH_Event_Query::posts_where_sql_for_event_category_slug( EEH_Event_Query::$_event_query_category  );
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_category_slug(EEH_Event_Query::$_event_query_category);
 			// Start Date
-			$SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month( EEH_Event_Query::$_event_query_month );
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month(EEH_Event_Query::$_event_query_month);
 		}
 		return $SQL;
 	}
@@ -499,8 +499,8 @@ 
 	 * @param    boolean $show_expired if TRUE, then displayed past events
 	 * @return    string
 	 */
-	public static function posts_where_sql_for_show_expired( $show_expired = FALSE ) {
-		return ! $show_expired ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > "' . current_time( 'mysql', TRUE ) . '" ' : '';
+	public static function posts_where_sql_for_show_expired($show_expired = FALSE) {
+		return ! $show_expired ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > "'.current_time('mysql', TRUE).'" ' : '';
 	}
 
 
@@ -512,9 +512,9 @@ 
 	 * @param    boolean $event_category_slug
 	 * @return    string
 	 */
-	public static function posts_where_sql_for_event_category_slug( $event_category_slug = NULL ) {
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = NULL) {
 		global $wpdb;
-		return ! empty( $event_category_slug ) ? ' AND ' . $wpdb->terms . '.slug = "' . $event_category_slug . '" ' : '';
+		return ! empty($event_category_slug) ? ' AND '.$wpdb->terms.'.slug = "'.$event_category_slug.'" ' : '';
 	}
 
 
@@ -526,13 +526,13 @@ 
 	 * @param    boolean $month
 	 * @return    string
 	 */
-	public static function posts_where_sql_for_event_list_month( $month = NULL ) {
+	public static function posts_where_sql_for_event_list_month($month = NULL) {
 		$SQL = '';
-		if ( ! empty( $month ) ) {
+		if ( ! empty($month)) {
 			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-			$SQL = ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start <= "' . gmdate( 'Y-m-t 23:59:59', strtotime( $month ) ) . '"';
+			$SQL = ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_start <= "'.gmdate('Y-m-t 23:59:59', strtotime($month)).'"';
 			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
-			$SQL .= ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end >= "' . gmdate( 'Y-m-01 0:0:00', strtotime( $month ) ) . '" ';
+			$SQL .= ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end >= "'.gmdate('Y-m-01 0:0:00', strtotime($month)).'" ';
 		}
 		return $SQL;
 	}
@@ -547,9 +547,9 @@ 
 	 * @param WP_Query $wp_query
 	 * @return    string
 	 */
-	public static function posts_orderby( $SQL = '', WP_Query $wp_query ) {
-		if ( EEH_Event_Query::apply_query_filters( $wp_query ) ) {
-			$SQL = EEH_Event_Query::posts_orderby_sql( EEH_Event_Query::$_event_query_orderby, EEH_Event_Query::$_event_query_sort );
+	public static function posts_orderby($SQL = '', WP_Query $wp_query) {
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			$SQL = EEH_Event_Query::posts_orderby_sql(EEH_Event_Query::$_event_query_orderby, EEH_Event_Query::$_event_query_sort);
 		}
 		return $SQL;
 	}
@@ -580,63 +580,63 @@ 
 	 * @param string     $sort
 	 * @return string
 	 */
-	public static function posts_orderby_sql( $orderby_params = array(), $sort = 'ASC' ) {
+	public static function posts_orderby_sql($orderby_params = array(), $sort = 'ASC') {
 		global $wpdb;
 		$SQL = '';
 		$counter = 0;
 		//make sure 'orderby' is set in query params
-		if ( ! isset( self::$_query_params['orderby'] )) {
+		if ( ! isset(self::$_query_params['orderby'])) {
 			self::$_query_params['orderby'] = array();
 		}
 		// loop thru $orderby_params (type cast as array)
-		foreach ( (array)$orderby_params as $orderby ) {
+		foreach ((array) $orderby_params as $orderby) {
 			// check if we have already added this param
-			if ( isset( self::$_query_params['orderby'][ $orderby ] )) {
+			if (isset(self::$_query_params['orderby'][$orderby])) {
 				// if so then remove from the $orderby_params so that the count() method below is accurate
-				unset( $orderby_params[ $orderby ] );
+				unset($orderby_params[$orderby]);
 				// then bump ahead to the next param
 				continue;
 			}
 			// this will ad a comma depending on whether this is the first or last param
-			$glue = $counter == 0 || $counter == count( $orderby_params ) ? ' ' : ', ';
+			$glue = $counter == 0 || $counter == count($orderby_params) ? ' ' : ', ';
 			// ok what's we dealing with?
-			switch ( $orderby ) {
+			switch ($orderby) {
 				case 'id' :
 				case 'ID' :
-					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.ID '.$sort;
 					break;
 				case 'end_date' :
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
 					break;
 				case 'event_name' :
-					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+					$SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
 					break;
 				case 'category_slug' :
-					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+					$SQL .= $glue.$wpdb->terms.'.slug '.$sort;
 					break;
 				case 'ticket_start' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
 					break;
 				case 'ticket_end' :
-					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+					$SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
 					break;
 				case 'venue_title' :
-					$SQL .= $glue . 'venue_title ' . $sort;
+					$SQL .= $glue.'venue_title '.$sort;
 					break;
 				case 'city' :
-					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+					$SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
 					break;
 				case 'state' :
-					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+					$SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
 					break;
 				case 'start_date' :
 				default :
-					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_start ' . $sort;
+					$SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_start '.$sort;
 					break;
 			}
 			// add to array of orderby params that have been added
-			self::$_query_params['orderby'][ $orderby ] = TRUE;
-			$counter ++;
+			self::$_query_params['orderby'][$orderby] = TRUE;
+			$counter++;
 		}
 		return $SQL;
 	}

core/helpers/EEH_Event_View.helper.php

Doc Comments +6 added lines, -6 removed lines

@@ -116,7 +116,7 @@ 
 	 *
 	 *  @access 	public
 	 * @param    int $EVT_ID
-	 *  @return 	string
+	 *  @return 	boolean
 	 */
 	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -136,7 +136,7 @@ 
 	 *    event_active_status
 	 *
 	 * @access    public
-	 * @param null $num_words
+	 * @param integer $num_words
 	 * @param null $more
 	 * @return    string
 	 */
@@ -322,7 +322,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_primary_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -347,7 +347,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_last_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -372,7 +372,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @return    string
+	 * @return    string|null
 	 */
 	public static function get_earliest_date_obj( $EVT_ID = 0 ) {
 		$event = EEH_Event_View::get_event( $EVT_ID );
@@ -422,7 +422,7 @@ 
 	 *
 	 * @access    public
 	 * @param int $EVT_ID
-	 * @param null $include_expired
+	 * @param false|null $include_expired
 	 * @param bool $include_deleted
 	 * @param null $limit
 	 * @return EE_Datetime[]

Spacing +117 added lines, -117 removed lines

@@ -40,27 +40,27 @@ 
 	 * @param    int $EVT_ID
 	 * @return    object
 	 */
-	public static function get_event( $EVT_ID = 0 ) {
-		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint( $EVT_ID );
+	public static function get_event($EVT_ID = 0) {
+		$EVT_ID = $EVT_ID instanceof WP_Post ? $EVT_ID->ID : absint($EVT_ID);
 		// do we already have the Event  you are looking for?
-		if ( EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID ) {
+		if (EEH_Event_View::$_event instanceof EE_Event && $EVT_ID && EEH_Event_View::$_event->ID() === $EVT_ID) {
 			return EEH_Event_View::$_event;
 		}
 		EEH_Event_View::$_event = NULL;
 		// international newspaper?
 		global $post;
 		// if this is being called from an EE_Event post, then we can just grab the attached EE_Event object
-		 if ( isset( $post->post_type ) && $post->post_type == 'espresso_events' || $EVT_ID ) {
+		 if (isset($post->post_type) && $post->post_type == 'espresso_events' || $EVT_ID) {
 //			d( $post );
 			// grab the event we're looking for
-			if ( isset( $post->EE_Event ) && ( $EVT_ID == 0 || ( $EVT_ID == $post->ID ))) {
+			if (isset($post->EE_Event) && ($EVT_ID == 0 || ($EVT_ID == $post->ID))) {
 				EEH_Event_View::$_event = $post->EE_Event;
 //				d( EEH_Event_View::$_event );
 			}
 			// now if we STILL do NOT have an EE_Event model object, BUT we have an Event ID...
-			if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID ) {
+			if ( ! EEH_Event_View::$_event instanceof EE_Event && $EVT_ID) {
 				// sigh... pull it from the db
-				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+				EEH_Event_View::$_event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 //				d( EEH_Event_View::$_event );
 			}
 		}
@@ -76,8 +76,8 @@ 
 	 * @param    int $EVT_ID
 	 * @return    boolean
 	 */
-	public static function display_ticket_selector( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function display_ticket_selector($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->display_ticket_selector() : FALSE;
 	}
 
@@ -90,9 +90,9 @@ 
 	 * @param    int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		return $event instanceof EE_Event ? $event->pretty_active_status( FALSE ) : '';
+	public static function event_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		return $event instanceof EE_Event ? $event->pretty_active_status(FALSE) : '';
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_active_status( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_active_status($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		return $event instanceof EE_Event ? $event->pretty_active_status() : 'inactive';
 	}
 
@@ -118,13 +118,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	string
 	 */
-	public static function event_has_content_or_excerpt( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_has_content_or_excerpt($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$has_content_or_excerpt = FALSE;
-		if ( $event instanceof EE_Event ) {
-			$has_content_or_excerpt = $event->description() != '' || $event->short_description( NULL, NULL, TRUE ) != '' ? TRUE : FALSE;
+		if ($event instanceof EE_Event) {
+			$has_content_or_excerpt = $event->description() != '' || $event->short_description(NULL, NULL, TRUE) != '' ? TRUE : FALSE;
 		}
-		if ( is_archive() && ! ( espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list() )) {
+		if (is_archive() && ! (espresso_display_full_description_in_event_list() || espresso_display_excerpt_in_event_list())) {
 			$has_content_or_excerpt = FALSE;
 		}
 		return $has_content_or_excerpt;
@@ -140,39 +140,39 @@ 
 	 * @param null $more
 	 * @return    string
 	 */
-	public static function event_content_or_excerpt( $num_words = NULL, $more = NULL ) {
+	public static function event_content_or_excerpt($num_words = NULL, $more = NULL) {
 
 		global $post;
 		$content = '';
 
 		ob_start();
-		if (( is_single() ) || ( is_archive() && espresso_display_full_description_in_event_list() )) {
+		if ((is_single()) || (is_archive() && espresso_display_full_description_in_event_list())) {
 			//echo '<h2 style="color:#E76700;">the_content<br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h2>';
 			the_content();
-		} else if (( is_archive() && has_excerpt( $post->ID ) && espresso_display_excerpt_in_event_list() ) || apply_filters( 'FHEE__EES_Espresso_Events__process_shortcode__true', FALSE )) {
+		} else if ((is_archive() && has_excerpt($post->ID) && espresso_display_excerpt_in_event_list()) || apply_filters('FHEE__EES_Espresso_Events__process_shortcode__true', FALSE)) {
 			//echo '<h2 style="color:#E76700;">the_excerpt<br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h2>';
 			the_excerpt();
-		} else if (( is_archive() && ! has_excerpt( $post->ID ) && espresso_display_excerpt_in_event_list() )) {
+		} else if ((is_archive() && ! has_excerpt($post->ID) && espresso_display_excerpt_in_event_list())) {
 			//echo '<h2 style="color:#E76700;">get_the_content<br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span><b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h2>';
-			if ( ! empty( $num_words )) {
-				if ( empty( $more )) {
-					$more = ' <a href="' . get_permalink() . '" class="more-link">' . __( '(more&hellip;)' ) . '</a>';
-					$more = apply_filters( 'the_content_more_link', $more );
+			if ( ! empty($num_words)) {
+				if (empty($more)) {
+					$more = ' <a href="'.get_permalink().'" class="more-link">'.__('(more&hellip;)').'</a>';
+					$more = apply_filters('the_content_more_link', $more);
 				}
-				$content = str_replace( 'NOMORELINK', '', get_the_content( 'NOMORELINK' ));
+				$content = str_replace('NOMORELINK', '', get_the_content('NOMORELINK'));
 
-				$content =  wp_trim_words( $content, $num_words, ' ' ) . $more;
+				$content = wp_trim_words($content, $num_words, ' ').$more;
 			} else {
-				$content =  get_the_content();
+				$content = get_the_content();
 			}
 			global $allowedtags;
-			$content = wp_kses( $content, $allowedtags );
-			$content = strip_shortcodes( $content );
-			echo apply_filters( 'the_content', $content );
+			$content = wp_kses($content, $allowedtags);
+			$content = strip_shortcodes($content);
+			echo apply_filters('the_content', $content);
 
 		} else {
 			//echo '<h2 style="color:#E76700;">nothing<br/><span style="font-size:9px;font-weight:normal;color:#666">' . __FILE__ . '</span>    <b style="font-size:10px;color:#333">  ' . __LINE__ . ' </b></h2>';
-			echo apply_filters( 'the_content', $content );
+			echo apply_filters('the_content', $content);
 		}
 		return ob_get_clean();
 	}
@@ -186,13 +186,13 @@ 
 	 * @param    int $EVT_ID
 	 *  @return 	EE_Ticket[]
 	 */
-	public static function event_tickets_available( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
+	public static function event_tickets_available($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
 		$tickets_available_for_purchase = array();
-		if( $event instanceof EE_Event ) {
-			$datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, FALSE );
-			foreach( $datetimes as $datetime ) {
-				$tickets_available_for_purchase = array_merge( $tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase() );
+		if ($event instanceof EE_Event) {
+			$datetimes = EEH_Event_View::get_all_date_obj($EVT_ID, FALSE);
+			foreach ($datetimes as $datetime) {
+				$tickets_available_for_purchase = array_merge($tickets_available_for_purchase, $datetime->ticket_types_available_for_purchase());
 			}
 		}
 		return $tickets_available_for_purchase;
@@ -208,22 +208,22 @@ 
 	 * @param 	  bool   $hide_uncategorized
 	 * @return    string
 	 */
-	public static function event_categories( $EVT_ID = 0, $hide_uncategorized = TRUE ) {
+	public static function event_categories($EVT_ID = 0, $hide_uncategorized = TRUE) {
 		$category_links = array();
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$event_categories = get_the_terms( $event->ID(), 'espresso_event_categories' );
-			if ( $event_categories ) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$event_categories = get_the_terms($event->ID(), 'espresso_event_categories');
+			if ($event_categories) {
 				// loop thru terms and create links
-				foreach ( $event_categories as $term ) {
-					$url = get_term_link( $term, 'espresso_venue_categories' );
-					if ( ! is_wp_error( $url ) && (( $hide_uncategorized && strtolower( $term->name ) != __( 'uncategorized', 'event_espresso' )) || ! $hide_uncategorized )) {
-						$category_links[] = '<a href="' . esc_url( $url ) . '" rel="tag">' . $term->name . '</a>';
+				foreach ($event_categories as $term) {
+					$url = get_term_link($term, 'espresso_venue_categories');
+					if ( ! is_wp_error($url) && (($hide_uncategorized && strtolower($term->name) != __('uncategorized', 'event_espresso')) || ! $hide_uncategorized)) {
+						$category_links[] = '<a href="'.esc_url($url).'" rel="tag">'.$term->name.'</a>';
 					}
 				}
 			}
 		}
-		return implode( ', ', $category_links );
+		return implode(', ', $category_links);
 	}
 
 
@@ -237,10 +237,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime( 'DTT_EVT_start', $format ) :  '';
+	public static function the_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_start', $format) : '';
 	}
 
 
@@ -254,10 +254,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_event_end_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime( 'DTT_EVT_end', $format ) : '';
+	public static function the_event_end_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_end', $format) : '';
 	}
 
 
@@ -271,10 +271,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_earliest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_earliest_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ?  $datetime->get_i18n_datetime( 'DTT_EVT_start', $format ) : '';
+	public static function the_earliest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_earliest_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_start', $format) : '';
 	}
 
 
@@ -288,10 +288,10 @@ 
 	 * @param int    $EVT_ID
 	 * @return    string
 	 */
-	public static function the_latest_event_date( $dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_last_date_obj( $EVT_ID );
-		$format = ! empty( $dt_frmt ) && ! empty( $tm_frmt ) ? $dt_frmt . ' ' . $tm_frmt : $dt_frmt . $tm_frmt;
-		return $datetime instanceof EE_Datetime ?  $datetime->get_i18n_datetime( 'DTT_EVT_end', $format ) : '';
+	public static function the_latest_event_date($dt_frmt = 'D M jS', $tm_frmt = 'g:i a', $EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_last_date_obj($EVT_ID);
+		$format = ! empty($dt_frmt) && ! empty($tm_frmt) ? $dt_frmt.' '.$tm_frmt : $dt_frmt.$tm_frmt;
+		return $datetime instanceof EE_Datetime ? $datetime->get_i18n_datetime('DTT_EVT_end', $format) : '';
 	}
 
 
@@ -303,13 +303,13 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_date_as_calendar_page( $EVT_ID = 0 ) {
-		$datetime = EEH_Event_View::get_primary_date_obj( $EVT_ID );
-		if ( $datetime instanceof EE_Datetime ) {
+	public static function event_date_as_calendar_page($EVT_ID = 0) {
+		$datetime = EEH_Event_View::get_primary_date_obj($EVT_ID);
+		if ($datetime instanceof EE_Datetime) {
 	?>
 		<div class="event-date-calendar-page-dv">
-			<div class="event-date-calendar-page-month-dv"><?php echo $datetime->get_i18n_datetime( 'DTT_EVT_start', 'M' );?></div>
-			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date( 'd' );?></div>
+			<div class="event-date-calendar-page-month-dv"><?php echo $datetime->get_i18n_datetime('DTT_EVT_start', 'M'); ?></div>
+			<div class="event-date-calendar-page-day-dv"><?php echo $datetime->start_date('d'); ?></div>
 		</div>
 	<?php
 		}
@@ -324,17 +324,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_primary_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_primary_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'ASC' )
+					'order_by' => array('DTT_order' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -349,17 +349,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_last_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_last_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_order' => 'DESC' )
+					'order_by' => array('DTT_order' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -374,17 +374,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_earliest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_earliest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'ASC' )
+					'order_by' => array('DTT_EVT_start' => 'ASC')
 				)
 			);
-			return reset( $datetimes );
+			return reset($datetimes);
 		} else {
 			 return FALSE;
 		}
@@ -399,17 +399,17 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function get_latest_date_obj( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function get_latest_date_obj($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			$datetimes = $event->get_many_related(
 				'Datetime',
 				array(
 					'limit' => 1,
-					'order_by' => array( 'DTT_EVT_start' => 'DESC' )
+					'order_by' => array('DTT_EVT_start' => 'DESC')
 				)
 			);
-			return end( $datetimes );
+			return end($datetimes);
 		} else {
 			return FALSE;
 		}
@@ -427,17 +427,17 @@ 
 	 * @param null $limit
 	 * @return EE_Datetime[]
 	 */
-	public static function get_all_date_obj( $EVT_ID = 0, $include_expired = null, $include_deleted = false, $limit = NULL ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if($include_expired === null){
-			if($event instanceof EE_Event && $event->is_expired()){
+	public static function get_all_date_obj($EVT_ID = 0, $include_expired = null, $include_deleted = false, $limit = NULL) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($include_expired === null) {
+			if ($event instanceof EE_Event && $event->is_expired()) {
 				$include_expired = true;
-			}else{
+			} else {
 				$include_expired = false;
 			}
 		}
 
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			return $event->datetimes_ordered($include_expired, $include_deleted, $limit);
 		} else {
 			 return array();
@@ -453,11 +453,11 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_link_url( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink( $event->ID() );
-			return preg_match( "~^(?:f|ht)tps?://~i", $url ) ? $url : 'http://' . $url;
+	public static function event_link_url($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			$url = $event->external_url() !== NULL && $event->external_url() !== '' ? $event->external_url() : get_permalink($event->ID());
+			return preg_match("~^(?:f|ht)tps?://~i", $url) ? $url : 'http://'.$url;
 		}
 		return NULL;
 	}
@@ -471,11 +471,11 @@ 
 	 * @param int $EVT_ID
 	 * @return    string
 	 */
-	public static function event_phone( $EVT_ID = 0 ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
-			EE_Registry::instance()->load_helper( 'Formatter' );
-			return EEH_Schema::telephone( $event->phone() );
+	public static function event_phone($EVT_ID = 0) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
+			EE_Registry::instance()->load_helper('Formatter');
+			return EEH_Schema::telephone($event->phone());
 		}
 		return NULL;
 	}
@@ -492,23 +492,23 @@ 
 	 * @param string $after
 	 * @return    string
 	 */
-	public static function edit_event_link( $EVT_ID = 0, $link = '', $before = '', $after = '' ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( $event instanceof EE_Event ) {
+	public static function edit_event_link($EVT_ID = 0, $link = '', $before = '', $after = '') {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ($event instanceof EE_Event) {
 			// can the user edit this post ?
-			if ( current_user_can( 'edit_post', $event->ID() )) {
+			if (current_user_can('edit_post', $event->ID())) {
 				// set link text
-				$link = ! empty( $link ) ? $link : __('edit this event');
+				$link = ! empty($link) ? $link : __('edit this event');
 				// generate nonce
-				$nonce = wp_create_nonce( 'edit_nonce' );
+				$nonce = wp_create_nonce('edit_nonce');
 				// generate url to event editor for this event
-				$url = add_query_arg( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce ), admin_url() );
+				$url = add_query_arg(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event->ID(), 'edit_nonce' => $nonce), admin_url());
 				// get edit CPT text
-				$post_type_obj = get_post_type_object( 'espresso_events' );
+				$post_type_obj = get_post_type_object('espresso_events');
 				// build final link html
-				$link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( $post_type_obj->labels->edit_item ) . '">' . $link . '</a>';
+				$link = '<a class="post-edit-link" href="'.$url.'" title="'.esc_attr($post_type_obj->labels->edit_item).'">'.$link.'</a>';
 				// put it all together
-				return $before . apply_filters( 'edit_post_link', $link, $event->ID() ) . $after;
+				return $before.apply_filters('edit_post_link', $link, $event->ID()).$after;
 			}
 		}
 		return '';

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -432,7 +434,7 @@ 
 		if($include_expired === null){
 			if($event instanceof EE_Event && $event->is_expired()){
 				$include_expired = true;
-			}else{
+			} else{
 				$include_expired = false;
 			}
 		}

core/helpers/EEH_Form_Fields.helper.php

Doc Comments +5 added lines, -5 removed lines

@@ -774,7 +774,7 @@ 
 	 *
 	 * @param mixed $opt_group
 	 * @param mixed $QSOs
-	 * @param mixed $answer
+	 * @param string $answer
 	 * @return string
 	 */
 	private static function _generate_select_option_group( $opt_group, $QSOs, $answer ){
@@ -1122,7 +1122,7 @@ 
 	/**
 	 * 	prep_required
 	 * @param string|array 	$required
-	 * @return array
+	 * @return string
 	 */
 	static function prep_required( $required = array() ){
 		// make sure required is an array
@@ -1173,8 +1173,8 @@ 
 
 	/**
 	 * 	_load_system_dropdowns
-	 * @param array 	$QFI
-	 * @return array
+	 * @param EE_Question_Form_Input 	$QFI
+	 * @return EE_Question_Form_Input
 	 */
 	private static function _load_system_dropdowns( $QFI ){
 		$QST_system = $QFI->get('QST_system');
@@ -1463,7 +1463,7 @@ 
 	 * @param    string   $nonce_action     - if using nonces
 	 * @param    bool|string $input_only       - whether to print form header and footer. TRUE returns the input without the form
 	 * @param    string   $extra_attributes - any extra attributes that need to be attached to the form input
-	 * @return    void
+	 * @return    string
 	 */
 	public static function submit_button( $url = '', $ID = '', $class = '', $text = '', $nonce_action = '', $input_only = FALSE, $extra_attributes = '' ) {
 		$btn = '';

Indentation +7 added lines, -7 removed lines

@@ -393,7 +393,7 @@ 
 
 	/**
 	 * generate_question_groups_html
- 	 *
+	 *
 	 * @param string $question_groups
 	 * @return string HTML
 	 */
@@ -537,7 +537,7 @@ 
 
 	/**
 	 * generate_form_input
- 	 *
+	 *
 	 * @param EE_Question_Form_Input $QFI
 	 * @return string HTML
 	 */
@@ -612,7 +612,7 @@ 
 
 	/**
 	 * generates HTML for a form text input
- 	 *
+	 *
 	 * @param string $question 	label content
 	 * @param string $answer 		form input value attribute
 	 * @param string $name 			form input name attribute
@@ -657,7 +657,7 @@ 
 
 	/**
 	 * generates HTML for a form textarea
- 	 *
+	 *
 	 * @param string $question 		label content
 	 * @param string $answer 		form input value attribute
 	 * @param string $name 			form input name attribute
@@ -708,7 +708,7 @@ 
 
 	/**
 	 * generates HTML for a form select input
- 	 *
+	 *
 	 * @param string $question 		label content
 	 * @param string $answer 		form input value attribute
 	 * @param array $options			array of answer options where array key = option value and array value = option display text
@@ -885,7 +885,7 @@ 
 
 	/**
 	 * generates HTML for form checkbox inputs
- 	 *
+	 *
 	 * @param string $question 		label content
 	 * @param string $answer 		form input value attribute
 	 * @param array $options 			array of options where array key = option value and array value = option display text
@@ -966,7 +966,7 @@ 
 
 	/**
 	 * generates HTML for a form datepicker input
- 	 *
+	 *
 	 * @param string $question 	label content
 	 * @param string $answer 		form input value attribute
 	 * @param string $name 			form input name attribute

Spacing +378 added lines, -378 removed lines

@@ -58,10 +58,10 @@ 
 	 * 	@return string
 	 * 	@todo: at some point we can break this down into other static methods to abstract it a bit better.
 	 */
-	static public function get_form_fields( $input_vars = array(), $id = FALSE ) {
+	static public function get_form_fields($input_vars = array(), $id = FALSE) {
 
-		if ( empty($input_vars) ) {
-			EE_Error::add_error( __('missing required variables for the form field generator', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
+		if (empty($input_vars)) {
+			EE_Error::add_error(__('missing required variables for the form field generator', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 
@@ -87,25 +87,25 @@ 
 				'append_content' => ''
 				);
 
-			$input_value = wp_parse_args( $input_value, $defaults );
+			$input_value = wp_parse_args($input_value, $defaults);
 
 			// required fields get a *
 			$required = isset($input_value['required']) && $input_value['required'] ? ' <span>*</span>: ' : ': ';
 			// and the css class "required"
-			$css_class = isset( $input_value['css_class'] ) ? $input_value['css_class'] : '';
-			$styles = $input_value['required'] ? 'required ' . $css_class : $css_class;
+			$css_class = isset($input_value['css_class']) ? $input_value['css_class'] : '';
+			$styles = $input_value['required'] ? 'required '.$css_class : $css_class;
 
-			$field_id = ($id) ? $id . '-' . $input_key : $input_key;
-			$tabindex = !empty($input_value['tabindex']) ? ' tabindex="' . $input_value['tabindex'] . '"' : '';
+			$field_id = ($id) ? $id.'-'.$input_key : $input_key;
+			$tabindex = ! empty($input_value['tabindex']) ? ' tabindex="'.$input_value['tabindex'].'"' : '';
 
 			//rows or cols?
-			$rows = isset($input_value['rows'] ) ? $input_value['rows'] : '10';
-			$cols = isset($input_value['cols'] ) ? $input_value['cols'] : '80';
+			$rows = isset($input_value['rows']) ? $input_value['rows'] : '10';
+			$cols = isset($input_value['cols']) ? $input_value['cols'] : '80';
 
 			//any content?
 			$append_content = $input_value['append_content'];
 
-			$output .= (!$close) ? '<ul>' : '';
+			$output .= ( ! $close) ? '<ul>' : '';
 			$output .= '<li>';
 
 			// what type of input are we dealing with ?
@@ -113,15 +113,15 @@ 
 
 				// text inputs
 				case 'text' :
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<input id="' . $field_id . '" class="' . $styles . '" type="text" value="' . $input_value['value'] . '" name="' . $input_value['name'] . '"' . $tabindex . '>';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<input id="'.$field_id.'" class="'.$styles.'" type="text" value="'.$input_value['value'].'" name="'.$input_value['name'].'"'.$tabindex.'>';
 					break;
 
 				// dropdowns
 				case 'select' :
 
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<select id="' . $field_id . '" class="' . $styles . '" name="' . $input_value['name'] . '"' . $tabindex . '>';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<select id="'.$field_id.'" class="'.$styles.'" name="'.$input_value['name'].'"'.$tabindex.'>';
 
 					if (is_array($input_value['options'])) {
 						$options = $input_value['options'];
@@ -130,30 +130,30 @@ 
 					}
 
 					foreach ($options as $key => $value) {
-						$selected = isset( $input_value['value'] ) && $input_value['value'] == $key ? 'selected=selected' : '';
+						$selected = isset($input_value['value']) && $input_value['value'] == $key ? 'selected=selected' : '';
 						//$key = str_replace( ' ', '_', sanitize_key( $value ));
-						$output .= "\n\t\t\t\t" . '<option '. $selected . ' value="' . $key . '">' . $value . '</option>';
+						$output .= "\n\t\t\t\t".'<option '.$selected.' value="'.$key.'">'.$value.'</option>';
 					}
-					$output .= "\n\t\t\t" . '</select>';
+					$output .= "\n\t\t\t".'</select>';
 
 					break;
 
 				case 'textarea' :
 
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<textarea id="' . $field_id . '" class="' . $styles . '" rows="'.$rows.'" cols="'.$cols.'" name="' . $input_value['name'] . '"' . $tabindex . '>' . $input_value['value'] . '</textarea>';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<textarea id="'.$field_id.'" class="'.$styles.'" rows="'.$rows.'" cols="'.$cols.'" name="'.$input_value['name'].'"'.$tabindex.'>'.$input_value['value'].'</textarea>';
 					break;
 
 				case 'hidden' :
 					$close = false;
 					$output .= "</li></ul>";
-					$output .= "\n\t\t\t" . '<input id="' . $field_id . '" type="hidden" name="' . $input_value['name'] . '" value="' . $input_value['value'] . '">';
+					$output .= "\n\t\t\t".'<input id="'.$field_id.'" type="hidden" name="'.$input_value['name'].'" value="'.$input_value['value'].'">';
 					break;
 
 				case 'checkbox' :
-					$checked = ( $input_value['value'] == 1 ) ? 'checked="checked"' : '';
-					$output .= "\n\t\t\t" . '<label for="' . $field_id . '">' . $input_value['label'] . $required . '</label>';
-					$output .= "\n\t\t\t" . '<input id="' . $field_id. '" type="checkbox" name="' . $input_value['name'] . '" value="1"' . $checked . $tabindex . ' />';
+					$checked = ($input_value['value'] == 1) ? 'checked="checked"' : '';
+					$output .= "\n\t\t\t".'<label for="'.$field_id.'">'.$input_value['label'].$required.'</label>';
+					$output .= "\n\t\t\t".'<input id="'.$field_id.'" type="checkbox" name="'.$input_value['name'].'" value="1"'.$checked.$tabindex.' />';
 					break;
 
 				case 'wp_editor' :
@@ -166,19 +166,19 @@ 
 					);
 					$output .= '</li>';
 					$output .= '</ul>';
-					$output .= '<h4>' . $input_value['label'] . '</h4>';
-					if ( $append_content ) {
+					$output .= '<h4>'.$input_value['label'].'</h4>';
+					if ($append_content) {
 						$output .= $append_content;
 					}
 					ob_start();
-					wp_editor( $input_value['value'], $field_id, $editor_settings);
+					wp_editor($input_value['value'], $field_id, $editor_settings);
 					$editor = ob_get_contents();
 					ob_end_clean();
 					$output .= $editor;
 					break;
 
 				}
-				if ( $append_content && $input_value['input'] !== 'wp_editor' ) {
+				if ($append_content && $input_value['input'] !== 'wp_editor') {
 					$output .= $append_content;
 				}
 				$output .= ($close) ? '</li>' : '';
@@ -219,7 +219,7 @@ 
 		$form_fields = array();
 		$fields = (array) $fields;
 
-		foreach ( $fields as $field_name => $field_atts ) {
+		foreach ($fields as $field_name => $field_atts) {
 			//defaults:
 			$defaults = array(
 				'label' => '',
@@ -237,67 +237,67 @@ 
 				'wpeditor_args' => array()
 				);
 			// merge defaults with passed arguments
-			$_fields = wp_parse_args( $field_atts, $defaults);
-			extract( $_fields );
+			$_fields = wp_parse_args($field_atts, $defaults);
+			extract($_fields);
 			// generate label
-			$label = empty($label) ? '' : '<label for="' . $id . '">' . $label . '</label>';
+			$label = empty($label) ? '' : '<label for="'.$id.'">'.$label.'</label>';
 			// generate field name
-			$f_name = !empty($unique_id) ? $field_name . '[' . $unique_id . ']' : $field_name;
+			$f_name = ! empty($unique_id) ? $field_name.'['.$unique_id.']' : $field_name;
 
 			//tabindex
-			$tabindex_str = !empty( $tabindex ) ? ' tabindex="' . $tabindex . '"' : '';
+			$tabindex_str = ! empty($tabindex) ? ' tabindex="'.$tabindex.'"' : '';
 
 			//we determine what we're building based on the type
-			switch ( $type ) {
+			switch ($type) {
 
 				case 'textarea' :
-						$fld = '<textarea id="' . $id . '" class="' . $class . '" rows="' . $dimensions[1] . '" cols="' . $dimensions[0] . '" name="' . $f_name . '"' . $tabindex_str . '>' . $value . '</textarea>';
+						$fld = '<textarea id="'.$id.'" class="'.$class.'" rows="'.$dimensions[1].'" cols="'.$dimensions[0].'" name="'.$f_name.'"'.$tabindex_str.'>'.$value.'</textarea>';
 						$fld .= $extra_desc;
 					break;
 
 				case 'checkbox' :
 						$c_input = '';
-						if ( is_array($value) ) {
-							foreach ( $value as $key => $val ) {
-								$c_id = $field_name . '_' . $value;
-								$c_class = isset($classes[$key]) ? ' class="' . $classes[$key] . '" ' : '';
-								$c_label = isset($labels[$key]) ? '<label for="' . $c_id . '">' . $labels[$key] . '</label>' : '';
-								$checked = !empty($default) && $default == $val ? ' checked="checked" ' : '';
-								$c_input .= '<input name="' . $f_name . '[]" type="checkbox" id="' . $c_id . '"' . $c_class . 'value="' . $val . '"' . $checked . $tabindex_str . ' />' . "\n" . $c_label;
+						if (is_array($value)) {
+							foreach ($value as $key => $val) {
+								$c_id = $field_name.'_'.$value;
+								$c_class = isset($classes[$key]) ? ' class="'.$classes[$key].'" ' : '';
+								$c_label = isset($labels[$key]) ? '<label for="'.$c_id.'">'.$labels[$key].'</label>' : '';
+								$checked = ! empty($default) && $default == $val ? ' checked="checked" ' : '';
+								$c_input .= '<input name="'.$f_name.'[]" type="checkbox" id="'.$c_id.'"'.$c_class.'value="'.$val.'"'.$checked.$tabindex_str.' />'."\n".$c_label;
 							}
 							$fld = $c_input;
 						} else {
-							$checked = !empty($default) && $default == $val ? 'checked="checked" ' : '';
-							$fld = '<input name="'. $f_name . '" type="checkbox" id="' . $id . '" class="' . $class . '" value="' . $value . '"' . $checked . $tabindex_str . ' />' . "\n";
+							$checked = ! empty($default) && $default == $val ? 'checked="checked" ' : '';
+							$fld = '<input name="'.$f_name.'" type="checkbox" id="'.$id.'" class="'.$class.'" value="'.$value.'"'.$checked.$tabindex_str.' />'."\n";
 						}
 					break;
 
 				case 'radio' :
 						$c_input = '';
-						if ( is_array($value) ) {
-							foreach ( $value as $key => $val ) {
-								$c_id = $field_name . '_' . $value;
-								$c_class = isset($classes[$key]) ? 'class="' . $classes[$key] . '" ' : '';
-								$c_label = isset($labels[$key]) ? '<label for="' . $c_id . '">' . $labels[$key] . '</label>' : '';
-								$checked = !empty($default) && $default == $val ? ' checked="checked" ' : '';
-								$c_input .= '<input name="' . $f_name . '" type="checkbox" id="' . $c_id . '"' . $c_class . 'value="' . $val . '"' . $checked . $tabindex_str . ' />' . "\n" . $c_label;
+						if (is_array($value)) {
+							foreach ($value as $key => $val) {
+								$c_id = $field_name.'_'.$value;
+								$c_class = isset($classes[$key]) ? 'class="'.$classes[$key].'" ' : '';
+								$c_label = isset($labels[$key]) ? '<label for="'.$c_id.'">'.$labels[$key].'</label>' : '';
+								$checked = ! empty($default) && $default == $val ? ' checked="checked" ' : '';
+								$c_input .= '<input name="'.$f_name.'" type="checkbox" id="'.$c_id.'"'.$c_class.'value="'.$val.'"'.$checked.$tabindex_str.' />'."\n".$c_label;
 							}
 							$fld = $c_input;
 						} else {
-							$checked = !empty($default) && $default == $val ? 'checked="checked" ' : '';
-							$fld = '<input name="'. $f_name . '" type="checkbox" id="' . $id . '" class="' . $class . '" value="' . $value . '"' . $checked . $tabindex_str . ' />' . "\n";
+							$checked = ! empty($default) && $default == $val ? 'checked="checked" ' : '';
+							$fld = '<input name="'.$f_name.'" type="checkbox" id="'.$id.'" class="'.$class.'" value="'.$value.'"'.$checked.$tabindex_str.' />'."\n";
 						}
 					break;
 
 				case 'hidden' :
-						$fld = '<input name="' . $f_name . '" type="hidden" id="' . $id . '" class="' . $class . '" value="' . $value . '" />' . "\n";
+						$fld = '<input name="'.$f_name.'" type="hidden" id="'.$id.'" class="'.$class.'" value="'.$value.'" />'."\n";
 					break;
 
 				case 'select' :
-						$fld = '<select name="' . $f_name . '" class="' . $class . '" id="' . $id . '"' . $tabindex_str . '>' . "\n";
-						foreach ( $value as $key => $val ) {
-							$checked = !empty($default) && $default == $val ? ' selected="selected"' : '';
-							$fld .= "\t" . '<option value="' . $val . '"' . $checked . '>' . $labels[$key] . '</option>' . "\n";
+						$fld = '<select name="'.$f_name.'" class="'.$class.'" id="'.$id.'"'.$tabindex_str.'>'."\n";
+						foreach ($value as $key => $val) {
+							$checked = ! empty($default) && $default == $val ? ' selected="selected"' : '';
+							$fld .= "\t".'<option value="'.$val.'"'.$checked.'>'.$labels[$key].'</option>'."\n";
 						}
 						$fld .= '</select>';
 					break;
@@ -309,21 +309,21 @@ 
 							'editor_class' => $class,
 							'tabindex' => $tabindex
 							);
-						$editor_settings = array_merge( $wpeditor_args, $editor_settings );
+						$editor_settings = array_merge($wpeditor_args, $editor_settings);
 						ob_start();
-						wp_editor( $value, $id, $editor_settings );
+						wp_editor($value, $id, $editor_settings);
 						$editor = ob_get_contents();
 						ob_end_clean();
 						$fld = $editor;
 					break;
 
 				default : //'text fields'
-						$fld = '<input name="' . $f_name . '" type="text" id="' . $id . '" class="' . $class . '" value="' . $value . '"' . $tabindex_str . ' />' . "\n";
+						$fld = '<input name="'.$f_name.'" type="text" id="'.$id.'" class="'.$class.'" value="'.$value.'"'.$tabindex_str.' />'."\n";
 						$fld .= $extra_desc;
 
 			}
 
-			$form_fields[ $field_name ] = array( 'label' => $label, 'field' => $fld );
+			$form_fields[$field_name] = array('label' => $label, 'field' => $fld);
 		}
 
 		return $form_fields;
@@ -352,22 +352,22 @@ 
 	 */
 	static public function select_input($name, $values, $default = '', $parameters = '', $class = '', $autosize = true) {
 		//if $values was submitted in the wrong format, convert it over
-		if(!empty($values) && (!array_key_exists(0,$values) || !is_array($values[0]))){
-			$converted_values=array();
-			foreach($values as $id=>$text){
-				$converted_values[]=array('id'=>$id,'text'=>$text);
+		if ( ! empty($values) && ( ! array_key_exists(0, $values) || ! is_array($values[0]))) {
+			$converted_values = array();
+			foreach ($values as $id=>$text) {
+				$converted_values[] = array('id'=>$id, 'text'=>$text);
 			}
-			$values=$converted_values;
+			$values = $converted_values;
 		}
 		//load formatter helper
-		EE_Registry::instance()->load_helper( 'Formatter' );
+		EE_Registry::instance()->load_helper('Formatter');
 		//EE_Registry::instance()->load_helper( 'Formatter' );
 
-		$field = '<select id="' . EEH_Formatter::ee_tep_output_string($name) . '" name="' . EEH_Formatter::ee_tep_output_string($name) . '"';
+		$field = '<select id="'.EEH_Formatter::ee_tep_output_string($name).'" name="'.EEH_Formatter::ee_tep_output_string($name).'"';
 		//Debug
 		//EEH_Debug_Tools::printr( $values, '$values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( EEH_Formatter::ee_tep_not_null($parameters))
-			$field .= ' ' . $parameters;
+		if (EEH_Formatter::ee_tep_not_null($parameters))
+			$field .= ' '.$parameters;
 		if ($autosize) {
 			$size = 'med';
 			for ($ii = 0, $ni = sizeof($values); $ii < $ni; $ii++) {
@@ -380,21 +380,21 @@ 
 			$size = '';
 		}
 
-		$field .= ' class="' . $class . ' ' . $size . '">';
+		$field .= ' class="'.$class.' '.$size.'">';
 
 		if (empty($default) && isset($GLOBALS[$name]))
 			$default = stripslashes($GLOBALS[$name]);
 
 
 		for ($i = 0, $n = sizeof($values); $i < $n; $i++) {
-			$field .= '<option value="' . $values[$i]['id'] . '"';
+			$field .= '<option value="'.$values[$i]['id'].'"';
 			if ($default == $values[$i]['id']) {
 				$field .= ' selected = "selected"';
 			}
-			if ( isset( $values[$i]['class'] ) ) {
-				$field .= ' class="' . $values[$i]['class'] . '"';
+			if (isset($values[$i]['class'])) {
+				$field .= ' class="'.$values[$i]['class'].'"';
 			}
-			$field .= '>' . $values[$i]['text'] . '</option>';
+			$field .= '>'.$values[$i]['text'].'</option>';
 		}
 		$field .= '</select>';
 
@@ -412,38 +412,38 @@ 
 	 * @param string $question_groups
 	 * @return string HTML
 	 */
-	static function generate_question_groups_html( $question_groups = array(), $group_wrapper = 'fieldset' ) {
+	static function generate_question_groups_html($question_groups = array(), $group_wrapper = 'fieldset') {
 
 		$html = '';
-		$before_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '' );
-		$after_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '' );
+		$before_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '');
+		$after_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
 
-		if ( ! empty( $question_groups )) {
+		if ( ! empty($question_groups)) {
 			//EEH_Debug_Tools::printr( $question_groups, '$question_groups  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 			// loop thru question groups
-			foreach ( $question_groups as $QSG ) {
+			foreach ($question_groups as $QSG) {
 				// check that questions exist
-				if ( ! empty( $QSG['QSG_questions'] )) {
+				if ( ! empty($QSG['QSG_questions'])) {
 					// use fieldsets
-					$html .= "\n\t" . '<' . $group_wrapper . ' class="espresso-question-group-wrap" id="' . $QSG['QSG_identifier'] . '">';
+					$html .= "\n\t".'<'.$group_wrapper.' class="espresso-question-group-wrap" id="'.$QSG['QSG_identifier'].'">';
 					// group_name
-					$html .= $QSG['QSG_show_group_name'] ? "\n\t\t" . '<h5 class="espresso-question-group-title-h5 section-title">' . self::prep_answer( $QSG['QSG_name'] ) . '</h5>' : '';
+					$html .= $QSG['QSG_show_group_name'] ? "\n\t\t".'<h5 class="espresso-question-group-title-h5 section-title">'.self::prep_answer($QSG['QSG_name']).'</h5>' : '';
 					// group_desc
-					$html .= $QSG['QSG_show_group_desc'] && ! empty( $QSG['QSG_desc'] ) ? '<div class="espresso-question-group-desc-pg">' . self::prep_answer( $QSG['QSG_desc'] ) . '</div>' : '';
+					$html .= $QSG['QSG_show_group_desc'] && ! empty($QSG['QSG_desc']) ? '<div class="espresso-question-group-desc-pg">'.self::prep_answer($QSG['QSG_desc']).'</div>' : '';
 
 					$html .= $before_question_group_questions;
 					// loop thru questions
-					foreach ( $QSG['QSG_questions'] as $question ) {
+					foreach ($QSG['QSG_questions'] as $question) {
 //						EEH_Debug_Tools::printr( $question, '$question  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 						$QFI = new EE_Question_Form_Input(
 							$question['qst_obj'],
 							$question['ans_obj'],
 							$question
 						);
-						$html .= self::generate_form_input( $QFI );
+						$html .= self::generate_form_input($QFI);
 					}
 					$html .= $after_question_group_questions;
-					$html .= "\n\t" . '</' . $group_wrapper . '>';
+					$html .= "\n\t".'</'.$group_wrapper.'>';
 				}
 			}
 		}
@@ -463,11 +463,11 @@ 
 	 * @param string       $group_wrapper
 	 * @return string HTML
 	 */
-	static function generate_question_groups_html2( $question_groups = array(), $q_meta = array(), 	$from_admin = FALSE, $group_wrapper = 'fieldset' ) {
+	static function generate_question_groups_html2($question_groups = array(), $q_meta = array(), $from_admin = FALSE, $group_wrapper = 'fieldset') {
 
 		$html = '';
-		$before_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '' );
-		$after_question_group_questions = apply_filters( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '' );
+		$before_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '');
+		$after_question_group_questions = apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
 
 		$default_q_meta = array(
 				'att_nmbr' => 1,
@@ -476,55 +476,55 @@ 
 				'input_id' => '',
 				'input_class' => ''
 		);
-		$q_meta = array_merge( $default_q_meta, $q_meta );
+		$q_meta = array_merge($default_q_meta, $q_meta);
 		//EEH_Debug_Tools::printr( $q_meta, '$q_meta  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
-		if ( ! empty( $question_groups )) {
+		if ( ! empty($question_groups)) {
 //			EEH_Debug_Tools::printr( $question_groups, '$question_groups  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 			// loop thru question groups
-			foreach ( $question_groups as $QSG ) {
-				if ( $QSG instanceof EE_Question_Group ) {
+			foreach ($question_groups as $QSG) {
+				if ($QSG instanceof EE_Question_Group) {
 					// check that questions exist
 
-					$where = array( 'QST_deleted' => 0 );
-					if ( ! $from_admin ) {
+					$where = array('QST_deleted' => 0);
+					if ( ! $from_admin) {
 						$where['QST_admin_only'] = 0;
 					}
-					$questions = $QSG->questions( array( $where, 'order_by' => array( 'Question_Group_Question.QGQ_order' => 'ASC' )));
-					if ( ! empty( $questions )) {
+					$questions = $QSG->questions(array($where, 'order_by' => array('Question_Group_Question.QGQ_order' => 'ASC')));
+					if ( ! empty($questions)) {
 						// use fieldsets
-						$html .= "\n\t" . '<' . $group_wrapper . ' class="espresso-question-group-wrap" id="' . $QSG->get( 'QSG_identifier' ) . '">';
+						$html .= "\n\t".'<'.$group_wrapper.' class="espresso-question-group-wrap" id="'.$QSG->get('QSG_identifier').'">';
 						// group_name
-						if ( $QSG->show_group_name() ) {
-							$html .=  "\n\t\t" . '<h5 class="espresso-question-group-title-h5 section-title">' . $QSG->get_pretty( 'QSG_name' ) . '</h5>';
+						if ($QSG->show_group_name()) {
+							$html .= "\n\t\t".'<h5 class="espresso-question-group-title-h5 section-title">'.$QSG->get_pretty('QSG_name').'</h5>';
 						}
 						// group_desc
-						if ( $QSG->show_group_desc() ) {
-							$html .=  '<div class="espresso-question-group-desc-pg">' . $QSG->get_pretty( 'QSG_desc'  ) . '</div>';
+						if ($QSG->show_group_desc()) {
+							$html .= '<div class="espresso-question-group-desc-pg">'.$QSG->get_pretty('QSG_desc').'</div>';
 						}
 
 						$html .= $before_question_group_questions;
 						// loop thru questions
-						foreach ( $questions as $QST ) {
+						foreach ($questions as $QST) {
 							$qstn_id = $QST->is_system_question() ? $QST->system_ID() : $QST->ID();
 
 							$answer = NULL;
 
-							if (  isset( $_GET['qstn'] ) && isset( $q_meta['input_id'] ) && isset( $q_meta['att_nmbr'] )) {
+							if (isset($_GET['qstn']) && isset($q_meta['input_id']) && isset($q_meta['att_nmbr'])) {
 								// check for answer in $_GET in case we are reprocessing a form after an error
-								if ( isset( $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] )) {
-									$answer = is_array( $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] ) ? $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] : sanitize_text_field( $_GET['qstn'][ $q_meta['input_id'] ][ $qstn_id ] );
+								if (isset($_GET['qstn'][$q_meta['input_id']][$qstn_id])) {
+									$answer = is_array($_GET['qstn'][$q_meta['input_id']][$qstn_id]) ? $_GET['qstn'][$q_meta['input_id']][$qstn_id] : sanitize_text_field($_GET['qstn'][$q_meta['input_id']][$qstn_id]);
 								}
-							} else if ( isset( $q_meta['attendee'] ) && $q_meta['attendee'] ) {
+							} else if (isset($q_meta['attendee']) && $q_meta['attendee']) {
 								//attendee data from the session
-								$answer = isset( $q_meta['attendee'][ $qstn_id ] ) ? $q_meta['attendee'][ $qstn_id ] : NULL;
+								$answer = isset($q_meta['attendee'][$qstn_id]) ? $q_meta['attendee'][$qstn_id] : NULL;
 							}
 
 
 
 							$QFI = new EE_Question_Form_Input(
 									$QST,
-									EE_Answer::new_instance ( array(
+									EE_Answer::new_instance(array(
 											'ANS_ID'=> 0,
 											'QST_ID'=> 0,
 											'REG_ID'=> 0,
@@ -533,10 +533,10 @@ 
 									$q_meta
 							);
 							//EEH_Debug_Tools::printr( $QFI, '$QFI  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-							$html .= self::generate_form_input( $QFI );
+							$html .= self::generate_form_input($QFI);
 						}
 						$html .= $after_question_group_questions;
-						$html .= "\n\t" . '</' . $group_wrapper . '>';
+						$html .= "\n\t".'</'.$group_wrapper.'>';
 					}
 				}
 			}
@@ -556,63 +556,63 @@ 
 	 * @param EE_Question_Form_Input $QFI
 	 * @return string HTML
 	 */
-	static function generate_form_input( EE_Question_Form_Input $QFI ) {
-		if ( isset( $QFI->QST_admin_only) && $QFI->QST_admin_only && ! is_admin() ) {
+	static function generate_form_input(EE_Question_Form_Input $QFI) {
+		if (isset($QFI->QST_admin_only) && $QFI->QST_admin_only && ! is_admin()) {
 			return '';
 		}
 
-		$QFI = self::_load_system_dropdowns( $QFI );
-		$QFI = self::_load_specialized_dropdowns( $QFI );
+		$QFI = self::_load_system_dropdowns($QFI);
+		$QFI = self::_load_specialized_dropdowns($QFI);
 
 		//we also need to verify
 
 		$display_text = $QFI->get('QST_display_text');
 		$input_name = $QFI->get('QST_input_name');
-		$answer = EE_Registry::instance()->REQ->is_set( $input_name ) ? EE_Registry::instance()->REQ->get( $input_name ) : $QFI->get('ANS_value');
+		$answer = EE_Registry::instance()->REQ->is_set($input_name) ? EE_Registry::instance()->REQ->get($input_name) : $QFI->get('ANS_value');
 		$input_id = $QFI->get('QST_input_id');
 		$input_class = $QFI->get('QST_input_class');
 //		$disabled = $QFI->get('QST_disabled') ? ' disabled="disabled"' : '';
 		$disabled = $QFI->get('QST_disabled') ? TRUE : FALSE;
-		$required_label = apply_filters(' FHEE__EEH_Form_Fields__generate_form_input__required_label', '<em>*</em>' );
+		$required_label = apply_filters(' FHEE__EEH_Form_Fields__generate_form_input__required_label', '<em>*</em>');
 		$QST_required = $QFI->get('QST_required');
-		$required = $QST_required ? array( 'label' => $required_label, 'class' => 'required needs-value', 'title' => $QST_required ) : array();
-		$use_html_entities = $QFI->get_meta( 'htmlentities' );
-		$required_text = $QFI->get('QST_required_text') != '' ? $QFI->get('QST_required_text') : __( 'This field is required', 'event_espresso' );
-		$required_text = $QST_required ? "\n\t\t\t" . '<div class="required-text hidden">' . self::prep_answer( $required_text, $use_html_entities ) . '</div>' : '';
+		$required = $QST_required ? array('label' => $required_label, 'class' => 'required needs-value', 'title' => $QST_required) : array();
+		$use_html_entities = $QFI->get_meta('htmlentities');
+		$required_text = $QFI->get('QST_required_text') != '' ? $QFI->get('QST_required_text') : __('This field is required', 'event_espresso');
+		$required_text = $QST_required ? "\n\t\t\t".'<div class="required-text hidden">'.self::prep_answer($required_text, $use_html_entities).'</div>' : '';
 		$label_class = 'espresso-form-input-lbl';
-		$QST_options = $QFI->options(true,$answer);
-		$options = is_array( $QST_options ) ? self::prep_answer_options( $QST_options ) : array();
+		$QST_options = $QFI->options(true, $answer);
+		$options = is_array($QST_options) ? self::prep_answer_options($QST_options) : array();
 		$system_ID = $QFI->get('QST_system');
-		$label_b4 = $QFI->get_meta( 'label_b4' );
-		$use_desc_4_label = $QFI->get_meta( 'use_desc_4_label' );
+		$label_b4 = $QFI->get_meta('label_b4');
+		$use_desc_4_label = $QFI->get_meta('use_desc_4_label');
 
 
-		switch ( $QFI->get('QST_type') ){
+		switch ($QFI->get('QST_type')) {
 
 			case 'TEXTAREA' :
-					return EEH_Form_Fields::textarea( $display_text, $answer, $input_name, $input_id, $input_class, array(), $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::textarea($display_text, $answer, $input_name, $input_id, $input_class, array(), $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities);
 				break;
 
 			case 'DROPDOWN' :
-					return EEH_Form_Fields::select( $display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, TRUE );
+					return EEH_Form_Fields::select($display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, TRUE);
 				break;
 
 
 			case 'RADIO_BTN' :
-					return EEH_Form_Fields::radio( $display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, $label_b4, $use_desc_4_label );
+					return EEH_Form_Fields::radio($display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities, $label_b4, $use_desc_4_label);
 				break;
 
 			case 'CHECKBOX' :
-					return EEH_Form_Fields::checkbox( $display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::checkbox($display_text, $answer, $options, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities);
 				break;
 
 			case 'DATE' :
-					return EEH_Form_Fields::datepicker( $display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::datepicker($display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities);
 				break;
 
 			case 'TEXT' :
 			default:
-					return EEH_Form_Fields::text( $display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities );
+					return EEH_Form_Fields::text($display_text, $answer, $input_name, $input_id, $input_class, $required, $required_text, $label_class, $disabled, $system_ID, $use_html_entities);
 				break;
 
 		}
@@ -638,31 +638,31 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function text( $question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function text($question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name ) {
+		if ( ! $question || ! $name) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'regular-text' : 'espresso-text-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<input type="text" name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . '" value="' . $answer . '"  title="' . esc_attr( $required['msg'] ) . '" ' . $disabled .' ' . $extra . '/>';
+		$input_html = "\n\t\t\t".'<input type="text" name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].'" value="'.$answer.'"  title="'.esc_attr($required['msg']).'" '.$disabled.' '.$extra.'/>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -684,35 +684,35 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function textarea( $question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $dimensions = FALSE, $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function textarea($question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $dimensions = FALSE, $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name ) {
+		if ( ! $question || ! $name) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// make sure $dimensions is an array
-		$dimensions = is_array( $dimensions ) ? $dimensions : array();
+		$dimensions = is_array($dimensions) ? $dimensions : array();
 		// and set some defaults
-		$dimensions = array_merge( array( 'rows' => 3, 'cols' => 40 ), $dimensions );
+		$dimensions = array_merge(array('rows' => 3, 'cols' => 40), $dimensions);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'regular-text' : 'espresso-textarea-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<textarea name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . '" rows="' . $dimensions['rows'] . '" cols="' . $dimensions['cols'] . '"  title="' . $required['msg'] . '" ' . $disabled . ' ' . $extra . '>' . $answer . '</textarea>';
+		$input_html = "\n\t\t\t".'<textarea name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].'" rows="'.$dimensions['rows'].'" cols="'.$dimensions['cols'].'"  title="'.$required['msg'].'" '.$disabled.' '.$extra.'>'.$answer.'</textarea>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -735,47 +735,47 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function select( $question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $add_please_select_option = FALSE ) {
+	static function select($question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $add_please_select_option = FALSE) {
 
 		// need these
-		if ( ! $question || ! $name || ! $options || empty( $options ) || ! is_array( $options )) {
+		if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? self::prep_answer( array_shift( $answer )) : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? self::prep_answer(array_shift($answer)) : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'wide' : 'espresso-select-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<select name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . '" title="' . esc_attr( $required['msg'] ) . '"' . $disabled . ' ' . $extra . '>';
+		$input_html = "\n\t\t\t".'<select name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].'" title="'.esc_attr($required['msg']).'"'.$disabled.' '.$extra.'>';
 		// recursively count array elements, to determine total number of options
-		$only_option = count( $options, 1 ) == 1 ? TRUE : FALSE;
-		if ( ! $only_option ) {
+		$only_option = count($options, 1) == 1 ? TRUE : FALSE;
+		if ( ! $only_option) {
 			// if there is NO answer set and there are multiple options to choose from, then set the "please select" message as selected
 			$selected = $answer === NULL ? ' selected="selected"' : '';
-			$input_html .= $add_please_select_option ? "\n\t\t\t\t" . '<option value=""' . $selected . '>' . __(' - please select - ', 'event_espresso') . '</option>' : '';
+			$input_html .= $add_please_select_option ? "\n\t\t\t\t".'<option value=""'.$selected.'>'.__(' - please select - ', 'event_espresso').'</option>' : '';
 		}
-		foreach ( $options as $key => $value ) {
+		foreach ($options as $key => $value) {
 			// if value is an array, then create option groups, else create regular ol' options
-			$input_html .= is_array( $value ) ? self::_generate_select_option_group( $key, $value, $answer ) : self::_generate_select_option( $value->value(), $value->desc(), $answer, $only_option );
+			$input_html .= is_array($value) ? self::_generate_select_option_group($key, $value, $answer) : self::_generate_select_option($value->value(), $value->desc(), $answer, $only_option);
 		}
 
-		$input_html .= "\n\t\t\t" . '</select>';
+		$input_html .= "\n\t\t\t".'</select>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__select__before_end_wrapper', $input_html, $question, $answer, $name, $id, $class, $system_ID );
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__select__before_end_wrapper', $input_html, $question, $answer, $name, $id, $class, $system_ID);
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -792,12 +792,12 @@ 
 	 * @param mixed $answer
 	 * @return string
 	 */
-	private static function _generate_select_option_group( $opt_group, $QSOs, $answer ){
-		$html = "\n\t\t\t\t" . '<optgroup label="' . self::prep_option_value( $opt_group ) . '">';
-		foreach ( $QSOs as $QSO ) {
-			$html .= self::_generate_select_option( $QSO->value(), $QSO->desc(), $answer );
+	private static function _generate_select_option_group($opt_group, $QSOs, $answer) {
+		$html = "\n\t\t\t\t".'<optgroup label="'.self::prep_option_value($opt_group).'">';
+		foreach ($QSOs as $QSO) {
+			$html .= self::_generate_select_option($QSO->value(), $QSO->desc(), $answer);
 		}
-		$html .= "\n\t\t\t\t" . '</optgroup>';
+		$html .= "\n\t\t\t\t".'</optgroup>';
 		return $html;
 	}
 
@@ -811,12 +811,12 @@ 
 	 * @param int $only_option
 	 * @return string
 	 */
-	private static function _generate_select_option( $key, $value, $answer, $only_option = FALSE ){
-		$key = self::prep_answer( $key );
-		$value = self::prep_answer( $value );
-		$value = ! empty( $value ) ? $value : $key;
-		$selected = ( $answer == $key || $only_option ) ? ' selected="selected"' : '';
-		return "\n\t\t\t\t" . '<option value="' . self::prep_option_value( $key ) . '"' . $selected . '> ' . $value . '&nbsp;&nbsp;&nbsp;</option>';
+	private static function _generate_select_option($key, $value, $answer, $only_option = FALSE) {
+		$key = self::prep_answer($key);
+		$value = self::prep_answer($value);
+		$value = ! empty($value) ? $value : $key;
+		$selected = ($answer == $key || $only_option) ? ' selected="selected"' : '';
+		return "\n\t\t\t\t".'<option value="'.self::prep_option_value($key).'"'.$selected.'> '.$value.'&nbsp;&nbsp;&nbsp;</option>';
 	}
 
 
@@ -840,56 +840,56 @@ 
 	 * @param bool        $use_desc_4_label
 	 * @return string HTML
 	 */
-	static function radio( $question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $label_b4 = FALSE, $use_desc_4_label = FALSE ) {
+	static function radio($question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE, $label_b4 = FALSE, $use_desc_4_label = FALSE) {
 		// need these
-		if ( ! $question || ! $name || ! $options || empty( $options ) || ! is_array( $options )) {
+		if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$radio_class = is_admin() ? 'ee-admin-radio-lbl' : $label_class;
-		$class = ! empty( $class ) ? $class : 'espresso-radio-btn-inp';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = ! empty($class) ? $class : 'espresso-radio-btn-inp';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label> ';
+		$label_html = $required_text."\n\t\t\t".'<label class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label> ';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<ul id="' . $id . '-ul" class="espresso-radio-btn-options-ul ' . $label_class . ' ' . $class . '-ul">';
+		$input_html = "\n\t\t\t".'<ul id="'.$id.'-ul" class="espresso-radio-btn-options-ul '.$label_class.' '.$class.'-ul">';
 
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$class .= ! empty( $required['class'] ) ? ' ' . $required['class'] : '';
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$class .= ! empty($required['class']) ? ' '.$required['class'] : '';
 
-		foreach ( $options as $OPT ) {
-			if ( $OPT instanceof EE_Question_Option ) {
-				$value = self::prep_option_value( $OPT->value() );
+		foreach ($options as $OPT) {
+			if ($OPT instanceof EE_Question_Option) {
+				$value = self::prep_option_value($OPT->value());
 				$label = $use_desc_4_label ? $OPT->desc() : $OPT->value();
-				$size = $use_desc_4_label ? self::get_label_size_class( $OPT->value() . ' ' . $OPT->desc() ) : self::get_label_size_class( $OPT->value() );
-				$desc = $OPT->desc();//no self::prep_answer
-				$answer = is_numeric( $value ) && empty( $answer ) ? 0 : $answer;
-				$checked = (string)$value == (string)$answer ? ' checked="checked"' : '';
-				$opt = '-' . sanitize_key( $value );
-
-				$input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
-				$input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-radio-btn-lbl">';
-				$input_html .= $label_b4  ? "\n\t\t\t\t\t\t" . '<span>' . $label . '</span>' : '';
-				$input_html .= "\n\t\t\t\t\t\t" . '<input type="radio" name="' . $name . '" id="' . $id . $opt . '" class="' . $class . '" value="' . $value . '" title="' . esc_attr( $required['msg'] ) . '" ' . $disabled . $checked . ' ' . $extra . '/>';
-				$input_html .= ! $label_b4  ? "\n\t\t\t\t\t\t" . '<span class="espresso-radio-btn-desc">' . $label . '</span>' : '';
-				$input_html .= "\n\t\t\t\t\t" . '</label>';
-				$input_html .= $use_desc_4_label ? '' : '<span class="espresso-radio-btn-option-desc small-text grey-text">' . $desc . '</span>';
-				$input_html .= "\n\t\t\t\t" . '</li>';
+				$size = $use_desc_4_label ? self::get_label_size_class($OPT->value().' '.$OPT->desc()) : self::get_label_size_class($OPT->value());
+				$desc = $OPT->desc(); //no self::prep_answer
+				$answer = is_numeric($value) && empty($answer) ? 0 : $answer;
+				$checked = (string) $value == (string) $answer ? ' checked="checked"' : '';
+				$opt = '-'.sanitize_key($value);
+
+				$input_html .= "\n\t\t\t\t".'<li'.$size.'>';
+				$input_html .= "\n\t\t\t\t\t".'<label class="'.$radio_class.' espresso-radio-btn-lbl">';
+				$input_html .= $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$label.'</span>' : '';
+				$input_html .= "\n\t\t\t\t\t\t".'<input type="radio" name="'.$name.'" id="'.$id.$opt.'" class="'.$class.'" value="'.$value.'" title="'.esc_attr($required['msg']).'" '.$disabled.$checked.' '.$extra.'/>';
+				$input_html .= ! $label_b4 ? "\n\t\t\t\t\t\t".'<span class="espresso-radio-btn-desc">'.$label.'</span>' : '';
+				$input_html .= "\n\t\t\t\t\t".'</label>';
+				$input_html .= $use_desc_4_label ? '' : '<span class="espresso-radio-btn-option-desc small-text grey-text">'.$desc.'</span>';
+				$input_html .= "\n\t\t\t\t".'</li>';
 			}
 		}
 
-		$input_html .= "\n\t\t\t" . '</ul>';
+		$input_html .= "\n\t\t\t".'</ul>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -912,65 +912,65 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function checkbox( $question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $label_b4 = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function checkbox($question = FALSE, $answer = NULL, $options = FALSE, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $label_b4 = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name || ! $options || empty( $options ) || ! is_array( $options )) {
+		if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
 			return NULL;
 		}
-		$answer = maybe_unserialize( $answer );
+		$answer = maybe_unserialize($answer);
 
 		// prep the answer(s)
-		$answer = is_array( $answer ) ? $answer : array( sanitize_key( $answer ) => $answer );
+		$answer = is_array($answer) ? $answer : array(sanitize_key($answer) => $answer);
 
-		foreach ( $answer as $key => $value ) {
-			$key = self::prep_option_value( $key );
-			$answer[$key] = self::prep_answer( $value );
+		foreach ($answer as $key => $value) {
+			$key = self::prep_option_value($key);
+			$answer[$key] = self::prep_answer($value);
 		}
 
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$radio_class = is_admin() ? 'ee-admin-radio-lbl' : $label_class;
-		$class = empty( $class ) ? 'espresso-radio-btn-inp' : $class;
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? 'espresso-radio-btn-inp' : $class;
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label> ';
+		$label_html = $required_text."\n\t\t\t".'<label class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label> ';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
-
-		$input_html = "\n\t\t\t" . '<ul id="' . $id . '-ul" class="espresso-checkbox-options-ul ' . $label_class . ' ' . $class . '-ul">';
-
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$class .= ! empty( $required['class'] ) ? ' ' . $required['class'] : '';
-
-		foreach ( $options as $OPT ) {
-			$value = $OPT->value();//self::prep_option_value( $OPT->value() );
-			$size = self::get_label_size_class(  $OPT->value() . ' ' . $OPT->desc() );
-			$text = self::prep_answer( $OPT->value() );
-			$desc = $OPT->desc() ;
-			$opt = '-' . sanitize_key( $value );
-
-			$checked = is_array( $answer ) && in_array( $text, $answer ) ? ' checked="checked"' : '';
-
-			$input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
-			$input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-checkbox-lbl">';
-			$input_html .= $label_b4  ? "\n\t\t\t\t\t\t" . '<span>' . $text . '</span>' : '';
-			$input_html .= "\n\t\t\t\t\t\t" . '<input type="checkbox" name="' . $name . '[' . $OPT->ID() . ']" id="' . $id . $opt . '" class="' . $class . '" value="' . $value . '" title="' . esc_attr( $required['msg'] ) . '" ' . $disabled . $checked . ' ' . $extra . '/>';
-			$input_html .= ! $label_b4  ? "\n\t\t\t\t\t\t" . '<span>' . $text . '</span>' : '';
- 			$input_html .= "\n\t\t\t\t\t" . '</label>';
-			if ( ! empty( $desc ) && $desc != $text ) {
-	 			$input_html .= "\n\t\t\t\t\t" . ' &nbsp; <br/><div class="espresso-checkbox-option-desc small-text grey-text">' . $desc . '</div>';
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
+
+		$input_html = "\n\t\t\t".'<ul id="'.$id.'-ul" class="espresso-checkbox-options-ul '.$label_class.' '.$class.'-ul">';
+
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$class .= ! empty($required['class']) ? ' '.$required['class'] : '';
+
+		foreach ($options as $OPT) {
+			$value = $OPT->value(); //self::prep_option_value( $OPT->value() );
+			$size = self::get_label_size_class($OPT->value().' '.$OPT->desc());
+			$text = self::prep_answer($OPT->value());
+			$desc = $OPT->desc();
+			$opt = '-'.sanitize_key($value);
+
+			$checked = is_array($answer) && in_array($text, $answer) ? ' checked="checked"' : '';
+
+			$input_html .= "\n\t\t\t\t".'<li'.$size.'>';
+			$input_html .= "\n\t\t\t\t\t".'<label class="'.$radio_class.' espresso-checkbox-lbl">';
+			$input_html .= $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$text.'</span>' : '';
+			$input_html .= "\n\t\t\t\t\t\t".'<input type="checkbox" name="'.$name.'['.$OPT->ID().']" id="'.$id.$opt.'" class="'.$class.'" value="'.$value.'" title="'.esc_attr($required['msg']).'" '.$disabled.$checked.' '.$extra.'/>';
+			$input_html .= ! $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$text.'</span>' : '';
+ 			$input_html .= "\n\t\t\t\t\t".'</label>';
+			if ( ! empty($desc) && $desc != $text) {
+	 			$input_html .= "\n\t\t\t\t\t".' &nbsp; <br/><div class="espresso-checkbox-option-desc small-text grey-text">'.$desc.'</div>';
 			}
-			$input_html .= "\n\t\t\t\t" . '</li>';
+			$input_html .= "\n\t\t\t\t".'</li>';
 
 		}
 
-		$input_html .= "\n\t\t\t" . '</ul>';
+		$input_html .= "\n\t\t\t".'</ul>';
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -992,36 +992,36 @@ 
 	 * @param string $disabled 		disabled="disabled" or null
 	 * @return string HTML
 	 */
-	static function datepicker( $question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE ) {
+	static function datepicker($question = FALSE, $answer = NULL, $name = FALSE, $id = '', $class = '', $required = FALSE, $required_text = '', $label_class = '', $disabled = FALSE, $system_ID = FALSE, $use_html_entities = TRUE) {
 		// need these
-		if ( ! $question || ! $name ) {
+		if ( ! $question || ! $name) {
 			return NULL;
 		}
 		// prep the answer
-		$answer = is_array( $answer ) ? '' : self::prep_answer( $answer, $use_html_entities );
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
 		// prep the required array
-		$required = self::prep_required( $required );
+		$required = self::prep_required($required);
 		// set disabled tag
-		$disabled = $answer === NULL || ! $disabled  ? '' : ' disabled="disabled"';
+		$disabled = $answer === NULL || ! $disabled ? '' : ' disabled="disabled"';
 		// ya gots ta have style man!!!
 		$txt_class = is_admin() ? 'regular-text' : 'espresso-datepicker-inp';
-		$class = empty( $class ) ? $txt_class : $class;
-		$class .= ! empty( $system_ID ) ? ' ' . $system_ID : '';
-		$extra = apply_filters( 'FHEE__EEH_Form_Fields__additional_form_field_attributes', '' );
+		$class = empty($class) ? $txt_class : $class;
+		$class .= ! empty($system_ID) ? ' '.$system_ID : '';
+		$extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
-		$label_html = $required_text . "\n\t\t\t" . '<label for="' . $name . '" class="' . $label_class . '">' . self::prep_question( $question ) . $required['label'] . '</label><br/>';
+		$label_html = $required_text."\n\t\t\t".'<label for="'.$name.'" class="'.$label_class.'">'.self::prep_question($question).$required['label'].'</label><br/>';
 		// filter label but ensure required text comes before it
-		$label_html = apply_filters( 'FHEE__EEH_Form_Fields__label_html', $label_html, $required_text );
+		$label_html = apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text);
 
-		$input_html = "\n\t\t\t" . '<input type="text" name="' . $name . '" id="' . $id . '" class="' . $class . ' ' . $required['class'] . ' datepicker" value="' . $answer . '"  title="' . esc_attr( $required['msg'] ) . '" ' . $disabled . ' ' . $extra . '/>';
+		$input_html = "\n\t\t\t".'<input type="text" name="'.$name.'" id="'.$id.'" class="'.$class.' '.$required['class'].' datepicker" value="'.$answer.'"  title="'.esc_attr($required['msg']).'" '.$disabled.' '.$extra.'/>';
 
 		// enqueue scripts
-		wp_register_style( 'espresso-ui-theme', EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'espresso-ui-theme');
-		wp_enqueue_script( 'jquery-ui-datepicker' );
+		wp_register_style('espresso-ui-theme', EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso-ui-theme');
+		wp_enqueue_script('jquery-ui-datepicker');
 
-		$input_html =  apply_filters( 'FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id );
-		return  $label_html . $input_html;
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return  $label_html.$input_html;
 
 	}
 
@@ -1033,7 +1033,7 @@ 
 	 * 	@access public
 	 * 	@return 	string
 	 */
-	public static function remove_label_keep_required_msg( $label_html, $required_text ) {
+	public static function remove_label_keep_required_msg($label_html, $required_text) {
 		return $required_text;
 	}
 
@@ -1047,9 +1047,9 @@ 
 	 * @param string $value
 	 * @return string HTML
 	 */
-	static function hidden_input( $name, $value, $id = '' ){
-		$id = ! empty( $id ) ? $id : $name;
-		return '<input id="' . $id . '" type="hidden" name="'.$name.'" value="' .  $value . '"/>';
+	static function hidden_input($name, $value, $id = '') {
+		$id = ! empty($id) ? $id : $name;
+		return '<input id="'.$id.'" type="hidden" name="'.$name.'" value="'.$value.'"/>';
 	}
 
 
@@ -1061,7 +1061,7 @@ 
 	 * @param string $question
 	 * @return string
 	 */
-	static function prep_question( $question ){
+	static function prep_question($question) {
 		return $question;
 //		$link = '';
 //		// does this label have a help link attached ?
@@ -1084,13 +1084,13 @@ 
 	 * @param mixed $answer
 	 * @return string
 	 */
-	static function prep_answer( $answer, $use_html_entities = TRUE ){
+	static function prep_answer($answer, $use_html_entities = TRUE) {
 		//make sure we convert bools first.  Otherwise (bool) false becomes an empty string which is NOT desired, we want "0".
-		if ( is_bool( $answer ) ) {
+		if (is_bool($answer)) {
 			$answer = $answer ? 1 : 0;
 		}
-		$answer = trim( stripslashes( str_replace( '&#039;', "'", $answer )));
-		return $use_html_entities ? htmlentities( $answer, ENT_QUOTES, 'UTF-8' ) : $answer;
+		$answer = trim(stripslashes(str_replace('&#039;', "'", $answer)));
+		return $use_html_entities ? htmlentities($answer, ENT_QUOTES, 'UTF-8') : $answer;
 	}
 
 
@@ -1100,18 +1100,18 @@ 
 	 * 	@param array $QSOs  array of EE_Question_Option objects
 	 * 	@return array
 	 */
-	public static function prep_answer_options( $QSOs = array() ){
+	public static function prep_answer_options($QSOs = array()) {
 		$prepped_answer_options = array();
-		if ( is_array( $QSOs ) && ! empty( $QSOs )) {
-			foreach( $QSOs as $key => $QSO ) {
-				if ( ! $QSO instanceof EE_Question_Option ) {
-					$QSO = EE_Question_Option::new_instance( array(
-						'QSO_value' => is_array( $QSO ) && isset( $QSO['id'] ) ? (string)$QSO['id'] : (string)$key,
-						'QSO_desc' => is_array( $QSO ) && isset( $QSO['text'] ) ? (string)$QSO['text'] : (string)$QSO
+		if (is_array($QSOs) && ! empty($QSOs)) {
+			foreach ($QSOs as $key => $QSO) {
+				if ( ! $QSO instanceof EE_Question_Option) {
+					$QSO = EE_Question_Option::new_instance(array(
+						'QSO_value' => is_array($QSO) && isset($QSO['id']) ? (string) $QSO['id'] : (string) $key,
+						'QSO_desc' => is_array($QSO) && isset($QSO['text']) ? (string) $QSO['text'] : (string) $QSO
 					));
 				}
-				if ( $QSO->opt_group() ) {
-					$prepped_answer_options[ $QSO->opt_group() ][] = $QSO;
+				if ($QSO->opt_group()) {
+					$prepped_answer_options[$QSO->opt_group()][] = $QSO;
 				} else {
 					$prepped_answer_options[] = $QSO;
 				}
@@ -1127,8 +1127,8 @@ 
 	 * @param string $option_value
 	 * @return string
 	 */
-	static function prep_option_value( $option_value ){
-		return trim( stripslashes( $option_value ));
+	static function prep_option_value($option_value) {
+		return trim(stripslashes($option_value));
 	}
 
 
@@ -1139,11 +1139,11 @@ 
 	 * @param string|array 	$required
 	 * @return array
 	 */
-	static function prep_required( $required = array() ){
+	static function prep_required($required = array()) {
 		// make sure required is an array
-		$required = is_array( $required ) ? $required : array();
+		$required = is_array($required) ? $required : array();
 		// and set some defaults
-		$required = array_merge( array( 'label' => '', 'class' => '', 'msg' => '' ), $required );
+		$required = array_merge(array('label' => '', 'class' => '', 'msg' => ''), $required);
 		return $required;
 	}
 
@@ -1154,30 +1154,30 @@ 
 	 * @param string 	$value
 	 * @return string
 	 */
-	static function get_label_size_class( $value = FALSE ){
-			if ( $value === FALSE || $value == '' ) {
+	static function get_label_size_class($value = FALSE) {
+			if ($value === FALSE || $value == '') {
 				return ' class="medium-lbl"';
 			}
 			// determine length of option value
-			$val_size = strlen( $value );
-			switch( $val_size ){
+			$val_size = strlen($value);
+			switch ($val_size) {
 				case $val_size < 3 :
-					$size =  ' class="nano-lbl"';
+					$size = ' class="nano-lbl"';
 					break;
 				case $val_size < 6 :
-					$size =  ' class="micro-lbl"';
+					$size = ' class="micro-lbl"';
 					break;
 				case $val_size < 12 :
-					$size =  ' class="tiny-lbl"';
+					$size = ' class="tiny-lbl"';
 					break;
 				case $val_size < 25 :
-					$size =  ' class="small-lbl"';
+					$size = ' class="small-lbl"';
 					break;
 				case $val_size > 100 :
-					$size =  ' class="big-lbl"';
+					$size = ' class="big-lbl"';
 					break;
 				default:
-					$size =  ' class="medium-lbl"';
+					$size = ' class="medium-lbl"';
 					break;
 			}
 		return $size;
@@ -1191,20 +1191,20 @@ 
 	 * @param array 	$QFI
 	 * @return array
 	 */
-	private static function _load_system_dropdowns( $QFI ){
+	private static function _load_system_dropdowns($QFI) {
 		$QST_system = $QFI->get('QST_system');
-		switch ( $QST_system ) {
+		switch ($QST_system) {
 			case 'state' :
-				$QFI = self::generate_state_dropdown( $QFI );
+				$QFI = self::generate_state_dropdown($QFI);
 				break;
 			case 'country' :
-				$QFI = self::generate_country_dropdown( $QFI );
+				$QFI = self::generate_country_dropdown($QFI);
 				break;
 			case 'admin-state' :
-				$QFI = self::generate_state_dropdown( $QFI, TRUE );
+				$QFI = self::generate_state_dropdown($QFI, TRUE);
 				break;
 			case 'admin-country' :
-				$QFI = self::generate_country_dropdown( $QFI, TRUE );
+				$QFI = self::generate_country_dropdown($QFI, TRUE);
 				break;
 		}
 		return $QFI;
@@ -1221,13 +1221,13 @@ 
 	 *
 	 * @return EE_Question_Form_Input
 	 */
-	protected static function _load_specialized_dropdowns( $QFI ) {
-		switch( $QFI->get( 'QST_type' ) ) {
+	protected static function _load_specialized_dropdowns($QFI) {
+		switch ($QFI->get('QST_type')) {
 			case 'STATE' :
-				$QFI = self::generate_state_dropdown( $QFI );
+				$QFI = self::generate_state_dropdown($QFI);
 				break;
 			case 'COUNTRY' :
-				$QFI = self::generate_country_dropdown( $QFI );
+				$QFI = self::generate_country_dropdown($QFI);
 				break;
 		}
 		return $QFI;
@@ -1241,23 +1241,23 @@ 
 	 * @param bool  $get_all
 	 * @return array
 	 */
-	public static function generate_state_dropdown( $QST, $get_all = FALSE ){
+	public static function generate_state_dropdown($QST, $get_all = FALSE) {
 		$states = $get_all ? EEM_State::instance()->get_all_states() : EEM_State::instance()->get_all_states_of_active_countries();
-		if ( $states && count( $states ) != count( $QST->options() )) {
-			$QST->set( 'QST_type', 'DROPDOWN' );
+		if ($states && count($states) != count($QST->options())) {
+			$QST->set('QST_type', 'DROPDOWN');
 			// if multiple countries, we'll create option groups within the dropdown
-			foreach ( $states as $state ) {
-				if ( $state instanceof EE_State ) {
-					$QSO = EE_Question_Option::new_instance ( array (
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$QSO = EE_Question_Option::new_instance(array(
 						'QSO_value' => $state->ID(),
 						'QSO_desc' => $state->name(),
-						'QST_ID' => $QST->get( 'QST_ID' ),
+						'QST_ID' => $QST->get('QST_ID'),
 						'QSO_deleted' => FALSE
 					));
 					// set option group
-					$QSO->set_opt_group( $state->country()->name() );
+					$QSO->set_opt_group($state->country()->name());
 					// add option to question
-					$QST->add_temp_option( $QSO );
+					$QST->add_temp_option($QSO);
 				}
 			}
 		}
@@ -1273,20 +1273,20 @@ 
 	 * @internal param array $question
 	 * @return array
 	 */
-	public static function generate_country_dropdown( $QST, $get_all = FALSE ){
+	public static function generate_country_dropdown($QST, $get_all = FALSE) {
 		$countries = $get_all ? EEM_Country::instance()->get_all_countries() : EEM_Country::instance()->get_all_active_countries();
-		if ( $countries && count( $countries ) != count( $QST->options() ) ) {
-			$QST->set( 'QST_type', 'DROPDOWN' );
+		if ($countries && count($countries) != count($QST->options())) {
+			$QST->set('QST_type', 'DROPDOWN');
 			// now add countries
-			foreach ( $countries as $country ) {
-				if ( $country instanceof EE_Country ) {
-					$QSO = EE_Question_Option::new_instance ( array (
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$QSO = EE_Question_Option::new_instance(array(
 						'QSO_value' => $country->ID(),
 						'QSO_desc' => $country->name(),
-						'QST_ID' => $QST->get( 'QST_ID' ),
+						'QST_ID' => $QST->get('QST_ID'),
 						'QSO_deleted' => FALSE
 					));
-					$QST->add_temp_option( $QSO );
+					$QST->add_temp_option($QSO);
 				}
 			}
 		}
@@ -1303,11 +1303,11 @@ 
 	 */
 	public static function two_digit_months_dropdown_options() {
 		$options = array();
-		for ( $x = 1; $x <= 12; $x++ ) {
-			$mm = str_pad( $x, 2, '0', STR_PAD_LEFT );
-			$options[ (string)$mm ] = (string)$mm;
+		for ($x = 1; $x <= 12; $x++) {
+			$mm = str_pad($x, 2, '0', STR_PAD_LEFT);
+			$options[(string) $mm] = (string) $mm;
 		}
-		return EEH_Form_Fields::prep_answer_options( $options );
+		return EEH_Form_Fields::prep_answer_options($options);
 	}
 
 
@@ -1322,11 +1322,11 @@ 
 		$options = array();
 		$current_year = date('y');
 		$next_decade = $current_year + 10;
-		for ( $x = $current_year; $x <= $next_decade; $x++ ) {
-			$yy = str_pad( $x, 2, '0', STR_PAD_LEFT );
-			$options[ (string)$yy ] = (string)$yy;
+		for ($x = $current_year; $x <= $next_decade; $x++) {
+			$yy = str_pad($x, 2, '0', STR_PAD_LEFT);
+			$options[(string) $yy] = (string) $yy;
 		}
-		return EEH_Form_Fields::prep_answer_options( $options );
+		return EEH_Form_Fields::prep_answer_options($options);
 	}
 
 
@@ -1340,17 +1340,17 @@ 
 	 * @param  integer $evt_category Event Category ID if the Event Category filter is selected
 	 * @return string                html
 	 */
-	public static function generate_registration_months_dropdown( $cur_date = '', $status = '', $evt_category = 0 ) {
+	public static function generate_registration_months_dropdown($cur_date = '', $status = '', $evt_category = 0) {
 		$_where = array();
-		if ( !empty( $status ) ) {
+		if ( ! empty($status)) {
 			$_where['STS_ID'] = $status;
 		}
 
-		if ( $evt_category > 0 ) {
+		if ($evt_category > 0) {
 			$_where['Event.Term_Taxonomy.term_id'] = $evt_category;
 		}
 
-		$regdtts = EEM_Registration::instance()->get_reg_months_and_years( $_where );
+		$regdtts = EEM_Registration::instance()->get_reg_months_and_years($_where);
 
 		//setup vals for select input helper
 		$options = array(
@@ -1360,15 +1360,15 @@ 
 				)
 			);
 
-		foreach ( $regdtts as $regdtt ) {
-			$date = $regdtt->reg_month. ' ' . $regdtt->reg_year;
+		foreach ($regdtts as $regdtt) {
+			$date = $regdtt->reg_month.' '.$regdtt->reg_year;
 			$options[] = array(
 				'text' => $date,
 				'id' => $date
 				);
 		}
 
-		return self::select_input('month_range', $options, $cur_date, '', 'wide' );
+		return self::select_input('month_range', $options, $cur_date, '', 'wide');
 	}
 
 
@@ -1382,18 +1382,18 @@ 
 	 * @param  string $evt_active_status "upcoming", "expired", "active", or "inactive"
 	 * @return string                    html
 	 */
-	public static function generate_event_months_dropdown( $cur_date = '', $status = NULL, $evt_category = NULL, $evt_active_status = NULL ) {
+	public static function generate_event_months_dropdown($cur_date = '', $status = NULL, $evt_category = NULL, $evt_active_status = NULL) {
 		//determine what post_status our condition will have for the query.
-		switch ( $status ) {
+		switch ($status) {
 			case 'month' :
 			case 'today' :
 			case NULL :
 			case 'all' :
-				$where['Event.status'] = array( 'NOT IN', array('trash') );
+				$where['Event.status'] = array('NOT IN', array('trash'));
 				break;
 
 			case 'draft' :
-				$where['Event.status'] = array( 'IN', array('draft', 'auto-draft') );
+				$where['Event.status'] = array('IN', array('draft', 'auto-draft'));
 
 			default :
 				$where['Event.status'] = $status;
@@ -1402,7 +1402,7 @@ 
 		//categories?
 
 
-		if ( !empty ( $evt_category ) ) {
+		if ( ! empty ($evt_category)) {
 			$where['Event.Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 			$where['Event.Term_Taxonomy.term_id'] = $evt_category;
 		}
@@ -1410,7 +1410,7 @@ 
 
 //		$where['DTT_is_primary'] = 1;
 
-		$DTTS = EE_Registry::instance()->load_model('Datetime')->get_dtt_months_and_years($where, $evt_active_status );
+		$DTTS = EE_Registry::instance()->load_model('Datetime')->get_dtt_months_and_years($where, $evt_active_status);
 
 		//let's setup vals for select input helper
 		$options = array(
@@ -1423,9 +1423,9 @@ 
 		//translate month and date
 		global $wp_locale;
 
-		foreach ( $DTTS as $DTT ) {
-			$localized_date = $wp_locale->get_month( date('m', strtotime($DTT->dtt_month)) ) . ' ' . $DTT->dtt_year;
-			$id = $DTT->dtt_month . ' ' . $DTT->dtt_year;
+		foreach ($DTTS as $DTT) {
+			$localized_date = $wp_locale->get_month(date('m', strtotime($DTT->dtt_month))).' '.$DTT->dtt_year;
+			$id = $DTT->dtt_month.' '.$DTT->dtt_year;
 			$options[] = array(
 				'text' => $localized_date,
 				'id' => $id
@@ -1433,7 +1433,7 @@ 
 		}
 
 
-		return self::select_input( 'month_range', $options, $cur_date, '', 'wide' );
+		return self::select_input('month_range', $options, $cur_date, '', 'wide');
 	}
 
 
@@ -1444,7 +1444,7 @@ 
 	 * @param  integer $current_cat currently selected category
 	 * @return string               html for dropdown
 	 */
-	public static function generate_event_category_dropdown( $current_cat = -1 ) {
+	public static function generate_event_category_dropdown($current_cat = -1) {
 		$categories = EEM_Term::instance()->get_all_ee_categories(TRUE);
 		$options = array(
 			'0' => array(
@@ -1454,14 +1454,14 @@ 
 			);
 
 		//setup categories for dropdown
-		foreach ( $categories as $category ) {
+		foreach ($categories as $category) {
 			$options[] = array(
 				'text' => $category->get('name'),
 				'id' => $category->ID()
 				);
 		}
 
-		return self::select_input( 'EVT_CAT', $options, $current_cat );
+		return self::select_input('EVT_CAT', $options, $current_cat);
 	}
 
 
@@ -1480,20 +1480,20 @@ 
 	 * @param    string   $extra_attributes - any extra attributes that need to be attached to the form input
 	 * @return    void
 	 */
-	public static function submit_button( $url = '', $ID = '', $class = '', $text = '', $nonce_action = '', $input_only = FALSE, $extra_attributes = '' ) {
+	public static function submit_button($url = '', $ID = '', $class = '', $text = '', $nonce_action = '', $input_only = FALSE, $extra_attributes = '') {
 		$btn = '';
-		if ( empty( $url ) || empty( $ID )) {
+		if (empty($url) || empty($ID)) {
 			return $btn;
 		}
-		$text = ! empty( $text ) ? $text : __('Submit', 'event_espresso' );
-		$btn .= '<input id="' . $ID . '-btn" class="' . $class . '" type="submit" value="' . $text . '" ' . $extra_attributes . '/>';
-		if ( ! $input_only ) {
-			$btn_frm = '<form id="' . $ID . '-frm" method="POST" action="' . $url . '">';
-			$btn_frm .= ! empty( $nonce_action ) ? wp_nonce_field( $nonce_action, $nonce_action . '_nonce', TRUE, FALSE ) : '';
+		$text = ! empty($text) ? $text : __('Submit', 'event_espresso');
+		$btn .= '<input id="'.$ID.'-btn" class="'.$class.'" type="submit" value="'.$text.'" '.$extra_attributes.'/>';
+		if ( ! $input_only) {
+			$btn_frm = '<form id="'.$ID.'-frm" method="POST" action="'.$url.'">';
+			$btn_frm .= ! empty($nonce_action) ? wp_nonce_field($nonce_action, $nonce_action.'_nonce', TRUE, FALSE) : '';
 			$btn_frm .= $btn;
 			$btn_frm .= '</form>';
 			$btn = $btn_frm;
-			unset ( $btn_frm );
+			unset ($btn_frm);
 		}
 		return $btn;
 	}

Braces +9 added lines, -6 removed lines

@@ -366,14 +366,16 @@ 
 		$field = '<select id="' . EEH_Formatter::ee_tep_output_string($name) . '" name="' . EEH_Formatter::ee_tep_output_string($name) . '"';
 		//Debug
 		//EEH_Debug_Tools::printr( $values, '$values  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		if ( EEH_Formatter::ee_tep_not_null($parameters))
-			$field .= ' ' . $parameters;
+		if ( EEH_Formatter::ee_tep_not_null($parameters)) {
+					$field .= ' ' . $parameters;
+		}
 		if ($autosize) {
 			$size = 'med';
 			for ($ii = 0, $ni = sizeof($values); $ii < $ni; $ii++) {
 				if ($values[$ii]['text']) {
-					if (strlen($values[$ii]['text']) > 5)
-						$size = 'wide';
+					if (strlen($values[$ii]['text']) > 5) {
+											$size = 'wide';
+					}
 				}
 			}
 		} else {
@@ -382,8 +384,9 @@ 
 
 		$field .= ' class="' . $class . ' ' . $size . '">';
 
-		if (empty($default) && isset($GLOBALS[$name]))
-			$default = stripslashes($GLOBALS[$name]);
+		if (empty($default) && isset($GLOBALS[$name])) {
+					$default = stripslashes($GLOBALS[$name]);
+		}
 
 
 		for ($i = 0, $n = sizeof($values); $i < $n; $i++) {

core/helpers/EEH_Line_Item.helper.php

Doc Comments +5 added lines, -4 removed lines

@@ -574,7 +574,7 @@ 
 	 * Ensures that taxes have been applied to the order, if not applies them.
 	 * Returns the total amount of tax
 	 * @param EE_Line_Item $total_line_item of type EEM_Line_Item::type_total
-	 * @return float
+	 * @return boolean
 	 */
 	public static function ensure_taxes_applied( $total_line_item ){
 		$taxes_subtotal = self::get_taxes_subtotal( $total_line_item );
@@ -590,7 +590,7 @@ 
 	 * Deletes ALL children of the passed line item
 	 *
 	 * @param EE_Line_Item $parent_line_item
-	 * @return bool
+	 * @return integer
 	 */
 	public static function delete_all_child_items( EE_Line_Item $parent_line_item ) {
 		$deleted = 0;
@@ -620,7 +620,7 @@ 
 	 * You should call EE_Registration_Processor::calculate_reg_final_prices_per_line_item()
 	 * after using this, to keep the registration final prices in-sync with the transaction's total.
 	 * @param EE_Line_Item      $total_line_item of type EEM_Line_Item::type_total
-	 * @param array|bool|string $line_item_codes
+	 * @param boolean $line_item_codes
 	 * @return int number of items successfully removed
 	 */
 	public static function delete_items( EE_Line_Item $total_line_item, $line_item_codes = FALSE ) {
@@ -784,6 +784,7 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @param string $line_item_type one of the EEM_Line_Item constants
 	 * @param string | NULL $obj_type object model class name (minus prefix) or NULL to ignore object type when searching
+	 * @param string $obj_type
 	 * @return EE_Line_Item[]
 	 */
 	protected static function _get_descendants_by_type_and_object_type( EE_Line_Item $parent_line_item, $line_item_type, $obj_type = NULL ) {
@@ -809,7 +810,7 @@ 
 	 * @uses  EEH_Line_Item::_get_descendants_by_type_and_object_type()
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @param string $OBJ_type object type (like Event)
-	 * @param array $OBJ_IDs array of OBJ_IDs
+	 * @param boolean[] $OBJ_IDs array of OBJ_IDs
 	 * @return EE_Line_Item[]
 	 */
 	public static function get_line_items_by_object_type_and_IDs( EE_Line_Item $parent_line_item, $OBJ_type = '', $OBJ_IDs = array() ) {

Braces +1 added lines, -1 removed lines

@@ -280,7 +280,7 @@
 		$pre_tax_subtotal = self::get_pre_tax_subtotal( $total_line_item );
 		if ( $pre_tax_subtotal instanceof EE_Line_Item ){
 			$success = $pre_tax_subtotal->add_child_line_item($item);
-		}else{
+		} else{
 			return FALSE;
 		}
 		$total_line_item->recalculate_total_including_taxes();

Spacing +270 added lines, -270 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  *
  * EEH_Line_Item
@@ -40,8 +40,8 @@ 
 	 * @param boolean $code if set to a value, ensures there is only one line item with that code
 	 * @return boolean success
 	 */
-	public static function add_unrelated_item( EE_Line_Item $parent_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE, $code = NULL  ){
-		$items_subtotal = self::get_pre_tax_subtotal( $parent_line_item );
+	public static function add_unrelated_item(EE_Line_Item $parent_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE, $code = NULL) {
+		$items_subtotal = self::get_pre_tax_subtotal($parent_line_item);
 		$line_item = EE_Line_Item::new_instance(array(
 			'LIN_name' => $name,
 			'LIN_desc' => $description,
@@ -49,8 +49,8 @@ 
 			'LIN_quantity' => $quantity,
 			'LIN_percent' => null,
 			'LIN_is_taxable' => $taxable,
-			'LIN_order' => $items_subtotal instanceof EE_Line_Item ? count( $items_subtotal->children() ) : 0,
-			'LIN_total' => floatval( $unit_price ) * intval( $quantity ),
+			'LIN_order' => $items_subtotal instanceof EE_Line_Item ? count($items_subtotal->children()) : 0,
+			'LIN_total' => floatval($unit_price) * intval($quantity),
 			'LIN_type'=>  EEM_Line_Item::type_line_item,
 			'LIN_code' => $code,
 		));
@@ -58,7 +58,7 @@ 
 			'FHEE__EEH_Line_Item__add_unrelated_item__line_item',
 			$line_item
 		);
-		return self::add_item( $parent_line_item, $line_item );
+		return self::add_item($parent_line_item, $line_item);
 	}
 
 
@@ -79,7 +79,7 @@ 
 	 * @param boolean      $taxable
 	 * @return boolean success
 	 */
-	public static function add_percentage_based_item( EE_Line_Item $parent_line_item, $name, $percentage_amount, $description = '', $taxable = FALSE ){
+	public static function add_percentage_based_item(EE_Line_Item $parent_line_item, $name, $percentage_amount, $description = '', $taxable = FALSE) {
 		$line_item = EE_Line_Item::new_instance(array(
 			'LIN_name' => $name,
 			'LIN_desc' => $description,
@@ -87,7 +87,7 @@ 
 			'LIN_percent' => $percentage_amount,
 			'LIN_quantity' => NULL,
 			'LIN_is_taxable' => $taxable,
-			'LIN_total' => floatval( $percentage_amount * ( $parent_line_item->total() / 100 )),
+			'LIN_total' => floatval($percentage_amount * ($parent_line_item->total() / 100)),
 			'LIN_type'=>  EEM_Line_Item::type_line_item,
 			'LIN_parent' => $parent_line_item->ID()
 		));
@@ -95,7 +95,7 @@ 
 			'FHEE__EEH_Line_Item__add_percentage_based_item__line_item',
 			$line_item
 		);
-		return self::add_item( $parent_line_item, $line_item );
+		return self::add_item($parent_line_item, $line_item);
 	}
 
 
@@ -116,15 +116,15 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function add_ticket_purchase( EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1 ){
-		if ( ! $total_line_item instanceof EE_Line_Item || ! $total_line_item->is_total() ) {
-			throw new EE_Error( sprintf( __( 'A valid line item total is required in order to add tickets. A line item of type "%s" was passed.', 'event_espresso' ), $ticket->ID(), $total_line_item->ID() ) );
+	public static function add_ticket_purchase(EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1) {
+		if ( ! $total_line_item instanceof EE_Line_Item || ! $total_line_item->is_total()) {
+			throw new EE_Error(sprintf(__('A valid line item total is required in order to add tickets. A line item of type "%s" was passed.', 'event_espresso'), $ticket->ID(), $total_line_item->ID()));
 		}
 		// either increment the qty for an existing ticket
-		$line_item = self::increment_ticket_qty_if_already_in_cart( $total_line_item, $ticket, $qty );
+		$line_item = self::increment_ticket_qty_if_already_in_cart($total_line_item, $ticket, $qty);
 		// or add a new one
-		if ( ! $line_item instanceof EE_Line_Item ) {
-			$line_item = self::create_ticket_line_item( $total_line_item, $ticket, $qty );
+		if ( ! $line_item instanceof EE_Line_Item) {
+			$line_item = self::create_ticket_line_item($total_line_item, $ticket, $qty);
 		}
 		$total_line_item->recalculate_total_including_taxes();
 		return $line_item;
@@ -140,19 +140,19 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function increment_ticket_qty_if_already_in_cart( EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1 ) {
+	public static function increment_ticket_qty_if_already_in_cart(EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1) {
 		$line_item = null;
-		if ( $total_line_item instanceof EE_Line_Item && $total_line_item->is_total() ) {
-			$ticket_line_items = EEH_Line_Item::get_ticket_line_items( $total_line_item );
-			foreach ( (array)$ticket_line_items as $ticket_line_item ) {
-				if ( $ticket_line_item instanceof EE_Line_Item && $ticket_line_item->OBJ_ID() == $ticket->ID() ) {
+		if ($total_line_item instanceof EE_Line_Item && $total_line_item->is_total()) {
+			$ticket_line_items = EEH_Line_Item::get_ticket_line_items($total_line_item);
+			foreach ((array) $ticket_line_items as $ticket_line_item) {
+				if ($ticket_line_item instanceof EE_Line_Item && $ticket_line_item->OBJ_ID() == $ticket->ID()) {
 					$line_item = $ticket_line_item;
 					break;
 				}
 			}
 		}
-		if ( $line_item instanceof EE_Line_Item ) {
-			EEH_Line_Item::increment_quantity( $line_item, $qty );
+		if ($line_item instanceof EE_Line_Item) {
+			EEH_Line_Item::increment_quantity($line_item, $qty);
 			return $line_item;
 		}
 		return null;
@@ -165,15 +165,15 @@ 
 	 * @param int $qty
 	 * @return void
 	 */
-	public static function increment_quantity( EE_Line_Item $line_item, $qty = 1 ) {
-		if( ! $line_item->is_percent() ) {
+	public static function increment_quantity(EE_Line_Item $line_item, $qty = 1) {
+		if ( ! $line_item->is_percent()) {
 			$qty += $line_item->quantity();
-			$line_item->set_quantity( $qty );
-			$line_item->set_total( $line_item->unit_price() * $qty );
+			$line_item->set_quantity($qty);
+			$line_item->set_total($line_item->unit_price() * $qty);
 		}
-		foreach( $line_item->children() as $child ) {
-			if( $child->is_sub_line_item() ) {
-				EEH_Line_Item::update_quantity( $child, $line_item->quantity() );
+		foreach ($line_item->children() as $child) {
+			if ($child->is_sub_line_item()) {
+				EEH_Line_Item::update_quantity($child, $line_item->quantity());
 			}
 		}
 	}
@@ -184,14 +184,14 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @param int $new_quantity
 	 */
-	public static function update_quantity( EE_Line_Item $line_item, $new_quantity ) {
-		if( ! $line_item->is_percent() ) {
-			$line_item->set_quantity( $new_quantity );
-			$line_item->set_total( $line_item->unit_price() * $new_quantity );
+	public static function update_quantity(EE_Line_Item $line_item, $new_quantity) {
+		if ( ! $line_item->is_percent()) {
+			$line_item->set_quantity($new_quantity);
+			$line_item->set_total($line_item->unit_price() * $new_quantity);
 		}
-		foreach( $line_item->children() as $child ) {
-			if( $child->is_sub_line_item() ) {
-				EEH_Line_Item::update_quantity( $child, $new_quantity );
+		foreach ($line_item->children() as $child) {
+			if ($child->is_sub_line_item()) {
+				EEH_Line_Item::update_quantity($child, $new_quantity);
 			}
 		}
 	}
@@ -206,38 +206,38 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_ticket_line_item( EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1 ) {
+	public static function create_ticket_line_item(EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1) {
 		$datetimes = $ticket->datetimes();
-		$event = sprintf( __( '(For %1$s)', 'event_espresso' ), reset( $datetimes )->event()->name() );
+		$event = sprintf(__('(For %1$s)', 'event_espresso'), reset($datetimes)->event()->name());
 		// get event subtotal line
-		$events_sub_total = self::get_event_line_item_for_ticket( $total_line_item, $ticket );
-		if ( ! $events_sub_total instanceof EE_Line_Item ) {
-			throw new EE_Error( sprintf( __( 'There is no events sub-total for ticket %s on total line item %d', 'event_espresso' ), $ticket->ID(), $total_line_item->ID() ) );
+		$events_sub_total = self::get_event_line_item_for_ticket($total_line_item, $ticket);
+		if ( ! $events_sub_total instanceof EE_Line_Item) {
+			throw new EE_Error(sprintf(__('There is no events sub-total for ticket %s on total line item %d', 'event_espresso'), $ticket->ID(), $total_line_item->ID()));
 		}
 		// add $ticket to cart
-		$line_item = EE_Line_Item::new_instance( array(
+		$line_item = EE_Line_Item::new_instance(array(
 			'LIN_name'       	=> $ticket->name(),
-			'LIN_desc'       		=> $ticket->description() != '' ? $ticket->description() . ' ' . $event : $event,
+			'LIN_desc'       		=> $ticket->description() != '' ? $ticket->description().' '.$event : $event,
 			'LIN_unit_price' 	=> $ticket->price(),
 			'LIN_quantity'   	=> $qty,
 			'LIN_is_taxable' 	=> $ticket->taxable(),
-			'LIN_order'      	=> count( $events_sub_total->children() ),
+			'LIN_order'      	=> count($events_sub_total->children()),
 			'LIN_total'      		=> $ticket->price() * $qty,
 			'LIN_type'       		=> EEM_Line_Item::type_line_item,
 			'OBJ_ID'         		=> $ticket->ID(),
 			'OBJ_type'       	=> 'Ticket'
-		) );
+		));
 		$line_item = apply_filters(
 			'FHEE__EEH_Line_Item__create_ticket_line_item__line_item',
 			$line_item
 		);
-		$events_sub_total->add_child_line_item( $line_item );
+		$events_sub_total->add_child_line_item($line_item);
 		//now add the sub-line items
 		$running_total_for_ticket = 0;
-		foreach ( $ticket->prices( array( 'order_by' => array( 'PRC_order' => 'ASC' ) ) ) as $price ) {
+		foreach ($ticket->prices(array('order_by' => array('PRC_order' => 'ASC'))) as $price) {
 			$sign = $price->is_discount() ? -1 : 1;
 			$price_total = $price->is_percent() ? $running_total_for_ticket * $price->amount() / 100 : $price->amount() * $qty;
-			$sub_line_item = EE_Line_Item::new_instance( array(
+			$sub_line_item = EE_Line_Item::new_instance(array(
 				'LIN_name'       	=> $price->name(),
 				'LIN_desc'       		=> $price->desc(),
 				'LIN_quantity'   	=> $price->is_percent() ? null : $qty,
@@ -247,18 +247,18 @@ 
 				'LIN_type'       		=> EEM_Line_Item::type_sub_line_item,
 				'OBJ_ID'         		=> $price->ID(),
 				'OBJ_type'       	=> 'Price'
-			) );
+			));
 			$sub_line_item = apply_filters(
 				'FHEE__EEH_Line_Item__create_ticket_line_item__sub_line_item',
 				$sub_line_item
 			);
-			if ( $price->is_percent() ) {
-				$sub_line_item->set_percent( $sign * $price->amount() );
+			if ($price->is_percent()) {
+				$sub_line_item->set_percent($sign * $price->amount());
 			} else {
-				$sub_line_item->set_unit_price( $sign * $price->amount() );
+				$sub_line_item->set_unit_price($sign * $price->amount());
 			}
 			$running_total_for_ticket += $price_total;
-			$line_item->add_child_line_item( $sub_line_item );
+			$line_item->add_child_line_item($sub_line_item);
 		}
 		return $line_item;
 	}
@@ -276,11 +276,11 @@ 
 	 * @param EE_Line_Item $item to be added
 	 * @return boolean
 	 */
-	public static function add_item( EE_Line_Item $total_line_item, EE_Line_Item $item ){
-		$pre_tax_subtotal = self::get_pre_tax_subtotal( $total_line_item );
-		if ( $pre_tax_subtotal instanceof EE_Line_Item ){
+	public static function add_item(EE_Line_Item $total_line_item, EE_Line_Item $item) {
+		$pre_tax_subtotal = self::get_pre_tax_subtotal($total_line_item);
+		if ($pre_tax_subtotal instanceof EE_Line_Item) {
 			$success = $pre_tax_subtotal->add_child_line_item($item);
-		}else{
+		} else {
 			return FALSE;
 		}
 		$total_line_item->recalculate_total_including_taxes();
@@ -294,9 +294,9 @@ 
 	 * @param EE_Line_Item $total_line_item of type EEM_Line_Item::type_total
 	 *	@return \EE_Line_Item
 	 */
-	public static function get_pre_tax_subtotal( EE_Line_Item $total_line_item ){
-		$pre_tax_subtotal = $total_line_item->get_child_line_item( 'pre-tax-subtotal' );
-		return $pre_tax_subtotal instanceof EE_Line_Item ? $pre_tax_subtotal : self::create_pre_tax_subtotal( $total_line_item );
+	public static function get_pre_tax_subtotal(EE_Line_Item $total_line_item) {
+		$pre_tax_subtotal = $total_line_item->get_child_line_item('pre-tax-subtotal');
+		return $pre_tax_subtotal instanceof EE_Line_Item ? $pre_tax_subtotal : self::create_pre_tax_subtotal($total_line_item);
 	}
 
 
@@ -306,9 +306,9 @@ 
 	 * @param EE_Line_Item $total_line_item of type EEM_Line_Item::type_total
 	 * @return \EE_Line_Item
 	 */
-	public static function get_taxes_subtotal( EE_Line_Item $total_line_item ){
-		$taxes = $total_line_item->get_child_line_item( 'taxes' );
-		return $taxes ? $taxes : self::create_taxes_subtotal( $total_line_item );
+	public static function get_taxes_subtotal(EE_Line_Item $total_line_item) {
+		$taxes = $total_line_item->get_child_line_item('taxes');
+		return $taxes ? $taxes : self::create_taxes_subtotal($total_line_item);
 	}
 
 
@@ -319,12 +319,12 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return void
 	 */
-	public static function set_TXN_ID( EE_Line_Item $line_item, $transaction = NULL ){
-		if( $transaction ){
+	public static function set_TXN_ID(EE_Line_Item $line_item, $transaction = NULL) {
+		if ($transaction) {
 			/** @type EEM_Transaction $EEM_Transaction */
-			$EEM_Transaction = EE_Registry::instance()->load_model( 'Transaction' );
-			$transaction = $EEM_Transaction->ensure_is_ID( $transaction );
-			$line_item->set_TXN_ID( $transaction );
+			$EEM_Transaction = EE_Registry::instance()->load_model('Transaction');
+			$transaction = $EEM_Transaction->ensure_is_ID($transaction);
+			$line_item->set_TXN_ID($transaction);
 		}
 	}
 
@@ -337,8 +337,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return \EE_Line_Item of type total
 	 */
-	public static function create_total_line_item( $transaction = NULL ){
-		$total_line_item = EE_Line_Item::new_instance( array(
+	public static function create_total_line_item($transaction = NULL) {
+		$total_line_item = EE_Line_Item::new_instance(array(
 			'LIN_code'	=> 'total',
 			'LIN_name'	=> __('Grand Total', 'event_espresso'),
 			'LIN_type'	=> EEM_Line_Item::type_total,
@@ -348,9 +348,9 @@ 
 			'FHEE__EEH_Line_Item__create_total_line_item__total_line_item',
 			$total_line_item
 		);
-		self::set_TXN_ID( $total_line_item, $transaction );
-		self::create_pre_tax_subtotal( $total_line_item, $transaction );
-		self::create_taxes_subtotal( $total_line_item, $transaction );
+		self::set_TXN_ID($total_line_item, $transaction);
+		self::create_pre_tax_subtotal($total_line_item, $transaction);
+		self::create_taxes_subtotal($total_line_item, $transaction);
 		return $total_line_item;
 	}
 
@@ -362,19 +362,19 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Line_Item
 	 */
-	protected static function create_pre_tax_subtotal( EE_Line_Item $total_line_item, $transaction = NULL ){
-		$pre_tax_line_item = EE_Line_Item::new_instance( array(
+	protected static function create_pre_tax_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		$pre_tax_line_item = EE_Line_Item::new_instance(array(
 			'LIN_code' 	=> 'pre-tax-subtotal',
-			'LIN_name' 	=> __( 'Pre-Tax Subtotal', 'event_espresso' ),
+			'LIN_name' 	=> __('Pre-Tax Subtotal', 'event_espresso'),
 			'LIN_type' 	=> EEM_Line_Item::type_sub_total
-		) );
+		));
 		$pre_tax_line_item = apply_filters(
 			'FHEE__EEH_Line_Item__create_pre_tax_subtotal__pre_tax_line_item',
 			$pre_tax_line_item
 		);
-		self::set_TXN_ID( $pre_tax_line_item, $transaction );
-		$total_line_item->add_child_line_item( $pre_tax_line_item );
-		self::create_event_subtotal( $pre_tax_line_item, $transaction );
+		self::set_TXN_ID($pre_tax_line_item, $transaction);
+		$total_line_item->add_child_line_item($pre_tax_line_item);
+		self::create_event_subtotal($pre_tax_line_item, $transaction);
 		return $pre_tax_line_item;
 	}
 
@@ -387,21 +387,21 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Line_Item
 	 */
-	protected static function create_taxes_subtotal( EE_Line_Item $total_line_item, $transaction = NULL ){
+	protected static function create_taxes_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
 		$tax_line_item = EE_Line_Item::new_instance(array(
 			'LIN_code'	=> 'taxes',
 			'LIN_name' 	=> __('Taxes', 'event_espresso'),
 			'LIN_type'	=> EEM_Line_Item::type_tax_sub_total,
-			'LIN_order' => 1000,//this should always come last
+			'LIN_order' => 1000, //this should always come last
 		));
 		$tax_line_item = apply_filters(
 			'FHEE__EEH_Line_Item__create_taxes_subtotal__tax_line_item',
 			$tax_line_item
 		);
-		self::set_TXN_ID( $tax_line_item, $transaction );
-		$total_line_item->add_child_line_item( $tax_line_item );
+		self::set_TXN_ID($tax_line_item, $transaction);
+		$total_line_item->add_child_line_item($tax_line_item);
 		//and lastly, add the actual taxes
-		self::apply_taxes( $total_line_item );
+		self::apply_taxes($total_line_item);
 		return $tax_line_item;
 	}
 
@@ -414,11 +414,11 @@ 
 	 * @param EE_Event $event
 	 * @return EE_Line_Item
 	 */
-	public static function create_event_subtotal( EE_Line_Item $pre_tax_line_item, $transaction = NULL, $event = NULL ){
+	public static function create_event_subtotal(EE_Line_Item $pre_tax_line_item, $transaction = NULL, $event = NULL) {
 		$event_line_item = EE_Line_Item::new_instance(array(
-			'LIN_code'	=> self::get_event_code( $event ),
-			'LIN_name' 	=> self::get_event_name( $event ),
-			'LIN_desc' 	=> self::get_event_desc( $event ),
+			'LIN_code'	=> self::get_event_code($event),
+			'LIN_name' 	=> self::get_event_name($event),
+			'LIN_desc' 	=> self::get_event_desc($event),
 			'LIN_type'	=> EEM_Line_Item::type_sub_total,
 			'OBJ_type' 	=> 'Event',
 			'OBJ_ID' 		=>  $event instanceof EE_Event ? $event->ID() : 0
@@ -427,8 +427,8 @@ 
 			'FHEE__EEH_Line_Item__create_event_subtotal__event_line_item',
 			$event_line_item
 		);
-		self::set_TXN_ID( $event_line_item, $transaction );
-		$pre_tax_line_item->add_child_line_item( $event_line_item );
+		self::set_TXN_ID($event_line_item, $transaction);
+		$pre_tax_line_item->add_child_line_item($event_line_item);
 		return $event_line_item;
 	}
 
@@ -437,8 +437,8 @@ 
 	 * @param EE_Event $event
 	 * @return string
 	 */
-	public static function get_event_code( $event ) {
-		return 'event-' . ( $event instanceof EE_Event ? $event->ID() : '0' );
+	public static function get_event_code($event) {
+		return 'event-'.($event instanceof EE_Event ? $event->ID() : '0');
 	}
 
 	/**
@@ -446,8 +446,8 @@ 
 	 * @param EE_Event $event
 	 * @return string
 	 */
-	public static function get_event_name( $event ) {
-		return $event instanceof EE_Event ? $event->name() : __( 'Event', 'event_espresso' );
+	public static function get_event_name($event) {
+		return $event instanceof EE_Event ? $event->name() : __('Event', 'event_espresso');
 	}
 
 	/**
@@ -455,7 +455,7 @@ 
 	 * @param EE_Event $event
 	 * @return string
 	 */
-	public static function get_event_desc( $event ) {
+	public static function get_event_desc($event) {
 		return $event instanceof EE_Event ? $event->short_description() : '';
 	}
 
@@ -469,37 +469,37 @@ 
 	  * @throws \EE_Error
 	  * @return EE_Line_Item
 	  */
-	public static function get_event_line_item_for_ticket( EE_Line_Item $grand_total, EE_Ticket $ticket ) {
+	public static function get_event_line_item_for_ticket(EE_Line_Item $grand_total, EE_Ticket $ticket) {
 		$first_datetime = $ticket->first_datetime();
-		if( ! $first_datetime instanceof EE_Datetime ){
-			throw new EE_Error( sprintf( __( 'The supplied ticket (ID %d) has no datetimes', 'event_espresso' ), $ticket->ID() ) );
+		if ( ! $first_datetime instanceof EE_Datetime) {
+			throw new EE_Error(sprintf(__('The supplied ticket (ID %d) has no datetimes', 'event_espresso'), $ticket->ID()));
 		}
 		$event = $first_datetime->event();
-		if ( ! $event instanceof EE_Event ) {
-			throw new EE_Error( sprintf( __( 'The supplied ticket (ID %d) has no event data associated with it.','event_espresso' ), $ticket->ID() ) );
+		if ( ! $event instanceof EE_Event) {
+			throw new EE_Error(sprintf(__('The supplied ticket (ID %d) has no event data associated with it.', 'event_espresso'), $ticket->ID()));
 		}
 		$event_line_item = NULL;
 		$found = false;
-		foreach ( EEH_Line_Item::get_event_subtotals( $grand_total ) as $event_line_item ) {
+		foreach (EEH_Line_Item::get_event_subtotals($grand_total) as $event_line_item) {
 			// default event subtotal, we should only ever find this the first time this method is called
-			if ( ! $event_line_item->OBJ_ID() ) {
+			if ( ! $event_line_item->OBJ_ID()) {
 				// let's use this! but first... set the event details
-				EEH_Line_Item::set_event_subtotal_details( $event_line_item, $event );
+				EEH_Line_Item::set_event_subtotal_details($event_line_item, $event);
 				$found = true;
 				break;
-			} else if ( $event_line_item->OBJ_ID() === $event->ID() ) {
+			} else if ($event_line_item->OBJ_ID() === $event->ID()) {
 				// found existing line item for this event in the cart, so break out of loop and use this one
 				$found = true;
 				break;
 			}
 		}
-		if ( ! $found ) {
+		if ( ! $found) {
 			//there is no event sub-total yet, so add it
-			$pre_tax_subtotal = EEH_Line_Item::get_pre_tax_subtotal( $grand_total );
+			$pre_tax_subtotal = EEH_Line_Item::get_pre_tax_subtotal($grand_total);
 			// create a new "event" subtotal below that
-			$event_line_item = EEH_Line_Item::create_event_subtotal( $pre_tax_subtotal, null, $event );
+			$event_line_item = EEH_Line_Item::create_event_subtotal($pre_tax_subtotal, null, $event);
 			// and set the event details
-			EEH_Line_Item::set_event_subtotal_details( $event_line_item, $event );
+			EEH_Line_Item::set_event_subtotal_details($event_line_item, $event);
 		}
 		return $event_line_item;
 	}
@@ -513,14 +513,14 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Line_Item
 	 */
-	public static function set_event_subtotal_details( EE_Line_Item $event_line_item, EE_Event $event, $transaction = NULL ){
-		if ( $event instanceof EE_Event ) {
-			$event_line_item->set_code( self::get_event_code( $event ) );
-			$event_line_item->set_name( self::get_event_name( $event ) );
-			$event_line_item->set_desc( self::get_event_desc( $event ) );
-			$event_line_item->set_OBJ_ID( $event->ID() );
+	public static function set_event_subtotal_details(EE_Line_Item $event_line_item, EE_Event $event, $transaction = NULL) {
+		if ($event instanceof EE_Event) {
+			$event_line_item->set_code(self::get_event_code($event));
+			$event_line_item->set_name(self::get_event_name($event));
+			$event_line_item->set_desc(self::get_event_desc($event));
+			$event_line_item->set_OBJ_ID($event->ID());
 		}
-		self::set_TXN_ID( $event_line_item, $transaction );
+		self::set_TXN_ID($event_line_item, $transaction);
 	}
 
 
@@ -531,19 +531,19 @@ 
 	 * any old taxes are removed
 	 * @param EE_Line_Item $total_line_item of type EEM_Line_Item::type_total
 	 */
-	public static function apply_taxes( EE_Line_Item $total_line_item ){
+	public static function apply_taxes(EE_Line_Item $total_line_item) {
 		/** @type EEM_Price $EEM_Price */
-		$EEM_Price = EE_Registry::instance()->load_model( 'Price' );
+		$EEM_Price = EE_Registry::instance()->load_model('Price');
 		// get array of taxes via Price Model
 		$ordered_taxes = $EEM_Price->get_all_prices_that_are_taxes();
-		ksort( $ordered_taxes );
-		$taxes_line_item = self::get_taxes_subtotal( $total_line_item );
+		ksort($ordered_taxes);
+		$taxes_line_item = self::get_taxes_subtotal($total_line_item);
 		//just to be safe, remove its old tax line items
 		$taxes_line_item->delete_children_line_items();
 		//loop thru taxes
-		foreach ( $ordered_taxes as $order => $taxes ) {
-			foreach ( $taxes as $tax ) {
-				if ( $tax instanceof EE_Price ) {
+		foreach ($ordered_taxes as $order => $taxes) {
+			foreach ($taxes as $tax) {
+				if ($tax instanceof EE_Price) {
 					$tax_line_item = EE_Line_Item::new_instance(
 						array(
 							'LIN_name'       => $tax->name(),
@@ -561,7 +561,7 @@ 
 						'FHEE__EEH_Line_Item__apply_taxes__tax_line_item',
 						$tax_line_item
 					);
-					$taxes_line_item->add_child_line_item( $tax_line_item );
+					$taxes_line_item->add_child_line_item($tax_line_item);
 				}
 			}
 		}
@@ -576,10 +576,10 @@ 
 	 * @param EE_Line_Item $total_line_item of type EEM_Line_Item::type_total
 	 * @return float
 	 */
-	public static function ensure_taxes_applied( $total_line_item ){
-		$taxes_subtotal = self::get_taxes_subtotal( $total_line_item );
-		if( ! $taxes_subtotal->children()){
-			self::apply_taxes( $total_line_item );
+	public static function ensure_taxes_applied($total_line_item) {
+		$taxes_subtotal = self::get_taxes_subtotal($total_line_item);
+		if ( ! $taxes_subtotal->children()) {
+			self::apply_taxes($total_line_item);
 		}
 		return $taxes_subtotal->total();
 	}
@@ -592,16 +592,16 @@ 
 	 * @param EE_Line_Item $parent_line_item
 	 * @return bool
 	 */
-	public static function delete_all_child_items( EE_Line_Item $parent_line_item ) {
+	public static function delete_all_child_items(EE_Line_Item $parent_line_item) {
 		$deleted = 0;
-		foreach ( $parent_line_item->children() as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				$deleted += EEH_Line_Item::delete_all_child_items( $child_line_item );
-				if ( $child_line_item->ID() ) {
+		foreach ($parent_line_item->children() as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				$deleted += EEH_Line_Item::delete_all_child_items($child_line_item);
+				if ($child_line_item->ID()) {
 					$child_line_item->delete();
-					unset( $child_line_item );
+					unset($child_line_item);
 				} else {
-					$parent_line_item->delete_child_line_item( $child_line_item->code() );
+					$parent_line_item->delete_child_line_item($child_line_item->code());
 				}
 				$deleted++;
 			}
@@ -623,25 +623,25 @@ 
 	 * @param array|bool|string $line_item_codes
 	 * @return int number of items successfully removed
 	 */
-	public static function delete_items( EE_Line_Item $total_line_item, $line_item_codes = FALSE ) {
+	public static function delete_items(EE_Line_Item $total_line_item, $line_item_codes = FALSE) {
 
-		if( $total_line_item->type() != EEM_Line_Item::type_total ){
-			EE_Error::doing_it_wrong('EEH_Line_Item::delete_items', __( 'This static method should only be called with a TOTAL line item, otherwise we won\'t recalculate the totals correctly', 'event_espresso' ), '4.6.18' );
+		if ($total_line_item->type() != EEM_Line_Item::type_total) {
+			EE_Error::doing_it_wrong('EEH_Line_Item::delete_items', __('This static method should only be called with a TOTAL line item, otherwise we won\'t recalculate the totals correctly', 'event_espresso'), '4.6.18');
 		}
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		// check if only a single line_item_id was passed
-		if ( ! empty( $line_item_codes ) && ! is_array( $line_item_codes )) {
+		if ( ! empty($line_item_codes) && ! is_array($line_item_codes)) {
 			// place single line_item_id in an array to appear as multiple line_item_ids
-			$line_item_codes = array ( $line_item_codes );
+			$line_item_codes = array($line_item_codes);
 		}
 		$removals = 0;
 		// cycle thru line_item_ids
-		foreach ( $line_item_codes as $line_item_id ) {
+		foreach ($line_item_codes as $line_item_id) {
 			$removals += $total_line_item->delete_child_line_item($line_item_id);
 		}
 
-		if ( $removals > 0 ) {
+		if ($removals > 0) {
 			$total_line_item->recalculate_taxes_and_tax_total();
 			return $removals;
 		} else {
@@ -658,17 +658,17 @@ 
 	 * @param string $description
 	 * @return EE_Line_Item the new tax line item created
 	 */
-	public static function set_total_tax_to( EE_Line_Item $total_line_item, $amount, $name = NULL, $description = NULL ){
+	public static function set_total_tax_to(EE_Line_Item $total_line_item, $amount, $name = NULL, $description = NULL) {
 		//first: remove all tax descendants
 		//add this as a new tax descendant
-		$tax_subtotal = self::get_taxes_subtotal( $total_line_item );
+		$tax_subtotal = self::get_taxes_subtotal($total_line_item);
 		$tax_subtotal->delete_children_line_items();
 		$taxable_total = $total_line_item->taxable_total();
 		$new_tax_subtotal = EE_Line_Item::new_instance(array(
 			'TXN_ID' => $total_line_item->TXN_ID(),
 			'LIN_name' => $name ? $name : __('Tax', 'event_espresso'),
 			'LIN_desc' => $description ? $description : '',
-			'LIN_percent' => $taxable_total ? ( $amount / $total_line_item->taxable_total()  * 100 ) : 0,
+			'LIN_percent' => $taxable_total ? ($amount / $total_line_item->taxable_total() * 100) : 0,
 			'LIN_total' => $amount,
 			'LIN_parent' => $tax_subtotal->ID(),
 			'LIN_type' => EEM_Line_Item::type_tax
@@ -678,7 +678,7 @@ 
 			$new_tax_subtotal
 		);
 		$new_tax_subtotal->save();
-		$tax_subtotal->set_total( $amount );
+		$tax_subtotal->set_total($amount);
 		$tax_subtotal->save();
 		$total_line_item->recalculate_total_including_taxes();
 		return $new_tax_subtotal;
@@ -693,8 +693,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_event_subtotals( EE_Line_Item $parent_line_item ) {
-		return self::get_subtotals_of_object_type( $parent_line_item, 'Event' );
+	public static function get_event_subtotals(EE_Line_Item $parent_line_item) {
+		return self::get_subtotals_of_object_type($parent_line_item, 'Event');
 	}
 
 
@@ -707,8 +707,8 @@ 
 	 * @param string $obj_type
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_subtotals_of_object_type( EE_Line_Item $parent_line_item, $obj_type = '' ) {
-		return self::_get_descendants_by_type_and_object_type( $parent_line_item, EEM_Line_Item::type_sub_total, $obj_type );
+	public static function get_subtotals_of_object_type(EE_Line_Item $parent_line_item, $obj_type = '') {
+		return self::_get_descendants_by_type_and_object_type($parent_line_item, EEM_Line_Item::type_sub_total, $obj_type);
 	}
 
 
@@ -720,8 +720,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_ticket_line_items( EE_Line_Item $parent_line_item ) {
-		return self::get_line_items_of_object_type( $parent_line_item, 'Ticket' );
+	public static function get_ticket_line_items(EE_Line_Item $parent_line_item) {
+		return self::get_line_items_of_object_type($parent_line_item, 'Ticket');
 	}
 
 
@@ -734,8 +734,8 @@ 
 	 * @param string $obj_type
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_line_items_of_object_type( EE_Line_Item $parent_line_item, $obj_type = '' ) {
-		return self::_get_descendants_by_type_and_object_type( $parent_line_item, EEM_Line_Item::type_line_item, $obj_type );
+	public static function get_line_items_of_object_type(EE_Line_Item $parent_line_item, $obj_type = '') {
+		return self::_get_descendants_by_type_and_object_type($parent_line_item, EEM_Line_Item::type_line_item, $obj_type);
 	}
 
 
@@ -746,8 +746,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_tax_descendants( EE_Line_Item $parent_line_item ) {
-		return EEH_Line_Item::get_descendants_of_type( $parent_line_item, EEM_Line_Item::type_tax );
+	public static function get_tax_descendants(EE_Line_Item $parent_line_item) {
+		return EEH_Line_Item::get_descendants_of_type($parent_line_item, EEM_Line_Item::type_tax);
 	}
 
 
@@ -758,8 +758,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_line_item_descendants( EE_Line_Item $parent_line_item ) {
-		return EEH_Line_Item::get_descendants_of_type( $parent_line_item, EEM_Line_Item::type_line_item );
+	public static function get_line_item_descendants(EE_Line_Item $parent_line_item) {
+		return EEH_Line_Item::get_descendants_of_type($parent_line_item, EEM_Line_Item::type_line_item);
 	}
 
 
@@ -772,8 +772,8 @@ 
 	 * @param string $line_item_type one of the EEM_Line_Item constants
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_descendants_of_type( EE_Line_Item $parent_line_item, $line_item_type ) {
-		return self::_get_descendants_by_type_and_object_type( $parent_line_item, $line_item_type, NULL );
+	public static function get_descendants_of_type(EE_Line_Item $parent_line_item, $line_item_type) {
+		return self::_get_descendants_by_type_and_object_type($parent_line_item, $line_item_type, NULL);
 	}
 
 
@@ -786,15 +786,15 @@ 
 	 * @param string | NULL $obj_type object model class name (minus prefix) or NULL to ignore object type when searching
 	 * @return EE_Line_Item[]
 	 */
-	protected static function _get_descendants_by_type_and_object_type( EE_Line_Item $parent_line_item, $line_item_type, $obj_type = NULL ) {
+	protected static function _get_descendants_by_type_and_object_type(EE_Line_Item $parent_line_item, $line_item_type, $obj_type = NULL) {
 		$objects = array();
-		foreach ( $parent_line_item->children() as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				if ( $child_line_item->type() == $line_item_type && ( $child_line_item->OBJ_type() == $obj_type || $obj_type === NULL )) {
+		foreach ($parent_line_item->children() as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				if ($child_line_item->type() == $line_item_type && ($child_line_item->OBJ_type() == $obj_type || $obj_type === NULL)) {
 					$objects[] = $child_line_item;
 				} else {
 					//go-through-all-its children looking for more matches
-					$objects = array_merge( $objects, self::_get_descendants_by_type_and_object_type( $child_line_item, $line_item_type, $obj_type ));
+					$objects = array_merge($objects, self::_get_descendants_by_type_and_object_type($child_line_item, $line_item_type, $obj_type));
 				}
 			}
 		}
@@ -812,8 +812,8 @@ 
 	 * @param array $OBJ_IDs array of OBJ_IDs
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_line_items_by_object_type_and_IDs( EE_Line_Item $parent_line_item, $OBJ_type = '', $OBJ_IDs = array() ) {
-		return self::_get_descendants_by_object_type_and_object_ID( $parent_line_item, $OBJ_type, $OBJ_IDs );
+	public static function get_line_items_by_object_type_and_IDs(EE_Line_Item $parent_line_item, $OBJ_type = '', $OBJ_IDs = array()) {
+		return self::_get_descendants_by_object_type_and_object_ID($parent_line_item, $OBJ_type, $OBJ_IDs);
 	}
 
 
@@ -826,15 +826,15 @@ 
 	 * @param array $OBJ_IDs array of OBJ_IDs
 	 * @return EE_Line_Item[]
 	 */
-	protected static function _get_descendants_by_object_type_and_object_ID( EE_Line_Item $parent_line_item, $OBJ_type, $OBJ_IDs ) {
+	protected static function _get_descendants_by_object_type_and_object_ID(EE_Line_Item $parent_line_item, $OBJ_type, $OBJ_IDs) {
 		$objects = array();
-		foreach ( $parent_line_item->children() as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				if ( is_array( $OBJ_IDs ) && $child_line_item->OBJ_type() == $OBJ_type && in_array( $child_line_item->OBJ_ID(), $OBJ_IDs )) {
+		foreach ($parent_line_item->children() as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				if (is_array($OBJ_IDs) && $child_line_item->OBJ_type() == $OBJ_type && in_array($child_line_item->OBJ_ID(), $OBJ_IDs)) {
 					$objects[] = $child_line_item;
 				} else {
 					//go-through-all-its children looking for more matches
-					$objects = array_merge( $objects, self::_get_descendants_by_object_type_and_object_ID( $child_line_item, $OBJ_type, $OBJ_IDs ));
+					$objects = array_merge($objects, self::_get_descendants_by_object_type_and_object_ID($child_line_item, $OBJ_type, $OBJ_IDs));
 				}
 			}
 		}
@@ -852,8 +852,8 @@ 
 	 * @param string $type like one of the EEM_Line_Item::type_*
 	 * @return EE_Line_Item
 	 */
-	public static function get_nearest_descendant_of_type( EE_Line_Item $parent_line_item, $type ) {
-		return self::_get_nearest_descendant( $parent_line_item, 'LIN_type' , $type );
+	public static function get_nearest_descendant_of_type(EE_Line_Item $parent_line_item, $type) {
+		return self::_get_nearest_descendant($parent_line_item, 'LIN_type', $type);
 	}
 
 
@@ -866,8 +866,8 @@ 
 	 * @param string $code any value used for LIN_code
 	 * @return EE_Line_Item
 	 */
-	public static function get_nearest_descendant_having_code( EE_Line_Item $parent_line_item, $code ) {
-		return self::_get_nearest_descendant( $parent_line_item, 'LIN_code' , $code );
+	public static function get_nearest_descendant_having_code(EE_Line_Item $parent_line_item, $code) {
+		return self::_get_nearest_descendant($parent_line_item, 'LIN_code', $code);
 	}
 
 
@@ -880,15 +880,15 @@ 
 	 * @param string $value any value stored in $search_field
 	 * @return EE_Line_Item
 	 */
-	protected static function _get_nearest_descendant( EE_Line_Item $parent_line_item, $search_field, $value ) {
-		foreach( $parent_line_item->children() as $child ){
-			if ( $child->get( $search_field ) == $value ){
+	protected static function _get_nearest_descendant(EE_Line_Item $parent_line_item, $search_field, $value) {
+		foreach ($parent_line_item->children() as $child) {
+			if ($child->get($search_field) == $value) {
 				return $child;
 			}
 		}
-		foreach( $parent_line_item->children() as $child ){
-			$descendant_found = self::_get_nearest_descendant( $child, $search_field, $value );
-			if ( $descendant_found ){
+		foreach ($parent_line_item->children() as $child) {
+			$descendant_found = self::_get_nearest_descendant($child, $search_field, $value);
+			if ($descendant_found) {
 				return $descendant_found;
 			}
 		}
@@ -904,22 +904,22 @@ 
 	 * @param int $indentation
 	 * @return void
 	 */
-	public static function visualize( EE_Line_Item $line_item, $indentation = 0 ){
+	public static function visualize(EE_Line_Item $line_item, $indentation = 0) {
 		echo "\n<br />";
-		for( $i = 0; $i < $indentation; $i++ ){
+		for ($i = 0; $i < $indentation; $i++) {
 			echo " - ";
 		}
-		if( $line_item->is_percent() ) {
-			$breakdown = $line_item->percent() . '%';
+		if ($line_item->is_percent()) {
+			$breakdown = $line_item->percent().'%';
 		} else {
-			$breakdown = '$' . $line_item->unit_price() . "x" . $line_item->quantity();
+			$breakdown = '$'.$line_item->unit_price()."x".$line_item->quantity();
 		}
-		echo $line_item->name() . "( " . $line_item->ID() . " ) : " . $line_item->type() . " $" . $line_item->total() . "(" . $breakdown . ")";
-		if( $line_item->is_taxable() ){
+		echo $line_item->name()."( ".$line_item->ID()." ) : ".$line_item->type()." $".$line_item->total()."(".$breakdown.")";
+		if ($line_item->is_taxable()) {
 			echo "  * taxable";
 		}
-		if( $line_item->children() ){
-			foreach($line_item->children() as $child){
+		if ($line_item->children()) {
+			foreach ($line_item->children() as $child) {
 				self::visualize($child, $indentation + 1);
 			}
 		}
@@ -960,88 +960,88 @@ 
 	 *                                          is theirs, which can be done with
 	 *                                          `EEM_Line_Item::instance()->get_line_item_for_registration( $registration );`
 	 */
-	public static function calculate_reg_final_prices_per_line_item( EE_Line_Item $line_item, $billable_ticket_quantities = array() ) {
+	public static function calculate_reg_final_prices_per_line_item(EE_Line_Item $line_item, $billable_ticket_quantities = array()) {
 		//init running grand total if not already
-		if ( ! isset( $running_totals[ 'total' ] ) ) {
-			$running_totals[ 'total' ] = 0;
+		if ( ! isset($running_totals['total'])) {
+			$running_totals['total'] = 0;
 		}
-		if( ! isset( $running_totals[ 'taxable' ] ) ) {
-			$running_totals[ 'taxable' ] = array( 'total' => 0 );
+		if ( ! isset($running_totals['taxable'])) {
+			$running_totals['taxable'] = array('total' => 0);
 		}
-		foreach ( $line_item->children() as $child_line_item ) {
-			switch ( $child_line_item->type() ) {
+		foreach ($line_item->children() as $child_line_item) {
+			switch ($child_line_item->type()) {
 
 				case EEM_Line_Item::type_sub_total :
-					$running_totals_from_subtotal = EEH_Line_Item::calculate_reg_final_prices_per_line_item( $child_line_item, $billable_ticket_quantities );
+					$running_totals_from_subtotal = EEH_Line_Item::calculate_reg_final_prices_per_line_item($child_line_item, $billable_ticket_quantities);
 					//combine arrays but preserve numeric keys
-					$running_totals = array_replace_recursive( $running_totals_from_subtotal, $running_totals );
-					$running_totals[ 'total' ] += $running_totals_from_subtotal[ 'total' ];
-					$running_totals[ 'taxable'][ 'total' ] += $running_totals_from_subtotal[ 'taxable' ][ 'total' ];
+					$running_totals = array_replace_recursive($running_totals_from_subtotal, $running_totals);
+					$running_totals['total'] += $running_totals_from_subtotal['total'];
+					$running_totals['taxable']['total'] += $running_totals_from_subtotal['taxable']['total'];
 					break;
 
 				case EEM_Line_Item::type_tax_sub_total :
 
 					//find how much the taxes percentage is
-					if ( $child_line_item->percent() != 0 ) {
+					if ($child_line_item->percent() != 0) {
 						$tax_percent_decimal = $child_line_item->percent() / 100;
 					} else {
 						$tax_percent_decimal = EE_Taxes::get_total_taxes_percentage() / 100;
 					}
 					//and apply to all the taxable totals, and add to the pretax totals
-					foreach ( $running_totals as $line_item_id => $this_running_total ) {
+					foreach ($running_totals as $line_item_id => $this_running_total) {
 						//"total" and "taxable" array key is an exception
-						if ( $line_item_id === 'taxable' ) {
+						if ($line_item_id === 'taxable') {
 							continue;
 						}
-						$taxable_total = $running_totals[ 'taxable' ][ $line_item_id ];
-						$running_totals[ $line_item_id ] += ( $taxable_total * $tax_percent_decimal );
+						$taxable_total = $running_totals['taxable'][$line_item_id];
+						$running_totals[$line_item_id] += ($taxable_total * $tax_percent_decimal);
 					}
 					break;
 
 				case EEM_Line_Item::type_line_item :
 
 					// ticket line items or ????
-					if ( $child_line_item->OBJ_type() === 'Ticket' ) {
+					if ($child_line_item->OBJ_type() === 'Ticket') {
 						// kk it's a ticket
-						if ( isset( $running_totals[ $child_line_item->ID() ] ) ) {
+						if (isset($running_totals[$child_line_item->ID()])) {
 							//huh? that shouldn't happen.
-							$running_totals[ 'total' ] += $child_line_item->total();
+							$running_totals['total'] += $child_line_item->total();
 						} else {
 							//its not in our running totals yet. great.
-							if ( $child_line_item->is_taxable() ) {
+							if ($child_line_item->is_taxable()) {
 								$taxable_amount = $child_line_item->unit_price();
 							} else {
 								$taxable_amount = 0;
 							}
 							// are we only calculating totals for some tickets?
-							if ( isset( $billable_ticket_quantities[ $child_line_item->OBJ_ID() ] ) ) {
-								$quantity = $billable_ticket_quantities[ $child_line_item->OBJ_ID() ];
-								$running_totals[ $child_line_item->ID() ] = $quantity ? $child_line_item->unit_price() : 0;
-								$running_totals[ 'taxable' ][ $child_line_item->ID() ] = $quantity ? $taxable_amount : 0;
+							if (isset($billable_ticket_quantities[$child_line_item->OBJ_ID()])) {
+								$quantity = $billable_ticket_quantities[$child_line_item->OBJ_ID()];
+								$running_totals[$child_line_item->ID()] = $quantity ? $child_line_item->unit_price() : 0;
+								$running_totals['taxable'][$child_line_item->ID()] = $quantity ? $taxable_amount : 0;
 							} else {
 								$quantity = $child_line_item->quantity();
-								$running_totals[ $child_line_item->ID() ] = $child_line_item->unit_price();
-								$running_totals[ 'taxable' ][ $child_line_item->ID() ] = $taxable_amount;
+								$running_totals[$child_line_item->ID()] = $child_line_item->unit_price();
+								$running_totals['taxable'][$child_line_item->ID()] = $taxable_amount;
 							}
-							$running_totals[ 'taxable' ][ 'total' ] += $taxable_amount * $quantity;
-							$running_totals[ 'total' ] += $child_line_item->unit_price() * $quantity;
+							$running_totals['taxable']['total'] += $taxable_amount * $quantity;
+							$running_totals['total'] += $child_line_item->unit_price() * $quantity;
 						}
 					} else {
 						// it's some other type of item added to the cart
 						// it should affect the running totals
 						// basically we want to convert it into a PERCENT modifier. Because
 						// more clearly affect all registration's final price equally
-						$line_items_percent_of_running_total = $running_totals[ 'total' ] > 0 ? ( $child_line_item->total() / $running_totals[ 'total' ] ) + 1 : 1;
-						foreach ( $running_totals as $line_item_id => $this_running_total ) {
+						$line_items_percent_of_running_total = $running_totals['total'] > 0 ? ($child_line_item->total() / $running_totals['total']) + 1 : 1;
+						foreach ($running_totals as $line_item_id => $this_running_total) {
 							//the "taxable" array key is an exception
-							if ( $line_item_id === 'taxable' ) {
+							if ($line_item_id === 'taxable') {
 								continue;
 							}
 							// update the running totals
 							// yes this actually even works for the running grand total!
-							$running_totals[ $line_item_id ] = $line_items_percent_of_running_total * $this_running_total;
-							if ( $child_line_item->is_taxable() ) {
-								$running_totals[ 'taxable' ][ $line_item_id ] = $line_items_percent_of_running_total * $running_totals[ 'taxable' ][ $line_item_id ];
+							$running_totals[$line_item_id] = $line_items_percent_of_running_total * $this_running_total;
+							if ($child_line_item->is_taxable()) {
+								$running_totals['taxable'][$line_item_id] = $line_items_percent_of_running_total * $running_totals['taxable'][$line_item_id];
 							}
 						}
 					}
@@ -1060,15 +1060,15 @@ 
 	 * @param EE_Registration[] $registrations
 	 * @return \EE_Line_Item
 	 */
-	public static function billable_line_item_tree( EE_Line_Item $line_item, $registrations ) {
-		$copy_li = EEH_Line_Item::billable_line_item( $line_item, $registrations );
-		foreach ( $line_item->children() as $child_li ) {
-			$copy_li->add_child_line_item( EEH_Line_Item::billable_line_item_tree( $child_li, $registrations ) );
+	public static function billable_line_item_tree(EE_Line_Item $line_item, $registrations) {
+		$copy_li = EEH_Line_Item::billable_line_item($line_item, $registrations);
+		foreach ($line_item->children() as $child_li) {
+			$copy_li->add_child_line_item(EEH_Line_Item::billable_line_item_tree($child_li, $registrations));
 		}
 		//if this is the grand total line item, make sure the totals all add up
 		//(we could have duplicated this logic AS we copied the line items, but
 		//it seems DRYer this way)
-		if ( $copy_li->type() === EEM_Line_Item::type_total ) {
+		if ($copy_li->type() === EEM_Line_Item::type_total) {
 			$copy_li->recalculate_total_including_taxes();
 		}
 		return $copy_li;
@@ -1083,26 +1083,26 @@ 
 	 * @return EE_Line_Item
 	 * @param EE_Registration[] $registrations
 	 */
-	public static function billable_line_item( EE_Line_Item $line_item, $registrations ) {
+	public static function billable_line_item(EE_Line_Item $line_item, $registrations) {
 		$new_li_fields = $line_item->model_field_array();
-		if ( $line_item->type() === EEM_Line_Item::type_line_item &&
+		if ($line_item->type() === EEM_Line_Item::type_line_item &&
 			$line_item->OBJ_type() === 'Ticket'
 		) {
 			$count = 0;
-			foreach ( $registrations as $registration ) {
-				if ( $line_item->OBJ_ID() === $registration->ticket_ID() &&
-					in_array( $registration->status_ID(), EEM_Registration::reg_statuses_that_allow_payment() )
+			foreach ($registrations as $registration) {
+				if ($line_item->OBJ_ID() === $registration->ticket_ID() &&
+					in_array($registration->status_ID(), EEM_Registration::reg_statuses_that_allow_payment())
 				) {
 					$count++;
 				}
 			}
-			$new_li_fields[ 'LIN_quantity' ] = $count;
+			$new_li_fields['LIN_quantity'] = $count;
 		}
 		//don't set the total. We'll leave that up to the code that calculates it
-		unset( $new_li_fields[ 'LIN_ID' ] );
-		unset( $new_li_fields[ 'LIN_parent' ] );
-		unset( $new_li_fields[ 'LIN_total' ] );
-		return EE_Line_Item::new_instance( $new_li_fields );
+		unset($new_li_fields['LIN_ID']);
+		unset($new_li_fields['LIN_parent']);
+		unset($new_li_fields['LIN_total']);
+		return EE_Line_Item::new_instance($new_li_fields);
 	}
 
 
@@ -1114,19 +1114,19 @@ 
 	 * @param EE_Line_Item $line_item |null
 	 * @return \EE_Line_Item|null
 	 */
-	public static function non_empty_line_items( EE_Line_Item $line_item ) {
-		$copied_li = EEH_Line_Item::non_empty_line_item( $line_item );
-		if ( $copied_li === null ) {
+	public static function non_empty_line_items(EE_Line_Item $line_item) {
+		$copied_li = EEH_Line_Item::non_empty_line_item($line_item);
+		if ($copied_li === null) {
 			return null;
 		}
 		//if this is an event subtotal, we want to only include it if it
 		//has a non-zero total and at least one ticket line item child
 		$ticket_children = 0;
-		foreach ( $line_item->children() as $child_li ) {
-			$child_li_copy = EEH_Line_Item::non_empty_line_items( $child_li );
-			if ( $child_li_copy !== null ) {
-				$copied_li->add_child_line_item( $child_li_copy );
-				if ( $child_li_copy->type() === EEM_Line_Item::type_line_item &&
+		foreach ($line_item->children() as $child_li) {
+			$child_li_copy = EEH_Line_Item::non_empty_line_items($child_li);
+			if ($child_li_copy !== null) {
+				$copied_li->add_child_line_item($child_li_copy);
+				if ($child_li_copy->type() === EEM_Line_Item::type_line_item &&
 					$child_li_copy->OBJ_type() === 'Ticket'
 				) {
 					$ticket_children++;
@@ -1135,7 +1135,7 @@ 
 		}
 		//if this is an event subtotal with NO ticket children
 		//we basically want to ignore it
-		if ( $line_item->type() === EEM_Line_Item::type_sub_total &&
+		if ($line_item->type() === EEM_Line_Item::type_sub_total &&
 			$line_item->OBJ_type() === 'Event' &&
 			$ticket_children === 0 &&
 			$line_item->total() === 0
@@ -1153,8 +1153,8 @@ 
 	 * @param EE_Line_Item      $line_item
 	 * @return EE_Line_Item
 	 */
-	public static function non_empty_line_item( EE_Line_Item $line_item ) {
-		if ( $line_item->type() === EEM_Line_Item::type_line_item &&
+	public static function non_empty_line_item(EE_Line_Item $line_item) {
+		if ($line_item->type() === EEM_Line_Item::type_line_item &&
 			$line_item->OBJ_type() === 'Ticket' &&
 			$line_item->quantity() == 0
 		) {
@@ -1162,9 +1162,9 @@ 
 		}
 		$new_li_fields = $line_item->model_field_array();
 		//don't set the total. We'll leave that up to the code that calculates it
-		unset( $new_li_fields[ 'LIN_ID' ] );
-		unset( $new_li_fields[ 'LIN_parent' ] );
-		return EE_Line_Item::new_instance( $new_li_fields );
+		unset($new_li_fields['LIN_ID']);
+		unset($new_li_fields['LIN_parent']);
+		return EE_Line_Item::new_instance($new_li_fields);
 	}
 
 
@@ -1178,9 +1178,9 @@ 
 	 * @param EE_Line_Item $total_line_item
 	 *	@return \EE_Line_Item
 	 */
-	public static function get_items_subtotal( EE_Line_Item $total_line_item ){
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::get_items_subtotal()', __('Method replaced with EEH_Line_Item::get_pre_tax_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::get_pre_tax_subtotal( $total_line_item );
+	public static function get_items_subtotal(EE_Line_Item $total_line_item) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::get_items_subtotal()', __('Method replaced with EEH_Line_Item::get_pre_tax_subtotal()', 'event_espresso'), '4.6.0');
+		return self::get_pre_tax_subtotal($total_line_item);
 	}
 
 
@@ -1190,9 +1190,9 @@ 
 	 * @param EE_Transaction $transaction
 	 *	@return \EE_Line_Item
 	 */
-	public static function create_default_total_line_item( $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_total_line_item()', __('Method replaced with EEH_Line_Item::create_total_line_item()', 'event_espresso'), '4.6.0' );
-		return self::create_total_line_item( $transaction );
+	public static function create_default_total_line_item($transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_total_line_item()', __('Method replaced with EEH_Line_Item::create_total_line_item()', 'event_espresso'), '4.6.0');
+		return self::create_total_line_item($transaction);
 	}
 
 
@@ -1203,9 +1203,9 @@ 
 	 * @param EE_Transaction $transaction
 	 *	@return \EE_Line_Item
 	 */
-	public static function create_default_tickets_subtotal( EE_Line_Item $total_line_item, $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_tickets_subtotal()', __('Method replaced with EEH_Line_Item::create_pre_tax_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::create_pre_tax_subtotal( $total_line_item, $transaction );
+	public static function create_default_tickets_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_tickets_subtotal()', __('Method replaced with EEH_Line_Item::create_pre_tax_subtotal()', 'event_espresso'), '4.6.0');
+		return self::create_pre_tax_subtotal($total_line_item, $transaction);
 	}
 
 
@@ -1216,9 +1216,9 @@ 
 	 * @param EE_Transaction $transaction
 	 *	@return \EE_Line_Item
 	 */
-	public static function create_default_taxes_subtotal( EE_Line_Item $total_line_item, $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_taxes_subtotal()', __('Method replaced with EEH_Line_Item::create_taxes_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::create_taxes_subtotal( $total_line_item, $transaction );
+	public static function create_default_taxes_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_taxes_subtotal()', __('Method replaced with EEH_Line_Item::create_taxes_subtotal()', 'event_espresso'), '4.6.0');
+		return self::create_taxes_subtotal($total_line_item, $transaction);
 	}
 
 
@@ -1229,9 +1229,9 @@ 
 	 * @param EE_Transaction $transaction
 	 *	@return \EE_Line_Item
 	 */
-	public static function create_default_event_subtotal( EE_Line_Item $total_line_item, $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_event_subtotal()', __('Method replaced with EEH_Line_Item::create_event_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::create_event_subtotal( $total_line_item, $transaction );
+	public static function create_default_event_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_event_subtotal()', __('Method replaced with EEH_Line_Item::create_event_subtotal()', 'event_espresso'), '4.6.0');
+		return self::create_event_subtotal($total_line_item, $transaction);
 	}
 
 

Indentation +9 added lines, -9 removed lines

@@ -467,15 +467,15 @@
 	}
 
 	/**
-	  * Given the grand total line item and a ticket, finds the event sub-total
-	  * line item the ticket's purchase should be added onto
-	  *
-	  * @access public
-	  * @param EE_Line_Item $grand_total the grand total line item
-	  * @param EE_Ticket $ticket
-	  * @throws \EE_Error
-	  * @return EE_Line_Item
-	  */
+	 * Given the grand total line item and a ticket, finds the event sub-total
+	 * line item the ticket's purchase should be added onto
+	 *
+	 * @access public
+	 * @param EE_Line_Item $grand_total the grand total line item
+	 * @param EE_Ticket $ticket
+	 * @throws \EE_Error
+	 * @return EE_Line_Item
+	 */
 	public static function get_event_line_item_for_ticket( EE_Line_Item $grand_total, EE_Ticket $ticket ) {
 		$first_datetime = $ticket->first_datetime();
 		if( ! $first_datetime instanceof EE_Datetime ){

core/helpers/EEH_Maps.helper.php

Doc Comments -2 removed lines

@@ -31,7 +31,6 @@ 
 
 	/**
 	 * google_map - creates a Google Map Link
-	 * @param  array $atts aray of attributes required for the map link generation
 	 * @return string (link to map!)
 	 */
 	public static function google_map( $ee_gmaps_opts ){
@@ -116,7 +115,6 @@ 
 
 	/**
 	 * creates a Google Map Link
-	 * @param  array $atts aray of attributes required for the map link generation
 	 * @return string (link to map!)
 	 */
 	public static function espresso_google_map_js() {

Spacing +27 added lines, -27 removed lines

@@ -34,20 +34,20 @@ 
 	 * @param  array $atts aray of attributes required for the map link generation
 	 * @return string (link to map!)
 	 */
-	public static function google_map( $ee_gmaps_opts ){
+	public static function google_map($ee_gmaps_opts) {
 
 		//d( $ee_gmaps_opts );
 
-		$ee_map_width = isset( $ee_gmaps_opts['ee_map_width'] ) && ! empty( $ee_gmaps_opts['ee_map_width'] ) ? $ee_gmaps_opts['ee_map_width'] : '300';
-		$ee_map_height = isset( $ee_gmaps_opts['ee_map_height'] ) && ! empty( $ee_gmaps_opts['ee_map_height'] ) ? $ee_gmaps_opts['ee_map_height'] : '185';
-		$ee_map_zoom = isset( $ee_gmaps_opts['ee_map_zoom'] ) && ! empty( $ee_gmaps_opts['ee_map_zoom'] ) ? $ee_gmaps_opts['ee_map_zoom'] : '12';
-		$ee_map_nav_display = isset( $ee_gmaps_opts['ee_map_nav_display'] ) && ! empty( $ee_gmaps_opts['ee_map_nav_display'] ) ? 'true' : 'false';
-		$ee_map_nav_size =  isset( $ee_gmaps_opts['ee_map_nav_size'] ) && ! empty( $ee_gmaps_opts['ee_map_nav_size'] )? $ee_gmaps_opts['ee_map_nav_size'] : 'default';
-		$ee_map_type_control =  isset( $ee_gmaps_opts['ee_map_type_control'] ) && ! empty( $ee_gmaps_opts['ee_map_type_control'] )? $ee_gmaps_opts['ee_map_type_control'] : 'default';
-		$static_url =  isset( $ee_gmaps_opts['ee_static_url'] ) && ! empty( $ee_gmaps_opts['ee_static_url'] )? $ee_gmaps_opts['ee_static_url'] : FALSE;
+		$ee_map_width = isset($ee_gmaps_opts['ee_map_width']) && ! empty($ee_gmaps_opts['ee_map_width']) ? $ee_gmaps_opts['ee_map_width'] : '300';
+		$ee_map_height = isset($ee_gmaps_opts['ee_map_height']) && ! empty($ee_gmaps_opts['ee_map_height']) ? $ee_gmaps_opts['ee_map_height'] : '185';
+		$ee_map_zoom = isset($ee_gmaps_opts['ee_map_zoom']) && ! empty($ee_gmaps_opts['ee_map_zoom']) ? $ee_gmaps_opts['ee_map_zoom'] : '12';
+		$ee_map_nav_display = isset($ee_gmaps_opts['ee_map_nav_display']) && ! empty($ee_gmaps_opts['ee_map_nav_display']) ? 'true' : 'false';
+		$ee_map_nav_size = isset($ee_gmaps_opts['ee_map_nav_size']) && ! empty($ee_gmaps_opts['ee_map_nav_size']) ? $ee_gmaps_opts['ee_map_nav_size'] : 'default';
+		$ee_map_type_control = isset($ee_gmaps_opts['ee_map_type_control']) && ! empty($ee_gmaps_opts['ee_map_type_control']) ? $ee_gmaps_opts['ee_map_type_control'] : 'default';
+		$static_url = isset($ee_gmaps_opts['ee_static_url']) && ! empty($ee_gmaps_opts['ee_static_url']) ? $ee_gmaps_opts['ee_static_url'] : FALSE;
 
-		if( isset( $ee_gmaps_opts['ee_map_align'] ) && ! empty( $ee_gmaps_opts['ee_map_align'] )){
-			switch( $ee_gmaps_opts['ee_map_align'] ){
+		if (isset($ee_gmaps_opts['ee_map_align']) && ! empty($ee_gmaps_opts['ee_map_align'])) {
+			switch ($ee_gmaps_opts['ee_map_align']) {
 				case "left":
 					$map_align = 'ee-gmap-align-left left';
 					break;
@@ -68,18 +68,18 @@ 
 
 		// Determine whether user has set a hardoded url to use and
 		// if so display a Google static iframe map else run V3 api
-		if( $static_url ) {
+		if ($static_url) {
 
-			$html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper ' . $map_align . '">';
-			$html .= '<iframe src="' . $static_url . '&output=embed" style="width: ' . $ee_map_width  .'px; height: ' . $ee_map_height . 'px;" frameborder="0" scrolling="no">';
+			$html = '<div class="ee-gmap-iframewrap ee-gmap-wrapper '.$map_align.'">';
+			$html .= '<iframe src="'.$static_url.'&output=embed" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;" frameborder="0" scrolling="no">';
 			$html .= '</iframe>';
-			$html .= '<a href="' . $static_url . '">View Large map</a>';
+			$html .= '<a href="'.$static_url.'">View Large map</a>';
 			$html .= '</div>';
 			return $html;
 
 		 } else {
 
-			EEH_Maps::$gmap_vars[ $ee_gmaps_opts['map_ID'] ] = array(
+			EEH_Maps::$gmap_vars[$ee_gmaps_opts['map_ID']] = array(
 				'map_ID' => $ee_gmaps_opts['map_ID'],
 				'ee_map_zoom' => $ee_map_zoom,
 				'ee_map_nav_display' => $ee_map_nav_display,
@@ -89,12 +89,12 @@ 
 			);
 
 			$html = '<div class="ee-gmap-wrapper '.$map_align.';">';
-			$html .= '<div class="ee-gmap" id="map_canvas_' . $ee_gmaps_opts['map_ID'] .'" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;"></div>';  //
+			$html .= '<div class="ee-gmap" id="map_canvas_'.$ee_gmaps_opts['map_ID'].'" style="width: '.$ee_map_width.'px; height: '.$ee_map_height.'px;"></div>'; //
 			$html .= '</div>';
 
-			wp_enqueue_script( 'gmap_api' );
-			wp_enqueue_script( 'ee_gmap' );
-			add_action( 'wp_footer', array( 'EEH_Maps', 'footer_enqueue_script' ));
+			wp_enqueue_script('gmap_api');
+			wp_enqueue_script('ee_gmap');
+			add_action('wp_footer', array('EEH_Maps', 'footer_enqueue_script'));
 
 			return $html;
 
@@ -109,7 +109,7 @@ 
 	 * @return void
 	 */
 	public static function footer_enqueue_script() {
-		wp_localize_script( 'ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars );
+		wp_localize_script('ee_gmap', 'ee_gmap_vars', EEH_Maps::$gmap_vars);
 	}
 
 
@@ -121,8 +121,8 @@ 
 	 */
 	public static function espresso_google_map_js() {
 		$scheme = is_ssl() ? 'https://' : 'http://';
-		wp_register_script( 'gmap_api', $scheme . 'maps.google.com/maps/api/js?sensor=false', array('jquery'), NULL, TRUE );
-		wp_register_script( 'ee_gmap', plugin_dir_url(__FILE__) . 'assets/ee_gmap.js', array('gmap_api'), '1.0', TRUE );
+		wp_register_script('gmap_api', $scheme.'maps.google.com/maps/api/js?sensor=false', array('jquery'), NULL, TRUE);
+		wp_register_script('ee_gmap', plugin_dir_url(__FILE__).'assets/ee_gmap.js', array('gmap_api'), '1.0', TRUE);
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 * @return string (link to map!)
 	 */
 	public static function google_map_link($atts) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		extract($atts);
 
 		$address = "{$address}";
@@ -146,9 +146,9 @@ 
 		$id = isset($id) ? $id : 'not_set';
 		$map_image_class = isset($map_image_class) ? $map_image_class : 'ee_google_map_view';
 
-		$address_string = ($address != '' ? $address : '') . ($city != '' ? ',' . $city : '') . ($state != '' ? ',' . $state : '') . ($zip != '' ? ',' . $zip : '') . ($country != '' ? ',' . $country : '');
+		$address_string = ($address != '' ? $address : '').($city != '' ? ','.$city : '').($state != '' ? ','.$state : '').($zip != '' ? ','.$zip : '').($country != '' ? ','.$country : '');
 
-		$google_map = htmlentities2('http://maps.google.com/maps?q=' . urlencode( $address_string ));
+		$google_map = htmlentities2('http://maps.google.com/maps?q='.urlencode($address_string));
 
 		switch ($type) {
 			case 'text':
@@ -162,10 +162,10 @@ 
 
 			case 'map':
 				$scheme = is_ssl() ? 'https://' : 'http://';
-				return '<a class="a_map_image_link" href="' . $google_map . '" target="_blank">' . '<img class="map_image_link" id="venue_map_' . $id . '" ' . $map_image_class . ' src="' . htmlentities2( $scheme . 'maps.googleapis.com/maps/api/staticmap?center=' . urlencode( $address_string ) . '&amp;zoom=14&amp;size=' . $map_w . 'x' . $map_h . '&amp;markers=color:green|label:|' . urlencode( $address_string ) . '&amp;sensor=false' ) . '" /></a>';
+				return '<a class="a_map_image_link" href="'.$google_map.'" target="_blank">'.'<img class="map_image_link" id="venue_map_'.$id.'" '.$map_image_class.' src="'.htmlentities2($scheme.'maps.googleapis.com/maps/api/staticmap?center='.urlencode($address_string).'&amp;zoom=14&amp;size='.$map_w.'x'.$map_h.'&amp;markers=color:green|label:|'.urlencode($address_string).'&amp;sensor=false').'" /></a>';
 		}
 
-		return '<a href="' . $google_map . '" target="_blank">' . $text . '</a>';
+		return '<a href="'.$google_map.'" target="_blank">'.$text.'</a>';
 	}
 
 

core/helpers/EEH_Qtip_Loader.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	 * - registers and enqueues the qtip scripts and styles.
 	 *
 	 * @access public
-	 * @param  array  $paths      Array of paths to check for the EE_Qtip class. If present we check these path(s) first.  If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded.
+	 * @param  string[]  $paths      Array of paths to check for the EE_Qtip class. If present we check these path(s) first.  If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded.
 	 * @param  string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips]
 	 * @return void
 	 */

Spacing +44 added lines, -44 removed lines

@@ -32,7 +32,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EEH_Qtip_Loader )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EEH_Qtip_Loader)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -48,8 +48,8 @@ 
 	 */
 	private function __construct() {
 		//let's just make sure this is instantiated in the right place.
-		if ( did_action( 'wp_print_styles' ) || did_action( 'admin_head' )) {
-			EE_Error::doing_it_wrong( 'EEH_Qtip_Loader', __('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso' ), '4.1' );
+		if (did_action('wp_print_styles') || did_action('admin_head')) {
+			EE_Error::doing_it_wrong('EEH_Qtip_Loader', __('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso'), '4.1');
 		}
 	}
 
@@ -61,27 +61,27 @@ 
 	 * @return void
 	 */
 	public function register_and_enqueue() {
-		$qtips_js = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.js';
-		$qtip_images_loaded = EE_THIRD_PARTY_URL . 'qtip/imagesloaded.pkg.min.js';
-		$qtip_map = EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.map';
-		$qtipcss = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.css';
+		$qtips_js = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.js';
+		$qtip_images_loaded = EE_THIRD_PARTY_URL.'qtip/imagesloaded.pkg.min.js';
+		$qtip_map = EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.map';
+		$qtipcss = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.css';
 
-		wp_register_script('qtip-map', $qtip_map, array(), '3', TRUE );
-		wp_register_script('qtip-images-loaded', $qtip_images_loaded, array(), '2.2.0', TRUE );
-		wp_register_script('qtip', $qtips_js, array('jquery'), '2.2.0', TRUE );
-		wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS . 'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('qtip-map', $qtip_map, array(), '3', TRUE);
+		wp_register_script('qtip-images-loaded', $qtip_images_loaded, array(), '2.2.0', TRUE);
+		wp_register_script('qtip', $qtips_js, array('jquery'), '2.2.0', TRUE);
+		wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS.'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, TRUE);
 
-		wp_register_style('qtip-css', $qtipcss, array(), '2.2' );
+		wp_register_style('qtip-css', $qtipcss, array(), '2.2');
 
 		//k now let's see if there are any registered qtips.  If there are, then we need to setup the localized script for ee-qtip-helper.js (and enqueue ee-qtip-helper.js of course!)
-		if ( !empty( $this->_qtips ) ) {
+		if ( ! empty($this->_qtips)) {
 			wp_enqueue_script('ee-qtip-helper');
 			wp_enqueue_style('qtip-css');
 			$qtips = array();
-			foreach ( $this->_qtips as $qtip ) {
+			foreach ($this->_qtips as $qtip) {
 				$qts = $qtip->get_tips();
-				foreach ( $qts as $qt ) {
-					if ( ! $qt instanceof EE_Qtip )
+				foreach ($qts as $qt) {
+					if ( ! $qt instanceof EE_Qtip)
 						continue;
 					$qtips[] = array(
 						'content_id' => $qt->content_id,
@@ -90,8 +90,8 @@ 
 						);
 				}
 			}
-			if ( !empty($qtips) )
-				wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) );
+			if ( ! empty($qtips))
+				wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array('qtips' => $qtips));
 
 		} else {
 			//qtips has been requested without any registration (so assuming its just directly used in the admin).
@@ -113,24 +113,24 @@ 
 	 * @param  string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips]
 	 * @return void
 	 */
-	public function register( $configname, $paths = array() ) {
+	public function register($configname, $paths = array()) {
 
 		//let's just make sure this is instantiated in the right place.
-		if ( did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts') ) {
-			EE_Error::doing_it_wrong( 'EEH_Qtip_Loader->register()', __('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso' ), '4.1' );
+		if (did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts')) {
+			EE_Error::doing_it_wrong('EEH_Qtip_Loader->register()', __('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso'), '4.1');
 		}
 
 		$configname = (array) $configname; //typecast to array
-		foreach ( $configname as $config ) {
-			$this->_register( $config, $paths );
+		foreach ($configname as $config) {
+			$this->_register($config, $paths);
 		}
 
 		//hook into appropriate footer
 		$footer_action = is_admin() ? 'admin_footer' : 'wp_footer';
-		add_action($footer_action, array($this, 'setup_qtip'), 10 );
+		add_action($footer_action, array($this, 'setup_qtip'), 10);
 
 		//make sure we "turn on" qtip js.
-		add_filter('FHEE_load_qtip', '__return_true' );
+		add_filter('FHEE_load_qtip', '__return_true');
 	}
 
 
@@ -144,15 +144,15 @@ 
 	 * @throws EE_Error
 	 * @return void
 	 */
-	private function _register( $config, $paths ) {
+	private function _register($config, $paths) {
 		//before doing anything we have to make sure that EE_Qtip_Config parent is required.
-		EE_Registry::instance()->load_lib( 'Qtip_Config', array(), TRUE );
+		EE_Registry::instance()->load_lib('Qtip_Config', array(), TRUE);
 
-		if ( !empty( $paths ) ) {
+		if ( ! empty($paths)) {
 			$paths = (array) $paths;
-			foreach ( $paths as $path ) {
-				$path = $path . $config . '.lib.php';
-				if ( !is_readable($path ) ) {
+			foreach ($paths as $path) {
+				$path = $path.$config.'.lib.php';
+				if ( ! is_readable($path)) {
 					continue;
 				} else {
 					require_once $path;
@@ -161,26 +161,26 @@ 
 		}
 
 		//does class exist at this point?  If it does then let's instantiate.  If it doesn't then let's continue with other paths.
-		if ( !class_exists($config) ) {
-			$path = EE_LIBRARIES . 'qtips/' . $config . '.lib.php';
-			if ( !is_readable($path ) ) {
-				throw new EE_Error( sprintf( __('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable.  Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config ) );
+		if ( ! class_exists($config)) {
+			$path = EE_LIBRARIES.'qtips/'.$config.'.lib.php';
+			if ( ! is_readable($path)) {
+				throw new EE_Error(sprintf(__('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable.  Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config));
 			} else {
 				require_once $path;
 			}
 		}
 
 		//now we attempt a class_exists one more time.
-		if ( !class_exists( $config ) )
-			throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) );
+		if ( ! class_exists($config))
+			throw new EE_Error(sprintf(__('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config));
 
 		//made it HERE?  FINALLY, let's get things setup.
 		$a = new ReflectionClass($config);
 		$qtip = $a->newInstance();
 
 		//verify that $qtip is a valid object
-		if ( ! $qtip instanceof EE_Qtip_Config )
-			throw new EE_Error( sprintf( __( 'The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config ) );
+		if ( ! $qtip instanceof EE_Qtip_Config)
+			throw new EE_Error(sprintf(__('The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config));
 
 		$this->_qtips[] = $a->newInstance();
 
@@ -196,12 +196,12 @@ 
 	 * @return void
 	 */
 	public function setup_qtip() {
-		if ( empty( $this->_qtips ) )
+		if (empty($this->_qtips))
 			return; //no qtips!
 
 		$content = array();
 
-		foreach ( $this->_qtips as $qtip ) {
+		foreach ($this->_qtips as $qtip) {
 			$content[] = $this->_generate_content_container($qtip);
 		}
 
@@ -218,10 +218,10 @@ 
 	private function _generate_content_container($qtip) {
 		$qts = $qtip->get_tips();
 		$content = array();
-		foreach ( $qts as $qt ) {
-			if ( ! $qt instanceof EE_Qtip )
+		foreach ($qts as $qt) {
+			if ( ! $qt instanceof EE_Qtip)
 				continue;
-			$content[] = '<div class="ee-qtip-helper-content hidden" id="' . $qt->content_id . '">' . $qt->content . '</div>';
+			$content[] = '<div class="ee-qtip-helper-content hidden" id="'.$qt->content_id.'">'.$qt->content.'</div>';
 		}
 
 		return implode('<br />', $content);

Braces +19 added lines, -12 removed lines

@@ -81,8 +81,9 @@ 
 			foreach ( $this->_qtips as $qtip ) {
 				$qts = $qtip->get_tips();
 				foreach ( $qts as $qt ) {
-					if ( ! $qt instanceof EE_Qtip )
-						continue;
+					if ( ! $qt instanceof EE_Qtip ) {
+											continue;
+					}
 					$qtips[] = array(
 						'content_id' => $qt->content_id,
 						'options' => $qt->options,
@@ -90,8 +91,9 @@ 
 						);
 				}
 			}
-			if ( !empty($qtips) )
-				wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) );
+			if ( !empty($qtips) ) {
+							wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ) );
+			}
 
 		} else {
 			//qtips has been requested without any registration (so assuming its just directly used in the admin).
@@ -171,16 +173,18 @@ 
 		}
 
 		//now we attempt a class_exists one more time.
-		if ( !class_exists( $config ) )
-			throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) );
+		if ( !class_exists( $config ) ) {
+					throw new EE_Error( sprintf( __('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config ) );
+		}
 
 		//made it HERE?  FINALLY, let's get things setup.
 		$a = new ReflectionClass($config);
 		$qtip = $a->newInstance();
 
 		//verify that $qtip is a valid object
-		if ( ! $qtip instanceof EE_Qtip_Config )
-			throw new EE_Error( sprintf( __( 'The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config ) );
+		if ( ! $qtip instanceof EE_Qtip_Config ) {
+					throw new EE_Error( sprintf( __( 'The class given for the Qtip loader (%s) is not a child of the <strong>EE_Qtip_Config</strong> class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config ) );
+		}
 
 		$this->_qtips[] = $a->newInstance();
 
@@ -196,8 +200,10 @@ 
 	 * @return void
 	 */
 	public function setup_qtip() {
-		if ( empty( $this->_qtips ) )
-			return; //no qtips!
+		if ( empty( $this->_qtips ) ) {
+					return;
+		}
+		//no qtips!
 
 		$content = array();
 
@@ -219,8 +225,9 @@ 
 		$qts = $qtip->get_tips();
 		$content = array();
 		foreach ( $qts as $qt ) {
-			if ( ! $qt instanceof EE_Qtip )
-				continue;
+			if ( ! $qt instanceof EE_Qtip ) {
+							continue;
+			}
 			$content[] = '<div class="ee-qtip-helper-content hidden" id="' . $qt->content_id . '">' . $qt->content . '</div>';
 		}
 

core/helpers/EEH_Tabbed_Content.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 	/**
 	 * this just returns the properly formatted tab content for our tab box.
 	 * @param  string $name    name of tab (used for selector)
-	 * @param  string $content content of tab
+	 * @param  string $tab_content content of tab
 	 * @return string          html for content area
 	 */
 	private static function tab_content($name, $tab_content, $active = false) {

Spacing +35 added lines, -35 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -43,22 +43,22 @@ 
 	 * @param  array $tabs_content an array of the content for each tab [required]
 	 * @return string               the assembled html string containing the tabbed content for display.
 	 */
-	public static function display($tabs_contents, $tabs_names = array(), $small_tabs = true, $tabs_content = TRUE ) {
+	public static function display($tabs_contents, $tabs_names = array(), $small_tabs = true, $tabs_content = TRUE) {
 
 		//first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
-		if ( !empty( $tabs_names) && ( count( (array) $tabs_names) != count( (array) $tabs_content) ) ) {
-			throw new EE_Error( __('The count for $tabs_names and $tabs_content does not match.', 'event_espresso') );
+		if ( ! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
+			throw new EE_Error(__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso'));
 		}
 
 		//make sure we've got incoming data setup properly
-		$tabs = !empty( $tabs_names ) ? (array) $tabs_names : array_keys( (array) $tabs_contents );
-		$tabs_content = !empty( $tabs_names ) ? array_combine( (array) $tabs_names, (array) $tabs_content ) : $tabs_contents;
+		$tabs = ! empty($tabs_names) ? (array) $tabs_names : array_keys((array) $tabs_contents);
+		$tabs_content = ! empty($tabs_names) ? array_combine((array) $tabs_names, (array) $tabs_content) : $tabs_contents;
 
-		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
+		$all_tabs = '<h2 class="nav-tab-wrapper">'."\n";
 		$all_tabs_content = '';
 
 		$index = 0;
-		foreach ( $tabs as $tab ) {
+		foreach ($tabs as $tab) {
 			$active = $index === 0 ? true : false;
 			$all_tabs .= self::tab($tab, $active);
 			$all_tabs_content .= self::tab_content($tab, $tabs_content[$tab], $active);
@@ -75,7 +75,7 @@ 
 
 		$tab_container_class = $small_tabs ? 'ee-nav-tabs ee-nav-tabs-small' : 'ee-nav-tabs';
 
-		return '<div class="'. $tab_container_class . '">' . "\n\t" . $all_tabs . $all_tabs_content . "\n" . '</div>';
+		return '<div class="'.$tab_container_class.'">'."\n\t".$all_tabs.$all_tabs_content."\n".'</div>';
 	}
 
 
@@ -98,11 +98,11 @@ 
 	 * @param array $nav_tabs tab array for nav tabs
 	 */
 	public static function display_admin_nav_tabs($nav_tabs = array()) {
-		if ( empty($nav_tabs) )
-			throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		if (empty($nav_tabs))
+			throw new EE_Error(__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso'));
 
-		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
-		foreach ( $nav_tabs as $slug => $tab ) {
+		$all_tabs = '<h2 class="nav-tab-wrapper">'."\n";
+		foreach ($nav_tabs as $slug => $tab) {
 			$all_tabs .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
 		}
 		$all_tabs .= '</h2>';
@@ -118,13 +118,13 @@ 
 	 * @param bool|string $css If string given then the generated tab will include that as the class.
 	 * @return string          html for tab
 	 */
-	private static function tab($name, $active = false, $nice_name = FALSE, $url = FALSE, $css = FALSE ) {
+	private static function tab($name, $active = false, $nice_name = FALSE, $url = FALSE, $css = FALSE) {
 		$name = str_replace(' ', '-', $name);
 		$class = $active ? 'nav-tab nav-tab-active' : 'nav-tab';
-		$class = $css ? $class . ' ' . $css : $class;
-		$nice_name = $nice_name ? $nice_name : ucwords( preg_replace('/(-|_)/', ' ', $name) );
-		$url = $url ? $url : '#' . $name;
-		$tab = '<a class="' . $class . '" rel="ee-tab-' . $name . '" href="' . $url . '">' . $nice_name . '</a>' . "\n\t";
+		$class = $css ? $class.' '.$css : $class;
+		$nice_name = $nice_name ? $nice_name : ucwords(preg_replace('/(-|_)/', ' ', $name));
+		$url = $url ? $url : '#'.$name;
+		$tab = '<a class="'.$class.'" rel="ee-tab-'.$name.'" href="'.$url.'">'.$nice_name.'</a>'."\n\t";
 		return $tab;
 	}
 
@@ -136,9 +136,9 @@ 
 	 */
 	private static function tab_content($name, $tab_content, $active = false) {
 		$class = $active ? 'nav-tab-content' : 'nav-tab-content hidden';
-		$name = str_replace( ' ', '-', $name);
-		$content = "\t" . '<div class="'. $class . '" id="ee-tab-' . $name . '">' . "\n";
-		$content .= "\t" . $tab_content . "\n";
+		$name = str_replace(' ', '-', $name);
+		$content = "\t".'<div class="'.$class.'" id="ee-tab-'.$name.'">'."\n";
+		$content .= "\t".$tab_content."\n";
 		$content .= '<div style="clear:both"></div></div>';
 		return $content;
 	}
@@ -164,8 +164,8 @@ 
 	 * @param string $default 			You can include a string for the item that will receive the "item_display" class for the js.
 	 * @return string                  a html snippet of of all the formatted link elements.
 	 */
-	public static function tab_text_links( $item_array, $container_class = '', $sep = '|', $default = '' ) {
-		if ( !is_array($item_array) || empty( $item_array ) )
+	public static function tab_text_links($item_array, $container_class = '', $sep = '|', $default = '') {
+		if ( ! is_array($item_array) || empty($item_array))
 			return false; //get out we don't have even the basic thing we need!
 
 
@@ -176,15 +176,15 @@ 
 			'title' => esc_attr__('Link for Item', 'event_espresso'),
 			'slug' => 'item_slug'
 		);
-		$container_class = !empty($container_class) ? 'ee-text-links ' . $container_class : 'ee-text-links';
-		$list = '<ul class="' . $container_class . '">';
+		$container_class = ! empty($container_class) ? 'ee-text-links '.$container_class : 'ee-text-links';
+		$list = '<ul class="'.$container_class.'">';
 
 		$ci = 1;
-		foreach ( $item_array as $item ) {
-			$item = wp_parse_args( $item, $defaults );
-			$item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
+		foreach ($item_array as $item) {
+			$item = wp_parse_args($item, $defaults);
+			$item['class'] = ! empty($default) && $default == $item['slug'] ? 'item_display '.$item['class'] : $item['class'];
 			$list .= self::_text_link_item($item);
-			if ( !empty($sep) && $ci != count($item_array) )
+			if ( ! empty($sep) && $ci != count($item_array))
 				$list .= self::_text_link_item($sep);
 			$ci++;
 		}
@@ -195,9 +195,9 @@ 
 
 
 
-	private static function _text_link_item( $item ) {
+	private static function _text_link_item($item) {
 		//if this isn't an array then we're doing a separator
-		if ( !is_array( $item ) ) {
+		if ( ! is_array($item)) {
 			$label = $item;
 			$class = 'ee-text-link-sep';
 			$href = '';
@@ -206,12 +206,12 @@ 
 			extract($item);
 		}
 
-		$class = $class != 'ee-text-link-sep'  ? 'class="ee-text-link-li ' . $class . '"' : 'class="ee-text-link-sep"';
+		$class = $class != 'ee-text-link-sep' ? 'class="ee-text-link-li '.$class.'"' : 'class="ee-text-link-sep"';
 
-		$content = '<li ' . $class . '>';
-		$content .= !empty($href) ? '<a class="ee-text-link" href="#' . $href . '" title="' . $title . '">' : '';
+		$content = '<li '.$class.'>';
+		$content .= ! empty($href) ? '<a class="ee-text-link" href="#'.$href.'" title="'.$title.'">' : '';
 		$content .= $label;
-		$content .= !empty($href) ? '</a>' : '';
+		$content .= ! empty($href) ? '</a>' : '';
 		$content .= '</li>';
 		return $content;
 	}

Braces +12 added lines, -7 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -98,8 +99,9 @@ 
 	 * @param array $nav_tabs tab array for nav tabs
 	 */
 	public static function display_admin_nav_tabs($nav_tabs = array()) {
-		if ( empty($nav_tabs) )
-			throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		if ( empty($nav_tabs) ) {
+					throw new EE_Error( __('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso' ) );
+		}
 
 		$all_tabs = '<h2 class="nav-tab-wrapper">' . "\n";
 		foreach ( $nav_tabs as $slug => $tab ) {
@@ -165,8 +167,10 @@ 
 	 * @return string                  a html snippet of of all the formatted link elements.
 	 */
 	public static function tab_text_links( $item_array, $container_class = '', $sep = '|', $default = '' ) {
-		if ( !is_array($item_array) || empty( $item_array ) )
-			return false; //get out we don't have even the basic thing we need!
+		if ( !is_array($item_array) || empty( $item_array ) ) {
+					return false;
+		}
+		//get out we don't have even the basic thing we need!
 
 
 		$defaults = array(
@@ -184,8 +188,9 @@ 
 			$item = wp_parse_args( $item, $defaults );
 			$item['class'] = !empty($default) && $default == $item['slug'] ? 'item_display ' . $item['class'] : $item['class'];
 			$list .= self::_text_link_item($item);
-			if ( !empty($sep) && $ci != count($item_array) )
-				$list .= self::_text_link_item($sep);
+			if ( !empty($sep) && $ci != count($item_array) ) {
+							$list .= self::_text_link_item($sep);
+			}
 			$ci++;
 		}
 

core/helpers/EEH_Template.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
 	 * @param bool|string $template_path server path to the file to be loaded, including file name and extension
 	 * @param  array      $template_args an array of arguments to be extracted for use in the template
 	 * @param  boolean    $return_string whether to send output immediately to screen, or capture and return as a string
-	 * @return mixed string
+	 * @return string string
 	 */
 	public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) {
 		//require the template validator for verifying variables are set according to how the template requires

Indentation +5 added lines, -5 removed lines

@@ -99,7 +99,7 @@ 
 				return array();
 			}
 			if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) {
-			    unset( $espresso_themes[ $key ] );
+				unset( $espresso_themes[ $key ] );
 			}
 			EEH_Template::$_espresso_themes = array();
 			foreach ( $espresso_themes as $espresso_theme ) {
@@ -226,7 +226,7 @@ 
 			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 );
-				    break;
+					break;
 				}
 			}
 		}
@@ -648,9 +648,9 @@ 
 		);
 
 		if ( empty( $items_label )
-		     || ! is_array( $items_label )
-		     || ! isset( $items_label['single'] )
-		     || ! isset( $items_label['plural'] ) ) {
+			 || ! 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' )

Spacing +180 added lines, -180 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);
 		}
 	}
 
@@ -156,26 +156,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
@@ -184,61 +184,61 @@ 
 			// 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 );
+			$template_folder_paths = apply_filters('FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths);
 
 			// array to hold all possible template paths
 			$full_template_paths = array();
 
 			// loop through $templates
-			foreach ( (array)$templates as $template ) {
+			foreach ((array) $templates as $template) {
 				// while looping through all template folder paths
-				foreach ( (array)$template_folder_paths as $template_folder_path ) {
+				foreach ((array) $template_folder_paths as $template_folder_path) {
 					// build up our template locations array by combining our template folder paths with our templates
-					$full_template_paths[] = rtrim( $template_folder_path, DS ) . DS . $template;
+					$full_template_paths[] = rtrim($template_folder_path, DS).DS.$template;
 				}
 				// 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);
 			}
 			// filter final array of full template paths
-			$full_template_paths = apply_filters( 'FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths );
+			$full_template_paths = apply_filters('FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths);
 
 
 			// 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);
 				    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;
 	}
 
 
@@ -250,9 +250,9 @@ 
 	 * @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) {
 		//require the template validator for verifying variables are set according to how the template requires
-		EE_Registry::instance()->load_helper( 'Template_Validator' );
+		EE_Registry::instance()->load_helper('Template_Validator');
 
 		/**
 		 * These two filters are intended for last minute changes to templates being loaded and/or template arg
@@ -263,26 +263,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 '';
 	}
@@ -300,27 +300,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;
 	}
 
 
@@ -336,50 +336,50 @@ 
 	 * @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 = (float) $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;
 				}
 
 				// 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;
 	}
@@ -394,11 +394,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];
 	}
 
 
@@ -411,9 +411,9 @@ 
 	 * @param string  $icon
 	 * @return string 	the html output for the button
 	 */
-	public static function get_button_or_link( $url, $label, $class = 'button-primary', $icon = '' ) {
-		$label = ! empty( $icon ) ? '<span class="' . $icon . '"></span>' . $label : $label;
-		$button = '<a id="' . sanitize_title_with_dashes($label) . '" href="' . $url . '" class="' . $class . '">' . $label . '</a>';
+	public static function get_button_or_link($url, $label, $class = 'button-primary', $icon = '') {
+		$label = ! empty($icon) ? '<span class="'.$icon.'"></span>'.$label : $label;
+		$button = '<a id="'.sanitize_title_with_dashes($label).'" href="'.$url.'" class="'.$class.'">'.$label.'</a>';
 		return $button;
 	}
 
@@ -430,21 +430,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>';
 	}
 
 
@@ -456,31 +456,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 {
@@ -488,7 +488,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>';
@@ -509,31 +509,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 .= '<h4>' . __('Status Legend', 'event_espresso') . '</h4>' . "\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 .= '<h4>'.__('Status Legend', 'event_espresso').'</h4>'."\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;
 	}
 
@@ -546,8 +546,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;
 	}
 	EE_Registry::instance()->load_helper('Array');
 	ob_start();
@@ -561,10 +561,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
@@ -578,7 +578,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
@@ -608,8 +608,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);
 	}
 
 
@@ -633,13 +633,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(
@@ -647,68 +647,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">',
@@ -717,29 +717,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>';
 	}
 
 

Braces +19 added lines, -16 removed lines

@@ -160,8 +160,9 @@ 
 		// first use WP locate_template to check for template in the current theme folder
 		$template_path = locate_template( $templates );
 
-		if ( $check_if_custom && !empty( $template_path ) )
-			return TRUE;
+		if ( $check_if_custom && !empty( $template_path ) ) {
+					return TRUE;
+		}
 
 		// not in the theme
 		if ( empty( $template_path )) {
@@ -364,11 +365,11 @@ 
 				if( $mny->sign_b4 ){
 					if( $amount >= 0 ){
 						$amount_formatted = $mny->sign . $amount_formatted;
-					}else{
+					} else{
 						$amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted );
 					}
 
-				}else{
+				} else{
 					$amount_formatted =  $amount_formatted . $mny->sign;
 				}
 
@@ -432,11 +433,13 @@ 
 	 */
 	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;
 
@@ -510,8 +513,9 @@ 
 	 * @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') );
+		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 ) {
@@ -572,8 +576,7 @@ 
 				</tbody>
 			</table>
 			<?php
-		}
-		else {
+		} else {
 			?>
 			<ul>
 				<?php
@@ -583,8 +586,7 @@ 
 			</ul>
 			<?php
 		}
-	}
-	else {
+	} else {
 		//simple value
 		echo $data;
 	}
@@ -664,8 +666,9 @@ 
 
 		$total_pages = ceil( $total_items / $per_page );
 
-		if ( $total_pages <= 1 )
-			return '';
+		if ( $total_pages <= 1 ) {
+					return '';
+		}
 
 		$item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single'];