eventespresso / event-espresso-core

core/helpers/EEH_Activation.helper.php

Indentation +10 added lines, -10 removed lines

@@ -1100,14 +1100,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;
 						}
 					}
 
@@ -1509,8 +1509,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 +370 added lines, -370 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,25 +340,25 @@ 
 		$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'
 			),
@@ -366,62 +366,62 @@ 
 
 		$EE_Core_Config = EE_Registry::instance()->CFG->core;
 
-		foreach ( $critical_pages as $critical_page ) {
+		foreach ($critical_pages as $critical_page) {
 			// is critical page ID set in config ?
-			if ( $EE_Core_Config->{$critical_page[ 'id' ]} !== FALSE ) {
+			if ($EE_Core_Config->{$critical_page['id']} !== FALSE) {
 				// attempt to find post by ID
-				$critical_page['post'] = get_post( $EE_Core_Config->{$critical_page[ 'id' ]} );
+				$critical_page['post'] = get_post($EE_Core_Config->{$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_Core_Config->{$critical_page[ 'id' ]}
+				isset($critical_page['post']->ID)
+				&& $critical_page['post']->ID != $EE_Core_Config->{$critical_page['id']}
 			) {
 				//update Config with post ID
-				$EE_Core_Config->{$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__ );
+				$EE_Core_Config->{$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__);
 				}
 			}
 
 			$critical_page_problem =
-				! isset( $critical_page['post']->post_status )
+				! isset($critical_page['post']->post_status)
 				|| $critical_page['post']->post_status != 'publish'
-				|| strpos( $critical_page['post']->post_content, $critical_page['code'] ) === FALSE
+				|| 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);
 		}
 	}
 
@@ -433,13 +433,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;
 		}
 
@@ -456,32 +456,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;
@@ -500,35 +500,35 @@ 
 	 * @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;
 		}
 		$EE_Core_Config = EE_Registry::instance()->CFG->core;
 		// map shortcode to post
-		$EE_Core_Config->post_shortcodes[ $critical_page['post']->post_name ][ $critical_page['code'] ] = $critical_page['post']->ID;
+		$EE_Core_Config->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_Core_Config->post_shortcodes[ $posts_page ] )) {
-			unset( $EE_Core_Config->post_shortcodes[ $posts_page ][ $critical_page['code'] ] );
+		if (isset($EE_Core_Config->post_shortcodes[$posts_page])) {
+			unset($EE_Core_Config->post_shortcodes[$posts_page][$critical_page['code']]);
 		}
-		if ( $posts_page != 'posts' && isset( $EE_Core_Config->post_shortcodes['posts'] )) {
-			unset( $EE_Core_Config->post_shortcodes['posts'][ $critical_page['code'] ] );
+		if ($posts_page != 'posts' && isset($EE_Core_Config->post_shortcodes['posts'])) {
+			unset($EE_Core_Config->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__);
 		}
 	}
 
@@ -546,24 +546,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;
@@ -590,29 +590,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>',
@@ -621,25 +621,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
 				)
@@ -661,15 +661,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);
 		}
@@ -688,15 +688,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;
 			}
@@ -714,12 +714,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;
 	}
@@ -734,9 +734,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;
 	}
@@ -751,11 +751,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;
 	}
@@ -771,18 +771,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;
 	}
@@ -798,27 +798,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;
@@ -838,27 +838,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,
@@ -870,8 +870,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,
@@ -883,14 +883,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;
 				}
 			}
 		}
@@ -899,10 +899,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',
@@ -919,25 +919,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()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -945,15 +945,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()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -961,15 +961,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()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -977,15 +977,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()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -993,15 +993,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()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1009,15 +1009,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()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1025,12 +1025,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(),
@@ -1040,12 +1040,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(),
@@ -1055,15 +1055,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()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_max_for_system_question($QST_system),
 									'QST_wp_user' => self::get_default_creator_id(),
 									'QST_deleted' => 0
 								);
@@ -1071,49 +1071,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()->absolute_max_for_system_question( $QST_system ),
+									'QST_max' => EEM_Question::instance()->absolute_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;
@@ -1122,9 +1122,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')
 					);
 				}
 			}
@@ -1136,11 +1136,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();
 		}
 	}
@@ -1156,7 +1156,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();
 
@@ -1222,38 +1222,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;
 	}
 
@@ -1266,7 +1266,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);
 	}
 
 
@@ -1285,16 +1285,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;
 				}
 			}
@@ -1304,36 +1304,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;
 					}
 
@@ -1342,41 +1342,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;
 			}
 
@@ -1384,45 +1384,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;
@@ -1442,47 +1442,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;
 	}
 
@@ -1496,12 +1496,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);
 		}
 	}
 
@@ -1523,24 +1523,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);
 		}
 	}
 
@@ -1554,18 +1554,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;
@@ -1590,8 +1590,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);
 		}
 
 
@@ -1629,58 +1629,58 @@ 
 			'ee_job_parameters_' => false,
 			'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__);
 		}
 	}
 
@@ -1690,23 +1690,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;
 		}
 	}
@@ -1714,7 +1714,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/db_models/EEM_Transaction.model.php

Spacing +49 added lines, -49 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 /**
  *
  * Transaction Model
@@ -68,35 +68,35 @@ 
 	 * 		Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 *	@return EEM_Transaction
 	 */
-	protected function __construct( $timezone ) {
-		$this->singular_item = __('Transaction','event_espresso');
-		$this->plural_item = __('Transactions','event_espresso');
+	protected function __construct($timezone) {
+		$this->singular_item = __('Transaction', 'event_espresso');
+		$this->plural_item = __('Transactions', 'event_espresso');
 
 		$this->_tables = array(
-			'Transaction'=>new EE_Primary_Table('esp_transaction','TXN_ID')
+			'Transaction'=>new EE_Primary_Table('esp_transaction', 'TXN_ID')
 		);
 		$this->_fields = array(
 			'Transaction'=>array(
-				'TXN_ID'=>new EE_Primary_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso')),
-				'TXN_timestamp'=>new EE_Datetime_Field('TXN_timestamp', __('date when transaction was created','event_espresso'), false, time(), $timezone ),
-				'TXN_total'=>new EE_Money_Field('TXN_total', __('Total value of Transaction','event_espresso'), false, 0),
-				'TXN_paid'=>new EE_Money_Field('TXN_paid', __('Amount paid towards transaction to date','event_espresso'), false, 0),
-				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Transaction::failed_status_code, 'Status'),
-				'TXN_session_data'=>new EE_Serialized_Text_Field('TXN_session_data', __('Serialized session data','event_espresso'), true, ''),
-				'TXN_hash_salt'=>new EE_Plain_Text_Field('TXN_hash_salt', __('Transaction Hash Salt','event_espresso'), true, ''),
+				'TXN_ID'=>new EE_Primary_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso')),
+				'TXN_timestamp'=>new EE_Datetime_Field('TXN_timestamp', __('date when transaction was created', 'event_espresso'), false, time(), $timezone),
+				'TXN_total'=>new EE_Money_Field('TXN_total', __('Total value of Transaction', 'event_espresso'), false, 0),
+				'TXN_paid'=>new EE_Money_Field('TXN_paid', __('Amount paid towards transaction to date', 'event_espresso'), false, 0),
+				'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Transaction::failed_status_code, 'Status'),
+				'TXN_session_data'=>new EE_Serialized_Text_Field('TXN_session_data', __('Serialized session data', 'event_espresso'), true, ''),
+				'TXN_hash_salt'=>new EE_Plain_Text_Field('TXN_hash_salt', __('Transaction Hash Salt', 'event_espresso'), true, ''),
 				'PMD_ID'=>new EE_Foreign_Key_Int_Field('PMD_ID', __("Last Used Payment Method", 'event_espresso'), true, NULL, 'Payment_Method'),
-				'TXN_reg_steps' => new EE_Serialized_Text_Field( 'TXN_reg_steps', __( 'Registration Steps', 'event_espresso' ), FALSE, array() ),
+				'TXN_reg_steps' => new EE_Serialized_Text_Field('TXN_reg_steps', __('Registration Steps', 'event_espresso'), FALSE, array()),
 			)
 		);
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
 			'Payment'=>new EE_Has_Many_Relation(),
 			'Status'=>new EE_Belongs_To_Relation(),
-			'Line_Item'=>new EE_Has_Many_Relation(false),//you can delete a transaction without needing to delete its line items
+			'Line_Item'=>new EE_Has_Many_Relation(false), //you can delete a transaction without needing to delete its line items
 			'Payment_Method'=>new EE_Belongs_To_Relation(),
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 
@@ -107,25 +107,25 @@ 
 	 * @param string $period
 	 * @return \stdClass[]
 	 */
-	public function get_revenue_per_day_report( $period = '-1 month' ) {
-		$sql_date = $this->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', strtotime( $period ) ), 'Y-m-d H:i:s', 'UTC' );
+	public function get_revenue_per_day_report($period = '-1 month') {
+		$sql_date = $this->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', strtotime($period)), 'Y-m-d H:i:s', 'UTC');
 
-		$offset = get_option( 'gmt_offset' );
+		$offset = get_option('gmt_offset');
 		$query_interval = $offset < 0
-			? 'DATE_SUB(TXN_timestamp, INTERVAL ' . $offset*-1 . ' HOUR)'
-			: 'DATE_ADD(TXN_timestamp, INTERVAL ' . $offset . ' HOUR)';
+			? 'DATE_SUB(TXN_timestamp, INTERVAL '.$offset * -1.' HOUR)'
+			: 'DATE_ADD(TXN_timestamp, INTERVAL '.$offset.' HOUR)';
 
 		$results = $this->_get_all_wpdb_results(
 			array(
 				array(
-				'TXN_timestamp' => array( '>=', $sql_date ) ),
+				'TXN_timestamp' => array('>=', $sql_date) ),
 				'group_by' => 'txnDate',
-				'order_by' => array( 'TXN_timestamp' => 'ASC' )
+				'order_by' => array('TXN_timestamp' => 'ASC')
 			),
 			OBJECT,
 			array(
-				'txnDate' => array( 'DATE(' . $query_interval . ')', '%s' ),
-				'revenue' => array( 'SUM(Transaction.TXN_paid)', '%d' )
+				'txnDate' => array('DATE('.$query_interval.')', '%s'),
+				'revenue' => array('SUM(Transaction.TXN_paid)', '%d')
 			)
 		);
 		return $results;
@@ -141,25 +141,25 @@ 
 	 * @throws \EE_Error
 	 * @return mixed
 	 */
-	public function get_revenue_per_event_report( $period = '-1 month' ) {
-		$date_sql = EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', date( 'Y-m-d H:i:s', strtotime( $period ) ), 'Y-m-d H:i:s', 'UTC' );
-		$where = array( 'Registration.REG_date' => array( '>=', $date_sql ) );
+	public function get_revenue_per_event_report($period = '-1 month') {
+		$date_sql = EEM_Registration::instance()->convert_datetime_for_query('REG_date', date('Y-m-d H:i:s', strtotime($period)), 'Y-m-d H:i:s', 'UTC');
+		$where = array('Registration.REG_date' => array('>=', $date_sql));
 
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'revenue_per_event_report' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'revenue_per_event_report')) {
 			$where ['Registration.Event.EVT_wp_user'] = get_current_user_id();
 		}
 
 		$results = $this->_get_all_wpdb_results(
 			array(
 				$where,
-				'group_by' => array( 'Registration.Event.EVT_name' ),
+				'group_by' => array('Registration.Event.EVT_name'),
 				'order_by' => 'Registration.Event.EVT_name',
-				'limit' => array( 0, 24 )
+				'limit' => array(0, 24)
 			),
 			OBJECT,
 			array(
-				'event_name' => array( 'Registration___Event_CPT.post_title', '%s' ),
-				'revenue' => array( 'SUM(TXN_PAID)', '%d' )
+				'event_name' => array('Registration___Event_CPT.post_title', '%s'),
+				'revenue' => array('SUM(TXN_PAID)', '%d')
 			)
 		);
 		return $results;
@@ -177,10 +177,10 @@ 
 	 * @param string $reg_url_link
 	 * @return EE_Transaction
 	 */
-	public function get_transaction_from_reg_url_link( $reg_url_link = '' ){
-		return $this->get_one( array(
+	public function get_transaction_from_reg_url_link($reg_url_link = '') {
+		return $this->get_one(array(
 			array(
-				'Registration.REG_url_link' => ! empty( $reg_url_link ) ? $reg_url_link : EE_Registry::instance()->REQ->get( 'e_reg_url_link', '' )
+				'Registration.REG_url_link' => ! empty($reg_url_link) ? $reg_url_link : EE_Registry::instance()->REQ->get('e_reg_url_link', '')
 			)
 		));
 	}
@@ -200,15 +200,15 @@ 
 	 * @param boolean $save_txn whether or not to save the transaction during this function call
 	 * @return boolean
 	 */
-	public function update_based_on_payments( $transaction_obj_or_id, $save_txn = TRUE ){
+	public function update_based_on_payments($transaction_obj_or_id, $save_txn = TRUE) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			sprintf( __( 'This method is deprecated. Please use "%s" instead', 'event_espresso' ), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()' ),
+			__CLASS__.'::'.__FUNCTION__,
+			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'),
 			'4.6.0'
 		);
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $this->ensure_is_obj( $transaction_obj_or_id ));
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($this->ensure_is_obj($transaction_obj_or_id));
 	}
 
 	/**
@@ -239,7 +239,7 @@ 
 			array(
 				0 => array(
 					'STS_ID' => EEM_Transaction::failed_status_code,
-					'TXN_timestamp' => array( '<', time() - $time_to_leave_alone )
+					'TXN_timestamp' => array('<', time() - $time_to_leave_alone)
 				)
 			),
 			$time_to_leave_alone
@@ -252,26 +252,26 @@ 
 		 */
 		$txn_ids = apply_filters(
 			'FHEE__EEM_Transaction__delete_junk_transactions__transaction_ids_to_delete',
-			EEM_Transaction::instance()->get_col( $ids_query, 'TXN_ID' ),
+			EEM_Transaction::instance()->get_col($ids_query, 'TXN_ID'),
 			$time_to_leave_alone
 		);
 
 		//now that we have the ids to delete, let's get deletin'
 		//Why no wpdb->prepare?  Because the data is trusted.  We got the ids from the original query to get them FROM
 		//the db (which is sanitized) so no need to prepare them again.
-		if ( $txn_ids ) {
-			$query   = '
+		if ($txn_ids) {
+			$query = '
 				DELETE
-				FROM ' . $this->table() . '
+				FROM ' . $this->table().'
 				WHERE
-					TXN_ID IN ( ' . implode( ",", $txn_ids ) . ')';
-			$deleted = $wpdb->query( $query );
+					TXN_ID IN ( ' . implode(",", $txn_ids).')';
+			$deleted = $wpdb->query($query);
 		}
-		if ( $deleted ) {
+		if ($deleted) {
 			/**
 			 * Allows code to do something after the transactions have been deleted.
 			 */
-			do_action( 'AHEE__EEM_Transaction__delete_junk_transactions__successful_deletion', $txn_ids );
+			do_action('AHEE__EEM_Transaction__delete_junk_transactions__successful_deletion', $txn_ids);
 		}
 		return $deleted;
 	}

payment_methods/Invoice/templates/invoice_settings_header_gateway.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * Event Espresso
@@ -26,9 +26,9 @@ 
  */
 ?>
 	<tr>
-		<th><h3><?php _e("Invoice Gateway Settings", 'event_espresso');?></h3></th>
+		<th><h3><?php _e("Invoice Gateway Settings", 'event_espresso'); ?></h3></th>
 		<td>
-			<span class="description"><?php _e("The following settings affect the functioning of the Invoice gateway.", 'event_espresso');?></span>
+			<span class="description"><?php _e("The following settings affect the functioning of the Invoice gateway.", 'event_espresso'); ?></span>
 		</td>
 	</tr>
 <?php

payment_methods/Invoice/templates/invoice_settings_header_display.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * Event Espresso
@@ -26,9 +26,9 @@ 
  */
 ?>
 	<tr>
-		<th><h3><?php _e("Invoice Display Settings", 'event_espresso');?></h3></th>
+		<th><h3><?php _e("Invoice Display Settings", 'event_espresso'); ?></h3></th>
 		<td>
-			<span class="description"><?php _e("The following settings affect the content and/or appearance of the downloadable PDF invoice.", 'event_espresso');?></span>
+			<span class="description"><?php _e("The following settings affect the content and/or appearance of the downloadable PDF invoice.", 'event_espresso'); ?></span>
 		</td>
 	</tr>
 <?php

core/EE_Deprecated.core.php

Spacing +141 added lines, -141 removed lines

@@ -15,9 +15,9 @@ 
  * @return boolean
  */
 function ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() {
-	$in_use =  has_filter( 'FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns' )
-			|| has_action( 'AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save' );
-	if( $in_use ) {
+	$in_use = has_filter('FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns')
+			|| has_action('AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save');
+	if ($in_use) {
 		$msg = __(
 			'We detected you are using the filter FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns or AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save.'
 			. 'Both of these have been deprecated and should not be used anymore. You should instead use FHEE__EE_Form_Section_Proper___construct__options_array to customize the contents of the form,'
@@ -26,18 +26,18 @@ 
 			'event_espresso' )
 		;
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
+			__CLASS__.'::'.__FUNCTION__,
 			$msg,
 			'4.8.32.rc.000'
 		);
 		//it seems the doing_it_wrong messages get output during some hidden html tags, so add an error to make sure this gets noticed
-		if ( is_admin() && ! defined( 'DOING_AJAX' ) ) {
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if (is_admin() && ! defined('DOING_AJAX')) {
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 	return $in_use;
 }
-add_action( 'AHEE__Registrations_Admin_Page___registration_details_metabox__start', 'ee_deprecated_using_old_registration_admin_custom_questions_form_hooks' );
+add_action('AHEE__Registrations_Admin_Page___registration_details_metabox__start', 'ee_deprecated_using_old_registration_admin_custom_questions_form_hooks');
 
 /**
  * @deprecated since 4.8.32.rc.000 because it has issues on https://events.codebasehq.com/projects/event-espresso/tickets/9165
@@ -46,34 +46,34 @@ 
  * @param EE_Admin_Page $admin_page
  * @return void
  */
-function ee_deprecated_update_attendee_registration_form_old( $admin_page ) {
+function ee_deprecated_update_attendee_registration_form_old($admin_page) {
 	//check if the old hooks are in use. If not, do the default
-	if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks()
-		|| ! $admin_page instanceof EE_Admin_Page ) {
+	if ( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks()
+		|| ! $admin_page instanceof EE_Admin_Page) {
 		return;
 	}
 	$req_data = $admin_page->get_request_data();
-	$qstns = isset( $req_data['qstn'] ) ? $req_data['qstn'] : FALSE;
-	$REG_ID = isset( $req_data['_REG_ID'] ) ? absint( $req_data['_REG_ID'] ) : FALSE;
-	$qstns = apply_filters( 'FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns', $qstns );
-	if ( ! $REG_ID || ! $qstns ) {
-		EE_Error::add_error( __('An error occurred. No registration ID and/or registration questions were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+	$qstns = isset($req_data['qstn']) ? $req_data['qstn'] : FALSE;
+	$REG_ID = isset($req_data['_REG_ID']) ? absint($req_data['_REG_ID']) : FALSE;
+	$qstns = apply_filters('FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns', $qstns);
+	if ( ! $REG_ID || ! $qstns) {
+		EE_Error::add_error(__('An error occurred. No registration ID and/or registration questions were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 	}
 	$success = TRUE;
 
 	// allow others to get in on this awesome fun   :D
-	do_action( 'AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save', $REG_ID, $qstns );
+	do_action('AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save', $REG_ID, $qstns);
 	// loop thru questions... FINALLY!!!
 
-	foreach ( $qstns as $QST_ID => $qstn ) {
+	foreach ($qstns as $QST_ID => $qstn) {
 		//if $qstn isn't an array then it doesn't already have an answer, so let's create the answer
-		if ( !is_array($qstn) ) {
-			$success = $this->_save_new_answer( $REG_ID, $QST_ID, $qstn);
+		if ( ! is_array($qstn)) {
+			$success = $this->_save_new_answer($REG_ID, $QST_ID, $qstn);
 			continue;
 		}
 
 
-		foreach ( $qstn as $ANS_ID => $ANS_value ) {
+		foreach ($qstn as $ANS_ID => $ANS_value) {
 			//get answer
 			$query_params = array(
 				0 => array(
@@ -84,7 +84,7 @@ 
 				);
 			$answer = EEM_Answer::instance()->get_one($query_params);
 			//this MAY be an array but NOT have an answer because its multi select.  If so then we need to create the answer
-			if ( ! $answer instanceof EE_Answer ) {
+			if ( ! $answer instanceof EE_Answer) {
 				$set_values = array(
 					'QST_ID' => $QST_ID,
 					'REG_ID' => $REG_ID,
@@ -99,11 +99,11 @@ 
 		}
 	}
 	$what = __('Registration Form', 'event_espresso');
-	$route = $REG_ID ? array( 'action' => 'view_registration', '_REG_ID' => $REG_ID ) : array( 'action' => 'default' );
-	$admin_page->redirect_after_action( $success, $what, __('updated', 'event_espresso'), $route );
+	$route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID) : array('action' => 'default');
+	$admin_page->redirect_after_action($success, $what, __('updated', 'event_espresso'), $route);
 	exit;
 }
-add_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1 );
+add_action('AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1);
 /**
  * Render the registration admin page's custom questions area in the old fashion
  * and firing the old hooks. When this method is removed, we can probably also
@@ -116,31 +116,31 @@ 
  * @return bool
  * @throws \EE_Error
  */
-function ee_deprecated_reg_questions_meta_box_old( $do_default_action, $admin_page, $registration ) {
+function ee_deprecated_reg_questions_meta_box_old($do_default_action, $admin_page, $registration) {
 	//check if the old hooks are in use. If not, do the default
-	if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks()
-		|| ! $admin_page instanceof EE_Admin_Page ) {
+	if ( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks()
+		|| ! $admin_page instanceof EE_Admin_Page) {
 		return $do_default_action;
 	}
-	add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array( $admin_page, 'form_before_question_group' ), 10, 1 );
-	add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', array( $admin_page, 'form_after_question_group' ), 10, 1 );
-	add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $admin_page, 'form_form_field_label_wrap' ), 10, 1 );
-	add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $admin_page, 'form_form_field_input__wrap' ), 10, 1 );
+	add_filter('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array($admin_page, 'form_before_question_group'), 10, 1);
+	add_filter('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', array($admin_page, 'form_after_question_group'), 10, 1);
+	add_filter('FHEE__EEH_Form_Fields__label_html', array($admin_page, 'form_form_field_label_wrap'), 10, 1);
+	add_filter('FHEE__EEH_Form_Fields__input_html', array($admin_page, 'form_form_field_input__wrap'), 10, 1);
 
-	$question_groups = EEM_Event::instance()->assemble_array_of_groups_questions_and_options( $registration, $registration->get('EVT_ID') );
+	$question_groups = EEM_Event::instance()->assemble_array_of_groups_questions_and_options($registration, $registration->get('EVT_ID'));
 
-	EE_Registry::instance()->load_helper( 'Form_Fields' );
+	EE_Registry::instance()->load_helper('Form_Fields');
 	$template_args = array(
-		'att_questions' => EEH_Form_Fields::generate_question_groups_html( $question_groups ),
+		'att_questions' => EEH_Form_Fields::generate_question_groups_html($question_groups),
 		'reg_questions_form_action' => 'edit_registration',
 		'REG_ID' => $registration->ID()
 	);
-	$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php';
-	echo EEH_Template::display_template( $template_path, $template_args, TRUE );
+	$template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_questions.template.php';
+	echo EEH_Template::display_template($template_path, $template_args, TRUE);
 	//indicate that we should not do the default admin page code
 	return false;
 }
-add_action( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', 'ee_deprecated_reg_questions_meta_box_old', 10, 3 );
+add_action('FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', 'ee_deprecated_reg_questions_meta_box_old', 10, 3);
 
 /**
  * ee_deprecated__registration_checkout__button_text
@@ -149,7 +149,7 @@ 
  * @param \EE_Checkout $checkout
  * @return string
  */
-function ee_deprecated__registration_checkout__button_text( $submit_button_text, EE_Checkout $checkout ) {
+function ee_deprecated__registration_checkout__button_text($submit_button_text, EE_Checkout $checkout) {
 	// list of old filters
 	$deprecated_filters = array(
 		'update_registration_details' => true,
@@ -159,16 +159,16 @@ 
 		'proceed_to' => true,
 	);
 	// loop thru and call doing_it_wrong() or remove any that aren't being used
-	foreach ( $deprecated_filters as $deprecated_filter => $on ) {
+	foreach ($deprecated_filters as $deprecated_filter => $on) {
 		// was this filter called ?
-		if ( has_action( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter )) {
+		if (has_action('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter)) {
 			// only display doing_it_wrong() notice to Event Admins during non-AJAX requests
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter' ) && ! defined( 'DOING_AJAX' ) ) {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter') && ! defined('DOING_AJAX')) {
 				EE_Error::doing_it_wrong(
-					'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter,
+					'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter,
 					sprintf(
-						__( 'The %1$s filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso' ),
-						'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter,
+						__('The %1$s filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso'),
+						'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter,
 						'<br />',
 						'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text',
 						'/modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php'
@@ -178,24 +178,24 @@ 
 				);
 			}
 		} else {
-			unset( $deprecated_filters[ $deprecated_filter ] );
+			unset($deprecated_filters[$deprecated_filter]);
 		}
 	}
-	if ( ! empty( $deprecated_filters )) {
-
-		if ( $checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset( $deprecated_filters[ 'update_registration_details' ] )) {
-			$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text );
-		} else if ( $checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset( $deprecated_filters[ 'process_payment' ] ) ) {
-			$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text );
-		} else if ( $checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset( $deprecated_filters[ 'finalize_registration' ] ) ) {
-			$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text );
+	if ( ! empty($deprecated_filters)) {
+
+		if ($checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset($deprecated_filters['update_registration_details'])) {
+			$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text);
+		} else if ($checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset($deprecated_filters['process_payment'])) {
+			$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text);
+		} else if ($checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset($deprecated_filters['finalize_registration'])) {
+			$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text);
 		}
-		if ( $checkout->next_step instanceof EE_SPCO_Reg_Step ) {
-			if ( $checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset( $deprecated_filters[ 'and_proceed_to_payment' ] ) ) {
-				$submit_button_text .= apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text );
+		if ($checkout->next_step instanceof EE_SPCO_Reg_Step) {
+			if ($checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset($deprecated_filters['and_proceed_to_payment'])) {
+				$submit_button_text .= apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text);
 			}
-			if ( $checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset( $deprecated_filters[ 'proceed_to' ] ) ) {
-				$submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text ) . $checkout->next_step->name();
+			if ($checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset($deprecated_filters['proceed_to'])) {
+				$submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text).$checkout->next_step->name();
 			}
 		}
 
@@ -203,7 +203,7 @@ 
 	return $submit_button_text;
 
 }
-add_filter( 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2 );
+add_filter('FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2);
 
 
 
@@ -214,16 +214,16 @@ 
  * @param \EE_Checkout $checkout
  * @param boolean $status_updates
  */
-function ee_deprecated_finalize_transaction( EE_Checkout $checkout, $status_updates ) {
+function ee_deprecated_finalize_transaction(EE_Checkout $checkout, $status_updates) {
 	$action_ref = NULL;
-	$action_ref = has_action( 'AHEE__EE_Transaction__finalize__new_transaction' ) ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref;
-	$action_ref = has_action( 'AHEE__EE_Transaction__finalize__all_transaction' ) ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref;
-	if ( $action_ref ) {
+	$action_ref = has_action('AHEE__EE_Transaction__finalize__new_transaction') ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref;
+	$action_ref = has_action('AHEE__EE_Transaction__finalize__all_transaction') ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref;
+	if ($action_ref) {
 
 		EE_Error::doing_it_wrong(
 			$action_ref,
 			sprintf(
-				__( 'This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso' ),
+				__('This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso'),
 				'<br />',
 				'/core/business/EE_Transaction_Processor.class.php',
 				'AHEE__EE_Transaction_Processor__finalize',
@@ -234,29 +234,29 @@ 
 			'4.6.0',
 			E_USER_DEPRECATED
 		);
-		switch ( $action_ref ) {
+		switch ($action_ref) {
 			case 'AHEE__EE_Transaction__finalize__new_transaction' :
-				do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request );
+				do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request);
 				break;
 			case 'AHEE__EE_Transaction__finalize__all_transaction' :
-				do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array( 'new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates ), $checkout->admin_request );
+				do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array('new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates), $checkout->admin_request);
 				break;
 		}
 	}
 }
-add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 );
+add_action('AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2);
 /**
  * ee_deprecated_finalize_registration
  *
  * @param EE_Registration $registration
  */
-function ee_deprecated_finalize_registration( EE_Registration $registration ) {
-	$action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL;
-	if ( $action_ref ) {
+function ee_deprecated_finalize_registration(EE_Registration $registration) {
+	$action_ref = has_action('AHEE__EE_Registration__finalize__update_and_new_reg') ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL;
+	if ($action_ref) {
 		EE_Error::doing_it_wrong(
 			$action_ref,
 			sprintf(
-				__( 'This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso' ),
+				__('This action is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso'),
 				'<br />',
 				'/core/business/EE_Registration_Processor.class.php',
 				'AHEE__EE_Registration_Processor__trigger_registration_status_changed_hook'
@@ -264,10 +264,10 @@ 
 			'4.6.0',
 			E_USER_DEPRECATED
 		);
-		do_action( 'AHEE__EE_Registration__finalize__update_and_new_reg', $registration, ( is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX )));
+		do_action('AHEE__EE_Registration__finalize__update_and_new_reg', $registration, (is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX)));
 	}
 }
-add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1 );
+add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1);
 
 
 
@@ -288,7 +288,7 @@ 
  *
  * @return array
  */
-function ee_deprecated_get_templates( $templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack ) {
+function ee_deprecated_get_templates($templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack) {
 	$old_default_classnames = array(
 		'EE_Messages_Email_Cancelled_Registration_Defaults',
 		'EE_Messages_Email_Declined_Registration_Defaults',
@@ -304,23 +304,23 @@ 
 
 	$old_class_instance = new stdClass();
 
-	foreach ( $old_default_classnames as $classname ) {
-		$filter_ref = 'FHEE__' . $classname . '___create_new_templates___templates';
-		if ( has_filter( $filter_ref ) ) {
-			EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED );
+	foreach ($old_default_classnames as $classname) {
+		$filter_ref = 'FHEE__'.$classname.'___create_new_templates___templates';
+		if (has_filter($filter_ref)) {
+			EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED);
 		}
-		$templates = apply_filters( $filter_ref, $templates, $old_class_instance );
+		$templates = apply_filters($filter_ref, $templates, $old_class_instance);
 	}
 
 	return $templates;
 }
-add_filter( 'FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4 );
+add_filter('FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4);
 
 /**
  * Called after EED_Module::set_hooks() and EED_Module::set_admin_hooks() was called.
  * Checks if any deprecated hooks were hooked-into and provide doing_it_wrong messages appropriately.
  */
-function ee_deprecated_hooks(){
+function ee_deprecated_hooks() {
 	/**
 	 * @var $hooks array where keys are hook names, and their values are array{
 	 *			@type string $version  when deprecated
@@ -331,26 +331,26 @@ 
 	$hooks = array(
 		'AHEE__EE_System___do_setup_validations' => array(
 			'version' => '4.6.0',
-			'alternative' => __( 'Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso' ),
+			'alternative' => __('Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso'),
 			'still_works' => FALSE
 		)
 	);
-	foreach( $hooks as $name => $deprecation_info ){
-		if( has_action( $name ) ){
+	foreach ($hooks as $name => $deprecation_info) {
+		if (has_action($name)) {
 			EE_Error::doing_it_wrong(
 				$name,
 				sprintf(
-					__('This filter is deprecated. %1$s%2$s','event_espresso'),
-					$deprecation_info[ 'still_works' ] ?  __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __( 'It has been completely removed.', 'event_espresso' ),
-					isset( $deprecation_info[ 'alternative' ] ) ? $deprecation_info[ 'alternative' ] : __( 'Please read the current EE4 documentation further or contact Support.', 'event_espresso' )
+					__('This filter is deprecated. %1$s%2$s', 'event_espresso'),
+					$deprecation_info['still_works'] ? __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __('It has been completely removed.', 'event_espresso'),
+					isset($deprecation_info['alternative']) ? $deprecation_info['alternative'] : __('Please read the current EE4 documentation further or contact Support.', 'event_espresso')
 				),
-				isset( $deprecation_info[ 'version' ] ) ? $deprecation_info[ 'version' ] : __( 'recently', 'event_espresso' ),
+				isset($deprecation_info['version']) ? $deprecation_info['version'] : __('recently', 'event_espresso'),
 				E_USER_DEPRECATED
 			);
 		}
 	}
 }
-add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks' );
+add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks');
 
 
 
@@ -373,25 +373,25 @@ 
  *
  * @return string                    The default contents for the messenger, message type, context and field.
  */
-function ee_deprecated_get_default_field_content( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack ) {
+function ee_deprecated_get_default_field_content($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) {
 
 	$classnames_to_try = array(
-		get_class( $messenger ) => $messenger,
-		get_class( $message_type ) => $message_type,
+		get_class($messenger) => $messenger,
+		get_class($message_type) => $message_type,
 		'EE_Messages_Base' => $message_type
 		);
 
-	foreach ( $classnames_to_try as $classname => $obj ) {
-		$filter_ref = 'FHEE__' . $classname . '__get_default_field_content';
-		if ( has_filter( $filter_ref ) ) {
-			EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED );
+	foreach ($classnames_to_try as $classname => $obj) {
+		$filter_ref = 'FHEE__'.$classname.'__get_default_field_content';
+		if (has_filter($filter_ref)) {
+			EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated.  It *may* work as an attempt to build in backwards compatibility.  However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED);
 		}
-		$contents = apply_filters( $filter_ref, $contents, $obj );
+		$contents = apply_filters($filter_ref, $contents, $obj);
 	}
 
 	return $contents;
 }
-add_filter( 'FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7 );
+add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7);
 
 
 
@@ -419,23 +419,23 @@ 
  *
  * @return string                    The path to the file being used.
  */
-function ee_deprecated_get_inline_css_template_filters( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url,  EE_Messages_Template_Pack $template_pack ) {
+function ee_deprecated_get_inline_css_template_filters($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) {
 
-	if ( $messenger == 'email' ) {
+	if ($messenger == 'email') {
 		$filter_ref = $url ? 'FHEE__EE_Email_Messenger__get_inline_css_template__css_url' : 'FHEE__EE_Email_Messenger__get_inline_css_template__css_path';
-	} elseif ( $messenger == 'html' ) {
+	} elseif ($messenger == 'html') {
 		$filter_ref = $url ? 'FHEE__EE_Html_messenger__get_inline_css_template__css_url' : 'FHEE__EE_Html_messenger__get_inline_css_template__css_path';
 	} else {
 		return $variation_path;
 	}
 
-	if ( has_filter( $filter_ref ) ) {
-		EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated.  It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED );
+	if (has_filter($filter_ref)) {
+		EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated.  It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED);
 	}
 
-	return apply_filters( $filter_ref, $variation_path, $url, $type );
+	return apply_filters($filter_ref, $variation_path, $url, $type);
 }
-add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8 );
+add_filter('FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8);
 
 
 
@@ -451,78 +451,78 @@ 
 class EE_Messages_Init extends EE_Base {
 
 	public function __construct() {
-		self::doing_it_wrong_call( __METHOD__ );
+		self::doing_it_wrong_call(__METHOD__);
 	}
 
 	/**
 	 * @param $method_name
 	 */
-	public static function doing_it_wrong_call( $method_name ) {
-		EE_Error::doing_it_wrong( __CLASS__, sprintf( __('The %s in this class is deprecated as of EE4.5.0.  All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name ), '4.5.0', E_USER_DEPRECATED );
+	public static function doing_it_wrong_call($method_name) {
+		EE_Error::doing_it_wrong(__CLASS__, sprintf(__('The %s in this class is deprecated as of EE4.5.0.  All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name), '4.5.0', E_USER_DEPRECATED);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
 	public static function set_autoloaders() {
-		self::doing_it_wrong_call( __METHOD__ );
+		self::doing_it_wrong_call(__METHOD__);
 		EED_Messages::set_autoloaders();
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function payment_reminder( $transaction ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::payment_reminder( $transaction );
+	public function payment_reminder($transaction) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::payment_reminder($transaction);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function payment( $transaction, $payment ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::payment( $transaction, $payment );
+	public function payment($transaction, $payment) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::payment($transaction, $payment);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function cancelled_registration( $transaction ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::cancelled_registration( $transaction );
+	public function cancelled_registration($transaction) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::cancelled_registration($transaction);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function maybe_registration( $transaction, $reg_msg, $from_admin ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::maybe_registration( $transaction, $reg_msg, $from_admin );
+	public function maybe_registration($transaction, $reg_msg, $from_admin) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::maybe_registration($transaction, $reg_msg, $from_admin);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function process_resend( $success, $req_data ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::process_resend( $req_data );
+	public function process_resend($success, $req_data) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::process_resend($req_data);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function process_admin_payment( $success, $payment ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::process_admin_payment( $success, $payment );
+	public function process_admin_payment($success, $payment) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::process_admin_payment($success, $payment);
 	}
 
 	/**
 	 * @deprecated 4.5.0
 	 */
-	public function send_newsletter_message( $contacts, $grp_id ) {
-		self::doing_it_wrong_call( __METHOD__ );
-		EED_Messages::send_newsletter_message( $contacts, $grp_id );
+	public function send_newsletter_message($contacts, $grp_id) {
+		self::doing_it_wrong_call(__METHOD__);
+		EED_Messages::send_newsletter_message($contacts, $grp_id);
 	}
 
 
@@ -543,13 +543,13 @@ 
  *
  * @return array additional cpts.
  */
-function ee_deprecated_get_cpts( $cpts ) {
-	if ( has_filter( 'FHEE__EE_Register_CPTs__construct__CPTs' ) ) {
-		EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED );
+function ee_deprecated_get_cpts($cpts) {
+	if (has_filter('FHEE__EE_Register_CPTs__construct__CPTs')) {
+		EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED);
 	}
-	return apply_filters( 'FHEE__EE_Register_CPTs__construct__CPTs', $cpts );
+	return apply_filters('FHEE__EE_Register_CPTs__construct__CPTs', $cpts);
 }
-add_filter( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10 );
+add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10);
 
 
 
@@ -563,10 +563,10 @@ 
  *
  * @return array additional custom taxonomies.
  */
-function ee_deprecated_get_taxonomies( $cts ) {
-	if ( has_filter( 'FHEE__EE_Register_CPTs__construct__taxonomies' ) ) {
-		EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED );
+function ee_deprecated_get_taxonomies($cts) {
+	if (has_filter('FHEE__EE_Register_CPTs__construct__taxonomies')) {
+		EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being.  However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED);
 	}
-	return apply_filters( 'FHEE__EE_Register_CPTs__construct__taxonomies', $cts );
+	return apply_filters('FHEE__EE_Register_CPTs__construct__taxonomies', $cts);
 }
-add_filter( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10 );
+add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10);

Indentation +15 added lines, -15 removed lines

@@ -105,17 +105,17 @@ 
 }
 add_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1 );
 /**
- * Render the registration admin page's custom questions area in the old fashion
- * and firing the old hooks. When this method is removed, we can probably also
- * remove the deprecated methods form_before_question_group, form_after_question_group,
- * form_form_field_label_wrap and form_form_field_input__wrap in Registrations_Admin_Page
- *
- * @param boolean         $do_default_action
- * @param EE_Admin_Page   $admin_page
- * @param EE_Registration $registration
- * @return bool
- * @throws \EE_Error
- */
+	 * Render the registration admin page's custom questions area in the old fashion
+	 * and firing the old hooks. When this method is removed, we can probably also
+	 * remove the deprecated methods form_before_question_group, form_after_question_group,
+	 * form_form_field_label_wrap and form_form_field_input__wrap in Registrations_Admin_Page
+	 *
+	 * @param boolean         $do_default_action
+	 * @param EE_Admin_Page   $admin_page
+	 * @param EE_Registration $registration
+	 * @return bool
+	 * @throws \EE_Error
+	 */
 function ee_deprecated_reg_questions_meta_box_old( $do_default_action, $admin_page, $registration ) {
 	//check if the old hooks are in use. If not, do the default
 	if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks()
@@ -246,10 +246,10 @@ 
 }
 add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 );
 /**
- * ee_deprecated_finalize_registration
- *
- * @param EE_Registration $registration
- */
+	 * ee_deprecated_finalize_registration
+	 *
+	 * @param EE_Registration $registration
+	 */
 function ee_deprecated_finalize_registration( EE_Registration $registration ) {
 	$action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL;
 	if ( $action_ref ) {

admin_pages/registrations/Registrations_Admin_Page.core.php

Indentation +64 added lines, -64 removed lines

@@ -136,9 +136,9 @@ 
 
 	/**
 	 * 		grab url requests and route them
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	public function _set_page_routes() {
 
 		$this->_get_registration_status_array();
@@ -404,7 +404,7 @@ 
 						'title' => __('Registrations Other', 'event_espresso'),
 						'filename' => 'registrations_overview_other'
 					)
-                ),
+				),
 				'help_tour' => array( 'Registration_Overview_Help_Tour' ),
 				'qtips' => array('Registration_List_Table_Tips'),
 				'list_table' => 'EE_Registrations_List_Table',
@@ -418,7 +418,7 @@ 
 					'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url,
 					'persistent' => FALSE
 					),
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registrations_details_help_tab' => array(
 						'title' => __('Registration Details', 'event_espresso'),
 						'filename' => 'registrations_details'
@@ -482,7 +482,7 @@ 
 					'order' => 20
 					),
 				'list_table' => 'EE_Attendee_Contact_List_Table',
-                'help_tabs' => array(
+				'help_tabs' => array(
 					'registrations_contact_list_help_tab' => array(
 						'title' => __('Registrations Contact List', 'event_espresso'),
 						'filename' => 'registrations_contact_list'
@@ -499,7 +499,7 @@ 
 						'title' => __('Contact List Other', 'event_espresso'),
 						'filename' => 'registrations_contact_list_other'
 					)
-                ),
+				),
 				'help_tour' => array( 'Contact_List_Help_Tour' ),
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
@@ -533,9 +533,9 @@ 
 
 	/**
 	 * 		get list of registration statuses
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	private function _get_registration_status_array() {
 		self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE);
 	}
@@ -842,7 +842,7 @@ 
 			return TRUE;
 		}
 
-	    $REG = EEM_Registration::instance();
+		$REG = EEM_Registration::instance();
 
 		$REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
 
@@ -1065,9 +1065,9 @@ 
 
 	/**
 	 * 		generates HTML for the View Registration Details Admin page
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _registration_details() {
 
 		$this->_template_args = array();
@@ -1145,9 +1145,9 @@ 
 
 	/**
 	 * 		_set_approve_or_decline_reg_status_buttons
-	*		@access protected
-	*		@return string
-	*/
+	 *		@access protected
+	 *		@return string
+	 */
 	public function set_reg_status_buttons_metabox() {
 
 		//is registration for free event OR for a completed transaction? This will determine whether the set to pending option is shown.
@@ -1337,10 +1337,10 @@ 
 
 	/**
 	 * 		approve_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function approve_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_approved, $notify );
 	}
@@ -1350,10 +1350,10 @@ 
 
 	/**
 	 * 		decline_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function decline_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify );
 	}
@@ -1363,10 +1363,10 @@ 
 
 	/**
 	 * 		cancel_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function cancel_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify );
 	}
@@ -1377,10 +1377,10 @@ 
 
 	/**
 	 * 		not_approve_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function not_approve_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify );
 	}
@@ -1389,10 +1389,10 @@ 
 
 	/**
 	 * 		decline_registration
-	*		@access protected
-	*		@param bool $notify whether or not to notify the registrant about their approval.
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@param bool $notify whether or not to notify the registrant about their approval.
+	 *		@return void
+	 */
 	protected function pending_registration( $notify = false ) {
 		$this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify );
 	}
@@ -1402,9 +1402,9 @@ 
 
 	/**
 	 * 		generates HTML for the Registration main meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_details_meta_box() {
 		EEH_Autoloader::register_line_item_display_autoloaders();
 		EEH_Autoloader::register_line_item_filter_autoloaders();
@@ -1487,7 +1487,7 @@ 
 	 *
 	 * @access public
 	 * @return void
-	*/
+	 */
 	public function _reg_questions_meta_box() {
 		//allow someone to override this method entirely
 		if( apply_filters( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration ) ) {
@@ -1689,12 +1689,12 @@ 
 
 	/**
 	 * 		generates HTML for the Registration main meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_attendees_meta_box() {
 
-	    $REG = EEM_Registration::instance();
+		$REG = EEM_Registration::instance();
 		//get all other registrations on this transaction, and cache
 		//the attendees for them so we don't have to run another query using force_join
 		$registrations = $REG->get_all(array(
@@ -1747,9 +1747,9 @@ 
 
 	/**
 	 * 		generates HTML for the Edit Registration side meta box
-	*		@access public
-	*		@return void
-	*/
+	 *		@access public
+	 *		@return void
+	 */
 	public function _reg_registrant_side_meta_box() {
 
 		/*@var $attendee EE_Attendee */
@@ -2095,9 +2095,9 @@ 
 
 	/**
 	 * 		set_reg_event
-	*		@access private
-	*		@return boolean
-	*/
+	 *		@access private
+	 *		@return boolean
+	 */
 	private function _set_reg_event() {
 		if ( is_object( $this->_reg_event )) {
 			return TRUE;
@@ -2204,9 +2204,9 @@ 
 
 	/**
 	 * 		generates HTML for the Attendee Contact List
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _attendee_contact_list_table() {
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 		$this->_search_btn_label = __('Contacts', 'event_espresso');
@@ -2220,9 +2220,9 @@ 
 	/**
 	 * 		get_attendees
 	 * 		@param bool $count whether to return count or data.
-	*		@access public
-	*		@return array
-	*/
+	 *		@access public
+	 *		@return array
+	 */
 	public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
@@ -2558,9 +2558,9 @@ 
 
 	/**
 	 * 		_attendee_details
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	public function attendee_registrations_meta_box( $post ) {
 
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
@@ -2593,10 +2593,10 @@ 
 
 	/**
 	 * 		_trash_or_restore_attendee
-	*		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
-	*		@access protected
-	*		@return void
-	*/
+	 *		@param boolean 		$trash - whether to move item to trash (TRUE) or restore it (FALSE)
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _trash_or_restore_attendees( $trash = TRUE ) {
 
 		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );

Spacing +528 added lines, -528 removed lines

@@ -49,8 +49,8 @@ 
 	 * @param bool $routing
 	 * @return Registrations_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -82,16 +82,16 @@ 
 				'trash' => 'post.php'
 			);
 
-		add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10 );
+		add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10);
 		//add filters so that the comment urls don't take users to a confusing 404 page
-		add_filter('get_comment_link', array( $this, 'clear_comment_link' ), 10, 3 );
+		add_filter('get_comment_link', array($this, 'clear_comment_link'), 10, 3);
 	}
 
 
-	public function clear_comment_link( $link, $comment, $args ) {
+	public function clear_comment_link($link, $comment, $args) {
 		//gotta make sure this only happens on this route
-		$post_type = get_post_type( $comment->comment_post_ID);
-		if ( $post_type == 'espresso_attendees' )
+		$post_type = get_post_type($comment->comment_post_ID);
+		if ($post_type == 'espresso_attendees')
 			return '#commentsdiv';
 		return $link;
 	}
@@ -99,7 +99,7 @@ 
 
 	protected function _ajax_hooks() {
 		//todo: all hooks for registrations ajax goes in here
-		add_action( 'wp_ajax_toggle_checkin_status', array( $this, 'toggle_checkin_status' ));
+		add_action('wp_ajax_toggle_checkin_status', array($this, 'toggle_checkin_status'));
 	}
 
 
@@ -114,8 +114,8 @@ 
 					'add-attendee' => __('Add Contact', 'event_espresso'),
 					'edit' => __('Edit Contact', 'event_espresso'),
 					'report'=>  __("Event Registrations CSV Report", "event_espresso"),
-					'report_all' => __( 'All Registrations CSV Report', 'event_espresso' ),
-					'contact_list_report' => __( 'Contact List Report', 'event_espresso' ),
+					'report_all' => __('All Registrations CSV Report', 'event_espresso'),
+					'contact_list_report' => __('Contact List Report', 'event_espresso'),
 					'contact_list_export'=>  __("Export Data", "event_espresso"),
 				),
 			'publishbox' => array(
@@ -143,9 +143,9 @@ 
 
 		$this->_get_registration_status_array();
 
-		$reg_id = ! empty( $this->_req_data['_REG_ID'] ) && ! is_array( $this->_req_data['_REG_ID'] ) ? $this->_req_data['_REG_ID'] : 0;
-		$att_id = ! empty( $this->_req_data[ 'ATT_ID' ] ) && ! is_array( $this->_req_data['ATT_ID'] ) ? $this->_req_data['ATT_ID'] : 0;
-		$att_id = ! empty( $this->_req_data['post'] ) && ! is_array( $this->_req_data['post'] ) ? $this->_req_data['post'] : $att_id;
+		$reg_id = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : 0;
+		$att_id = ! empty($this->_req_data['ATT_ID']) && ! is_array($this->_req_data['ATT_ID']) ? $this->_req_data['ATT_ID'] : 0;
+		$att_id = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post'] : $att_id;
 
 		$this->_page_routes = array(
 
@@ -178,7 +178,7 @@ 
 
 				'restore_registrations' => array(
 					'func' => '_trash_or_restore_registrations',
-					'args' => array( 'trash' => FALSE ),
+					'args' => array('trash' => FALSE),
 					'noheader' => TRUE,
 					'capability' => 'ee_delete_registrations'
 					),
@@ -405,7 +405,7 @@ 
 						'filename' => 'registrations_overview_other'
 					)
                 ),
-				'help_tour' => array( 'Registration_Overview_Help_Tour' ),
+				'help_tour' => array('Registration_Overview_Help_Tour'),
 				'qtips' => array('Registration_List_Table_Tips'),
 				'list_table' => 'EE_Registrations_List_Table',
 				'require_nonce' => FALSE
@@ -415,7 +415,7 @@ 
 				'nav' => array(
 					'label' => __('REG Details', 'event_espresso'),
 					'order' => 15,
-					'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url,
+					'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID']), $this->_current_page_view_url) : $this->_admin_base_url,
 					'persistent' => FALSE
 					),
                 'help_tabs' => array(
@@ -436,8 +436,8 @@ 
 						'filename' => 'registrations_details_registrant_details'
 						)
 					),
-				'help_tour' => array( 'Registration_Details_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_registration_details_metaboxes' ) ),
+				'help_tour' => array('Registration_Details_Help_Tour'),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_registration_details_metaboxes')),
 				'require_nonce' => FALSE
 				),
 
@@ -461,7 +461,7 @@ 
 					'order' => 15,
 					'persistent' => FALSE
 					),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes')),
 				'require_nonce' => FALSE
 				),
 
@@ -470,7 +470,7 @@ 
 					'label' => __('Edit Contact', 'event_espresso'),
 					'order' => 15,
 					'persistent' => FALSE,
-					'url' => isset($this->_req_data['ATT_ID']) ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url
+					'url' => isset($this->_req_data['ATT_ID']) ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID']), $this->_current_page_view_url) : $this->_admin_base_url
 					),
 				'metaboxes' => array('attendee_editor_metaboxes'),
 				'require_nonce' => FALSE
@@ -500,7 +500,7 @@ 
 						'filename' => 'registrations_contact_list_other'
 					)
                 ),
-				'help_tour' => array( 'Contact_List_Help_Tour' ),
+				'help_tour' => array('Contact_List_Help_Tour'),
 				'metaboxes' => array(),
 				'require_nonce' => FALSE
 				),
@@ -519,7 +519,7 @@ 
 	protected function _add_screen_options() {}
 	protected function _add_feature_pointers() {}
 	public function admin_init() {
-		EE_Registry::$i18n_js_strings[ 'update_att_qstns' ] = __( 'click "Update Registration Questions" to save your changes', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['update_att_qstns'] = __('click "Update Registration Questions" to save your changes', 'event_espresso');
 	}
 	public function admin_notices() {}
 	public function admin_footer_scripts() {}
@@ -537,7 +537,7 @@ 
 	*		@return void
 	*/
 	private function _get_registration_status_array() {
-		self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE);
+		self::$_reg_status = EEM_Registration::reg_status_array(array(), TRUE);
 	}
 
 
@@ -560,11 +560,11 @@ 
 	public function load_scripts_styles() {
 		//style
 		//wp_register_style('espresso_attendees', ATT_ASSETS_URL . 'espresso_attendees_admin.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_register_style('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_reg');
 
 		//script
-		wp_register_script('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.js', array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.js', array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE);
 		wp_enqueue_script('espresso_reg');
 	}
 
@@ -573,9 +573,9 @@ 
 	public function load_scripts_styles_edit_attendee() {
 		//stuff to only show up on our attendee edit details page.
 		$attendee_details_translations = array(
-			'att_publish_text' => sprintf( __('Created on: <b>%1$s</b>', 'event_espresso'), $this->_cpt_model_obj->get_datetime('ATT_created') )
+			'att_publish_text' => sprintf(__('Created on: <b>%1$s</b>', 'event_espresso'), $this->_cpt_model_obj->get_datetime('ATT_created'))
 			);
-		wp_localize_script( 'espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations );
+		wp_localize_script('espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations);
 		wp_enqueue_script('jquery-validate');
 	}
 
@@ -584,8 +584,8 @@ 
 		//styles
 		wp_enqueue_style('espresso-ui-theme');
 		//scripts
-		$this->_get_reg_custom_questions_form( $this->_registration->ID() );
-		$this->_reg_custom_questions_form->wp_enqueue_scripts( true );
+		$this->_get_reg_custom_questions_form($this->_registration->ID());
+		$this->_reg_custom_questions_form->wp_enqueue_scripts(true);
 	}
 
 
@@ -595,7 +595,7 @@ 
 
 	public function load_scripts_styles_contact_list() {
 		wp_deregister_style('espresso_reg');
-		wp_register_style('espresso_att', REG_ASSETS_URL . 'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_att', REG_ASSETS_URL.'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_att');
 	}
 
@@ -604,9 +604,9 @@ 
 
 
 	public function load_scripts_styles_new_registration() {
-		wp_register_script( 'ee-spco-for-admin', REG_ASSETS_URL . 'spco_for_admin.js', array('underscore', 'jquery'), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_register_script('ee-spco-for-admin', REG_ASSETS_URL.'spco_for_admin.js', array('underscore', 'jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		wp_enqueue_script('ee-spco-for-admin');
-		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' );
+		add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true');
 		EE_Form_Section_Proper::wp_enqueue_scripts();
 		EED_Ticket_Selector::load_tckt_slctr_assets();
 		EE_Datepicker_Input::enqueue_styles_and_scripts();
@@ -645,23 +645,23 @@ 
 
 		/** setup reg status bulk actions **/
 		$def_reg_status_actions['approve_registration'] = __('Approve Registrations', 'event_espresso');
-		if ( in_array( $match_array['approve_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['approve_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['approve_and_notify_registration'] = __('Approve and Notify Registrations', 'event_espresso');
 		}
 		$def_reg_status_actions['decline_registration'] = __('Decline Registrations', 'event_espresso');
-		if ( in_array( $match_array['decline_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['decline_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['decline_and_notify_registration'] = __('Decline and Notify Registrations', 'event_espresso');
 		}
 		$def_reg_status_actions['pending_registration'] = __('Set Registrations to Pending Payment', 'event_espresso');
-		if ( in_array( $match_array['pending_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['pending_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['pending_and_notify_registration'] = __('Set Registrations to Pending Payment and Notify', 'event_espresso');
 		}
 		$def_reg_status_actions['no_approve_registration'] = __('Set Registrations to Not Approved', 'event_espresso');
-		if ( in_array( $match_array['no_approve_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['no_approve_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['no_approve_and_notify_registration'] = __('Set Registrations to Not Approved and Notify', 'event_espresso');
 		}
 		$def_reg_status_actions['cancel_registration'] = __('Cancel Registrations', 'event_espresso');
-		if ( in_array( $match_array['cancel_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) {
+		if (in_array($match_array['cancel_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) {
 			$def_reg_status_actions['cancel_and_notify_registration'] = __('Cancel Registrations and Notify', 'event_espresso');
 		}
 
@@ -670,29 +670,29 @@ 
 				'slug' => 'all',
 				'label' => __('View All Registrations', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions, array(
+				'bulk_action' => array_merge($def_reg_status_actions, array(
 					'trash_registrations' => __('Trash Registrations', 'event_espresso')
-					) )
+					))
 				),
 			'month' => array(
 				'slug' => 'month',
 				'label' => __('This Month', 'event_espresso'),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions, array(
+				'bulk_action' => array_merge($def_reg_status_actions, array(
 					'trash_registrations' => __('Trash Registrations', 'event_espresso')
 					))
 				),
 			'today' => array(
 				'slug' => 'today',
-				'label' => sprintf( __('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp' ) ) ),
+				'label' => sprintf(__('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp'))),
 				'count' => 0,
-				'bulk_action' => array_merge( $def_reg_status_actions,  array(
+				'bulk_action' => array_merge($def_reg_status_actions, array(
 					'trash_registrations' => __('Trash Registrations', 'event_espresso')
 					))
 				)
 			);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registrations', 'espresso_registrations_delete_registration' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registrations', 'espresso_registrations_delete_registration')) {
 			$this->_views['incomplete'] = array(
 				'slug' => 'incomplete',
 				'label' => __('Incomplete', 'event_espresso'),
@@ -728,7 +728,7 @@ 
 				)
 			);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_contacts', 'espresso_registrations_trash_attendees' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_contacts', 'espresso_registrations_trash_attendees')) {
 			$this->_views['trash'] = array(
 				'slug' => 'trash',
 				'label' => __('Trash', 'event_espresso'),
@@ -767,42 +767,42 @@ 
 				'desc' => __('View Transaction Invoice', 'event_espresso')
 				),
  			);
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) {
 			$fc_items['resend_registration'] = array(
 				'class' => 'dashicons dashicons-email-alt',
 				'desc' => __('Resend Registration Details', 'event_espresso')
 				);
 		} else {
-			$fc_items['blank'] = array( 'class' => 'blank', 'desc' => '' );
+			$fc_items['blank'] = array('class' => 'blank', 'desc' => '');
 		}
 
 		$sc_items = array(
 			'approved_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')
 				),
 			'pending_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence')
 				),
 			'incomplete_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_incomplete,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_incomplete, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_incomplete,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_incomplete, FALSE, 'sentence')
 			),
 			'not_approved' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence')
 				),
 			'declined_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence')
 				),
 			'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled,
-				'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled,
+				'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence')
 				)
 			);
-		return array_merge( $fc_items, $sc_items );
+		return array_merge($fc_items, $sc_items);
 	}
 
 
@@ -815,15 +815,15 @@ 
 
 
 	protected function _registrations_overview_list_table() {
-		$EVT_ID = ( ! empty( $this->_req_data['event_id'] )) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		if ( $EVT_ID ) {
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_registrations', 'espresso_registrations_new_registration', $EVT_ID ) ) {
-				$this->_admin_page_title .= $this->get_action_link_or_button( 'new_registration', 'add-registrant', array( 'event_id' => $EVT_ID ), 'add-new-h2' );
+		$EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE;
+		if ($EVT_ID) {
+			if (EE_Registry::instance()->CAP->current_user_can('ee_edit_registrations', 'espresso_registrations_new_registration', $EVT_ID)) {
+				$this->_admin_page_title .= $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $EVT_ID), 'add-new-h2');
 			}
-			$event = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
-			$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( __('%s Viewing registrations for the event: %s%s', 'event_espresso'), '<h2>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce( array('action' => 'edit', 'post' => $event->ID() ), EVENTS_ADMIN_URL ) . '">' . $event->get('EVT_name') . '</a>', '</h2>' ) : '';
+			$event = EEM_Event::instance()->get_one_by_ID($EVT_ID);
+			$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(__('%s Viewing registrations for the event: %s%s', 'event_espresso'), '<h2>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'">'.$event->get('EVT_name').'</a>', '</h2>') : '';
 		}
-		$this->_template_args['after_list_table'] = $this->_display_legend( $this->_registration_legend_items() );
+		$this->_template_args['after_list_table'] = $this->_display_legend($this->_registration_legend_items());
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -838,19 +838,19 @@ 
 	 */
 	private function _set_registration_object() {
 		//get out if we've already set the object
-		if ( is_object( $this->_registration )) {
+		if (is_object($this->_registration)) {
 			return TRUE;
 		}
 
 	    $REG = EEM_Registration::instance();
 
-		$REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
+		$REG_ID = ( ! empty($this->_req_data['_REG_ID'])) ? absint($this->_req_data['_REG_ID']) : FALSE;
 
-		if ( $this->_registration = $REG->get_one_by_ID( $REG_ID ))
+		if ($this->_registration = $REG->get_one_by_ID($REG_ID))
 			return TRUE;
 		else {
-			$error_msg = sprintf( __('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID );
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg = sprintf(__('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID);
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 			$this->_registration = NULL;
 			return FALSE;
 		}
@@ -869,25 +869,25 @@ 
 	 * @internal param bool $all whether to ignore all query params and just return ALL registrations (or count if count is set)
 	 * @return mixed (int|array)  int = count || array of registration objects
 	 */
-	public function get_registrations( $per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE ) {
-
-		$EVT_ID = ! empty( $this->_req_data['event_id'] ) && $this->_req_data['event_id'] > 0 ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$CAT_ID = ! empty( $this->_req_data['EVT_CAT'] ) && (int) $this->_req_data['EVT_CAT'] > 0? absint( $this->_req_data['EVT_CAT'] ) : FALSE;
-		$reg_status = ! empty( $this->_req_data['_reg_status'] ) ? sanitize_text_field( $this->_req_data['_reg_status'] ) : FALSE;
-		$month_range = ! empty( $this->_req_data['month_range'] ) ? sanitize_text_field( $this->_req_data['month_range'] ) : FALSE;//should be like 2013-april
-		$today_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'today' ? TRUE : FALSE;
-		$this_month_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'month' ? TRUE  : FALSE;
+	public function get_registrations($per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE) {
+
+		$EVT_ID = ! empty($this->_req_data['event_id']) && $this->_req_data['event_id'] > 0 ? absint($this->_req_data['event_id']) : FALSE;
+		$CAT_ID = ! empty($this->_req_data['EVT_CAT']) && (int) $this->_req_data['EVT_CAT'] > 0 ? absint($this->_req_data['EVT_CAT']) : FALSE;
+		$reg_status = ! empty($this->_req_data['_reg_status']) ? sanitize_text_field($this->_req_data['_reg_status']) : FALSE;
+		$month_range = ! empty($this->_req_data['month_range']) ? sanitize_text_field($this->_req_data['month_range']) : FALSE; //should be like 2013-april
+		$today_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'today' ? TRUE : FALSE;
+		$this_month_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'month' ? TRUE : FALSE;
 		$start_date = FALSE;
 		$end_date = FALSE;
 		$_where = array();
-		$trash = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'trash' ? TRUE : FALSE;
-		$incomplete = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'incomplete' ? TRUE : FALSE;
+		$trash = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'trash' ? TRUE : FALSE;
+		$incomplete = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'incomplete' ? TRUE : FALSE;
 
 		//set orderby
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
 
-		switch ( $this->_req_data['orderby'] ) {
+		switch ($this->_req_data['orderby']) {
 			case '_REG_ID':
 				$orderby = 'REG_ID';
 				break;
@@ -907,26 +907,26 @@ 
 				$orderby = 'REG_date';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $count  ? NULL : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? NULL : array($offset, $per_page);
 
-		if($EVT_ID){
-			$_where['EVT_ID']=$EVT_ID;
+		if ($EVT_ID) {
+			$_where['EVT_ID'] = $EVT_ID;
 		}
-		if($CAT_ID){
+		if ($CAT_ID) {
 			$_where['Event.Term_Taxonomy.term_id'] = $CAT_ID;
 		}
-		if ( $incomplete ) {
+		if ($incomplete) {
 			$_where['STS_ID'] = EEM_Registration::status_id_incomplete;
 		} else if ( ! $trash) {
-			$_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete );
+			$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
 		}
-		if($reg_status){
+		if ($reg_status) {
 			$_where['STS_ID'] = $reg_status;
 		}
 
@@ -938,105 +938,105 @@ 
 		$time_start = ' 00:00:00';
 		$time_end = ' 23:59:59';
 
-		if($today_a || $today ){
+		if ($today_a || $today) {
 			$curdate = date('Y-m-d', current_time('timestamp'));
-			$_where['REG_date']= array('BETWEEN',
+			$_where['REG_date'] = array('BETWEEN',
 				array(
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_start, 'Y-m-d H:i:s' ),
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_end, 'Y-m-d H:i:s' ),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_start, 'Y-m-d H:i:s'),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_end, 'Y-m-d H:i:s'),
 			));
-		}elseif($this_month_a || $this_month){
+		}elseif ($this_month_a || $this_month) {
 			$this_month_r = date('m', current_time('timestamp'));
-			$days_this_month = date( 't', current_time('timestamp') );
-			$_where['REG_date']= array('BETWEEN',
+			$days_this_month = date('t', current_time('timestamp'));
+			$_where['REG_date'] = array('BETWEEN',
 				array(
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start, 'Y-m-d H:i:s' ),
-					EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end, 'Y-m-d H:i:s' )
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-01'.' '.$time_start, 'Y-m-d H:i:s'),
+					EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' '.$time_end, 'Y-m-d H:i:s')
 			));
-		}elseif($month_range){
+		}elseif ($month_range) {
 			$pieces = explode(' ', $this->_req_data['month_range'], 3);
-			$month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
-			$year_r = !empty($pieces[1]) ? $pieces[1] : '';
-			$days_in_month = date('t', strtotime($year_r .  '-' . $month_r . '-' . '01') );
-			$_where['REG_date']= array('BETWEEN',
-				array(  EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-' . $days_in_month .  ' 23:59:59', 'Y-m-d H:i:s' ) ) );
-		}elseif($start_date && $end_date){
+			$month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
+			$year_r = ! empty($pieces[1]) ? $pieces[1] : '';
+			$days_in_month = date('t', strtotime($year_r.'-'.$month_r.'-'.'01'));
+			$_where['REG_date'] = array('BETWEEN',
+				array(EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-'.$days_in_month.' 23:59:59', 'Y-m-d H:i:s')));
+		}elseif ($start_date && $end_date) {
 			throw new EE_Error("not yet supported");
-		}elseif($start_date){
+		}elseif ($start_date) {
 			throw new EE_Error("not yet supported");
-		}elseif($end_date){
+		}elseif ($end_date) {
 			throw new EE_Error("not yet supported");
 		}
 
-		if ( ! empty( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if ( ! empty($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'Event.EVT_name' => array( 'LIKE', $sstr),
-				'Event.EVT_desc' => array( 'LIKE', $sstr ),
-				'Event.EVT_short_desc' => array( 'LIKE' , $sstr ),
-				'Attendee.ATT_full_name' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_fname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_lname' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_email' => array('LIKE', $sstr ),
-				'Attendee.ATT_address' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_address2' => array( 'LIKE', $sstr ),
-				'Attendee.ATT_city' => array( 'LIKE', $sstr ),
-				'REG_final_price' => array( 'LIKE', $sstr ),
-				'REG_code' => array( 'LIKE', $sstr ),
-				'REG_count' => array( 'LIKE' , $sstr ),
-				'REG_group_size' => array( 'LIKE' , $sstr ),
-				'Ticket.TKT_name' => array( 'LIKE', $sstr ),
-				'Ticket.TKT_description' => array( 'LIKE', $sstr ),
-				'Transaction.Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $sstr )
+				'Event.EVT_name' => array('LIKE', $sstr),
+				'Event.EVT_desc' => array('LIKE', $sstr),
+				'Event.EVT_short_desc' => array('LIKE', $sstr),
+				'Attendee.ATT_full_name' => array('LIKE', $sstr),
+				'Attendee.ATT_fname' => array('LIKE', $sstr),
+				'Attendee.ATT_lname' => array('LIKE', $sstr),
+				'Attendee.ATT_short_bio' => array('LIKE', $sstr),
+				'Attendee.ATT_email' => array('LIKE', $sstr),
+				'Attendee.ATT_address' => array('LIKE', $sstr),
+				'Attendee.ATT_address2' => array('LIKE', $sstr),
+				'Attendee.ATT_city' => array('LIKE', $sstr),
+				'REG_final_price' => array('LIKE', $sstr),
+				'REG_code' => array('LIKE', $sstr),
+				'REG_count' => array('LIKE', $sstr),
+				'REG_group_size' => array('LIKE', $sstr),
+				'Ticket.TKT_name' => array('LIKE', $sstr),
+				'Ticket.TKT_description' => array('LIKE', $sstr),
+				'Transaction.Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $sstr)
 				);
 		}
 
 		//capability checks
-		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations')) {
 			$_where['AND'] = array(
 				'Event.EVT_wp_user' => get_current_user_id()
 				);
 		}
 
 
-		if( $count ){
-			if ( $trash ) {
-				return EEM_Registration::instance()->count_deleted( array( $_where ));
-			} else if ( $incomplete ) {
-				return EEM_Registration::instance()->count( array( $_where ));
+		if ($count) {
+			if ($trash) {
+				return EEM_Registration::instance()->count_deleted(array($_where));
+			} else if ($incomplete) {
+				return EEM_Registration::instance()->count(array($_where));
 			} else {
-				return EEM_Registration::instance()->count( array( $_where, 'default_where_conditions' => 'this_model_only' ));
+				return EEM_Registration::instance()->count(array($_where, 'default_where_conditions' => 'this_model_only'));
 			}
 		} else {
 			//make sure we remove default where conditions cause all registrations matching query are returned
-			$query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'default_where_conditions' => 'this_model_only' );
-			if ( $per_page !== -1 ) {
+			$query_params = array($_where, 'order_by' => array($orderby => $sort), 'default_where_conditions' => 'this_model_only');
+			if ($per_page !== -1) {
 				$query_params['limit'] = $limit;
 			}
-			$registrations =  $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params);
+			$registrations = $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params);
 
 
-			if ( $EVT_ID && isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration &&  $registrations[0]->event_obj()) {
+			if ($EVT_ID && isset($registrations[0]) && $registrations[0] instanceof EE_Registration && $registrations[0]->event_obj()) {
 				$first_registration = $registrations[0];
 				//EEH_Debug_Tools::printr( $registrations[0], '$registrations  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 				$event_name = $first_registration->event_obj()->name();
-				$event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
+				$event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a'); // isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y,    g:i:s a', $registrations[0]->DTT_EVT_start ) : '';
 				// edit event link
-				if ( $event_name != '' ) {
-					$edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL );
-					$edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>';
-					$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ;
+				if ($event_name != '') {
+					$edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL);
+					$edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>';
+					$event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>';
 				}
 
-				$back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL );
-				$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">&laquo; ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>';
+				$back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL);
+				$back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">&laquo; '.__('Back to All Registrations', 'event_espresso').'</a>';
 
 				$this->_template_args['before_admin_page_content'] = '
 			<div id="admin-page-header">
-				<h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1>
-				<h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3>
-				<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span>
+				<h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1>
+				<h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3>
+				<span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span>
 			</div>
 			';
 
@@ -1074,7 +1074,7 @@ 
 
 		$this->_set_registration_object();
 
-		if ( is_object( $this->_registration )) {
+		if (is_object($this->_registration)) {
 			$transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance();
 			$this->_session = $transaction->session_data();
 
@@ -1082,10 +1082,10 @@ 
 
 
 			$this->_template_args['reg_nmbr']['value'] = $this->_registration->ID();
-			$this->_template_args['reg_nmbr']['label'] = __( 'Registration Number', 'event_espresso' );
+			$this->_template_args['reg_nmbr']['label'] = __('Registration Number', 'event_espresso');
 
-			$this->_template_args['reg_datetime']['value'] =  $this->_registration->pretty_date('l F j, Y','g:i:s a') ;
-			$this->_template_args['reg_datetime']['label'] = __( 'Date', 'event_espresso' );
+			$this->_template_args['reg_datetime']['value'] = $this->_registration->pretty_date('l F j, Y', 'g:i:s a');
+			$this->_template_args['reg_datetime']['label'] = __('Date', 'event_espresso');
 
 			$this->_template_args['grand_total'] = $transaction->total();
 
@@ -1093,19 +1093,19 @@ 
 			// link back to overview
 			$this->_template_args['reg_overview_url'] = REG_ADMIN_URL;
 			$this->_template_args['registration'] = $this->_registration;
-			$this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'event_id' => $event_id ), REG_ADMIN_URL );
-			$this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event_id, 'page' => 'espresso_transactions' ), admin_url( 'admin.php' ) );
-			$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event_id ), admin_url( 'admin.php' ) );
+			$this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $event_id), REG_ADMIN_URL);
+			$this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event_id, 'page' => 'espresso_transactions'), admin_url('admin.php'));
+			$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event_id), admin_url('admin.php'));
 
 			//next and previous links
-			$next_reg = $this->_registration->next(null, array(), 'REG_ID' );
-			$this->_template_args['next_registration'] = $next_reg ? $this->_next_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $next_reg['REG_ID'] ), REG_ADMIN_URL ), 'dashicons dashicons-arrow-right ee-icon-size-22' ) : '';
-			$previous_reg = $this->_registration->previous( null, array(), 'REG_ID' );
-			$this->_template_args['previous_registration'] = $previous_reg ? $this->_previous_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $previous_reg['REG_ID'] ), REG_ADMIN_URL ), 'dashicons dashicons-arrow-left ee-icon-size-22' ) : '';
+			$next_reg = $this->_registration->next(null, array(), 'REG_ID');
+			$this->_template_args['next_registration'] = $next_reg ? $this->_next_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $next_reg['REG_ID']), REG_ADMIN_URL), 'dashicons dashicons-arrow-right ee-icon-size-22') : '';
+			$previous_reg = $this->_registration->previous(null, array(), 'REG_ID');
+			$this->_template_args['previous_registration'] = $previous_reg ? $this->_previous_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $previous_reg['REG_ID']), REG_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : '';
 
 			// grab header
-			$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_header.template.php';
-			$this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+			$template_path = REG_TEMPLATE_PATH.'reg_admin_details_header.template.php';
+			$this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		} else {
 
@@ -1124,17 +1124,17 @@ 
 
 
 	protected function _registration_details_metaboxes() {
-		do_action( 'AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this );
+		do_action('AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this);
 		$this->_set_registration_object();
 		$attendee = $this->_registration instanceof EE_Registration ? $this->_registration->attendee() : null;
-		add_meta_box( 'edit-reg-status-mbox', __( 'Registration Status', 'event_espresso' ), array( $this, 'set_reg_status_buttons_metabox' ), $this->wp_page_slug, 'normal', 'high' );
-		add_meta_box( 'edit-reg-details-mbox', __( 'Registration Details', 'event_espresso' ), array( $this, '_reg_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
-		if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox' ) ) {
-			add_meta_box( 'edit-reg-questions-mbox', __( 'Registration Form Answers', 'event_espresso' ), array( $this, '_reg_questions_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-reg-status-mbox', __('Registration Status', 'event_espresso'), array($this, 'set_reg_status_buttons_metabox'), $this->wp_page_slug, 'normal', 'high');
+		add_meta_box('edit-reg-details-mbox', __('Registration Details', 'event_espresso'), array($this, '_reg_details_meta_box'), $this->wp_page_slug, 'normal', 'high');
+		if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox')) {
+			add_meta_box('edit-reg-questions-mbox', __('Registration Form Answers', 'event_espresso'), array($this, '_reg_questions_meta_box'), $this->wp_page_slug, 'normal', 'high');
 		}
-		add_meta_box( 'edit-reg-registrant-mbox', __( 'Contact Details', 'event_espresso' ), array( $this, '_reg_registrant_side_meta_box' ), $this->wp_page_slug, 'side', 'high' );
-		if ( $this->_registration->group_size() > 1 ) {
-			add_meta_box( 'edit-reg-attendees-mbox', __( 'Other Registrations in this Transaction', 'event_espresso' ), array( $this, '_reg_attendees_meta_box' ), $this->wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-reg-registrant-mbox', __('Contact Details', 'event_espresso'), array($this, '_reg_registrant_side_meta_box'), $this->wp_page_slug, 'side', 'high');
+		if ($this->_registration->group_size() > 1) {
+			add_meta_box('edit-reg-attendees-mbox', __('Other Registrations in this Transaction', 'event_espresso'), array($this, '_reg_attendees_meta_box'), $this->wp_page_slug, 'normal', 'high');
 		}
 	}
 
@@ -1155,23 +1155,23 @@ 
 
 		//let's get an array of all possible buttons that we can just reference
 		$status_buttons = $this->_get_reg_status_buttons();
-		$template_args[ 'reg_status_value' ] = $this->_registration->pretty_status();
-		$template_args[ 'reg_status_class' ] = 'status-' . $this->_registration->status_ID();
+		$template_args['reg_status_value'] = $this->_registration->pretty_status();
+		$template_args['reg_status_class'] = 'status-'.$this->_registration->status_ID();
 		$template_args['attendee'] = $this->_registration->attendee();
-		$template = REG_TEMPLATE_PATH . 'reg_status_change_buttons.template.php';
-		if ( $this->_set_registration_object() ) {
+		$template = REG_TEMPLATE_PATH.'reg_status_change_buttons.template.php';
+		if ($this->_set_registration_object()) {
 			$current_status = $this->_registration->status_ID();
-			unset( $status_buttons[$current_status] );
-			if ( $current_status != EEM_Registration::status_id_pending_payment && $is_complete ) {
-				unset( $status_buttons[EEM_Registration::status_id_pending_payment] );
+			unset($status_buttons[$current_status]);
+			if ($current_status != EEM_Registration::status_id_pending_payment && $is_complete) {
+				unset($status_buttons[EEM_Registration::status_id_pending_payment]);
 			}
-			$template_args['status_buttons'] = implode( "\n", $status_buttons );
+			$template_args['status_buttons'] = implode("\n", $status_buttons);
 		}
 		$template_args['form_url'] = REG_ADMIN_URL;
 		$template_args['REG_ID'] = $this->_registration->ID();
-		$template_args['nonce'] = wp_nonce_field( 'change_reg_status_nonce',  'change_reg_status_nonce', FALSE, FALSE );
+		$template_args['nonce'] = wp_nonce_field('change_reg_status_nonce', 'change_reg_status_nonce', FALSE, FALSE);
 
-		EEH_Template::display_template( $template, $template_args );
+		EEH_Template::display_template($template, $template_args);
 
 	}
 
@@ -1185,11 +1185,11 @@ 
 	private function _get_reg_status_buttons() {
 
 		$buttons = array(
-			EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_pending_payment . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_not_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_declined . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) . '">',
-			EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_cancelled . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) . '">',
+			EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_pending_payment.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_not_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_declined.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence').'">',
+			EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_cancelled.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence').'">',
 			);
 		return $buttons;
 	}
@@ -1203,13 +1203,13 @@ 
 	 *
 	 * @return array  (array with reg_id(s) updated and whether update was successful.
 	 */
-	protected function _set_registration_status_from_request( $status = false, $notify = false ) {
-		$REG_ID = isset( $this->_req_data['_REG_ID'] ) ? (array) $this->_req_data['_REG_ID'] : array();
+	protected function _set_registration_status_from_request($status = false, $notify = false) {
+		$REG_ID = isset($this->_req_data['_REG_ID']) ? (array) $this->_req_data['_REG_ID'] : array();
 
-		$success = $this->_set_registration_status( $REG_ID, $status );
+		$success = $this->_set_registration_status($REG_ID, $status);
 
 		//notify?
-		if ( $success && $notify && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) {
+		if ($success && $notify && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) {
 			$this->_process_resend_registration();
 		}
 
@@ -1227,19 +1227,19 @@ 
 	 * @param bool $status
 	 * @return array (an array with 'success' key representing whether status change was successful, and 'REG_ID' as the array of updated registrations).
 	 */
-	protected function _set_registration_status( $REG_ID, $status = false ) {
+	protected function _set_registration_status($REG_ID, $status = false) {
 		$success = true;
 		// set default status if none is passed
 		$status = $status ? $status : EEM_Registration::status_id_pending_payment;
 
 		//typecast and sanitize reg_id
-		$reg_ids = array_filter( (array) $REG_ID, 'absint' );
+		$reg_ids = array_filter((array) $REG_ID, 'absint');
 
 		//loop through REG_ID's and change status
-		foreach ( $reg_ids as $r_id ) {
-			$registration = EEM_Registration::instance()->get_one_by_ID( $r_id );
-			if ( $registration instanceof EE_Registration ) {
-				$registration->set_status( $status );
+		foreach ($reg_ids as $r_id) {
+			$registration = EEM_Registration::instance()->get_one_by_ID($r_id);
+			if ($registration instanceof EE_Registration) {
+				$registration->set_status($status);
 				$result = $registration->save();
 
 				//verifying explicit fails because update *may* just return 0 for 0 rows affected
@@ -1251,7 +1251,7 @@ 
 		$this->_req_data['_REG_ID'] = $reg_ids;
 
 		//return $success and processed registrations
-		return array( 'REG_ID' => $reg_ids, 'success' => $success );
+		return array('REG_ID' => $reg_ids, 'success' => $success);
 	}
 
 
@@ -1263,37 +1263,37 @@ 
 	 * @param   bool    $notify indicates whether the _set_registration_status_from_request does notifications or not.
 	 * @return void
 	 */
-	protected function _reg_status_change_return( $STS_ID, $notify = false ) {
+	protected function _reg_status_change_return($STS_ID, $notify = false) {
 
-		$result = ! empty( $STS_ID ) ? $this->_set_registration_status_from_request( $STS_ID, $notify ) : array( 'success' => false );
+		$result = ! empty($STS_ID) ? $this->_set_registration_status_from_request($STS_ID, $notify) : array('success' => false);
 
 
-		$success = isset( $result['success'] ) && $result['success'];
+		$success = isset($result['success']) && $result['success'];
 
 		//setup success message
-		if ( $success ) {
-			$msg = is_array( $result['REG_ID'] ) && count( $result['REG_ID'] ) > 1  ? sprintf( __('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) :  sprintf( __('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) ;
-			EE_Error::add_success( $msg );
+		if ($success) {
+			$msg = is_array($result['REG_ID']) && count($result['REG_ID']) > 1 ? sprintf(__('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower')) : sprintf(__('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower'));
+			EE_Error::add_success($msg);
 		} else {
-			EE_Error::add_error( __('Something went wrong, and the status was not changed', 'event_espresso' ), __FILE__, __LINE__, __FUNCTION__ );
+			EE_Error::add_error(__('Something went wrong, and the status was not changed', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__);
 		}
 
-		$route = isset( $this->_req_data['return'] ) && $this->_req_data['return'] == 'view_registration' ? array( 'action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0] ) : array( 'action' => 'default' );
+		$route = isset($this->_req_data['return']) && $this->_req_data['return'] == 'view_registration' ? array('action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0]) : array('action' => 'default');
 		//unset nonces
-		foreach ( $this->_req_data as $ref => $value ) {
-			if ( strpos( $ref, 'nonce' ) !== false ) {
-				unset( $this->_req_data[$ref] );
+		foreach ($this->_req_data as $ref => $value) {
+			if (strpos($ref, 'nonce') !== false) {
+				unset($this->_req_data[$ref]);
 				continue;
 			}
 
-			$value = is_array( $value ) ? array_map( 'urlencode', $value ) : urlencode( $value );
+			$value = is_array($value) ? array_map('urlencode', $value) : urlencode($value);
 			$this->_req_data[$ref] = $value;
 		}
 
 		//merge request vars so that the reloaded list table contains any existing filter query params
-		$route = array_merge( $this->_req_data, $route );
+		$route = array_merge($this->_req_data, $route);
 
-		$this->_redirect_after_action( $success, '', '', $route, true );
+		$this->_redirect_after_action($success, '', '', $route, true);
 
 		}
 
@@ -1306,29 +1306,29 @@ 
 	protected function _change_reg_status() {
 		$this->_req_data['return'] = 'view_registration';
 		//set notify based on whether the send notifications toggle is set or not
-		$notify = ! empty( $this->_req_data['txn_reg_status_change']['send_notifications'] );
-		$this->_req_data[ '_reg_status_id' ] = isset( $this->_req_data[ '_reg_status_id' ] ) ? $this->_req_data[ '_reg_status_id' ] : '';
+		$notify = ! empty($this->_req_data['txn_reg_status_change']['send_notifications']);
+		$this->_req_data['_reg_status_id'] = isset($this->_req_data['_reg_status_id']) ? $this->_req_data['_reg_status_id'] : '';
 
-		switch ( $this->_req_data['_reg_status_id'] ) {
-			case EEH_Template::pretty_status( EEM_Registration::status_id_approved, false, 'sentence' ) :
-				$this->approve_registration( $notify );
+		switch ($this->_req_data['_reg_status_id']) {
+			case EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence') :
+				$this->approve_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, false, 'sentence' ) :
-				$this->pending_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence') :
+				$this->pending_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, false, 'sentence' ) :
-				$this->not_approve_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence') :
+				$this->not_approve_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_declined, false, 'sentence' ) :
-				$this->decline_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence') :
+				$this->decline_registration($notify);
 				break;
-			case EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, false, 'sentence' ) :
-				$this->cancel_registration( $notify );
+			case EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence') :
+				$this->cancel_registration($notify);
 				break;
 			default :
 				$result['success'] = false;
-				unset( $this->_req_data['return'] );
-				$this->_reg_status_change_return( '', false );
+				unset($this->_req_data['return']);
+				$this->_reg_status_change_return('', false);
 				break;
 		}
 	}
@@ -1341,8 +1341,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function approve_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_approved, $notify );
+	protected function approve_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_approved, $notify);
 	}
 
 
@@ -1354,8 +1354,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function decline_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify );
+	protected function decline_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_declined, $notify);
 	}
 
 
@@ -1367,8 +1367,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function cancel_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify );
+	protected function cancel_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_cancelled, $notify);
 	}
 
 
@@ -1381,8 +1381,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function not_approve_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify );
+	protected function not_approve_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_not_approved, $notify);
 	}
 
 
@@ -1393,8 +1393,8 @@ 
 	*		@param bool $notify whether or not to notify the registrant about their approval.
 	*		@return void
 	*/
-	protected function pending_registration( $notify = false ) {
-		$this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify );
+	protected function pending_registration($notify = false) {
+		$this->_reg_status_change_return(EEM_Registration::status_id_pending_payment, $notify);
 	}
 
 
@@ -1408,75 +1408,75 @@ 
 	public function _reg_details_meta_box() {
 		EEH_Autoloader::register_line_item_display_autoloaders();
 		EEH_Autoloader::register_line_item_filter_autoloaders();
-		EE_Registry::instance()->load_Helper( 'Line_Item' );
+		EE_Registry::instance()->load_Helper('Line_Item');
 		$transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance();
 		$this->_session = $transaction->session_data();
 
 		$filters = new EE_Line_Item_Filter_Collection();
-		$filters->add( new EE_Single_Registration_Line_Item_Filter( $this->_registration ) );
-		$filters->add( new EE_Non_Zero_Line_Item_Filter() );
-		$line_item_filter_processor = new EE_Line_Item_Filter_Processor( $filters, $transaction->total_line_item() );
+		$filters->add(new EE_Single_Registration_Line_Item_Filter($this->_registration));
+		$filters->add(new EE_Non_Zero_Line_Item_Filter());
+		$line_item_filter_processor = new EE_Line_Item_Filter_Processor($filters, $transaction->total_line_item());
 		$filtered_line_item_tree = $line_item_filter_processor->process();
 
 		$this->_template_args['REG_ID'] = $this->_registration->ID();
-		$line_item_display = new EE_Line_Item_Display( 'reg_admin_table', 'EE_Admin_Table_Registration_Line_Item_Display_Strategy' );
-		$this->_template_args['line_item_table'] = $line_item_display->display_line_item( $filtered_line_item_tree, array( 'EE_Registration' => $this->_registration ) );
+		$line_item_display = new EE_Line_Item_Display('reg_admin_table', 'EE_Admin_Table_Registration_Line_Item_Display_Strategy');
+		$this->_template_args['line_item_table'] = $line_item_display->display_line_item($filtered_line_item_tree, array('EE_Registration' => $this->_registration));
 
 
 		$attendee = $this->_registration->attendee();
 
 
-		$this->_template_args['view_transaction_button'] = EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ?EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array('action'=> 'view_transaction', 'TXN_ID' => $transaction->ID() ), TXN_ADMIN_URL ), __(' View Transaction'), 'button secondary-button right', 'dashicons dashicons-cart' ) : '';
-		$this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ?EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'resend_registration', '_REG_ID'=>$this->_registration->ID(), 'redirect_to' => 'view_registration' ), REG_ADMIN_URL ), __(' Resend Registration'), 'button secondary-button right', 'dashicons dashicons-email-alt' ) : '';
+		$this->_template_args['view_transaction_button'] = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=> 'view_transaction', 'TXN_ID' => $transaction->ID()), TXN_ADMIN_URL), __(' View Transaction'), 'button secondary-button right', 'dashicons dashicons-cart') : '';
+		$this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration') ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=>'resend_registration', '_REG_ID'=>$this->_registration->ID(), 'redirect_to' => 'view_registration'), REG_ADMIN_URL), __(' Resend Registration'), 'button secondary-button right', 'dashicons dashicons-email-alt') : '';
 
 
 		$this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
-		$payment = $transaction->get_first_related( 'Payment' );
+		$payment = $transaction->get_first_related('Payment');
 		$payment = ! $payment instanceof EE_Payment ? EE_Payment::new_instance() : $payment;
-		$payment_method = $payment->get_first_related( 'Payment_Method' );
+		$payment_method = $payment->get_first_related('Payment_Method');
 		$payment_method = ! $payment_method instanceof EE_Payment_Method ? EE_Payment_Method::new_instance() : $payment_method;
-		$reg_status_class = 'status-' . $this->_registration->status_ID();
+		$reg_status_class = 'status-'.$this->_registration->status_ID();
 		$reg_details = array(
 			'payment_method' => $payment_method->name(),
 			'response_msg' => $payment->gateway_response(),
-			'registration_id' => $this->_registration->get( 'REG_code' ),
+			'registration_id' => $this->_registration->get('REG_code'),
 			'registration_session' => $this->_registration->session_ID(),
-			'ip_address' => isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : '',
-			'user_agent' => isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : '',
+			'ip_address' => isset($this->_session['ip_address']) ? $this->_session['ip_address'] : '',
+			'user_agent' => isset($this->_session['user_agent']) ? $this->_session['user_agent'] : '',
 			);
 
 
-		if ( isset( $reg_details['registration_id'] )) {
+		if (isset($reg_details['registration_id'])) {
 			$this->_template_args['reg_details']['registration_id']['value'] = $reg_details['registration_id'];
-			$this->_template_args['reg_details']['registration_id']['label'] = __( 'Registration ID', 'event_espresso' );
+			$this->_template_args['reg_details']['registration_id']['label'] = __('Registration ID', 'event_espresso');
 			$this->_template_args['reg_details']['registration_id']['class'] = 'regular-text';
 		}
 
-		if ( isset( $reg_details['payment_method'] ) ) {
+		if (isset($reg_details['payment_method'])) {
 			$this->_template_args['reg_details']['payment_method']['value'] = $reg_details['payment_method'];
-			$this->_template_args['reg_details']['payment_method']['label'] = __( 'Most Recent Payment Method', 'event_espresso' );
+			$this->_template_args['reg_details']['payment_method']['label'] = __('Most Recent Payment Method', 'event_espresso');
 			$this->_template_args['reg_details']['payment_method']['class'] = 'regular-text';
 			$this->_template_args['reg_details']['response_msg']['value'] = $reg_details['response_msg'];
-			$this->_template_args['reg_details']['response_msg']['label'] = __( 'Payment method response', 'event_espresso' );
+			$this->_template_args['reg_details']['response_msg']['label'] = __('Payment method response', 'event_espresso');
 			$this->_template_args['reg_details']['response_msg']['class'] = 'regular-text';
 		}
 
 		$this->_template_args['reg_details']['registration_session']['value'] = $reg_details['registration_session'];
-		$this->_template_args['reg_details']['registration_session']['label'] = __( 'Registration Session', 'event_espresso' );
+		$this->_template_args['reg_details']['registration_session']['label'] = __('Registration Session', 'event_espresso');
 		$this->_template_args['reg_details']['registration_session']['class'] = 'regular-text';
 
 		$this->_template_args['reg_details']['ip_address']['value'] = $reg_details['ip_address'];
-		$this->_template_args['reg_details']['ip_address']['label'] = __( 'Registration placed from IP', 'event_espresso' );
+		$this->_template_args['reg_details']['ip_address']['label'] = __('Registration placed from IP', 'event_espresso');
 		$this->_template_args['reg_details']['ip_address']['class'] = 'regular-text';
 
 		$this->_template_args['reg_details']['user_agent']['value'] = $reg_details['user_agent'];
-		$this->_template_args['reg_details']['user_agent']['label'] = __( 'Registrant User Agent', 'event_espresso' );
+		$this->_template_args['reg_details']['user_agent']['label'] = __('Registrant User Agent', 'event_espresso');
 		$this->_template_args['reg_details']['user_agent']['class'] = 'large-text';
 
-		$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL );
+		$this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL);
 
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_details.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_details.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 	}
 
@@ -1490,14 +1490,14 @@ 
 	*/
 	public function _reg_questions_meta_box() {
 		//allow someone to override this method entirely
-		if( apply_filters( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration ) ) {
-			$form = $this->_get_reg_custom_questions_form( $this->_registration->ID() );
-			$this->_template_args[ 'att_questions' ] = count( $form->subforms() ) > 0 ? $form->get_html_and_js() : '';
+		if (apply_filters('FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration)) {
+			$form = $this->_get_reg_custom_questions_form($this->_registration->ID());
+			$this->_template_args['att_questions'] = count($form->subforms()) > 0 ? $form->get_html_and_js() : '';
 			$this->_template_args['reg_questions_form_action'] = 'edit_registration';
 			$this->_template_args['REG_ID'] = $this->_registration->ID();
 
-			$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php';
-			echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+			$template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_questions.template.php';
+			echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 		}
 	}
 
@@ -1511,12 +1511,12 @@ 
 	 * @param        string $output
 	 * @return        string
 	 */
-	public function form_before_question_group( $output ) {
+	public function form_before_question_group($output) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			__( 'This method would have been protected but was used on a filter callback'
+			__CLASS__.'::'.__FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
 				. 'so needed to be public. Please discontinue usage as it will be removed soon.',
-				'event_espresso' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return '
@@ -1535,20 +1535,20 @@ 
 	 * @param        string $output
 	 * @return        string
 	 */
-	public function form_after_question_group( $output ) {
+	public function form_after_question_group($output) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			__( 'This method would have been protected but was used on a filter callback'
+			__CLASS__.'::'.__FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
 				. 'so needed to be public. Please discontinue usage as it will be removed soon.',
-				'event_espresso' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return  '
 			<tr class="hide-if-no-js">
 				<th> </th>
 				<td class="reg-admin-edit-attendee-question-td">
-					<a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '">
-						<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span>
+					<a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__('click to edit question', 'event_espresso').'">
+						<span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span>
 						<div class="dashicons dashicons-edit"></div>
 					</a>
 				</td>
@@ -1568,18 +1568,18 @@ 
 	 * @param        string $label
 	 * @return        string
 	 */
-	public function form_form_field_label_wrap( $label ) {
+	public function form_form_field_label_wrap($label) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			__( 'This method would have been protected but was used on a filter callback'
+			__CLASS__.'::'.__FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
 				. 'so needed to be public. Please discontinue usage as it will be removed soon.',
-				'event_espresso' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return '
 			<tr>
 				<th>
-					' . $label  . '
+					' . $label.'
 				</th>';
 	}
 
@@ -1593,17 +1593,17 @@ 
 	 * @param        string $input
 	 * @return        string
 	 */
-	public function form_form_field_input__wrap( $input ) {
+	public function form_form_field_input__wrap($input) {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			__( 'This method would have been protected but was used on a filter callback'
+			__CLASS__.'::'.__FUNCTION__,
+			__('This method would have been protected but was used on a filter callback'
 				. 'so needed to be public. Please discontinue usage as it will be removed soon.',
-				'event_espresso' ),
+				'event_espresso'),
 			'4.8.32.rc.000'
 		);
 		return '
 				<td class="reg-admin-attendee-questions-input-td disabled-input">
-					' . $input . '
+					' . $input.'
 				</td>
 			</tr>';
 	}
@@ -1617,14 +1617,14 @@ 
 	 * @return void
 	 */
 	protected function _update_attendee_registration_form() {
-		do_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', $this );
-		if( $_SERVER['REQUEST_METHOD'] == 'POST'){
-			$REG_ID = isset( $this->_req_data['_REG_ID'] ) ? absint( $this->_req_data['_REG_ID'] ) : FALSE;
-			$success = $this->_save_reg_custom_questions_form( $REG_ID );
-			if( $success ) {
+		do_action('AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', $this);
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+			$REG_ID = isset($this->_req_data['_REG_ID']) ? absint($this->_req_data['_REG_ID']) : FALSE;
+			$success = $this->_save_reg_custom_questions_form($REG_ID);
+			if ($success) {
 				$what = __('Registration Form', 'event_espresso');
-				$route = $REG_ID ? array( 'action' => 'view_registration', '_REG_ID' => $REG_ID ) : array( 'action' => 'default' );
-				$this->_redirect_after_action( $success, $what, __('updated', 'event_espresso'), $route );
+				$route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID) : array('action' => 'default');
+				$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), $route);
 			}
 		}
 	}
@@ -1635,11 +1635,11 @@ 
 	 * @param int $REG_ID
 	 * @return EE_Registration_Custom_Questions_Form
 	 */
-	protected function _get_reg_custom_questions_form( $REG_ID ) {
-		if( ! $this->_reg_custom_questions_form ) {
-			require_once( REG_ADMIN . 'form_sections' . DS . 'EE_Registration_Custom_Questions_Form.form.php' );
-			$this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form( EEM_Registration::instance()->get_one_by_ID( $REG_ID ) );
-			$this->_reg_custom_questions_form->_construct_finalize( null, null );
+	protected function _get_reg_custom_questions_form($REG_ID) {
+		if ( ! $this->_reg_custom_questions_form) {
+			require_once(REG_ADMIN.'form_sections'.DS.'EE_Registration_Custom_Questions_Form.form.php');
+			$this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form(EEM_Registration::instance()->get_one_by_ID($REG_ID));
+			$this->_reg_custom_questions_form->_construct_finalize(null, null);
 		}
 		return $this->_reg_custom_questions_form;
 	}
@@ -1652,17 +1652,17 @@ 
 	 * @param bool $REG_ID
 	 * @return bool
 	 */
-	private function _save_reg_custom_questions_form( $REG_ID = FALSE ) {
+	private function _save_reg_custom_questions_form($REG_ID = FALSE) {
 
 		if ( ! $REG_ID) {
-			EE_Error::add_error( __('An error occurred. No registration ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('An error occurred. No registration ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		$form = $this->_get_reg_custom_questions_form( $REG_ID );
-		$form->receive_form_submission( $this->_req_data );
+		$form = $this->_get_reg_custom_questions_form($REG_ID);
+		$form->receive_form_submission($this->_req_data);
 		$success = false;
-		if( $form->is_valid() ) {
-			foreach( $form->subforms() as $question_group_id => $question_group_form ) {
-				foreach( $question_group_form->inputs() as $question_id => $input ) {
+		if ($form->is_valid()) {
+			foreach ($form->subforms() as $question_group_id => $question_group_form) {
+				foreach ($question_group_form->inputs() as $question_id => $input) {
 					$where_conditions = array(
 							'QST_ID' => $question_id,
 							'REG_ID' => $REG_ID
@@ -1670,19 +1670,19 @@ 
 					$possibly_new_values = array(
 							'ANS_value' => $input->normalized_value()
 						);
-					$answer = EEM_Answer::instance()->get_one( array( $where_conditions ) );
-					if( $answer instanceof EE_Answer ) {
-						$success = $answer->save( $possibly_new_values );
+					$answer = EEM_Answer::instance()->get_one(array($where_conditions));
+					if ($answer instanceof EE_Answer) {
+						$success = $answer->save($possibly_new_values);
 					} else {
 						//insert it then
-						$cols_n_vals = array_merge( $where_conditions, $possibly_new_values );
-						$answer = EE_Answer::new_instance( $cols_n_vals );
+						$cols_n_vals = array_merge($where_conditions, $possibly_new_values);
+						$answer = EE_Answer::new_instance($cols_n_vals);
 						$success = $answer->save();
 					}
 				}
 			}
 		} else {
-			EE_Error::add_error( $form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $success;
 	}
@@ -1700,30 +1700,30 @@ 
 		$registrations = $REG->get_all(array(
 			array(
 				'TXN_ID'=>$this->_registration->transaction_ID(),
-				'REG_ID'=>array('!=',$this->_registration->ID())
+				'REG_ID'=>array('!=', $this->_registration->ID())
 			),
 			'force_join'=>array('Attendee')));
 
 		$this->_template_args['attendees'] = array();
 		$this->_template_args['attendee_notice'] = '';
 		EE_Registry::instance()->load_helper('Array');
-		if ( empty( $registrations)  || ( is_array($registrations) &&  ! EEH_Array::get_one_item_from_array($registrations) ) ) {
-			EE_Error::add_error( __('There are no records attached to this registration. Something may have gone wrong with the registration', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if (empty($registrations) || (is_array($registrations) && ! EEH_Array::get_one_item_from_array($registrations))) {
+			EE_Error::add_error(__('There are no records attached to this registration. Something may have gone wrong with the registration', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['attendee_notice'] = EE_Error::get_notices();
 		} else {
 
 			$att_nmbr = 1;
-			foreach ( $registrations as $registration ) {
+			foreach ($registrations as $registration) {
 				/* @var $registration EE_Registration */
 				$attendee = $registration->attendee() ? $registration->attendee() : EEM_Attendee::instance()->create_default_object();
-				$this->_template_args['attendees'][ $att_nmbr ]['fname'] = $attendee->fname();//( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : '';
-				$this->_template_args['attendees'][ $att_nmbr ]['lname'] = $attendee->lname();//( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : '';
-				$this->_template_args['attendees'][ $att_nmbr ]['email'] = $attendee->email();//( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : '';
-				$this->_template_args['attendees'][ $att_nmbr ]['final_price'] = $registration->final_price();//( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : '';
+				$this->_template_args['attendees'][$att_nmbr]['fname'] = $attendee->fname(); //( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : '';
+				$this->_template_args['attendees'][$att_nmbr]['lname'] = $attendee->lname(); //( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : '';
+				$this->_template_args['attendees'][$att_nmbr]['email'] = $attendee->email(); //( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : '';
+				$this->_template_args['attendees'][$att_nmbr]['final_price'] = $registration->final_price(); //( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : '';
 
-				$this->_template_args['attendees'][ $att_nmbr ]['address'] = implode( ', ', $attendee->full_address_as_array() );
+				$this->_template_args['attendees'][$att_nmbr]['address'] = implode(', ', $attendee->full_address_as_array());
 
-				$this->_template_args['attendees'][ $att_nmbr ]['att_link'] = self::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$attendee->ID() ), REG_ADMIN_URL );
+				$this->_template_args['attendees'][$att_nmbr]['att_link'] = self::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL);
 
 				$att_nmbr++;
 			}
@@ -1735,8 +1735,8 @@ 
 
 	//			$this->_template_args['registration_form_url'] = add_query_arg( array( 'action' => 'edit_registration', 'process' => 'attendees'  ), REG_ADMIN_URL );
 		}
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_attendees.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_attendees.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 	}
 
@@ -1757,11 +1757,11 @@ 
 		$attendee = $att_check instanceof EE_Attendee ? $att_check : EEM_Attendee::instance()->create_default_object();
 
 		//now let's determine if this is not the primary registration.  If it isn't then we set the primary_registration object for reference BUT ONLY if the Attendee object loaded is not the same as the primary registration object (that way we know if we need to show cereate button or not)
-		if ( ! $this->_registration->is_primary_registrant() ) {
+		if ( ! $this->_registration->is_primary_registrant()) {
 			$primary_registration = $this->_registration->get_primary_registration();
 			$primary_attendee = $primary_registration->attendee();
 
-			if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID() ) {
+			if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID()) {
 				//in here?  This means the displayed registration is not the primary registrant but ALREADY HAS its own custom attendee object so let's not worry about the primary reg.
 				$primary_registration = NULL;
 			}
@@ -1770,28 +1770,28 @@ 
 		}
 
 		$this->_template_args['ATT_ID'] = $attendee->ID();
-		$this->_template_args['fname'] = $attendee->fname();//$this->_registration->ATT_fname;
-		$this->_template_args['lname'] = $attendee->lname();//$this->_registration->ATT_lname;
-		$this->_template_args['email'] = $attendee->email();//$this->_registration->ATT_email;
+		$this->_template_args['fname'] = $attendee->fname(); //$this->_registration->ATT_fname;
+		$this->_template_args['lname'] = $attendee->lname(); //$this->_registration->ATT_lname;
+		$this->_template_args['email'] = $attendee->email(); //$this->_registration->ATT_email;
 		$this->_template_args['phone'] = $attendee->phone();
 
-		EE_Registry::instance()->load_helper( 'Formatter' );
-		$this->_template_args[ 'formatted_address' ] = EEH_Address::format( $attendee );
+		EE_Registry::instance()->load_helper('Formatter');
+		$this->_template_args['formatted_address'] = EEH_Address::format($attendee);
 
 
 		//edit link
-		$this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$attendee->ID() ), REG_ADMIN_URL );
-		$this->_template_args['att_edit_label'] = __('View/Edit Contact' );
+		$this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL);
+		$this->_template_args['att_edit_label'] = __('View/Edit Contact');
 
 		//create link
-		$this->_template_args['create_link'] = $primary_registration instanceof EE_Registration ? EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'duplicate_attendee',  '_REG_ID' => $this->_registration->ID() ), REG_ADMIN_URL ): '';
+		$this->_template_args['create_link'] = $primary_registration instanceof EE_Registration ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'duplicate_attendee', '_REG_ID' => $this->_registration->ID()), REG_ADMIN_URL) : '';
 		$this->_template_args['create_label'] = __('Create Contact', 'event_espresso');
 
 		$this->_template_args['att_check'] = $att_check;
 
 
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_details_side_meta_box_registrant.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_details_side_meta_box_registrant.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 	}
 
 
@@ -1804,7 +1804,7 @@ 
 	 * @access protected
 	 * @return void
 	 */
-	protected function _trash_or_restore_registrations( $trash = TRUE ) {
+	protected function _trash_or_restore_registrations($trash = TRUE) {
 		$REGM = EEM_Registration::instance();
 
 		$success = 1;
@@ -1814,26 +1814,26 @@ 
 		$dtts = array();
 
 		//if empty _REG_ID then get out because there's nothing to do
-		if ( empty( $this->_req_data['_REG_ID'] ) ) {
+		if (empty($this->_req_data['_REG_ID'])) {
 			$msg = $trash ? __('In order to trash registrations you must select which ones you wish to trash by clicking the checkboxes.', 'event_espresso') : __('In order to restore registrations you must select which ones you wish to restore by clicking the checkboxes.', 'event_espresso');
-			EE_Error::add_error( $msg, __FILE__, __LINE__, __FUNCTION__ );
-			$this->_redirect_after_action(FALSE, '', '', array(), TRUE );
+			EE_Error::add_error($msg, __FILE__, __LINE__, __FUNCTION__);
+			$this->_redirect_after_action(FALSE, '', '', array(), TRUE);
 		}
 
 		//Checkboxes
-		if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
+		if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['_REG_ID'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) {
+			while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
 
 				$REG = $REGM->get_one_by_ID($REG_ID);
 				$payment_count = $REG->get_first_related('Transaction')->count_related('Payment');
-				if ( $payment_count > 0 ) {
-					$name = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name() : __( 'Unknown Attendee', 'event_espresso' );
+				if ($payment_count > 0) {
+					$name = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name() : __('Unknown Attendee', 'event_espresso');
 					$error = 1;
 					$success = 0;
-					EE_Error::add_error( sprintf( __('The registration for %s could not be trashed because it has payments attached to the related transaction.  If you wish to trash this registration you must first delete the payments on the related transaction.', 'event_espresso'), $name ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(sprintf(__('The registration for %s could not be trashed because it has payments attached to the related transaction.  If you wish to trash this registration you must first delete the payments on the related transaction.', 'event_espresso'), $name), __FILE__, __FUNCTION__, __LINE__);
 					continue; //can't trash this registration because it has payments.
 				}
 				$ticket = $REG->get_first_related('Ticket');
@@ -1842,7 +1842,7 @@ 
 				$dtts = array_merge($dtts, $dtt);
 
 				$updated = $trash ? $REG->delete() : $REG->restore();
-				if ( !$updated ) {
+				if ( ! $updated) {
 					$success = 0;
 				} else {
 					$success = 2;
@@ -1857,7 +1857,7 @@ 
 			$tickets[$ticket->ID()] = $ticket;
 			$dtts = $ticket->get_many_related('Datetime');
 			$updated = $trash ? $REG->delete() : $REG->restore();
-			if ( ! $updated ) {
+			if ( ! $updated) {
 				$success = 0;
 			}
 
@@ -1867,10 +1867,10 @@ 
 		EEM_Ticket::instance()->update_tickets_sold($tickets);
 		EEM_Datetime::instance()->update_sold($dtts);
 
-		$what = $success > 1 ? __( 'Registrations', 'event_espresso' ) : __( 'Registration', 'event_espresso' );
-		$action_desc = $trash ? __( 'moved to the trash', 'event_espresso' ) : __( 'restored', 'event_espresso' );
+		$what = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso');
+		$action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
 		$overwrite_msgs = $error ? TRUE : FALSE;
-		$this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'default' ), $overwrite_msgs );
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), $overwrite_msgs);
 	}
 
 
@@ -1894,16 +1894,16 @@ 
 		$success = 1;
 
 		//Checkboxes
-		if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
+		if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['_REG_ID'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) {
+			while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) {
 				$REG = $REG_MDL->get_one_by_ID($REG_ID);
-				if ( ! $REG instanceof EE_Registration )
+				if ( ! $REG instanceof EE_Registration)
 					continue;
 				$deleted = $this->_delete_registration($REG);
-				if ( !$deleted ) {
+				if ( ! $deleted) {
 					$success = 0;
 				}
 			}
@@ -1913,15 +1913,15 @@ 
 			$REG_ID = $this->_req_data['_REG_ID'];
 			$REG = $REG_MDL->get_one_by_ID($REG_ID);
 			$deleted = $this->_delete_registration($REG);
-			if ( ! $deleted ) {
+			if ( ! $deleted) {
 				$success = 0;
 			}
 
 		}
 
-		$what = $success > 1 ? __( 'Registrations', 'event_espresso' ) : __( 'Registration', 'event_espresso' );
-		$action_desc = __( 'permanently deleted.', 'event_espresso' );
-		$this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'default' ), TRUE );
+		$what = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso');
+		$action_desc = __('permanently deleted.', 'event_espresso');
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), TRUE);
 	}
 
 
@@ -1933,31 +1933,31 @@ 
 	 * @param  EE_Registration $REG registration to be deleted permenantly
 	 * @return boolean              true = successful deletion, false = fail.
 	 */
-	protected function _delete_registration( EE_Registration $REG ) {
+	protected function _delete_registration(EE_Registration $REG) {
 		//first we start with the transaction... ultimately, we WILL not delete permanently if there are any related registrations on the transaction that are NOT trashed.
 		$TXN = $REG->get_first_related('Transaction');
 		$REGS = $TXN->get_many_related('Registration');
 
 		$all_trashed = TRUE;
-		foreach ( $REGS as $registration ) {
-			if ( ! $registration->get('REG_deleted') )
+		foreach ($REGS as $registration) {
+			if ( ! $registration->get('REG_deleted'))
 				$all_trashed = FALSE;
 		}
 
-		if ( ! $all_trashed ) {
-			EE_Error::add_error( __('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well.  These registrations will be permanently deleted in the same action.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $all_trashed) {
+			EE_Error::add_error(__('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well.  These registrations will be permanently deleted in the same action.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 		//k made it here so that means we can delete all the related transactions and their answers (but let's do them separately from THIS one).
-		foreach ( $REGS as $registration ) {
+		foreach ($REGS as $registration) {
 
 			//delete related answers
 			$registration->delete_related_permanently('Answer');
 
 			//remove relationship to EE_Attendee (but we ALWAYS leave the contact record intact)
 			$attendee = $registration->get_first_related('Attendee');
-			if ( $attendee instanceof EE_Attendee ) {
+			if ($attendee instanceof EE_Attendee) {
 				$registration->_remove_relation_to($attendee, 'Attendee');
 			}
 
@@ -1967,7 +1967,7 @@ 
 			//now delete permanently the checkins related to this registration.
 			$registration->delete_related_permanently('Checkin');
 
-			if ( $registration->ID() === $REG->ID() )
+			if ($registration->ID() === $REG->ID())
 				continue; //we don't want to delete permanently the existing registration just yet.
 
 			//remove relation to transaction for these registrations if NOT the existing registrations
@@ -2000,34 +2000,34 @@ 
 	 * @return void
 	 */
 	public function new_registration() {
-		if ( ! $this->_set_reg_event() ) {
-			throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request', 'event_espresso') );
+		if ( ! $this->_set_reg_event()) {
+			throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request', 'event_espresso'));
 		}
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 
 		// gotta start with a clean slate if we're not coming here via ajax
-		if ( ! defined('DOING_AJAX' ) && ( ! isset( $this->_req_data['processing_registration'] ) || isset( $this->_req_data['step_error'] ))) {
-			EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+		if ( ! defined('DOING_AJAX') && ( ! isset($this->_req_data['processing_registration']) || isset($this->_req_data['step_error']))) {
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		}
 
-		$this->_template_args['event_name'] = '' ;
+		$this->_template_args['event_name'] = '';
 		// event name
-		if ( $this->_reg_event ) {
+		if ($this->_reg_event) {
 			$this->_template_args['event_name'] = $this->_reg_event->name();
-			$edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$this->_reg_event->ID() ), EVENTS_ADMIN_URL );
-			$edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $this->_reg_event->name() . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>';
-			$this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ;
+			$edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$this->_reg_event->ID()), EVENTS_ADMIN_URL);
+			$edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$this->_reg_event->name().'">'.__('Edit Event', 'event_espresso').'</a>';
+			$this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>';
 		}
 
 		$this->_template_args['step_content'] = $this->_get_registration_step_content();
 
-		if ( defined('DOING_AJAX' ) )
+		if (defined('DOING_AJAX'))
 			$this->_return_json();
 
 
 		// grab header
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_register_new_attendee.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		//$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
 		// the details template wrapper
@@ -2045,7 +2045,7 @@ 
 	 */
 	protected function _get_registration_step_content() {
 
-		$template_path = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee_step_content.template.php';
+		$template_path = REG_TEMPLATE_PATH.'reg_admin_register_new_attendee_step_content.template.php';
 		$template_args = array(
 			'title' => '',
 			'content' => '',
@@ -2066,11 +2066,11 @@ 
 
 		//if the cart is empty then we know we're at step one so we'll display ticket selector
 		$cart = EE_Registry::instance()->SSN->get_session_data('cart');
-		$step = empty( $cart ) ? 'ticket' : 'questions';
-		switch ( $step ) {
+		$step = empty($cart) ? 'ticket' : 'questions';
+		switch ($step) {
 			case 'ticket' :
 				$template_args['title'] = __('Step One: Select the Ticket for this registration', 'event_espresso');
-				$template_args['content'] = EED_Ticket_Selector::instance()->display_ticket_selector( $this->_reg_event );
+				$template_args['content'] = EED_Ticket_Selector::instance()->display_ticket_selector($this->_reg_event);
 				$template_args['step_button_text'] = __('Add Tickets and Continue to Registrant Details', 'event_espresso');
 				$template_args['show_notification_toggle'] = FALSE;
 				break;
@@ -2083,9 +2083,9 @@ 
 				break;
 		}
 
-		$this->_set_add_edit_form_tags( 'process_reg_step', $hidden_fields ); //we come back to the process_registration_step route.
+		$this->_set_add_edit_form_tags('process_reg_step', $hidden_fields); //we come back to the process_registration_step route.
 
-		return EEH_Template::display_template( $template_path, $template_args, TRUE );
+		return EEH_Template::display_template($template_path, $template_args, TRUE);
 	}
 
 
@@ -2099,11 +2099,11 @@ 
 	*		@return boolean
 	*/
 	private function _set_reg_event() {
-		if ( is_object( $this->_reg_event )) {
+		if (is_object($this->_reg_event)) {
 			return TRUE;
 		}
-		$EVT_ID = ( ! empty( $this->_req_data['event_id'] )) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		if ( ! $EVT_ID ) {
+		$EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE;
+		if ( ! $EVT_ID) {
 			return FALSE;
 		}
 
@@ -2124,62 +2124,62 @@ 
 	public function process_reg_step() {
 
 		$this->_set_reg_event();
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 
 		//what step are we on?
-		$cart = EE_Registry::instance()->SSN->get_session_data( 'cart' );
-		$step = empty( $cart ) ? 'ticket' : 'questions';
+		$cart = EE_Registry::instance()->SSN->get_session_data('cart');
+		$step = empty($cart) ? 'ticket' : 'questions';
 
 		//if doing ajax then we need to verify the nonce
-		if ( 'DOING_AJAX' ) {
-			$nonce = isset( $this->_req_data[$this->_req_nonce] ) ? sanitize_text_field( $this->_req_data[$this->_req_nonce] ) : '';
-			$this->_verify_nonce( $nonce, $this->_req_nonce );
+		if ('DOING_AJAX') {
+			$nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : '';
+			$this->_verify_nonce($nonce, $this->_req_nonce);
 		}
 
-		switch ( $step ) {
+		switch ($step) {
 			case 'ticket' :
 				//process ticket selection
 				$success = EED_Ticket_Selector::instance()->process_ticket_selections();
-				if ( $success ) {
-					EE_Error::add_success( __('Tickets Selected. Now complete the registration.'), 'event_espresso');
+				if ($success) {
+					EE_Error::add_success(__('Tickets Selected. Now complete the registration.'), 'event_espresso');
 				} else {
 					$query_args['step_error'] = $this->_req_data['step_error'] = TRUE;
 				}
-				if ( defined('DOING_AJAX') ) {
+				if (defined('DOING_AJAX')) {
 					$this->new_registration(); //display next step
 				} else {
 					$query_args['action'] = 'new_registration';
 					$query_args['processing_registration'] = true;
 					$query_args['event_id'] = $this->_reg_event->ID();
-					$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+					$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 				}
 				break;
 			case 'questions' :
-				if( ! isset( $this->_req_data[ 'txn_reg_status_change' ], $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ] ) ) {
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15 );
+				if ( ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['send_notifications'])) {
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15);
 				}
 				//process registration
 				$transaction = EED_Single_Page_Checkout::instance()->process_registration_from_admin();
-				if ( ! $transaction instanceof EE_Transaction ) {
+				if ( ! $transaction instanceof EE_Transaction) {
 					$query_args = array(
 						'action' => 'new_registration',
 						'processing_registration' => true,
 						'event_id' => $this->_reg_event->ID()
 					);
 
-					if ( defined('DOING_AJAX' )) {
+					if (defined('DOING_AJAX')) {
 						//display registration form again because there are errors (maybe validation?)
 						$this->new_registration();
 						return;
 					} else {
-						$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+						$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 						return;
 					}
 				}
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// maybe update status, and make sure to save transaction if not done already
-				if ( ! $transaction_payments->update_transaction_status_based_on_total_paid( $transaction )) {
+				if ( ! $transaction_payments->update_transaction_status_based_on_total_paid($transaction)) {
 					$transaction->save();
 				}
 				$query_args = array(
@@ -2187,8 +2187,8 @@ 
 					'TXN_ID' => $transaction->ID(),
 					'page' => 'espresso_transactions'
 				);
-				EE_Error::add_success( __('Registration Created.  Please review the transaction and add any payments as necessary', 'event_espresso') );
-				$this->_redirect_after_action( FALSE, '', '', $query_args, TRUE );
+				EE_Error::add_success(__('Registration Created.  Please review the transaction and add any payments as necessary', 'event_espresso'));
+				$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 				break;
 			}
 
@@ -2208,7 +2208,7 @@ 
 	*		@return void
 	*/
 	protected function _attendee_contact_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_search_btn_label = __('Contacts', 'event_espresso');
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
@@ -2223,10 +2223,10 @@ 
 	*		@access public
 	*		@return array
 	*/
-	public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) {
+	public function get_attendees($per_page, $count = FALSE, $trash = FALSE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		require_once( REG_ADMIN . 'EE_Attendee_Contact_List_Table.class.php' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		require_once(REG_ADMIN.'EE_Attendee_Contact_List_Table.class.php');
 		$ATT_MDL = EEM_Attendee::instance();
 
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
@@ -2254,47 +2254,47 @@ 
 				$orderby = 'ATT_lname';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
 
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $per_page ) && !empty( $per_page ) ? $per_page : 10;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($per_page) && ! empty($per_page) ? $per_page : 10;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
 		$_where = array();
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'Registration.Event.EVT_name' => array( 'LIKE', $sstr),
-				'Registration.Event.EVT_desc' => array( 'LIKE', $sstr ),
-				'Registration.Event.EVT_short_desc' => array( 'LIKE' , $sstr ),
-				'ATT_fname' => array( 'LIKE', $sstr ),
-				'ATT_lname' => array( 'LIKE', $sstr ),
-				'ATT_short_bio' => array( 'LIKE', $sstr ),
-				'ATT_email' => array('LIKE', $sstr ),
-				'ATT_address' => array( 'LIKE', $sstr ),
-				'ATT_address2' => array( 'LIKE', $sstr ),
-				'ATT_city' => array( 'LIKE', $sstr ),
-				'Country.CNT_name' => array( 'LIKE', $sstr ),
-				'State.STA_name' => array('LIKE', $sstr ),
-				'ATT_phone' => array( 'LIKE', $sstr ),
-				'Registration.REG_final_price' => array( 'LIKE', $sstr ),
-				'Registration.REG_code' => array( 'LIKE', $sstr ),
-				'Registration.REG_count' => array( 'LIKE' , $sstr ),
-				'Registration.REG_group_size' => array( 'LIKE' , $sstr )
+				'Registration.Event.EVT_name' => array('LIKE', $sstr),
+				'Registration.Event.EVT_desc' => array('LIKE', $sstr),
+				'Registration.Event.EVT_short_desc' => array('LIKE', $sstr),
+				'ATT_fname' => array('LIKE', $sstr),
+				'ATT_lname' => array('LIKE', $sstr),
+				'ATT_short_bio' => array('LIKE', $sstr),
+				'ATT_email' => array('LIKE', $sstr),
+				'ATT_address' => array('LIKE', $sstr),
+				'ATT_address2' => array('LIKE', $sstr),
+				'ATT_city' => array('LIKE', $sstr),
+				'Country.CNT_name' => array('LIKE', $sstr),
+				'State.STA_name' => array('LIKE', $sstr),
+				'ATT_phone' => array('LIKE', $sstr),
+				'Registration.REG_final_price' => array('LIKE', $sstr),
+				'Registration.REG_code' => array('LIKE', $sstr),
+				'Registration.REG_count' => array('LIKE', $sstr),
+				'Registration.REG_group_size' => array('LIKE', $sstr)
 				);
 		}
 
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $count ? NULL : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? NULL : array($offset, $per_page);
 
-		if ( $trash ) {
-			$_where['status'] = array( '!=', 'publish' );
-			$all_attendees = $count ? $ATT_MDL->count( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit)): $ATT_MDL->get_all( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
+		if ($trash) {
+			$_where['status'] = array('!=', 'publish');
+			$all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
 		} else {
-			$_where['status'] = array( 'IN', array( 'publish' ) );
-			$all_attendees = $count ? $ATT_MDL->count( array($_where, 'order_by'=>array($orderby=>$sort),'limit'=>$limit)) : $ATT_MDL->get_all( array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit) );
+			$_where['status'] = array('IN', array('publish'));
+			$all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit));
 		}
 
 		return $all_attendees;
@@ -2311,10 +2311,10 @@ 
 	 */
 	protected function _resend_registration() {
 		$this->_process_resend_registration();
-		$query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID'] ) : array(
+		$query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID']) : array(
 			'action' => 'default'
 		);
-		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE );
+		$this->_redirect_after_action(FALSE, '', '', $query_args, TRUE);
 	}
 
 
@@ -2322,27 +2322,27 @@ 
 
 
 
-	public function _registrations_report(){
-		if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) {
-			wp_redirect( EE_Admin_Page::add_query_args_and_nonce(
+	public function _registrations_report() {
+		if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
+			wp_redirect(EE_Admin_Page::add_query_args_and_nonce(
 				array(
 					'page' => 'espresso_batch',
 					'batch' => 'file',
-					'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL,
-					'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport' ),
-					'return_url' => urlencode( $this->_req_data[ 'return_url' ] ),
-				)) );
+					'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL,
+					'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\RegistrationsReport'),
+					'return_url' => urlencode($this->_req_data['return_url']),
+				)));
 		} else {
-			EE_Registry::instance()->load_helper( 'File' );
+			EE_Registry::instance()->load_helper('File');
 			$new_request_args = array(
 				'export' => 'report',
 				'action' => 'registrations_report_for_event',
-				'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL,
+				'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL,
 			);
 			$this->_req_data = array_merge($this->_req_data, $new_request_args);
 
-			if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-				require_once(EE_CLASSES . 'EE_Export.class.php');
+			if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+				require_once(EE_CLASSES.'EE_Export.class.php');
 				$EE_Export = EE_Export::instance($this->_req_data);
 				$EE_Export->export();
 			}
@@ -2351,28 +2351,28 @@ 
 
 
 
-	public function _contact_list_export(){
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-			require_once(EE_CLASSES . 'EE_Export.class.php');
+	public function _contact_list_export() {
+		EE_Registry::instance()->load_helper('File');
+		if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+			require_once(EE_CLASSES.'EE_Export.class.php');
 			$EE_Export = EE_Export::instance($this->_req_data);
 			$EE_Export->export_attendees();
 		}
 	}
 
-	public function _contact_list_report(){
-		if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) {
-			wp_redirect( EE_Admin_Page::add_query_args_and_nonce(
+	public function _contact_list_report() {
+		if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) {
+			wp_redirect(EE_Admin_Page::add_query_args_and_nonce(
 				array(
 					'page' => 'espresso_batch',
 					'batch' => 'file',
-					'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\AttendeesReport' ),
-					'return_url' => urlencode( $this->_req_data[ 'return_url' ] ),
-				)) );
+					'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\AttendeesReport'),
+					'return_url' => urlencode($this->_req_data['return_url']),
+				)));
 		} else {
-			EE_Registry::instance()->load_helper( 'File' );
-			if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) {
-				require_once(EE_CLASSES . 'EE_Export.class.php');
+			EE_Registry::instance()->load_helper('File');
+			if (is_readable(EE_CLASSES.'EE_Export.class.php')) {
+				require_once(EE_CLASSES.'EE_Export.class.php');
 				$EE_Export = EE_Export::instance($this->_req_data);
 				$EE_Export->report_attendees();
 			}
@@ -2392,73 +2392,73 @@ 
 	 * @return void
 	 */
 	protected function _duplicate_attendee() {
-		$action = !empty( $this->_req_data['return'] ) ? $this->_req_data['return'] : 'default';
+		$action = ! empty($this->_req_data['return']) ? $this->_req_data['return'] : 'default';
 		//verify we have necessary info
-		if ( empty($this->_req_data['_REG_ID'] )  ) {
-			EE_Error::add_error( __('Unable to create the contact for the registration because the required paramaters are not present (_REG_ID )', 'event_espresso'),  __FILE__, __LINE__, __FUNCTION__ );
-			$query_args = array( 'action' => $action );
+		if (empty($this->_req_data['_REG_ID'])) {
+			EE_Error::add_error(__('Unable to create the contact for the registration because the required paramaters are not present (_REG_ID )', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__);
+			$query_args = array('action' => $action);
 			$this->_redirect_after_action('', '', '', $query_args, TRUE);
 		}
 
 		//okay necessary deets present... let's dupe the incoming attendee and attach to incoming registration.
-		$registration = EEM_Registration::instance()->get_one_by_ID( $this->_req_data['_REG_ID'] );
+		$registration = EEM_Registration::instance()->get_one_by_ID($this->_req_data['_REG_ID']);
 		$attendee = $registration->attendee();
 
 		//remove relation of existing attendee on registration
-		$registration->_remove_relation_to($attendee, 'Attendee' );
+		$registration->_remove_relation_to($attendee, 'Attendee');
 		//new attendee
 		$new_attendee = clone $attendee;
-		$new_attendee->set( 'ATT_ID', 0 );
+		$new_attendee->set('ATT_ID', 0);
 		$new_attendee->save();
 
 		//add new attendee to reg
-		$registration->_add_relation_to( $new_attendee, 'Attendee');
+		$registration->_add_relation_to($new_attendee, 'Attendee');
 
-		EE_Error::add_success( __('New Contact record created.  Now make any edits you wish to make for this contact.', 'event_espresso') );
+		EE_Error::add_success(__('New Contact record created.  Now make any edits you wish to make for this contact.', 'event_espresso'));
 
 		//redirect to edit page for attendee
-		$query_args = array( 'post' => $new_attendee->ID(), 'action' => 'edit_attendee' );
+		$query_args = array('post' => $new_attendee->ID(), 'action' => 'edit_attendee');
 
-		$this->_redirect_after_action( '', '', '', $query_args, TRUE );
+		$this->_redirect_after_action('', '', '', $query_args, TRUE);
 	}
 
 
 	//related to cpt routes
 	protected function _insert_update_cpt_item($post_id, $post) {
 		$success = true;
-		$attendee = EEM_Attendee::instance()->get_one_by_ID( $post_id );
+		$attendee = EEM_Attendee::instance()->get_one_by_ID($post_id);
 		//for attendee updates
-		if ( $post->post_type = 'espresso_attendees' && !empty( $attendee ) ) {
+		if ($post->post_type = 'espresso_attendees' && ! empty($attendee)) {
 			//note we should only be UPDATING attendees at this point.
 			$updated_fields = array(
 				'ATT_fname' => $this->_req_data['ATT_fname'],
 				'ATT_lname' => $this->_req_data['ATT_lname'],
-				'ATT_full_name'=> $this->_req_data['ATT_fname'] . ' ' . $this->_req_data['ATT_lname'],
+				'ATT_full_name'=> $this->_req_data['ATT_fname'].' '.$this->_req_data['ATT_lname'],
 				'ATT_address' => isset($this->_req_data['ATT_address']) ? $this->_req_data['ATT_address'] : '',
 				'ATT_address2' => isset($this->_req_data['ATT_address2']) ? $this->_req_data['ATT_address2'] : '',
-				'ATT_city' => isset( $this->_req_data['ATT_city'] ) ? $this->_req_data['ATT_city'] : '',
-				'STA_ID' => isset( $this->_req_data['STA_ID'] ) ? $this->_req_data['STA_ID'] : '',
-				'CNT_ISO' => isset( $this->_req_data['CNT_ISO'] ) ? $this->_req_data['CNT_ISO'] : '',
-				'ATT_zip' => isset( $this->_req_data['ATT_zip'] ) ? $this->_req_data['ATT_zip'] : '',
-				'ATT_email' => isset( $this->_req_data['ATT_email'] ) ? $this->_req_data['ATT_email'] : '',
-				'ATT_phone' => isset( $this->_req_data['ATT_phone'] ) ? $this->_req_data['ATT_phone'] : ''
+				'ATT_city' => isset($this->_req_data['ATT_city']) ? $this->_req_data['ATT_city'] : '',
+				'STA_ID' => isset($this->_req_data['STA_ID']) ? $this->_req_data['STA_ID'] : '',
+				'CNT_ISO' => isset($this->_req_data['CNT_ISO']) ? $this->_req_data['CNT_ISO'] : '',
+				'ATT_zip' => isset($this->_req_data['ATT_zip']) ? $this->_req_data['ATT_zip'] : '',
+				'ATT_email' => isset($this->_req_data['ATT_email']) ? $this->_req_data['ATT_email'] : '',
+				'ATT_phone' => isset($this->_req_data['ATT_phone']) ? $this->_req_data['ATT_phone'] : ''
 				);
-			foreach ( $updated_fields as $field => $value ) {
+			foreach ($updated_fields as $field => $value) {
 				$attendee->set($field, $value);
 			}
 
 			$success = $attendee->save();
 
-			$attendee_update_callbacks = apply_filters( 'FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update', array() );
-			foreach ( $attendee_update_callbacks as $a_callback ) {
-				if ( FALSE === call_user_func_array( $a_callback, array($attendee, $this->_req_data ) ) ) {
-					throw new EE_Error( sprintf( __('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback.  Please check the spelling.', 'event_espresso'), $a_callback ) );
+			$attendee_update_callbacks = apply_filters('FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update', array());
+			foreach ($attendee_update_callbacks as $a_callback) {
+				if (FALSE === call_user_func_array($a_callback, array($attendee, $this->_req_data))) {
+					throw new EE_Error(sprintf(__('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback.  Please check the spelling.', 'event_espresso'), $a_callback));
 				}
 			}
 		}
 
-		if ( $success === FALSE )
-			EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ($success === FALSE)
+			EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 
 	}
 
@@ -2478,17 +2478,17 @@ 
 		remove_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
 		remove_meta_box('commentstatusdiv', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
 
-		if ( post_type_supports( 'espresso_attendees', 'excerpt') ) {
-			add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal' );
+		if (post_type_supports('espresso_attendees', 'excerpt')) {
+			add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal');
 		}
 
-		if ( post_type_supports( 'espresso_attendees', 'comments') ) {
+		if (post_type_supports('espresso_attendees', 'comments')) {
 			add_meta_box('commentsdiv', __('Notes on the Contact', 'event_espresso'), 'post_comment_meta_box', $this->_cpt_routes[$this->_req_action], 'normal', 'core');
 		}
 
-		add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'), array( $this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core' );
-		add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'), array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core' );
-		add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'), array( $this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high');
+		add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'), array($this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core');
+		add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'), array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core');
+		add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'), array($this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high');
 	}
 
 
@@ -2497,10 +2497,10 @@ 
 	 * @param  WP_Post $post wp post object
 	 * @return string        attendee contact info ( and form )
 	 */
-	public function attendee_contact_info( $post ) {
+	public function attendee_contact_info($post) {
 		//get attendee object ( should already have it )
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
-		$template = REG_TEMPLATE_PATH . 'attendee_contact_info_metabox_content.template.php';
+		$template = REG_TEMPLATE_PATH.'attendee_contact_info_metabox_content.template.php';
 		EEH_Template::display_template($template, $this->_template_args);
 	}
 
@@ -2516,12 +2516,12 @@ 
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
 		$this->_template_args['state_html'] = EEH_Form_Fields::generate_form_input(
 				new EE_Question_Form_Input(
-				EE_Question::new_instance( array(
+				EE_Question::new_instance(array(
 					'QST_ID' => 0,
 					'QST_display_text' => __('State/Province', 'event_espresso'),
 					'QST_system' => 'admin-state'
 					)),
-				EE_Answer::new_instance( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $this->_cpt_model_obj->state_ID()
 					)),
@@ -2534,12 +2534,12 @@ 
 			));
 		$this->_template_args['country_html'] = EEH_Form_Fields::generate_form_input(
 				new EE_Question_Form_Input(
-				EE_Question::new_instance( array(
+				EE_Question::new_instance(array(
 					'QST_ID' => 0,
 					'QST_display_text' => __('Country', 'event_espresso'),
 					'QST_system' => 'admin-country'
 					)),
-				EE_Answer::new_instance( array(
+				EE_Answer::new_instance(array(
 					'ANS_ID' => 0,
 					'ANS_value' => $this->_cpt_model_obj->country_ID()
 					)),
@@ -2550,8 +2550,8 @@ 
 					'append_qstn_id' => FALSE
 					)
 				));
-		$template = REG_TEMPLATE_PATH . 'attendee_address_details_metabox_content.template.php';
-		EEH_Template::display_template($template, $this->_template_args );
+		$template = REG_TEMPLATE_PATH.'attendee_address_details_metabox_content.template.php';
+		EEH_Template::display_template($template, $this->_template_args);
 
 	}
 
@@ -2561,11 +2561,11 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	public function attendee_registrations_meta_box( $post ) {
+	public function attendee_registrations_meta_box($post) {
 
 		$this->_template_args['attendee'] = $this->_cpt_model_obj;
 		$this->_template_args['registrations'] = $this->_cpt_model_obj->get_many_related('Registration');
-		$template = REG_TEMPLATE_PATH . 'attendee_registrations_main_meta_box.template.php';
+		$template = REG_TEMPLATE_PATH.'attendee_registrations_main_meta_box.template.php';
 		EEH_Template::display_template($template, $this->_template_args);
 
 	}
@@ -2579,8 +2579,8 @@ 
 	 * @return string        html for new form.
 	 */
 	public function after_title_form_fields($post) {
-		if ( $post->post_type == 'espresso_attendees' ) {
-			$template = REG_TEMPLATE_PATH . 'attendee_details_after_title_form_fields.template.php';
+		if ($post->post_type == 'espresso_attendees') {
+			$template = REG_TEMPLATE_PATH.'attendee_details_after_title_form_fields.template.php';
 			$template_args['attendee'] = $this->_cpt_model_obj;
 			EEH_Template::display_template($template, $template_args);
 		}
@@ -2597,21 +2597,21 @@ 
 	*		@access protected
 	*		@return void
 	*/
-	protected function _trash_or_restore_attendees( $trash = TRUE ) {
+	protected function _trash_or_restore_attendees($trash = TRUE) {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$ATT_MDL = EEM_Attendee::instance();
 
 		$success = 1;
 		//Checkboxes
-		if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			// if array has more than one element than success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 			// cycle thru checkboxes
-			while (list( $ATT_ID, $value ) = each($this->_req_data['checkbox'])) {
-				$updated = $trash ? $ATT_MDL->update_by_ID(array( 'status' => 'trash' ), $ATT_ID) : $ATT_MDL->update_by_ID( array('status' => 'publish' ), $ATT_ID);
-				if ( !$updated ) {
+			while (list($ATT_ID, $value) = each($this->_req_data['checkbox'])) {
+				$updated = $trash ? $ATT_MDL->update_by_ID(array('status' => 'trash'), $ATT_ID) : $ATT_MDL->update_by_ID(array('status' => 'publish'), $ATT_ID);
+				if ( ! $updated) {
 					$success = 0;
 				}
 			}
@@ -2620,18 +2620,18 @@ 
 			// grab single id and delete
 			$ATT_ID = absint($this->_req_data['ATT_ID']);
 			//get attendee
-			$att = $ATT_MDL->get_one_by_ID( $ATT_ID );
+			$att = $ATT_MDL->get_one_by_ID($ATT_ID);
 			$updated = $trash ? $att->set_status('trash') : $att->set_status('publish');
 			$updated = $att->save();
-			if ( ! $updated ) {
+			if ( ! $updated) {
 				$success = 0;
 			}
 
 		}
 
-		$what = $success > 1 ? __( 'Contacts', 'event_espresso' ) : __( 'Contact', 'event_espresso' );
-		$action_desc = $trash ? __( 'moved to the trash', 'event_espresso' ) : __( 'restored', 'event_espresso' );
-		$this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'contact_list' ) );
+		$what = $success > 1 ? __('Contacts', 'event_espresso') : __('Contact', 'event_espresso');
+		$action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
+		$this->_redirect_after_action($success, $what, $action_desc, array('action' => 'contact_list'));
 
 	}
 

core/EE_Error.core.php

Doc Comments +5 added lines, -5 removed lines

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

Indentation +175 added lines, -175 removed lines

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

Spacing +236 added lines, -236 removed lines

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

core/helpers/EEH_Debug_Tools.helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -392,7 +392,7 @@
 	 *    @ access public
 	 *    @ return void
 	 *
-	 * @param mixed $var
+	 * @param string $var
 	 * @param bool $var_name
 	 * @param string $file
 	 * @param int $line

Spacing +137 added lines, -137 removed lines

@@ -8,7 +8,7 @@ 
  * @since 				4.0
  *
  */
-class EEH_Debug_Tools{
+class EEH_Debug_Tools {
 
 	/**
 	 * 	instance of the EEH_Autoloader object
@@ -41,7 +41,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( ! self::$_instance instanceof EEH_Debug_Tools ) {
+		if ( ! self::$_instance instanceof EEH_Debug_Tools) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -57,21 +57,21 @@ 
 	 */
 	private function __construct() {
 		// load Kint PHP debugging library
-		if ( ! class_exists( 'Kint' ) &&  file_exists( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' )){
+		if ( ! class_exists('Kint') && file_exists(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php')) {
 			// despite EE4 having a check for an existing copy of the Kint debugging class,
 			// if another plugin was loaded AFTER EE4 and they did NOT perform a similar check,
 			// then hilarity would ensue as PHP throws a "Cannot redeclare class Kint" error
 			// so we've moved it to our test folder so that it is not included with production releases
 			// plz use https://wordpress.org/plugins/kint-debugger/  if testing production versions of EE
-			require_once( EE_PLUGIN_DIR_PATH . 'tests' . DS . 'kint' . DS . 'Kint.class.php' );
+			require_once(EE_PLUGIN_DIR_PATH.'tests'.DS.'kint'.DS.'Kint.class.php');
 		}
-		if ( ! defined('DOING_AJAX') || ! isset( $_REQUEST['noheader'] ) || $_REQUEST['noheader'] != 'true' || ! isset( $_REQUEST['TB_iframe'] )) {
+		if ( ! defined('DOING_AJAX') || ! isset($_REQUEST['noheader']) || $_REQUEST['noheader'] != 'true' || ! isset($_REQUEST['TB_iframe'])) {
 			//add_action( 'shutdown', array($this,'espresso_session_footer_dump') );
 		}
-		$plugin = basename( EE_PLUGIN_DIR_PATH );
-		add_action( "activate_{$plugin}", array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' ));
-		add_action( 'activated_plugin', array( 'EEH_Debug_Tools', 'ee_plugin_activation_errors' ));
-		add_action( 'shutdown', array( 'EEH_Debug_Tools', 'show_db_name' ));
+		$plugin = basename(EE_PLUGIN_DIR_PATH);
+		add_action("activate_{$plugin}", array('EEH_Debug_Tools', 'ee_plugin_activation_errors'));
+		add_action('activated_plugin', array('EEH_Debug_Tools', 'ee_plugin_activation_errors'));
+		add_action('shutdown', array('EEH_Debug_Tools', 'show_db_name'));
 	}
 
 
@@ -82,8 +82,8 @@ 
 	 * 	@return void
 	 */
 	public static function show_db_name() {
-		if ( ! defined( 'DOING_AJAX' ) && ( defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS )) {
-			echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '. DB_NAME .'</p>';
+		if ( ! defined('DOING_AJAX') && (defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS)) {
+			echo '<p style="font-size:10px;font-weight:normal;color:#E76700;margin: 1em 2em; text-align: right;">DB_NAME: '.DB_NAME.'</p>';
 		}
 	}
 
@@ -95,9 +95,9 @@ 
 	 * 	@return void
 	 */
 	public function espresso_session_footer_dump() {
-		if ( class_exists('Kint') && function_exists( 'wp_get_current_user' ) && current_user_can('update_core') && ( defined('WP_DEBUG') && WP_DEBUG ) &&  ! defined('DOING_AJAX') && class_exists( 'EE_Registry' )) {
-			Kint::dump(  EE_Registry::instance()->SSN->id() );
-			Kint::dump( EE_Registry::instance()->SSN );
+		if (class_exists('Kint') && function_exists('wp_get_current_user') && current_user_can('update_core') && (defined('WP_DEBUG') && WP_DEBUG) && ! defined('DOING_AJAX') && class_exists('EE_Registry')) {
+			Kint::dump(EE_Registry::instance()->SSN->id());
+			Kint::dump(EE_Registry::instance()->SSN);
 			//			Kint::dump( EE_Registry::instance()->SSN->get_session_data('cart')->get_tickets() );
 			$this->espresso_list_hooked_functions();
 			$this->show_times();
@@ -114,27 +114,27 @@ 
 	 * @param bool $tag
 	 * @return void
 	 */
-	public function espresso_list_hooked_functions( $tag=FALSE ){
+	public function espresso_list_hooked_functions($tag = FALSE) {
 		global $wp_filter;
 		echo '<br/><br/><br/><h3>Hooked Functions</h3>';
-		if ( $tag ) {
-			$hook[$tag]=$wp_filter[$tag];
-			if ( ! is_array( $hook[$tag] )) {
-				trigger_error( "Nothing found for '$tag' hook", E_USER_WARNING );
+		if ($tag) {
+			$hook[$tag] = $wp_filter[$tag];
+			if ( ! is_array($hook[$tag])) {
+				trigger_error("Nothing found for '$tag' hook", E_USER_WARNING);
 				return;
 			}
-			echo '<h5>For Tag: '. $tag .'</h5>';
+			echo '<h5>For Tag: '.$tag.'</h5>';
 		}
 		else {
-			$hook=$wp_filter;
-			ksort( $hook );
+			$hook = $wp_filter;
+			ksort($hook);
 		}
-		foreach( $hook as $tag => $priorities ) {
+		foreach ($hook as $tag => $priorities) {
 			echo "<br />&gt;&gt;&gt;&gt;&gt;\t<strong>$tag</strong><br />";
-			ksort( $priorities );
-			foreach( $priorities as $priority => $function ){
+			ksort($priorities);
+			foreach ($priorities as $priority => $function) {
 				echo $priority;
-				foreach( $function as $name => $properties ) {
+				foreach ($function as $name => $properties) {
 					echo "\t$name<br />";
 				}
 			}
@@ -150,15 +150,15 @@ 
 	 * @param string $hook_name
 	 * @return array
 	 */
-	public static function registered_filter_callbacks( $hook_name = '' ) {
+	public static function registered_filter_callbacks($hook_name = '') {
 		$filters = array();
 		global $wp_filter;
-		if ( isset( $wp_filter[ $hook_name ] ) ) {
-			$filters[ $hook_name ] = array();
-			foreach ( $wp_filter[ $hook_name ] as $priority => $callbacks ) {
-				$filters[ $hook_name ][ $priority ] = array();
-				foreach ( $callbacks as $callback ) {
-					$filters[ $hook_name ][ $priority ][] = $callback['function'];
+		if (isset($wp_filter[$hook_name])) {
+			$filters[$hook_name] = array();
+			foreach ($wp_filter[$hook_name] as $priority => $callbacks) {
+				$filters[$hook_name][$priority] = array();
+				foreach ($callbacks as $callback) {
+					$filters[$hook_name][$priority][] = $callback['function'];
 				}
 			}
 		}
@@ -171,8 +171,8 @@ 
 	 * 	start_timer
 	 * @param null $timer_name
 	 */
-	public function start_timer( $timer_name = NULL ){
-		$this->_start_times[$timer_name] = microtime( TRUE );
+	public function start_timer($timer_name = NULL) {
+		$this->_start_times[$timer_name] = microtime(TRUE);
 	}
 
 
@@ -181,15 +181,15 @@ 
 	 * stop_timer
 	 * @param string $timer_name
 	 */
-	public function stop_timer($timer_name = 'default'){
-		if( isset( $this->_start_times[ $timer_name ] ) ){
-			$start_time = $this->_start_times[ $timer_name ];
-			unset( $this->_start_times[ $timer_name ] );
-		}else{
-			$start_time = array_pop( $this->_start_times );
+	public function stop_timer($timer_name = 'default') {
+		if (isset($this->_start_times[$timer_name])) {
+			$start_time = $this->_start_times[$timer_name];
+			unset($this->_start_times[$timer_name]);
+		} else {
+			$start_time = array_pop($this->_start_times);
 		}
-		$total_time = microtime( TRUE ) - $start_time;
-		switch ( $total_time ) {
+		$total_time = microtime(TRUE) - $start_time;
+		switch ($total_time) {
 			case $total_time < 0.00001 :
 				$color = '#8A549A';
 				$bold = 'normal';
@@ -215,7 +215,7 @@ 
 				$bold = 'bold';
 				break;
 		}
-		$this->_times[] = '<hr /><div style="display: inline-block; min-width: 10px; margin:0 1em; color:'.$color.'; font-weight:'.$bold.'; font-size:1.2em;">' . number_format( $total_time, 8 ) . '</div> ' . $timer_name;
+		$this->_times[] = '<hr /><div style="display: inline-block; min-width: 10px; margin:0 1em; color:'.$color.'; font-weight:'.$bold.'; font-size:1.2em;">'.number_format($total_time, 8).'</div> '.$timer_name;
 	}
 	/**
 	 * Measure the memory usage by PHP so far.
@@ -223,10 +223,10 @@ 
 	 * @param boolean $output_now whether to echo now, or wait until EEH_Debug_Tools::show_times() is called
 	 * @return void
 	 */
-	public function measure_memory( $label, $output_now = false ) {
-		$memory_used = $this->convert( memory_get_peak_usage( true ) );
-		$this->_memory_usage_points[ $label ] = $memory_used;
-		if( $output_now ) {
+	public function measure_memory($label, $output_now = false) {
+		$memory_used = $this->convert(memory_get_peak_usage(true));
+		$this->_memory_usage_points[$label] = $memory_used;
+		if ($output_now) {
 			echo "\r\n<br>$label : $memory_used";
 		}
 	}
@@ -236,9 +236,9 @@ 
 	 * @param int $size
 	 * @return string
 	 */
-	public function convert( $size ) {
-		$unit=array('b','kb','mb','gb','tb','pb');
-		return @round($size/pow(1024,($i=floor(log($size,1024)))),2).' '.$unit[ absint( $i ) ];
+	public function convert($size) {
+		$unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
+		return @round($size / pow(1024, ($i = floor(log($size, 1024)))), 2).' '.$unit[absint($i)];
 	}
 
 
@@ -248,9 +248,9 @@ 
 	 * @param bool $output_now
 	 * @return string
 	 */
-	public function show_times($output_now=true){
-		$output = '<h2>Times:</h2>' . implode("<br>",$this->_times) . '<h2>Memory</h2>' . implode('<br>', $this->_memory_usage_points );
-		if($output_now){
+	public function show_times($output_now = true) {
+		$output = '<h2>Times:</h2>'.implode("<br>", $this->_times).'<h2>Memory</h2>'.implode('<br>', $this->_memory_usage_points);
+		if ($output_now) {
 			echo $output;
 			return '';
 		}
@@ -265,25 +265,25 @@ 
 	 * 	@return void
 	 */
 	public static function ee_plugin_activation_errors() {
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$activation_errors = ob_get_contents();
-			if ( ! empty( $activation_errors ) ) {
-				$activation_errors = date( 'Y-m-d H:i:s' ) . "\n" . $activation_errors;
+			if ( ! empty($activation_errors)) {
+				$activation_errors = date('Y-m-d H:i:s')."\n".$activation_errors;
 			}
-			espresso_load_required( 'EEH_File', EE_HELPERS . 'EEH_File.helper.php' );
-			if ( class_exists( 'EEH_File' )) {
+			espresso_load_required('EEH_File', EE_HELPERS.'EEH_File.helper.php');
+			if (class_exists('EEH_File')) {
 				try {
-					EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html' );
-					EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors );
-				} catch( EE_Error $e ){
-					EE_Error::add_error( sprintf( __(  'The Event Espresso activation errors file could not be setup because: %s', 'event_espresso' ), $e->getMessage() ), __FILE__, __FUNCTION__, __LINE__ );
+					EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html');
+					EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors);
+				} catch (EE_Error $e) {
+					EE_Error::add_error(sprintf(__('The Event Espresso activation errors file could not be setup because: %s', 'event_espresso'), $e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 				}
 			} else {
 				// old school attempt
-				file_put_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . 'espresso_plugin_activation_errors.html', $activation_errors );
+				file_put_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.'espresso_plugin_activation_errors.html', $activation_errors);
 			}
-			$activation_errors = get_option( 'ee_plugin_activation_errors', '' ) . $activation_errors;
-			update_option( 'ee_plugin_activation_errors', $activation_errors );
+			$activation_errors = get_option('ee_plugin_activation_errors', '').$activation_errors;
+			update_option('ee_plugin_activation_errors', $activation_errors);
 		}
 	}
 
@@ -299,22 +299,22 @@ 
 	 * @param int     $error_type
 	 * @uses trigger_error()
 	 */
-	public function doing_it_wrong( $function, $message, $version, $error_type = E_USER_NOTICE ) {
-		do_action( 'AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version);
-		$version = is_null( $version ) ? '' : sprintf( __('(This message was added in version %s of Event Espresso.', 'event_espresso' ), $version );
-		$error_message = sprintf( esc_html__('%1$s was called %2$sincorrectly%3$s. %4$s %5$s','event_espresso' ), $function, '<strong>', '</strong>', $message, $version );
+	public function doing_it_wrong($function, $message, $version, $error_type = E_USER_NOTICE) {
+		do_action('AHEE__EEH_Debug_Tools__doing_it_wrong_run', $function, $message, $version);
+		$version = is_null($version) ? '' : sprintf(__('(This message was added in version %s of Event Espresso.', 'event_espresso'), $version);
+		$error_message = sprintf(esc_html__('%1$s was called %2$sincorrectly%3$s. %4$s %5$s', 'event_espresso'), $function, '<strong>', '</strong>', $message, $version);
 
 		//don't trigger error if doing ajax, instead we'll add a transient EE_Error notice that in theory should show on the next request.
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-			$error_message .= esc_html__( 'This is a doing_it_wrong message that was triggered during an ajax request.  The request params on this request were: ', 'event_espresso' );
+		if (defined('DOING_AJAX') && DOING_AJAX) {
+			$error_message .= esc_html__('This is a doing_it_wrong message that was triggered during an ajax request.  The request params on this request were: ', 'event_espresso');
 			$error_message .= '<ul><li>';
-			$error_message .= implode( '</li><li>', EE_Registry::instance()->REQ->params() );
+			$error_message .= implode('</li><li>', EE_Registry::instance()->REQ->params());
 			$error_message .= '</ul>';
-			EE_Error::add_error( $error_message, 'debug::doing_it_wrong', $function, '42' );
+			EE_Error::add_error($error_message, 'debug::doing_it_wrong', $function, '42');
 			//now we set this on the transient so it shows up on the next request.
-			EE_Error::get_notices( is_admin(), true );
+			EE_Error::get_notices(is_admin(), true);
 		} else {
-			trigger_error( $error_message, $error_type );
+			trigger_error($error_message, $error_type);
 		}
 	}
 
@@ -336,22 +336,22 @@ 
 	 * @param string $debug_index
 	 * @param string $debug_key
 	 */
-	public static function log( $class='', $func = '', $line = '', $info = array(), $display_request = false,  $debug_index = '', $debug_key = 'EE_DEBUG_SPCO' ) {
-		if ( WP_DEBUG /*&& false*/ ) {
-			$debug_key = $debug_key . '_' . EE_Session::instance()->id();
-			$debug_data = get_option( $debug_key, array() );
+	public static function log($class = '', $func = '', $line = '', $info = array(), $display_request = false, $debug_index = '', $debug_key = 'EE_DEBUG_SPCO') {
+		if (WP_DEBUG /*&& false*/) {
+			$debug_key = $debug_key.'_'.EE_Session::instance()->id();
+			$debug_data = get_option($debug_key, array());
 			$default_data = array(
-				$class => $func . '() : ' . $line,
+				$class => $func.'() : '.$line,
 				'REQ'  => $display_request ? $_REQUEST : '',
 			);
 			// don't serialize objects
-			$info = self::strip_objects( $info );
-			$index = ! empty( $debug_index ) ? $debug_index : 0;
-			if ( ! isset( $debug_data[$index] ) ) {
+			$info = self::strip_objects($info);
+			$index = ! empty($debug_index) ? $debug_index : 0;
+			if ( ! isset($debug_data[$index])) {
 				$debug_data[$index] = array();
 			}
-			$debug_data[$index][microtime()] = array_merge( $default_data, $info );
-			update_option( $debug_key, $debug_data );
+			$debug_data[$index][microtime()] = array_merge($default_data, $info);
+			update_option($debug_key, $debug_data);
 		}
 	}
 
@@ -363,26 +363,26 @@ 
 	 * @param array $info
 	 * @return array
 	 */
-	public static function strip_objects( $info = array() ) {
-		foreach ( $info as $key => $value ) {
-			if ( is_array( $value ) ) {
-				$info[ $key ] = self::strip_objects( $value );
-			} else if ( is_object( $value ) ) {
-				$object_class = get_class( $value );
-				$info[ $object_class ] = array();
-				$info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : spl_object_hash( $value );
-				if ( method_exists( $value, 'ID' ) ) {
-					$info[ $object_class ][ 'ID' ] = $value->ID();
+	public static function strip_objects($info = array()) {
+		foreach ($info as $key => $value) {
+			if (is_array($value)) {
+				$info[$key] = self::strip_objects($value);
+			} else if (is_object($value)) {
+				$object_class = get_class($value);
+				$info[$object_class] = array();
+				$info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : spl_object_hash($value);
+				if (method_exists($value, 'ID')) {
+					$info[$object_class]['ID'] = $value->ID();
 				}
-				if ( method_exists( $value, 'status' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status();
-				} else if ( method_exists( $value, 'status_ID' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status_ID();
+				if (method_exists($value, 'status')) {
+					$info[$object_class]['status'] = $value->status();
+				} else if (method_exists($value, 'status_ID')) {
+					$info[$object_class]['status'] = $value->status_ID();
 				}
-				unset( $info[ $key ] );
+				unset($info[$key]);
 			}
 		}
-		return (array)$info;
+		return (array) $info;
 	}
 
 
@@ -399,24 +399,24 @@ 
 	 * @param int $header
 	 * @param bool $die
 	 */
-	public static function printv( $var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false ) {
+	public static function printv($var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false) {
 		$var_name = ! $var_name ? 'string' : $var_name;
 		$heading_tag = 'h';
-		$heading_tag .= is_int( $header ) ? $header : 5;
-		$var_name = ucwords( str_replace( '$', '', $var_name ) );
-		$is_method = method_exists( $var_name, $var );
-		$var_name = ucwords( str_replace( '_', ' ', $var_name ) );
+		$heading_tag .= is_int($header) ? $header : 5;
+		$var_name = ucwords(str_replace('$', '', $var_name));
+		$is_method = method_exists($var_name, $var);
+		$var_name = ucwords(str_replace('_', ' ', $var_name));
 		ob_start();
-		echo '<' . $heading_tag . ' style="color:#2EA2CC; margin:25px 0 0;"><b>' . $var_name . '</b>';
+		echo '<'.$heading_tag.' style="color:#2EA2CC; margin:25px 0 0;"><b>'.$var_name.'</b>';
 		echo $is_method
-			? '<span style="color:#999">::</span><span style="color:#E76700">' . $var . '()</span><br />'
-			: '<span style="color:#999"> : </span><span style="color:#E76700">' . $var . '</span><br />';
-		echo '<span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">' . $file;
-		echo '<br />line no: ' . $line . '</span>';
-		echo '</' . $heading_tag . '>';
+			? '<span style="color:#999">::</span><span style="color:#E76700">'.$var.'()</span><br />'
+			: '<span style="color:#999"> : </span><span style="color:#E76700">'.$var.'</span><br />';
+		echo '<span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">'.$file;
+		echo '<br />line no: '.$line.'</span>';
+		echo '</'.$heading_tag.'>';
 		$result = ob_get_clean();
-		if ( $die ) {
-			die( $result );
+		if ($die) {
+			die($result);
 		} else {
 			echo $result;
 		}
@@ -435,35 +435,35 @@ 
 	 * @param int $header
 	 * @param bool $die
 	 */
-	public static function printr( $var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false ) {
-		$file = str_replace( rtrim( ABSPATH, '\\/' ), '', $file );
+	public static function printr($var, $var_name = false, $file = __FILE__, $line = __LINE__, $header = 5, $die = false) {
+		$file = str_replace(rtrim(ABSPATH, '\\/'), '', $file);
 		//$print_r = false;
-		if ( is_string( $var ) ) {
-			EEH_Debug_Tools::printv( $var, $var_name, $file, $line, $header, $die );
+		if (is_string($var)) {
+			EEH_Debug_Tools::printv($var, $var_name, $file, $line, $header, $die);
 			return;
-		} else if ( is_object( $var ) ) {
+		} else if (is_object($var)) {
 			$var_name = ! $var_name ? 'object' : $var_name;
 			//$print_r = true;
-		} else if ( is_array( $var ) ) {
+		} else if (is_array($var)) {
 			$var_name = ! $var_name ? 'array' : $var_name;
 			//$print_r = true;
-		} else if ( is_numeric( $var ) ) {
+		} else if (is_numeric($var)) {
 			$var_name = ! $var_name ? 'numeric' : $var_name;
-		} else if ( is_null( $var ) ) {
+		} else if (is_null($var)) {
 			$var_name = ! $var_name ? 'null' : $var_name;
 		}
 		$heading_tag = 'h';
-		$heading_tag .= is_int( $header ) ? $header : 5;
-		$var_name = ucwords( str_replace( array( '$', '_' ), array( '', ' ' ), $var_name ) );
+		$heading_tag .= is_int($header) ? $header : 5;
+		$var_name = ucwords(str_replace(array('$', '_'), array('', ' '), $var_name));
 		ob_start();
-		echo '<' . $heading_tag . ' style="color:#2EA2CC; margin:25px 0 0;"><b>' . $var_name . '</b>';
+		echo '<'.$heading_tag.' style="color:#2EA2CC; margin:25px 0 0;"><b>'.$var_name.'</b>';
 		echo '<span style="color:#999"> : </span><span style="color:#E76700">';
-		var_dump( $var );
-		echo '</span><br /><span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">' . $file;
-		echo '<br />line no: ' . $line . '</span></' . $heading_tag . '>';
+		var_dump($var);
+		echo '</span><br /><span style="font-size:9px;font-weight:normal;color:#666;line-height: 12px;">'.$file;
+		echo '<br />line no: '.$line.'</span></'.$heading_tag.'>';
 		$result = ob_get_clean();
-		if ( $die ) {
-			die( $result );
+		if ($die) {
+			die($result);
 		} else {
 			echo $result;
 		}
@@ -480,8 +480,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_wp_query' ) ) {
-	function dump_wp_query(){
+if (class_exists('Kint') && ! function_exists('dump_wp_query')) {
+	function dump_wp_query() {
 		global $wp_query;
 		d($wp_query);
 	}
@@ -491,8 +491,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_wp' ) ) {
-	function dump_wp(){
+if (class_exists('Kint') && ! function_exists('dump_wp')) {
+	function dump_wp() {
 		global $wp;
 		d($wp);
 	}
@@ -502,8 +502,8 @@ 
  * borrowed from Kint Debugger
  * Plugin URI: http://upthemes.com/plugins/kint-debugger/
  */
-if ( class_exists('Kint') && ! function_exists( 'dump_post' ) ) {
-	function dump_post(){
+if (class_exists('Kint') && ! function_exists('dump_post')) {
+	function dump_post() {
 		global $post;
 		d($post);
 	}

core/libraries/rest_api/controllers/model/Read.php

Doc Comments +1 added lines, -1 removed lines

@@ -670,7 +670,7 @@
 
 
 	/**
-	 * @param $model
+	 * @param \EEM_Base $model
 	 * @param $query_params
 	 * @return array
 	 */

Spacing +246 added lines, -246 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\libraries\rest_api\controllers\model;
 use EventEspresso\core\libraries\rest_api\Capabilities;
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -24,7 +24,7 @@ 
 
 	public function __construct() {
 		parent::__construct();
-		\EE_Registry::instance()->load_helper( 'Inflector' );
+		\EE_Registry::instance()->load_helper('Inflector');
 	}
 
 	/**
@@ -32,22 +32,22 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_all( \WP_REST_Request $request) {
+	public static function handle_request_get_all(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)~',
-				array( 'version', 'model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)~',
+				array('version', 'model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -55,12 +55,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entities_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 					)
 			);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -70,21 +70,21 @@ 
 	 * @param \WP_Rest_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_one( \WP_Rest_Request $request ) {
+	public static function handle_request_get_one(\WP_Rest_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)~',
-				array( 'version', 'model', 'id' ) );
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $model_name_singular ) ) {
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)~',
+				array('version', 'model', 'id') );
+			$controller->set_requested_version($matches['version']);
+			$model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$model_name_singular
 						)
 					)
@@ -92,12 +92,12 @@ 
 			}
 			return $controller->send_response(
 					$controller->get_entity_from_model(
-							$controller->get_model_version_info()->load_model( $model_name_singular ),
+							$controller->get_model_version_info()->load_model($model_name_singular),
 							$request
 						)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -109,40 +109,40 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return \WP_REST_Response|\WP_Error
 	 */
-	public static function handle_request_get_related( \WP_REST_Request $request ) {
+	public static function handle_request_get_related(\WP_REST_Request $request) {
 		$controller = new Read();
-		try{
+		try {
 			$matches = $controller->parse_route(
 				$request->get_route(),
-				'~' . \EED_Core_Rest_Api::ee_api_namespace_for_regex . '(.*)/(.*)/(.*)~',
-				array( 'version', 'model', 'id', 'related_model' )
+				'~'.\EED_Core_Rest_Api::ee_api_namespace_for_regex.'(.*)/(.*)/(.*)~',
+				array('version', 'model', 'id', 'related_model')
 			);
-			$controller->set_requested_version( $matches[ 'version' ] );
-			$main_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $main_model_name_singular ) ) {
+			$controller->set_requested_version($matches['version']);
+			$main_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($main_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$main_model_name_singular
 						)
 					)
 				);
 			}
-			$main_model = $controller->get_model_version_info()->load_model( $main_model_name_singular );
+			$main_model = $controller->get_model_version_info()->load_model($main_model_name_singular);
 			//assume the related model name is plural and try to find the model's name
-			$related_model_name_singular = \EEH_Inflector::singularize_and_upper( $matches[ 'related_model' ] );
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			$related_model_name_singular = \EEH_Inflector::singularize_and_upper($matches['related_model']);
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				//so the word didn't singularize well. Maybe that's just because it's a singular word?
-				$related_model_name_singular = \EEH_Inflector::humanize( $matches[ 'related_model' ] );
+				$related_model_name_singular = \EEH_Inflector::humanize($matches['related_model']);
 			}
-			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version( $related_model_name_singular ) ) {
+			if ( ! $controller->get_model_version_info()->is_model_name_in_this_version($related_model_name_singular)) {
 				return $controller->send_response(
 					new \WP_Error(
 						'endpoint_parsing_error',
 						sprintf(
-							__( 'There is no model for endpoint %s. Please contact event espresso support', 'event_espresso' ),
+							__('There is no model for endpoint %s. Please contact event espresso support', 'event_espresso'),
 							$related_model_name_singular
 						)
 					)
@@ -151,13 +151,13 @@ 
 
 			return $controller->send_response(
 					$controller->get_entities_from_relation(
-						$request->get_param( 'id' ),
-						$main_model->related_settings_for( $related_model_name_singular ) ,
+						$request->get_param('id'),
+						$main_model->related_settings_for($related_model_name_singular),
 						$request
 					)
 				);
-		} catch( \Exception $e ) {
-			return $controller->send_response( $e );
+		} catch (\Exception $e) {
+			return $controller->send_response($e);
 		}
 	}
 
@@ -170,31 +170,31 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entities_from_model( $model, $request) {
-		$query_params = $this->create_model_query_params( $model, $request->get_params() );
-		if( ! Capabilities::current_user_has_partial_access_to( $model, $query_params[ 'caps' ] ) ) {
-			$model_name_plural = \EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() );
+	public function get_entities_from_model($model, $request) {
+		$query_params = $this->create_model_query_params($model, $request->get_params());
+		if ( ! Capabilities::current_user_has_partial_access_to($model, $query_params['caps'])) {
+			$model_name_plural = \EEH_Inflector::pluralize_and_lower($model->get_this_model_name());
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $model_name_plural ),
+				sprintf('rest_%s_cannot_list', $model_name_plural),
 				sprintf(
-					__( 'Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s. Missing permissions: %2$s', 'event_espresso'),
 					$model_name_plural,
-					Capabilities::get_missing_permissions_string( $model, $query_params[ 'caps' ] )
+					Capabilities::get_missing_permissions_string($model, $query_params['caps'])
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
 
-		$this->_set_debug_info( 'model query params', $query_params );
+		$this->_set_debug_info('model query params', $query_params);
 		/** @type array $results */
-		$results = $model->get_all_wpdb_results( $query_params );
+		$results = $model->get_all_wpdb_results($query_params);
 		$nice_results = array( );
-		foreach ( $results as $result ) {
-			$nice_results[ ] = $this->create_entity_from_wpdb_result(
+		foreach ($results as $result) {
+			$nice_results[] = $this->create_entity_from_wpdb_result(
 					$model,
 					$result,
-					$request->get_param( 'include' ),
-					$query_params[ 'caps' ]
+					$request->get_param('include'),
+					$query_params['caps']
 				);
 		}
 		return $nice_results;
@@ -212,83 +212,83 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entities_from_relation( $id,  $relation, $request ) {
-		$context = $this->validate_context( $request->get_param( 'caps' ));
+	public function get_entities_from_relation($id, $relation, $request) {
+		$context = $this->validate_context($request->get_param('caps'));
 		$model = $relation->get_this_model();
 		$related_model = $relation->get_other_model();
 		//check if they can access the 1st model object
-		$query_params = array( array( $model->primary_key_name() => $id ),'limit' => 1 );
-		if( $model instanceof \EEM_Soft_Delete_Base ){
+		$query_params = array(array($model->primary_key_name() => $id), 'limit' => 1);
+		if ($model instanceof \EEM_Soft_Delete_Base) {
 			$query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		}
 		$restricted_query_params = $query_params;
-		$restricted_query_params[ 'caps' ] = $context;
-		$this->_set_debug_info( 'main model query params', $restricted_query_params );
-		$this->_set_debug_info( 'missing caps', Capabilities::get_missing_permissions_string( $related_model, $context ) );
+		$restricted_query_params['caps'] = $context;
+		$this->_set_debug_info('main model query params', $restricted_query_params);
+		$this->_set_debug_info('missing caps', Capabilities::get_missing_permissions_string($related_model, $context));
 
-		if(
+		if (
 			! (
-				Capabilities::current_user_has_partial_access_to( $related_model, $context )
-				&& $model->exists( $restricted_query_params )
+				Capabilities::current_user_has_partial_access_to($related_model, $context)
+				&& $model->exists($restricted_query_params)
 			)
-		){
-			if( $relation instanceof \EE_Belongs_To_Relation ) {
-				$related_model_name_maybe_plural = strtolower( $related_model->get_this_model_name() );
-			}else{
-				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower( $related_model->get_this_model_name() );
+		) {
+			if ($relation instanceof \EE_Belongs_To_Relation) {
+				$related_model_name_maybe_plural = strtolower($related_model->get_this_model_name());
+			} else {
+				$related_model_name_maybe_plural = \EEH_Inflector::pluralize_and_lower($related_model->get_this_model_name());
 			}
 			return new \WP_Error(
-				sprintf( 'rest_%s_cannot_list', $related_model_name_maybe_plural ),
+				sprintf('rest_%s_cannot_list', $related_model_name_maybe_plural),
 				sprintf(
-					__(	'Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso' ),
+					__('Sorry, you are not allowed to list %1$s related to %2$s. Missing permissions: %3$s', 'event_espresso'),
 					$related_model_name_maybe_plural,
 					$relation->get_this_model()->get_this_model_name(),
 					implode(
 						',',
 						array_keys(
-							Capabilities::get_missing_permissions( $related_model, $context )
+							Capabilities::get_missing_permissions($related_model, $context)
 						)
 					)
 				),
-				array( 'status' => 403 )
+				array('status' => 403)
 			);
 		}
-		$query_params = $this->create_model_query_params( $relation->get_other_model(), $request->get_params() );
-		$query_params[0][ $relation->get_this_model()->get_this_model_name() . '.' . $relation->get_this_model()->primary_key_name() ] = $id;
-		$query_params[ 'default_where_conditions' ] = 'none';
-		$query_params[ 'caps' ] = $context;
-		$this->_set_debug_info( 'model query params', $query_params );
+		$query_params = $this->create_model_query_params($relation->get_other_model(), $request->get_params());
+		$query_params[0][$relation->get_this_model()->get_this_model_name().'.'.$relation->get_this_model()->primary_key_name()] = $id;
+		$query_params['default_where_conditions'] = 'none';
+		$query_params['caps'] = $context;
+		$this->_set_debug_info('model query params', $query_params);
 		/** @type array $results */
-		$results = $relation->get_other_model()->get_all_wpdb_results( $query_params );
+		$results = $relation->get_other_model()->get_all_wpdb_results($query_params);
 		$nice_results = array();
-		foreach( $results as $result ) {
+		foreach ($results as $result) {
 			$nice_result = $this->create_entity_from_wpdb_result(
 				$relation->get_other_model(),
 				$result,
-				$request->get_param( 'include' ),
-				$query_params[ 'caps' ]
+				$request->get_param('include'),
+				$query_params['caps']
 			);
-			if( $relation instanceof \EE_HABTM_Relation ) {
+			if ($relation instanceof \EE_HABTM_Relation) {
 				//put the unusual stuff (properties from the HABTM relation) first, and make sure
 				//if there are conflicts we prefer the properties from the main model
 				$join_model_result = $this->create_entity_from_wpdb_result(
 					$relation->get_join_model(),
 					$result,
-					$request->get_param( 'include' ),
-					$query_params[ 'caps' ]
+					$request->get_param('include'),
+					$query_params['caps']
 				);
-				$joined_result = array_merge( $nice_result, $join_model_result );
+				$joined_result = array_merge($nice_result, $join_model_result);
 				//but keep the meta stuff from the main model
-				if( isset( $nice_result['meta'] ) ){
+				if (isset($nice_result['meta'])) {
 					$joined_result['meta'] = $nice_result['meta'];
 				}
 				$nice_result = $joined_result;
 			}
 			$nice_results[] = $nice_result;
 		}
-		if( $relation instanceof \EE_Belongs_To_Relation ){
-			return array_shift( $nice_results );
-		}else{
+		if ($relation instanceof \EE_Belongs_To_Relation) {
+			return array_shift($nice_results);
+		} else {
 			return $nice_results;
 		}
 	}
@@ -325,110 +325,110 @@ 
 	 * @param string $context one of the return values from EEM_Base::valid_cap_contexts()
 	 * @return array ready for being converted into json for sending to client
 	 */
-	public function create_entity_from_wpdb_result( $model, $db_row, $include, $context ) {
-		if( $include == null ) {
+	public function create_entity_from_wpdb_result($model, $db_row, $include, $context) {
+		if ($include == null) {
 			$include = '*';
 		}
-		if( $context == null ) {
+		if ($context == null) {
 			$context = \EEM_Base::caps_read;
 		}
-		$result = $model->deduce_fields_n_values_from_cols_n_values( $db_row );
-		$result = array_intersect_key( $result, $this->get_model_version_info()->fields_on_model_in_this_version( $model ) );
-		foreach( $result as $field_name => $raw_field_value ) {
+		$result = $model->deduce_fields_n_values_from_cols_n_values($db_row);
+		$result = array_intersect_key($result, $this->get_model_version_info()->fields_on_model_in_this_version($model));
+		foreach ($result as $field_name => $raw_field_value) {
 			$field_obj = $model->field_settings_for($field_name);
-			$field_value = $field_obj->prepare_for_set_from_db( $raw_field_value );
-			if( $this->is_subclass_of_one(  $field_obj, $this->get_model_version_info()->fields_ignored() ) ){
-				unset( $result[ $field_name ] );
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_rendered_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'rendered' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			$field_value = $field_obj->prepare_for_set_from_db($raw_field_value);
+			if ($this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_ignored())) {
+				unset($result[$field_name]);
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_rendered_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'rendered' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			}elseif(
-				$this->is_subclass_of_one( $field_obj, $this->get_model_version_info()->fields_that_have_pretty_format() )
-			){
-				$result[ $field_name ] = array(
-					'raw' => $field_obj->prepare_for_get( $field_value ),
-					'pretty' => $field_obj->prepare_for_pretty_echoing( $field_value )
+			}elseif (
+				$this->is_subclass_of_one($field_obj, $this->get_model_version_info()->fields_that_have_pretty_format())
+			) {
+				$result[$field_name] = array(
+					'raw' => $field_obj->prepare_for_get($field_value),
+					'pretty' => $field_obj->prepare_for_pretty_echoing($field_value)
 				);
-			}elseif( $field_obj instanceof \EE_Datetime_Field ){
-				if( $raw_field_value instanceof \DateTime ) {
-					$raw_field_value = $raw_field_value->format( 'c' );
+			}elseif ($field_obj instanceof \EE_Datetime_Field) {
+				if ($raw_field_value instanceof \DateTime) {
+					$raw_field_value = $raw_field_value->format('c');
 				}
-				$result[ $field_name ] = mysql_to_rfc3339( $raw_field_value );
-			}else{
-				$value_prepared = $field_obj->prepare_for_get( $field_value );
+				$result[$field_name] = mysql_to_rfc3339($raw_field_value);
+			} else {
+				$value_prepared = $field_obj->prepare_for_get($field_value);
 
-				$result[ $field_name ] = $value_prepared === INF ? EE_INF_IN_DB : $value_prepared;
+				$result[$field_name] = $value_prepared === INF ? EE_INF_IN_DB : $value_prepared;
 			}
 		}
-		if( $model instanceof \EEM_CPT_Base ) {
+		if ($model instanceof \EEM_CPT_Base) {
 			$attachment = wp_get_attachment_image_src(
-				get_post_thumbnail_id( $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ),
+				get_post_thumbnail_id($db_row[$model->get_primary_key_field()->get_qualified_column()]),
 				'full'
 			);
-			$result[ 'featured_image_url' ] = !empty( $attachment ) ? $attachment[ 0 ] : null;
-			$result[ 'link' ] = get_permalink( $db_row[ $model->get_primary_key_field()->get_qualified_column() ] );
+			$result['featured_image_url'] = ! empty($attachment) ? $attachment[0] : null;
+			$result['link'] = get_permalink($db_row[$model->get_primary_key_field()->get_qualified_column()]);
 		}
 		//add links to related data
 		$result['_links'] = array(
 			'self' => array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $result[ $model->primary_key_name() ]
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$result[$model->primary_key_name()]
 					)
 				)
 			),
 			'collection' => array(
 				array(
 					'href' => $this->get_versioned_link_to(
-						\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() )
+						\EEH_Inflector::pluralize_and_lower($model->get_this_model_name())
 					)
 				)
 			),
 		);
 		global $wp_rest_server;
-		if( $model instanceof \EEM_CPT_Base &&
+		if ($model instanceof \EEM_CPT_Base &&
 			$wp_rest_server instanceof \WP_REST_Server &&
-			$wp_rest_server->get_route_options( '/wp/v2/posts' ) ) {
-			$result[ '_links' ][ \EED_Core_Rest_Api::ee_api_link_namespace . 'self_wp_post' ] = array(
+			$wp_rest_server->get_route_options('/wp/v2/posts')) {
+			$result['_links'][\EED_Core_Rest_Api::ee_api_link_namespace.'self_wp_post'] = array(
 				array(
-					'href' => rest_url( '/wp/v2/posts/' . $db_row[ $model->get_primary_key_field()->get_qualified_column() ] ),
+					'href' => rest_url('/wp/v2/posts/'.$db_row[$model->get_primary_key_field()->get_qualified_column()]),
 					'single' => true
 				)
 			);
 		}
 
 		//filter fields if specified
-		$includes_for_this_model = $this->extract_includes_for_this_model( $include );
-		if( ! empty( $includes_for_this_model ) ) {
-			if( $model->has_primary_key_field() ) {
+		$includes_for_this_model = $this->extract_includes_for_this_model($include);
+		if ( ! empty($includes_for_this_model)) {
+			if ($model->has_primary_key_field()) {
 				//always include the primary key
 				$includes_for_this_model[] = $model->primary_key_name();
 			}
-			$result = array_intersect_key( $result, array_flip( $includes_for_this_model ) );
+			$result = array_intersect_key($result, array_flip($includes_for_this_model));
 		}
 		//add meta links and possibly include related models
 		$relation_settings = apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_result__related_models_to_include',
 			$model->relation_settings()
 		);
-		foreach( $relation_settings as $relation_name => $relation_obj ) {
-			$related_model_part = $this->get_related_entity_name( $relation_name, $relation_obj );
-			if( empty( $includes_for_this_model ) || isset( $includes_for_this_model['meta'] ) ) {
-				$result['_links'][ \EED_Core_Rest_Api::ee_api_link_namespace . $related_model_part] = array(
+		foreach ($relation_settings as $relation_name => $relation_obj) {
+			$related_model_part = $this->get_related_entity_name($relation_name, $relation_obj);
+			if (empty($includes_for_this_model) || isset($includes_for_this_model['meta'])) {
+				$result['_links'][\EED_Core_Rest_Api::ee_api_link_namespace.$related_model_part] = array(
 					array(
 						'href' => $this->get_versioned_link_to(
-							\EEH_Inflector::pluralize_and_lower( $model->get_this_model_name() ) . '/' . $result[ $model->primary_key_name() ] . '/' . $related_model_part
+							\EEH_Inflector::pluralize_and_lower($model->get_this_model_name()).'/'.$result[$model->primary_key_name()].'/'.$related_model_part
 						),
 						'single' => $relation_obj instanceof \EE_Belongs_To_Relation ? true : false
 					)
 				);
 			}
-			$related_fields_to_include = $this->extract_includes_for_this_model( $include, $relation_name );
-			if( $related_fields_to_include ) {
+			$related_fields_to_include = $this->extract_includes_for_this_model($include, $relation_name);
+			if ($related_fields_to_include) {
 				$pretend_related_request = new \WP_REST_Request();
 				$pretend_related_request->set_query_params(
 					array(
@@ -440,11 +440,11 @@ 
 					)
 				);
 				$related_results = $this->get_entities_from_relation(
-					$result[ $model->primary_key_name() ],
+					$result[$model->primary_key_name()],
 					$relation_obj,
 					$pretend_related_request
 				);
-				$result[ $related_model_part ] = $related_results instanceof \WP_Error ? null : $related_results;
+				$result[$related_model_part] = $related_results instanceof \WP_Error ? null : $related_results;
 			}
 		}
 		$result = apply_filters(
@@ -461,7 +461,7 @@ 
 		);
 		$this->_set_debug_info(
 			'inaccessible fields',
-			array_keys( array_diff_key( $result, $result_without_inaccessible_fields ) )
+			array_keys(array_diff_key($result, $result_without_inaccessible_fields))
 		);
 		return apply_filters(
 			'FHEE__Read__create_entity_from_wpdb_results__entity_return',
@@ -476,8 +476,8 @@ 
 	 * @param string $link_part_after_version_and_slash eg "events/10/datetimes"
 	 * @return string url eg "http://mysite.com/wp-json/ee/v4.6/events/10/datetimes"
 	 */
-	public function get_versioned_link_to( $link_part_after_version_and_slash ) {
-		return rest_url( \EED_Core_Rest_Api::ee_api_namespace . $this->get_model_version_info()->requested_version() . '/' . $link_part_after_version_and_slash );
+	public function get_versioned_link_to($link_part_after_version_and_slash) {
+		return rest_url(\EED_Core_Rest_Api::ee_api_namespace.$this->get_model_version_info()->requested_version().'/'.$link_part_after_version_and_slash);
 	}
 
 	/**
@@ -487,11 +487,11 @@ 
 	 * @param \EE_Model_Relation_Base $relation_obj
 	 * @return string
 	 */
-	public static function get_related_entity_name( $relation_name, $relation_obj ){
-		if( $relation_obj instanceof \EE_Belongs_To_Relation ) {
-			return strtolower( $relation_name );
-		}else{
-			return \EEH_Inflector::pluralize_and_lower( $relation_name );
+	public static function get_related_entity_name($relation_name, $relation_obj) {
+		if ($relation_obj instanceof \EE_Belongs_To_Relation) {
+			return strtolower($relation_name);
+		} else {
+			return \EEH_Inflector::pluralize_and_lower($relation_name);
 		}
 	}
 
@@ -504,44 +504,44 @@ 
 	 * @param \WP_REST_Request $request
 	 * @return array
 	 */
-	public function get_entity_from_model( $model, $request ) {
-		$query_params = array( array( $model->primary_key_name() => $request->get_param( 'id' ) ),'limit' => 1);
-		if( $model instanceof \EEM_Soft_Delete_Base ){
+	public function get_entity_from_model($model, $request) {
+		$query_params = array(array($model->primary_key_name() => $request->get_param('id')), 'limit' => 1);
+		if ($model instanceof \EEM_Soft_Delete_Base) {
 			$query_params = $model->alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		}
 		$restricted_query_params = $query_params;
-		$restricted_query_params[ 'caps' ] =  $this->validate_context(  $request->get_param( 'caps' ) );
-		$this->_set_debug_info( 'model query params', $restricted_query_params );
-		$model_rows = $model->get_all_wpdb_results( $restricted_query_params );
-		if ( ! empty ( $model_rows ) ) {
+		$restricted_query_params['caps'] = $this->validate_context($request->get_param('caps'));
+		$this->_set_debug_info('model query params', $restricted_query_params);
+		$model_rows = $model->get_all_wpdb_results($restricted_query_params);
+		if ( ! empty ($model_rows)) {
 			return $this->create_entity_from_wpdb_result(
 				$model,
-				array_shift( $model_rows ),
-				$request->get_param( 'include' ),
-				$this->validate_context( $request->get_param( 'caps' ) ) );
+				array_shift($model_rows),
+				$request->get_param('include'),
+				$this->validate_context($request->get_param('caps')) );
 		} else {
 			//ok let's test to see if we WOULD have found it, had we not had restrictions from missing capabilities
-			$lowercase_model_name = strtolower( $model->get_this_model_name() );
-			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results( $query_params );
-			if( ! empty( $model_rows_found_sans_restrictions ) ) {
+			$lowercase_model_name = strtolower($model->get_this_model_name());
+			$model_rows_found_sans_restrictions = $model->get_all_wpdb_results($query_params);
+			if ( ! empty($model_rows_found_sans_restrictions)) {
 				//you got shafted- it existed but we didn't want to tell you!
 				return new \WP_Error(
 					'rest_user_cannot_read',
 					sprintf(
-						__( 'Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso' ),
-						strtolower( $model->get_this_model_name() ),
+						__('Sorry, you cannot read this %1$s. Missing permissions are: %2$s', 'event_espresso'),
+						strtolower($model->get_this_model_name()),
 						Capabilities::get_missing_permissions_string(
 							$model,
-							$this->validate_context( $request->get_param( 'caps' ) ) )
+							$this->validate_context($request->get_param('caps')) )
 					),
-					array( 'status' => 403 )
+					array('status' => 403)
 				);
 			} else {
 				//it's not you. It just doesn't exist
 				return new \WP_Error(
-					sprintf( 'rest_%s_invalid_id', $lowercase_model_name ),
-					sprintf( __( 'Invalid %s ID.', 'event_espresso' ), $lowercase_model_name ),
-					array( 'status' => 404 )
+					sprintf('rest_%s_invalid_id', $lowercase_model_name),
+					sprintf(__('Invalid %s ID.', 'event_espresso'), $lowercase_model_name),
+					array('status' => 404)
 				);
 			}
 		}
@@ -554,14 +554,14 @@ 
 	 * @param string $context
 	 * @return string array key of EEM_Base::cap_contexts_to_cap_action_map()
 	 */
-	public function validate_context( $context ) {
-		if( ! $context ) {
+	public function validate_context($context) {
+		if ( ! $context) {
 			$context = \EEM_Base::caps_read;
 		}
 		$valid_contexts = \EEM_Base::valid_cap_contexts();
-		if( in_array( $context, $valid_contexts )  ){
+		if (in_array($context, $valid_contexts)) {
 			return $context;
-		}else{
+		} else {
 			return \EEM_Base::caps_read;
 		}
 	}
@@ -577,73 +577,73 @@ 
 	 *                          that absolutely no results should be returned
 	 * @throws \EE_Error
 	 */
-	public function create_model_query_params( $model, $query_parameters ) {
+	public function create_model_query_params($model, $query_parameters) {
 		$model_query_params = array( );
-		if ( isset( $query_parameters[ 'where' ] ) ) {
-			$model_query_params[ 0 ] = $this->prepare_rest_query_params_key_for_models( $model, $query_parameters[ 'where' ] );
-		}
-		if ( isset( $query_parameters[ 'order_by' ] ) ) {
-			$order_by = $query_parameters[ 'order_by' ];
-		} elseif ( isset( $query_parameters[ 'orderby' ] ) ) {
-			$order_by = $query_parameters[ 'orderby' ];
-		}else{
+		if (isset($query_parameters['where'])) {
+			$model_query_params[0] = $this->prepare_rest_query_params_key_for_models($model, $query_parameters['where']);
+		}
+		if (isset($query_parameters['order_by'])) {
+			$order_by = $query_parameters['order_by'];
+		} elseif (isset($query_parameters['orderby'])) {
+			$order_by = $query_parameters['orderby'];
+		} else {
 			$order_by = null;
 		}
-		if( $order_by !== null ){
-			$model_query_params[ 'order_by' ] = $this->prepare_rest_query_params_key_for_models( $model, $order_by );
+		if ($order_by !== null) {
+			$model_query_params['order_by'] = $this->prepare_rest_query_params_key_for_models($model, $order_by);
 		}
-		if ( isset( $query_parameters[ 'group_by' ] ) ) {
-			$group_by = $query_parameters[ 'group_by' ];
-		} elseif ( isset( $query_parameters[ 'groupby' ] ) ) {
-			$group_by = $query_parameters[ 'groupby' ];
-		}else{
+		if (isset($query_parameters['group_by'])) {
+			$group_by = $query_parameters['group_by'];
+		} elseif (isset($query_parameters['groupby'])) {
+			$group_by = $query_parameters['groupby'];
+		} else {
 			$group_by = null;
 		}
-		if( $group_by !== null ){
-			if( is_array( $group_by ) ) {
-				$group_by = $this->prepare_rest_query_params_values_for_models( $model, $group_by );
+		if ($group_by !== null) {
+			if (is_array($group_by)) {
+				$group_by = $this->prepare_rest_query_params_values_for_models($model, $group_by);
 			}
-			$model_query_params[ 'group_by' ] = $group_by;
+			$model_query_params['group_by'] = $group_by;
 		}
-		if ( isset( $query_parameters[ 'having' ] ) ) {
+		if (isset($query_parameters['having'])) {
 			//@todo: no good for permissions
-			$model_query_params[ 'having' ] = $this->prepare_rest_query_params_key_for_models( $model, $query_parameters[ 'having' ] );
+			$model_query_params['having'] = $this->prepare_rest_query_params_key_for_models($model, $query_parameters['having']);
 		}
-		if ( isset( $query_parameters[ 'order' ] ) ) {
-			$model_query_params[ 'order' ] = $query_parameters[ 'order' ];
+		if (isset($query_parameters['order'])) {
+			$model_query_params['order'] = $query_parameters['order'];
 		}
-		if ( isset( $query_parameters[ 'mine' ] ) ){
-			$model_query_params = $model->alter_query_params_to_only_include_mine( $model_query_params );
+		if (isset($query_parameters['mine'])) {
+			$model_query_params = $model->alter_query_params_to_only_include_mine($model_query_params);
 		}
-		if( isset( $query_parameters[ 'limit' ] ) ) {
+		if (isset($query_parameters['limit'])) {
 			//limit should be either a string like '23' or '23,43', or an array with two items in it
-			if( is_string( $query_parameters[ 'limit' ] ) ) {
+			if (is_string($query_parameters['limit'])) {
 				$limit_array = explode(',', $query_parameters['limit']);
-			}else {
-				$limit_array = $query_parameters[ 'limit' ];
+			} else {
+				$limit_array = $query_parameters['limit'];
 			}
 			$sanitized_limit = array();
-			foreach( $limit_array as $key => $limit_part ) {
-				if( $this->_debug_mode && ( ! is_numeric( $limit_part ) || count( $sanitized_limit ) > 2 ) ) {
+			foreach ($limit_array as $key => $limit_part) {
+				if ($this->_debug_mode && ( ! is_numeric($limit_part) || count($sanitized_limit) > 2)) {
 					throw new \EE_Error(
 						sprintf(
-							__( 'An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso' ),
-							json_encode( $query_parameters[ 'limit' ] )
+							__('An invalid limit filter was provided. It was: %s. If the EE4 JSON REST API weren\'t in debug mode, this message would not appear.', 'event_espresso'),
+							json_encode($query_parameters['limit'])
 						)
 					);
 				}
-				$sanitized_limit[] = intval( $limit_part );
+				$sanitized_limit[] = intval($limit_part);
 			}
-			$model_query_params[ 'limit' ] = implode( ',', $sanitized_limit );
-		}else{
-			$model_query_params[ 'limit' ] = 50;
+			$model_query_params['limit'] = implode(',', $sanitized_limit);
+		} else {
+			$model_query_params['limit'] = 50;
 		}
-		if( isset( $query_parameters[ 'caps' ] ) ) {
-			$model_query_params[ 'caps' ] = $this->validate_context( $query_parameters[ 'caps' ] );
-		}else{
-			$model_query_params[ 'caps' ] = \EEM_Base::caps_read;
+		if (isset($query_parameters['caps'])) {
+			$model_query_params['caps'] = $this->validate_context($query_parameters['caps']);
+		} else {
+			$model_query_params['caps'] = \EEM_Base::caps_read;
 		}
-		return apply_filters( 'FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model );
+		return apply_filters('FHEE__Read__create_model_query_params', $model_query_params, $query_parameters, $model);
 	}
 
 
@@ -655,13 +655,13 @@ 
 	 * @param array     $query_params sub-array from @see EEM_Base::get_all()
 	 * @return array
 	 */
-	public function prepare_rest_query_params_key_for_models( $model,  $query_params ) {
+	public function prepare_rest_query_params_key_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_key_for_models( $model, $value );
-			}else{
-				$model_ready_query_params[ $key ] = $value;
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_key_for_models($model, $value);
+			} else {
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -674,13 +674,13 @@ 
 	 * @param $query_params
 	 * @return array
 	 */
-	public function prepare_rest_query_params_values_for_models( $model, $query_params ) {
+	public function prepare_rest_query_params_values_for_models($model, $query_params) {
 		$model_ready_query_params = array();
-		foreach( $query_params as $key => $value ) {
-			if( is_array( $value ) ) {
-				$model_ready_query_params[ $key ] = $this->prepare_rest_query_params_values_for_models( $model, $value );
+		foreach ($query_params as $key => $value) {
+			if (is_array($value)) {
+				$model_ready_query_params[$key] = $this->prepare_rest_query_params_values_for_models($model, $value);
 			} else {
-				$model_ready_query_params[ $key ] = $value;
+				$model_ready_query_params[$key] = $value;
 			}
 		}
 		return $model_ready_query_params;
@@ -696,33 +696,33 @@ 
 	 * @return array of fields for this model. If $model_name is provided, then
 	 * the fields for that model, with the model's name removed from each.
 	 */
-	public function extract_includes_for_this_model( $include_string, $model_name = null ) {
-		if( is_array( $include_string ) ) {
-			$include_string = implode( ',', $include_string );
+	public function extract_includes_for_this_model($include_string, $model_name = null) {
+		if (is_array($include_string)) {
+			$include_string = implode(',', $include_string);
 		}
-		if( $include_string === '*' ) {
+		if ($include_string === '*') {
 			return array();
 		}
-		$includes = explode( ',', $include_string );
+		$includes = explode(',', $include_string);
 		$extracted_fields_to_include = array();
-		if( $model_name ){
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
-				if( strpos( $field_to_include, $model_name . '.' ) === 0 ) {
+		if ($model_name) {
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
+				if (strpos($field_to_include, $model_name.'.') === 0) {
 					//found the model name at the exact start
-					$field_sans_model_name = str_replace( $model_name . '.', '', $field_to_include );
+					$field_sans_model_name = str_replace($model_name.'.', '', $field_to_include);
 					$extracted_fields_to_include[] = $field_sans_model_name;
-				}elseif( $field_to_include == $model_name ){
+				}elseif ($field_to_include == $model_name) {
 					$extracted_fields_to_include[] = '*';
 				}
 			}
-		}else{
+		} else {
 			//look for ones with no period
-			foreach( $includes as $field_to_include ) {
-				$field_to_include = trim( $field_to_include );
+			foreach ($includes as $field_to_include) {
+				$field_to_include = trim($field_to_include);
 				if (
-					strpos( $field_to_include, '.' ) === false
-					&& ! $this->get_model_version_info()->is_model_name_in_this_version( $field_to_include )
+					strpos($field_to_include, '.') === false
+					&& ! $this->get_model_version_info()->is_model_name_in_this_version($field_to_include)
 				) {
 					$extracted_fields_to_include[] = $field_to_include;
 				}