eventespresso / event-espresso-core

core/helpers/EEH_Activation.helper.php

Indentation +31 added lines, -31 removed lines

@@ -1,26 +1,26 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for WordPress
- *
- * @ package			Event Espresso
- * @ author			Seth Shoultes
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
- * @ link					http://www.eventespresso.com
- * @ version		 	4.0
- *
- * ------------------------------------------------------------------------
- *
- * EEH_Activation Helper
- *
- * @package			Event Espresso
- * @subpackage	/helpers/
- * @author				Brent Christensen
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for WordPress
+	 *
+	 * @ package			Event Espresso
+	 * @ author			Seth Shoultes
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
+	 * @ link					http://www.eventespresso.com
+	 * @ version		 	4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * EEH_Activation Helper
+	 *
+	 * @package			Event Espresso
+	 * @subpackage	/helpers/
+	 * @author				Brent Christensen
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class EEH_Activation {
 
 	/**
@@ -1085,14 +1085,14 @@ 
 							$QSG_ID = reset( $id_col );
 						} else {
 							//ok so we didn't find it in the db either?? that's weird because we should have inserted it at the start of this method
-                                                        EE_Log::instance()->log( 
-                                                                __FILE__, 
-                                                                __FUNCTION__, 
-                                                                sprintf( 
-                                                                        __( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'), 
-                                                                        $QST_ID ), 
-                                                                'error' );
-                                                        continue;
+														EE_Log::instance()->log( 
+																__FILE__, 
+																__FUNCTION__, 
+																sprintf( 
+																		__( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'), 
+																		$QST_ID ), 
+																'error' );
+														continue;
 						}
 					}
                                         
@@ -1605,8 +1605,8 @@ 
 				}
 			}
 		}
-                //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
-                remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
+				//also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
+				remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
 
 		if ( $remove_all && $espresso_db_update = get_option( 'espresso_db_update' )) {
 			$db_update_sans_ee4 = array();

Spacing +367 added lines, -367 removed lines

@@ -57,9 +57,9 @@ 
 	 * @param $table_name
 	 * @return string
 	 */
-	public static function ensure_table_name_has_prefix( $table_name ) {
+	public static function ensure_table_name_has_prefix($table_name) {
 		global $wpdb;
-		return strpos( $table_name, $wpdb->prefix ) === 0 ? $table_name : $wpdb->prefix . $table_name;
+		return strpos($table_name, $wpdb->prefix) === 0 ? $table_name : $wpdb->prefix.$table_name;
 	}
 
 
@@ -85,7 +85,7 @@ 
 	 * be called on plugin activation and reactivation
 	 * @return boolean success, whether the database and folders are setup properly
 	 */
-	public static function initialize_db_and_folders(){
+	public static function initialize_db_and_folders() {
 		$good_filesystem = EEH_Activation::create_upload_directories();
 		$good_db = EEH_Activation::create_database_tables();
 		return $good_filesystem && $good_db;
@@ -99,9 +99,9 @@ 
 	 * upon activation of a new plugin, reactivation, and at the end
 	 * of running migration scripts
 	 */
-	public static function initialize_db_content(){
+	public static function initialize_db_content() {
 		//let's avoid doing all this logic repeatedly, especially when addons are requesting it
-		if( EEH_Activation::$_initialized_db_content_already_in_this_request ) {
+		if (EEH_Activation::$_initialized_db_content_already_in_this_request) {
 			return;
 		}
 		EEH_Activation::$_initialized_db_content_already_in_this_request = true;
@@ -118,7 +118,7 @@ 
 		EEH_Activation::remove_cron_tasks();
 		EEH_Activation::create_cron_tasks();
 		//also, check for CAF default db content
-		do_action( 'AHEE__EEH_Activation__initialize_db_content' );
+		do_action('AHEE__EEH_Activation__initialize_db_content');
 		//also: EEM_Gateways::load_all_gateways() outputs a lot of success messages
 		//which users really won't care about on initial activation
 		EE_Error::overwrite_success();
@@ -137,7 +137,7 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public static function get_cron_tasks( $which_to_include ) {
+	public static function get_cron_tasks($which_to_include) {
 		$cron_tasks = apply_filters(
 			'FHEE__EEH_Activation__get_cron_tasks',
 			array(
@@ -146,17 +146,17 @@ 
 				'AHEE__EE_Cron_Tasks__update_transaction_with_payment' => EEH_Activation::cron_task_no_longer_in_use, //there may have been a bug which prevented from these cron tasks from getting unscheduled, so we might want to remove these for a few updates
 			)
 		);
-		if( $which_to_include === 'all' ) {
+		if ($which_to_include === 'all') {
 			//leave as-is
-		}elseif( $which_to_include === 'old' ) {
-			$cron_tasks = array_filter( $cron_tasks, function ( $value ) {
+		}elseif ($which_to_include === 'old') {
+			$cron_tasks = array_filter($cron_tasks, function($value) {
 				return $value === EEH_Activation::cron_task_no_longer_in_use;
 			});
-		}elseif( $which_to_include === 'current' ) {
-			$cron_tasks = array_filter( $cron_tasks );
-		}elseif( WP_DEBUG ) {
-			throw new EE_Error( sprintf( __( 'Invalidate argument of "%1$s" passed to EEH_Activation::get_cron_tasks. Valid values are "all", "old" and "current".', 'event_espresso' ), $which_to_include ) );
-		}else{
+		}elseif ($which_to_include === 'current') {
+			$cron_tasks = array_filter($cron_tasks);
+		}elseif (WP_DEBUG) {
+			throw new EE_Error(sprintf(__('Invalidate argument of "%1$s" passed to EEH_Activation::get_cron_tasks. Valid values are "all", "old" and "current".', 'event_espresso'), $which_to_include));
+		} else {
 			//leave as-is
 		}
 		return $cron_tasks;
@@ -167,9 +167,9 @@ 
 	 */
 	public static function create_cron_tasks() {
 
-		foreach( EEH_Activation::get_cron_tasks( 'current' ) as $hook_name => $frequency ) {
-			if( ! wp_next_scheduled( $hook_name ) ) {
-				wp_schedule_event( time(), $frequency, $hook_name );
+		foreach (EEH_Activation::get_cron_tasks('current') as $hook_name => $frequency) {
+			if ( ! wp_next_scheduled($hook_name)) {
+				wp_schedule_event(time(), $frequency, $hook_name);
 			}
 		}
 
@@ -179,10 +179,10 @@ 
 	 * Remove the currently-existing and now-removed cron tasks.
 	 * @param boolean $remove_all whether to only remove the old ones, or remove absolutely ALL the EE ones
 	 */
-	public static function remove_cron_tasks( $remove_all = true ) {
+	public static function remove_cron_tasks($remove_all = true) {
 		$cron_tasks_to_remove = $remove_all ? 'all' : 'old';
 		$crons = _get_cron_array();
-		$crons = is_array( $crons ) ? $crons : array();
+		$crons = is_array($crons) ? $crons : array();
 		/* reminder that $crons looks like: top-level keys are timestamps,
 		 * and their values are arrays.
 		 * The 2nd level arrays have keys with each of the cron task hooknames to run at that time
@@ -200,14 +200,14 @@ 
 		 *					...
 		 *      ...
 		 */
-		foreach( EEH_Activation::get_cron_tasks( $cron_tasks_to_remove ) as $hook_name => $frequency ) {
-			foreach( $crons as $timestamp => $hooks_to_fire_at_time ) {
-				if ( array_key_exists( $hook_name, $hooks_to_fire_at_time ) )  {
-					unset( $crons[ $timestamp ][ $hook_name ] );
+		foreach (EEH_Activation::get_cron_tasks($cron_tasks_to_remove) as $hook_name => $frequency) {
+			foreach ($crons as $timestamp => $hooks_to_fire_at_time) {
+				if (array_key_exists($hook_name, $hooks_to_fire_at_time)) {
+					unset($crons[$timestamp][$hook_name]);
 				}
 			}
 		}
-		_set_cron_array( $crons );
+		_set_cron_array($crons);
 	}
 
 
@@ -222,7 +222,7 @@ 
 	 */
 	public static function CPT_initialization() {
 		// register Custom Post Types
-		EE_Registry::instance()->load_core( 'Register_CPTs' );
+		EE_Registry::instance()->load_core('Register_CPTs');
 		flush_rewrite_rules();
 	}
 
@@ -240,8 +240,8 @@ 
 	 * 	@return void
 	 */
 	public static function reset_and_update_config() {
-		do_action( 'AHEE__EE_Config___load_core_config__start', array( 'EEH_Activation', 'load_calendar_config' ) );
-		add_filter( 'FHEE__EE_Config___load_core_config__config_settings', array( 'EEH_Activation', 'migrate_old_config_data' ), 10, 3 );
+		do_action('AHEE__EE_Config___load_core_config__start', array('EEH_Activation', 'load_calendar_config'));
+		add_filter('FHEE__EE_Config___load_core_config__config_settings', array('EEH_Activation', 'migrate_old_config_data'), 10, 3);
 		//EE_Config::reset();
 	}
 
@@ -254,23 +254,23 @@ 
 	 */
 	public static function load_calendar_config() {
 		// grab array of all plugin folders and loop thru it
-		$plugins = glob( WP_PLUGIN_DIR . DS . '*', GLOB_ONLYDIR );
-		if ( empty( $plugins ) ) {
+		$plugins = glob(WP_PLUGIN_DIR.DS.'*', GLOB_ONLYDIR);
+		if (empty($plugins)) {
 			return;
 		}
-		foreach ( $plugins as $plugin_path ) {
+		foreach ($plugins as $plugin_path) {
 			// grab plugin folder name from path
-			$plugin = basename( $plugin_path );
+			$plugin = basename($plugin_path);
 			// drill down to Espresso plugins
-			if ( strpos( $plugin, 'espresso' ) !== FALSE || strpos( $plugin, 'Espresso' ) !== FALSE || strpos( $plugin, 'ee4' ) !== FALSE || strpos( $plugin, 'EE4' ) !== FALSE ) {
+			if (strpos($plugin, 'espresso') !== FALSE || strpos($plugin, 'Espresso') !== FALSE || strpos($plugin, 'ee4') !== FALSE || strpos($plugin, 'EE4') !== FALSE) {
 				// then to calendar related plugins
-				if ( strpos( $plugin, 'calendar' ) !== FALSE ) {
+				if (strpos($plugin, 'calendar') !== FALSE) {
 					// this is what we are looking for
-					$calendar_config = $plugin_path . DS . 'EE_Calendar_Config.php';
+					$calendar_config = $plugin_path.DS.'EE_Calendar_Config.php';
 					// does it exist in this folder ?
-					if ( is_readable( $calendar_config )) {
+					if (is_readable($calendar_config)) {
 						// YEAH! let's load it
-						require_once( $calendar_config );
+						require_once($calendar_config);
 					}
 				}
 			}
@@ -287,21 +287,21 @@ 
 	 * @param \EE_Config $EE_Config
 	 * @return \stdClass
 	 */
-	public static function migrate_old_config_data( $settings = array(), $config = '', EE_Config $EE_Config ) {
-		$convert_from_array = array( 'addons' );
+	public static function migrate_old_config_data($settings = array(), $config = '', EE_Config $EE_Config) {
+		$convert_from_array = array('addons');
 		// in case old settings were saved as an array
-		if ( is_array( $settings ) && in_array( $config, $convert_from_array )) {
+		if (is_array($settings) && in_array($config, $convert_from_array)) {
 			// convert existing settings to an object
 			$config_array = $settings;
 			$settings = new stdClass();
-			foreach ( $config_array as $key => $value ){
-				if ( $key == 'calendar' && class_exists( 'EE_Calendar_Config' )) {
-					$EE_Config->set_config( 'addons', 'EE_Calendar', 'EE_Calendar_Config', $value );
+			foreach ($config_array as $key => $value) {
+				if ($key == 'calendar' && class_exists('EE_Calendar_Config')) {
+					$EE_Config->set_config('addons', 'EE_Calendar', 'EE_Calendar_Config', $value);
 				} else {
 					$settings->$key = $value;
 				}
 			}
-			add_filter( 'FHEE__EE_Config___load_core_config__update_espresso_config', '__return_true' );
+			add_filter('FHEE__EE_Config___load_core_config__update_espresso_config', '__return_true');
 		}
 		return $settings;
 	}
@@ -317,8 +317,8 @@ 
 	 */
 	public static function deactivate_event_espresso() {
 		// check permissions
-		if ( current_user_can( 'activate_plugins' )) {
-			deactivate_plugins( EE_PLUGIN_BASENAME, TRUE );
+		if (current_user_can('activate_plugins')) {
+			deactivate_plugins(EE_PLUGIN_BASENAME, TRUE);
 		}
 	}
 
@@ -340,79 +340,79 @@ 
 		$critical_pages = array(
 			array(
 				'id' =>'reg_page_id',
-				'name' => __( 'Registration Checkout', 'event_espresso' ),
+				'name' => __('Registration Checkout', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_CHECKOUT'
 			),
 			array(
 				'id' => 'txn_page_id',
-				'name' => __( 'Transactions', 'event_espresso' ),
+				'name' => __('Transactions', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_TXN_PAGE'
 			),
 			array(
 				'id' => 'thank_you_page_id',
-				'name' => __( 'Thank You', 'event_espresso' ),
+				'name' => __('Thank You', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_THANK_YOU'
 			),
 			array(
 				'id' => 'cancel_page_id',
-				'name' => __( 'Registration Cancelled', 'event_espresso' ),
+				'name' => __('Registration Cancelled', 'event_espresso'),
 				'post' => NULL,
 				'code' => 'ESPRESSO_CANCELLED'
 			),
 		);
 
-		foreach ( $critical_pages as $critical_page ) {
+		foreach ($critical_pages as $critical_page) {
 			// is critical page ID set in config ?
-			if ( EE_Registry::instance()->CFG->core->$critical_page['id'] !== FALSE ) {
+			if (EE_Registry::instance()->CFG->core->$critical_page['id'] !== FALSE) {
 				// attempt to find post by ID
-				$critical_page['post'] = get_post( EE_Registry::instance()->CFG->core->$critical_page['id'] );
+				$critical_page['post'] = get_post(EE_Registry::instance()->CFG->core->$critical_page['id']);
 			}
 			// no dice?
-			if ( $critical_page['post'] == NULL ) {
+			if ($critical_page['post'] == NULL) {
 				// attempt to find post by title
-				$critical_page['post'] = self::get_page_by_ee_shortcode( $critical_page['code'] );
+				$critical_page['post'] = self::get_page_by_ee_shortcode($critical_page['code']);
 				// still nothing?
-				if ( $critical_page['post'] == NULL ) {
-					$critical_page = EEH_Activation::create_critical_page( $critical_page );
+				if ($critical_page['post'] == NULL) {
+					$critical_page = EEH_Activation::create_critical_page($critical_page);
 					// REALLY? Still nothing ??!?!?
-					if ( $critical_page['post'] == NULL ) {
-						$msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' );
-						EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					if ($critical_page['post'] == NULL) {
+						$msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso');
+						EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 						break;
 					}
 				}
 			}
 			// track post_shortcodes
-			if ( $critical_page['post'] ) {
-				EEH_Activation::_track_critical_page_post_shortcodes( $critical_page );
+			if ($critical_page['post']) {
+				EEH_Activation::_track_critical_page_post_shortcodes($critical_page);
 			}
 			// check that Post ID matches critical page ID in config
-			if ( isset( $critical_page['post']->ID ) && $critical_page['post']->ID != EE_Registry::instance()->CFG->core->$critical_page['id'] ) {
+			if (isset($critical_page['post']->ID) && $critical_page['post']->ID != EE_Registry::instance()->CFG->core->$critical_page['id']) {
 				//update Config with post ID
 				EE_Registry::instance()->CFG->core->$critical_page['id'] = $critical_page['post']->ID;
-				if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE ) ) {
-					$msg = __( 'The Event Espresso critical page configuration settings could not be updated.', 'event_espresso' );
-					EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) {
+					$msg = __('The Event Espresso critical page configuration settings could not be updated.', 'event_espresso');
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 
-			$critical_page_problem =  ! isset( $critical_page['post']->post_status ) || $critical_page['post']->post_status != 'publish' || strpos( $critical_page['post']->post_content, $critical_page['code'] ) === FALSE ? TRUE : $critical_page_problem;
+			$critical_page_problem = ! isset($critical_page['post']->post_status) || $critical_page['post']->post_status != 'publish' || strpos($critical_page['post']->post_content, $critical_page['code']) === FALSE ? TRUE : $critical_page_problem;
 
 		}
 
-		if ( $critical_page_problem ) {
+		if ($critical_page_problem) {
 			$msg = sprintf(
-				__('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso' ),
-				'<a href="' . admin_url('admin.php?page=espresso_general_settings&action=critical_pages') . '">' . __('Event Espresso Critical Pages Settings', 'event_espresso') . '</a>'
+				__('A potential issue has been detected with one or more of your Event Espresso pages. Go to %s to view your Event Espresso pages.', 'event_espresso'),
+				'<a href="'.admin_url('admin.php?page=espresso_general_settings&action=critical_pages').'">'.__('Event Espresso Critical Pages Settings', 'event_espresso').'</a>'
 			);
-			EE_Error::add_persistent_admin_notice( 'critical_page_problem', $msg );
+			EE_Error::add_persistent_admin_notice('critical_page_problem', $msg);
 		}
 
-		if ( EE_Error::has_notices() ) {
-			EE_Error::get_notices( FALSE, TRUE, TRUE );
+		if (EE_Error::has_notices()) {
+			EE_Error::get_notices(FALSE, TRUE, TRUE);
 		}
 
 	}
@@ -425,13 +425,13 @@ 
 	 * parameter to the shortcode
 	 * @return WP_Post or NULl
 	 */
-	public static function get_page_by_ee_shortcode($ee_shortcode){
+	public static function get_page_by_ee_shortcode($ee_shortcode) {
 		global $wpdb;
 		$shortcode_and_opening_bracket = '['.$ee_shortcode;
 		$post_id = $wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE '%$shortcode_and_opening_bracket%' LIMIT 1");
-		if($post_id){
+		if ($post_id) {
 			return get_post($post_id);
-		}else{
+		} else {
 			return NULL;
 		}
 
@@ -448,32 +448,32 @@ 
 	 * @param array $critical_page
 	 * @return array
 	 */
-	public static function create_critical_page( $critical_page ) {
+	public static function create_critical_page($critical_page) {
 
 		$post_args = array(
 			'post_title' => $critical_page['name'],
 			'post_status' => 'publish',
 			'post_type' => 'page',
 			'comment_status' => 'closed',
-			'post_content' => '[' . $critical_page['code'] . ']'
+			'post_content' => '['.$critical_page['code'].']'
 		);
 
-		$post_id = wp_insert_post( $post_args );
-		if ( ! $post_id ) {
+		$post_id = wp_insert_post($post_args);
+		if ( ! $post_id) {
 			$msg = sprintf(
-				__( 'The Event Espresso  critical page entitled "%s" could not be created.', 'event_espresso' ),
+				__('The Event Espresso  critical page entitled "%s" could not be created.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return $critical_page;
 		}
 		// get newly created post's details
-		if ( ! $critical_page['post'] = get_post( $post_id )) {
+		if ( ! $critical_page['post'] = get_post($post_id)) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso' ),
+				__('The Event Espresso critical page entitled "%s" could not be retrieved.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 
 		return $critical_page;
@@ -492,34 +492,34 @@ 
 	 * @param array $critical_page
 	 * @return void
 	 */
-	private static function _track_critical_page_post_shortcodes( $critical_page = array() ) {
+	private static function _track_critical_page_post_shortcodes($critical_page = array()) {
 		// check the goods
-		if ( ! $critical_page['post'] instanceof WP_Post ) {
+		if ( ! $critical_page['post'] instanceof WP_Post) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso' ),
+				__('The Event Espresso critical page shortcode for the page %s can not be tracked because it is not a WP_Post object.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return;
 		}
 		// map shortcode to post
-		EE_Registry::instance()->CFG->core->post_shortcodes[ $critical_page['post']->post_name ][ $critical_page['code'] ] = $critical_page['post']->ID;
+		EE_Registry::instance()->CFG->core->post_shortcodes[$critical_page['post']->post_name][$critical_page['code']] = $critical_page['post']->ID;
 		// and make sure it's NOT added to the WP "Posts Page"
 		// name of the WP Posts Page
 		$posts_page = EE_Registry::instance()->CFG->get_page_for_posts();
-		if ( isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $posts_page ] )) {
-			unset( EE_Registry::instance()->CFG->core->post_shortcodes[ $posts_page ][ $critical_page['code'] ] );
+		if (isset(EE_Registry::instance()->CFG->core->post_shortcodes[$posts_page])) {
+			unset(EE_Registry::instance()->CFG->core->post_shortcodes[$posts_page][$critical_page['code']]);
 		}
-		if ( $posts_page != 'posts' && isset( EE_Registry::instance()->CFG->core->post_shortcodes['posts'] )) {
-			unset( EE_Registry::instance()->CFG->core->post_shortcodes['posts'][ $critical_page['code'] ] );
+		if ($posts_page != 'posts' && isset(EE_Registry::instance()->CFG->core->post_shortcodes['posts'])) {
+			unset(EE_Registry::instance()->CFG->core->post_shortcodes['posts'][$critical_page['code']]);
 		}
 		// update post_shortcode CFG
-		if ( ! EE_Config::instance()->update_espresso_config( FALSE, FALSE )) {
+		if ( ! EE_Config::instance()->update_espresso_config(FALSE, FALSE)) {
 			$msg = sprintf(
-				__( 'The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso' ),
+				__('The Event Espresso critical page shortcode for the %s page could not be configured properly.', 'event_espresso'),
 				$critical_page['name']
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -537,24 +537,24 @@ 
 	public static function get_default_creator_id() {
 		global $wpdb;
 
-		if ( ! empty( self::$_default_creator_id ) ) {
+		if ( ! empty(self::$_default_creator_id)) {
 			return self::$_default_creator_id;
 		}/**/
 
-		$role_to_check = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator' );
+		$role_to_check = apply_filters('FHEE__EEH_Activation__get_default_creator_id__role_to_check', 'administrator');
 
 		//let's allow pre_filtering for early exits by alternative methods for getting id.  We check for truthy result and if so then exit early.
-		$pre_filtered_id = apply_filters( 'FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check );
-		if ( $pre_filtered_id !== false ) {
+		$pre_filtered_id = apply_filters('FHEE__EEH_Activation__get_default_creator_id__pre_filtered_id', false, $role_to_check);
+		if ($pre_filtered_id !== false) {
 			return (int) $pre_filtered_id;
 		}
 
-		$capabilities_key = EEH_Activation::ensure_table_name_has_prefix( 'capabilities' );
-		$query = $wpdb->prepare( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%' . $role_to_check . '%' );
-		$user_id = $wpdb->get_var( $query );
-		 $user_id = apply_filters( 'FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id );
-		 if ( $user_id && intval( $user_id ) ) {
-		 	self::$_default_creator_id =  intval( $user_id );
+		$capabilities_key = EEH_Activation::ensure_table_name_has_prefix('capabilities');
+		$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '$capabilities_key' AND meta_value LIKE %s ORDER BY user_id ASC LIMIT 0,1", '%'.$role_to_check.'%');
+		$user_id = $wpdb->get_var($query);
+		 $user_id = apply_filters('FHEE__EEH_Activation_Helper__get_default_creator_id__user_id', $user_id);
+		 if ($user_id && intval($user_id)) {
+		 	self::$_default_creator_id = intval($user_id);
 		 	return self::$_default_creator_id;
 		 } else {
 		 	return NULL;
@@ -581,29 +581,29 @@ 
 	 * 	@return void
 	 * @throws EE_Error if there are database errors
 	 */
-	public static function create_table( $table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_pre_existing_table = false ) {
-		if( apply_filters( 'FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql ) ){
+	public static function create_table($table_name, $sql, $engine = 'ENGINE=MyISAM ', $drop_pre_existing_table = false) {
+		if (apply_filters('FHEE__EEH_Activation__create_table__short_circuit', FALSE, $table_name, $sql)) {
 			return;
 		}
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		if ( ! function_exists( 'dbDelta' )) {
-			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if ( ! function_exists('dbDelta')) {
+			require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 		}
 		/** @var WPDB $wpdb */
 		global $wpdb;
-		$wp_table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$wp_table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		// do we need to first delete an existing version of this table ?
-		if ( $drop_pre_existing_table && EEH_Activation::table_exists( $wp_table_name ) ){
+		if ($drop_pre_existing_table && EEH_Activation::table_exists($wp_table_name)) {
 			// ok, delete the table... but ONLY if it's empty
-			$deleted_safely = EEH_Activation::delete_db_table_if_empty( $wp_table_name );
+			$deleted_safely = EEH_Activation::delete_db_table_if_empty($wp_table_name);
 			// table is NOT empty, are you SURE you want to delete this table ???
-			if ( ! $deleted_safely && defined( 'EE_DROP_BAD_TABLES' ) && EE_DROP_BAD_TABLES ){
-				EEH_Activation::delete_unused_db_table( $wp_table_name );
-			} else if ( ! $deleted_safely ) {
+			if ( ! $deleted_safely && defined('EE_DROP_BAD_TABLES') && EE_DROP_BAD_TABLES) {
+				EEH_Activation::delete_unused_db_table($wp_table_name);
+			} else if ( ! $deleted_safely) {
 				// so we should be more cautious rather than just dropping tables so easily
 				EE_Error::add_persistent_admin_notice(
-						'bad_table_' . $wp_table_name . '_detected',
-						sprintf( __( 'Database table %1$s exists when it shouldn\'t, and may contain erroneous data. If you have previously restored your database from a backup that didn\'t remove the old tables, then we recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso' ),
+						'bad_table_'.$wp_table_name.'_detected',
+						sprintf(__('Database table %1$s exists when it shouldn\'t, and may contain erroneous data. If you have previously restored your database from a backup that didn\'t remove the old tables, then we recommend adding %2$s to your %3$s file then restore to that backup again. This will clear out the invalid data from %1$s. Afterwards you should undo that change from your %3$s file. %4$sIf you cannot edit %3$s, you should remove the data from %1$s manually then restore to the backup again.', 'event_espresso'),
 								$wp_table_name,
 								"<pre>define( 'EE_DROP_BAD_TABLES', TRUE );</pre>",
 								'<b>wp-config.php</b>',
@@ -612,25 +612,25 @@ 
 			}
 		}
 		// does $sql contain valid column information? ( LPT: https://regex101.com/ is great for working out regex patterns )
-		if ( preg_match( '((((.*?))(,\s))+)', $sql, $valid_column_data ) ) {
+		if (preg_match('((((.*?))(,\s))+)', $sql, $valid_column_data)) {
 			$SQL = "CREATE TABLE $wp_table_name ( $sql ) $engine DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;";
 			//get $wpdb to echo errors, but buffer them. This way at least WE know an error
 			//happened. And then we can choose to tell the end user
-			$old_show_errors_policy = $wpdb->show_errors( TRUE );
-			$old_error_suppression_policy = $wpdb->suppress_errors( FALSE );
+			$old_show_errors_policy = $wpdb->show_errors(TRUE);
+			$old_error_suppression_policy = $wpdb->suppress_errors(FALSE);
 			ob_start();
-			dbDelta( $SQL );
+			dbDelta($SQL);
 			$output = ob_get_contents();
 			ob_end_clean();
-			$wpdb->show_errors( $old_show_errors_policy );
-			$wpdb->suppress_errors( $old_error_suppression_policy );
-			if( ! empty( $output ) ){
-				throw new EE_Error( $output	);
+			$wpdb->show_errors($old_show_errors_policy);
+			$wpdb->suppress_errors($old_error_suppression_policy);
+			if ( ! empty($output)) {
+				throw new EE_Error($output);
 			}
 		} else {
 			throw new EE_Error(
 				sprintf(
-					__( 'The following table creation SQL does not contain valid information about the table columns: %1$s %2$s', 'event_espresso' ),
+					__('The following table creation SQL does not contain valid information about the table columns: %1$s %2$s', 'event_espresso'),
 					'<br />',
 					$sql
 				)
@@ -652,15 +652,15 @@ 
 	 * @param string $column_info if your SQL were 'ALTER TABLE table_name ADD price VARCHAR(10)', this would be 'VARCHAR(10)'
 	 * @return bool|int
 	 */
-	public static function add_column_if_it_doesnt_exist($table_name,$column_name,$column_info='INT UNSIGNED NOT NULL'){
-		if( apply_filters( 'FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', FALSE ) ){
+	public static function add_column_if_it_doesnt_exist($table_name, $column_name, $column_info = 'INT UNSIGNED NOT NULL') {
+		if (apply_filters('FHEE__EEH_Activation__add_column_if_it_doesnt_exist__short_circuit', FALSE)) {
 			return FALSE;
 		}
 		global $wpdb;
-		$full_table_name= EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$full_table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		$fields = self::get_fields_on_table($table_name);
-		if (!in_array($column_name, $fields)){
-			$alter_query="ALTER TABLE $full_table_name ADD $column_name $column_info";
+		if ( ! in_array($column_name, $fields)) {
+			$alter_query = "ALTER TABLE $full_table_name ADD $column_name $column_info";
 			//echo "alter query:$alter_query";
 			return $wpdb->query($alter_query);
 		}
@@ -679,15 +679,15 @@ 
 	 * 	@param string $table_name, without prefixed $wpdb->prefix
 	 * 	@return array of database column names
 	 */
-	public static function get_fields_on_table( $table_name = NULL ) {
+	public static function get_fields_on_table($table_name = NULL) {
 		global $wpdb;
-		$table_name= EEH_Activation::ensure_table_name_has_prefix( $table_name );
-		if ( ! empty( $table_name )) {
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
+		if ( ! empty($table_name)) {
 			$columns = $wpdb->get_results("SHOW COLUMNS FROM $table_name ");
 			if ($columns !== FALSE) {
 				$field_array = array();
-				foreach($columns as $column ){
-					$field_array[] = $column->Field;;
+				foreach ($columns as $column) {
+					$field_array[] = $column->Field; ;
 				}
 				return $field_array;
 			}
@@ -705,12 +705,12 @@ 
 	 * @param string $table_name
 	 * @return bool
 	 */
-	public static function db_table_is_empty( $table_name ) {
+	public static function db_table_is_empty($table_name) {
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
-		if ( EEH_Activation::table_exists( $table_name ) ) {
-			$count = $wpdb->get_var( "SELECT COUNT(*) FROM $table_name" );
-			return absint( $count ) === 0 ? true : false;
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
+		if (EEH_Activation::table_exists($table_name)) {
+			$count = $wpdb->get_var("SELECT COUNT(*) FROM $table_name");
+			return absint($count) === 0 ? true : false;
 		}
 		return false;
 	}
@@ -725,9 +725,9 @@ 
 	 * @param string $table_name
 	 * @return bool | int
 	 */
-	public static function delete_db_table_if_empty( $table_name ) {
-		if ( EEH_Activation::db_table_is_empty( $table_name ) ) {
-			return EEH_Activation::delete_unused_db_table( $table_name );
+	public static function delete_db_table_if_empty($table_name) {
+		if (EEH_Activation::db_table_is_empty($table_name)) {
+			return EEH_Activation::delete_unused_db_table($table_name);
 		}
 		return false;
 	}
@@ -742,11 +742,11 @@ 
 	 * @param string $table_name
 	 * @return bool | int
 	 */
-	public static function delete_unused_db_table( $table_name ) {
+	public static function delete_unused_db_table($table_name) {
 		global $wpdb;
-		if ( EEH_Activation::table_exists( $table_name ) ) {
-			$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
-			return $wpdb->query( "DROP TABLE IF EXISTS $table_name" );
+		if (EEH_Activation::table_exists($table_name)) {
+			$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
+			return $wpdb->query("DROP TABLE IF EXISTS $table_name");
 		}
 		return false;
 	}
@@ -762,18 +762,18 @@ 
 	 * @param string $index_name
 	 * @return bool | int
 	 */
-	public static function drop_index( $table_name, $index_name ) {
-		if( apply_filters( 'FHEE__EEH_Activation__drop_index__short_circuit', FALSE ) ){
+	public static function drop_index($table_name, $index_name) {
+		if (apply_filters('FHEE__EEH_Activation__drop_index__short_circuit', FALSE)) {
 			return FALSE;
 		}
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		$index_exists_query = "SHOW INDEX FROM $table_name WHERE Key_name = '$index_name'";
 		if (
-			$wpdb->get_var( "SHOW TABLES LIKE '$table_name'" ) == $table_name
-			&& $wpdb->get_var( $index_exists_query ) == $table_name //using get_var with the $index_exists_query returns the table's name
+			$wpdb->get_var("SHOW TABLES LIKE '$table_name'") == $table_name
+			&& $wpdb->get_var($index_exists_query) == $table_name //using get_var with the $index_exists_query returns the table's name
 		) {
-			return $wpdb->query( "ALTER TABLE $table_name DROP INDEX $index_name" );
+			return $wpdb->query("ALTER TABLE $table_name DROP INDEX $index_name");
 		}
 		return TRUE;
 	}
@@ -789,27 +789,27 @@ 
 	 * @return boolean success (whether database is setup properly or not)
 	 */
 	public static function create_database_tables() {
-		EE_Registry::instance()->load_core( 'Data_Migration_Manager' );
+		EE_Registry::instance()->load_core('Data_Migration_Manager');
 		//find the migration script that sets the database to be compatible with the code
 		$dms_name = EE_Data_Migration_Manager::instance()->get_most_up_to_date_dms();
-		if( $dms_name ){
-			$current_data_migration_script = EE_Registry::instance()->load_dms( $dms_name );
-			$current_data_migration_script->set_migrating( false );
+		if ($dms_name) {
+			$current_data_migration_script = EE_Registry::instance()->load_dms($dms_name);
+			$current_data_migration_script->set_migrating(false);
 			$current_data_migration_script->schema_changes_before_migration();
 			$current_data_migration_script->schema_changes_after_migration();
-			if( $current_data_migration_script->get_errors() ){
-				if( WP_DEBUG ){
-					foreach( $current_data_migration_script->get_errors() as $error ){
-						EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__ );
+			if ($current_data_migration_script->get_errors()) {
+				if (WP_DEBUG) {
+					foreach ($current_data_migration_script->get_errors() as $error) {
+						EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__);
 					}
-				}else{
-					EE_Error::add_error( __( 'There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso' ) );
+				} else {
+					EE_Error::add_error(__('There were errors creating the Event Espresso database tables and Event Espresso has been deactivated. To view the errors, please enable WP_DEBUG in your wp-config.php file.', 'event_espresso'));
 				}
 				return false;
 			}
 			EE_Data_Migration_Manager::instance()->update_current_database_state_to();
-		}else{
-			EE_Error::add_error( __( 'Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+		} else {
+			EE_Error::add_error(__('Could not determine most up-to-date data migration script from which to pull database schema structure. So database is probably not setup properly', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		return true;
@@ -829,27 +829,27 @@ 
 	public static function initialize_system_questions() {
 		// QUESTION GROUPS
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( 'esp_question_group' );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix('esp_question_group');
 		$SQL = "SELECT QSG_system FROM $table_name WHERE QSG_system != 0";
 		// what we have
-		$question_groups = $wpdb->get_col( $SQL );
+		$question_groups = $wpdb->get_col($SQL);
 		// check the response
-		$question_groups = is_array( $question_groups ) ? $question_groups : array();
+		$question_groups = is_array($question_groups) ? $question_groups : array();
 		// what we should have
-		$QSG_systems = array( 1, 2 );
+		$QSG_systems = array(1, 2);
 		// loop thru what we should have and compare to what we have
-		foreach ( $QSG_systems as $QSG_system ) {
+		foreach ($QSG_systems as $QSG_system) {
 			// reset values array
 			$QSG_values = array();
 			// if we don't have what we should have (but use $QST_system as as string because that's what we got from the db)
-			if ( ! in_array( "$QSG_system", $question_groups )) {
+			if ( ! in_array("$QSG_system", $question_groups)) {
 				// add it
-				switch ( $QSG_system ) {
+				switch ($QSG_system) {
 
 					case 1:
 							$QSG_values = array(
-									'QSG_name' => __( 'Personal Information', 'event_espresso' ),
-									'QSG_identifier' => 'personal-information-' . time(),
+									'QSG_name' => __('Personal Information', 'event_espresso'),
+									'QSG_identifier' => 'personal-information-'.time(),
 									'QSG_desc' => '',
 									'QSG_order' => 1,
 									'QSG_show_group_name' => 1,
@@ -861,8 +861,8 @@ 
 
 					case 2:
 							$QSG_values = array(
-									'QSG_name' => __( 'Address Information','event_espresso' ),
-									'QSG_identifier' => 'address-information-' . time(),
+									'QSG_name' => __('Address Information', 'event_espresso'),
+									'QSG_identifier' => 'address-information-'.time(),
 									'QSG_desc' => '',
 									'QSG_order' => 2,
 									'QSG_show_group_name' => 1,
@@ -874,14 +874,14 @@ 
 
 				}
 				// make sure we have some values before inserting them
-				if ( ! empty( $QSG_values )) {
+				if ( ! empty($QSG_values)) {
 					// insert system question
 					$wpdb->insert(
 						$table_name,
 						$QSG_values,
-						array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d' )
+						array('%s', '%s', '%s', '%d', '%d', '%d', '%d', '%d')
 					);
-					$QSG_IDs[ $QSG_system ] = $wpdb->insert_id;
+					$QSG_IDs[$QSG_system] = $wpdb->insert_id;
 				}
 			}
 		}
@@ -890,10 +890,10 @@ 
 
 		// QUESTIONS
 		global $wpdb;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( 'esp_question' );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix('esp_question');
 		$SQL = "SELECT QST_system FROM $table_name WHERE QST_system != ''";
 		// what we have
-		$questions = $wpdb->get_col( $SQL );
+		$questions = $wpdb->get_col($SQL);
 		// what we should have
 		$QST_systems = array(
 			'fname',
@@ -910,25 +910,25 @@ 
 		$order_for_group_1 = 1;
 		$order_for_group_2 = 1;
 		// loop thru what we should have and compare to what we have
-		foreach ( $QST_systems as $QST_system ) {
+		foreach ($QST_systems as $QST_system) {
 			// reset values array
 			$QST_values = array();
 			// if we don't have what we should have
-			if ( ! in_array( $QST_system, $questions )) {
+			if ( ! in_array($QST_system, $questions)) {
 				// add it
-				switch ( $QST_system ) {
+				switch ($QST_system) {
 
 					case 'fname':
 							$QST_values = array(
-									'QST_display_text' => __( 'First Name', 'event_espresso' ),
-									'QST_admin_label' => __( 'First Name - System Question', 'event_espresso' ),
+									'QST_display_text' => __('First Name', 'event_espresso'),
+									'QST_admin_label' => __('First Name - System Question', 'event_espresso'),
 									'QST_system' => 'fname',
 									'QST_type' => 'TEXT',
 									'QST_required' => 1,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 1,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->max_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->max_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -936,15 +936,15 @@ 
 
 					case 'lname':
 							$QST_values = array(
-									'QST_display_text' => __( 'Last Name', 'event_espresso' ),
-									'QST_admin_label' => __( 'Last Name - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Last Name', 'event_espresso'),
+									'QST_admin_label' => __('Last Name - System Question', 'event_espresso'),
 									'QST_system' => 'lname',
 									'QST_type' => 'TEXT',
 									'QST_required' => 1,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 2,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->max_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->max_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -952,15 +952,15 @@ 
 
 					case 'email':
 							$QST_values = array(
-									'QST_display_text' => __( 'Email Address', 'event_espresso' ),
-									'QST_admin_label' => __( 'Email Address - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Email Address', 'event_espresso'),
+									'QST_admin_label' => __('Email Address - System Question', 'event_espresso'),
 									'QST_system' => 'email',
 									'QST_type' => 'TEXT',
 									'QST_required' => 1,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 3,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->max_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->max_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -968,15 +968,15 @@ 
 
 					case 'address':
 							$QST_values = array(
-									'QST_display_text' => __( 'Address', 'event_espresso' ),
-									'QST_admin_label' => __( 'Address - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Address', 'event_espresso'),
+									'QST_admin_label' => __('Address - System Question', 'event_espresso'),
 									'QST_system' => 'address',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 4,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->max_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->max_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -984,15 +984,15 @@ 
 
 					case 'address2':
 							$QST_values = array(
-									'QST_display_text' => __( 'Address2', 'event_espresso' ),
-									'QST_admin_label' => __( 'Address2 - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Address2', 'event_espresso'),
+									'QST_admin_label' => __('Address2 - System Question', 'event_espresso'),
 									'QST_system' => 'address2',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 5,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->max_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->max_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1000,15 +1000,15 @@ 
 
 					case 'city':
 							$QST_values = array(
-									'QST_display_text' => __( 'City', 'event_espresso' ),
-									'QST_admin_label' => __( 'City - System Question', 'event_espresso' ),
+									'QST_display_text' => __('City', 'event_espresso'),
+									'QST_admin_label' => __('City - System Question', 'event_espresso'),
 									'QST_system' => 'city',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 6,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->max_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->max_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1016,12 +1016,12 @@ 
 
 					case 'state':
 							$QST_values = array(
-									'QST_display_text' => __( 'State/Province', 'event_espresso' ),
-									'QST_admin_label' => __( 'State/Province - System Question', 'event_espresso' ),
+									'QST_display_text' => __('State/Province', 'event_espresso'),
+									'QST_admin_label' => __('State/Province - System Question', 'event_espresso'),
 									'QST_system' => 'state',
 									'QST_type' => 'STATE',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 7,
 									'QST_admin_only' => 0,
 									'QST_wp_user' => self::get_default_creator_id(),
@@ -1031,12 +1031,12 @@ 
 
 					case 'country' :
 							$QST_values = array(
-									'QST_display_text' => __( 'Country', 'event_espresso' ),
-									'QST_admin_label' => __( 'Country - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Country', 'event_espresso'),
+									'QST_admin_label' => __('Country - System Question', 'event_espresso'),
 									'QST_system' => 'country',
 									'QST_type' => 'COUNTRY',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 8,
 									'QST_admin_only' => 0,
 									'QST_wp_user' => self::get_default_creator_id(),
@@ -1046,15 +1046,15 @@ 
 
 					case 'zip':
 							$QST_values = array(
-									'QST_display_text' => __( 'Zip/Postal Code', 'event_espresso' ),
-									'QST_admin_label' => __( 'Zip/Postal Code - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Zip/Postal Code', 'event_espresso'),
+									'QST_admin_label' => __('Zip/Postal Code - System Question', 'event_espresso'),
 									'QST_system' => 'zip',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 9,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->max_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->max_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1062,49 +1062,49 @@ 
 
 					case 'phone':
 							$QST_values = array(
-									'QST_display_text' => __( 'Phone Number', 'event_espresso' ),
-									'QST_admin_label' => __( 'Phone Number - System Question', 'event_espresso' ),
+									'QST_display_text' => __('Phone Number', 'event_espresso'),
+									'QST_admin_label' => __('Phone Number - System Question', 'event_espresso'),
 									'QST_system' => 'phone',
 									'QST_type' => 'TEXT',
 									'QST_required' => 0,
-									'QST_required_text' => __( 'This field is required', 'event_espresso' ),
+									'QST_required_text' => __('This field is required', 'event_espresso'),
 									'QST_order' => 10,
 									'QST_admin_only' => 0,
-									'QST_max' => EEM_Question::instance()->max_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->max_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
 						break;
 
 				}
-				if ( ! empty( $QST_values )) {
+				if ( ! empty($QST_values)) {
 					// insert system question
 					$wpdb->insert(
 						$table_name,
 						$QST_values,
-						array( '%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d' )
+						array('%s', '%s', '%s', '%s', '%d', '%s', '%d', '%d', '%d', '%d')
 					);
 					$QST_ID = $wpdb->insert_id;
 
 					// QUESTION GROUP QUESTIONS
-					if(  in_array( $QST_system, array( 'fname', 'lname', 'email' ) ) ) {
+					if (in_array($QST_system, array('fname', 'lname', 'email'))) {
 						$system_question_we_want = EEM_Question_Group::system_personal;
 					} else {
 						$system_question_we_want = EEM_Question_Group::system_address;
 					}
-					if( isset( $QSG_IDs[ $system_question_we_want ] ) ) {
-						$QSG_ID = $QSG_IDs[ $system_question_we_want ];
+					if (isset($QSG_IDs[$system_question_we_want])) {
+						$QSG_ID = $QSG_IDs[$system_question_we_want];
 					} else {
-						$id_col = EEM_Question_Group::instance()->get_col( array( array( 'QSG_system' => $system_question_we_want ) ) );
-						if( is_array( $id_col ) ) {
-							$QSG_ID = reset( $id_col );
+						$id_col = EEM_Question_Group::instance()->get_col(array(array('QSG_system' => $system_question_we_want)));
+						if (is_array($id_col)) {
+							$QSG_ID = reset($id_col);
 						} else {
 							//ok so we didn't find it in the db either?? that's weird because we should have inserted it at the start of this method
                                                         EE_Log::instance()->log( 
                                                                 __FILE__, 
                                                                 __FUNCTION__, 
                                                                 sprintf( 
-                                                                        __( 'Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'), 
+                                                                        __('Could not associate question %1$s to a question group because no system question group existed', 'event_espresso'), 
                                                                         $QST_ID ), 
                                                                 'error' );
                                                         continue;
@@ -1113,9 +1113,9 @@ 
                                         
 					// add system questions to groups
 					$wpdb->insert(
-						EEH_Activation::ensure_table_name_has_prefix( 'esp_question_group_question' ),
-						array( 'QSG_ID' => $QSG_ID , 'QST_ID' => $QST_ID, 'QGQ_order'=>($QSG_ID==1)? $order_for_group_1++ : $order_for_group_2++ ),
-						array( '%d', '%d','%d' )
+						EEH_Activation::ensure_table_name_has_prefix('esp_question_group_question'),
+						array('QSG_ID' => $QSG_ID, 'QST_ID' => $QST_ID, 'QGQ_order'=>($QSG_ID == 1) ? $order_for_group_1++ : $order_for_group_2++),
+						array('%d', '%d', '%d')
 					);
 				}
 			}
@@ -1127,11 +1127,11 @@ 
 	 * Makes sure the default payment method (Invoice) is active.
 	 * This used to be done automatically as part of constructing the old gateways config
 	 */
-	public static function insert_default_payment_methods(){
-		if( ! EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart ) ){
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( 'Invoice' );
-		}else{
+	public static function insert_default_payment_methods() {
+		if ( ! EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart)) {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type('Invoice');
+		} else {
 			EEM_Payment_Method::instance()->verify_button_urls();
 		}
 	}
@@ -1147,7 +1147,7 @@ 
 
 		global $wpdb;
 
-		if ( EEH_Activation::table_exists( EEM_Status::instance()->table() ) ) {
+		if (EEH_Activation::table_exists(EEM_Status::instance()->table())) {
 
 			$table_name = EEM_Status::instance()->table();
 
@@ -1213,38 +1213,38 @@ 
 	 * 	@return boolean success of verifying upload directories exist
 	 */
 	public static function create_upload_directories() {
-		EE_Registry::instance()->load_helper( 'File' );
+		EE_Registry::instance()->load_helper('File');
 		// Create the required folders
 		$folders = array(
 				EVENT_ESPRESSO_TEMPLATE_DIR,
 				EVENT_ESPRESSO_GATEWAY_DIR,
-				EVENT_ESPRESSO_UPLOAD_DIR . 'logs/',
-				EVENT_ESPRESSO_UPLOAD_DIR . 'css/',
-				EVENT_ESPRESSO_UPLOAD_DIR . 'tickets/'
+				EVENT_ESPRESSO_UPLOAD_DIR.'logs/',
+				EVENT_ESPRESSO_UPLOAD_DIR.'css/',
+				EVENT_ESPRESSO_UPLOAD_DIR.'tickets/'
 		);
-		foreach ( $folders as $folder ) {
+		foreach ($folders as $folder) {
 			try {
-				EEH_File::ensure_folder_exists_and_is_writable( $folder );
-				@ chmod( $folder, 0755 );
-			} catch( EE_Error $e ){
+				EEH_File::ensure_folder_exists_and_is_writable($folder);
+				@ chmod($folder, 0755);
+			} catch (EE_Error $e) {
 				EE_Error::add_error(
 					sprintf(
-						__(  'Could not create the folder at "%1$s" because: %2$s', 'event_espresso' ),
+						__('Could not create the folder at "%1$s" because: %2$s', 'event_espresso'),
 						$folder,
-						'<br />' . $e->getMessage()
+						'<br />'.$e->getMessage()
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				//indicate we'll need to fix this later
-				update_option( EEH_Activation::upload_directories_incomplete_option_name, true );
+				update_option(EEH_Activation::upload_directories_incomplete_option_name, true);
 				return FALSE;
 			}
 		}
 		//just add the .htaccess file to the logs directory to begin with. Even if logging
 		//is disabled, there might be activation errors recorded in there
-		EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs/' );
+		EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs/');
 		//remember EE's folders are all good
-		delete_option( EEH_Activation::upload_directories_incomplete_option_name );
+		delete_option(EEH_Activation::upload_directories_incomplete_option_name);
 		return TRUE;
 	}
 	
@@ -1257,7 +1257,7 @@ 
 	 * @return boolean
 	 */
 	public static function upload_directories_incomplete() {
-		return get_option( EEH_Activation::upload_directories_incomplete_option_name, false );
+		return get_option(EEH_Activation::upload_directories_incomplete_option_name, false);
 	}
 
 
@@ -1276,16 +1276,16 @@ 
 		$installed_messengers = $default_messengers = array();
 
 		//include our helper
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
 		//get all installed messenger objects
 		$installed = EEH_MSG_Template::get_installed_message_objects();
 
 		//let's setup the $installed messengers in an array AND the messengers that are set to be activated on install.
-		foreach ( $installed['messengers'] as $msgr ) {
-			if ( $msgr instanceof EE_messenger ) {
+		foreach ($installed['messengers'] as $msgr) {
+			if ($msgr instanceof EE_messenger) {
 				$installed_messengers[$msgr->name] = $msgr;
-				if ( $msgr->activate_on_install ) {
+				if ($msgr->activate_on_install) {
 					$default_messengers[] = $msgr->name;
 				}
 			}
@@ -1295,36 +1295,36 @@ 
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
 
 		//things that have already been activated before
-		$has_activated = get_option( 'ee_has_activated_messenger' );
+		$has_activated = get_option('ee_has_activated_messenger');
 
 		//do an initial loop to determine if we need to continue
 		$def_ms = array();
-		foreach ( $default_messengers as $msgr ) {
-			if ( isset($active_messengers[$msgr] ) || isset( $has_activated[$msgr] ) ) continue;
+		foreach ($default_messengers as $msgr) {
+			if (isset($active_messengers[$msgr]) || isset($has_activated[$msgr])) continue;
 			$def_ms[] = $msgr;
 		}
 
 		//setup the $installed_mts in an array
-		foreach ( $installed['message_types'] as $imt ) {
-			if ( $imt instanceof EE_message_type ) {
+		foreach ($installed['message_types'] as $imt) {
+			if ($imt instanceof EE_message_type) {
 				$installed_mts[$imt->name] = $imt;
 			}
 		}
 
 		//loop through default array for default messengers (if present)
-		if ( ! empty( $def_ms ) ) {
-			foreach ( $def_ms as $messenger ) {
+		if ( ! empty($def_ms)) {
+			foreach ($def_ms as $messenger) {
 				//all is good so let's setup the default stuff. We need to use the given messenger object (if exists) to get the default message type for the messenger.
-				if ( ! isset( $installed_messengers[$messenger] )) {
+				if ( ! isset($installed_messengers[$messenger])) {
 					continue;
 				}
 				/** @var EE_messenger[] $installed_messengers  */
 				$default_mts = $installed_messengers[$messenger]->get_default_message_types();
 				$active_messengers[$messenger]['obj'] = $installed_messengers[$messenger];
-				foreach ( $default_mts as $index => $mt ) {
+				foreach ($default_mts as $index => $mt) {
 					//is there an installed_mt matching the default string?  If not then nothing to do here.
-					if ( ! isset( $installed_mts[$mt] ) ) {
-						unset( $default_mts[$index] );
+					if ( ! isset($installed_mts[$mt])) {
+						unset($default_mts[$index]);
 						continue;
 					}
 
@@ -1333,41 +1333,41 @@ 
 					/** @var EE_message_type[] $installed_mts */
 					$settings_fields = $installed_mts[$mt]->get_admin_settings_fields();
 					$settings = array();
-					if ( is_array( $settings_fields ) ) {
-						foreach ( $settings_fields as $field => $values ) {
-							if ( isset( $values['default'] ) ) {
+					if (is_array($settings_fields)) {
+						foreach ($settings_fields as $field => $values) {
+							if (isset($values['default'])) {
 								$settings[$field] = $values['default'];
 							}
 						}
 					}
 
-					$active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt]['settings'] = $settings;
+					$active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]['settings'] = $settings;
 					$has_activated[$messenger][] = $mt;
 				}
 
 				//setup any initial settings for the messenger
 				$msgr_settings = $installed_messengers[$messenger]->get_admin_settings_fields();
 
-				if ( !empty( $msgr_settings ) ) {
-					foreach ( $msgr_settings as $field => $value ) {
+				if ( ! empty($msgr_settings)) {
+					foreach ($msgr_settings as $field => $value) {
 						$active_messengers[$messenger]['settings'][$field] = $value;
 					}
 				}
 
 				//now let's save the settings for this messenger! Must do now because the validator checks the db for active messengers to validate.
-				EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
+				EEH_MSG_Template::update_active_messengers_in_db($active_messengers);
 
 				//let's generate all the templates but only if the messenger has default_mts (otherwise its just activated).
-				if ( !empty( $default_mts ) ) {
-					$success = EEH_MSG_Template::generate_new_templates( $messenger, $default_mts, '', TRUE );
+				if ( ! empty($default_mts)) {
+					$success = EEH_MSG_Template::generate_new_templates($messenger, $default_mts, '', TRUE);
 				}
 			}
 		} //end check for empty( $def_ms )
 
 		//still need to see if there are any message types to activate for active messengers
-		foreach ( $active_messengers as $messenger => $settings ) {
+		foreach ($active_messengers as $messenger => $settings) {
 			$msg_obj = $settings['obj'];
-			if ( ! $msg_obj instanceof EE_messenger ) {
+			if ( ! $msg_obj instanceof EE_messenger) {
 				continue;
 			}
 
@@ -1375,45 +1375,45 @@ 
 			$new_default_mts = array();
 
 			//loop through each default mt reported by the messenger and make sure its set in its active db entry.
-			foreach( $all_default_mts as $index => $mt ) {
+			foreach ($all_default_mts as $index => $mt) {
 				//already active? already has generated templates? || has already been activated before (we dont' want to reactivate things users intentionally deactivated).
-				if ( ( isset( $has_activated[$messenger] ) && in_array($mt, $has_activated[$messenger]) ) || isset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt] ) ||  EEH_MSG_Template::already_generated( $messenger, $mt, 0, FALSE ) ) {
+				if ((isset($has_activated[$messenger]) && in_array($mt, $has_activated[$messenger])) || isset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]) || EEH_MSG_Template::already_generated($messenger, $mt, 0, FALSE)) {
 					continue;
 				}
 
 				//is there an installed_mt matching the default string?  If not then nothing to do here.
-				if ( ! isset( $installed_mts[$mt] ) ) {
-					unset( $all_default_mts[$mt] );
+				if ( ! isset($installed_mts[$mt])) {
+					unset($all_default_mts[$mt]);
 					continue;
 				}
 
 				$settings_fields = $installed_mts[$mt]->get_admin_settings_fields();
 				$settings = array();
-				if ( is_array( $settings_fields ) ) {
-					foreach ( $settings_fields as $field => $values ) {
-						if ( isset( $values['default'] ) ) {
+				if (is_array($settings_fields)) {
+					foreach ($settings_fields as $field => $values) {
+						if (isset($values['default'])) {
 							$settings[$field] = $values['default'];
 						}
 					}
 				}
 
-				$active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt]['settings'] = $settings;
+				$active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]['settings'] = $settings;
 				$new_default_mts[] = $mt;
 				$has_activated[$messenger][] = $mt;
 			}
 
 
-			if ( ! empty( $new_default_mts ) ) {
-				$success = EEH_MSG_Template::generate_new_templates( $messenger, $new_default_mts, '', TRUE );
+			if ( ! empty($new_default_mts)) {
+				$success = EEH_MSG_Template::generate_new_templates($messenger, $new_default_mts, '', TRUE);
 			}
 
 		}
 
 		//now let's save the settings for this messenger!
-		EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
+		EEH_MSG_Template::update_active_messengers_in_db($active_messengers);
 
 		//update $has_activated record
-		update_option( 'ee_has_activated_messenger', $has_activated );
+		update_option('ee_has_activated_messenger', $has_activated);
 
 		//that's it!
 		return $success;
@@ -1433,47 +1433,47 @@ 
 	 */
 	public static function validate_messages_system() {
 		//include our helper
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
 		//get active and installed  messengers/message types.
 		$active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
 		$installed = EEH_MSG_Template::get_installed_message_objects();
 		$installed_messengers = $installed_mts = array();
 		//set up the arrays so they can be handled easier.
-		foreach( $installed['messengers'] as $im ) {
-			if ( $im instanceof EE_messenger ) {
+		foreach ($installed['messengers'] as $im) {
+			if ($im instanceof EE_messenger) {
 				$installed_messengers[$im->name] = $im;
 			}
 		}
-		foreach( $installed['message_types'] as $imt ) {
-			if ( $imt instanceof EE_message_type ) {
+		foreach ($installed['message_types'] as $imt) {
+			if ($imt instanceof EE_message_type) {
 				$installed_mts[$imt->name] = $imt;
 			}
 		}
 
 		//now let's loop through the active array and validate
-		foreach( $active_messengers as $messenger => $active_details ) {
+		foreach ($active_messengers as $messenger => $active_details) {
 			//first let's see if this messenger is installed.
-			if ( ! isset( $installed_messengers[$messenger] ) ) {
+			if ( ! isset($installed_messengers[$messenger])) {
 				//not set so let's just remove from actives and make sure templates are inactive.
-				unset( $active_messengers[$messenger] );
-				EEH_MSG_Template::update_to_inactive( $messenger );
+				unset($active_messengers[$messenger]);
+				EEH_MSG_Template::update_to_inactive($messenger);
 				continue;
 			}
 
 			//messenger is active, so let's just make sure that any active message types not installed are deactivated.
-			$mts = ! empty( $active_details['settings'][$messenger . '-message_types'] ) ? $active_details['settings'][$messenger . '-message_types'] : array();
-			foreach ( $mts as $mt_name => $mt ) {
-				if ( ! isset( $installed_mts[$mt_name] )  ) {
-					unset( $active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt_name] );
-					EEH_MSG_Template::update_to_inactive( $messenger, $mt_name );
+			$mts = ! empty($active_details['settings'][$messenger.'-message_types']) ? $active_details['settings'][$messenger.'-message_types'] : array();
+			foreach ($mts as $mt_name => $mt) {
+				if ( ! isset($installed_mts[$mt_name])) {
+					unset($active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt_name]);
+					EEH_MSG_Template::update_to_inactive($messenger, $mt_name);
 				}
 			}
 		}
 
 		//all done! let's update the active_messengers.
-		EEH_MSG_Template::update_active_messengers_in_db( $active_messengers );
-		do_action( 'AHEE__EEH_Activation__validate_messages_system' );
+		EEH_MSG_Template::update_active_messengers_in_db($active_messengers);
+		do_action('AHEE__EEH_Activation__validate_messages_system');
 		return;
 	}
 
@@ -1487,12 +1487,12 @@ 
 	 * 	@static
 	 * 	@return void
 	 */
-	public static function create_no_ticket_prices_array(){
+	public static function create_no_ticket_prices_array() {
 		// this creates an array for tracking events that have no active ticket prices created
 		// this allows us to warn admins of the situation so that it can be corrected
-		$espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', FALSE );
-		if ( ! $espresso_no_ticket_prices ) {
-			add_option( 'ee_no_ticket_prices', array(), '', FALSE );
+		$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', FALSE);
+		if ( ! $espresso_no_ticket_prices) {
+			add_option('ee_no_ticket_prices', array(), '', FALSE);
 		}
 	}
 
@@ -1514,24 +1514,24 @@ 
 	 * Finds all our EE4 custom post types, and deletes them and their associated data (like post meta or term relations)/
 	 * @global wpdb $wpdb
 	 */
-	public static function delete_all_espresso_cpt_data(){
+	public static function delete_all_espresso_cpt_data() {
 		global $wpdb;
 		//get all the CPT post_types
 		$ee_post_types = array();
-		foreach(EE_Registry::instance()->non_abstract_db_models as $model_name){
-			if ( method_exists( $model_name, 'instance' )) {
-				$model_obj = call_user_func( array( $model_name, 'instance' ));
-				if ( $model_obj instanceof EEM_CPT_Base ) {
-					$ee_post_types[] = $wpdb->prepare("%s",$model_obj->post_type());
+		foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) {
+			if (method_exists($model_name, 'instance')) {
+				$model_obj = call_user_func(array($model_name, 'instance'));
+				if ($model_obj instanceof EEM_CPT_Base) {
+					$ee_post_types[] = $wpdb->prepare("%s", $model_obj->post_type());
 				}
 			}
 		}
 		//get all our CPTs
-		$query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",",$ee_post_types).")";
+		$query = "SELECT ID FROM {$wpdb->posts} WHERE post_type IN (".implode(",", $ee_post_types).")";
 		$cpt_ids = $wpdb->get_col($query);
 		//delete each post meta and term relations too
-		foreach($cpt_ids as $post_id){
-			wp_delete_post($post_id,true);
+		foreach ($cpt_ids as $post_id) {
+			wp_delete_post($post_id, true);
 		}
 	}
 
@@ -1545,18 +1545,18 @@ 
 	 * @param bool $remove_all
 	 * @return void
 	 */
-	public static function delete_all_espresso_tables_and_data( $remove_all = true ) {
+	public static function delete_all_espresso_tables_and_data($remove_all = true) {
 		global $wpdb;
 		$undeleted_tables = array();
 
 		// load registry
-		foreach( EE_Registry::instance()->non_abstract_db_models as $model_name ){
-			if ( method_exists( $model_name, 'instance' )) {
-				$model_obj = call_user_func( array( $model_name, 'instance' ));
-				if ( $model_obj instanceof EEM_Base ) {
-					foreach ( $model_obj->get_tables() as $table ) {
-						if ( strpos( $table->get_table_name(), 'esp_' )) {
-							switch ( EEH_Activation::delete_unused_db_table( $table->get_table_name() )) {
+		foreach (EE_Registry::instance()->non_abstract_db_models as $model_name) {
+			if (method_exists($model_name, 'instance')) {
+				$model_obj = call_user_func(array($model_name, 'instance'));
+				if ($model_obj instanceof EEM_Base) {
+					foreach ($model_obj->get_tables() as $table) {
+						if (strpos($table->get_table_name(), 'esp_')) {
+							switch (EEH_Activation::delete_unused_db_table($table->get_table_name())) {
 								case false :
 									$undeleted_tables[] = $table->get_table_name();
 								break;
@@ -1581,8 +1581,8 @@ 
 			'esp_promotion_rule',
 			'esp_rule'
 		);
-		foreach( $tables_without_models as $table ){
-			EEH_Activation::delete_db_table_if_empty( $table );
+		foreach ($tables_without_models as $table) {
+			EEH_Activation::delete_db_table_if_empty($table);
 		}
 
 
@@ -1619,58 +1619,58 @@ 
 			'ee_pers_admin_notices' => true,
 			'ee_upload_directories_incomplete' => true,
 		);
-		if( is_main_site() ) {
-			$wp_options_to_delete[ 'ee_network_config' ] = true;
+		if (is_main_site()) {
+			$wp_options_to_delete['ee_network_config'] = true;
 		}
 
 		$undeleted_options = array();
-		foreach ( $wp_options_to_delete as $option_name => $no_wildcard ) {
+		foreach ($wp_options_to_delete as $option_name => $no_wildcard) {
 
-			if( $no_wildcard ){
-				if( ! delete_option( $option_name ) ){
+			if ($no_wildcard) {
+				if ( ! delete_option($option_name)) {
 					$undeleted_options[] = $option_name;
 				}
-			}else{
-				$option_names_to_delete_from_wildcard = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'" );
-				foreach($option_names_to_delete_from_wildcard as $option_name_from_wildcard ){
-					if( ! delete_option( $option_name_from_wildcard ) ){
+			} else {
+				$option_names_to_delete_from_wildcard = $wpdb->get_col("SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%$option_name%'");
+				foreach ($option_names_to_delete_from_wildcard as $option_name_from_wildcard) {
+					if ( ! delete_option($option_name_from_wildcard)) {
 						$undeleted_options[] = $option_name_from_wildcard;
 					}
 				}
 			}
 		}
                 //also, let's make sure the "ee_config_option_names" wp option stays out by removing the action that adds it
-                remove_action( 'shutdown', array( EE_Config::instance(), 'shutdown' ), 10 );
+                remove_action('shutdown', array(EE_Config::instance(), 'shutdown'), 10);
 
-		if ( $remove_all && $espresso_db_update = get_option( 'espresso_db_update' )) {
+		if ($remove_all && $espresso_db_update = get_option('espresso_db_update')) {
 			$db_update_sans_ee4 = array();
-			foreach($espresso_db_update as $version => $times_activated){
-				if( $version[0] =='3'){//if its NON EE4
+			foreach ($espresso_db_update as $version => $times_activated) {
+				if ($version[0] == '3') {//if its NON EE4
 					$db_update_sans_ee4[$version] = $times_activated;
 				}
 			}
-			update_option( 'espresso_db_update', $db_update_sans_ee4 );
+			update_option('espresso_db_update', $db_update_sans_ee4);
 		}
 
 		$errors = '';
-		if ( ! empty( $undeleted_tables )) {
+		if ( ! empty($undeleted_tables)) {
 			$errors .= sprintf(
-				__( 'The following tables could not be deleted: %s%s', 'event_espresso' ),
+				__('The following tables could not be deleted: %s%s', 'event_espresso'),
 				'<br/>',
-				implode( ',<br/>', $undeleted_tables )
+				implode(',<br/>', $undeleted_tables)
 			);
 		}
-		if ( ! empty( $undeleted_options )) {
-			$errors .= ! empty( $undeleted_tables ) ? '<br/>' : '';
+		if ( ! empty($undeleted_options)) {
+			$errors .= ! empty($undeleted_tables) ? '<br/>' : '';
 			$errors .= sprintf(
-				__( 'The following wp-options could not be deleted: %s%s', 'event_espresso' ),
+				__('The following wp-options could not be deleted: %s%s', 'event_espresso'),
 				'<br/>',
-				implode( ',<br/>', $undeleted_options )
+				implode(',<br/>', $undeleted_options)
 			);
 
 		}
-		if ( $errors != '' ) {
-			EE_Error::add_attention( $errors, __FILE__, __FUNCTION__, __LINE__ );
+		if ($errors != '') {
+			EE_Error::add_attention($errors, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -1680,23 +1680,23 @@ 
 	 * @param string $table_name with or without $wpdb->prefix
 	 * @return boolean
 	 */
-	public static function table_exists( $table_name ){
+	public static function table_exists($table_name) {
 		global $wpdb, $EZSQL_ERROR;
-		$table_name = EEH_Activation::ensure_table_name_has_prefix( $table_name );
+		$table_name = EEH_Activation::ensure_table_name_has_prefix($table_name);
 		//ignore if this causes an sql error
 		$old_error = $wpdb->last_error;
 		$old_suppress_errors = $wpdb->suppress_errors();
-		$old_show_errors_value = $wpdb->show_errors( FALSE );
+		$old_show_errors_value = $wpdb->show_errors(FALSE);
 		$ezsql_error_cache = $EZSQL_ERROR;
-		$wpdb->get_results( "SELECT * from $table_name LIMIT 1");
-		$wpdb->show_errors( $old_show_errors_value );
-		$wpdb->suppress_errors( $old_suppress_errors );
+		$wpdb->get_results("SELECT * from $table_name LIMIT 1");
+		$wpdb->show_errors($old_show_errors_value);
+		$wpdb->suppress_errors($old_suppress_errors);
 		$new_error = $wpdb->last_error;
 		$wpdb->last_error = $old_error;
 		$EZSQL_ERROR = $ezsql_error_cache;
-		if( empty( $new_error ) ){
+		if (empty($new_error)) {
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -1704,7 +1704,7 @@ 
 	/**
 	 * Resets the cache on EEH_Activation
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_default_creator_id = NULL;
 		self::$_initialized_db_content_already_in_this_request = false;
 	}

core/EE_Config.core.php

Indentation +140 added lines, -140 removed lines

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

Spacing +400 added lines, -400 removed lines

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

core/libraries/plugin_api/EE_Register_Config.lib.php

Spacing +18 added lines, -18 removed lines

@@ -42,24 +42,24 @@ 
 	 *                       		}
 	 * @return void
 	 */
-	public static function register( $config_class = NULL, $setup_args = array() ) {
+	public static function register($config_class = NULL, $setup_args = array()) {
 
-		$setup_args['config_name'] = isset( $setup_args['config_name'] ) && ! empty( $setup_args['config_name'] ) ? $setup_args['config_name'] : $config_class;
-		$setup_args['config_section'] = isset( $setup_args['config_section'] ) && ! empty( $setup_args['config_section'] ) ? $setup_args['config_section'] : 'addons';
+		$setup_args['config_name'] = isset($setup_args['config_name']) && ! empty($setup_args['config_name']) ? $setup_args['config_name'] : $config_class;
+		$setup_args['config_section'] = isset($setup_args['config_section']) && ! empty($setup_args['config_section']) ? $setup_args['config_section'] : 'addons';
 
 		//required fields MUST be present, so let's make sure they are.
-		if ( empty( $config_class ) || ! is_array( $setup_args ) || empty( $setup_args['config_name'] )) {
-			throw new EE_Error( __( 'In order to register a Config Class with EE_Register_Config::register(), you must include a "config_class" (the actual class name for this config class). As well, you can supply an array containing the following keys: "config_section" the main section of the config object the settings will be saved under (by default the new config will be registered under EE_Config::instance()->modules or EE_Config::instance()->addons depending on what type of class is calling this), "config_name" (by default the new config will be registered to EE_Config::instance()->{config_section}->{config_class}, but supplying a "config_name" will set the property name that this variable is accessible by. ie: EE_Config::instance()->{config_section}->{config_name})', 'event_espresso' ));
+		if (empty($config_class) || ! is_array($setup_args) || empty($setup_args['config_name'])) {
+			throw new EE_Error(__('In order to register a Config Class with EE_Register_Config::register(), you must include a "config_class" (the actual class name for this config class). As well, you can supply an array containing the following keys: "config_section" the main section of the config object the settings will be saved under (by default the new config will be registered under EE_Config::instance()->modules or EE_Config::instance()->addons depending on what type of class is calling this), "config_name" (by default the new config will be registered to EE_Config::instance()->{config_section}->{config_class}, but supplying a "config_name" will set the property name that this variable is accessible by. ie: EE_Config::instance()->{config_section}->{config_name})', 'event_espresso'));
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_ee_config_registry[ $config_class ] ) ){
+		if (isset(self::$_ee_config_registry[$config_class])) {
 			return;
 		}
 
 
 		//first find out if this happened too late.
-		if ( did_action( 'AHEE__EE_System__load_core_configuration__begin' ) ) {
+		if (did_action('AHEE__EE_System__load_core_configuration__begin')) {
 			EE_Error::doing_it_wrong(
 				__METHOD__,
 				sprintf(
@@ -70,13 +70,13 @@ 
 				);
 		}
 		//add incoming stuff to our registry property
-		self::$_ee_config_registry[ $config_class ] = array(
+		self::$_ee_config_registry[$config_class] = array(
 			'section' => $setup_args['config_section'],
 			'name' => $setup_args['config_name']
 		);
 
-		add_action( 'AHEE__EE_Config___load_core_config__end', array( 'EE_Register_Config', 'set_config' ), 15, 1 );
-		add_action( 'AHEE__EE_Config__update_espresso_config__end', array( 'EE_Register_Config', 'set_config' ), 15, 1 );
+		add_action('AHEE__EE_Config___load_core_config__end', array('EE_Register_Config', 'set_config'), 15, 1);
+		add_action('AHEE__EE_Config__update_espresso_config__end', array('EE_Register_Config', 'set_config'), 15, 1);
 	}
 
 
@@ -90,18 +90,18 @@ 
 	 * @param \EE_Config $EE_Config
 	 * @return \StdClass
 	 */
-	public static function set_config( EE_Config $EE_Config ) {
-		foreach ( self::$_ee_config_registry as $config_class => $settings ) {
+	public static function set_config(EE_Config $EE_Config) {
+		foreach (self::$_ee_config_registry as $config_class => $settings) {
 			//first some validation of our incoming class_name.  We'll throw an error early if its' not registered correctly
-			if ( ! class_exists( $config_class )) {
+			if ( ! class_exists($config_class)) {
 				throw new EE_Error(
 					sprintf(
-						__( 'The "%s" config class can not be registered with EE_Config because it does not exist.  Verify that an autoloader has been set for this class', 'event_espresso' ),
+						__('The "%s" config class can not be registered with EE_Config because it does not exist.  Verify that an autoloader has been set for this class', 'event_espresso'),
 						$config_class
 					)
 				 );
 			}
-			$EE_Config->get_config( $settings['section'], $settings['name'], $config_class );
+			$EE_Config->get_config($settings['section'], $settings['name'], $config_class);
 		}
 	}
 
@@ -111,8 +111,8 @@ 
 	/**
 	 * @param mixed $config_class_name
 	 */
-	public static function deregister( $config_class_name = NULL ) {
-		if ( ! empty( self::$_ee_config_registry[ $config_class_name ] ))
-    			unset( self::$_ee_config_registry[ $config_class_name ] );
+	public static function deregister($config_class_name = NULL) {
+		if ( ! empty(self::$_ee_config_registry[$config_class_name]))
+    			unset(self::$_ee_config_registry[$config_class_name]);
 	}
 }

core/db_classes/EE_Question.class.php

Doc Comments +10 added lines, -10 removed lines

@@ -184,7 +184,7 @@ 
 	/**
 	 * returns the text for displaying the question to users
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function display_text() {
 		return $this->get( 'QST_display_text' );
@@ -195,7 +195,7 @@ 
 	/**
 	 * returns the text for the administrative label
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function admin_label() {
 		return $this->get( 'QST_admin_label' );
@@ -206,7 +206,7 @@ 
 	/**
 	 * returns the attendee column name for this question
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function system_ID() {
 		return $this->get( 'QST_system' );
@@ -229,7 +229,7 @@ 
 	 * returns the text which should be displayed when a user
 	 * doesn't answer this question in a form
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function required_text() {
 		return $this->get( 'QST_required_text' );
@@ -240,7 +240,7 @@ 
 	/**
 	 * returns the type of this question
 	 * @access public
-	 * @return string
+	 * @return boolean
 	 */
 	public function type() {
 		return $this->get( 'QST_type' );
@@ -252,7 +252,7 @@ 
 	 * returns an integer showing where this question should
 	 * be placed in a sequence of questions
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function order() {
 		return $this->get( 'QST_order' );
@@ -275,7 +275,7 @@ 
 	/**
 	 * returns the id the wordpress user who created this question
 	 * @access public
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get( 'QST_wp_user' );
@@ -369,7 +369,7 @@ 
 	 * Adds an option for this question. Note: if the option were previously associated with a different
 	 * Question, that relationship will be overwritten.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function add_option( EE_Question_Option $option ) {
 		return $this->_add_relation_to( $option, 'Question_Option' );
@@ -392,7 +392,7 @@ 
 	/**
 	 * Marks the option as deleted.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function remove_option( EE_Question_Option $option ) {
 		return $this->_remove_relation_to( $option, 'Question_Option' );
@@ -461,7 +461,7 @@ 
 	
 	/**
 	 * Returns the question's maximum allowed response size
-	 * @return int|float
+	 * @return boolean
 	 */
 	public function max() {
 		return $this->get( 'QST_max' );

Spacing +74 added lines, -74 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
@@ -37,9 +37,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Question
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -50,8 +50,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Question
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @access        public
 	 * @param string $QST_display_text
 	 */
-	public function set_display_text( $QST_display_text = '' ) {
-		$this->set( 'QST_display_text', $QST_display_text );
+	public function set_display_text($QST_display_text = '') {
+		$this->set('QST_display_text', $QST_display_text);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @access        public
 	 * @param        string $QST_admin_label
 	 */
-	public function set_admin_label( $QST_admin_label = '' ) {
-		$this->set( 'QST_admin_label', $QST_admin_label );
+	public function set_admin_label($QST_admin_label = '') {
+		$this->set('QST_admin_label', $QST_admin_label);
 	}
 
 
@@ -86,8 +86,8 @@ 
 	 * @access        public
 	 * @param        mixed $QST_system
 	 */
-	public function set_system_ID( $QST_system = '' ) {
-		$this->set( 'QST_system', $QST_system );
+	public function set_system_ID($QST_system = '') {
+		$this->set('QST_system', $QST_system);
 	}
 
 
@@ -98,8 +98,8 @@ 
 	 * @access        public
 	 * @param        string $QST_type
 	 */
-	public function set_question_type( $QST_type = '' ) {
-		$this->set( 'QST_type', $QST_type );
+	public function set_question_type($QST_type = '') {
+		$this->set('QST_type', $QST_type);
 	}
 
 
@@ -110,8 +110,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_required
 	 */
-	public function set_required( $QST_required = FALSE ) {
-		$this->set( 'QST_required', $QST_required );
+	public function set_required($QST_required = FALSE) {
+		$this->set('QST_required', $QST_required);
 	}
 
 
@@ -122,8 +122,8 @@ 
 	 * @access        public
 	 * @param        string $QST_required_text
 	 */
-	public function set_required_text( $QST_required_text = '' ) {
-		$this->set( 'QST_required_text', $QST_required_text );
+	public function set_required_text($QST_required_text = '') {
+		$this->set('QST_required_text', $QST_required_text);
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 * @access        public
 	 * @param        int $QST_order
 	 */
-	public function set_order( $QST_order = 0 ) {
-		$this->set( 'QST_order', $QST_order );
+	public function set_order($QST_order = 0) {
+		$this->set('QST_order', $QST_order);
 	}
 
 
@@ -146,8 +146,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_admin_only
 	 */
-	public function set_admin_only( $QST_admin_only = FALSE ) {
-		$this->set( 'QST_admin_only', $QST_admin_only );
+	public function set_admin_only($QST_admin_only = FALSE) {
+		$this->set('QST_admin_only', $QST_admin_only);
 	}
 
 
@@ -158,8 +158,8 @@ 
 	 * @access        public
 	 * @param        int $QST_wp_user
 	 */
-	public function set_wp_user( $QST_wp_user = 1 ) {
-		$this->set( 'QST_wp_user', $QST_wp_user );
+	public function set_wp_user($QST_wp_user = 1) {
+		$this->set('QST_wp_user', $QST_wp_user);
 	}
 
 
@@ -175,8 +175,8 @@ 
 	 * @access        public
 	 * @param 	bool $QST_deleted
 	 */
-	public function set_deleted( $QST_deleted = FALSE ) {
-		$this->set( 'QST_deleted', $QST_deleted );
+	public function set_deleted($QST_deleted = FALSE) {
+		$this->set('QST_deleted', $QST_deleted);
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	public function display_text() {
-		return $this->get( 'QST_display_text' );
+		return $this->get('QST_display_text');
 	}
 
 
@@ -198,7 +198,7 @@ 
 	 * @return string
 	 */
 	public function admin_label() {
-		return $this->get( 'QST_admin_label' );
+		return $this->get('QST_admin_label');
 	}
 
 
@@ -209,7 +209,7 @@ 
 	 * @return string
 	 */
 	public function system_ID() {
-		return $this->get( 'QST_system' );
+		return $this->get('QST_system');
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'QST_required' );
+		return $this->get('QST_required');
 	}
 
 
@@ -232,7 +232,7 @@ 
 	 * @return string
 	 */
 	public function required_text() {
-		return $this->get( 'QST_required_text' );
+		return $this->get('QST_required_text');
 	}
 
 
@@ -243,7 +243,7 @@ 
 	 * @return string
 	 */
 	public function type() {
-		return $this->get( 'QST_type' );
+		return $this->get('QST_type');
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QST_order' );
+		return $this->get('QST_order');
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return boolean
 	 */
 	public function admin_only() {
-		return $this->get( 'QST_admin_only' );
+		return $this->get('QST_admin_only');
 	}
 
 
@@ -278,7 +278,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'QST_wp_user' );
+		return $this->get('QST_wp_user');
 	}
 
 
@@ -289,7 +289,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * @return EE_Answer[]
 	 */
 	public function answers() {
-		return $this->get_many_related( 'Answer' );
+		return $this->get_many_related('Answer');
 	}
 
 
@@ -309,7 +309,7 @@ 
 	 * @return boolean true = has answers, false = no answers.
 	 */
 	public function has_answers() {
-		return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE;
+		return $this->count_related('Answer') > 0 ? TRUE : FALSE;
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return EE_Question_Group[]
 	 */
 	public function question_groups() {
-		return $this->get_many_related( 'Question_Group' );
+		return $this->get_many_related('Question_Group');
 	}
 
 
@@ -333,24 +333,24 @@ 
 	 *                                                       whether it was trashed or not.
 	 * @return EE_Question_Option[]
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
-		if ( ! $this->ID() ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
+		if ( ! $this->ID()) {
 			return array();
 		}
 		$query_params = array();
-		if ( $selected_value_to_always_include ) {
-			if ( is_array( $selected_value_to_always_include ) ) {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include );
+		if ($selected_value_to_always_include) {
+			if (is_array($selected_value_to_always_include)) {
+				$query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include);
 			} else {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include;
+				$query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include;
 			}
 		}
-		if ( $notDeletedOptionsOnly ) {
-			$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE;
+		if ($notDeletedOptionsOnly) {
+			$query_params[0]['OR*options-query']['QSO_deleted'] = FALSE;
 		}
 		//order by QSO_order
-		$query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' );
-		return $this->get_many_related( 'Question_Option', $query_params );
+		$query_params['order_by'] = array('QSO_order' => 'ASC');
+		return $this->get_many_related('Question_Option', $query_params);
 	}
 
 
@@ -360,7 +360,7 @@ 
 	 * @return \EE_Question_Option[]
 	 */
 	public function temp_options() {
-		return $this->_model_relations[ 'Question_Option' ];
+		return $this->_model_relations['Question_Option'];
 	}
 
 
@@ -371,8 +371,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_option( EE_Question_Option $option ) {
-		return $this->_add_relation_to( $option, 'Question_Option' );
+	public function add_option(EE_Question_Option $option) {
+		return $this->_add_relation_to($option, 'Question_Option');
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_temp_option( EE_Question_Option $option ) {
-		$this->_model_relations[ 'Question_Option' ][ ] = $option;
+	public function add_temp_option(EE_Question_Option $option) {
+		$this->_model_relations['Question_Option'][] = $option;
 		return TRUE;
 	}
 
@@ -394,8 +394,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function remove_option( EE_Question_Option $option ) {
-		return $this->_remove_relation_to( $option, 'Question_Option' );
+	public function remove_option(EE_Question_Option $option) {
+		return $this->_remove_relation_to($option, 'Question_Option');
 	}
 
 
@@ -404,8 +404,8 @@ 
 	 * @return bool
 	 */
 	public function is_system_question() {
-		$system_ID = $this->get( 'QST_system' );
-		return ! empty( $system_ID ) ? TRUE : FALSE;
+		$system_ID = $this->get('QST_system');
+		return ! empty($system_ID) ? TRUE : FALSE;
 	}
 
 
@@ -418,8 +418,8 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_order();
-		$latest_order ++;
-		$this->set( 'QST_order', $latest_order );
+		$latest_order++;
+		$this->set('QST_order', $latest_order);
 	}
 
 
@@ -438,20 +438,20 @@ 
 	 * Duplicates this question and its question options
 	 * @return \EE_Question
 	 */
-	public function duplicate( $options = array() ) {
+	public function duplicate($options = array()) {
 		$new_question = clone $this;
-		$new_question->set( 'QST_ID', null );
-		$new_question->set_display_text( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->display_text() ) );
-		$new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) );
-		$new_question->set_system_ID( null );
-		$new_question->set_wp_user( get_current_user_id() );
+		$new_question->set('QST_ID', null);
+		$new_question->set_display_text(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->display_text()));
+		$new_question->set_admin_label(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->admin_label()));
+		$new_question->set_system_ID(null);
+		$new_question->set_wp_user(get_current_user_id());
                 //if we're duplicating a trashed question, assume we don't want the new one to be trashed
-                $new_question->set_deleted( false );
+                $new_question->set_deleted(false);
 		$success = $new_question->save();
-		if( $success ) {
+		if ($success) {
 			//we don't totally want to duplicate the question options, because we want them to be for the NEW question
-			foreach( $this->options() as $question_option ) {
-				$question_option->duplicate( array( 'QST_ID' => $new_question->ID() ) );
+			foreach ($this->options() as $question_option) {
+				$question_option->duplicate(array('QST_ID' => $new_question->ID()));
 			}
 			return $new_question;
 		} else {
@@ -464,7 +464,7 @@ 
 	 * @return int|float
 	 */
 	public function max() {
-		return $this->get( 'QST_max' );
+		return $this->get('QST_max');
 	}
 	
 	/**
@@ -472,8 +472,8 @@ 
 	 * @param int|float $new_max
 	 * @return int|float
 	 */
-	public function set_max( $new_max ) {
-		return $this->set( 'QST_max', $new_max );
+	public function set_max($new_max) {
+		return $this->set('QST_max', $new_max);
 	}
 
 

admin_pages/registration_form/Registration_Form_Admin_Page.core.php

Spacing +144 added lines, -144 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -58,12 +58,12 @@ 
 
 
 
-	public function __construct( $routing = TRUE ) {
-		require_once( EE_MODELS . 'EEM_Question.model.php' );
-		require_once( EE_MODELS . 'EEM_Question_Group.model.php' );
-		$this->_question_model=  EEM_Question::instance();
-		$this->_question_group_model=EEM_Question_Group::instance();
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		require_once(EE_MODELS.'EEM_Question.model.php');
+		require_once(EE_MODELS.'EEM_Question_Group.model.php');
+		$this->_question_model = EEM_Question::instance();
+		$this->_question_group_model = EEM_Question_Group::instance();
+		parent::__construct($routing);
 	}
 
 
@@ -97,7 +97,7 @@ 
 
 
 	protected function _set_page_routes() {
-		$qst_id = ! empty( $this->_req_data['QST_ID'] ) ? $this->_req_data['QST_ID'] : 0;
+		$qst_id = ! empty($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
 		$this->_page_routes = array(
 			'default' => array(
 				'func' => '_questions_overview_list_table',
@@ -118,7 +118,7 @@ 
 
 			'update_question' => array(
 				'func' => '_insert_or_update_question',
-				'args' => array('new_question' => FALSE ),
+				'args' => array('new_question' => FALSE),
 				'capability' => 'ee_edit_question',
 				'obj_id' => $qst_id,
 				'noheader' => TRUE,
@@ -153,7 +153,7 @@ 
 						'filename' => 'registration_form_questions_overview_views_bulk_actions_search'
 						)
 					),
-				'help_tour' => array( 'Registration_Form_Questions_Overview_Help_Tour'),
+				'help_tour' => array('Registration_Form_Questions_Overview_Help_Tour'),
 				'require_nonce' => FALSE,
 				'qtips' => array(
 					'EE_Registration_Form_Tips'
@@ -172,7 +172,7 @@ 
 						'filename' => 'registration_form_question_groups'
 						),
 					),
-				'help_tour' => array( 'Registration_Form_Question_Groups_Help_Tour'),
+				'help_tour' => array('Registration_Form_Question_Groups_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 
@@ -181,16 +181,16 @@ 
 					'label' => __('Edit Question', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['question_id']) ? add_query_arg(array('question_id' => $this->_req_data['question_id'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['question_id']) ? add_query_arg(array('question_id' => $this->_req_data['question_id']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'help_tabs' => array(
 					'registration_form_edit_question_group_help_tab' => array(
 						'title' => __('Edit Question', 'event_espresso'),
 						'filename' => 'registration_form_edit_question'
 						),
 					),
-                'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
+                'help_tour' => array('Registration_Form_Edit_Question_Help_Tour'),
 				'require_nonce' => FALSE
 				),
 			);
@@ -218,7 +218,7 @@ 
 	//none of the below group are currently used for Event Categories
 	protected function _add_feature_pointers() {}
 	public function load_scripts_styles() {
-		wp_register_style( 'espresso_registration', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_registration', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_registration');
 	}
 	public function admin_init() {}
@@ -234,20 +234,20 @@ 
 
 	public function load_scripts_styles_add_question() {
 		$this->load_scripts_styles_forms();
-		wp_register_script( 'espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_registration_form_single' );
+		wp_register_script('espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_registration_form_single');
 	}
 	public function load_scripts_styles_edit_question() {
 		$this->load_scripts_styles_forms();
-		wp_register_script( 'espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'espresso_registration_form_single' );
+		wp_register_script('espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('espresso_registration_form_single');
 	}
 
 
 
 
 	public function recaptcha_info_help_tab() {
-		$template = REGISTRATION_FORM_TEMPLATE_PATH . 'recaptcha_info_help_tab.template.php';
+		$template = REGISTRATION_FORM_TEMPLATE_PATH.'recaptcha_info_help_tab.template.php';
 		EEH_Template::display_template($template, array());
 	}
 
@@ -279,7 +279,7 @@ 
 				)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_questions', 'espresso_registration_form_trash_questions' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_questions')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => __('Trash', 'event_espresso'),
@@ -297,9 +297,9 @@ 
 	 */
 	protected function _questions_groups_preview() {
 		$this->_admin_page_title = __('Question Groups (Preview)', 'event_espresso');
-		$this->_template_args['preview_img'] = '<img src="' . REGISTRATION_FORM_ASSETS_URL . 'caf_reg_form_preview.jpg" alt="' . esc_attr__( 'Preview Question Groups Overview List Table screenshot', 'event_espresso' ) . '" />';
-		$this->_template_args['preview_text'] = '<strong>'.__( 'Question Groups is a feature that is only available in the Caffeinated version of Event Espresso.  With the Question Groups feature you are able to: create new question groups, edit existing question groups, and also create and edit new questions and add them to question groups.', 'event_espresso' ).'</strong>';
-		$this->display_admin_caf_preview_page( 'question_groups_tab' );
+		$this->_template_args['preview_img'] = '<img src="'.REGISTRATION_FORM_ASSETS_URL.'caf_reg_form_preview.jpg" alt="'.esc_attr__('Preview Question Groups Overview List Table screenshot', 'event_espresso').'" />';
+		$this->_template_args['preview_text'] = '<strong>'.__('Question Groups is a feature that is only available in the Caffeinated version of Event Espresso.  With the Question Groups feature you are able to: create new question groups, edit existing question groups, and also create and edit new questions and add them to question groups.', 'event_espresso').'</strong>';
+		$this->display_admin_caf_preview_page('question_groups_tab');
 	}
 
 
@@ -308,58 +308,58 @@ 
 	 * Extracts the question field's values from the POST request to update or insert them
 	 * @return array where each key is the name of a model's field/db column, and each value is its value.
 	 */
-	protected function _set_column_values_for(EEM_Base $model){
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=array();
+	protected function _set_column_values_for(EEM_Base $model) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = array();
 
 		//some initial checks for proper values.
 		//if QST_admin_only, then no matter what QST_required is we disable.
-		if ( !empty( $this->_req_data['QST_admin_only'] ) ) {
+		if ( ! empty($this->_req_data['QST_admin_only'])) {
 			$this->_req_data['QST_required'] = 0;
 		}
-		foreach($model->field_settings() as $fieldName=>$settings){
+		foreach ($model->field_settings() as $fieldName=>$settings) {
 			// basically if QSG_identifier is empty or not set
-			if ( $fieldName == 'QSG_identifier' && ( isset( $this->_req_data['QSG_identifier'] ) && empty( $this->_req_data['QSG_identifier'] ) )) {
-				$QSG_name = isset( $this->_req_data['QSG_name'] ) ? $this->_req_data['QSG_name'] : '' ;
-				$set_column_values[$fieldName] = sanitize_title($QSG_name ) . '-' . uniqid();
+			if ($fieldName == 'QSG_identifier' && (isset($this->_req_data['QSG_identifier']) && empty($this->_req_data['QSG_identifier']))) {
+				$QSG_name = isset($this->_req_data['QSG_name']) ? $this->_req_data['QSG_name'] : '';
+				$set_column_values[$fieldName] = sanitize_title($QSG_name).'-'.uniqid();
 //				dd($set_column_values);
 			}
 			//if the admin label is blank, use a slug version of the question text
-			else if ( $fieldName == 'QST_admin_label' && ( isset( $this->_req_data['QST_admin_label'] ) && empty( $this->_req_data['QST_admin_label'] )  )) {
-				$QST_text = isset( $this->_req_data['QST_display_text'] ) ? $this->_req_data['QST_display_text'] : '' ;
-				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text,10));
+			else if ($fieldName == 'QST_admin_label' && (isset($this->_req_data['QST_admin_label']) && empty($this->_req_data['QST_admin_label']))) {
+				$QST_text = isset($this->_req_data['QST_display_text']) ? $this->_req_data['QST_display_text'] : '';
+				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text, 10));
 			}
 
 
-			else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
+			else if ($fieldName == 'QST_admin_only' && ( ! isset($this->_req_data['QST_admin_only']))) {
 				$set_column_values[$fieldName] = 0;
 			}
 			
-			else if ( $fieldName == 'QST_max' ) {
+			else if ($fieldName == 'QST_max') {
 				$qst_system = EEM_Question::instance()->get_var( 
 					array(
 						array(
-							'QST_ID' => $this->_req_data[ 'QST_ID' ]
+							'QST_ID' => $this->_req_data['QST_ID']
 						)
 					), 
 					'QST_system' );
-				$max_max = EEM_Question::instance()->max_max_for_system_question( $qst_system );
-				if( empty( $this->_req_data[ 'QST_max' ] ) ||
-					 $this->_req_data[ 'QST_max' ] > $max_max ) {
-					$set_column_values[ $fieldName ] = $max_max;
+				$max_max = EEM_Question::instance()->max_max_for_system_question($qst_system);
+				if (empty($this->_req_data['QST_max']) ||
+					 $this->_req_data['QST_max'] > $max_max) {
+					$set_column_values[$fieldName] = $max_max;
 				}
 			}
 
 
 			//only add a property to the array if it's not null (otherwise the model should just use the default value)
-			if(
-				! isset( $set_column_values[ $fieldName ] ) &&
-				isset($this->_req_data[$fieldName] ) ){
-				$set_column_values[$fieldName]=$this->_req_data[$fieldName];
+			if (
+				! isset($set_column_values[$fieldName]) &&
+				isset($this->_req_data[$fieldName]) ) {
+				$set_column_values[$fieldName] = $this->_req_data[$fieldName];
 			}
 
 		}
-		return $set_column_values;//validation fo this data to be performed by the model before insertion.
+		return $set_column_values; //validation fo this data to be performed by the model before insertion.
 	}
 
 
@@ -372,87 +372,87 @@ 
 
 
 
-	protected function _edit_question( $action= 'add' ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$ID=isset( $this->_req_data['QST_ID'] ) && ! empty( $this->_req_data['QST_ID'] ) ? absint( $this->_req_data['QST_ID'] ) : FALSE;
+	protected function _edit_question($action = 'add') {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$ID = isset($this->_req_data['QST_ID']) && ! empty($this->_req_data['QST_ID']) ? absint($this->_req_data['QST_ID']) : FALSE;
 
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
 		// add PRC_ID to title if editing
-		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
-		if($ID){
-			$question=$this->_question_model->get_one_by_ID($ID);
-			$additional_hidden_fields=array('QST_ID'=>array('type'=>'hidden','value'=>$ID));
+		$this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
+		if ($ID) {
+			$question = $this->_question_model->get_one_by_ID($ID);
+			$additional_hidden_fields = array('QST_ID'=>array('type'=>'hidden', 'value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question', $additional_hidden_fields);
-		}else{
-			$question= EE_Question::new_instance();
+		} else {
+			$question = EE_Question::new_instance();
 			$question->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question');
 		}
-		$question_types = $question->has_answers() ?  $this->_question_model->question_types_in_same_category( $question->type() ) : $this->_question_model->allowed_question_types();
-		$this->_template_args['QST_ID']=$ID;
-		$this->_template_args['question']=$question;
-		$this->_template_args['question_types']= $question_types;
-		$this->_template_args['max_max'] = EEM_Question::instance()->max_max_for_system_question( $question->system_ID() );
+		$question_types = $question->has_answers() ? $this->_question_model->question_types_in_same_category($question->type()) : $this->_question_model->allowed_question_types();
+		$this->_template_args['QST_ID'] = $ID;
+		$this->_template_args['question'] = $question;
+		$this->_template_args['question_types'] = $question_types;
+		$this->_template_args['max_max'] = EEM_Question::instance()->max_max_for_system_question($question->system_ID());
 
-		$this->_set_publish_post_box_vars( 'id', $ID );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_TEMPLATE_PATH . 'questions_main_meta_box.template.php', $this->_template_args, TRUE );
+		$this->_set_publish_post_box_vars('id', $ID);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_TEMPLATE_PATH.'questions_main_meta_box.template.php', $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
 	}
 
 	protected function _insert_or_update_question($new_question = TRUE) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$set_column_values=$this->_set_column_values_for($this->_question_model);
-		if($new_question){
-			$ID=$this->_question_model->insert($set_column_values);
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$set_column_values = $this->_set_column_values_for($this->_question_model);
+		if ($new_question) {
+			$ID = $this->_question_model->insert($set_column_values);
 			$success = $ID ? true : false;
 			$action_desc = 'added';
-		}else{
-			$ID=absint($this->_req_data['QST_ID']);
-			$pk=$this->_question_model->primary_key_name();
-			$wheres=array($pk=>$ID);
+		} else {
+			$ID = absint($this->_req_data['QST_ID']);
+			$pk = $this->_question_model->primary_key_name();
+			$wheres = array($pk=>$ID);
 			unset($set_column_values[$pk]);
-			$success= $this->_question_model->update($set_column_values,array($wheres));
-			$action_desc='updated';
+			$success = $this->_question_model->update($set_column_values, array($wheres));
+			$action_desc = 'updated';
 		}
 
-		if ($ID){
+		if ($ID) {
 			//save the related options
 			//trash removed options, save old ones
 			//get list of all options
 			/** @type EE_Question $question */
-			$question=$this->_question_model->get_one_by_ID($ID);
-			$options=$question->options();
-			if(! empty($options)){
-				foreach($options as $option_ID=>$option){
-					$option_req_index=$this->_get_option_req_data_index($option_ID);
-					if($option_req_index!==FALSE){
+			$question = $this->_question_model->get_one_by_ID($ID);
+			$options = $question->options();
+			if ( ! empty($options)) {
+				foreach ($options as $option_ID=>$option) {
+					$option_req_index = $this->_get_option_req_data_index($option_ID);
+					if ($option_req_index !== FALSE) {
 						$option->save($this->_req_data['question_options'][$option_req_index]);
-					}else{
+					} else {
 						//not found, remove it
 						$option->delete();
 					}
 				}
 			}
 			//save new related options
-			foreach($this->_req_data['question_options'] as $index=>$option_req_data){
-				if( empty($option_req_data['QSO_ID'] ) && (  ( isset( $option_req_data['QSO_value'] ) && $option_req_data['QSO_value'] !== '' ) || ! empty( $option_req_data['QSO_desc'] ) ) ) {//no ID! save it!
-					if( ! isset( $option_req_data['QSO_value'] ) || $option_req_data['QSO_value'] === ''  ){
-						$option_req_data['QSO_value']=$option_req_data['QSO_desc'];
+			foreach ($this->_req_data['question_options'] as $index=>$option_req_data) {
+				if (empty($option_req_data['QSO_ID']) && ((isset($option_req_data['QSO_value']) && $option_req_data['QSO_value'] !== '') || ! empty($option_req_data['QSO_desc']))) {//no ID! save it!
+					if ( ! isset($option_req_data['QSO_value']) || $option_req_data['QSO_value'] === '') {
+						$option_req_data['QSO_value'] = $option_req_data['QSO_desc'];
 					}
-					$new_option=EE_Question_Option::new_instance( array( 'QSO_value' => $option_req_data['QSO_value'], 'QSO_desc' => $option_req_data['QSO_desc'], 'QSO_order' => $option_req_data['QSO_order'], 'QST_ID' => $question->ID()));
+					$new_option = EE_Question_Option::new_instance(array('QSO_value' => $option_req_data['QSO_value'], 'QSO_desc' => $option_req_data['QSO_desc'], 'QSO_order' => $option_req_data['QSO_order'], 'QST_ID' => $question->ID()));
 					$new_option->save();
 				}
 			}
 		}
-		$query_args = array( 'action' => 'edit_question', 'QST_ID' => $ID );
-		if ( $success !== FALSE ) {
-			$msg = $new_question ? sprintf( __('The %s has been created', 'event_espresso'), $this->_question_model->item_name() ) : sprintf( __('The %s has been updated', 'event_espresso' ), $this->_question_model->item_name() );
-			EE_Error::add_success( $msg );
+		$query_args = array('action' => 'edit_question', 'QST_ID' => $ID);
+		if ($success !== FALSE) {
+			$msg = $new_question ? sprintf(__('The %s has been created', 'event_espresso'), $this->_question_model->item_name()) : sprintf(__('The %s has been updated', 'event_espresso'), $this->_question_model->item_name());
+			EE_Error::add_success($msg);
 		}
 
-		$this->_redirect_after_action( FALSE, '', $action_desc, $query_args, TRUE);
+		$this->_redirect_after_action(FALSE, '', $action_desc, $query_args, TRUE);
 	}
 
 
@@ -465,10 +465,10 @@ 
 	 * @param int $ID of the question option to find
 	 * @return int index in question_options array if successful, FALSE if unsuccessful
 	 */
-	protected function _get_option_req_data_index($ID){
-		$req_data_for_question_options=$this->_req_data['question_options'];
-		foreach($req_data_for_question_options as $num=>$option_data){
-			if(array_key_exists('QSO_ID',$option_data) && intval($option_data['QSO_ID'])==$ID){
+	protected function _get_option_req_data_index($ID) {
+		$req_data_for_question_options = $this->_req_data['question_options'];
+		foreach ($req_data_for_question_options as $num=>$option_data) {
+			if (array_key_exists('QSO_ID', $option_data) && intval($option_data['QSO_ID']) == $ID) {
 				return $num;
 			}
 		}
@@ -489,25 +489,25 @@ 
 	 * @param EEM_Base $model either EEM_Question or EEM_Question_Group
 	 * @return array lik EEM_Base::get_all's $query_params parameter
 	 */
-	protected function get_query_params($model, $per_page=10,$current_page=10){
+	protected function get_query_params($model, $per_page = 10, $current_page = 10) {
 		$query_params = array();
-		$offset=($current_page-1)*$per_page;
-		$query_params['limit']=array($offset,$per_page);
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$offset = ($current_page - 1) * $per_page;
+		$query_params['limit'] = array($offset, $per_page);
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 		$orderby_field = $model instanceof EEM_Question ? 'QST_ID' : 'QSG_order';
 		$field_to_order_by = empty($this->_req_data['orderby']) ? $orderby_field : $this->_req_data['orderby'];
-		$query_params['order_by']=array( $field_to_order_by => $order );
-		$search_string = array_key_exists('s',$this->_req_data) ? $this->_req_data['s'] : null;
-		if(! empty($search_string)){
-			if($model instanceof EEM_Question_Group){
-				$query_params[0]=array(
+		$query_params['order_by'] = array($field_to_order_by => $order);
+		$search_string = array_key_exists('s', $this->_req_data) ? $this->_req_data['s'] : null;
+		if ( ! empty($search_string)) {
+			if ($model instanceof EEM_Question_Group) {
+				$query_params[0] = array(
 					'OR'=>array(
-						'QSG_name'=>array('LIKE',"%$search_string%"),
-						'QSG_desc'=>array('LIKE',"%$search_string%"))
+						'QSG_name'=>array('LIKE', "%$search_string%"),
+						'QSG_desc'=>array('LIKE', "%$search_string%"))
 					);
-			}else{
-				$query_params[0]=array(
-					'QST_display_text'=>array('LIKE',"%$search_string%")
+			} else {
+				$query_params[0] = array(
+					'QST_display_text'=>array('LIKE', "%$search_string%")
 					);
 			}
 		}
@@ -549,13 +549,13 @@ 
 
 
 
-	public function get_questions( $per_page=10,$current_page = 1, $count = FALSE ) {
+	public function get_questions($per_page = 10, $current_page = 1, $count = FALSE) {
 		$QST = EEM_Question::instance();
 		$query_params = $this->get_query_params($QST, $per_page, $current_page);
-		if ($count){
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
+		if ($count) {
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
 			$results = $QST->count($where);
-		}else{
+		} else {
 			$results = $QST->get_all($query_params);
 		}
 		return $results;
@@ -564,20 +564,20 @@ 
 
 
 
-	public function get_trashed_questions( $per_page,$current_page = 1, $count = FALSE ) {
-		$query_params=$this->get_query_params(EEM_Question::instance(),$per_page,$current_page);
-		$where = isset( $query_params[0] ) ? array($query_params[0]) : array();
-		$questions=$count ? EEM_Question::instance()->count_deleted($where) : EEM_Question::instance()->get_all_deleted($query_params);
+	public function get_trashed_questions($per_page, $current_page = 1, $count = FALSE) {
+		$query_params = $this->get_query_params(EEM_Question::instance(), $per_page, $current_page);
+		$where = isset($query_params[0]) ? array($query_params[0]) : array();
+		$questions = $count ? EEM_Question::instance()->count_deleted($where) : EEM_Question::instance()->get_all_deleted($query_params);
 		return $questions;
 	}
 
 
 
-	public function get_question_groups( $per_page,$current_page = 1, $count = FALSE ) {
+	public function get_question_groups($per_page, $current_page = 1, $count = FALSE) {
 		/** @type EEM_Question_Group $questionGroupModel */
-		$questionGroupModel=EEM_Question_Group::instance();
-		$query_params=$this->get_query_params( $questionGroupModel, $per_page, $current_page );
-		$questionGroups=$questionGroupModel->get_all($query_params);//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
+		$questionGroupModel = EEM_Question_Group::instance();
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
+		$questionGroups = $questionGroupModel->get_all($query_params); //note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
 		return $questionGroups;
 	}
 
@@ -594,36 +594,36 @@ 
 
 		$this->_template_args['values'] = $this->_yes_no_values;
 
-		$this->_template_args['use_captcha'] = isset( EE_Registry::instance()->CFG->registration->use_captcha ) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE;
-		$this->_template_args['show_captcha_settings'] = $this->_template_args['use_captcha'] ? 'style="display:table-row;"': '';
+		$this->_template_args['use_captcha'] = isset(EE_Registry::instance()->CFG->registration->use_captcha) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE;
+		$this->_template_args['show_captcha_settings'] = $this->_template_args['use_captcha'] ? 'style="display:table-row;"' : '';
 
-		$this->_template_args['recaptcha_publickey'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) : '';
-		$this->_template_args['recaptcha_privatekey'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) : '';
-		$this->_template_args['recaptcha_width'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_width ) ? absint( EE_Registry::instance()->CFG->registration->recaptcha_width ) : 500;
+		$this->_template_args['recaptcha_publickey'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_publickey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_publickey) : '';
+		$this->_template_args['recaptcha_privatekey'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) : '';
+		$this->_template_args['recaptcha_width'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_width) ? absint(EE_Registry::instance()->CFG->registration->recaptcha_width) : 500;
 
 		$this->_template_args['recaptcha_theme_options'] = array(
-				array('id'  => 'red','text'=> __('Red', 'event_espresso')),
-				array('id'  => 'white','text'=> __('White', 'event_espresso')),
-				array('id'  => 'blackglass','text'=> __('Blackglass', 'event_espresso')),
-				array('id'  => 'clean','text'=> __('Clean', 'event_espresso'))
+				array('id'  => 'red', 'text'=> __('Red', 'event_espresso')),
+				array('id'  => 'white', 'text'=> __('White', 'event_espresso')),
+				array('id'  => 'blackglass', 'text'=> __('Blackglass', 'event_espresso')),
+				array('id'  => 'clean', 'text'=> __('Clean', 'event_espresso'))
 			);
-		$this->_template_args['recaptcha_theme'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_theme ) ? EE_Registry::instance()->CFG->registration->get_pretty( 'recaptcha_theme' ) : 'clean';
+		$this->_template_args['recaptcha_theme'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_theme) ? EE_Registry::instance()->CFG->registration->get_pretty('recaptcha_theme') : 'clean';
 
 		$this->_template_args['recaptcha_language_options'] = array(
-				array('id'  => 'en','text'=> __('English', 'event_espresso')),
-				array('id'  => 'es','text'=> __('Spanish', 'event_espresso')),
-				array('id'  => 'nl','text'=> __('Dutch', 'event_espresso')),
-				array('id'  => 'fr','text'=> __('French', 'event_espresso')),
-				array('id'  => 'de','text'=> __('German', 'event_espresso')),
-				array('id'  => 'pt','text'=> __('Portuguese', 'event_espresso')),
-				array('id'  => 'ru','text'=> __('Russian', 'event_espresso')),
-				array('id'  => 'tr','text'=> __('Turkish', 'event_espresso'))
+				array('id'  => 'en', 'text'=> __('English', 'event_espresso')),
+				array('id'  => 'es', 'text'=> __('Spanish', 'event_espresso')),
+				array('id'  => 'nl', 'text'=> __('Dutch', 'event_espresso')),
+				array('id'  => 'fr', 'text'=> __('French', 'event_espresso')),
+				array('id'  => 'de', 'text'=> __('German', 'event_espresso')),
+				array('id'  => 'pt', 'text'=> __('Portuguese', 'event_espresso')),
+				array('id'  => 'ru', 'text'=> __('Russian', 'event_espresso')),
+				array('id'  => 'tr', 'text'=> __('Turkish', 'event_espresso'))
 			);
-		$this->_template_args['recaptcha_language'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_language ) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en';
+		$this->_template_args['recaptcha_language'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_language) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en';
 
-		$this->_set_add_edit_form_tags( 'update_reg_form_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_TEMPLATE_PATH . 'reg_form_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_reg_form_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_TEMPLATE_PATH.'reg_form_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 

Braces +9 added lines, -13 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
@@ -328,14 +329,9 @@ 
 			else if ( $fieldName == 'QST_admin_label' && ( isset( $this->_req_data['QST_admin_label'] ) && empty( $this->_req_data['QST_admin_label'] )  )) {
 				$QST_text = isset( $this->_req_data['QST_display_text'] ) ? $this->_req_data['QST_display_text'] : '' ;
 				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text,10));
-			}
-
-
-			else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
+			} else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
 				$set_column_values[$fieldName] = 0;
-			}
-			
-			else if ( $fieldName == 'QST_max' ) {
+			} else if ( $fieldName == 'QST_max' ) {
 				$qst_system = EEM_Question::instance()->get_var( 
 					array(
 						array(
@@ -383,7 +379,7 @@ 
 			$question=$this->_question_model->get_one_by_ID($ID);
 			$additional_hidden_fields=array('QST_ID'=>array('type'=>'hidden','value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question', $additional_hidden_fields);
-		}else{
+		} else{
 			$question= EE_Question::new_instance();
 			$question->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question');
@@ -408,7 +404,7 @@ 
 			$ID=$this->_question_model->insert($set_column_values);
 			$success = $ID ? true : false;
 			$action_desc = 'added';
-		}else{
+		} else{
 			$ID=absint($this->_req_data['QST_ID']);
 			$pk=$this->_question_model->primary_key_name();
 			$wheres=array($pk=>$ID);
@@ -429,7 +425,7 @@ 
 					$option_req_index=$this->_get_option_req_data_index($option_ID);
 					if($option_req_index!==FALSE){
 						$option->save($this->_req_data['question_options'][$option_req_index]);
-					}else{
+					} else{
 						//not found, remove it
 						$option->delete();
 					}
@@ -505,7 +501,7 @@ 
 						'QSG_name'=>array('LIKE',"%$search_string%"),
 						'QSG_desc'=>array('LIKE',"%$search_string%"))
 					);
-			}else{
+			} else{
 				$query_params[0]=array(
 					'QST_display_text'=>array('LIKE',"%$search_string%")
 					);
@@ -555,7 +551,7 @@ 
 		if ($count){
 			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
 			$results = $QST->count($where);
-		}else{
+		} else{
 			$results = $QST->get_all($query_params);
 		}
 		return $results;

admin_pages/registration_form/templates/questions_main_meta_box.template.php

Spacing +53 added lines, -53 removed lines

@@ -21,7 +21,7 @@ 
 		<tbody>
 			<tr>
 				<th>
-					<label for="QST_display_text"><?php echo $fields['QST_display_text']->get_nicename();?></label> <?php echo EEH_Template::get_help_tab_link('question_text_info');?>
+					<label for="QST_display_text"><?php echo $fields['QST_display_text']->get_nicename(); ?></label> <?php echo EEH_Template::get_help_tab_link('question_text_info'); ?>
 				</th>
 				<td>
 					<input type="text" class="regular-text" id="QST_display_text" name="QST_display_text" value="<?php $question->f('QST_display_text')?>"/>
@@ -31,23 +31,23 @@ 
 
 			<tr>
 				<th>
-					<label for="QST_admin_label"><?php echo $fields['QST_admin_label']->get_nicename();?></label> <?php echo EEH_Template::get_help_tab_link('question_label_info');?>
+					<label for="QST_admin_label"><?php echo $fields['QST_admin_label']->get_nicename(); ?></label> <?php echo EEH_Template::get_help_tab_link('question_label_info'); ?>
 				</th>
 				<td>
 					<?php
-						$disabled = ! empty( $QST_system ) ? ' disabled="disabled"' : '';
-						$id =  ! empty( $QST_system ) ? '_disabled' : '';
+						$disabled = ! empty($QST_system) ? ' disabled="disabled"' : '';
+						$id = ! empty($QST_system) ? '_disabled' : '';
 					?>
 					<input type="text" class="regular-text" id="QST_admin_label<?php echo $id?>" name="QST_admin_label<?php echo $id?>" value="<?php $question->f('QST_admin_label')?>"<?php echo $disabled?>/>
 					<input class="QST_order" type="hidden" id="QST_order<?php echo $id; ?>" name = "QST_order<?php echo $id; ?>" value="<?php echo $question->get('QST_order'); ?>" />
-					<?php if ( ! empty( $QST_system )) { ?>
+					<?php if ( ! empty($QST_system)) { ?>
 						<input type="hidden"  id="QST_admin_label" name="QST_admin_label" value="<?php echo $question->admin_label()?>"/>
 					<?php } ?>
 					<br/>
 					<p class="description">
-					<?php if ( ! empty( $QST_system )) { ?>
+					<?php if ( ! empty($QST_system)) { ?>
 					<span class="description" style="color:#D54E21;">
-						<?php _e('System question! This field cannot be changed.','event_espresso')?>
+						<?php _e('System question! This field cannot be changed.', 'event_espresso')?>
 					</span>
 					<?php } ?>
 
@@ -57,21 +57,21 @@ 
 
 			<tr>
 				<th>
-					<label for="QST_admin_only"><?php echo $fields['QST_admin_only']->get_nicename();?></label> <?php echo EEH_Template::get_help_tab_link('question_admin_only_info');?>
+					<label for="QST_admin_only"><?php echo $fields['QST_admin_only']->get_nicename(); ?></label> <?php echo EEH_Template::get_help_tab_link('question_admin_only_info'); ?>
 				</th>
 				<td>
 					<?php
-						$disabled = ! empty( $QST_system ) ? ' disabled="disabled"' : '';
-						$id =  ! empty( $QST_system ) ? '_disabled' : '';
+						$disabled = ! empty($QST_system) ? ' disabled="disabled"' : '';
+						$id = ! empty($QST_system) ? '_disabled' : '';
 						$admin_only = $question->get('QST_admin_only');
-						$checked = !empty( $admin_only ) ? ' checked="checked"' : '';
+						$checked = ! empty($admin_only) ? ' checked="checked"' : '';
 					?>
 					<input class="QST_admin_only" type="checkbox" id="QST_admin_only<?php echo $id; ?>" name = "QST_admin_only<?php echo $id; ?>" value="1"<?php echo $disabled; echo $checked; ?>/>
 					<br/>
 					<p class="description">
-					<?php if ( ! empty( $QST_system )) { ?>
+					<?php if ( ! empty($QST_system)) { ?>
 					<span class="description" style="color:#D54E21;">
-						<?php _e('System question! This field cannot be changed.','event_espresso')?>
+						<?php _e('System question! This field cannot be changed.', 'event_espresso')?>
 					</span>
 					<?php } ?>
 
@@ -81,21 +81,21 @@ 
 
 			<tr>
 				<th>
-					<label for="QST_type"><?php echo $fields['QST_type']->get_nicename();?></label> <?php echo EEH_Template::get_help_tab_link('question_type_info');?>
+					<label for="QST_type"><?php echo $fields['QST_type']->get_nicename(); ?></label> <?php echo EEH_Template::get_help_tab_link('question_type_info'); ?>
 				</th>
 				<td>
 					<?php
-						$disabled = ! empty( $QST_system ) ? ' disabled="disabled"' : '';
-						$id =  ! empty( $QST_system ) ? '_disabled' : '';
-						echo EEH_Form_Fields::select_input( 'QST_type' . $id, $question_types, $question->type(), 'id="QST_type' . $id . '"' . $disabled );
-						if( ! empty( $QST_system ) ) { ?>
+						$disabled = ! empty($QST_system) ? ' disabled="disabled"' : '';
+						$id = ! empty($QST_system) ? '_disabled' : '';
+						echo EEH_Form_Fields::select_input('QST_type'.$id, $question_types, $question->type(), 'id="QST_type'.$id.'"'.$disabled);
+						if ( ! empty($QST_system)) { ?>
 							<input type="hidden"  id="QST_type" name="QST_type" value="<?php echo $question->type()?>"/>
 						<?php
-							$explanatory_text = __('System question! This field cannot be changed.','event_espresso');
-						}else{
-							$explanatory_text = __('Because there are currently answers for this question in the database, your options to change the question type have been limited to similar question-types.','event_espresso');
+							$explanatory_text = __('System question! This field cannot be changed.', 'event_espresso');
+						} else {
+							$explanatory_text = __('Because there are currently answers for this question in the database, your options to change the question type have been limited to similar question-types.', 'event_espresso');
 						}
-						if ( ! empty( $QST_system ) || $has_answers ) { ?>
+						if ( ! empty($QST_system) || $has_answers) { ?>
 							<p><span class="description" style="color:#D54E21;">
 								<?php echo $explanatory_text; ?>
 							</span></p>
@@ -108,21 +108,21 @@ 
 			<tr id="text_input_question_options">
 				<th>
 					<label>
-						<?php _e( 'Maximum Allowed Response Size', 'event_espresso' );?>
+						<?php _e('Maximum Allowed Response Size', 'event_espresso'); ?>
 					</label>
 				</th>
 				<td>
-					<input id="QST_max" name="QST_max" type="number" <?php echo $max_max == EE_INF ? '' : "max='$max_max'";?> value="<?php $question->f( 'QST_max' );?>">
+					<input id="QST_max" name="QST_max" type="number" <?php echo $max_max == EE_INF ? '' : "max='$max_max'"; ?> value="<?php $question->f('QST_max'); ?>">
 					<p>
 						<span class="description">
-							<?php _e( 'Maximum number of characters allowed when answering this question', 'event_espresso' );?>
+							<?php _e('Maximum number of characters allowed when answering this question', 'event_espresso'); ?>
 						</span>
 					</p>
 					<p>
 						<span class="description" style="color:#D54E21;">
 							<?php printf(
-									__( 'System question! The maximum number of characters that can be used for this question is %1$s', 'event_espresso' ),
-									$max_max );?>
+									__('System question! The maximum number of characters that can be used for this question is %1$s', 'event_espresso'),
+									$max_max ); ?>
 						</span>
 					</p>
 				</td>
@@ -130,7 +130,7 @@ 
 			<tr id="question_options">
 				<th>
 					<label>
-						<?php _e('Answer Options','event_espresso')?>
+						<?php _e('Answer Options', 'event_espresso')?>
 					</label>
 				</th>
 				<td>
@@ -139,10 +139,10 @@ 
 						<thead>
 							<tr>
 								<th class="option-value-header">
-									<?php _e('Value','event_espresso')?>
+									<?php _e('Value', 'event_espresso')?>
 								</th>
 								<th class="option-desc-header">
-									<?php _e('Description (optional, only shown on registration form)','event_espresso')?>
+									<?php _e('Description (optional, only shown on registration form)', 'event_espresso')?>
 								</th>
 								<th>
 								</th>
@@ -165,17 +165,17 @@ 
 							</tr>
 
 							<?php
-							$count=0;
+							$count = 0;
 							$question_options = $question->options();
-							if ( ! empty( $question_options )) {
-								foreach( $question_options as $option_id => $option ) {
-									$disabled =  $has_answers || $option->get('QSO_system') ? ' disabled="disabled"'  : '';
+							if ( ! empty($question_options)) {
+								foreach ($question_options as $option_id => $option) {
+									$disabled = $has_answers || $option->get('QSO_system') ? ' disabled="disabled"' : '';
 							?>
 								<tr class="question-option ee-options-sortable">
 									<td class="option-value-cell">
 										<input type="hidden" class="QSO_order" name="question_options[<?php echo $count; ?>][QSO_order]" value="<?php echo $count; ?>">
 										<input type="text" class="option-value regular-text" name="question_options[<?php echo $count?>][QSO_value]" value="<?php  $option->f('QSO_value')?>"<?php echo $disabled; ?>>
-										<?php if ( $has_answers ) : ?>
+										<?php if ($has_answers) : ?>
 											<input type="hidden" name="question_options[<?php echo $count; ?>][QSO_value]" value="<?php echo $option->f('QSO_value'); ?>" >
 										<?php endif; ?>
 									</td>
@@ -183,7 +183,7 @@ 
 										<input type="text" class="option-desc regular-text" name="question_options[<?php echo $count?>][QSO_desc]" value="<?php $option->f('QSO_desc')?>">
 									</td>
 									<td>
-										<?php if ( ! $option->system() ) { ?>
+										<?php if ( ! $option->system()) { ?>
 											<span class="dashicons clickable dashicons-post-trash ee-icon-size-18 remove-option remove-item"></span>
 										<?php } ?>
 										<span class="dashicons dashicons-image-flip-vertical sortable-drag-handle ee-icon-size-18"></span>
@@ -222,13 +222,13 @@ 
 					</table>
 
 					<a id="new-question-option" class="button" style="margin:0 0 1em 3px;">
-						<?php _e('Add Another Answer Option','event_espresso')?>
+						<?php _e('Add Another Answer Option', 'event_espresso')?>
 					</a><br/>
 
 					<p class="description">
-						<?php _e('Answer Options are the choices that you give people to select from for RADIO_BTN, CHECKBOX or DROPDOWN questions. The Value is a simple key that will be saved to the database and the description is optional. Note that values CANNOT contain any HTML, but descriptions can.','event_espresso')?>
+						<?php _e('Answer Options are the choices that you give people to select from for RADIO_BTN, CHECKBOX or DROPDOWN questions. The Value is a simple key that will be saved to the database and the description is optional. Note that values CANNOT contain any HTML, but descriptions can.', 'event_espresso')?>
 					</p>
-					<?php if ( $has_answers ) : ?>
+					<?php if ($has_answers) : ?>
 					<p class="description" style="color:#D54E21;">
 							<?php _e('Answer values that are uneditable are this way because there are registrations in the database that have answers for this question.  If you need to correct a mistake, or edit an existing option value, then trash the existing one and create a new option with the changes.  This will ensure that the existing registrations that chose the original answer will preserve that answer.', 'event_espresso'); ?>
 					</p>
@@ -239,32 +239,32 @@ 
 
 			<tr>
 				<th>
-					<label for="QST_required"><?php echo $fields['QST_required']->get_nicename();?></label> <?php echo EEH_Template::get_help_tab_link('required_question_info');?>
+					<label for="QST_required"><?php echo $fields['QST_required']->get_nicename(); ?></label> <?php echo EEH_Template::get_help_tab_link('required_question_info'); ?>
 				</th>
 				<td>
 					<?php
-					$system_required = array( 'fname', 'email' );
-					$disabled = in_array( $QST_system, $system_required ) ? ' disabled="disabled"' : '';
+					$system_required = array('fname', 'email');
+					$disabled = in_array($QST_system, $system_required) ? ' disabled="disabled"' : '';
 					$required_on = $question->get('QST_admin_only');
 					$show_required_msg = $required_on ? '' : ' display:none;';
-					$disabled = $required_on || ! empty( $disabled ) ? ' disabled="disabled"' : '';
-					$id =  ! empty( $disabled ) && in_array( $QST_system, $system_required) ? '_disabled' : '';
-					$requiredOptions=array(
-						array('text'=>'Optional','id'=>0),
-						array('text'=>'Required','id'=>1)
+					$disabled = $required_on || ! empty($disabled) ? ' disabled="disabled"' : '';
+					$id = ! empty($disabled) && in_array($QST_system, $system_required) ? '_disabled' : '';
+					$requiredOptions = array(
+						array('text'=>'Optional', 'id'=>0),
+						array('text'=>'Required', 'id'=>1)
 					);
-					echo EEH_Form_Fields::select_input('QST_required' . $id, $requiredOptions, $question->required(), 'id="QST_required' . $id . '"' . $disabled );
+					echo EEH_Form_Fields::select_input('QST_required'.$id, $requiredOptions, $question->required(), 'id="QST_required'.$id.'"'.$disabled);
 					?>
 						<p><span id="required_toggled_on" class="description" style="color:#D54E21;<?php echo $show_required_msg; ?>">
-						<?php _e('Required is set to optional, and this field is disabled, because the question is Admin-Only.','event_espresso')?>
+						<?php _e('Required is set to optional, and this field is disabled, because the question is Admin-Only.', 'event_espresso')?>
 						</span></p>
 						<p><span id="required_toggled_off" class="description" style="color:#D54E21; display: none;">
-							<?php _e('Required option field is no longer disabled because the question is not Admin-Only','event_espresso')?>
+							<?php _e('Required option field is no longer disabled because the question is not Admin-Only', 'event_espresso')?>
 						</span></p>
-					<?php if ( ! empty( $disabled ) && in_array( $QST_system, $system_required ) ) { ?>
+					<?php if ( ! empty($disabled) && in_array($QST_system, $system_required)) { ?>
 						<input type="hidden"  id="QST_required" name="QST_required" value="1"/>
 						<p><span class="description" style="color:#D54E21;">
-						<?php _e('System question! This field cannot be changed.','event_espresso')?>
+						<?php _e('System question! This field cannot be changed.', 'event_espresso')?>
 					</span></p>
 					<?php } ?>
 
@@ -273,7 +273,7 @@ 
 
 			<tr>
 				<th>
-					<label for="QST_required_text"><?php _e('Required Text', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('required_text_info');?>
+					<label for="QST_required_text"><?php _e('Required Text', 'event_espresso'); ?></label> <?php echo EEH_Template::get_help_tab_link('required_text_info'); ?>
 				</th>
 				<td>
 					<input type="text" class="regular-text" id="QST_required_text" name="QST_required_text" value="<?php  $question->f('QST_required_text')?>"/>

core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php

Spacing +78 added lines, -78 removed lines

@@ -13,13 +13,13 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_8_0_stages/*');
 $class_to_filepath = array();
-foreach($stages as $filepath){
+foreach ($stages as $filepath) {
 	$matches = array();
-	preg_match('~4_8_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+	preg_match('~4_8_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 	$class_to_filepath[$matches[1]] = $filepath;
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_8_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_8_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
 
@@ -35,7 +35,7 @@ 
  * @since                4.6.0
  *
  */
-class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * return EE_DMS_Core_4_8_0
@@ -62,14 +62,14 @@ 
 	 */
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
+		if ($version_string <= '4.8.0' && $version_string >= '4.7.0') {
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -90,15 +90,15 @@ 
 	 * @return bool
 	 */
 	public function schema_changes_before_migration() {
-		$now_in_mysql = current_time( 'mysql', true );
+		$now_in_mysql = current_time('mysql', true);
 
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -137,7 +137,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_currency';
 		$sql = "CUR_code VARCHAR(6) COLLATE utf8_bin NOT NULL,
@@ -147,7 +147,7 @@ 
 				CUR_dec_plc VARCHAR(1) COLLATE utf8_bin NOT NULL DEFAULT '2',
 				CUR_active TINYINT(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_currency_payment_method';
@@ -177,7 +177,7 @@ 
 
 
 
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -194,41 +194,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -245,7 +245,7 @@ 
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				LIN_timestamp DATETIME NOT NULL DEFAULT '$now_in_mysql',
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_log';
 		$sql = "LOG_ID INT(11) NOT NULL AUTO_INCREMENT,
@@ -268,7 +268,7 @@ 
 					KEY GRP_ID (GRP_ID)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_message_template_group', 'EVT_ID' );
+		EEH_Activation::drop_index('esp_message_template_group', 'EVT_ID');
 
 		$table_name = 'esp_message_template_group';
 		$sql = "GRP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -283,7 +283,7 @@ 
 					MTP_is_active TINYINT(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_message_template';
 		$sql = "EMT_ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -292,7 +292,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_has_not_changed_since_previous( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_payment';
@@ -360,8 +360,8 @@ 
 					  PRIMARY KEY  (TTM_ID)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -374,20 +374,20 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
@@ -395,7 +395,7 @@ 
 					QSO_system VARCHAR(25) DEFAULT NULL,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_is_changed_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -441,8 +441,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -531,7 +531,7 @@ 
 					  PRC_wp_user BIGINT UNSIGNED NULL,
 					  PRC_parent INT(10) UNSIGNED DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = "esp_price_type";
 		$sql = "PRT_ID TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -568,12 +568,12 @@ 
 					  TKT_parent INT(10) UNSIGNED DEFAULT '0',
 					  TKT_deleted TINYINT(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -585,7 +585,7 @@ 
 					QSG_wp_user BIGINT UNSIGNED NULL,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		/** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */
 		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
@@ -621,7 +621,7 @@ 
 		return $script_4_7_defaults->schema_changes_after_migration();
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 	
@@ -635,19 +635,19 @@ 
 		//CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active
 		//('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 		$newer_countries = array(
-			array( 'AX', 'ALA', 0, 'Alan Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0 ),
-			array( 'BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0 ),
-			array( 'CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0 ),
-			array( 'GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0 ),
-			array( 'IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2,  '+44', 0, 0  ),
-			array( 'JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0 ),
-			array( 'MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0 ),
-			array( 'MN', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1,  2, '+382', 0, 0 ),
-			array( 'RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+941', 1, 0 ),
-			array( 'SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0 ),
-			array( 'SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0 ),
-			array( 'XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+381', 0, 0 ),
-			array( 'YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0 ),
+			array('AX', 'ALA', 0, 'Alan Islands', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+358', 1, 0),
+			array('BL', 'BLM', 0, 'Saint Barthelemy', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
+			array('CW', 'CUW', 0, 'Curacao', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+599', 1, 0),
+			array('GG', 'GGY', 0, 'Guernsey', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+44', 0, 0),
+			array('IM', 'IMN', 0, 'Isle of Man', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
+			array('JE', 'JEY', 0, 'Jersey', 'GBP', 'Pound', 'Pounds', '£', 1, 2, '+44', 0, 0),
+			array('MF', 'MAF', 0, 'Saint Martin', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+590', 1, 0),
+			array('MN', 'MNE', 0, 'Montenegro', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+382', 0, 0),
+			array('RS', 'SRB', 0, 'Serbia', 'RSD', 'Dinar', 'Dinars', '', 0, 2, '+941', 1, 0),
+			array('SS', 'SSD', 0, 'South Sudan', 'SSP', 'Pound', 'Pounds', '£', 1, 2, '+211', 0, 0),
+			array('SX', 'SXM', 0, 'Sint Maarten', 'ANG', 'Guilder', 'Guilders', 'ƒ', 1, 2, '+1', 1, 0),
+			array('XK', 'XKX', 0, 'Kosovo', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+381', 0, 0),
+			array('YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0),
 		);
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
@@ -666,14 +666,14 @@ 
 							"CNT_is_EU" => '%d',
 							"CNT_active" => '%d',
 						);
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '" . $country_table . "'") == $country_table ) {
-			foreach( $newer_countries as $country ) {
-				$SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1" ;
+		if ($wpdb->get_var("SHOW TABLES LIKE '".$country_table."'") == $country_table) {
+			foreach ($newer_countries as $country) {
+				$SQL = "SELECT COUNT('CNT_ISO') FROM {$country_table} WHERE CNT_ISO='{$country[0]}' LIMIT 1";
 				$countries = $wpdb->get_var($SQL);
-				if ( ! $countries ) {
+				if ( ! $countries) {
 
-					$wpdb->insert( $country_table,
-							array_combine( array_keys( $country_format), $country ),
+					$wpdb->insert($country_table,
+							array_combine(array_keys($country_format), $country),
 							$country_format
 							);
 				}
@@ -691,7 +691,7 @@ 
 		// CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active
 		//( 'EUR',  'Euro',  'Euros',  '€',  2,1),
 		$newer_currencies = array(
-			array( 'RSD', 'Dinar', 'Dinars', '', 3, 1 ),
+			array('RSD', 'Dinar', 'Dinars', '', 3, 1),
 		);
 		global $wpdb;
 		$currency_table = $wpdb->prefix."esp_currency";
@@ -703,14 +703,14 @@ 
 							"CUR_dec_plc" => '%d',
 							"CUR_active" => '%d',
 						);
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '" . $currency_table . "'") == $currency_table ) {
-			foreach( $newer_currencies as $currency ) {
-				$SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1" ;
+		if ($wpdb->get_var("SHOW TABLES LIKE '".$currency_table."'") == $currency_table) {
+			foreach ($newer_currencies as $currency) {
+				$SQL = "SELECT COUNT('CUR_code') FROM {$currency_table} WHERE CUR_code='{$currency[0]}' LIMIT 1";
 				$countries = $wpdb->get_var($SQL);
-				if ( ! $countries ) {
+				if ( ! $countries) {
 
-					$wpdb->insert( $currency_table,
-							array_combine( array_keys( $currency_format), $currency ),
+					$wpdb->insert($currency_table,
+							array_combine(array_keys($currency_format), $currency),
 							$currency_format
 							);
 				}
@@ -722,9 +722,9 @@ 
 	 * which should just be a temporary issue for folks who installed 4.8.0-4.8.5;
 	 * we should be able to stop doing this in 4.9
 	 */
-	public function fix_non_default_taxes(){
+	public function fix_non_default_taxes() {
 		global $wpdb;
-		$query = $wpdb->prepare( "UPDATE
+		$query = $wpdb->prepare("UPDATE
 				{$wpdb->prefix}esp_price p INNER JOIN
 				{$wpdb->prefix}esp_price_type pt ON p.PRT_ID = pt.PRT_ID
 			SET
@@ -732,8 +732,8 @@ 
 			WHERE
 				p.PRC_is_default = 0 AND
 				pt.PBT_ID = %d
-					", EEM_Price_Type::base_type_tax );
-		$wpdb->query( $query );
+					", EEM_Price_Type::base_type_tax);
+		$wpdb->query($query);
 	}
 }
 

core/db_models/EEM_Question.model.php

Spacing +56 added lines, -56 removed lines

@@ -21,8 +21,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' );
-require_once( EE_CLASSES . 'EE_Question.class.php');
+require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php');
+require_once(EE_CLASSES.'EE_Question.class.php');
 
 class EEM_Question extends EEM_Soft_Delete_Base {
 
@@ -69,21 +69,21 @@ 
 	// private instance of the Attendee object
 	protected static $_instance = NULL;
 
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Question','event_espresso');
-		$this->plural_item = __('Questions','event_espresso');
-		$this->_allowed_question_types=apply_filters(
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Question', 'event_espresso');
+		$this->plural_item = __('Questions', 'event_espresso');
+		$this->_allowed_question_types = apply_filters(
 			'FHEE__EEM_Question__construct__allowed_question_types',
 			array(
-				EEM_Question::QST_type_text =>__('Text','event_espresso'),
-				EEM_Question::QST_type_textarea =>__('Textarea','event_espresso'),
-				EEM_Question::QST_type_checkbox =>__('Checkboxes','event_espresso'),
-				EEM_Question::QST_type_radio =>__('Radio Buttons','event_espresso'),
-				EEM_Question::QST_type_dropdown =>__('Dropdown','event_espresso'),
-				EEM_Question::QST_type_state =>__('State/Province Dropdown','event_espresso'),
-				EEM_Question::QST_type_country =>__('Country Dropdown','event_espresso'),
-				EEM_Question::QST_type_date =>__('Date Picker','event_espresso'),
-				EEM_Question::QST_type_html_textarea => __( 'HTML Textarea', 'event_espresso' ),
+				EEM_Question::QST_type_text =>__('Text', 'event_espresso'),
+				EEM_Question::QST_type_textarea =>__('Textarea', 'event_espresso'),
+				EEM_Question::QST_type_checkbox =>__('Checkboxes', 'event_espresso'),
+				EEM_Question::QST_type_radio =>__('Radio Buttons', 'event_espresso'),
+				EEM_Question::QST_type_dropdown =>__('Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_state =>__('State/Province Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_country =>__('Country Dropdown', 'event_espresso'),
+				EEM_Question::QST_type_date =>__('Date Picker', 'event_espresso'),
+				EEM_Question::QST_type_html_textarea => __('HTML Textarea', 'event_espresso'),
 			)
 		);
 		$this->_question_type_categories = apply_filters(
@@ -102,22 +102,22 @@ 
 		);
 
 		$this->_tables = array(
-			'Question'=>new EE_Primary_Table('esp_question','QST_ID')
+			'Question'=>new EE_Primary_Table('esp_question', 'QST_ID')
 		);
 		$this->_fields = array(
 			'Question'=>array(
-				'QST_ID'=>new EE_Primary_Key_Int_Field('QST_ID', __('Question ID','event_espresso')),
-				'QST_display_text'=>new EE_Full_HTML_Field('QST_display_text', __('Question Text','event_espresso'), true, ''),
-				'QST_admin_label'=>new EE_Plain_Text_Field('QST_admin_label', __('Question Label (admin-only)','event_espresso'), true, ''),
-				'QST_system'=>new EE_Plain_Text_Field('QST_system', __('Internal string ID for question','event_espresso'), TRUE, NULL ),
-				'QST_type'=>new EE_Enum_Text_Field('QST_type', __('Question Type','event_espresso'),false, 'TEXT',$this->_allowed_question_types),
-				'QST_required'=>new EE_Boolean_Field('QST_required', __('Required Question?','event_espresso'), false, false),
-				'QST_required_text'=>new EE_Simple_HTML_Field('QST_required_text', __('Text to Display if Not Provided','event_espresso'), true, ''),
-				'QST_order'=>new EE_Integer_Field('QST_order', __('Question Order','event_espresso'), false, 0),
-				'QST_admin_only'=>new EE_Boolean_Field('QST_admin_only', __('Admin-Only Question?','event_espresso'), false, false),
-				'QST_max' => new EE_Infinite_Integer_Field( 'QST_max', __( 'Max Size', 'event_espresso'	), false, EE_INF ),
-				'QST_wp_user'=>new EE_WP_User_Field('QST_wp_user', __('Question Creator ID','event_espresso'), false ),
-				'QST_deleted'=>new EE_Trashed_Flag_Field('QST_deleted', __('Flag Indicating question was deleted','event_espresso'), false, false)
+				'QST_ID'=>new EE_Primary_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso')),
+				'QST_display_text'=>new EE_Full_HTML_Field('QST_display_text', __('Question Text', 'event_espresso'), true, ''),
+				'QST_admin_label'=>new EE_Plain_Text_Field('QST_admin_label', __('Question Label (admin-only)', 'event_espresso'), true, ''),
+				'QST_system'=>new EE_Plain_Text_Field('QST_system', __('Internal string ID for question', 'event_espresso'), TRUE, NULL),
+				'QST_type'=>new EE_Enum_Text_Field('QST_type', __('Question Type', 'event_espresso'), false, 'TEXT', $this->_allowed_question_types),
+				'QST_required'=>new EE_Boolean_Field('QST_required', __('Required Question?', 'event_espresso'), false, false),
+				'QST_required_text'=>new EE_Simple_HTML_Field('QST_required_text', __('Text to Display if Not Provided', 'event_espresso'), true, ''),
+				'QST_order'=>new EE_Integer_Field('QST_order', __('Question Order', 'event_espresso'), false, 0),
+				'QST_admin_only'=>new EE_Boolean_Field('QST_admin_only', __('Admin-Only Question?', 'event_espresso'), false, false),
+				'QST_max' => new EE_Infinite_Integer_Field('QST_max', __('Max Size', 'event_espresso'), false, EE_INF),
+				'QST_wp_user'=>new EE_WP_User_Field('QST_wp_user', __('Question Creator ID', 'event_espresso'), false),
+				'QST_deleted'=>new EE_Trashed_Flag_Field('QST_deleted', __('Flag Indicating question was deleted', 'event_espresso'), false, false)
 			)
 		);
 		$this->_model_relations = array(
@@ -129,11 +129,11 @@ 
 			'Question_Group_Question'=>new EE_Has_Many_Relation()
 		);
 		//this model is generally available for reading
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Reg_Form('QST_system');
-		parent::__construct( $timezone );
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Reg_Form('QST_system');
+		parent::__construct($timezone);
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 	 * but they can be extended
 	 * @return string[]
 	 */
-	public function allowed_question_types(){
+	public function allowed_question_types() {
 		return $this->_allowed_question_types;
 	}
 	/**
@@ -149,16 +149,16 @@ 
 	 * @param string $question_type one of EEM_Question::allowed_question_types(
 	 * @return string[] like EEM_Question::allowed_question_types()
 	 */
-	public function question_types_in_same_category( $question_type ) {
-		$question_types = array( $question_type );
-		foreach( $this->_question_type_categories as $category => $question_types_in_category ) {
-			if( in_array( $question_type, $question_types_in_category ) ) {
+	public function question_types_in_same_category($question_type) {
+		$question_types = array($question_type);
+		foreach ($this->_question_type_categories as $category => $question_types_in_category) {
+			if (in_array($question_type, $question_types_in_category)) {
 				$question_types = $question_types_in_category;
 				break;
 			}
 		}
 
-		return array_intersect_key( $this->allowed_question_types(), array_flip( $question_types ) );
+		return array_intersect_key($this->allowed_question_types(), array_flip($question_types));
 	}
 	
 	/**
@@ -167,11 +167,11 @@ 
 	 * @param string $category one of the top-level keys of EEM_Question::question_type_categories()
 	 * @return boolean
 	 */
-	public function question_type_is_in_category( $question_type, $category ) {
-		if( ! isset( $this->_question_type_categories[ $category ] ) ) {
+	public function question_type_is_in_category($question_type, $category) {
+		if ( ! isset($this->_question_type_categories[$category])) {
 			return false;
 		}
-		return in_array( $question_type, $this->_question_type_categories[ $category ] );
+		return in_array($question_type, $this->_question_type_categories[$category]);
 	}
 	
 	/**
@@ -188,9 +188,9 @@ 
 	 * @param string $system_question_group_id QSG_system
 	 * @return array of system question names (QST_system)
 	 */
-	public function allowed_system_questions_in_system_question_group( $system_question_group_id ) {
+	public function allowed_system_questions_in_system_question_group($system_question_group_id) {
 		$question_system_ids = array();
-		switch( $system_question_group_id ) {
+		switch ($system_question_group_id) {
 			case EEM_Question_Group::system_personal:
 				$question_system_ids = array(
 					EEM_Attendee::system_question_fname,
@@ -211,7 +211,7 @@ 
 				);
 				break;
 		}
-		return apply_filters( 'FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id );
+		return apply_filters('FHEE__EEM_Question__system_questions_allowed_in_system_question_group__return', $question_system_ids, $system_question_group_id);
 	}
 
 	/**
@@ -220,11 +220,11 @@ 
 	 * @param string $system_question_group_id QSG_system
 	 * @return array of system question names (QST_system)
 	 */
-	public function required_system_questions_in_system_question_group( $system_question_group_id ) {
+	public function required_system_questions_in_system_question_group($system_question_group_id) {
 		$question_system_ids = null;
-		switch( $system_question_group_id ) {
+		switch ($system_question_group_id) {
 			case EEM_Question_Group::system_personal:
-				$question_system_ids =  array(
+				$question_system_ids = array(
 					EEM_Attendee::system_question_fname,
 					EEM_Attendee::system_question_email,
 				);
@@ -232,7 +232,7 @@ 
 			default:
 				$question_system_ids = array();
 		}
-		return apply_filters( 'FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id );
+		return apply_filters('FHEE__EEM_Question__system_questions_required_in_system_question_group', $question_system_ids, $system_question_group_id);
 	}
 
 
@@ -243,8 +243,8 @@ 
 	 * @param $QST_system
 	 * @return int of QST_ID for the question that corresponds to that QST_system
 	 */
-	public function get_Question_ID_from_system_string( $QST_system ){
-		 return $this->get_var( array( array( 'QST_system' => $QST_system ) ) );
+	public function get_Question_ID_from_system_string($QST_system) {
+		 return $this->get_var(array(array('QST_system' => $QST_system)));
 	}
 
 
@@ -256,9 +256,9 @@ 
 	 */
 	public function get_latest_question_order() {
 		$columns_to_select = array(
-			'max_order' => array("MAX(QST_order)","%d")
+			'max_order' => array("MAX(QST_order)", "%d")
 		);
-		$max = $this->_get_all_wpdb_results( array(), ARRAY_A, $columns_to_select );
+		$max = $this->_get_all_wpdb_results(array(), ARRAY_A, $columns_to_select);
 		return $max[0]['max_order'];
 	}
 	
@@ -288,10 +288,10 @@ 
 	 * @param string $system_question_value
 	 * @return int|float
 	 */
-	public function max_max_for_system_question( $system_question_value ) {
+	public function max_max_for_system_question($system_question_value) {
 		$maxes = $this->system_question_maxes();
-		if( isset( $maxes[ $system_question_value ] ) ) {
-			return $maxes[ $system_question_value ];
+		if (isset($maxes[$system_question_value])) {
+			return $maxes[$system_question_value];
 		} else {
 			return EE_INF;
 		}

core/libraries/form_sections/strategies/validation/EE_Max_Length_Validation_Strategy.strategy.php

Spacing +12 added lines, -12 removed lines

@@ -8,36 +8,36 @@
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
  * @author				Mike Nelson
  */
-class EE_Max_Length_Validation_Strategy extends EE_Validation_Strategy_Base{
+class EE_Max_Length_Validation_Strategy extends EE_Validation_Strategy_Base {
 
 	protected $_max_length;
 
-	public function __construct( $validation_error_message = NULL, $max_length = EE_INF ) {
+	public function __construct($validation_error_message = NULL, $max_length = EE_INF) {
 		$this->_max_length = $max_length;
-		if( $validation_error_message === null ) {
-			$validation_error_message = sprintf( __( 'Input is too long. Maximum number of characters is %1$s', 'event_espresso' ), $max_length );
+		if ($validation_error_message === null) {
+			$validation_error_message = sprintf(__('Input is too long. Maximum number of characters is %1$s', 'event_espresso'), $max_length);
 		}
-		parent::__construct( $validation_error_message );
+		parent::__construct($validation_error_message);
 	}
 
 	/**
 	 * @param $normalized_value
 	 */
 	public function validate($normalized_value) {
-		if( $this->_max_length !== EE_INF &&
+		if ($this->_max_length !== EE_INF &&
 				$normalized_value &&
-				is_string( $normalized_value ) &&
-				 strlen( $normalized_value ) > $this->_max_length){
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'maxlength' );
+				is_string($normalized_value) &&
+				 strlen($normalized_value) > $this->_max_length) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'maxlength');
 		}
 	}
 
 	/**
 	 * @return array
 	 */
-	function get_jquery_validation_rule_array(){
-		if( $this->_max_length !== EE_INF ) {
-			return array( 'maxlength'=> $this->_max_length, 'messages' => array( 'maxlength' => $this->get_validation_error_message() ) );
+	function get_jquery_validation_rule_array() {
+		if ($this->_max_length !== EE_INF) {
+			return array('maxlength'=> $this->_max_length, 'messages' => array('maxlength' => $this->get_validation_error_message()));
 		} else {
 			return array();
 		}