eventespresso / event-espresso-core

core/EE_Config.core.php

Doc Comments +5 added lines, -5 removed lines

@@ -373,7 +373,7 @@ 
 	 *    update_espresso_config
 	 *
 	 * @access   public
-	 * @return   bool
+	 * @return   boolean|null
 	 */
 	protected function _reset_espresso_addon_config() {
 		$this->_addon_option_names = array();
@@ -459,7 +459,7 @@ 
 	 * @param    string         $name
 	 * @param    string         $config_class
 	 * @param    EE_Config_Base $config_obj
-	 * @param    array          $tests_to_run
+	 * @param    integer[]          $tests_to_run
 	 * @param    bool           $display_errors
 	 * @return    bool    TRUE on success, FALSE on fail
 	 */
@@ -1736,7 +1736,7 @@ 
 
 
 	/**
-	 * @return array
+	 * @return integer[]
 	 */
 	public function get_critical_pages_array() {
 		return array(
@@ -1750,7 +1750,7 @@ 
 
 
 	/**
-	 * @return array
+	 * @return string[]
 	 */
 	public function get_critical_pages_shortcodes_array() {
 		return array(
@@ -2785,7 +2785,7 @@ 
 	 * according to max_input_vars
 	 *
 	 * @param int   $input_count the count of input vars.
-	 * @return array {
+	 * @return string {
 	 *                           An array that represents whether available space and if no available space the error
 	 *                           message.
 	 * @type bool   $has_space   whether more inputs can be added.

Indentation +3 added lines, -3 removed lines

@@ -2105,7 +2105,7 @@ 
 	public function __construct( $CNT_ISO = '' ) {
 		// get country code from organization settings or use default
 		$ORG_CNT = isset( EE_Registry::instance()->CFG->organization )
-		           && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config
+				   && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config
 			? EE_Registry::instance()->CFG->organization->CNT_ISO
 			: '';
 		// but override if requested
@@ -2794,8 +2794,8 @@ 
 	 */
 	public function max_input_vars_limit_check( $input_count = 0 ) {
 		if ( ! empty( $this->php->max_input_vars )
-		     && ( $input_count >= $this->php->max_input_vars )
-		     && ( PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >= 9 )
+			 && ( $input_count >= $this->php->max_input_vars )
+			 && ( PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >= 9 )
 		) {
 			return sprintf(
 				__(

Spacing +375 added lines, -375 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -121,7 +121,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EE_Config ) {
+		if ( ! self::$_instance instanceof EE_Config) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -141,20 +141,20 @@ 
 	 *                               site was put into maintenance mode)
 	 * @return EE_Config
 	 */
-	public static function reset( $hard_reset = false, $reinstantiate = true ) {
-		if ( $hard_reset ) {
+	public static function reset($hard_reset = false, $reinstantiate = true) {
+		if ($hard_reset) {
 			self::$_instance->_addon_option_names = array();
 			self::$_instance->_initialize_config();
 			self::$_instance->update_espresso_config();
 		}
-		if ( self::$_instance instanceof EE_Config ) {
+		if (self::$_instance instanceof EE_Config) {
 			self::$_instance->update_addon_option_names();
 		}
 		self::$_instance = null;
 		//we don't need to reset the static properties imo because those should
 		//only change when a module is added or removed. Currently we don't
 		//support removing a module during a request when it previously existed
-		if ( $reinstantiate ) {
+		if ($reinstantiate) {
 			return self::instance();
 		} else {
 			return null;
@@ -170,7 +170,7 @@ 
 	 * @return \EE_Config
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Config__construct__begin', $this );
+		do_action('AHEE__EE_Config__construct__begin', $this);
 		// setup empty config classes
 		$this->_initialize_config();
 		// load existing EE site settings
@@ -180,17 +180,17 @@ 
 		//  register shortcodes and modules
 		add_action(
 			'AHEE__EE_System__register_shortcodes_modules_and_widgets',
-			array( $this, 'register_shortcodes_and_modules' ),
+			array($this, 'register_shortcodes_and_modules'),
 			999
 		);
 		//  initialize shortcodes and modules
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'initialize_shortcodes_and_modules' ) );
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'initialize_shortcodes_and_modules'));
 		// register widgets
-		add_action( 'widgets_init', array( $this, 'widgets_init' ), 10 );
+		add_action('widgets_init', array($this, 'widgets_init'), 10);
 		// shutdown
-		add_action( 'shutdown', array( $this, 'update_addon_option_names' ), 10 );
+		add_action('shutdown', array($this, 'update_addon_option_names'), 10);
 		// construct__end hook
-		do_action( 'AHEE__EE_Config__construct__end', $this );
+		do_action('AHEE__EE_Config__construct__end', $this);
 		// hardcoded hack
 		$this->template_settings->current_espresso_theme = 'Espresso_Arabica_2014';
 	}
@@ -203,7 +203,7 @@ 
 	 * @return string current theme set.
 	 */
 	public static function get_current_theme() {
-		return isset( self::$_instance->template_settings->current_espresso_theme )
+		return isset(self::$_instance->template_settings->current_espresso_theme)
 			? self::$_instance->template_settings->current_espresso_theme : 'Espresso_Arabica_2014';
 	}
 
@@ -218,7 +218,7 @@ 
 	private function _initialize_config() {
 		EE_Config::trim_log();
 		//set defaults
-		$this->_addon_option_names = get_option( EE_Config::ADDON_OPTION_NAMES, array() );
+		$this->_addon_option_names = get_option(EE_Config::ADDON_OPTION_NAMES, array());
 		$this->addons = new stdClass();
 		// set _module_route_map
 		EE_Config::$_module_route_map = array();
@@ -238,9 +238,9 @@ 
 	 */
 	private function _load_core_config() {
 		// load_core_config__start hook
-		do_action( 'AHEE__EE_Config___load_core_config__start', $this );
+		do_action('AHEE__EE_Config___load_core_config__start', $this);
 		$espresso_config = $this->get_espresso_config();
-		foreach ( $espresso_config as $config => $settings ) {
+		foreach ($espresso_config as $config => $settings) {
 			// load_core_config__start hook
 			$settings = apply_filters(
 				'FHEE__EE_Config___load_core_config__config_settings',
@@ -248,22 +248,22 @@ 
 				$config,
 				$this
 			);
-			if ( is_object( $settings ) && property_exists( $this, $config ) ) {
-				$this->{$config} = apply_filters( 'FHEE__EE_Config___load_core_config__' . $config, $settings );
+			if (is_object($settings) && property_exists($this, $config)) {
+				$this->{$config} = apply_filters('FHEE__EE_Config___load_core_config__'.$config, $settings);
 				//call configs populate method to ensure any defaults are set for empty values.
-				if ( method_exists( $settings, 'populate' ) ) {
+				if (method_exists($settings, 'populate')) {
 					$this->{$config}->populate();
 				}
-				if ( method_exists( $settings, 'do_hooks' ) ) {
+				if (method_exists($settings, 'do_hooks')) {
 					$this->{$config}->do_hooks();
 				}
 			}
 		}
-		if ( apply_filters( 'FHEE__EE_Config___load_core_config__update_espresso_config', false ) ) {
+		if (apply_filters('FHEE__EE_Config___load_core_config__update_espresso_config', false)) {
 			$this->update_espresso_config();
 		}
 		// load_core_config__end hook
-		do_action( 'AHEE__EE_Config___load_core_config__end', $this );
+		do_action('AHEE__EE_Config___load_core_config__end', $this);
 	}
 
 
@@ -278,23 +278,23 @@ 
 		$this->core = $this->core instanceof EE_Core_Config
 			? $this->core
 			: new EE_Core_Config();
-		$this->core = apply_filters( 'FHEE__EE_Config___initialize_config__core', $this->core );
+		$this->core = apply_filters('FHEE__EE_Config___initialize_config__core', $this->core);
 		$this->organization = $this->organization instanceof EE_Organization_Config
 			? $this->organization
 			: new EE_Organization_Config();
-		$this->organization = apply_filters( 'FHEE__EE_Config___initialize_config__organization', $this->organization );
+		$this->organization = apply_filters('FHEE__EE_Config___initialize_config__organization', $this->organization);
 		$this->currency = $this->currency instanceof EE_Currency_Config
 			? $this->currency
 			: new EE_Currency_Config();
-		$this->currency = apply_filters( 'FHEE__EE_Config___initialize_config__currency', $this->currency );
+		$this->currency = apply_filters('FHEE__EE_Config___initialize_config__currency', $this->currency);
 		$this->registration = $this->registration instanceof EE_Registration_Config
 			? $this->registration
 			: new EE_Registration_Config();
-		$this->registration = apply_filters( 'FHEE__EE_Config___initialize_config__registration', $this->registration );
+		$this->registration = apply_filters('FHEE__EE_Config___initialize_config__registration', $this->registration);
 		$this->admin = $this->admin instanceof EE_Admin_Config
 			? $this->admin
 			: new EE_Admin_Config();
-		$this->admin = apply_filters( 'FHEE__EE_Config___initialize_config__admin', $this->admin );
+		$this->admin = apply_filters('FHEE__EE_Config___initialize_config__admin', $this->admin);
 		$this->template_settings = $this->template_settings instanceof EE_Template_Config
 			? $this->template_settings
 			: new EE_Template_Config();
@@ -305,15 +305,15 @@ 
 		$this->map_settings = $this->map_settings instanceof EE_Map_Config
 			? $this->map_settings
 			: new EE_Map_Config();
-		$this->map_settings = apply_filters( 'FHEE__EE_Config___initialize_config__map_settings', $this->map_settings );
+		$this->map_settings = apply_filters('FHEE__EE_Config___initialize_config__map_settings', $this->map_settings);
 		$this->environment = $this->environment instanceof EE_Environment_Config
 			? $this->environment
 			: new EE_Environment_Config();
-		$this->environment = apply_filters( 'FHEE__EE_Config___initialize_config__environment', $this->environment );
+		$this->environment = apply_filters('FHEE__EE_Config___initialize_config__environment', $this->environment);
 		$this->gateway = $this->gateway instanceof EE_Gateway_Config
 			? $this->gateway
 			: new EE_Gateway_Config();
-		$this->gateway = apply_filters( 'FHEE__EE_Config___initialize_config__gateway', $this->gateway );
+		$this->gateway = apply_filters('FHEE__EE_Config___initialize_config__gateway', $this->gateway);
 	}
 
 
@@ -328,7 +328,7 @@ 
 		// grab espresso configuration
 		return apply_filters(
 			'FHEE__EE_Config__get_espresso_config__CFG',
-			get_option( EE_Config::OPTION_NAME, array() )
+			get_option(EE_Config::OPTION_NAME, array())
 		);
 	}
 
@@ -342,12 +342,12 @@ 
 	 * @param        $old_value
 	 * @param        $value
 	 */
-	public function double_check_config_comparison( $option = '', $old_value, $value ) {
+	public function double_check_config_comparison($option = '', $old_value, $value) {
 		// make sure we're checking the ee config
-		if ( $option === EE_Config::OPTION_NAME ) {
+		if ($option === EE_Config::OPTION_NAME) {
 			// run a loose comparison of the old value against the new value for type and properties,
 			// but NOT exact instance like WP update_option does (ie: NOT type safe comparison)
-			if ( $value != $old_value ) {
+			if ($value != $old_value) {
 				// if they are NOT the same, then remove the hook,
 				// which means the subsequent update results will be based solely on the update query results
 				// the reason we do this is because, as stated above,
@@ -362,7 +362,7 @@ 
 				// the string it sees in the db looks the same as the new one it has been passed!!!
 				// This results in the query returning an "affected rows" value of ZERO,
 				// which gets returned immediately by WP update_option and looks like an error.
-				remove_action( 'update_option', array( $this, 'check_config_updated' ) );
+				remove_action('update_option', array($this, 'check_config_updated'));
 			}
 		}
 	}
@@ -377,11 +377,11 @@ 
 	 */
 	protected function _reset_espresso_addon_config() {
 		$this->_addon_option_names = array();
-		foreach ( $this->addons as $addon_name => $addon_config_obj ) {
-			$addon_config_obj = maybe_unserialize( $addon_config_obj );
-			$config_class = get_class( $addon_config_obj );
-			if ( $addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class ) {
-				$this->update_config( 'addons', $addon_name, $addon_config_obj, false );
+		foreach ($this->addons as $addon_name => $addon_config_obj) {
+			$addon_config_obj = maybe_unserialize($addon_config_obj);
+			$config_class = get_class($addon_config_obj);
+			if ($addon_config_obj instanceof $config_class && ! $addon_config_obj instanceof __PHP_Incomplete_Class) {
+				$this->update_config('addons', $addon_name, $addon_config_obj, false);
 			}
 			$this->addons->{$addon_name} = null;
 		}
@@ -397,18 +397,18 @@ 
 	 * @param   bool $add_error
 	 * @return   bool
 	 */
-	public function update_espresso_config( $add_success = false, $add_error = true ) {
+	public function update_espresso_config($add_success = false, $add_error = true) {
 		// commented out the following re: https://events.codebasehq.com/projects/event-espresso/tickets/8197
 		//$clone = clone( self::$_instance );
 		//self::$_instance = NULL;
-		do_action( 'AHEE__EE_Config__update_espresso_config__begin', $this );
+		do_action('AHEE__EE_Config__update_espresso_config__begin', $this);
 		$this->_reset_espresso_addon_config();
 		// hook into update_option because that happens AFTER the ( $value === $old_value ) conditional
 		// but BEFORE the actual update occurs
-		add_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1, 3 );
+		add_action('update_option', array($this, 'double_check_config_comparison'), 1, 3);
 		// now update "ee_config"
-		$saved = update_option( EE_Config::OPTION_NAME, $this );
-		EE_Config::log( EE_Config::OPTION_NAME );
+		$saved = update_option(EE_Config::OPTION_NAME, $this);
+		EE_Config::log(EE_Config::OPTION_NAME);
 		// if not saved... check if the hook we just added still exists;
 		// if it does, it means one of two things:
 		// 		that update_option bailed at the ( $value === $old_value ) conditional,
@@ -419,17 +419,17 @@ 
 		// but just means no update occurred, so don't display an error to the user.
 		// BUT... if update_option returns FALSE, AND the hook is missing,
 		// then it means that something truly went wrong
-		$saved = ! $saved ? has_action( 'update_option', array( $this, 'double_check_config_comparison' ) ) : $saved;
+		$saved = ! $saved ? has_action('update_option', array($this, 'double_check_config_comparison')) : $saved;
 		// remove our action since we don't want it in the system anymore
-		remove_action( 'update_option', array( $this, 'double_check_config_comparison' ), 1 );
-		do_action( 'AHEE__EE_Config__update_espresso_config__end', $this, $saved );
+		remove_action('update_option', array($this, 'double_check_config_comparison'), 1);
+		do_action('AHEE__EE_Config__update_espresso_config__end', $this, $saved);
 		//self::$_instance = $clone;
 		//unset( $clone );
 		// if config remains the same or was updated successfully
-		if ( $saved ) {
-			if ( $add_success ) {
+		if ($saved) {
+			if ($add_success) {
 				EE_Error::add_success(
-					__( 'The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso' ),
+					__('The Event Espresso Configuration Settings have been successfully updated.', 'event_espresso'),
 					__FILE__,
 					__FUNCTION__,
 					__LINE__
@@ -437,9 +437,9 @@ 
 			}
 			return true;
 		} else {
-			if ( $add_error ) {
+			if ($add_error) {
 				EE_Error::add_error(
-					__( 'The Event Espresso Configuration Settings were not updated.', 'event_espresso' ),
+					__('The Event Espresso Configuration Settings were not updated.', 'event_espresso'),
 					__FILE__,
 					__FUNCTION__,
 					__LINE__
@@ -468,16 +468,16 @@ 
 		$name = '',
 		$config_class = '',
 		$config_obj = null,
-		$tests_to_run = array( 1, 2, 3, 4, 5, 6, 7, 8 ),
+		$tests_to_run = array(1, 2, 3, 4, 5, 6, 7, 8),
 		$display_errors = true
 	) {
 		try {
-			foreach ( $tests_to_run as $test ) {
-				switch ( $test ) {
+			foreach ($tests_to_run as $test) {
+				switch ($test) {
 					// TEST #1 : check that section was set
 					case 1 :
-						if ( empty( $section ) ) {
-							if ( $display_errors ) {
+						if (empty($section)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
 										__(
@@ -493,11 +493,11 @@ 
 						break;
 					// TEST #2 : check that settings section exists
 					case 2 :
-						if ( ! isset( $this->{$section} ) ) {
-							if ( $display_errors ) {
+						if ( ! isset($this->{$section} )) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" configuration section does not exist.', 'event_espresso' ),
+										__('The "%s" configuration section does not exist.', 'event_espresso'),
 										$section
 									)
 								);
@@ -508,9 +508,9 @@ 
 					// TEST #3 : check that section is the proper format
 					case 3 :
 						if (
-						! ( $this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass )
+						! ($this->{$section} instanceof EE_Config_Base || $this->{$section} instanceof stdClass)
 						) {
-							if ( $display_errors ) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
 										__(
@@ -526,8 +526,8 @@ 
 						break;
 					// TEST #4 : check that config section name has been set
 					case 4 :
-						if ( empty( $name ) ) {
-							if ( $display_errors ) {
+						if (empty($name)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									__(
 										'No name has been provided for the specific configuration section.',
@@ -540,8 +540,8 @@ 
 						break;
 					// TEST #5 : check that a config class name has been set
 					case 5 :
-						if ( empty( $config_class ) ) {
-							if ( $display_errors ) {
+						if (empty($config_class)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									__(
 										'No class name has been provided for the specific configuration section.',
@@ -554,8 +554,8 @@ 
 						break;
 					// TEST #6 : verify config class is accessible
 					case 6 :
-						if ( ! class_exists( $config_class ) ) {
-							if ( $display_errors ) {
+						if ( ! class_exists($config_class)) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
 										__(
@@ -571,11 +571,11 @@ 
 						break;
 					// TEST #7 : check that config has even been set
 					case 7 :
-						if ( ! isset( $this->{$section}->{$name} ) ) {
-							if ( $display_errors ) {
+						if ( ! isset($this->{$section}->{$name} )) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'No configuration has been set for "%1$s->%2$s".', 'event_espresso' ),
+										__('No configuration has been set for "%1$s->%2$s".', 'event_espresso'),
 										$section,
 										$name
 									)
@@ -584,13 +584,13 @@ 
 							return false;
 						} else {
 							// and make sure it's not serialized
-							$this->{$section}->{$name} = maybe_unserialize( $this->{$section}->{$name} );
+							$this->{$section}->{$name} = maybe_unserialize($this->{$section}->{$name} );
 						}
 						break;
 					// TEST #8 : check that config is the requested type
 					case 8 :
-						if ( ! $this->{$section}->{$name} instanceof $config_class ) {
-							if ( $display_errors ) {
+						if ( ! $this->{$section}->{$name} instanceof $config_class) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
 										__(
@@ -608,12 +608,12 @@ 
 						break;
 					// TEST #9 : verify config object
 					case 9 :
-						if ( ! $config_obj instanceof EE_Config_Base ) {
-							if ( $display_errors ) {
+						if ( ! $config_obj instanceof EE_Config_Base) {
+							if ($display_errors) {
 								throw new EE_Error(
 									sprintf(
-										__( 'The "%s" class is not an instance of EE_Config_Base.', 'event_espresso' ),
-										print_r( $config_obj, true )
+										__('The "%s" class is not an instance of EE_Config_Base.', 'event_espresso'),
+										print_r($config_obj, true)
 									)
 								);
 							}
@@ -622,7 +622,7 @@ 
 						break;
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		// you have successfully run the gauntlet
@@ -639,8 +639,8 @@ 
 	 * @param        string $name
 	 * @return        string
 	 */
-	private function _generate_config_option_name( $section = '', $name = '' ) {
-		return 'ee_config-' . strtolower( $section . '-' . str_replace( array( 'EE_', 'EED_' ), '', $name ) );
+	private function _generate_config_option_name($section = '', $name = '') {
+		return 'ee_config-'.strtolower($section.'-'.str_replace(array('EE_', 'EED_'), '', $name));
 	}
 
 
@@ -654,10 +654,10 @@ 
 	 * @param    string $name
 	 * @return    string
 	 */
-	private function _set_config_class( $config_class = '', $name = '' ) {
-		return ! empty( $config_class )
+	private function _set_config_class($config_class = '', $name = '') {
+		return ! empty($config_class)
 			? $config_class
-			: str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $name ) ) ) . '_Config';
+			: str_replace(' ', '_', ucwords(str_replace('_', ' ', $name))).'_Config';
 	}
 
 
@@ -672,36 +672,36 @@ 
 	 * @param    EE_Config_Base $config_obj
 	 * @return    EE_Config_Base
 	 */
-	public function set_config( $section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = null ) {
+	public function set_config($section = '', $name = '', $config_class = '', EE_Config_Base $config_obj = null) {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6, and 7 to verify all config params are set and valid
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, null, array( 1, 2, 3, 4, 5, 6 ) ) ) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, null, array(1, 2, 3, 4, 5, 6))) {
 			return null;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// if the config option name hasn't been added yet to the list of option names we're tracking, then do so now
-		if ( ! isset( $this->_addon_option_names[ $config_option_name ] ) ) {
-			$this->_addon_option_names[ $config_option_name ] = $config_class;
+		if ( ! isset($this->_addon_option_names[$config_option_name])) {
+			$this->_addon_option_names[$config_option_name] = $config_class;
 			$this->update_addon_option_names();
 		}
 		// verify the incoming config object but suppress errors
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), false ) ) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), false)) {
 			$config_obj = new $config_class();
 		}
-		if ( get_option( $config_option_name ) ) {
-			EE_Config::log( $config_option_name );
-			update_option( $config_option_name, $config_obj );
+		if (get_option($config_option_name)) {
+			EE_Config::log($config_option_name);
+			update_option($config_option_name, $config_obj);
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		} else {
 			// create a wp-option for this config
-			if ( add_option( $config_option_name, $config_obj, '', 'no' ) ) {
-				$this->{$section}->{$name} = maybe_unserialize( $config_obj );
+			if (add_option($config_option_name, $config_obj, '', 'no')) {
+				$this->{$section}->{$name} = maybe_unserialize($config_obj);
 				return $this->{$section}->{$name};
 			} else {
 				EE_Error::add_error(
-					sprintf( __( 'The "%s" could not be saved to the database.', 'event_espresso' ), $config_class ),
+					sprintf(__('The "%s" could not be saved to the database.', 'event_espresso'), $config_class),
 					__FILE__,
 					__FUNCTION__,
 					__LINE__
@@ -724,40 +724,40 @@ 
 	 * @param    bool                  $throw_errors
 	 * @return    bool
 	 */
-	public function update_config( $section = '', $name = '', $config_obj = '', $throw_errors = true ) {
-		$config_obj = maybe_unserialize( $config_obj );
+	public function update_config($section = '', $name = '', $config_obj = '', $throw_errors = true) {
+		$config_obj = maybe_unserialize($config_obj);
 		// get class name of the incoming object
-		$config_class = get_class( $config_obj );
+		$config_class = get_class($config_obj);
 		// run tests 1-5 and 9 to verify config
 		if ( ! $this->_verify_config_params(
 			$section,
 			$name,
 			$config_class,
 			$config_obj,
-			array( 1, 2, 3, 4, 7, 9 )
+			array(1, 2, 3, 4, 7, 9)
 		)
 		) {
 			return false;
 		}
-		$config_option_name = $this->_generate_config_option_name( $section, $name );
+		$config_option_name = $this->_generate_config_option_name($section, $name);
 		// check if config object has been added to db by seeing if config option name is in $this->_addon_option_names array
-		if ( ! isset( $this->_addon_option_names[ $config_option_name ] ) ) {
+		if ( ! isset($this->_addon_option_names[$config_option_name])) {
 			// save new config to db
-			return $this->set_config( $section, $name, $config_class, $config_obj );
+			return $this->set_config($section, $name, $config_class, $config_obj);
 		} else {
 			// first check if the record already exists
-			$existing_config = get_option( $config_option_name );
-			$config_obj = serialize( $config_obj );
+			$existing_config = get_option($config_option_name);
+			$config_obj = serialize($config_obj);
 			// just return if db record is already up to date (NOT type safe comparison)
-			if ( $existing_config == $config_obj ) {
+			if ($existing_config == $config_obj) {
 				$this->{$section}->{$name} = $config_obj;
 				return true;
-			} else if ( update_option( $config_option_name, $config_obj ) ) {
-				EE_Config::log( $config_option_name );
+			} else if (update_option($config_option_name, $config_obj)) {
+				EE_Config::log($config_option_name);
 				// update wp-option for this config class
 				$this->{$section}->{$name} = $config_obj;
 				return true;
-			} elseif ( $throw_errors ) {
+			} elseif ($throw_errors) {
 				EE_Error::add_error(
 					sprintf(
 						__(
@@ -765,7 +765,7 @@ 
 							'event_espresso'
 						),
 						$config_class,
-						'EE_Config->' . $section . '->' . $name
+						'EE_Config->'.$section.'->'.$name
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -787,34 +787,34 @@ 
 	 * @param    string $config_class
 	 * @return    mixed EE_Config_Base | NULL
 	 */
-	public function get_config( $section = '', $name = '', $config_class = '' ) {
+	public function get_config($section = '', $name = '', $config_class = '') {
 		// ensure config class is set to something
-		$config_class = $this->_set_config_class( $config_class, $name );
+		$config_class = $this->_set_config_class($config_class, $name);
 		// run tests 1-4, 6 and 7 to verify that all params have been set
-		if ( ! $this->_verify_config_params( $section, $name, $config_class, null, array( 1, 2, 3, 4, 5, 6 ) ) ) {
+		if ( ! $this->_verify_config_params($section, $name, $config_class, null, array(1, 2, 3, 4, 5, 6))) {
 			return null;
 		}
 		// now test if the requested config object exists, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, null, array( 7, 8 ), false ) ) {
+		if ($this->_verify_config_params($section, $name, $config_class, null, array(7, 8), false)) {
 			// config already exists, so pass it back
 			return $this->{$section}->{$name};
 		}
 		// load config option from db if it exists
-		$config_obj = $this->get_config_option( $this->_generate_config_option_name( $section, $name ) );
+		$config_obj = $this->get_config_option($this->_generate_config_option_name($section, $name));
 		// verify the newly retrieved config object, but suppress errors
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ), false ) ) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9), false)) {
 			// config is good, so set it and pass it back
 			$this->{$section}->{$name} = $config_obj;
 			return $this->{$section}->{$name};
 		}
 		// oops! $config_obj is not already set and does not exist in the db, so create a new one
-		$config_obj = $this->set_config( $section, $name, $config_class );
+		$config_obj = $this->set_config($section, $name, $config_class);
 		// verify the newly created config object
-		if ( $this->_verify_config_params( $section, $name, $config_class, $config_obj, array( 9 ) ) ) {
+		if ($this->_verify_config_params($section, $name, $config_class, $config_obj, array(9))) {
 			return $this->{$section}->{$name};
 		} else {
 			EE_Error::add_error(
-				sprintf( __( 'The "%s" could not be retrieved from the database.', 'event_espresso' ), $config_class ),
+				sprintf(__('The "%s" could not be retrieved from the database.', 'event_espresso'), $config_class),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -832,9 +832,9 @@ 
 	 * @param    string $config_option_name
 	 * @return    mixed EE_Config_Base | FALSE
 	 */
-	public function get_config_option( $config_option_name = '' ) {
+	public function get_config_option($config_option_name = '') {
 		// retrieve the wp-option for this config class.
-		return maybe_unserialize( get_option( $config_option_name ) );
+		return maybe_unserialize(get_option($config_option_name));
 	}
 
 
@@ -844,11 +844,11 @@ 
 	 *
 	 * @param string $config_option_name
 	 */
-	public static function log( $config_option_name = '' ) {
-		if ( ! empty( $config_option_name ) ) {
-			$config_log = get_option( EE_Config::LOG_NAME, array() );
-			$config_log[ (string) microtime( true ) ] = $config_option_name;
-			update_option( EE_Config::LOG_NAME, $config_log );
+	public static function log($config_option_name = '') {
+		if ( ! empty($config_option_name)) {
+			$config_log = get_option(EE_Config::LOG_NAME, array());
+			$config_log[(string) microtime(true)] = $config_option_name;
+			update_option(EE_Config::LOG_NAME, $config_log);
 		}
 	}
 
@@ -859,12 +859,12 @@ 
 	 * reduces the size of the config log to the length specified by EE_Config::LOG_LENGTH
 	 */
 	public static function trim_log() {
-		$config_log = get_option( EE_Config::LOG_NAME, array() );
-		$log_length = count( $config_log );
-		if ( $log_length > EE_Config::LOG_LENGTH ) {
-			ksort( $config_log );
-			$config_log = array_slice( $config_log, $log_length - EE_Config::LOG_LENGTH, null, true );
-			update_option( EE_Config::LOG_NAME, $config_log );
+		$config_log = get_option(EE_Config::LOG_NAME, array());
+		$log_length = count($config_log);
+		if ($log_length > EE_Config::LOG_LENGTH) {
+			ksort($config_log);
+			$config_log = array_slice($config_log, $log_length - EE_Config::LOG_LENGTH, null, true);
+			update_option(EE_Config::LOG_NAME, $config_log);
 		}
 	}
 
@@ -879,14 +879,14 @@ 
 	 * @return    string
 	 */
 	public static function get_page_for_posts() {
-		$page_for_posts = get_option( 'page_for_posts' );
-		if ( ! $page_for_posts ) {
+		$page_for_posts = get_option('page_for_posts');
+		if ( ! $page_for_posts) {
 			return 'posts';
 		}
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT post_name from $wpdb->posts WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
-		return $wpdb->get_var( $wpdb->prepare( $SQL, $page_for_posts ) );
+		return $wpdb->get_var($wpdb->prepare($SQL, $page_for_posts));
 	}
 
 
@@ -942,17 +942,17 @@ 
 			)
 		) {
 			// grab list of installed widgets
-			$widgets_to_register = glob( EE_WIDGETS . '*', GLOB_ONLYDIR );
+			$widgets_to_register = glob(EE_WIDGETS.'*', GLOB_ONLYDIR);
 			// filter list of modules to register
 			$widgets_to_register = apply_filters(
 				'FHEE__EE_Config__register_widgets__widgets_to_register',
 				$widgets_to_register
 			);
-			if ( ! empty( $widgets_to_register ) ) {
+			if ( ! empty($widgets_to_register)) {
 				// cycle thru widget folders
-				foreach ( $widgets_to_register as $widget_path ) {
+				foreach ($widgets_to_register as $widget_path) {
 					// add to list of installed widget modules
-					EE_Config::register_ee_widget( $widget_path );
+					EE_Config::register_ee_widget($widget_path);
 				}
 			}
 			// filter list of installed modules
@@ -972,57 +972,57 @@ 
 	 * @param    string $widget_path - full path up to and including widget folder
 	 * @return    void
 	 */
-	public static function register_ee_widget( $widget_path = null ) {
-		do_action( 'AHEE__EE_Config__register_widget__begin', $widget_path );
+	public static function register_ee_widget($widget_path = null) {
+		do_action('AHEE__EE_Config__register_widget__begin', $widget_path);
 		$widget_ext = '.widget.php';
 		// make all separators match
-		$widget_path = rtrim( str_replace( '/\\', DS, $widget_path ), DS );
+		$widget_path = rtrim(str_replace('/\\', DS, $widget_path), DS);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $widget_path, $widget_ext ) !== false ) {
+		if (strpos($widget_path, $widget_ext) !== false) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$file_name = explode( '.', basename( $widget_path ) );
+			$file_name = explode('.', basename($widget_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$widget = strpos( $file_name[0], 'EEW_' ) === 0 ? substr( $file_name[0], 4 ) : $file_name[0];
+			$widget = strpos($file_name[0], 'EEW_') === 0 ? substr($file_name[0], 4) : $file_name[0];
 			// sanitize shortcode directory name
-			$widget = sanitize_key( $widget );
+			$widget = sanitize_key($widget);
 			// now we need to rebuild the shortcode path
-			$widget_path = explode( DS, $widget_path );
+			$widget_path = explode(DS, $widget_path);
 			// remove last segment
-			array_pop( $widget_path );
+			array_pop($widget_path);
 			// glue it back together
-			$widget_path = implode( DS, $widget_path );
+			$widget_path = implode(DS, $widget_path);
 		} else {
 			// grab and sanitize widget directory name
-			$widget = sanitize_key( basename( $widget_path ) );
+			$widget = sanitize_key(basename($widget_path));
 		}
 		// create classname from widget directory name
-		$widget = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $widget ) ) );
+		$widget = str_replace(' ', '_', ucwords(str_replace('_', ' ', $widget)));
 		// add class prefix
-		$widget_class = 'EEW_' . $widget;
+		$widget_class = 'EEW_'.$widget;
 		// does the widget exist ?
-		if ( ! is_readable( $widget_path . DS . $widget_class . $widget_ext ) ) {
+		if ( ! is_readable($widget_path.DS.$widget_class.$widget_ext)) {
 			$msg = sprintf(
 				__(
 					'The requested %s widget file could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s',
 					'event_espresso'
 				),
 				$widget_class,
-				$widget_path . DS . $widget_class . $widget_ext
+				$widget_path.DS.$widget_class.$widget_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		// load the widget class file
-		require_once( $widget_path . DS . $widget_class . $widget_ext );
+		require_once($widget_path.DS.$widget_class.$widget_ext);
 		// verify that class exists
-		if ( ! class_exists( $widget_class ) ) {
-			$msg = sprintf( __( 'The requested %s widget class does not exist.', 'event_espresso' ), $widget_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($widget_class)) {
+			$msg = sprintf(__('The requested %s widget class does not exist.', 'event_espresso'), $widget_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
-		register_widget( $widget_class );
+		register_widget($widget_class);
 		// add to array of registered widgets
-		EE_Registry::instance()->widgets->{$widget_class} = $widget_path . DS . $widget_class . $widget_ext;
+		EE_Registry::instance()->widgets->{$widget_class} = $widget_path.DS.$widget_class.$widget_ext;
 	}
 
 
@@ -1035,17 +1035,17 @@ 
 	 */
 	private function _register_shortcodes() {
 		// grab list of installed shortcodes
-		$shortcodes_to_register = glob( EE_SHORTCODES . '*', GLOB_ONLYDIR );
+		$shortcodes_to_register = glob(EE_SHORTCODES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
 		$shortcodes_to_register = apply_filters(
 			'FHEE__EE_Config__register_shortcodes__shortcodes_to_register',
 			$shortcodes_to_register
 		);
-		if ( ! empty( $shortcodes_to_register ) ) {
+		if ( ! empty($shortcodes_to_register)) {
 			// cycle thru shortcode folders
-			foreach ( $shortcodes_to_register as $shortcode_path ) {
+			foreach ($shortcodes_to_register as $shortcode_path) {
 				// add to list of installed shortcode modules
-				EE_Config::register_shortcode( $shortcode_path );
+				EE_Config::register_shortcode($shortcode_path);
 			}
 		}
 		// filter list of installed modules
@@ -1064,64 +1064,64 @@ 
 	 * @param    string $shortcode_path - full path up to and including shortcode folder
 	 * @return    bool
 	 */
-	public static function register_shortcode( $shortcode_path = null ) {
-		do_action( 'AHEE__EE_Config__register_shortcode__begin', $shortcode_path );
+	public static function register_shortcode($shortcode_path = null) {
+		do_action('AHEE__EE_Config__register_shortcode__begin', $shortcode_path);
 		$shortcode_ext = '.shortcode.php';
 		// make all separators match
-		$shortcode_path = str_replace( array( '\\', '/' ), DS, $shortcode_path );
+		$shortcode_path = str_replace(array('\\', '/'), DS, $shortcode_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $shortcode_path, $shortcode_ext ) !== false ) {
+		if (strpos($shortcode_path, $shortcode_ext) !== false) {
 			// grab shortcode file name from directory name and break apart at dots
-			$shortcode_file = explode( '.', basename( $shortcode_path ) );
+			$shortcode_file = explode('.', basename($shortcode_path));
 			// take first segment from file name pieces and remove class prefix if it exists
-			$shortcode = strpos( $shortcode_file[0], 'EES_' ) === 0
-				? substr( $shortcode_file[0], 4 )
+			$shortcode = strpos($shortcode_file[0], 'EES_') === 0
+				? substr($shortcode_file[0], 4)
 				: $shortcode_file[0];
 			// sanitize shortcode directory name
-			$shortcode = sanitize_key( $shortcode );
+			$shortcode = sanitize_key($shortcode);
 			// now we need to rebuild the shortcode path
-			$shortcode_path = explode( DS, $shortcode_path );
+			$shortcode_path = explode(DS, $shortcode_path);
 			// remove last segment
-			array_pop( $shortcode_path );
+			array_pop($shortcode_path);
 			// glue it back together
-			$shortcode_path = implode( DS, $shortcode_path ) . DS;
+			$shortcode_path = implode(DS, $shortcode_path).DS;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize shortcode directory name
-			$shortcode = sanitize_key( basename( $shortcode_path ) );
-			$shortcode_path = rtrim( $shortcode_path, DS ) . DS;
+			$shortcode = sanitize_key(basename($shortcode_path));
+			$shortcode_path = rtrim($shortcode_path, DS).DS;
 		}
 		// create classname from shortcode directory or file name
-		$shortcode = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $shortcode ) ) );
+		$shortcode = str_replace(' ', '_', ucwords(str_replace('_', ' ', $shortcode)));
 		// add class prefix
-		$shortcode_class = 'EES_' . $shortcode;
+		$shortcode_class = 'EES_'.$shortcode;
 		// does the shortcode exist ?
-		if ( ! is_readable( $shortcode_path . DS . $shortcode_class . $shortcode_ext ) ) {
+		if ( ! is_readable($shortcode_path.DS.$shortcode_class.$shortcode_ext)) {
 			$msg = sprintf(
 				__(
 					'The requested %s shortcode file could not be found or is not readable due to file permissions. It should be in %s',
 					'event_espresso'
 				),
 				$shortcode_class,
-				$shortcode_path . DS . $shortcode_class . $shortcode_ext
+				$shortcode_path.DS.$shortcode_class.$shortcode_ext
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// load the shortcode class file
-		require_once( $shortcode_path . $shortcode_class . $shortcode_ext );
+		require_once($shortcode_path.$shortcode_class.$shortcode_ext);
 		// verify that class exists
-		if ( ! class_exists( $shortcode_class ) ) {
+		if ( ! class_exists($shortcode_class)) {
 			$msg = sprintf(
-				__( 'The requested %s shortcode class does not exist.', 'event_espresso' ),
+				__('The requested %s shortcode class does not exist.', 'event_espresso'),
 				$shortcode_class
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		$shortcode = strtoupper( $shortcode );
+		$shortcode = strtoupper($shortcode);
 		// add to array of registered shortcodes
-		EE_Registry::instance()->shortcodes->{$shortcode} = $shortcode_path . $shortcode_class . $shortcode_ext;
+		EE_Registry::instance()->shortcodes->{$shortcode} = $shortcode_path.$shortcode_class.$shortcode_ext;
 		return true;
 	}
 
@@ -1135,22 +1135,22 @@ 
 	 */
 	private function _register_modules() {
 		// grab list of installed modules
-		$modules_to_register = glob( EE_MODULES . '*', GLOB_ONLYDIR );
+		$modules_to_register = glob(EE_MODULES.'*', GLOB_ONLYDIR);
 		// filter list of modules to register
 		$modules_to_register = apply_filters(
 			'FHEE__EE_Config__register_modules__modules_to_register',
 			$modules_to_register
 		);
-		if ( ! empty( $modules_to_register ) ) {
+		if ( ! empty($modules_to_register)) {
 			// loop through folders
-			foreach ( $modules_to_register as $module_path ) {
+			foreach ($modules_to_register as $module_path) {
 				/**TEMPORARILY EXCLUDE gateways from modules for time being**/
 				if (
-					$module_path !== EE_MODULES . 'zzz-copy-this-module-template'
-					&& $module_path !== EE_MODULES . 'gateways'
+					$module_path !== EE_MODULES.'zzz-copy-this-module-template'
+					&& $module_path !== EE_MODULES.'gateways'
 				) {
 					// add to list of installed modules
-					EE_Config::register_module( $module_path );
+					EE_Config::register_module($module_path);
 				}
 			}
 		}
@@ -1170,39 +1170,39 @@ 
 	 * @param    string $module_path - full path up to and including module folder
 	 * @return    bool
 	 */
-	public static function register_module( $module_path = null ) {
-		do_action( 'AHEE__EE_Config__register_module__begin', $module_path );
+	public static function register_module($module_path = null) {
+		do_action('AHEE__EE_Config__register_module__begin', $module_path);
 		$module_ext = '.module.php';
 		// make all separators match
-		$module_path = str_replace( array( '\\', '/' ), DS, $module_path );
+		$module_path = str_replace(array('\\', '/'), DS, $module_path);
 		// does the file path INCLUDE the actual file name as part of the path ?
-		if ( strpos( $module_path, $module_ext ) !== false ) {
+		if (strpos($module_path, $module_ext) !== false) {
 			// grab and shortcode file name from directory name and break apart at dots
-			$module_file = explode( '.', basename( $module_path ) );
+			$module_file = explode('.', basename($module_path));
 			// now we need to rebuild the shortcode path
-			$module_path = explode( DS, $module_path );
+			$module_path = explode(DS, $module_path);
 			// remove last segment
-			array_pop( $module_path );
+			array_pop($module_path);
 			// glue it back together
-			$module_path = implode( DS, $module_path ) . DS;
+			$module_path = implode(DS, $module_path).DS;
 			// take first segment from file name pieces and sanitize it
-			$module = preg_replace( '/[^a-zA-Z0-9_\-]/', '', $module_file[0] );
+			$module = preg_replace('/[^a-zA-Z0-9_\-]/', '', $module_file[0]);
 			// ensure class prefix is added
-			$module_class = strpos( $module, 'EED_' ) !== 0 ? 'EED_' . $module : $module;
+			$module_class = strpos($module, 'EED_') !== 0 ? 'EED_'.$module : $module;
 		} else {
 			// we need to generate the filename based off of the folder name
 			// grab and sanitize module name
-			$module = strtolower( basename( $module_path ) );
-			$module = preg_replace( '/[^a-z0-9_\-]/', '', $module );
+			$module = strtolower(basename($module_path));
+			$module = preg_replace('/[^a-z0-9_\-]/', '', $module);
 			// like trailingslashit()
-			$module_path = rtrim( $module_path, DS ) . DS;
+			$module_path = rtrim($module_path, DS).DS;
 			// create classname from module directory name
-			$module = str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $module ) ) );
+			$module = str_replace(' ', '_', ucwords(str_replace('_', ' ', $module)));
 			// add class prefix
-			$module_class = 'EED_' . $module;
+			$module_class = 'EED_'.$module;
 		}
 		// does the module exist ?
-		if ( ! is_readable( $module_path . DS . $module_class . $module_ext ) ) {
+		if ( ! is_readable($module_path.DS.$module_class.$module_ext)) {
 			$msg = sprintf(
 				__(
 					'The requested %s module file could not be found or is not readable due to file permissions.',
@@ -1210,19 +1210,19 @@ 
 				),
 				$module
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// load the module class file
-		require_once( $module_path . $module_class . $module_ext );
+		require_once($module_path.$module_class.$module_ext);
 		// verify that class exists
-		if ( ! class_exists( $module_class ) ) {
-			$msg = sprintf( __( 'The requested %s module class does not exist.', 'event_espresso' ), $module_class );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! class_exists($module_class)) {
+			$msg = sprintf(__('The requested %s module class does not exist.', 'event_espresso'), $module_class);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// add to array of registered modules
-		EE_Registry::instance()->modules->{$module_class} = $module_path . $module_class . $module_ext;
+		EE_Registry::instance()->modules->{$module_class} = $module_path.$module_class.$module_ext;
 		do_action(
 			'AHEE__EE_Config__register_module__complete',
 			$module_class,
@@ -1242,26 +1242,26 @@ 
 	 */
 	private function _initialize_shortcodes() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path ) {
+		foreach (EE_Registry::instance()->shortcodes as $shortcode => $shortcode_path) {
 			// add class prefix
-			$shortcode_class = 'EES_' . $shortcode;
+			$shortcode_class = 'EES_'.$shortcode;
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $shortcode_class, 'set_hooks_admin' ) );
+				call_user_func(array($shortcode_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
 				add_action(
 					'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons',
-					array( $shortcode_class, 'set_hooks' )
+					array($shortcode_class, 'set_hooks')
 				);
 				// convert classname to UPPERCASE and create WP shortcode.
-				$shortcode_tag = strtoupper( $shortcode );
+				$shortcode_tag = strtoupper($shortcode);
 				// but first check if the shortcode has already been added before assigning 'fallback_shortcode_processor'
-				if ( ! shortcode_exists( $shortcode_tag ) ) {
+				if ( ! shortcode_exists($shortcode_tag)) {
 					// NOTE: this shortcode declaration will get overridden if the shortcode is successfully detected in the post content in EE_Front_Controller->_initialize_shortcodes()
-					add_shortcode( $shortcode_tag, array( $shortcode_class, 'fallback_shortcode_processor' ) );
+					add_shortcode($shortcode_tag, array($shortcode_class, 'fallback_shortcode_processor'));
 				}
 			}
 		}
@@ -1278,17 +1278,17 @@ 
 	 */
 	private function _initialize_modules() {
 		// cycle thru shortcode folders
-		foreach ( EE_Registry::instance()->modules as $module_class => $module_path ) {
+		foreach (EE_Registry::instance()->modules as $module_class => $module_path) {
 			// fire the shortcode class's set_hooks methods in case it needs to hook into other parts of the system
 			// which set hooks ?
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// fire immediately
-				call_user_func( array( $module_class, 'set_hooks_admin' ) );
+				call_user_func(array($module_class, 'set_hooks_admin'));
 			} else {
 				// delay until other systems are online
 				add_action(
 					'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons',
-					array( $module_class, 'set_hooks' )
+					array($module_class, 'set_hooks')
 				);
 			}
 		}
@@ -1306,29 +1306,29 @@ 
 	 * @param    string $key         - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_route( $route = null, $module = null, $method_name = null, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_route__begin', $route, $module, $method_name );
-		$module = str_replace( 'EED_', '', $module );
-		$module_class = 'EED_' . $module;
-		if ( ! isset( EE_Registry::instance()->modules->{$module_class} ) ) {
-			$msg = sprintf( __( 'The module %s has not been registered.', 'event_espresso' ), $module );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+	public static function register_route($route = null, $module = null, $method_name = null, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_route__begin', $route, $module, $method_name);
+		$module = str_replace('EED_', '', $module);
+		$module_class = 'EED_'.$module;
+		if ( ! isset(EE_Registry::instance()->modules->{$module_class} )) {
+			$msg = sprintf(__('The module %s has not been registered.', 'event_espresso'), $module);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( empty( $route ) ) {
-			$msg = sprintf( __( 'No route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($route)) {
+			$msg = sprintf(__('No route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! method_exists( 'EED_' . $module, $method_name ) ) {
+		if ( ! method_exists('EED_'.$module, $method_name)) {
 			$msg = sprintf(
-				__( 'A valid class method for the %s route has not been supplied.', 'event_espresso' ),
+				__('A valid class method for the %s route has not been supplied.', 'event_espresso'),
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		EE_Config::$_module_route_map[ $key ][ $route ] = array( 'EED_' . $module, $method_name );
+		EE_Config::$_module_route_map[$key][$route] = array('EED_'.$module, $method_name);
 		return true;
 	}
 
@@ -1342,11 +1342,11 @@ 
 	 * @param    string $key   - url param key indicating a route is being called
 	 * @return    string
 	 */
-	public static function get_route( $route = null, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_route__begin', $route );
-		$route = (string) apply_filters( 'FHEE__EE_Config__get_route', $route );
-		if ( isset( EE_Config::$_module_route_map[ $key ][ $route ] ) ) {
-			return EE_Config::$_module_route_map[ $key ][ $route ];
+	public static function get_route($route = null, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_route__begin', $route);
+		$route = (string) apply_filters('FHEE__EE_Config__get_route', $route);
+		if (isset(EE_Config::$_module_route_map[$key][$route])) {
+			return EE_Config::$_module_route_map[$key][$route];
 		}
 		return null;
 	}
@@ -1376,49 +1376,49 @@ 
 	 * @param    string       $key     - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_forward( $route = null, $status = 0, $forward = null, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_forward', $route, $status, $forward );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) || empty( $route ) ) {
+	public static function register_forward($route = null, $status = 0, $forward = null, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_forward', $route, $status, $forward);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
 			$msg = sprintf(
-				__( 'The module route %s for this forward has not been registered.', 'event_espresso' ),
+				__('The module route %s for this forward has not been registered.', 'event_espresso'),
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( empty( $forward ) ) {
-			$msg = sprintf( __( 'No forwarding route has been supplied.', 'event_espresso' ), $route );
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($forward)) {
+			$msg = sprintf(__('No forwarding route has been supplied.', 'event_espresso'), $route);
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( is_array( $forward ) ) {
-			if ( ! isset( $forward[1] ) ) {
+		if (is_array($forward)) {
+			if ( ! isset($forward[1])) {
 				$msg = sprintf(
-					__( 'A class method for the %s forwarding route has not been supplied.', 'event_espresso' ),
+					__('A class method for the %s forwarding route has not been supplied.', 'event_espresso'),
 					$route
 				);
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
-			if ( ! method_exists( $forward[0], $forward[1] ) ) {
+			if ( ! method_exists($forward[0], $forward[1])) {
 				$msg = sprintf(
-					__( 'The class method %s for the %s forwarding route is in invalid.', 'event_espresso' ),
+					__('The class method %s for the %s forwarding route is in invalid.', 'event_espresso'),
 					$forward[1],
 					$route
 				);
-				EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
-		} else if ( ! function_exists( $forward ) ) {
+		} else if ( ! function_exists($forward)) {
 			$msg = sprintf(
-				__( 'The function %s for the %s forwarding route is in invalid.', 'event_espresso' ),
+				__('The function %s for the %s forwarding route is in invalid.', 'event_espresso'),
 				$forward,
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		EE_Config::$_module_forward_map[ $key ][ $route ][ absint( $status ) ] = $forward;
+		EE_Config::$_module_forward_map[$key][$route][absint($status)] = $forward;
 		return true;
 	}
 
@@ -1434,12 +1434,12 @@ 
 	 * @param    string  $key    - url param key indicating a route is being called
 	 * @return    string
 	 */
-	public static function get_forward( $route = null, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_forward__begin', $route, $status );
-		if ( isset( EE_Config::$_module_forward_map[ $key ][ $route ][ $status ] ) ) {
+	public static function get_forward($route = null, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_forward__begin', $route, $status);
+		if (isset(EE_Config::$_module_forward_map[$key][$route][$status])) {
 			return apply_filters(
 				'FHEE__EE_Config__get_forward',
-				EE_Config::$_module_forward_map[ $key ][ $route ][ $status ],
+				EE_Config::$_module_forward_map[$key][$route][$status],
 				$route,
 				$status
 			);
@@ -1461,17 +1461,17 @@ 
 	 * @param    string  $key    - url param key indicating a route is being called
 	 * @return    bool
 	 */
-	public static function register_view( $route = null, $status = 0, $view = null, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__register_view__begin', $route, $status, $view );
-		if ( ! isset( EE_Config::$_module_route_map[ $key ][ $route ] ) || empty( $route ) ) {
+	public static function register_view($route = null, $status = 0, $view = null, $key = 'ee') {
+		do_action('AHEE__EE_Config__register_view__begin', $route, $status, $view);
+		if ( ! isset(EE_Config::$_module_route_map[$key][$route]) || empty($route)) {
 			$msg = sprintf(
-				__( 'The module route %s for this view has not been registered.', 'event_espresso' ),
+				__('The module route %s for this view has not been registered.', 'event_espresso'),
 				$route
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! is_readable( $view ) ) {
+		if ( ! is_readable($view)) {
 			$msg = sprintf(
 				__(
 					'The %s view file could not be found or is not readable due to file permissions.',
@@ -1479,10 +1479,10 @@ 
 				),
 				$view
 			);
-			EE_Error::add_error( $msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		EE_Config::$_module_view_map[ $key ][ $route ][ absint( $status ) ] = $view;
+		EE_Config::$_module_view_map[$key][$route][absint($status)] = $view;
 		return true;
 	}
 
@@ -1498,12 +1498,12 @@ 
 	 * @param    string  $key    - url param key indicating a route is being called
 	 * @return    string
 	 */
-	public static function get_view( $route = null, $status = 0, $key = 'ee' ) {
-		do_action( 'AHEE__EE_Config__get_view__begin', $route, $status );
-		if ( isset( EE_Config::$_module_view_map[ $key ][ $route ][ $status ] ) ) {
+	public static function get_view($route = null, $status = 0, $key = 'ee') {
+		do_action('AHEE__EE_Config__get_view__begin', $route, $status);
+		if (isset(EE_Config::$_module_view_map[$key][$route][$status])) {
 			return apply_filters(
 				'FHEE__EE_Config__get_view',
-				EE_Config::$_module_view_map[ $key ][ $route ][ $status ],
+				EE_Config::$_module_view_map[$key][$route][$status],
 				$route,
 				$status
 			);
@@ -1514,7 +1514,7 @@ 
 
 
 	public function update_addon_option_names() {
-		update_option( EE_Config::ADDON_OPTION_NAMES, $this->_addon_option_names );
+		update_option(EE_Config::ADDON_OPTION_NAMES, $this->_addon_option_names);
 	}
 
 
@@ -1537,22 +1537,22 @@ 
 	 * @return mixed if a detected type found return the escaped value, otherwise just the raw value is returned.
 	 * @throws \EE_Error
 	 */
-	public function get_pretty( $property ) {
-		if ( ! property_exists( $this, $property ) ) {
+	public function get_pretty($property) {
+		if ( ! property_exists($this, $property)) {
 			throw new EE_Error(
 				sprintf(
 					__(
 						'%1$s::get_pretty() has been called with the property %2$s which does not exist on the %1$s config class.',
 						'event_espresso'
 					),
-					get_class( $this ),
+					get_class($this),
 					$property
 				)
 			);
 		}
 		//just handling escaping of strings for now.
-		if ( is_string( $this->{$property} ) ) {
-			return stripslashes( $this->{$property} );
+		if (is_string($this->{$property} )) {
+			return stripslashes($this->{$property} );
 		}
 		return $this->{$property};
 	}
@@ -1561,17 +1561,17 @@ 
 
 	public function populate() {
 		//grab defaults via a new instance of this class.
-		$class_name = get_class( $this );
+		$class_name = get_class($this);
 		$defaults = new $class_name;
 		//loop through the properties for this class and see if they are set.  If they are NOT, then grab the
 		//default from our $defaults object.
-		foreach ( get_object_vars( $defaults ) as $property => $value ) {
-			if ( $this->{$property} === null ) {
+		foreach (get_object_vars($defaults) as $property => $value) {
+			if ($this->{$property} === null) {
 				$this->{$property} = $value;
 			}
 		}
 		//cleanup
-		unset( $defaults );
+		unset($defaults);
 	}
 
 
@@ -1587,7 +1587,7 @@ 
 	 * @param $a
 	 * @return bool
 	 */
-	public function __isset( $a ) {
+	public function __isset($a) {
 		return false;
 	}
 
@@ -1599,7 +1599,7 @@ 
 	 * @param $a
 	 * @return bool
 	 */
-	public function __unset( $a ) {
+	public function __unset($a) {
 		return false;
 	}
 
@@ -1698,18 +1698,18 @@ 
 	 */
 	public function __construct() {
 		$current_network_main_site = is_multisite() ? get_current_site() : null;
-		$current_main_site_id = ! empty( $current_network_main_site ) ? $current_network_main_site->blog_id : 1;
+		$current_main_site_id = ! empty($current_network_main_site) ? $current_network_main_site->blog_id : 1;
 		// set default organization settings
 		$this->current_blog_id = get_current_blog_id();
 		$this->current_blog_id = $this->current_blog_id === null ? 1 : $this->current_blog_id;
 		$this->ee_ueip_optin = is_main_site()
-			? get_option( 'ee_ueip_optin', true )
+			? get_option('ee_ueip_optin', true)
 			: get_blog_option(
 				$current_main_site_id,
 				'ee_ueip_optin',
 				true
 			);
-		$this->ee_ueip_has_notified = is_main_site() ? get_option( 'ee_ueip_has_notified', false ) : true;
+		$this->ee_ueip_has_notified = is_main_site() ? get_option('ee_ueip_has_notified', false) : true;
 		$this->post_shortcodes = array();
 		$this->module_route_map = array();
 		$this->module_forward_map = array();
@@ -1725,9 +1725,9 @@ 
 		$this->thank_you_page_url = '';
 		$this->cancel_page_url = '';
 		//cpt slugs
-		$this->event_cpt_slug = __( 'events', 'event_espresso' );
+		$this->event_cpt_slug = __('events', 'event_espresso');
 		//ueip constant check
-		if ( defined( 'EE_DISABLE_UXIP' ) && EE_DISABLE_UXIP ) {
+		if (defined('EE_DISABLE_UXIP') && EE_DISABLE_UXIP) {
 			$this->ee_ueip_optin = false;
 			$this->ee_ueip_has_notified = true;
 		}
@@ -1770,8 +1770,8 @@ 
 	 * @return    string
 	 */
 	public function reg_page_url() {
-		if ( ! $this->reg_page_url ) {
-			$this->reg_page_url = get_permalink( $this->reg_page_id ) . '#checkout';
+		if ( ! $this->reg_page_url) {
+			$this->reg_page_url = get_permalink($this->reg_page_id).'#checkout';
 		}
 		return $this->reg_page_url;
 	}
@@ -1786,12 +1786,12 @@ 
 	 * @access    public
 	 * @return    string
 	 */
-	public function txn_page_url( $query_args = array() ) {
-		if ( ! $this->txn_page_url ) {
-			$this->txn_page_url = get_permalink( $this->txn_page_id );
+	public function txn_page_url($query_args = array()) {
+		if ( ! $this->txn_page_url) {
+			$this->txn_page_url = get_permalink($this->txn_page_id);
 		}
-		if ( $query_args ) {
-			return add_query_arg( $query_args, $this->txn_page_url );
+		if ($query_args) {
+			return add_query_arg($query_args, $this->txn_page_url);
 		} else {
 			return $this->txn_page_url;
 		}
@@ -1807,12 +1807,12 @@ 
 	 * @access    public
 	 * @return    string
 	 */
-	public function thank_you_page_url( $query_args = array() ) {
-		if ( ! $this->thank_you_page_url ) {
-			$this->thank_you_page_url = get_permalink( $this->thank_you_page_id );
+	public function thank_you_page_url($query_args = array()) {
+		if ( ! $this->thank_you_page_url) {
+			$this->thank_you_page_url = get_permalink($this->thank_you_page_id);
 		}
-		if ( $query_args ) {
-			return add_query_arg( $query_args, $this->thank_you_page_url );
+		if ($query_args) {
+			return add_query_arg($query_args, $this->thank_you_page_url);
 		} else {
 			return $this->thank_you_page_url;
 		}
@@ -1827,8 +1827,8 @@ 
 	 * @return    string
 	 */
 	public function cancel_page_url() {
-		if ( ! $this->cancel_page_url ) {
-			$this->cancel_page_url = get_permalink( $this->cancel_page_id );
+		if ( ! $this->cancel_page_url) {
+			$this->cancel_page_url = get_permalink($this->cancel_page_id);
 		}
 		return $this->cancel_page_url;
 	}
@@ -1859,7 +1859,7 @@ 
 		//reset all url properties
 		$this->_reset_urls();
 		//return what to save to db
-		return array_keys( get_object_vars( $this ) );
+		return array_keys(get_object_vars($this));
 	}
 
 }
@@ -2007,14 +2007,14 @@ 
 	 */
 	public function __construct() {
 		// set default organization settings
-		$this->name = get_bloginfo( 'name' );
+		$this->name = get_bloginfo('name');
 		$this->address_1 = '123 Onna Road';
 		$this->address_2 = 'PO Box 123';
 		$this->city = 'Inna City';
 		$this->STA_ID = 4;
 		$this->CNT_ISO = 'US';
 		$this->zip = '12345';
-		$this->email = get_bloginfo( 'admin_email' );
+		$this->email = get_bloginfo('admin_email');
 		$this->phone = '';
 		$this->vat = '123456789';
 		$this->logo_url = '';
@@ -2102,45 +2102,45 @@ 
 	 * @param string $CNT_ISO
 	 * @return \EE_Currency_Config
 	 */
-	public function __construct( $CNT_ISO = '' ) {
+	public function __construct($CNT_ISO = '') {
 		// get country code from organization settings or use default
-		$ORG_CNT = isset( EE_Registry::instance()->CFG->organization )
+		$ORG_CNT = isset(EE_Registry::instance()->CFG->organization)
 		           && EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config
 			? EE_Registry::instance()->CFG->organization->CNT_ISO
 			: '';
 		// but override if requested
-		$CNT_ISO = ! empty( $CNT_ISO ) ? $CNT_ISO : $ORG_CNT;
-		EE_Registry::instance()->load_helper( 'Activation' );
+		$CNT_ISO = ! empty($CNT_ISO) ? $CNT_ISO : $ORG_CNT;
+		EE_Registry::instance()->load_helper('Activation');
 		// so if that all went well, and we are not in M-Mode (cuz you can't query the db in M-Mode) and double-check the countries table exists
 		if (
-			! empty( $CNT_ISO )
+			! empty($CNT_ISO)
 			&& EE_Maintenance_Mode::instance()->models_can_query()
-			&& EEH_Activation::table_exists( EE_Registry::instance()->load_model( 'Country' )->table() )
+			&& EEH_Activation::table_exists(EE_Registry::instance()->load_model('Country')->table())
 		) {
 			// retrieve the country settings from the db, just in case they have been customized
-			$country = EE_Registry::instance()->load_model( 'Country' )->get_one_by_ID( $CNT_ISO );
-			if ( $country instanceof EE_Country ) {
-				$this->code = $country->currency_code();    // currency code: USD, CAD, EUR
-				$this->name = $country->currency_name_single();    // Dollar
-				$this->plural = $country->currency_name_plural();    // Dollars
-				$this->sign = $country->currency_sign();            // currency sign: $
-				$this->sign_b4 = $country->currency_sign_before();        // currency sign before or after: $TRUE  or  FALSE$
-				$this->dec_plc = $country->currency_decimal_places();    // decimal places: 2 = 0.00  3 = 0.000
-				$this->dec_mrk = $country->currency_decimal_mark();    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-				$this->thsnds = $country->currency_thousands_separator();    // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$country = EE_Registry::instance()->load_model('Country')->get_one_by_ID($CNT_ISO);
+			if ($country instanceof EE_Country) {
+				$this->code = $country->currency_code(); // currency code: USD, CAD, EUR
+				$this->name = $country->currency_name_single(); // Dollar
+				$this->plural = $country->currency_name_plural(); // Dollars
+				$this->sign = $country->currency_sign(); // currency sign: $
+				$this->sign_b4 = $country->currency_sign_before(); // currency sign before or after: $TRUE  or  FALSE$
+				$this->dec_plc = $country->currency_decimal_places(); // decimal places: 2 = 0.00  3 = 0.000
+				$this->dec_mrk = $country->currency_decimal_mark(); // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+				$this->thsnds = $country->currency_thousands_separator(); // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 			}
 		}
 		// fallback to hardcoded defaults, in case the above failed
-		if ( empty( $this->code ) ) {
+		if (empty($this->code)) {
 			// set default currency settings
-			$this->code = 'USD';    // currency code: USD, CAD, EUR
-			$this->name = __( 'Dollar', 'event_espresso' );    // Dollar
-			$this->plural = __( 'Dollars', 'event_espresso' );    // Dollars
-			$this->sign = '$';    // currency sign: $
-			$this->sign_b4 = true;    // currency sign before or after: $TRUE  or  FALSE$
-			$this->dec_plc = 2;    // decimal places: 2 = 0.00  3 = 0.000
-			$this->dec_mrk = '.';    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-			$this->thsnds = ',';    // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+			$this->code = 'USD'; // currency code: USD, CAD, EUR
+			$this->name = __('Dollar', 'event_espresso'); // Dollar
+			$this->plural = __('Dollars', 'event_espresso'); // Dollars
+			$this->sign = '$'; // currency sign: $
+			$this->sign_b4 = true; // currency sign before or after: $TRUE  or  FALSE$
+			$this->dec_plc = 2; // decimal places: 2 = 0.00  3 = 0.000
+			$this->dec_mrk = '.'; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+			$this->thsnds = ','; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
 		}
 	}
 }
@@ -2303,7 +2303,7 @@ 
 	 * @since 4.8.8.rc.019
 	 */
 	public function do_hooks() {
-		add_action( 'AHEE__EE_Config___load_core_config__end', array( $this, 'set_default_reg_status_on_EEM_Event' ) );
+		add_action('AHEE__EE_Config___load_core_config__end', array($this, 'set_default_reg_status_on_EEM_Event'));
 	}
 
 
@@ -2312,7 +2312,7 @@ 
 	 * @return void
 	 */
 	public function set_default_reg_status_on_EEM_Event() {
-		EEM_Event::set_default_reg_status( $this->default_STS_ID );
+		EEM_Event::set_default_reg_status($this->default_STS_ID);
 	}
 
 
@@ -2417,10 +2417,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function log_file_name( $reset = false ) {
-		if ( empty( $this->log_file_name ) || $reset ) {
-			$this->log_file_name = sanitize_key( 'espresso_log_' . md5( uniqid( '', true ) ) ) . '.txt';
-			EE_Config::instance()->update_espresso_config( false, false );
+	public function log_file_name($reset = false) {
+		if (empty($this->log_file_name) || $reset) {
+			$this->log_file_name = sanitize_key('espresso_log_'.md5(uniqid('', true))).'.txt';
+			EE_Config::instance()->update_espresso_config(false, false);
 		}
 		return $this->log_file_name;
 	}
@@ -2431,10 +2431,10 @@ 
 	 * @param bool $reset
 	 * @return string
 	 */
-	public function debug_file_name( $reset = false ) {
-		if ( empty( $this->debug_file_name ) || $reset ) {
-			$this->debug_file_name = sanitize_key( 'espresso_debug_' . md5( uniqid( '', true ) ) ) . '.txt';
-			EE_Config::instance()->update_espresso_config( false, false );
+	public function debug_file_name($reset = false) {
+		if (empty($this->debug_file_name) || $reset) {
+			$this->debug_file_name = sanitize_key('espresso_debug_'.md5(uniqid('', true))).'.txt';
+			EE_Config::instance()->update_espresso_config(false, false);
 		}
 		return $this->debug_file_name;
 	}
@@ -2606,21 +2606,21 @@ 
 		// set default map settings
 		$this->use_google_maps = true;
 		// for event details pages (reg page)
-		$this->event_details_map_width = 585;            // ee_map_width_single
-		$this->event_details_map_height = 362;            // ee_map_height_single
-		$this->event_details_map_zoom = 14;            // ee_map_zoom_single
-		$this->event_details_display_nav = true;            // ee_map_nav_display_single
-		$this->event_details_nav_size = false;            // ee_map_nav_size_single
-		$this->event_details_control_type = 'default';        // ee_map_type_control_single
-		$this->event_details_map_align = 'center';            // ee_map_align_single
+		$this->event_details_map_width = 585; // ee_map_width_single
+		$this->event_details_map_height = 362; // ee_map_height_single
+		$this->event_details_map_zoom = 14; // ee_map_zoom_single
+		$this->event_details_display_nav = true; // ee_map_nav_display_single
+		$this->event_details_nav_size = false; // ee_map_nav_size_single
+		$this->event_details_control_type = 'default'; // ee_map_type_control_single
+		$this->event_details_map_align = 'center'; // ee_map_align_single
 		// for event list pages
-		$this->event_list_map_width = 300;            // ee_map_width
-		$this->event_list_map_height = 185;        // ee_map_height
-		$this->event_list_map_zoom = 12;            // ee_map_zoom
-		$this->event_list_display_nav = false;        // ee_map_nav_display
-		$this->event_list_nav_size = true;            // ee_map_nav_size
-		$this->event_list_control_type = 'dropdown';        // ee_map_type_control
-		$this->event_list_map_align = 'center';            // ee_map_align
+		$this->event_list_map_width = 300; // ee_map_width
+		$this->event_list_map_height = 185; // ee_map_height
+		$this->event_list_map_zoom = 12; // ee_map_zoom
+		$this->event_list_display_nav = false; // ee_map_nav_display
+		$this->event_list_nav_size = true; // ee_map_nav_size
+		$this->event_list_control_type = 'dropdown'; // ee_map_type_control
+		$this->event_list_map_align = 'center'; // ee_map_align
 	}
 
 }
@@ -2773,7 +2773,7 @@ 
 	 * @return void
 	 */
 	protected function _set_php_values() {
-		$this->php->max_input_vars = ini_get( 'max_input_vars' );
+		$this->php->max_input_vars = ini_get('max_input_vars');
 		$this->php->version = phpversion();
 	}
 
@@ -2792,10 +2792,10 @@ 
 	 * @type string $msg         Any message to be displayed.
 	 *                           }
 	 */
-	public function max_input_vars_limit_check( $input_count = 0 ) {
-		if ( ! empty( $this->php->max_input_vars )
-		     && ( $input_count >= $this->php->max_input_vars )
-		     && ( PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >= 9 )
+	public function max_input_vars_limit_check($input_count = 0) {
+		if ( ! empty($this->php->max_input_vars)
+		     && ($input_count >= $this->php->max_input_vars)
+		     && (PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3 && PHP_RELEASE_VERSION >= 9)
 		) {
 			return sprintf(
 				__(
@@ -2861,7 +2861,7 @@ 
 	 */
 	public function __construct() {
 		$this->payment_settings = array();
-		$this->active_gateways = array( 'Invoice' => false );
+		$this->active_gateways = array('Invoice' => false);
 	}
 }