eventespresso / event-espresso-core

core/helpers/EEH_Activation.helper.php

Spacing +346 added lines, -346 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
 /**
  * EEH_Activation Helper
  *
@@ -48,9 +48,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->base_prefix ) === 0 ? $table_name : $wpdb->prefix . $table_name;
+		return strpos($table_name, $wpdb->base_prefix) === 0 ? $table_name : $wpdb->prefix.$table_name;
 	}
 
 
@@ -78,7 +78,7 @@ 
 	 * @return boolean success, whether the database and folders are setup properly
 	 * @throws \EE_Error
 	 */
-	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;
@@ -94,9 +94,9 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	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;
@@ -113,9 +113,9 @@ 
 		EEH_Activation::remove_cron_tasks();
 		EEH_Activation::create_cron_tasks();
 		// remove all TXN locks since that is being done via extra meta now
-		delete_option( 'ee_locked_transactions' );
+		delete_option('ee_locked_transactions');
 		//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();
@@ -135,7 +135,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(
@@ -144,16 +144,16 @@ 
 				'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 === 'old' ) {
+		if ($which_to_include === 'old') {
 			$cron_tasks = array_filter(
 				$cron_tasks,
-				function ( $value ) {
+				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 && $which_to_include !== 'all' ) {
+		} elseif ($which_to_include === 'current') {
+			$cron_tasks = array_filter($cron_tasks);
+		} elseif (WP_DEBUG && $which_to_include !== 'all') {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -176,9 +176,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);
 			}
 		}
 
@@ -192,10 +192,10 @@ 
 	 * @param boolean $remove_all whether to only remove the old ones, or remove absolutely ALL the EE ones
 	 * @throws \EE_Error
 	 */
-	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 of what $crons look like:
 		 * Top-level keys are timestamps, and their values are arrays.
 		 * The 2nd level arrays have keys with each of the cron task hook names to run at that time
@@ -213,23 +213,23 @@ 
 		 *					...
 		 *      ...
 		 */
-		$ee_cron_tasks_to_remove = EEH_Activation::get_cron_tasks( $cron_tasks_to_remove );
-		foreach ( $crons as $timestamp => $hooks_to_fire_at_time ) {
-			if ( is_array( $hooks_to_fire_at_time ) ) {
-				foreach ( $hooks_to_fire_at_time as $hook_name => $hook_actions ) {
-					if ( isset( $ee_cron_tasks_to_remove[ $hook_name ] )
-					     && is_array( $ee_cron_tasks_to_remove[ $hook_name ] )
+		$ee_cron_tasks_to_remove = EEH_Activation::get_cron_tasks($cron_tasks_to_remove);
+		foreach ($crons as $timestamp => $hooks_to_fire_at_time) {
+			if (is_array($hooks_to_fire_at_time)) {
+				foreach ($hooks_to_fire_at_time as $hook_name => $hook_actions) {
+					if (isset($ee_cron_tasks_to_remove[$hook_name])
+					     && is_array($ee_cron_tasks_to_remove[$hook_name])
 					) {
-						unset( $crons[ $timestamp ][ $hook_name ] );
+						unset($crons[$timestamp][$hook_name]);
 					}
 				}
 				//also take care of any empty cron timestamps.
-				if ( empty( $hooks_to_fire_at_time ) ) {
-					unset( $crons[ $timestamp ] );
+				if (empty($hooks_to_fire_at_time)) {
+					unset($crons[$timestamp]);
 				}
 			}
 		}
-		_set_cron_array( $crons );
+		_set_cron_array($crons);
 	}
 
 
@@ -244,7 +244,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();
 	}
 
@@ -262,8 +262,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();
 	}
 
@@ -276,28 +276,28 @@ 
 	 */
 	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
 			// then to calendar related plugins
 			if (
-				strpos( $plugin, 'espresso' ) !== FALSE
-				|| strpos( $plugin, 'Espresso' ) !== FALSE
-				|| strpos( $plugin, 'ee4' ) !== FALSE
-				|| strpos( $plugin, 'EE4' ) !== FALSE
-				|| strpos( $plugin, 'calendar' ) !== false
+				strpos($plugin, 'espresso') !== FALSE
+				|| strpos($plugin, 'Espresso') !== FALSE
+				|| strpos($plugin, 'ee4') !== FALSE
+				|| strpos($plugin, 'EE4') !== FALSE
+				|| 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);
 				}
 			}
 		}
@@ -313,21 +313,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;
 	}
@@ -343,8 +343,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);
 		}
 	}
 
@@ -366,25 +366,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'
 			),
@@ -392,62 +392,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);
 		}
 	}
 
@@ -459,13 +459,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;
 		}
 
@@ -482,32 +482,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;
@@ -526,35 +526,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_Config::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__);
 		}
 	}
 
@@ -572,24 +572,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 && (int)$user_id ) {
-		 	self::$_default_creator_id = (int)$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 && (int) $user_id) {
+		 	self::$_default_creator_id = (int) $user_id;
 		 	return self::$_default_creator_id;
 		 } else {
 		 	return NULL;
@@ -616,29 +616,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>',
@@ -647,25 +647,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
 				)
@@ -688,15 +688,15 @@ 
 	 *                            '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);
 		}
@@ -715,14 +715,14 @@ 
 	 * 	@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 ){
+				foreach ($columns as $column) {
 					$field_array[] = $column->Field;
 				}
 				return $field_array;
@@ -741,12 +741,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;
 	}
@@ -761,9 +761,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;
 	}
@@ -778,11 +778,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;
 	}
@@ -798,18 +798,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 (
-			EEH_Activation::table_exists(  $table_name )
-			&& $wpdb->get_var( $index_exists_query ) === $table_name //using get_var with the $index_exists_query returns the table's name
+			EEH_Activation::table_exists($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;
 	}
@@ -825,27 +825,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;
@@ -865,27 +865,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,
@@ -897,8 +897,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,
@@ -910,14 +910,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;
 				}
 			}
 		}
@@ -926,10 +926,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',
@@ -946,25 +946,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
 								);
@@ -972,15 +972,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
 								);
@@ -988,15 +988,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' => 'EMAIL',
 									'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
 								);
@@ -1004,15 +1004,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
 								);
@@ -1020,15 +1020,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
 								);
@@ -1036,15 +1036,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
 								);
@@ -1052,12 +1052,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(),
@@ -1067,12 +1067,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(),
@@ -1082,15 +1082,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
 								);
@@ -1098,49 +1098,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;
@@ -1149,12 +1149,12 @@ 
 
 					// add system questions to groups
 					$wpdb->insert(
-						EEH_Activation::ensure_table_name_has_prefix( 'esp_question_group_question' ),
-						array( 'QSG_ID'    => $QSG_ID,
+						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++
+						       'QGQ_order' => ($QSG_ID === 1) ? $order_for_group_1++ : $order_for_group_2++
 						),
-						array( '%d', '%d', '%d' )
+						array('%d', '%d', '%d')
 					);
 				}
 			}
@@ -1170,11 +1170,11 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	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();
 		}
 	}
@@ -1190,7 +1190,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();
 
@@ -1265,33 +1265,33 @@ 
 		$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;
 	}
 
@@ -1304,7 +1304,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);
 	}
 
 
@@ -1321,7 +1321,7 @@ 
 	 */
 	public static function generate_default_message_templates() {
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		/*
 		 * This first method is taking care of ensuring any default messengers
 		 * that should be made active and have templates generated are done.
@@ -1357,22 +1357,22 @@ 
 		$active_messengers = $message_resource_manager->active_messengers();
 		$installed_message_types = $message_resource_manager->installed_message_types();
 		$templates_created = false;
-		foreach ( $active_messengers as $active_messenger ) {
+		foreach ($active_messengers as $active_messenger) {
 			$default_message_type_names_for_messenger = $active_messenger->get_default_message_types();
 			$default_message_type_names_to_activate = array();
 			// looping through each default message type reported by the messenger
 			// and setup the actual message types to activate.
-			foreach ( $default_message_type_names_for_messenger as $default_message_type_name_for_messenger ) {
+			foreach ($default_message_type_names_for_messenger as $default_message_type_name_for_messenger) {
 				// if already active or has already been activated before we skip
 				// (otherwise we might reactivate something user's intentionally deactivated.)
 				// we also skip if the message type is not installed.
 				if (
-					$message_resource_manager->has_message_type_been_activated_for_messenger( $default_message_type_name_for_messenger, $active_messenger->name )
+					$message_resource_manager->has_message_type_been_activated_for_messenger($default_message_type_name_for_messenger, $active_messenger->name)
 					|| $message_resource_manager->is_message_type_active_for_messenger(
 						$active_messenger->name,
 						$default_message_type_name_for_messenger
 					)
-					|| ! isset( $installed_message_types[ $default_message_type_name_for_messenger ] )
+					|| ! isset($installed_message_types[$default_message_type_name_for_messenger])
 				) {
 					continue;
 				}
@@ -1385,7 +1385,7 @@ 
 				false
 			);
 			//activate the templates for these message types
-			if ( ! empty( $default_message_type_names_to_activate ) ) {
+			if ( ! empty($default_message_type_names_to_activate)) {
 				$templates_created = EEH_MSG_Template::generate_new_templates(
 					$active_messenger->name,
 					$default_message_type_names_for_messenger,
@@ -1412,18 +1412,18 @@ 
 		EE_Message_Resource_Manager $message_resource_manager
 	) {
 		/** @type EE_messenger[] $messengers_to_generate */
-		$messengers_to_generate = self::_get_default_messengers_to_generate_on_activation( $message_resource_manager );
+		$messengers_to_generate = self::_get_default_messengers_to_generate_on_activation($message_resource_manager);
 		$installed_message_types = $message_resource_manager->installed_message_types();
 		$templates_generated = false;
-		foreach ( $messengers_to_generate as $messenger_to_generate ) {
+		foreach ($messengers_to_generate as $messenger_to_generate) {
 			$default_message_type_names_for_messenger = $messenger_to_generate->get_default_message_types();
 			//verify the default message types match an installed message type.
-			foreach ( $default_message_type_names_for_messenger as $key => $name ) {
+			foreach ($default_message_type_names_for_messenger as $key => $name) {
 				if (
-					! isset( $installed_message_types[ $name ] )
-					|| $message_resource_manager->has_message_type_been_activated_for_messenger( $name, $messenger_to_generate->name )
+					! isset($installed_message_types[$name])
+					|| $message_resource_manager->has_message_type_been_activated_for_messenger($name, $messenger_to_generate->name)
 				) {
-					unset( $default_message_type_names_for_messenger[ $key ] );
+					unset($default_message_type_names_for_messenger[$key]);
 				}
 			}
 			// in previous iterations, the active_messengers option in the db
@@ -1437,7 +1437,7 @@ 
 				false
 			);
 			//create any templates needing created (or will reactivate templates already generated as necessary).
-			if ( ! empty( $default_message_type_names_for_messenger ) ) {
+			if ( ! empty($default_message_type_names_for_messenger)) {
 				$templates_generated = EEH_MSG_Template::generate_new_templates(
 					$messenger_to_generate->name,
 					$default_message_type_names_for_messenger,
@@ -1469,18 +1469,18 @@ 
 		$has_activated = $message_resource_manager->get_has_activated_messengers_option();
 
 		$messengers_to_generate = array();
-		foreach ( $installed_messengers as $installed_messenger ) {
+		foreach ($installed_messengers as $installed_messenger) {
 			//if installed messenger is a messenger that should be activated on install
 			//and is not already active
 			//and has never been activated
 			if (
 				! $installed_messenger->activate_on_install
-				|| isset( $active_messengers[ $installed_messenger->name ] )
-				|| isset( $has_activated[ $installed_messenger->name ] )
+				|| isset($active_messengers[$installed_messenger->name])
+				|| isset($has_activated[$installed_messenger->name])
 			) {
 				continue;
 			}
-			$messengers_to_generate[ $installed_messenger->name ] = $installed_messenger;
+			$messengers_to_generate[$installed_messenger->name] = $installed_messenger;
 		}
 		return $messengers_to_generate;
 	}
@@ -1505,9 +1505,9 @@ 
 	 */
 	public static function validate_messages_system() {
 		/** @type EE_Message_Resource_Manager $message_resource_manager */
-		$message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		$message_resource_manager->validate_active_message_types_are_installed();
-		do_action( 'AHEE__EEH_Activation__validate_messages_system' );
+		do_action('AHEE__EEH_Activation__validate_messages_system');
 	}
 
 
@@ -1520,12 +1520,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);
 		}
 	}
 
@@ -1550,24 +1550,24 @@ 
 	 * @global wpdb $wpdb
 	 * @throws \EE_Error
 	 */
-	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);
 		}
 	}
 
@@ -1581,18 +1581,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;
@@ -1617,8 +1617,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);
 		}
 
 
@@ -1656,58 +1656,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( (string)$version[0] === '3'){//if its NON EE4
+			foreach ($espresso_db_update as $version => $times_activated) {
+				if ((string) $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 ( ! empty( $errors ) ) {
-			EE_Error::add_attention( $errors, __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! empty($errors)) {
+			EE_Error::add_attention($errors, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 	
@@ -1717,10 +1717,10 @@ 
 	 */
 	public static function last_wpdb_error_code() {
 		global $wpdb;
-		if( $wpdb->use_mysqli ) {
-			return mysqli_errno( $wpdb->dbh );
+		if ($wpdb->use_mysqli) {
+			return mysqli_errno($wpdb->dbh);
 		} else {
-			return mysql_errno( $wpdb->dbh );
+			return mysql_errno($wpdb->dbh);
 		}
 	}
 
@@ -1730,23 +1730,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 there was a table doesn't exist error
-		if( ! empty( $new_error ) ) {
-			if(
+		if ( ! empty($new_error)) {
+			if (
 				in_array(
 					EEH_Activation::last_wpdb_error_code(),
 					array(
@@ -1756,14 +1756,14 @@ 
 					)
 				)
 				|| 
-				preg_match( '~^Table .* doesn\'t exist~', $new_error ) //in case not using mysql and error codes aren't reliable, just check for this error string
+				preg_match('~^Table .* doesn\'t exist~', $new_error) //in case not using mysql and error codes aren't reliable, just check for this error string
 			) {
 				return false;
 			} else {
 				//log this because that's weird. Just use the normal PHP error log
 				error_log( 
 					sprintf(
-						__( 'Event Espresso error detected when checking if table existed: %1$s (it wasn\'t just that the table didn\'t exist either)', 'event_espresso' ),
+						__('Event Espresso error detected when checking if table existed: %1$s (it wasn\'t just that the table didn\'t exist either)', 'event_espresso'),
 					$new_error
 					)
 				);
@@ -1775,7 +1775,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;
 	}

Braces +5 added lines, -5 removed lines

@@ -465,7 +465,7 @@ 
 		$post_id = $wpdb->get_var("SELECT ID FROM {$wpdb->posts} WHERE post_content LIKE '%$shortcode_and_opening_bracket%' LIMIT 1");
 		if($post_id){
 			return get_post($post_id);
-		}else{
+		} else{
 			return NULL;
 		}
 
@@ -838,13 +838,13 @@ 
 					foreach( $current_data_migration_script->get_errors() as $error ){
 						EE_Error::add_error($error, __FILE__, __FUNCTION__, __LINE__ );
 					}
-				}else{
+				} 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{
+		} 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;
 		}
@@ -1174,7 +1174,7 @@ 
 		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{
+		} else{
 			EEM_Payment_Method::instance()->verify_button_urls();
 		}
 	}
@@ -1667,7 +1667,7 @@ 
 				if( ! delete_option( $option_name ) ){
 					$undeleted_options[] = $option_name;
 				}
-			}else{
+			} 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 ) ){

core/db_models/EEM_Message.model.php

Spacing +81 added lines, -81 removed lines

@@ -105,42 +105,42 @@ 
 	 *
 	 * @return EEM_Message
 	 */
-	protected function __construct( $timezone = null ) {
-		$this->singular_item = __('Message','event_espresso');
-		$this->plural_item = __('Messages','event_espresso');
+	protected function __construct($timezone = null) {
+		$this->singular_item = __('Message', 'event_espresso');
+		$this->plural_item = __('Messages', 'event_espresso');
 
 		//used for token generator
-		EE_Registry::instance()->load_helper( 'URL' );
+		EE_Registry::instance()->load_helper('URL');
 
 		$this->_tables = array(
-			'Message'=>new EE_Primary_Table('esp_message','MSG_ID')
+			'Message'=>new EE_Primary_Table('esp_message', 'MSG_ID')
 		);
 
 		$allowed_priority = array(
-			self::priority_high => __( 'high', 'event_espresso' ),
-			self::priority_medium => __( 'medium', 'event_espresso' ),
-			self::priority_low => __( 'low', 'event_espresso' )
+			self::priority_high => __('high', 'event_espresso'),
+			self::priority_medium => __('medium', 'event_espresso'),
+			self::priority_low => __('low', 'event_espresso')
 		);
 
 		$this->_fields = array(
 			'Message'=>array(
-				'MSG_ID'=>new EE_Primary_Key_Int_Field('MSG_ID', __('Message ID','event_espresso')),
-				'MSG_token' => new EE_Plain_Text_Field( 'MSG_token', __('Unique Token used to represent this row in publicly viewable contexts (eg. a url).', 'event_espresso' ), false, EEH_URL::generate_unique_token() ),
-				'GRP_ID'=>new EE_Foreign_Key_Int_Field( 'GRP_ID', __('Foreign key to the EEM_Message_Template_Group table.', 'event_espresso' ), true, 0, 'Message_Template_Group' ),
-				'TXN_ID' => new EE_Foreign_Key_Int_Field( 'TXN_ID', __( 'Foreign key to the related EE_Transaction.  This is required to give context for regenerating the specific message', 'event_espresso' ), true, 0, 'Transaction' ),
-				'MSG_messenger' => new EE_Plain_Text_Field('MSG_messenger', __( 'Corresponds to the EE_messenger::name used to send this message. This will also be used to attempt any resending of the message.', 'event_espresso' ), false, 'email' ),
-				'MSG_message_type' => new EE_Plain_Text_Field( 'MSG_message_type', __( 'Corresponds to the EE_message_type::name used to generate this message.', 'event_espresso' ), false, 'receipt' ),
-				'MSG_context' => new EE_Plain_Text_Field( 'MSG_context', __( 'Context', 'event_espresso' ), false ),
-				'MSG_recipient_ID' => new EE_Foreign_Key_Int_Field( 'MSG_recipient_ID', __( 'Recipient ID', 'event_espresso' ), true, null, array( 'Registration', 'Attendee', 'WP_User' ) ),
-				'MSG_recipient_type' => new EE_Any_Foreign_Model_Name_Field( 'MSG_recipient_type', __( 'Recipient Type', 'event_espresso' ), true, null, array( 'Registration', 'Attendee', 'WP_User' ) ),
-				'MSG_content' => new EE_Maybe_Serialized_Text_Field( 'MSG_content', __( 'Content', 'event_espresso' ), true, '' ),
-				'MSG_to' => new EE_Maybe_Serialized_Text_Field( 'MSG_to', __( 'Address To', 'event_espresso' ), true ),
-				'MSG_from' => new EE_Maybe_Serialized_Text_Field( 'MSG_from', __( 'Address From', 'event_espresso' ), true ),
-				'MSG_subject' => new EE_Maybe_Serialized_Text_Field( 'MSG_subject', __( 'Subject', 'event_espresso' ), true, '' ),
-				'MSG_priority' => new EE_Enum_Integer_Field( 'MSG_priority', __( 'Priority', 'event_espresso' ), false, self::priority_low, $allowed_priority ),
-				'STS_ID' => new EE_Foreign_Key_String_Field( 'STS_ID', __( 'Status', 'event_espresso' ), false, self::status_incomplete, 'Status' ),
-				'MSG_created' => new EE_Datetime_Field( 'MSG_created', __( 'Created', 'event_espresso' ), false, time() ),
-				'MSG_modified' => new EE_Datetime_Field( 'MSG_modified', __( 'Modified', 'event_espresso' ), true, time() )
+				'MSG_ID'=>new EE_Primary_Key_Int_Field('MSG_ID', __('Message ID', 'event_espresso')),
+				'MSG_token' => new EE_Plain_Text_Field('MSG_token', __('Unique Token used to represent this row in publicly viewable contexts (eg. a url).', 'event_espresso'), false, EEH_URL::generate_unique_token()),
+				'GRP_ID'=>new EE_Foreign_Key_Int_Field('GRP_ID', __('Foreign key to the EEM_Message_Template_Group table.', 'event_espresso'), true, 0, 'Message_Template_Group'),
+				'TXN_ID' => new EE_Foreign_Key_Int_Field('TXN_ID', __('Foreign key to the related EE_Transaction.  This is required to give context for regenerating the specific message', 'event_espresso'), true, 0, 'Transaction'),
+				'MSG_messenger' => new EE_Plain_Text_Field('MSG_messenger', __('Corresponds to the EE_messenger::name used to send this message. This will also be used to attempt any resending of the message.', 'event_espresso'), false, 'email'),
+				'MSG_message_type' => new EE_Plain_Text_Field('MSG_message_type', __('Corresponds to the EE_message_type::name used to generate this message.', 'event_espresso'), false, 'receipt'),
+				'MSG_context' => new EE_Plain_Text_Field('MSG_context', __('Context', 'event_espresso'), false),
+				'MSG_recipient_ID' => new EE_Foreign_Key_Int_Field('MSG_recipient_ID', __('Recipient ID', 'event_espresso'), true, null, array('Registration', 'Attendee', 'WP_User')),
+				'MSG_recipient_type' => new EE_Any_Foreign_Model_Name_Field('MSG_recipient_type', __('Recipient Type', 'event_espresso'), true, null, array('Registration', 'Attendee', 'WP_User')),
+				'MSG_content' => new EE_Maybe_Serialized_Text_Field('MSG_content', __('Content', 'event_espresso'), true, ''),
+				'MSG_to' => new EE_Maybe_Serialized_Text_Field('MSG_to', __('Address To', 'event_espresso'), true),
+				'MSG_from' => new EE_Maybe_Serialized_Text_Field('MSG_from', __('Address From', 'event_espresso'), true),
+				'MSG_subject' => new EE_Maybe_Serialized_Text_Field('MSG_subject', __('Subject', 'event_espresso'), true, ''),
+				'MSG_priority' => new EE_Enum_Integer_Field('MSG_priority', __('Priority', 'event_espresso'), false, self::priority_low, $allowed_priority),
+				'STS_ID' => new EE_Foreign_Key_String_Field('STS_ID', __('Status', 'event_espresso'), false, self::status_incomplete, 'Status'),
+				'MSG_created' => new EE_Datetime_Field('MSG_created', __('Created', 'event_espresso'), false, time()),
+				'MSG_modified' => new EE_Datetime_Field('MSG_modified', __('Modified', 'event_espresso'), true, time())
 			)
 		);
 		$this->_model_relations = array(
@@ -150,7 +150,7 @@ 
 			'Message_Template_Group' => new EE_Belongs_To_Relation(),
 			'Transaction' => new EE_Belongs_To_Relation()
 		);
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -161,8 +161,8 @@ 
 	public function create_default_object() {
 		/** @type EE_Message $message */
 		$message = parent::create_default_object();
-		if ( $message instanceof EE_Message ) {
-			return EE_Message_Factory::set_messenger_and_message_type( $message );
+		if ($message instanceof EE_Message) {
+			return EE_Message_Factory::set_messenger_and_message_type($message);
 		}
 		return null;
 	}
@@ -173,11 +173,11 @@ 
 	 * @param mixed $cols_n_values
 	 * @return \EE_Message
 	 */
-	public function instantiate_class_from_array_or_object( $cols_n_values ) {
+	public function instantiate_class_from_array_or_object($cols_n_values) {
 		/** @type EE_Message $message */
-		$message = parent::instantiate_class_from_array_or_object( $cols_n_values );
-		if ( $message instanceof EE_Message ) {
-			return EE_Message_Factory::set_messenger_and_message_type( $message );
+		$message = parent::instantiate_class_from_array_or_object($cols_n_values);
+		if ($message instanceof EE_Message) {
+			return EE_Message_Factory::set_messenger_and_message_type($message);
 		}
 		return null;
 	}
@@ -190,13 +190,13 @@ 
 	 * @param string $message_type the message type slug
 	 * @return boolean
 	 */
-	public function message_sent_for_attendee( $attendee, $message_type ) {
-		$attendee_ID = EEM_Attendee::instance()->ensure_is_ID( $attendee );
-		return $this->exists( array( array(
+	public function message_sent_for_attendee($attendee, $message_type) {
+		$attendee_ID = EEM_Attendee::instance()->ensure_is_ID($attendee);
+		return $this->exists(array(array(
 			'Attendee.ATT_ID' => $attendee_ID,
 			'MSG_message_type' => $message_type,
-			'STS_ID' => array( 'IN', $this->stati_indicating_sent() )
-		) ) );
+			'STS_ID' => array('IN', $this->stati_indicating_sent())
+		)));
 	}
 
 
@@ -208,13 +208,13 @@ 
 	 * @param string $message_type the message type slug
 	 * @return boolean
 	 */
-	public function message_sent_for_registration( $registration, $message_type ) {
-		$registrationID = EEM_Registration::instance()->ensure_is_ID( $registration );
-		return $this->exists( array( array(
+	public function message_sent_for_registration($registration, $message_type) {
+		$registrationID = EEM_Registration::instance()->ensure_is_ID($registration);
+		return $this->exists(array(array(
 			'Registration.REG_ID' => $registrationID,
 			'MSG_message_type' => $message_type,
-			'STS_ID' => array( 'IN', $this->stati_indicating_sent() )
-		) ) );
+			'STS_ID' => array('IN', $this->stati_indicating_sent())
+		)));
 	}
 
 
@@ -225,10 +225,10 @@ 
 	 * @param string $token
 	 * @return EE_Message
 	 */
-	public function get_one_by_token( $token ) {
-		return $this->get_one( array( array(
+	public function get_one_by_token($token) {
+		return $this->get_one(array(array(
 			'MSG_token' => $token
-		) ) );
+		)));
 	}
 
 
@@ -236,8 +236,8 @@ 
 	 * Returns stati that indicate the message HAS been sent
 	 * @return array of strings for possible stati
 	 */
-	public function stati_indicating_sent(){
-		return apply_filters( 'FHEE__EEM_Message__stati_indicating_sent', array( self::status_sent ) );
+	public function stati_indicating_sent() {
+		return apply_filters('FHEE__EEM_Message__stati_indicating_sent', array(self::status_sent));
 	}
 
 
@@ -248,7 +248,7 @@ 
 	 * @return array of strings for possible stati.
 	 */
 	public function stati_indicating_to_send() {
-		return apply_filters( 'FHEE__EEM_Message__stati_indicating_to_send', array( self::status_idle, self::status_resend ) );
+		return apply_filters('FHEE__EEM_Message__stati_indicating_to_send', array(self::status_idle, self::status_resend));
 	}
 
 
@@ -262,10 +262,10 @@ 
 			self::status_retry,
 		);
 		//if WP_DEBUG is set, then let's include debug_only fails
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$failed_stati[] = self::status_debug_only;
 		}
-		return apply_filters( 'FHEE__EEM_Message__stati_indicating_failed_sending', $failed_stati );
+		return apply_filters('FHEE__EEM_Message__stati_indicating_failed_sending', $failed_stati);
 	}
 
 
@@ -300,11 +300,11 @@ 
 		// the value, matches the corresponding EEM_Base child reference.
 		$expected_vars = $this->_expected_vars_for_query_inject();
 		$query_params[0] = array();
-		foreach ( $expected_vars as $request_key => $model_name ) {
-			$request_value = EE_Registry::instance()->REQ->get( $request_key );
-			if ( $request_value ) {
+		foreach ($expected_vars as $request_key => $model_name) {
+			$request_value = EE_Registry::instance()->REQ->get($request_key);
+			if ($request_value) {
 				//special case
-				switch ( $request_key ) {
+				switch ($request_key) {
 					case '_REG_ID' :
 						$query_params[0]['AND**filter_by']['OR**filter_by_REG_ID'] = array(
 							'Transaction.Registration.REG_ID' => $request_value,
@@ -316,7 +316,7 @@ 
 						);
 						break;
 					default :
-						$query_params[0]['AND**filter_by'][ 'OR**filter_by_' . $request_key ][ $model_name . '.' . $request_key ] = $request_value;
+						$query_params[0]['AND**filter_by']['OR**filter_by_'.$request_key][$model_name.'.'.$request_key] = $request_value;
 						break;
 				}
 			}
@@ -333,53 +333,53 @@ 
 		$expected_vars = $this->_expected_vars_for_query_inject();
 		$pretty_label = '';
 		$label_parts = array();
-		foreach ( $expected_vars as $request_key => $model_name ) {
-			$model = EE_Registry::instance()->load_model( $model_name );
-			if ( $model_field_value = EE_Registry::instance()->REQ->get( $request_key ) ) {
-				switch ( $request_key ) {
+		foreach ($expected_vars as $request_key => $model_name) {
+			$model = EE_Registry::instance()->load_model($model_name);
+			if ($model_field_value = EE_Registry::instance()->REQ->get($request_key)) {
+				switch ($request_key) {
 					case '_REG_ID' :
 						$label_parts[] = sprintf(
-							esc_html__( 'Registration with the ID: %s', 'event_espresso' ),
+							esc_html__('Registration with the ID: %s', 'event_espresso'),
 							$model_field_value
 						);
 						break;
 					case 'ATT_ID' :
 						/** @var EE_Attendee $attendee */
-						$attendee = $model->get_one_by_ID( $model_field_value );
+						$attendee = $model->get_one_by_ID($model_field_value);
 						$label_parts[] = $attendee instanceof EE_Attendee
-							? sprintf( esc_html__( 'Attendee %s', 'event_espresso' ), $attendee->full_name() )
-							: sprintf( esc_html__( 'Attendee ID: %s', 'event_espresso' ), $model_field_value );
+							? sprintf(esc_html__('Attendee %s', 'event_espresso'), $attendee->full_name())
+							: sprintf(esc_html__('Attendee ID: %s', 'event_espresso'), $model_field_value);
 						break;
 					case 'ID' :
 						/** @var EE_WP_User $wpUser */
-						$wpUser = $model->get_one_by_ID( $model_field_value );
+						$wpUser = $model->get_one_by_ID($model_field_value);
 						$label_parts[] = $wpUser instanceof EE_WP_User
-							? sprintf( esc_html__( 'WP User: %s', 'event_espresso' ), $wpUser->name() )
-							: sprintf( esc_html__( 'WP User ID: %s', 'event_espresso' ), $model_field_value );
+							? sprintf(esc_html__('WP User: %s', 'event_espresso'), $wpUser->name())
+							: sprintf(esc_html__('WP User ID: %s', 'event_espresso'), $model_field_value);
 						break;
 					case 'TXN_ID' :
 						$label_parts[] = sprintf(
-							esc_html__( 'Transaction with the ID: %s', 'event_espresso' ),
+							esc_html__('Transaction with the ID: %s', 'event_espresso'),
 							$model_field_value
 						);
 						break;
 					case 'EVT_ID' :
 						/** @var EE_Event $Event */
-						$Event = $model->get_one_by_ID( $model_field_value );
+						$Event = $model->get_one_by_ID($model_field_value);
 						$label_parts[] = $Event instanceof EE_Event
-							? sprintf( esc_html__( 'for the Event: %s', 'event_espresso' ), $Event->name() )
-							: sprintf( esc_html__( 'for the Event with ID: %s', 'event_espresso' ), $model_field_value );
+							? sprintf(esc_html__('for the Event: %s', 'event_espresso'), $Event->name())
+							: sprintf(esc_html__('for the Event with ID: %s', 'event_espresso'), $model_field_value);
 						break;
 				}
 			}
 		}
 
-		if ( $label_parts ) {
+		if ($label_parts) {
 
 			//prepend to the last element of $label_parts an "and".
-			if ( count( $label_parts ) > 1 ) {
-				$label_parts_index_to_prepend                 = count( $label_parts ) - 1;
-				$label_parts[ $label_parts_index_to_prepend ] = 'and' . $label_parts[ $label_parts_index_to_prepend ];
+			if (count($label_parts) > 1) {
+				$label_parts_index_to_prepend                 = count($label_parts) - 1;
+				$label_parts[$label_parts_index_to_prepend] = 'and'.$label_parts[$label_parts_index_to_prepend];
 			}
 
 			$pretty_label .= sprintf(
@@ -388,7 +388,7 @@ 
 					'A label for the messages returned in a query that are filtered by items in the query. This could be Transaction, Event, Attendee, Registration, or WP_User.',
 					'event_espresso'
 				),
-				implode( ', ', $label_parts )
+				implode(', ', $label_parts)
 			);
 		}
 		return $pretty_label;
@@ -438,20 +438,20 @@ 
 	 *
 	 * @return bool         true means Messages is in debug mode.  false means messages system is not in debug mode.
 	 */
-	public static function debug( $set_debug = null ) {
+	public static function debug($set_debug = null) {
 		static $is_debugging = null;
 
 		//initialize (use constant if set).
-		if ( is_null( $set_debug ) && is_null( $is_debugging ) ) {
-			$is_debugging = defined( 'EE_DEBUG_MESSAGES' ) && EE_DEBUG_MESSAGES;
+		if (is_null($set_debug) && is_null($is_debugging)) {
+			$is_debugging = defined('EE_DEBUG_MESSAGES') && EE_DEBUG_MESSAGES;
 		}
 
-		if ( ! is_null( $set_debug ) ) {
-			$is_debugging = filter_var( $set_debug, FILTER_VALIDATE_BOOLEAN );
+		if ( ! is_null($set_debug)) {
+			$is_debugging = filter_var($set_debug, FILTER_VALIDATE_BOOLEAN);
 		}
 
 		//return filtered value
-		return apply_filters( 'FHEE__EEM_Message__debug', $is_debugging );
+		return apply_filters('FHEE__EEM_Message__debug', $is_debugging);
 	}
 
 

admin_pages/messages/Messages_Admin_Page.core.php

Spacing +627 added lines, -627 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
-	{exit('NO direct script access allowed');}
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
+	{exit('NO direct script access allowed'); }
 
 /**
  *
@@ -72,10 +72,10 @@ 
 	/**
 	 * @param bool $routing
 	 */
-	public function __construct( $routing = true ) {
+	public function __construct($routing = true) {
 		//make sure messages autoloader is running
 		EED_Messages::set_autoloaders();
-		parent::__construct( $routing );
+		parent::__construct($routing);
 	}
 
 
@@ -89,7 +89,7 @@ 
 
 		$this->_activate_state = isset($this->_req_data['activate_state']) ? (array) $this->_req_data['activate_state'] : array();
 
-		$this->_active_messenger = isset( $this->_req_data['messenger'] ) ? $this->_req_data['messenger'] : null;
+		$this->_active_messenger = isset($this->_req_data['messenger']) ? $this->_req_data['messenger'] : null;
 		$this->_load_message_resource_manager();
 	}
 
@@ -103,7 +103,7 @@ 
 	 * @throws EE_Error
 	*/
 	protected function _load_message_resource_manager() {
-		$this->_message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+		$this->_message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 	}
 
 
@@ -116,13 +116,13 @@ 
 	 */
 	public function get_messengers_for_list_table() {
 		$m_values = array();
-		$active_messengers = EEM_Message::instance()->get_all( array( 'group_by' => 'MSG_messenger' ) );
+		$active_messengers = EEM_Message::instance()->get_all(array('group_by' => 'MSG_messenger'));
 		//setup messengers for selects
 		$i = 1;
-		foreach ( $active_messengers as $active_messenger ) {
-			if ( $active_messenger instanceof EE_Message ) {
-				$m_values[ $i ]['id'] = $active_messenger->messenger();
-				$m_values[ $i ]['text'] = ucwords( $active_messenger->messenger_label() );
+		foreach ($active_messengers as $active_messenger) {
+			if ($active_messenger instanceof EE_Message) {
+				$m_values[$i]['id'] = $active_messenger->messenger();
+				$m_values[$i]['text'] = ucwords($active_messenger->messenger_label());
 				$i++;
 			}
 		}
@@ -139,12 +139,12 @@ 
 	 */
 	public function get_message_types_for_list_table() {
 		$mt_values = array();
-		$active_messages = EEM_Message::instance()->get_all( array( 'group_by' => 'MSG_message_type' ) );
+		$active_messages = EEM_Message::instance()->get_all(array('group_by' => 'MSG_message_type'));
 		$i = 1;
-		foreach ( $active_messages as $active_message ) {
-			if ( $active_message instanceof EE_Message ) {
-				$mt_values[ $i ]['id'] = $active_message->message_type();
-				$mt_values[ $i ]['text'] = ucwords( $active_message->message_type_label() );
+		foreach ($active_messages as $active_message) {
+			if ($active_message instanceof EE_Message) {
+				$mt_values[$i]['id'] = $active_message->message_type();
+				$mt_values[$i]['text'] = ucwords($active_message->message_type_label());
 				$i++;
 			}
 		}
@@ -161,14 +161,14 @@ 
 	 */
 	public function get_contexts_for_message_types_for_list_table() {
 		$contexts = array();
-		$active_message_contexts = EEM_Message::instance()->get_all( array( 'group_by' => 'MSG_context' ) );
-		foreach ( $active_message_contexts as $active_message ) {
-			if ( $active_message instanceof EE_Message ) {
+		$active_message_contexts = EEM_Message::instance()->get_all(array('group_by' => 'MSG_context'));
+		foreach ($active_message_contexts as $active_message) {
+			if ($active_message instanceof EE_Message) {
 				$message_type = $active_message->message_type_object();
-				if ( $message_type instanceof EE_message_type ) {
+				if ($message_type instanceof EE_message_type) {
 					$message_type_contexts = $message_type->get_contexts();
-					foreach ( $message_type_contexts as $context => $context_details ) {
-						$contexts[ $context ] = $context_details['label'];
+					foreach ($message_type_contexts as $context => $context_details) {
+						$contexts[$context] = $context_details['label'];
 					}
 				}
 			}
@@ -179,11 +179,11 @@ 
 
 
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_activate_messenger', array($this, 'activate_messenger_toggle' ) );
-		add_action('wp_ajax_activate_mt', array( $this, 'activate_mt_toggle') );
-		add_action('wp_ajax_ee_msgs_save_settings', array( $this, 'save_settings') );
-		add_action('wp_ajax_ee_msgs_update_mt_form', array( $this, 'update_mt_form' ) );
-		add_action('wp_ajax_switch_template_pack', array( $this, 'switch_template_pack' ) );
+		add_action('wp_ajax_activate_messenger', array($this, 'activate_messenger_toggle'));
+		add_action('wp_ajax_activate_mt', array($this, 'activate_mt_toggle'));
+		add_action('wp_ajax_ee_msgs_save_settings', array($this, 'save_settings'));
+		add_action('wp_ajax_ee_msgs_update_mt_form', array($this, 'update_mt_form'));
+		add_action('wp_ajax_switch_template_pack', array($this, 'switch_template_pack'));
 	}
 
 
@@ -215,13 +215,13 @@ 
 	*		@return void
 	*/
 	protected function _set_page_routes() {
-		$grp_id = ! empty( $this->_req_data['GRP_ID'] ) && ! is_array( $this->_req_data['GRP_ID'] )
+		$grp_id = ! empty($this->_req_data['GRP_ID']) && ! is_array($this->_req_data['GRP_ID'])
 			? $this->_req_data['GRP_ID']
 			: 0;
-		$grp_id = empty( $grp_id ) && !empty( $this->_req_data['id'] )
+		$grp_id = empty($grp_id) && ! empty($this->_req_data['id'])
 			? $this->_req_data['id']
 			: $grp_id;
-		$msg_id = ! empty( $this->_req_data['MSG_ID'] ) && ! is_array( $this->_req_data['MSG_ID'] )
+		$msg_id = ! empty($this->_req_data['MSG_ID']) && ! is_array($this->_req_data['MSG_ID'])
 			? $this->_req_data['MSG_ID']
 			: 0;
 
@@ -263,35 +263,35 @@ 
 			'insert_message_template' => array(
 				'func' => '_insert_or_update_message_template',
 				'capability' => 'ee_edit_messages',
-				'args' => array( 'new_template' => true ),
+				'args' => array('new_template' => true),
 				'noheader' => true
 			 ),
 			'update_message_template' => array(
 				'func' => '_insert_or_update_message_template',
 				'capability' => 'ee_edit_message',
 				'obj_id' => $grp_id,
-				'args' => array( 'new_template' => false ),
+				'args' => array('new_template' => false),
 				'noheader' => true
 			),
 			'trash_message_template' => array(
 				'func' => '_trash_or_restore_message_template',
 				'capability' => 'ee_delete_message',
 				'obj_id' => $grp_id,
-				'args' => array( 'trash' => true, 'all' => true ),
+				'args' => array('trash' => true, 'all' => true),
 				'noheader' => true
 			),
 			'trash_message_template_context' => array(
 				'func' => '_trash_or_restore_message_template',
 				'capability' => 'ee_delete_message',
 				'obj_id' => $grp_id,
-				'args' => array( 'trash' => true ),
+				'args' => array('trash' => true),
 				'noheader' => true
 			),
 			'restore_message_template' => array(
 				'func' => '_trash_or_restore_message_template',
 				'capability' => 'ee_delete_message',
 				'obj_id' => $grp_id,
-				'args' => array( 'trash' => false, 'all' => true ),
+				'args' => array('trash' => false, 'all' => true),
 				'noheader' => true
 			),
 			'restore_message_template_context' => array(
@@ -410,7 +410,7 @@ 
 						'filename' => 'messages_overview_other',
 					),
 				),
-				'help_tour' => array( 'Messages_Overview_Help_Tour' ),
+				'help_tour' => array('Messages_Overview_Help_Tour'),
 				'require_nonce' => false
 			),
 			'custom_mtps' => array(
@@ -445,7 +445,7 @@ 
 				),
 				'metaboxes' => array('_publish_post_box', '_register_edit_meta_boxes'),
 				'has_metaboxes' => true,
-				'help_tour' => array( 'Message_Templates_Edit_Help_Tour' ),
+				'help_tour' => array('Message_Templates_Edit_Help_Tour'),
 				'help_tabs' => array(
 					'edit_message_template' => array(
 						'title' => __('Message Template Editor', 'event_espresso'),
@@ -501,7 +501,7 @@ 
 						'filename' => 'messages_settings_messengers'
 					),
 				),
-				'help_tour' => array( 'Messages_Settings_Help_Tour' ),
+				'help_tour' => array('Messages_Settings_Help_Tour'),
 				'require_nonce' => false
 			)
 		);
@@ -534,7 +534,7 @@ 
 
 
 	protected function _add_screen_options_default() {
-		$this->_admin_page_title = __( 'Message Activity', 'event_espresso' );
+		$this->_admin_page_title = __('Message Activity', 'event_espresso');
 		$this->_per_page_screen_option();
 	}
 
@@ -556,37 +556,37 @@ 
 
 
 	public function messages_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_messages_help_tab.template.php');
 	}
 
 
 	public function messengers_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_messenger_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_messenger_help_tab.template.php');
 	}
 
 
 	public function message_types_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_message_type_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_message_type_help_tab.template.php');
 	}
 
 
 	public function messages_overview_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_overview_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_overview_help_tab.template.php');
 	}
 
 
 	public function message_templates_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_message_templates_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_message_templates_help_tab.template.php');
 	}
 
 
 	public function edit_message_template_help_tab() {
-		$args['img1'] = '<img src="' . EE_MSG_ASSETS_URL . 'images/editor.png' . '" alt="' . esc_attr__('Editor Title', 'event_espresso') . '" />';
-		$args['img2'] = '<img src="' . EE_MSG_ASSETS_URL . 'images/switch-context.png' . '" alt="' . esc_attr__('Context Switcher and Preview', 'event_espresso') . '" />';
-		$args['img3'] = '<img class="left" src="' . EE_MSG_ASSETS_URL . 'images/form-fields.png' . '" alt="' . esc_attr__('Message Template Form Fields', 'event_espresso') . '" />';
-		$args['img4'] = '<img class="right" src="' . EE_MSG_ASSETS_URL . 'images/shortcodes-metabox.png' . '" alt="' . esc_attr__('Shortcodes Metabox', 'event_espresso') . '" />';
-		$args['img5'] = '<img class="right" src="' . EE_MSG_ASSETS_URL . 'images/publish-meta-box.png' . '" alt="' . esc_attr__('Publish Metabox', 'event_espresso') . '" />';
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_templates_editor_help_tab.template.php', $args);
+		$args['img1'] = '<img src="'.EE_MSG_ASSETS_URL.'images/editor.png'.'" alt="'.esc_attr__('Editor Title', 'event_espresso').'" />';
+		$args['img2'] = '<img src="'.EE_MSG_ASSETS_URL.'images/switch-context.png'.'" alt="'.esc_attr__('Context Switcher and Preview', 'event_espresso').'" />';
+		$args['img3'] = '<img class="left" src="'.EE_MSG_ASSETS_URL.'images/form-fields.png'.'" alt="'.esc_attr__('Message Template Form Fields', 'event_espresso').'" />';
+		$args['img4'] = '<img class="right" src="'.EE_MSG_ASSETS_URL.'images/shortcodes-metabox.png'.'" alt="'.esc_attr__('Shortcodes Metabox', 'event_espresso').'" />';
+		$args['img5'] = '<img class="right" src="'.EE_MSG_ASSETS_URL.'images/publish-meta-box.png'.'" alt="'.esc_attr__('Publish Metabox', 'event_espresso').'" />';
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_messages_templates_editor_help_tab.template.php', $args);
 	}
 
 
@@ -594,22 +594,22 @@ 
 	public function message_template_shortcodes_help_tab() {
 		$this->_set_shortcodes();
 		$args['shortcodes'] = $this->_shortcodes;
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_shortcodes_help_tab.template.php', $args );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_messages_shortcodes_help_tab.template.php', $args);
 	}
 
 
 
 	public function preview_message_help_tab() {
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_preview_help_tab.template.php' );
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_preview_help_tab.template.php');
 	}
 
 
 	public function settings_help_tab() {
-		$args['img1'] = '<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-active.png' . '" alt="' . esc_attr__('Active Email Tab', 'event_espresso') . '" />';
-		$args['img2'] = '<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-inactive.png' . '" alt="' . esc_attr__('Inactive Email Tab', 'event_espresso') . '" />';
+		$args['img1'] = '<img class="inline-text" src="'.EE_MSG_ASSETS_URL.'images/email-tab-active.png'.'" alt="'.esc_attr__('Active Email Tab', 'event_espresso').'" />';
+		$args['img2'] = '<img class="inline-text" src="'.EE_MSG_ASSETS_URL.'images/email-tab-inactive.png'.'" alt="'.esc_attr__('Inactive Email Tab', 'event_espresso').'" />';
 		$args['img3'] = '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" checked="checked"><label for="ee-on-off-toggle-on"></label>';
 		$args['img4'] = '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox"><label for="ee-on-off-toggle-on"></label>';
-		EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_settings_help_tab.template.php', $args);
+		EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'ee_msg_messages_settings_help_tab.template.php', $args);
 	}
 
 
@@ -617,31 +617,31 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_register_style('espresso_ee_msg', EE_MSG_ASSETS_URL . 'ee_message_admin.css', EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_ee_msg', EE_MSG_ASSETS_URL.'ee_message_admin.css', EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_ee_msg');
 
-		wp_register_script('ee-messages-settings', EE_MSG_ASSETS_URL . 'ee-messages-settings.js', array('jquery-ui-droppable', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, true );
-		wp_register_script( 'ee-msg-list-table-js', EE_MSG_ASSETS_URL. 'ee_message_admin_list_table.js', array( 'ee-dialog' ), EVENT_ESPRESSO_VERSION );
+		wp_register_script('ee-messages-settings', EE_MSG_ASSETS_URL.'ee-messages-settings.js', array('jquery-ui-droppable', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, true);
+		wp_register_script('ee-msg-list-table-js', EE_MSG_ASSETS_URL.'ee_message_admin_list_table.js', array('ee-dialog'), EVENT_ESPRESSO_VERSION);
 	}
 
 
 
 	public function load_scripts_styles_default() {
-		wp_enqueue_script( 'ee-msg-list-table-js' );
+		wp_enqueue_script('ee-msg-list-table-js');
 	}
 
 
 
 
 
-	public function wp_editor_css( $mce_css ) {
+	public function wp_editor_css($mce_css) {
 		//if we're on the edit_message_template route
-		if ( $this->_req_action == 'edit_message_template' && $this->_active_messenger instanceof EE_messenger  ) {
+		if ($this->_req_action == 'edit_message_template' && $this->_active_messenger instanceof EE_messenger) {
 			$message_type_name = $this->_active_message_type_name;
 
 			//we're going to REPLACE the existing mce css
 			//we need to get the css file location from the active messenger
-			$mce_css = $this->_active_messenger->get_variation($this->_template_pack, $message_type_name, true, 'wpeditor', $this->_variation );
+			$mce_css = $this->_active_messenger->get_variation($this->_template_pack, $message_type_name, true, 'wpeditor', $this->_variation);
 		}
 
 		return $mce_css;
@@ -659,15 +659,15 @@ 
 			$this->_message_template_group->messenger_obj()->label['singular'],
 			$this->_message_template_group->message_type_obj()->label['singular']
 		);
-		EE_Registry::$i18n_js_strings['confirm_switch_template_pack'] = __('Switching the template pack for a messages template will reset the content for the template so the new layout is loaded.  Any custom content in the existing template will be lost. Are you sure you wish to do this?', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['confirm_switch_template_pack'] = __('Switching the template pack for a messages template will reset the content for the template so the new layout is loaded.  Any custom content in the existing template will be lost. Are you sure you wish to do this?', 'event_espresso');
 
-		wp_register_script('ee_msgs_edit_js', EE_MSG_ASSETS_URL . 'ee_message_editor.js', array('jquery'), EVENT_ESPRESSO_VERSION );
+		wp_register_script('ee_msgs_edit_js', EE_MSG_ASSETS_URL.'ee_message_editor.js', array('jquery'), EVENT_ESPRESSO_VERSION);
 
 		wp_enqueue_script('ee_admin_js');
 		wp_enqueue_script('ee_msgs_edit_js');
 
 		//add in special css for tiny_mce
-		add_filter( 'mce_css', array( $this, 'wp_editor_css' ) );
+		add_filter('mce_css', array($this, 'wp_editor_css'));
 	}
 
 
@@ -676,22 +676,22 @@ 
 
 		$this->_set_message_template_group();
 
-		if ( isset( $this->_req_data['messenger'] ) ) {
-			$this->_active_messenger = $this->_message_resource_manager->get_active_messenger( $this->_req_data['messenger'] );
+		if (isset($this->_req_data['messenger'])) {
+			$this->_active_messenger = $this->_message_resource_manager->get_active_messenger($this->_req_data['messenger']);
 		}
 
-		$message_type_name = isset( $this->_req_data['message_type'] ) ? $this->_req_data['message_type'] : '';
+		$message_type_name = isset($this->_req_data['message_type']) ? $this->_req_data['message_type'] : '';
 
 
-		wp_enqueue_style('espresso_preview_css', $this->_active_messenger->get_variation( $this->_template_pack, $message_type_name, true, 'preview', $this->_variation ) );
+		wp_enqueue_style('espresso_preview_css', $this->_active_messenger->get_variation($this->_template_pack, $message_type_name, true, 'preview', $this->_variation));
 	}
 
 
 
 	public function load_scripts_styles_settings() {
-		wp_register_style( 'ee-message-settings', EE_MSG_ASSETS_URL . 'ee_message_settings.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'ee-text-links' );
-		wp_enqueue_style( 'ee-message-settings' );
+		wp_register_style('ee-message-settings', EE_MSG_ASSETS_URL.'ee_message_settings.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('ee-text-links');
+		wp_enqueue_style('ee-message-settings');
 
 		wp_enqueue_script('ee-messages-settings');
 	}
@@ -721,40 +721,40 @@ 
 	 * set views array for message queue list table
 	 */
 	public function _set_list_table_views_default() {
-		EE_Registry::instance()->load_helper( 'Template' );
+		EE_Registry::instance()->load_helper('Template');
 
-		$common_bulk_actions = EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'message_list_table_bulk_actions' )
+		$common_bulk_actions = EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'message_list_table_bulk_actions')
 			? array(
-				'generate_now' => __( 'Generate Now', 'event_espresso' ),
-		        'generate_and_send_now' => __( 'Generate and Send Now', 'event_espresso' ),
-		        'queue_for_resending' => __( 'Queue for Resending', 'event_espresso' ),
-		        'send_now' => __( 'Send Now', 'event_espresso' )
+				'generate_now' => __('Generate Now', 'event_espresso'),
+		        'generate_and_send_now' => __('Generate and Send Now', 'event_espresso'),
+		        'queue_for_resending' => __('Queue for Resending', 'event_espresso'),
+		        'send_now' => __('Send Now', 'event_espresso')
 				)
 			: array();
 
-		$delete_bulk_action = EE_Registry::instance()->CAP->current_user_can( 'ee_delete_messages', 'message_list_table_bulk_actions' )
-			? array( 'delete_ee_messages' => __( 'Delete Messages', 'event_espresso' ) )
+		$delete_bulk_action = EE_Registry::instance()->CAP->current_user_can('ee_delete_messages', 'message_list_table_bulk_actions')
+			? array('delete_ee_messages' => __('Delete Messages', 'event_espresso'))
 			: array();
 
 
 		$this->_views = array(
 			 'all' => array(
 			    'slug' => 'all',
-			    'label' => __( 'All', 'event_espresso' ),
+			    'label' => __('All', 'event_espresso'),
 			    'count' => 0,
-			    'bulk_action' => array_merge( $common_bulk_actions, $delete_bulk_action )
+			    'bulk_action' => array_merge($common_bulk_actions, $delete_bulk_action)
 			 )
 		);
 
 
-		foreach ( EEM_Message::instance()->all_statuses() as $status ) {
-			if ( $status === EEM_Message::status_debug_only && ! EEM_Message::debug() ) {
+		foreach (EEM_Message::instance()->all_statuses() as $status) {
+			if ($status === EEM_Message::status_debug_only && ! EEM_Message::debug()) {
 				continue;
 			}
 			$status_bulk_actions = $common_bulk_actions;
 			//unset bulk actions not applying to status
-			if ( ! empty( $status_bulk_actions ) ) {
-				switch ( $status ) {
+			if ( ! empty($status_bulk_actions)) {
+				switch ($status) {
 					case EEM_Message::status_idle :
 					case EEM_Message::status_resend :
 						$status_bulk_actions['send_now'] = $common_bulk_actions['send_now'];
@@ -766,21 +766,21 @@ 
 						break;
 
 					case EEM_Message::status_incomplete :
-						unset( $status_bulk_actions['queue_for_resending'], $status_bulk_actions['send_now'] );
+						unset($status_bulk_actions['queue_for_resending'], $status_bulk_actions['send_now']);
 						break;
 
 					case EEM_Message::status_retry :
 					case EEM_Message::status_sent :
-						unset( $status_bulk_actions['generate_now'], $status_bulk_actions['generate_and_send_now'] );
+						unset($status_bulk_actions['generate_now'], $status_bulk_actions['generate_and_send_now']);
 						break;
 				}
 			}
 
-			$this->_views[ strtolower( $status ) ] = array(
-				'slug' => strtolower( $status ),
-				'label' => EEH_Template::pretty_status( $status, false, 'sentence' ),
+			$this->_views[strtolower($status)] = array(
+				'slug' => strtolower($status),
+				'label' => EEH_Template::pretty_status($status, false, 'sentence'),
 				'count' => 0,
-				'bulk_action' => array_merge( $status_bulk_actions, $delete_bulk_action )
+				'bulk_action' => array_merge($status_bulk_actions, $delete_bulk_action)
 			);
 		}
 	}
@@ -799,8 +799,8 @@ 
 	protected function _message_queue_list_table() {
 		$this->_search_btn_label = __('Message Activity', 'event_espresso');
 		$this->_template_args['per_column'] = 6;
-		$this->_template_args['after_list_table'] = $this->_display_legend( $this->_message_legend_items() );
-		$this->_template_args['before_list_table'] = '<h3>' . EEM_Message::instance()->get_pretty_label_for_results() . '</h3>';
+		$this->_template_args['after_list_table'] = $this->_display_legend($this->_message_legend_items());
+		$this->_template_args['before_list_table'] = '<h3>'.EEM_Message::instance()->get_pretty_label_for_results().'</h3>';
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -813,8 +813,8 @@ 
 		$action_css_classes = EEH_MSG_Template::get_message_action_icons();
 		$action_items = array();
 
-		foreach( $action_css_classes as $action_item => $action_details ) {
-			if ( $action_item === 'see_notifications_for' ) {
+		foreach ($action_css_classes as $action_item => $action_details) {
+			if ($action_item === 'see_notifications_for') {
 				continue;
 			}
 			$action_items[$action_item] = array(
@@ -826,37 +826,37 @@ 
 		/** @type array $status_items status legend setup*/
 		$status_items = array(
 			'sent_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_sent,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_sent, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_sent,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_sent, false, 'sentence')
 				),
 			'idle_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_idle,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_idle, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_idle,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_idle, false, 'sentence')
 				),
 			'failed_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_failed,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_failed, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_failed,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_failed, false, 'sentence')
 			),
 			'resend_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_resend,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_resend, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_resend,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_resend, false, 'sentence')
 				),
 			'incomplete_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_incomplete,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_incomplete, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_incomplete,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_incomplete, false, 'sentence')
 				),
 			'retry_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_retry,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_retry, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_retry,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_retry, false, 'sentence')
 				)
 		);
-		if ( EEM_Message::debug() ) {
+		if (EEM_Message::debug()) {
 			$status_items['debug_only_status'] = array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_debug_only,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_debug_only, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_debug_only,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_debug_only, false, 'sentence')
 			);
 		}
-		return array_merge( $action_items, $status_items );
+		return array_merge($action_items, $status_items);
 	}
 
 
@@ -866,9 +866,9 @@ 
 
 	protected function _custom_mtps_preview() {
 		$this->_admin_page_title = __('Custom Message Templates (Preview)', 'event_espresso');
-		$this->_template_args['preview_img'] = '<img src="' . EE_MSG_ASSETS_URL . 'images/custom_mtps_preview.png" alt="' . esc_attr__('Preview Custom Message Templates screenshot', 'event_espresso' ) . '" />';
+		$this->_template_args['preview_img'] = '<img src="'.EE_MSG_ASSETS_URL.'images/custom_mtps_preview.png" alt="'.esc_attr__('Preview Custom Message Templates screenshot', 'event_espresso').'" />';
 		$this->_template_args['preview_text'] = '<strong>'.__('Custom Message Templates is a feature that is only available in the caffeinated version of Event Espresso.  With the Custom Message Templates feature, you are able to create custom templates and set them per event.', 'event_espresso').'</strong>';
-		$this->display_admin_caf_preview_page( 'custom_message_types', false );
+		$this->display_admin_caf_preview_page('custom_message_types', false);
 	}
 
 
@@ -892,31 +892,31 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_message_templates( $perpage = 10, $type = 'in_use', $count = false, $all = false, $global = true ) {
+	public function get_message_templates($perpage = 10, $type = 'in_use', $count = false, $all = false, $global = true) {
 
 		$MTP = EEM_Message_Template_Group::instance();
 
 		$this->_req_data['orderby'] = empty($this->_req_data['orderby']) ? 'GRP_ID' : $this->_req_data['orderby'];
 		$orderby = $this->_req_data['orderby'];
 
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] ) ) ? $this->_req_data['order'] : 'ASC';
+		$order = (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( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $perpage;
+		$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'] : $perpage;
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = $all ? null : array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $all ? null : array($offset, $per_page);
 
 
 		//options will match what is in the _views array property
-		switch( $type ) {
+		switch ($type) {
 
 			case 'in_use':
-				$templates = $MTP->get_all_active_message_templates($orderby, $order, $limit, $count, $global, true );
+				$templates = $MTP->get_all_active_message_templates($orderby, $order, $limit, $count, $global, true);
 				break;
 
 			default:
-				$templates = $MTP->get_all_trashed_grouped_message_templates($orderby, $order, $limit, $count, $global );
+				$templates = $MTP->get_all_trashed_grouped_message_templates($orderby, $order, $limit, $count, $global);
 
 		}
 
@@ -935,8 +935,8 @@ 
 		$installed_message_types = $this->_message_resource_manager->installed_message_types();
 		$installed = array();
 
-		foreach ( $installed_message_types as $message_type ) {
-			$installed[ $message_type->name ] = $message_type;
+		foreach ($installed_message_types as $message_type) {
+			$installed[$message_type->name] = $message_type;
 		}
 
 		return $installed;
@@ -955,24 +955,24 @@ 
 	 *
 	 * @throws EE_error
 	 */
-	protected function _add_message_template(  $message_type = '', $messenger='', $GRP_ID = '' ) {
+	protected function _add_message_template($message_type = '', $messenger = '', $GRP_ID = '') {
 		//set values override any request data
-		$message_type = !empty( $message_type ) ? $message_type : '';
-		$message_type = empty( $message_type ) && !empty( $this->_req_data['message_type'] ) ? $this->_req_data['message_type'] : $message_type;
+		$message_type = ! empty($message_type) ? $message_type : '';
+		$message_type = empty($message_type) && ! empty($this->_req_data['message_type']) ? $this->_req_data['message_type'] : $message_type;
 
-		$messenger = !empty( $messenger ) ? $messenger : '';
-		$messenger = empty( $messenger ) && !empty( $this->_req_data['messenger'] ) ? $this->_req_data['messenger'] : $messenger;
+		$messenger = ! empty($messenger) ? $messenger : '';
+		$messenger = empty($messenger) && ! empty($this->_req_data['messenger']) ? $this->_req_data['messenger'] : $messenger;
 
-		$GRP_ID = !empty( $GRP_ID ) ? $GRP_ID : '';
-		$GRP_ID = empty( $GRP_ID ) && !empty( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : $GRP_ID;
+		$GRP_ID = ! empty($GRP_ID) ? $GRP_ID : '';
+		$GRP_ID = empty($GRP_ID) && ! empty($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : $GRP_ID;
 
 		//we need messenger and message type.  They should be coming from the event editor. If not here then return error
-		if ( empty( $message_type ) || empty( $messenger )  )
-			{throw new EE_error(__('Sorry, but we can\'t create new templates because we\'re missing the messenger or message type', 'event_espresso'));}
+		if (empty($message_type) || empty($messenger))
+			{throw new EE_error(__('Sorry, but we can\'t create new templates because we\'re missing the messenger or message type', 'event_espresso')); }
 
 		//we need the GRP_ID for the template being used as the base for the new template
-		if ( empty( $GRP_ID ) )
-			{throw new EE_Error( __('In order to create a custom message template the GRP_ID of the template being used as a base is needed', 'event_espresso' ) );}
+		if (empty($GRP_ID))
+			{throw new EE_Error(__('In order to create a custom message template the GRP_ID of the template being used as a base is needed', 'event_espresso')); }
 
 		//let's just make sure the template gets generated!
 
@@ -993,8 +993,8 @@ 
 	 * @param int      $GRP_ID         GRP_ID for the related message template group this new template will be based
 	 *                                 off of.
 	 */
-	public function add_message_template( $message_type, $messenger, $GRP_ID ) {
-		$this->_add_message_template( $message_type, $messenger, $GRP_ID );
+	public function add_message_template($message_type, $messenger, $GRP_ID) {
+		$this->_add_message_template($message_type, $messenger, $GRP_ID);
 	}
 
 
@@ -1005,14 +1005,14 @@ 
 	 * @return void
 	 */
 	protected function _edit_message_template() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$template_fields = '';
 		$sidebar_fields = '';
 		//we filter the tinyMCE settings to remove the validation since message templates by their nature will not have valid html in the templates.
-		add_filter( 'tiny_mce_before_init', array( $this, 'filter_tinymce_init'), 10, 2 );
+		add_filter('tiny_mce_before_init', array($this, 'filter_tinymce_init'), 10, 2);
 
-		$GRP_ID = isset( $this->_req_data['id'] ) && !empty( $this->_req_data['id'] )
-			? absint( $this->_req_data['id'] )
+		$GRP_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id'])
+			? absint($this->_req_data['id'])
 			: false;
 
 		$this->_set_shortcodes(); //this also sets the _message_template property.
@@ -1020,20 +1020,20 @@ 
 		$c_label = $message_template_group->context_label();
 		$c_config = $message_template_group->contexts_config();
 
-		reset( $c_config );
-		$context = isset( $this->_req_data['context']) && !empty($this->_req_data['context'] )
+		reset($c_config);
+		$context = isset($this->_req_data['context']) && ! empty($this->_req_data['context'])
 			? strtolower($this->_req_data['context'])
 			: key($c_config);
 
 
-		if ( empty($GRP_ID) ) {
+		if (empty($GRP_ID)) {
 			$action = 'insert_message_template';
 			//$button_both = false;
 			//$button_text = array( __( 'Save','event_espresso') );
 			//$button_actions = array('something_different');
 			//$referrer = false;
 			$edit_message_template_form_url = add_query_arg(
-				array( 'action' => $action, 'noheader' => true ),
+				array('action' => $action, 'noheader' => true),
 				EE_MSG_ADMIN_URL
 			);
 		} else {
@@ -1043,7 +1043,7 @@ 
 			//$button_actions = array();
 			//$referrer = $this->_admin_base_url;
 			$edit_message_template_form_url = add_query_arg(
-				array( 'action' => $action, 'noheader' => true ),
+				array('action' => $action, 'noheader' => true),
 				EE_MSG_ADMIN_URL
 			);
 		}
@@ -1057,14 +1057,14 @@ 
 
 		//Do we have any validation errors?
 		$validators = $this->_get_transient();
-		$v_fields = !empty($validators) ? array_keys($validators) : array();
+		$v_fields = ! empty($validators) ? array_keys($validators) : array();
 
 
 		//we need to assemble the title from Various details
 		$context_label = sprintf(
 			__('(%s %s)', 'event_espresso'),
 			$c_config[$context]['label'],
-			ucwords($c_label['label'] )
+			ucwords($c_label['label'])
 		);
 
 		$title = sprintf(
@@ -1085,7 +1085,7 @@ 
 			$message_template_group->message_type()
 		);
 
-		if ( !$template_field_structure ) {
+		if ( ! $template_field_structure) {
 			$template_field_structure = false;
 			$template_fields = __('There was an error in assembling the fields for this display (you should see an error message)', 'event_espresso');
 		}
@@ -1095,51 +1095,51 @@ 
 
 
 		//if we have the extra key.. then we need to remove the content index from the template_field_structure as it will get handled in the "extra" array.
-		if ( is_array($template_field_structure[$context]) && isset( $template_field_structure[$context]['extra']) ) {
-			foreach ( $template_field_structure[$context]['extra'] as $reference_field => $new_fields ) {
-				unset( $template_field_structure[$context][$reference_field] );
+		if (is_array($template_field_structure[$context]) && isset($template_field_structure[$context]['extra'])) {
+			foreach ($template_field_structure[$context]['extra'] as $reference_field => $new_fields) {
+				unset($template_field_structure[$context][$reference_field]);
 			}
 		}
 
 		//let's loop through the template_field_structure and actually assemble the input fields!
-		if ( !empty($template_field_structure) ) {
-			foreach ( $template_field_structure[$context] as $template_field => $field_setup_array ) {
+		if ( ! empty($template_field_structure)) {
+			foreach ($template_field_structure[$context] as $template_field => $field_setup_array) {
 				//if this is an 'extra' template field then we need to remove any existing fields that are keyed up in the extra array and reset them.
-				if ( $template_field == 'extra' ) {
+				if ($template_field == 'extra') {
 					$this->_template_args['is_extra_fields'] = true;
-					foreach ( $field_setup_array as $reference_field => $new_fields_array ) {
-						$message_template = $message_templates[ $context ][ $reference_field ];
+					foreach ($field_setup_array as $reference_field => $new_fields_array) {
+						$message_template = $message_templates[$context][$reference_field];
 						$content = $message_template instanceof EE_Message_Template
-							? $message_template->get( 'MTP_content' )
+							? $message_template->get('MTP_content')
 							: '';
-						foreach ( $new_fields_array as $extra_field =>  $extra_array ) {
+						foreach ($new_fields_array as $extra_field =>  $extra_array) {
 							//let's verify if we need this extra field via the shortcodes parameter.
 							$continue = false;
-							if ( isset( $extra_array['shortcodes_required'] ) ) {
-								foreach ( (array) $extra_array['shortcodes_required'] as $shortcode ) {
-									if ( !array_key_exists( $shortcode, $this->_shortcodes ) )
-										{$continue = true;}
+							if (isset($extra_array['shortcodes_required'])) {
+								foreach ((array) $extra_array['shortcodes_required'] as $shortcode) {
+									if ( ! array_key_exists($shortcode, $this->_shortcodes))
+										{$continue = true; }
 								}
-								if ( $continue ) {continue;}
+								if ($continue) {continue; }
 							}
 
-							$field_id = $reference_field . '-' . $extra_field . '-content';
+							$field_id = $reference_field.'-'.$extra_field.'-content';
 							$template_form_fields[$field_id] = $extra_array;
-							$template_form_fields[$field_id]['name'] = 'MTP_template_fields[' . $reference_field . '][content][' . $extra_field . ']';
-							$css_class = isset( $extra_array['css_class'] ) ? $extra_array['css_class'] : '';
+							$template_form_fields[$field_id]['name'] = 'MTP_template_fields['.$reference_field.'][content]['.$extra_field.']';
+							$css_class = isset($extra_array['css_class']) ? $extra_array['css_class'] : '';
 
-							$template_form_fields[$field_id]['css_class'] = ! empty( $v_fields )
+							$template_form_fields[$field_id]['css_class'] = ! empty($v_fields)
 																			&& in_array($extra_field, $v_fields)
 																			&&
 																			(
-								                                                is_array($validators[$extra_field] )
-																				&& isset( $validators[$extra_field]['msg'] )
+								                                                is_array($validators[$extra_field])
+																				&& isset($validators[$extra_field]['msg'])
 							                                                )
-								? 'validate-error ' . $css_class
+								? 'validate-error '.$css_class
 								: $css_class;
 
-							$template_form_fields[$field_id]['value'] = !empty($message_templates) && isset($content[$extra_field])
-								? stripslashes( html_entity_decode( $content[$extra_field], ENT_QUOTES, "UTF-8") )
+							$template_form_fields[$field_id]['value'] = ! empty($message_templates) && isset($content[$extra_field])
+								? stripslashes(html_entity_decode($content[$extra_field], ENT_QUOTES, "UTF-8"))
 								: '';
 
 							//do we have a validation error?  if we do then let's use that value instead
@@ -1155,32 +1155,32 @@ 
 								$field_id
 							);
 
-							if ( isset( $extra_array['input'] ) && $extra_array['input'] == 'wp_editor' ) {
+							if (isset($extra_array['input']) && $extra_array['input'] == 'wp_editor') {
 								//we want to decode the entities
 								$template_form_fields[$field_id]['value'] = stripslashes(
-									html_entity_decode( $template_form_fields[$field_id]['value'], ENT_QUOTES, "UTF-8")
+									html_entity_decode($template_form_fields[$field_id]['value'], ENT_QUOTES, "UTF-8")
 								);
 
 							}/**/
 						}
-						$templatefield_MTP_id = $reference_field . '-MTP_ID';
-						$templatefield_templatename_id = $reference_field . '-name';
+						$templatefield_MTP_id = $reference_field.'-MTP_ID';
+						$templatefield_templatename_id = $reference_field.'-name';
 
 						$template_form_fields[$templatefield_MTP_id] = array(
-							'name' => 'MTP_template_fields[' . $reference_field . '][MTP_ID]',
+							'name' => 'MTP_template_fields['.$reference_field.'][MTP_ID]',
 							'label' => null,
 							'input' => 'hidden',
 							'type' => 'int',
 							'required' => false,
 							'validation' => false,
-							'value' => !empty($message_templates) ? $message_template->ID() : '',
+							'value' => ! empty($message_templates) ? $message_template->ID() : '',
 							'css_class' => '',
 							'format' => '%d',
 							'db-col' => 'MTP_ID'
 						);
 
 						$template_form_fields[$templatefield_templatename_id] = array(
-							'name' => 'MTP_template_fields[' . $reference_field . '][name]',
+							'name' => 'MTP_template_fields['.$reference_field.'][name]',
 							'label' => null,
 							'input' => 'hidden',
 							'type' => 'string',
@@ -1194,14 +1194,14 @@ 
 					}
 					continue; //skip the next stuff, we got the necessary fields here for this dataset.
 				} else {
-					$field_id = $template_field . '-content';
+					$field_id = $template_field.'-content';
 					$template_form_fields[$field_id] = $field_setup_array;
-					$template_form_fields[$field_id]['name'] = 'MTP_template_fields[' . $template_field . '][content]';
-					$message_template = isset( $message_templates[ $context ][ $template_field ] )
-						? $message_templates[ $context ][ $template_field ]
+					$template_form_fields[$field_id]['name'] = 'MTP_template_fields['.$template_field.'][content]';
+					$message_template = isset($message_templates[$context][$template_field])
+						? $message_templates[$context][$template_field]
 						: null;
-					$template_form_fields[$field_id]['value'] = ! empty( $message_templates )
-																&& is_array( $message_templates[$context] )
+					$template_form_fields[$field_id]['value'] = ! empty($message_templates)
+																&& is_array($message_templates[$context])
 																&& $message_template instanceof EE_Message_Template
 						? $message_template->get('MTP_content')
 						: '';
@@ -1214,10 +1214,10 @@ 
 
 					$template_form_fields[$field_id]['db-col'] = 'MTP_content';
 					$css_class = isset($field_setup_array['css_class']) ? $field_setup_array['css_class'] : '';
-					$template_form_fields[$field_id]['css_class'] =  ! empty( $v_fields )
-																	 && in_array( $template_field, $v_fields )
-																	 && isset( $validators[$template_field]['msg'] )
-						? 'validate-error ' . $css_class
+					$template_form_fields[$field_id]['css_class'] = ! empty($v_fields)
+																	 && in_array($template_field, $v_fields)
+																	 && isset($validators[$template_field]['msg'])
+						? 'validate-error '.$css_class
 						: $css_class;
 
 					//shortcode selector
@@ -1228,12 +1228,12 @@ 
 
 				//k took care of content field(s) now let's take care of others.
 
-				$templatefield_MTP_id = $template_field . '-MTP_ID';
-				$templatefield_field_templatename_id = $template_field . '-name';
+				$templatefield_MTP_id = $template_field.'-MTP_ID';
+				$templatefield_field_templatename_id = $template_field.'-name';
 
 				//foreach template field there are actually two form fields created
 				$template_form_fields[$templatefield_MTP_id] = array(
-					'name' => 'MTP_template_fields[' . $template_field . '][MTP_ID]',
+					'name' => 'MTP_template_fields['.$template_field.'][MTP_ID]',
 					'label' => null,
 					'input' => 'hidden',
 					'type' => 'int',
@@ -1246,7 +1246,7 @@ 
 				);
 
 				$template_form_fields[$templatefield_field_templatename_id] = array(
-					'name' => 'MTP_template_fields[' . $template_field . '][name]',
+					'name' => 'MTP_template_fields['.$template_field.'][name]',
 					'label' => null,
 					'input' => 'hidden',
 					'type' => 'string',
@@ -1390,13 +1390,13 @@ 
 				'value' => $GRP_ID
 				);
 			$sidebar_form_fields['ee-msg-evt-nonce'] = array(
-				'name' => $action . '_nonce',
+				'name' => $action.'_nonce',
 				'input' => 'hidden',
 				'type' => 'string',
-				'value' => wp_create_nonce( $action . '_nonce')
+				'value' => wp_create_nonce($action.'_nonce')
 				);
 
-			if ( isset($this->_req_data['template_switch']) && $this->_req_data['template_switch'] ) {
+			if (isset($this->_req_data['template_switch']) && $this->_req_data['template_switch']) {
 				$sidebar_form_fields['ee-msg-template-switch'] = array(
 					'name' => 'template_switch',
 					'input' => 'hidden',
@@ -1406,8 +1406,8 @@ 
 			}
 
 
-			$template_fields = $this->_generate_admin_form_fields( $template_form_fields );
-			$sidebar_fields = $this->_generate_admin_form_fields( $sidebar_form_fields );
+			$template_fields = $this->_generate_admin_form_fields($template_form_fields);
+			$sidebar_fields = $this->_generate_admin_form_fields($sidebar_form_fields);
 
 
 		} //end if ( !empty($template_field_structure) )
@@ -1419,7 +1419,7 @@ 
 			 $GRP_ID,
 			 false,
 			 add_query_arg(
-			    array( 'action' => 'global_mtps' ),
+			    array('action' => 'global_mtps'),
 			    $this->_admin_base_url
 			 )
 		);
@@ -1435,7 +1435,7 @@ 
 			),
 			$this->_admin_base_url
 		);
-		$preview_button = '<a href="' . $preview_url . '" class="button-secondary messages-preview-button">' . __('Preview', 'event_espresso') . '</a>';
+		$preview_button = '<a href="'.$preview_url.'" class="button-secondary messages-preview-button">'.__('Preview', 'event_espresso').'</a>';
 
 
 		//setup context switcher
@@ -1463,17 +1463,17 @@ 
 		$this->_template_args['after_admin_page_content'] = $this->_add_form_element_after();
 
 		$this->_template_path = $this->_template_args['GRP_ID']
-			? EE_MSG_TEMPLATE_PATH . 'ee_msg_details_main_edit_meta_box.template.php'
-			: EE_MSG_TEMPLATE_PATH . 'ee_msg_details_main_add_meta_box.template.php';
+			? EE_MSG_TEMPLATE_PATH.'ee_msg_details_main_edit_meta_box.template.php'
+			: EE_MSG_TEMPLATE_PATH.'ee_msg_details_main_add_meta_box.template.php';
 
 		//send along EE_Message_Template_Group object for further template use.
 		$this->_template_args['MTP'] = $message_template_group;
 
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $this->_template_path, $this->_template_args, true );
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, true);
 
 
 		//finally, let's set the admin_page title
-		$this->_admin_page_title = sprintf( __('Editing %s', 'event_espresso'), $title );
+		$this->_admin_page_title = sprintf(__('Editing %s', 'event_espresso'), $title);
 
 
 		//we need to take care of setting the shortcodes property for use elsewhere.
@@ -1486,7 +1486,7 @@ 
 	}
 
 
-	public function filter_tinymce_init( $mceInit, $editor_id ) {
+	public function filter_tinymce_init($mceInit, $editor_id) {
 		return $mceInit;
 	}
 
@@ -1497,7 +1497,7 @@ 
 	}
 
 	public function _add_form_element_before() {
-		return '<form method="post" action="' . $this->_template_args["edit_message_template_form_url"] . '" id="ee-msg-edit-frm">';
+		return '<form method="post" action="'.$this->_template_args["edit_message_template_form_url"].'" id="ee-msg-edit-frm">';
 	}
 
 	public function _add_form_element_after() {
@@ -1514,25 +1514,25 @@ 
 	 *
 	 */
 	public function switch_template_pack() {
-		$GRP_ID = ! empty( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : 0;
-		$template_pack = ! empty( $this->_req_data['template_pack'] ) ? $this->_req_data['template_pack'] : '';
+		$GRP_ID = ! empty($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : 0;
+		$template_pack = ! empty($this->_req_data['template_pack']) ? $this->_req_data['template_pack'] : '';
 
 		//verify we have needed values.
-		if ( empty( $GRP_ID ) || empty( $template_pack ) ) {
+		if (empty($GRP_ID) || empty($template_pack)) {
 			$this->_template_args['error'] = true;
-			EE_Error::add_error( __('The required date for switching templates is not available.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__  );
+			EE_Error::add_error(__('The required date for switching templates is not available.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			//get template, set the new template_pack and then reset to default
 			/** @type EE_Message_Template_Group $message_template_group */
-			$message_template_group = EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
+			$message_template_group = EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
 
-			$message_template_group->set_template_pack_name( $template_pack );
+			$message_template_group->set_template_pack_name($template_pack);
 			$this->_req_data['msgr'] = $message_template_group->messenger();
 			$this->_req_data['mt'] = $message_template_group->message_type();
 
 			$query_args = $this->_reset_to_default_template();
 
-			if ( empty( $query_args['id'] ) ) {
+			if (empty($query_args['id'])) {
 				EE_Error::add_error(
 					__(
 						'Something went wrong with switching the template pack. Please try again or contact EE support',
@@ -1542,7 +1542,7 @@ 
 				);
 				$this->_template_args['error'] = true;
 			} else {
-				$template_label =$message_template_group->get_template_pack()->label;
+				$template_label = $message_template_group->get_template_pack()->label;
 				$template_pack_labels = $message_template_group->messenger_obj()->get_supports_labels();
 				EE_Error::add_success(
 					sprintf(
@@ -1555,7 +1555,7 @@ 
 					)
 				);
 				//generate the redirect url for js.
-				$url = self::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
+				$url = self::add_query_args_and_nonce($query_args, $this->_admin_base_url);
 				$this->_template_args['data']['redirect_url'] = $url;
 				$this->_template_args['success'] = true;
 			}
@@ -1577,9 +1577,9 @@ 
 	protected function _reset_to_default_template() {
 
 		$templates = array();
-		$GRP_ID = !empty( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : 0;
+		$GRP_ID = ! empty($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : 0;
 		//we need to make sure we've got the info we need.
-		if ( ! isset( $this->_req_data['msgr'], $this->_req_data['mt'], $this->_req_data['GRP_ID'] ) ) {
+		if ( ! isset($this->_req_data['msgr'], $this->_req_data['mt'], $this->_req_data['GRP_ID'])) {
 			EE_Error::add_error(
 				__(
 					'In order to reset the template to its default we require the messenger, message type, and message template GRP_ID to know what is being reset.  At least one of these is missing.',
@@ -1591,9 +1591,9 @@ 
 
 		// all templates will be reset to whatever the defaults are
 		// for the global template matching the messenger and message type.
-		$success = !empty( $GRP_ID ) ? true : false;
+		$success = ! empty($GRP_ID) ? true : false;
 
-		if ( $success ) {
+		if ($success) {
 
 			//let's first determine if the incoming template is a global template,
 			// if it isn't then we need to get the global template matching messenger and message type.
@@ -1601,9 +1601,9 @@ 
 
 
 			//note this is ONLY deleting the template fields (Message Template rows) NOT the message template group.
-			$success = $this->_delete_mtp_permanently( $GRP_ID, false );
+			$success = $this->_delete_mtp_permanently($GRP_ID, false);
 
-			if ( $success ) {
+			if ($success) {
 				// if successfully deleted, lets generate the new ones.
 				// Note. We set GLOBAL to true, because resets on ANY template
 				// will use the related global template defaults for regeneration.
@@ -1621,32 +1621,32 @@ 
 		}
 
 		//any error messages?
-		if ( !$success ) {
+		if ( ! $success) {
 			EE_Error::add_error(
-				__( 'Something went wrong with deleting existing templates. Unable to reset to default', 'event_espresso' ),
+				__('Something went wrong with deleting existing templates. Unable to reset to default', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
 
 		//all good, let's add a success message!
-		if ( $success && ! empty( $templates ) ) {
+		if ($success && ! empty($templates)) {
 			$templates = $templates[0]; //the info for the template we generated is the first element in the returned array.
 			EE_Error::overwrite_success();
-			EE_Error::add_success( __('Templates have been reset to defaults.', 'event_espresso') );
+			EE_Error::add_success(__('Templates have been reset to defaults.', 'event_espresso'));
 		}
 
 
 		$query_args = array(
-			'id' => isset( $templates['GRP_ID'] ) ? $templates['GRP_ID'] : null,
-			'context' => isset( $templates['MTP_context'] ) ? $templates['MTP_context'] : null,
-			'action' => isset( $templates['GRP_ID'] ) ? 'edit_message_template' : 'global_mtps'
+			'id' => isset($templates['GRP_ID']) ? $templates['GRP_ID'] : null,
+			'context' => isset($templates['MTP_context']) ? $templates['MTP_context'] : null,
+			'action' => isset($templates['GRP_ID']) ? 'edit_message_template' : 'global_mtps'
 			);
 
 		//if called via ajax then we return query args otherwise redirect
-		if ( defined('DOING_AJAX') && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			return $query_args;
 		} else {
-			$this->_redirect_after_action( false, '', '', $query_args, true );
+			$this->_redirect_after_action(false, '', '', $query_args, true);
 			return null;
 		}
 	}
@@ -1659,7 +1659,7 @@ 
 	 * @param bool $send if TRUE then we are doing an actual TEST send with the results of the preview.
 	 * @return string
 	 */
-	public function _preview_message( $send = false ) {
+	public function _preview_message($send = false) {
 		//first make sure we've got the necessary parameters
 		if (
 			! isset(
@@ -1675,13 +1675,13 @@ 
 			);
 		}
 
-		EE_Registry::instance()->REQ->set( 'GRP_ID', $this->_req_data['GRP_ID'] );
+		EE_Registry::instance()->REQ->set('GRP_ID', $this->_req_data['GRP_ID']);
 
 
 		//get the preview!
-		$preview = EED_Messages::preview_message( $this->_req_data['message_type'], $this->_req_data['context'], $this->_req_data['messenger'], $send );
+		$preview = EED_Messages::preview_message($this->_req_data['message_type'], $this->_req_data['context'], $this->_req_data['messenger'], $send);
 
-		if ( $send ) {
+		if ($send) {
 			return $preview;
 		}
 
@@ -1691,22 +1691,22 @@ 
 			'context' => $this->_req_data['context'],
 			'action' => 'edit_message_template'
 			);
-		$go_back_url = parent::add_query_args_and_nonce( $query_args, $this->_admin_base_url );
-		$preview_button = '<a href="' . $go_back_url . '" class="button-secondary messages-preview-go-back-button">' . __('Go Back to Edit', 'event_espresso') . '</a>';
+		$go_back_url = parent::add_query_args_and_nonce($query_args, $this->_admin_base_url);
+		$preview_button = '<a href="'.$go_back_url.'" class="button-secondary messages-preview-go-back-button">'.__('Go Back to Edit', 'event_espresso').'</a>';
 		$message_types = $this->get_installed_message_types();
-		$active_messenger = $this->_message_resource_manager->get_active_messenger( $this->_req_data['messenger'] );
+		$active_messenger = $this->_message_resource_manager->get_active_messenger($this->_req_data['messenger']);
 		$active_messenger_label = $active_messenger instanceof EE_messenger
-			? ucwords( $active_messenger->label['singular'] )
-			: esc_html__( 'Unknown Messenger', 'event_espresso' );
+			? ucwords($active_messenger->label['singular'])
+			: esc_html__('Unknown Messenger', 'event_espresso');
 		//let's provide a helpful title for context
 		$preview_title = sprintf(
-			__( 'Viewing Preview for %s %s Message Template', 'event_espresso' ),
+			__('Viewing Preview for %s %s Message Template', 'event_espresso'),
 			$active_messenger_label,
-			ucwords( $message_types[ $this->_req_data[ 'message_type' ] ]->label[ 'singular' ] )
+			ucwords($message_types[$this->_req_data['message_type']]->label['singular'])
 		);
 		//setup display of preview.
 		$this->_admin_page_title = $preview_title;
-		$this->_template_args['admin_page_content'] = $preview_button . '<br />' .stripslashes($preview);
+		$this->_template_args['admin_page_content'] = $preview_button.'<br />'.stripslashes($preview);
 		$this->_template_args['data']['force_json'] = true;
 		return '';
 	}
@@ -1736,9 +1736,9 @@ 
 	 * @return void
 	 */
 	protected function _register_edit_meta_boxes() {
-		add_meta_box( 'mtp_valid_shortcodes', __('Valid Shortcodes', 'event_espresso'), array( $this, 'shortcode_meta_box' ), $this->_current_screen->id, 'side', 'default' );
-		add_meta_box( 'mtp_extra_actions', __('Extra Actions', 'event_espresso'), array( $this, 'extra_actions_meta_box' ), $this->_current_screen->id, 'side', 'high' );
-		add_meta_box( 'mtp_templates', __('Template Styles', 'event_espresso'), array( $this, 'template_pack_meta_box' ), $this->_current_screen->id, 'side', 'high' );
+		add_meta_box('mtp_valid_shortcodes', __('Valid Shortcodes', 'event_espresso'), array($this, 'shortcode_meta_box'), $this->_current_screen->id, 'side', 'default');
+		add_meta_box('mtp_extra_actions', __('Extra Actions', 'event_espresso'), array($this, 'extra_actions_meta_box'), $this->_current_screen->id, 'side', 'high');
+		add_meta_box('mtp_templates', __('Template Styles', 'event_espresso'), array($this, 'template_pack_meta_box'), $this->_current_screen->id, 'side', 'high');
 	}
 
 
@@ -1757,14 +1757,14 @@ 
 
 		$tp_select_values = array();
 
-		foreach ( $tp_collection as $tp ) {
+		foreach ($tp_collection as $tp) {
 			//only include template packs that support this messenger and message type!
 			$supports = $tp->get_supports();
 			if (
-				! isset( $supports[ $this->_message_template_group->messenger() ] )
+				! isset($supports[$this->_message_template_group->messenger()])
 				|| ! in_array(
 					$this->_message_template_group->message_type(),
-					$supports[ $this->_message_template_group->messenger() ]
+					$supports[$this->_message_template_group->messenger()]
 				)
 			) {
 				//not supported
@@ -1778,7 +1778,7 @@ 
 		}
 
 		//if empty $tp_select_values then we make sure default is set because EVERY message type should be supported by the default template pack.  This still allows for the odd template pack to override.
-		if ( empty( $tp_select_values ) ) {
+		if (empty($tp_select_values)) {
 			$tp_select_values[] = array(
 				'text' => __('Default', 'event_espresso'),
 				'id' => 'default'
@@ -1791,14 +1791,14 @@ 
 			$this->_message_template_group->message_type()
 		);
 		$variations_select_values = array();
-		foreach ( $variations as $variation => $label ) {
+		foreach ($variations as $variation => $label) {
 			$variations_select_values[] = array(
 				'text' => $label,
 				'id' => $variation
 			);
 		}
 
-		$template_pack_labels= $this->_message_template_group->messenger_obj()->get_supports_labels();
+		$template_pack_labels = $this->_message_template_group->messenger_obj()->get_supports_labels();
 
 		$template_args['template_packs_selector'] = EEH_Form_Fields::select_input(
 			'MTP_template_pack',
@@ -1815,9 +1815,9 @@ 
 		$template_args['template_pack_description'] = $template_pack_labels->template_pack_description;
 		$template_args['template_variation_description'] = $template_pack_labels->template_variation_description;
 
-		$template = EE_MSG_TEMPLATE_PATH . 'template_pack_and_variations_metabox.template.php';
+		$template = EE_MSG_TEMPLATE_PATH.'template_pack_and_variations_metabox.template.php';
 
-		EEH_Template::display_template( $template, $template_args );
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -1848,47 +1848,47 @@ 
 		//first we need to see if there are any fields
 		$fields = $this->_message_template_group->messenger_obj()->get_test_settings_fields();
 
-		if ( !empty( $fields ) ) {
+		if ( ! empty($fields)) {
 			//yup there be fields
-			foreach ( $fields as $field => $config ) {
-				$field_id = $this->_message_template_group->messenger() . '_' . $field;
+			foreach ($fields as $field => $config) {
+				$field_id = $this->_message_template_group->messenger().'_'.$field;
 				$existing = $this->_message_template_group->messenger_obj()->get_existing_test_settings();
-				$default = isset( $config['default'] ) ? $config['default'] : '';
-				$default = isset( $config['value'] ) ? $config['value'] : $default;
+				$default = isset($config['default']) ? $config['default'] : '';
+				$default = isset($config['value']) ? $config['value'] : $default;
 
 				//if type is hidden and the value is empty something may have gone wrong so let's correct with the defaults
 				$fix = $config['input'] == 'hidden' && isset($existing[$field]) && empty($existing[$field]) ? $default : '';
-				$existing[$field] = isset( $existing[$field] ) && empty( $fix ) ? $existing[$field] : $fix;
+				$existing[$field] = isset($existing[$field]) && empty($fix) ? $existing[$field] : $fix;
 
 				$template_form_fields[$field_id] = array(
-					'name' => 'test_settings_fld[' . $field . ']',
+					'name' => 'test_settings_fld['.$field.']',
 					'label' => $config['label'],
 					'input' => $config['input'],
 					'type' => $config['type'],
 					'required' => $config['required'],
 					'validation' => $config['validation'],
-					'value' => isset( $existing[$field] ) ? $existing[$field] : $default,
+					'value' => isset($existing[$field]) ? $existing[$field] : $default,
 					'css_class' => $config['css_class'],
-					'options' => isset( $config['options'] ) ? $config['options'] : array(),
+					'options' => isset($config['options']) ? $config['options'] : array(),
 					'default' => $default,
 					'format' => $config['format']
 					);
 			}
 		}
 
-		$test_settings_fields = !empty( $template_form_fields)
-			? $this->_generate_admin_form_fields( $template_form_fields, 'string', 'ee_tst_settings_flds' )
+		$test_settings_fields = ! empty($template_form_fields)
+			? $this->_generate_admin_form_fields($template_form_fields, 'string', 'ee_tst_settings_flds')
 			: '';
 
 		$test_settings_html = '';
 		//print out $test_settings_fields
-		if ( !empty( $test_settings_fields ) ) {
+		if ( ! empty($test_settings_fields)) {
 			echo $test_settings_fields;
-			$test_settings_html = '<input type="submit" class="button-primary mtp-test-button alignright" name="test_button" value="' . __('Test Send', 'event_espresso') . '" /><div style="clear:both"></div>';
+			$test_settings_html = '<input type="submit" class="button-primary mtp-test-button alignright" name="test_button" value="'.__('Test Send', 'event_espresso').'" /><div style="clear:both"></div>';
 		}
 
 		//and button
-		echo $test_settings_html . '<p>' . __('Need to reset this message type and start over?', 'event_espresso') . '</p>' . '<div class="publishing-action alignright resetbutton">' . $button . '</div><div style="clear:both"></div>';
+		echo $test_settings_html.'<p>'.__('Need to reset this message type and start over?', 'event_espresso').'</p>'.'<div class="publishing-action alignright resetbutton">'.$button.'</div><div style="clear:both"></div>';
 	}
 
 
@@ -1903,13 +1903,13 @@ 
      * @param string $linked_input_id The css id of the input that the shortcodes get added to.
      * @return string
     */
-	protected function _get_shortcode_selector( $field, $linked_input_id ) {
+	protected function _get_shortcode_selector($field, $linked_input_id) {
 		$template_args = array(
-			'shortcodes' => $this->_get_shortcodes( array( $field ), true ),
+			'shortcodes' => $this->_get_shortcodes(array($field), true),
 			'fieldname' => $field,
 			'linked_input_id' => $linked_input_id
 		);
-		return EEH_Template::display_template( EE_MSG_TEMPLATE_PATH . 'shortcode_selector_skeleton.template.php', $template_args, true );
+		return EEH_Template::display_template(EE_MSG_TEMPLATE_PATH.'shortcode_selector_skeleton.template.php', $template_args, true);
 	}
 
 
@@ -1924,13 +1924,13 @@ 
 		$shortcodes = $this->_get_shortcodes(array(), false); //just make sure shortcodes property is set
 		//$messenger = $this->_message_template_group->messenger_obj();
 		//now let's set the content depending on the status of the shortcodes array
-		if ( empty( $shortcodes ) ) {
-			$content = '<p>' . __('There are no valid shortcodes available', 'event_espresso') . '</p>';
+		if (empty($shortcodes)) {
+			$content = '<p>'.__('There are no valid shortcodes available', 'event_espresso').'</p>';
 			echo $content;
 		} else {
 			//$alt = 0;
 			?>
-			<div style="float:right; margin-top:10px"><?php echo $this->_get_help_tab_link('message_template_shortcodes'); ?></div><p class="small-text"><?php printf( __('You can view the shortcodes usable in your template by clicking the %s icon next to each field.', 'event_espresso' ), '<span class="dashicons dashicons-menu"></span>' ); ?></p>
+			<div style="float:right; margin-top:10px"><?php echo $this->_get_help_tab_link('message_template_shortcodes'); ?></div><p class="small-text"><?php printf(__('You can view the shortcodes usable in your template by clicking the %s icon next to each field.', 'event_espresso'), '<span class="dashicons dashicons-menu"></span>'); ?></p>
 			<?php
 		}
 
@@ -1947,7 +1947,7 @@ 
 	protected function _set_shortcodes() {
 
 		//no need to run this if the property is already set
-		if ( !empty($this->_shortcodes ) ) {return;}
+		if ( ! empty($this->_shortcodes)) {return; }
 
 		$this->_shortcodes = $this->_get_shortcodes();
 	}
@@ -1969,14 +1969,14 @@ 
 	 * @return array          Shortcodes indexed by fieldname and the an array of shortcode/label pairs OR if merged is true
 	 *                       just an array of shortcode/label pairs.
 	 */
-	protected function _get_shortcodes( $fields = array(), $merged = true ) {
+	protected function _get_shortcodes($fields = array(), $merged = true) {
 		$this->_set_message_template_group();
 
 		//we need the messenger and message template to retrieve the valid shortcodes array.
-		$GRP_ID = isset( $this->_req_data['id'] ) && !empty( $this->_req_data['id'] ) ? absint( $this->_req_data['id'] ) : false;
-		$context = isset( $this->_req_data['context'] ) ? $this->_req_data['context'] : key( $this->_message_template_group->contexts_config() );
+		$GRP_ID = isset($this->_req_data['id']) && ! empty($this->_req_data['id']) ? absint($this->_req_data['id']) : false;
+		$context = isset($this->_req_data['context']) ? $this->_req_data['context'] : key($this->_message_template_group->contexts_config());
 
-		return !empty($GRP_ID) ? $this->_message_template_group->get_shortcodes( $context, $fields, $merged ) : array();
+		return ! empty($GRP_ID) ? $this->_message_template_group->get_shortcodes($context, $fields, $merged) : array();
 	}
 
 
@@ -1989,19 +1989,19 @@ 
 	 */
 	protected function _set_message_template_group() {
 
-		if ( !empty( $this->_message_template_group ) )
-			{return;} //get out if this is already set.
+		if ( ! empty($this->_message_template_group))
+			{return; } //get out if this is already set.
 
-		$GRP_ID =  ! empty( $this->_req_data['GRP_ID'] ) ? absint( $this->_req_data['GRP_ID'] ) : false;
-		$GRP_ID = empty( $GRP_ID ) && ! empty( $this->_req_data['id'] ) ? $this->_req_data['id'] : $GRP_ID;
+		$GRP_ID = ! empty($this->_req_data['GRP_ID']) ? absint($this->_req_data['GRP_ID']) : false;
+		$GRP_ID = empty($GRP_ID) && ! empty($this->_req_data['id']) ? $this->_req_data['id'] : $GRP_ID;
 
 		//let's get the message templates
 		$MTP = EEM_Message_Template_Group::instance();
 
-		if ( empty($GRP_ID) )
-			{$this->_message_template_group = $MTP->create_default_object();}
+		if (empty($GRP_ID))
+			{$this->_message_template_group = $MTP->create_default_object(); }
 		else
-			{$this->_message_template_group = $MTP->get_one_by_ID( $GRP_ID );}
+			{$this->_message_template_group = $MTP->get_one_by_ID($GRP_ID); }
 
 		$this->_template_pack = $this->_message_template_group->get_template_pack();
 		$this->_variation = $this->_message_template_group->get_template_pack_variation();
@@ -2020,7 +2020,7 @@ 
 	 * @param array $args various things the context switcher needs.
 	 *
 	 */
-	protected function _set_context_switcher( EE_Message_Template_Group $template_group_object, $args) {
+	protected function _set_context_switcher(EE_Message_Template_Group $template_group_object, $args) {
 		$context_details = $template_group_object->contexts_config();
 		$context_label = $template_group_object->context_label();
 		ob_start();
@@ -2028,20 +2028,20 @@ 
 		<div class="ee-msg-switcher-container">
 			<form method="get" action="<?php echo EE_MSG_ADMIN_URL; ?>" id="ee-msg-context-switcher-frm">
 				<?php
-					foreach ( $args as $name => $value ) {
-						if ( $name == 'context' || empty($value) || $name == 'extra' ) {continue;}
+					foreach ($args as $name => $value) {
+						if ($name == 'context' || empty($value) || $name == 'extra') {continue; }
 						?>
 						<input type="hidden" name="<?php echo $name; ?>" value = "<?php echo $value; ?>" />
 						<?php
 					}
 					//setup nonce_url
-					wp_nonce_field($args['action'] . '_nonce', $args['action'] . '_nonce', false);
+					wp_nonce_field($args['action'].'_nonce', $args['action'].'_nonce', false);
 				?>
 				<select name="context">
 					<?php
 					$context_templates = $template_group_object->context_templates();
-					if ( is_array($context_templates) ) :
-							foreach ( $context_templates as $context => $template_fields ) :
+					if (is_array($context_templates)) :
+							foreach ($context_templates as $context => $template_fields) :
 								$checked = ($context == $args['context']) ? 'selected="selected"' : '';
 					?>
 					<option value="<?php echo $context; ?>" <?php echo $checked; ?>>
@@ -2049,7 +2049,7 @@ 
 					</option>
 					<?php endforeach; endif; ?>
 				</select>
-				<?php $button_text = sprintf( __('Switch %s', 'event_espresso'), ucwords($context_label['label']) ); ?>
+				<?php $button_text = sprintf(__('Switch %s', 'event_espresso'), ucwords($context_label['label'])); ?>
 				<input id="submit-msg-context-switcher-sbmt" class="button-secondary" type="submit" value="<?php echo $button_text; ?>">
 			</form>
 			<?php echo $args['extra']; ?>
@@ -2076,8 +2076,8 @@ 
 	 * @return array
 	 */
 	protected function _set_message_template_column_values($index) {
-		if ( is_array($this->_req_data['MTP_template_fields'][$index]['content'] ) ) {
-			foreach ( $this->_req_data['MTP_template_fields'][$index]['content'] as $field => $value ) {
+		if (is_array($this->_req_data['MTP_template_fields'][$index]['content'])) {
+			foreach ($this->_req_data['MTP_template_fields'][$index]['content'] as $field => $value) {
 				$this->_req_data['MTP_template_fields'][$index]['content'][$field] = $value;
 			}
 		} /*else {
@@ -2086,22 +2086,22 @@ 
 
 
 		$set_column_values = array(
-			'MTP_ID'             => absint( $this->_req_data[ 'MTP_template_fields' ][ $index ][ 'MTP_ID' ] ),
-			'GRP_ID'             => absint( $this->_req_data[ 'GRP_ID' ] ),
-			'MTP_user_id'        => absint( $this->_req_data[ 'MTP_user_id' ] ),
-			'MTP_messenger'      => strtolower( $this->_req_data[ 'MTP_messenger' ] ),
-			'MTP_message_type'   => strtolower( $this->_req_data[ 'MTP_message_type' ] ),
-			'MTP_template_field' => strtolower( $this->_req_data[ 'MTP_template_fields' ][ $index ][ 'name' ] ),
-			'MTP_context'        => strtolower( $this->_req_data[ 'MTP_context' ] ),
-			'MTP_content'        => $this->_req_data[ 'MTP_template_fields' ][ $index ][ 'content' ],
-			'MTP_is_global'      => isset( $this->_req_data[ 'MTP_is_global' ] )
-				? absint( $this->_req_data[ 'MTP_is_global' ] )
+			'MTP_ID'             => absint($this->_req_data['MTP_template_fields'][$index]['MTP_ID']),
+			'GRP_ID'             => absint($this->_req_data['GRP_ID']),
+			'MTP_user_id'        => absint($this->_req_data['MTP_user_id']),
+			'MTP_messenger'      => strtolower($this->_req_data['MTP_messenger']),
+			'MTP_message_type'   => strtolower($this->_req_data['MTP_message_type']),
+			'MTP_template_field' => strtolower($this->_req_data['MTP_template_fields'][$index]['name']),
+			'MTP_context'        => strtolower($this->_req_data['MTP_context']),
+			'MTP_content'        => $this->_req_data['MTP_template_fields'][$index]['content'],
+			'MTP_is_global'      => isset($this->_req_data['MTP_is_global'])
+				? absint($this->_req_data['MTP_is_global'])
 				: 0,
-			'MTP_is_override'    => isset( $this->_req_data[ 'MTP_is_override' ] )
-				? absint( $this->_req_data[ 'MTP_is_override' ] )
+			'MTP_is_override'    => isset($this->_req_data['MTP_is_override'])
+				? absint($this->_req_data['MTP_is_override'])
 				: 0,
-			'MTP_deleted'        => absint( $this->_req_data[ 'MTP_deleted' ] ),
-			'MTP_is_active'      => absint( $this->_req_data[ 'MTP_is_active' ] )
+			'MTP_deleted'        => absint($this->_req_data['MTP_deleted']),
+			'MTP_is_active'      => absint($this->_req_data['MTP_is_active'])
 		);
 
 
@@ -2113,36 +2113,36 @@ 
 
 
 
-	protected function _insert_or_update_message_template($new = false ) {
+	protected function _insert_or_update_message_template($new = false) {
 
-		do_action ( 'AHEE_log', __FILE__, __FUNCTION__, '');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$success = 0;
 		$override = false;
 
 		//setup notices description
-		$messenger = ! empty( $this->_req_data['MTP_messenger'] )
-			? ucwords( str_replace( '_', ' ', $this->_req_data['MTP_messenger'] ) )
+		$messenger = ! empty($this->_req_data['MTP_messenger'])
+			? ucwords(str_replace('_', ' ', $this->_req_data['MTP_messenger']))
 			: false;
 
-		$message_type = ! empty( $this->_req_data['MTP_message_type'] )
-			? ucwords( str_replace( '_', ' ', $this->_req_data['MTP_message_type'] ) )
+		$message_type = ! empty($this->_req_data['MTP_message_type'])
+			? ucwords(str_replace('_', ' ', $this->_req_data['MTP_message_type']))
 			: false;
 
-		$context = ! empty( $this->_req_data['MTP_context'] )
-			? ucwords( str_replace( '_', ' ', $this->_req_data['MTP_context'] ) )
+		$context = ! empty($this->_req_data['MTP_context'])
+			? ucwords(str_replace('_', ' ', $this->_req_data['MTP_context']))
 			: false;
 
-		$item_desc = $messenger ? $messenger . ' ' . $message_type . ' ' . $context . ' ' : '';
+		$item_desc = $messenger ? $messenger.' '.$message_type.' '.$context.' ' : '';
 		$item_desc .= 'Message Template';
 		$query_args = array();
 		$edit_array = array();
 		$action_desc = '';
 
 		//if this is "new" then we need to generate the default contexts for the selected messenger/message_type for user to edit.
-		if ( $new ) {
-			$GRP_ID = !empty( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : 0;
-			if ( $edit_array = $this->_generate_new_templates($messenger, $message_type, $GRP_ID ) ) {
-				if ( empty($edit_array) ) {
+		if ($new) {
+			$GRP_ID = ! empty($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : 0;
+			if ($edit_array = $this->_generate_new_templates($messenger, $message_type, $GRP_ID)) {
+				if (empty($edit_array)) {
 					$success = 0;
 				} else {
 					$success = 1;
@@ -2161,7 +2161,7 @@ 
 
 
 			//run update for each template field in displayed context
-			if ( !isset($this->_req_data['MTP_template_fields']) && empty($this->_req_data['MTP_template_fields'] ) ) {
+			if ( ! isset($this->_req_data['MTP_template_fields']) && empty($this->_req_data['MTP_template_fields'])) {
 				EE_Error::add_error(
 					__('There was a problem saving the template fields from the form because I didn\'t receive any actual template field data.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
@@ -2170,25 +2170,25 @@ 
 
 			} else {
 				//first validate all fields!
-				$validates = $MTPG->validate($this->_req_data['MTP_template_fields'], $this->_req_data['MTP_context'],  $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type']);
+				$validates = $MTPG->validate($this->_req_data['MTP_template_fields'], $this->_req_data['MTP_context'], $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type']);
 
 				//if $validate returned error messages (i.e. is_array()) then we need to process them and setup an appropriate response. HMM, dang this isn't correct, $validates will ALWAYS be an array.  WE need to make sure there is no actual error messages in validates.
-				if ( is_array($validates) && !empty($validates) ) {
+				if (is_array($validates) && ! empty($validates)) {
 					//add the transient so when the form loads we know which fields to highlight
-					$this->_add_transient( 'edit_message_template', $validates );
+					$this->_add_transient('edit_message_template', $validates);
 
 					$success = 0;
 
 					//setup notices
-					foreach ( $validates as $field => $error ) {
-						if ( isset($error['msg'] ) ) {
-							EE_Error::add_error( $error['msg'], __FILE__, __FUNCTION__, __LINE__ );
+					foreach ($validates as $field => $error) {
+						if (isset($error['msg'])) {
+							EE_Error::add_error($error['msg'], __FILE__, __FUNCTION__, __LINE__);
 						}
 					}
 
 				} else {
 					$set_column_values = array();
-					foreach ( $this->_req_data['MTP_template_fields'] as $template_field => $content ) {
+					foreach ($this->_req_data['MTP_template_fields'] as $template_field => $content) {
 						$set_column_values = $this->_set_message_template_column_values($template_field);
 
 						$where_cols_n_values = array(
@@ -2201,11 +2201,11 @@ 
 							'MTP_context' => $set_column_values['MTP_context'],
 							'MTP_content' => $set_column_values['MTP_content']
 						);
-						if ( $updated = $MTP->update( $message_template_fields, array( $where_cols_n_values ) ) ) {
-							if ( $updated === false ) {
+						if ($updated = $MTP->update($message_template_fields, array($where_cols_n_values))) {
+							if ($updated === false) {
 								EE_Error::add_error(
 									sprintf(
-										__( '%s field was NOT updated for some reason', 'event_espresso' ),
+										__('%s field was NOT updated for some reason', 'event_espresso'),
 										$template_field
 									),
 									__FILE__, __FUNCTION__, __LINE__
@@ -2219,46 +2219,46 @@ 
 
 					//we can use the last set_column_values for the MTPG update (because its the same for all of these specific MTPs)
 					$mtpg_fields = array(
-						'MTP_user_id'      => $set_column_values[ 'MTP_user_id' ],
-						'MTP_messenger'    => $set_column_values[ 'MTP_messenger' ],
-						'MTP_message_type' => $set_column_values[ 'MTP_message_type' ],
-						'MTP_is_global'    => $set_column_values[ 'MTP_is_global' ],
-						'MTP_is_override'  => $set_column_values[ 'MTP_is_override' ],
-						'MTP_deleted'      => $set_column_values[ 'MTP_deleted' ],
-						'MTP_is_active'    => $set_column_values[ 'MTP_is_active' ],
-						'MTP_name'         => ! empty( $this->_req_data[ 'ee_msg_non_global_fields' ][ 'MTP_name' ] )
-							? $this->_req_data[ 'ee_msg_non_global_fields' ][ 'MTP_name' ]
+						'MTP_user_id'      => $set_column_values['MTP_user_id'],
+						'MTP_messenger'    => $set_column_values['MTP_messenger'],
+						'MTP_message_type' => $set_column_values['MTP_message_type'],
+						'MTP_is_global'    => $set_column_values['MTP_is_global'],
+						'MTP_is_override'  => $set_column_values['MTP_is_override'],
+						'MTP_deleted'      => $set_column_values['MTP_deleted'],
+						'MTP_is_active'    => $set_column_values['MTP_is_active'],
+						'MTP_name'         => ! empty($this->_req_data['ee_msg_non_global_fields']['MTP_name'])
+							? $this->_req_data['ee_msg_non_global_fields']['MTP_name']
 							: '',
-						'MTP_description'  => ! empty( $this->_req_data[ 'ee_msg_non_global_fields' ][ 'MTP_description' ] )
-							? $this->_req_data[ 'ee_msg_non_global_fields' ][ 'MTP_description' ]
+						'MTP_description'  => ! empty($this->_req_data['ee_msg_non_global_fields']['MTP_description'])
+							? $this->_req_data['ee_msg_non_global_fields']['MTP_description']
 							: ''
 					);
 
-					$mtpg_where = array('GRP_ID' => $set_column_values['GRP_ID'] );
-					$updated = $MTPG->update( $mtpg_fields, array($mtpg_where) );
+					$mtpg_where = array('GRP_ID' => $set_column_values['GRP_ID']);
+					$updated = $MTPG->update($mtpg_fields, array($mtpg_where));
 
-					if ( $updated === false ) {
+					if ($updated === false) {
 						EE_Error::add_error(
 							sprintf(
-								__( 'The Message Template Group (%d) was NOT updated for some reason', 'event_espresso' ),
-								$set_column_values[ 'GRP_ID' ]
+								__('The Message Template Group (%d) was NOT updated for some reason', 'event_espresso'),
+								$set_column_values['GRP_ID']
 							),
 							__FILE__, __FUNCTION__, __LINE__
 						);
 					} else {
 						//k now we need to ensure the template_pack and template_variation fields are set.
-						$template_pack = ! empty( $this->_req_data['MTP_template_pack' ] )
+						$template_pack = ! empty($this->_req_data['MTP_template_pack'])
 							? $this->_req_data['MTP_template_pack']
 							: 'default';
 
-						$template_variation = ! empty( $this->_req_data['MTP_template_variation'] )
+						$template_variation = ! empty($this->_req_data['MTP_template_variation'])
 							? $this->_req_data['MTP_template_variation']
 							: 'default';
 
-						$mtpg_obj = $MTPG->get_one_by_ID( $set_column_values['GRP_ID'] );
-						if ( $mtpg_obj instanceof EE_Message_Template_Group ) {
-							$mtpg_obj->set_template_pack_name( $template_pack );
-							$mtpg_obj->set_template_pack_variation( $template_variation );
+						$mtpg_obj = $MTPG->get_one_by_ID($set_column_values['GRP_ID']);
+						if ($mtpg_obj instanceof EE_Message_Template_Group) {
+							$mtpg_obj->set_template_pack_name($template_pack);
+							$mtpg_obj->set_template_pack_variation($template_variation);
 						}
 						$success = 1;
 					}
@@ -2268,7 +2268,7 @@ 
 		}
 
 		//we return things differently if doing ajax
-		if ( defined('DOING_AJAX') && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			$this->_template_args['success'] = $success;
 			$this->_template_args['error'] = ! $success ? true : false;
 			$this->_template_args['content'] = '';
@@ -2276,9 +2276,9 @@ 
 				'grpID' => $edit_array['GRP_ID'],
 				'templateName' => $edit_array['template_name']
 				);
-			if ( $success ) {
+			if ($success) {
 				EE_Error::overwrite_success();
-				EE_Error::add_success( __('The new template has been created and automatically selected for this event.  You can edit the new template by clicking the edit button.  Note before this template is assigned to this event, the event must be saved.', 'event_espresso') );
+				EE_Error::add_success(__('The new template has been created and automatically selected for this event.  You can edit the new template by clicking the edit button.  Note before this template is assigned to this event, the event must be saved.', 'event_espresso'));
 			}
 
 			$this->_return_json();
@@ -2286,13 +2286,13 @@ 
 
 
 		//was a test send triggered?
-		if ( isset( $this->_req_data['test_button'] ) ) {
+		if (isset($this->_req_data['test_button'])) {
 			EE_Error::overwrite_success();
-			$this->_do_test_send( $this->_req_data['MTP_context'],  $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type'] );
+			$this->_do_test_send($this->_req_data['MTP_context'], $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type']);
 			$override = true;
 		}
 
-		if ( empty( $query_args ) ) {
+		if (empty($query_args)) {
 			$query_args = array(
 				'id' => $this->_req_data['GRP_ID'],
 				'context' => $this->_req_data['MTP_context'],
@@ -2300,7 +2300,7 @@ 
 				);
 		}
 
-		$this->_redirect_after_action( $success, $item_desc, $action_desc, $query_args, $override );
+		$this->_redirect_after_action($success, $item_desc, $action_desc, $query_args, $override);
 	}
 
 
@@ -2314,28 +2314,28 @@ 
 	 * @param  string $message_type message type being tested
 	 *
 	 */
-	protected function _do_test_send( $context, $messenger, $message_type ) {
+	protected function _do_test_send($context, $messenger, $message_type) {
 		//set things up for preview
 		$this->_req_data['messenger'] = $messenger;
 		$this->_req_data['message_type'] = $message_type;
 		$this->_req_data['context'] = $context;
-		$this->_req_data['GRP_ID'] = isset($this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : '';
-		$active_messenger = $this->_message_resource_manager->get_active_messenger( $messenger );
+		$this->_req_data['GRP_ID'] = isset($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : '';
+		$active_messenger = $this->_message_resource_manager->get_active_messenger($messenger);
 
 		//let's save any existing fields that might be required by the messenger
 		if (
-			isset( $this->_req_data['test_settings_fld'] )
+			isset($this->_req_data['test_settings_fld'])
 			&& $active_messenger instanceof EE_messenger
 		) {
-			$active_messenger->set_existing_test_settings( $this->_req_data['test_settings_fld'] );
+			$active_messenger->set_existing_test_settings($this->_req_data['test_settings_fld']);
 		}
 
 		$success = $this->_preview_message(true);
 
-		if ( $success ) {
-			EE_Error::add_success( __('Test message sent', 'event_espresso') );
+		if ($success) {
+			EE_Error::add_success(__('Test message sent', 'event_espresso'));
 		} else {
-			EE_Error::add_error( __('The test message was not sent', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('The test message was not sent', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -2361,11 +2361,11 @@ 
 	protected function _generate_new_templates($messenger, $message_types, $GRP_ID = 0, $global = false) {
 
 		//if no $message_types are given then that's okay... this may be a messenger that just adds shortcodes, so we just don't generate any templates.
-		if ( empty( $message_types ) ) {
+		if (empty($message_types)) {
 			return true;
 		}
 
-		return EEH_MSG_Template::generate_new_templates( $messenger, $message_types, $GRP_ID, $global );
+		return EEH_MSG_Template::generate_new_templates($messenger, $message_types, $GRP_ID, $global);
 	}
 
 
@@ -2381,33 +2381,33 @@ 
 	 *
 	 * @return void
 	 */
-	protected function _trash_or_restore_message_template($trash = true, $all = false ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+	protected function _trash_or_restore_message_template($trash = true, $all = false) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$MTP = EEM_Message_Template_Group::instance();
 
 		$success = 1;
 
 		//incoming GRP_IDs
-		if ( $all ) {
+		if ($all) {
 			//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 then success message should be plural.
 				//todo: what about nonce?
-				$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+				$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 				//cycle through checkboxes
-				while ( list( $GRP_ID, $value ) = each ($this->_req_data['checkbox']) ) {
-					$trashed_or_restored = $trash ? $MTP->delete_by_ID( $GRP_ID ) : $MTP->restore_by_ID( $GRP_ID );
-					if ( ! $trashed_or_restored ) {
+				while (list($GRP_ID, $value) = each($this->_req_data['checkbox'])) {
+					$trashed_or_restored = $trash ? $MTP->delete_by_ID($GRP_ID) : $MTP->restore_by_ID($GRP_ID);
+					if ( ! $trashed_or_restored) {
 						$success = 0;
 					}
 				}
 			} else {
 				//grab single GRP_ID and handle
-				$GRP_ID = isset( $this->_req_data['id'] ) ? absint($this->_req_data['id']) : 0;
-				if ( ! empty( $GRP_ID ) ) {
-					$trashed_or_restored = $trash ? $MTP->delete_by_ID( $GRP_ID ) : $MTP->restore_by_ID( $GRP_ID );
-					if ( ! $trashed_or_restored ) {
+				$GRP_ID = isset($this->_req_data['id']) ? absint($this->_req_data['id']) : 0;
+				if ( ! empty($GRP_ID)) {
+					$trashed_or_restored = $trash ? $MTP->delete_by_ID($GRP_ID) : $MTP->restore_by_ID($GRP_ID);
+					if ( ! $trashed_or_restored) {
 						$success = 0;
 					}
 				} else {
@@ -2419,13 +2419,13 @@ 
 
 		$action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso');
 
-		$action_desc = !empty( $this->_req_data['template_switch'] ) ? __('switched') : $action_desc;
+		$action_desc = ! empty($this->_req_data['template_switch']) ? __('switched') : $action_desc;
 
 		$item_desc = $all ? _n('Message Template Group', 'Message Template Groups', $success, 'event_espresso') : _n('Message Template Context', 'Message Template Contexts', $success, 'event_espresso');
 
-		$item_desc = !empty( $this->_req_data['template_switch'] ) ? _n('template', 'templates', $success, 'event_espresso') : $item_desc;
+		$item_desc = ! empty($this->_req_data['template_switch']) ? _n('template', 'templates', $success, 'event_espresso') : $item_desc;
 
-		$this->_redirect_after_action( $success, $item_desc, $action_desc, array() );
+		$this->_redirect_after_action($success, $item_desc, $action_desc, array());
 
 	}
 
@@ -2441,24 +2441,24 @@ 
 	 * @return void
 	 */
 	protected function _delete_message_template() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//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 then success message should be plural
-			$success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1;
+			$success = count($this->_req_data['checkbox']) > 1 ? 2 : 1;
 
 			//cycle through bulk action checkboxes
-			while ( list( $GRP_ID, $value ) = each($this->_req_data['checkbox'] ) ) {
-				$success = $this->_delete_mtp_permanently( $GRP_ID );
+			while (list($GRP_ID, $value) = each($this->_req_data['checkbox'])) {
+				$success = $this->_delete_mtp_permanently($GRP_ID);
 			}
 		} else {
 			//grab single grp_id and delete
-			$GRP_ID = absint($this->_req_data['id'] );
-			$success = $this->_delete_mtp_permanently( $GRP_ID );
+			$GRP_ID = absint($this->_req_data['id']);
+			$success = $this->_delete_mtp_permanently($GRP_ID);
 		}
 
-		$this->_redirect_after_action( $success, 'Message Templates', 'deleted', array() );
+		$this->_redirect_after_action($success, 'Message Templates', 'deleted', array());
 
 	}
 
@@ -2473,20 +2473,20 @@ 
 	 *
 	 * @return bool        boolean to indicate the success of the deletes or not.
 	 */
-	private function _delete_mtp_permanently( $GRP_ID, $include_group = true ) {
+	private function _delete_mtp_permanently($GRP_ID, $include_group = true) {
 		$success = 1;
 		$MTPG = EEM_Message_Template_Group::instance();
 		//first let's GET this group
-		$MTG = $MTPG->get_one_by_ID( $GRP_ID );
+		$MTG = $MTPG->get_one_by_ID($GRP_ID);
 		//then delete permanently all the related Message Templates
-		$deleted = $MTG->delete_related_permanently( 'Message_Template' );
+		$deleted = $MTG->delete_related_permanently('Message_Template');
 
-		if ( $deleted === 0 )
-			{$success = 0;}
+		if ($deleted === 0)
+			{$success = 0; }
 
 		//now delete permanently this particular group
 
-		if ( $include_group && ! $MTG->delete_permanently() ) {
+		if ($include_group && ! $MTG->delete_permanently()) {
 			$success = 0;
 		}
 		return $success;
@@ -2504,7 +2504,7 @@ 
 	*	@return string
 	*/
 	protected function _learn_more_about_message_templates_link() {
-		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >' . __('learn more about how message templates works', 'event_espresso') . '</a>';
+		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >'.__('learn more about how message templates works', 'event_espresso').'</a>';
 	}
 
 
@@ -2522,10 +2522,10 @@ 
 
 		$this->_set_m_mt_settings();
 
-		$selected_messenger = isset( $this->_req_data['selected_messenger'] ) ? $this->_req_data['selected_messenger'] : 'email';
+		$selected_messenger = isset($this->_req_data['selected_messenger']) ? $this->_req_data['selected_messenger'] : 'email';
 
 		//let's setup the messenger tabs
-		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links( $this->_m_mt_settings['messenger_tabs'], 'messenger_links', '|', $selected_messenger );
+		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links($this->_m_mt_settings['messenger_tabs'], 'messenger_links', '|', $selected_messenger);
 		$this->_template_args['before_admin_page_content'] = '<div class="ui-widget ui-helper-clearfix">';
 		$this->_template_args['after_admin_page_content'] = '</div><!-- end .ui-widget -->';
 
@@ -2544,7 +2544,7 @@ 
 	 */
 	protected function _set_m_mt_settings() {
 		//first if this is already set then lets get out no need to regenerate data.
-		if ( !empty($this->_m_mt_settings) ) {
+		if ( ! empty($this->_m_mt_settings)) {
 			return;
 		}
 
@@ -2559,10 +2559,10 @@ 
 
 		//assemble the array for the _tab_text_links helper
 
-		foreach ( $messengers as $messenger ) {
+		foreach ($messengers as $messenger) {
 			$this->_m_mt_settings['messenger_tabs'][$messenger->name] = array(
 				'label' => ucwords($messenger->label['singular']),
-				'class' => $this->_message_resource_manager->is_messenger_active( $messenger->name ) ? 'messenger-active' : '',
+				'class' => $this->_message_resource_manager->is_messenger_active($messenger->name) ? 'messenger-active' : '',
 				'href' => $messenger->name,
 				'title' => __('Modify this Messenger', 'event_espresso'),
 				'slug' => $messenger->name,
@@ -2572,26 +2572,26 @@ 
 
 			$message_types_for_messenger = $messenger->get_valid_message_types();
 
-			foreach ( $message_types as $message_type ) {
+			foreach ($message_types as $message_type) {
 				//first we need to verify that this message type is valid with this messenger. Cause if it isn't then it shouldn't show in either the inactive OR active metabox.
-				if ( ! in_array( $message_type->name, $message_types_for_messenger ) ) {
+				if ( ! in_array($message_type->name, $message_types_for_messenger)) {
 					continue;
 				}
 
-				$a_or_i = $this->_message_resource_manager->is_message_type_active_for_messenger( $messenger->name, $message_type->name ) ? 'active' : 'inactive';
+				$a_or_i = $this->_message_resource_manager->is_message_type_active_for_messenger($messenger->name, $message_type->name) ? 'active' : 'inactive';
 
 				$this->_m_mt_settings['message_type_tabs'][$messenger->name][$a_or_i][$message_type->name] = array(
-					'label'    => ucwords( $message_type->label[ 'singular' ] ),
-					'class'    => 'message-type-' . $a_or_i,
-					'slug_id'  => $message_type->name . '-messagetype-' . $messenger->name,
-					'mt_nonce' => wp_create_nonce( $message_type->name . '_nonce' ),
-					'href'     => 'espresso_' . $message_type->name . '_message_type_settings',
+					'label'    => ucwords($message_type->label['singular']),
+					'class'    => 'message-type-'.$a_or_i,
+					'slug_id'  => $message_type->name.'-messagetype-'.$messenger->name,
+					'mt_nonce' => wp_create_nonce($message_type->name.'_nonce'),
+					'href'     => 'espresso_'.$message_type->name.'_message_type_settings',
 					'title'    => $a_or_i == 'active'
-						? __( 'Drag this message type to the Inactive window to deactivate', 'event_espresso' )
-						: __( 'Drag this message type to the messenger to activate', 'event_espresso' ),
+						? __('Drag this message type to the Inactive window to deactivate', 'event_espresso')
+						: __('Drag this message type to the messenger to activate', 'event_espresso'),
 					'content'  => $a_or_i == 'active'
-						? $this->_message_type_settings_content( $message_type, $messenger, true )
-						: $this->_message_type_settings_content( $message_type, $messenger ),
+						? $this->_message_type_settings_content($message_type, $messenger, true)
+						: $this->_message_type_settings_content($message_type, $messenger),
 					'slug'     => $message_type->name,
 					'active'   => $a_or_i == 'active' ? true : false,
 					'obj'      => $message_type
@@ -2610,34 +2610,34 @@ 
 	 *
 	 * @return string                html output for the content
 	 */
-	protected function _message_type_settings_content( $message_type, $messenger, $active = false ) {
+	protected function _message_type_settings_content($message_type, $messenger, $active = false) {
 		//get message type fields
 		$fields = $message_type->get_admin_settings_fields();
-		$settings_template_args['template_form_fields']= '';
+		$settings_template_args['template_form_fields'] = '';
 
-		if ( !empty( $fields ) && $active ) {
+		if ( ! empty($fields) && $active) {
 
-			$existing_settings = $message_type->get_existing_admin_settings( $messenger->name );
+			$existing_settings = $message_type->get_existing_admin_settings($messenger->name);
 
-			foreach( $fields as $fldname => $fldprops ) {
-				$field_id = $messenger->name . '-' . $message_type->name . '-' . $fldname;
+			foreach ($fields as $fldname => $fldprops) {
+				$field_id = $messenger->name.'-'.$message_type->name.'-'.$fldname;
 				$template_form_field[$field_id] = array(
-					'name' => 'message_type_settings[' . $fldname . ']',
+					'name' => 'message_type_settings['.$fldname.']',
 					'label' => $fldprops['label'],
 					'input' => $fldprops['field_type'],
 					'type' => $fldprops['value_type'],
 					'required' => $fldprops['required'],
 					'validation' => $fldprops['validation'],
-					'value' => isset( $existing_settings[$fldname]) ? $existing_settings[$fldname] : $fldprops['default'],
-					'options' => isset( $fldprops['options'] ) ? $fldprops['options'] : array(),
-					'default' => isset( $existing_settings[$fldname] ) ? $existing_settings[$fldname] : $fldprops['default'],
+					'value' => isset($existing_settings[$fldname]) ? $existing_settings[$fldname] : $fldprops['default'],
+					'options' => isset($fldprops['options']) ? $fldprops['options'] : array(),
+					'default' => isset($existing_settings[$fldname]) ? $existing_settings[$fldname] : $fldprops['default'],
 					'css_class' => 'no-drag',
 					'format' => $fldprops['format']
 				);
 			}
 
 
-			$settings_template_args['template_form_fields'] = !empty($template_form_field) ? $this->_generate_admin_form_fields( $template_form_field, 'string', 'ee_mt_activate_form' ) : '';
+			$settings_template_args['template_form_fields'] = ! empty($template_form_field) ? $this->_generate_admin_form_fields($template_form_field, 'string', 'ee_mt_activate_form') : '';
 		}
 
 		$settings_template_args['description'] = $message_type->description;
@@ -2657,13 +2657,13 @@ 
 					)
 				);
 
-		$settings_template_args['hidden_fields'] = $this->_generate_admin_form_fields( $settings_template_args['hidden_fields'], 'array' );
-		$settings_template_args['show_form'] = empty( $settings_template_args['template_form_fields'] ) ? ' hidden' : '';
+		$settings_template_args['hidden_fields'] = $this->_generate_admin_form_fields($settings_template_args['hidden_fields'], 'array');
+		$settings_template_args['show_form'] = empty($settings_template_args['template_form_fields']) ? ' hidden' : '';
 
 
 
-		$template = EE_MSG_TEMPLATE_PATH . 'ee_msg_mt_settings_content.template.php';
-		$content = EEH_Template::display_template( $template, $settings_template_args, true );
+		$template = EE_MSG_TEMPLATE_PATH.'ee_msg_mt_settings_content.template.php';
+		$content = EEH_Template::display_template($template, $settings_template_args, true);
 		return $content;
 	}
 
@@ -2680,27 +2680,27 @@ 
 		$m_boxes = $mt_boxes = array();
 		$m_template_args = $mt_template_args = array();
 
-		$selected_messenger = isset( $this->_req_data['selected_messenger'] ) ? $this->_req_data['selected_messenger'] : 'email';
+		$selected_messenger = isset($this->_req_data['selected_messenger']) ? $this->_req_data['selected_messenger'] : 'email';
 
-		if ( isset( $this->_m_mt_settings[ 'messenger_tabs' ] ) ) {
-			foreach ( $this->_m_mt_settings[ 'messenger_tabs' ] as $messenger => $tab_array ) {
-				$hide_on_message = $this->_message_resource_manager->is_messenger_active( $messenger ) ? '' : 'hidden';
-				$hide_off_message = $this->_message_resource_manager->is_messenger_active( $messenger ) ? 'hidden' : '';
+		if (isset($this->_m_mt_settings['messenger_tabs'])) {
+			foreach ($this->_m_mt_settings['messenger_tabs'] as $messenger => $tab_array) {
+				$hide_on_message = $this->_message_resource_manager->is_messenger_active($messenger) ? '' : 'hidden';
+				$hide_off_message = $this->_message_resource_manager->is_messenger_active($messenger) ? 'hidden' : '';
 				//messenger meta boxes
 				$active = $selected_messenger == $messenger ? true : false;
-				$active_mt_tabs = isset( $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'active' ] )
-				? $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'active' ]
+				$active_mt_tabs = isset($this->_m_mt_settings['message_type_tabs'][$messenger]['active'])
+				? $this->_m_mt_settings['message_type_tabs'][$messenger]['active']
 				: '';
-				$m_boxes[ $messenger . '_a_box' ] = sprintf(
-				__( '%s Settings', 'event_espresso' ),
-				$tab_array[ 'label' ]
+				$m_boxes[$messenger.'_a_box'] = sprintf(
+				__('%s Settings', 'event_espresso'),
+				$tab_array['label']
 				);
-				$m_template_args[ $messenger . '_a_box' ] = array(
-				'active_message_types'   => ! empty( $active_mt_tabs ) ? $this->_get_mt_tabs( $active_mt_tabs ) : '',
-				'inactive_message_types' => isset( $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'inactive' ] )
-				? $this->_get_mt_tabs( $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'inactive' ] )
+				$m_template_args[$messenger.'_a_box'] = array(
+				'active_message_types'   => ! empty($active_mt_tabs) ? $this->_get_mt_tabs($active_mt_tabs) : '',
+				'inactive_message_types' => isset($this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'])
+				? $this->_get_mt_tabs($this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'])
 				: '',
-				'content'                => $this->_get_messenger_box_content( $tab_array[ 'obj' ] ),
+				'content'                => $this->_get_messenger_box_content($tab_array['obj']),
 				'hidden'                 => $active ? '' : ' hidden',
 				'hide_on_message'        => $hide_on_message,
 				'messenger'              => $messenger,
@@ -2709,11 +2709,11 @@ 
 				// message type meta boxes
 				// (which is really just the inactive container for each messenger
 				// showing inactive message types for that messenger)
-				$mt_boxes[ $messenger . '_i_box' ] = __( 'Inactive Message Types', 'event_espresso' );
-				$mt_template_args[ $messenger . '_i_box' ] = array(
-				'active_message_types'   => ! empty( $active_mt_tabs ) ? $this->_get_mt_tabs( $active_mt_tabs ) : '',
-				'inactive_message_types' => isset( $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'inactive' ] )
-				? $this->_get_mt_tabs( $this->_m_mt_settings[ 'message_type_tabs' ][ $messenger ][ 'inactive' ] )
+				$mt_boxes[$messenger.'_i_box'] = __('Inactive Message Types', 'event_espresso');
+				$mt_template_args[$messenger.'_i_box'] = array(
+				'active_message_types'   => ! empty($active_mt_tabs) ? $this->_get_mt_tabs($active_mt_tabs) : '',
+				'inactive_message_types' => isset($this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'])
+				? $this->_get_mt_tabs($this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'])
 				: '',
 				'hidden'                 => $active ? '' : ' hidden',
 				'hide_on_message'        => $hide_on_message,
@@ -2726,15 +2726,15 @@ 
 
 
 		//register messenger metaboxes
-		$m_template_path = EE_MSG_TEMPLATE_PATH . 'ee_msg_details_messenger_mt_meta_box.template.php';
-		foreach ( $m_boxes as $box => $label ) {
-			$callback_args = array( 'template_path' => $m_template_path, 'template_args' => $m_template_args[$box] );
-			$msgr = str_replace( '_a_box', '', $box );
+		$m_template_path = EE_MSG_TEMPLATE_PATH.'ee_msg_details_messenger_mt_meta_box.template.php';
+		foreach ($m_boxes as $box => $label) {
+			$callback_args = array('template_path' => $m_template_path, 'template_args' => $m_template_args[$box]);
+			$msgr = str_replace('_a_box', '', $box);
 			add_meta_box(
-				'espresso_' . $msgr . '_settings',
+				'espresso_'.$msgr.'_settings',
 				$label,
-				function( $post, $metabox ) {
-					echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );
+				function($post, $metabox) {
+					echo EEH_Template::display_template($metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE);
 				},
 				$this->_current_screen->id,
 				'normal',
@@ -2744,17 +2744,17 @@ 
 		}
 
 		//register message type metaboxes
-		$mt_template_path = EE_MSG_TEMPLATE_PATH . 'ee_msg_details_messenger_meta_box.template.php';
-		foreach ( $mt_boxes as $box => $label ) {
+		$mt_template_path = EE_MSG_TEMPLATE_PATH.'ee_msg_details_messenger_meta_box.template.php';
+		foreach ($mt_boxes as $box => $label) {
 			$callback_args = array(
-				'template_path' => $mt_template_path, 'template_args' => $mt_template_args[ $box ]
+				'template_path' => $mt_template_path, 'template_args' => $mt_template_args[$box]
 			);
-			$mt = str_replace( '_i_box', '', $box );
+			$mt = str_replace('_i_box', '', $box);
 			add_meta_box(
-				'espresso_' . $mt . '_inactive_mts',
+				'espresso_'.$mt.'_inactive_mts',
 				$label,
-				function( $post, $metabox ) {
-					echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );
+				function($post, $metabox) {
+					echo EEH_Template::display_template($metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE);
 				},
 				$this->_current_screen->id,
 				'side',
@@ -2765,11 +2765,11 @@ 
 
 		//register metabox for global messages settings but only when on the main site.  On single site installs this will
 		//always result in the metabox showing, on multisite installs the metabox will only show on the main site.
-		if ( is_main_site() ) {
+		if (is_main_site()) {
 			add_meta_box(
 				'espresso_global_message_settings',
-				__( 'Global Message Settings', 'event_espresso' ),
-				array( $this, 'global_messages_settings_metabox_content' ),
+				__('Global Message Settings', 'event_espresso'),
+				array($this, 'global_messages_settings_metabox_content'),
 				$this->_current_screen->id,
 				'normal',
 				'low',
@@ -2789,7 +2789,7 @@ 
 	public function global_messages_settings_metabox_content() {
 		$form = $this->_generate_global_settings_form();
 		echo $form->form_open(
-			$this->add_query_args_and_nonce( array( 'action' => 'update_global_settings' ), EE_MSG_ADMIN_URL ),
+			$this->add_query_args_and_nonce(array('action' => 'update_global_settings'), EE_MSG_ADMIN_URL),
 			'POST'
 		)
 		. $form->get_html()
@@ -2802,7 +2802,7 @@ 
 	 * @return EE_Form_Section_Proper
 	 */
 	protected function _generate_global_settings_form() {
-		EE_Registry::instance()->load_helper( 'HTML' );
+		EE_Registry::instance()->load_helper('HTML');
 		/** @var EE_Network_Core_Config $network_config */
 		$network_config = EE_Registry::instance()->NET_CFG->core;
 		return new EE_Form_Section_Proper(
@@ -2821,13 +2821,13 @@ 
 							),
 							array(
 								'default' => $network_config->do_messages_on_same_request,
-								'html_label_text' => __( 'Generate and send all messages:', 'event_espresso' ),
-								'html_help_text' => __( 'By default the messages system uses a more efficient means of processing messages on separate requests and utilizes the wp-cron scheduling system.  This makes things execute faster for people registering for your events.  However, if the wp-cron system is disabled on your site and there is no alternative in place, then you can change this so messages are always executed on the same request.', 'event_espresso' ),
+								'html_label_text' => __('Generate and send all messages:', 'event_espresso'),
+								'html_help_text' => __('By default the messages system uses a more efficient means of processing messages on separate requests and utilizes the wp-cron scheduling system.  This makes things execute faster for people registering for your events.  However, if the wp-cron system is disabled on your site and there is no alternative in place, then you can change this so messages are always executed on the same request.', 'event_espresso'),
 							)
 						),
 						'update_settings' => new EE_Submit_Input(
 							array(
-								'default' => __( 'Update', 'event_espresso' ),
+								'default' => __('Update', 'event_espresso'),
 								'html_label_text' => '&nbsp'
 							)
 						)
@@ -2846,28 +2846,28 @@ 
 		/** @var EE_Network_Core_Config $network_config */
 		$network_config = EE_Registry::instance()->NET_CFG->core;
 		$form = $this->_generate_global_settings_form();
-		if ( $form->was_submitted() ) {
+		if ($form->was_submitted()) {
 			$form->receive_form_submission();
-			if ( $form->is_valid() ) {
+			if ($form->is_valid()) {
 				$valid_data = $form->valid_data();
-				foreach( $valid_data as $property => $value ) {
-					$setter = 'set_' . $property;
-					if ( method_exists( $network_config, $setter ) ) {
-						$network_config->{$setter}( $value );
+				foreach ($valid_data as $property => $value) {
+					$setter = 'set_'.$property;
+					if (method_exists($network_config, $setter)) {
+						$network_config->{$setter}($value);
 					} else if (
-						property_exists( $network_config, $property )
+						property_exists($network_config, $property)
 						&& $network_config->{$property} !== $value
 					) {
 						$network_config->{$property} = $value;
 					}
 				}
 				//only update if the form submission was valid!
-				EE_Registry::instance()->NET_CFG->update_config( true, false );
+				EE_Registry::instance()->NET_CFG->update_config(true, false);
 				EE_Error::overwrite_success();
-				EE_Error::add_success( __( 'Global message settings were updated', 'event_espresso' ) );
+				EE_Error::add_success(__('Global message settings were updated', 'event_espresso'));
 			}
 		}
-		$this->_redirect_after_action( 0, '', '', array( 'action' => 'settings' ), true );
+		$this->_redirect_after_action(0, '', '', array('action' => 'settings'), true);
 	}
 
 
@@ -2878,13 +2878,13 @@ 
 	 *
 	 * @return string            html formatted tabs
 	 */
-	protected function _get_mt_tabs( $tab_array ) {
+	protected function _get_mt_tabs($tab_array) {
 		$tab_array = (array) $tab_array;
-		$template = EE_MSG_TEMPLATE_PATH . 'ee_msg_details_mt_settings_tab_item.template.php';
+		$template = EE_MSG_TEMPLATE_PATH.'ee_msg_details_mt_settings_tab_item.template.php';
 		$tabs = '';
 
-		foreach ( $tab_array as $tab ) {
-			$tabs .=  EEH_Template::display_template( $template, $tab, true );
+		foreach ($tab_array as $tab) {
+			$tabs .= EEH_Template::display_template($template, $tab, true);
 		}
 
 		return $tabs;
@@ -2900,29 +2900,29 @@ 
 	 *
 	 * @return string            html formatted content
 	 */
-	protected function _get_messenger_box_content( EE_messenger $messenger ) {
+	protected function _get_messenger_box_content(EE_messenger $messenger) {
 
 		$fields = $messenger->get_admin_settings_fields();
 		$settings_template_args['template_form_fields'] = '';
 
 		//is $messenger active?
-		$settings_template_args['active'] = $this->_message_resource_manager->is_messenger_active( $messenger->name );
+		$settings_template_args['active'] = $this->_message_resource_manager->is_messenger_active($messenger->name);
 
 
-		if ( ! empty( $fields ) ) {
+		if ( ! empty($fields)) {
 
 			$existing_settings = $messenger->get_existing_admin_settings();
 
-			foreach( $fields as $fldname => $fldprops ) {
-				$field_id = $messenger->name . '-' . $fldname;
+			foreach ($fields as $fldname => $fldprops) {
+				$field_id = $messenger->name.'-'.$fldname;
 				$template_form_field[$field_id] = array(
-					'name' => 'messenger_settings[' . $field_id . ']',
+					'name' => 'messenger_settings['.$field_id.']',
 					'label' => $fldprops['label'],
 					'input' => $fldprops['field_type'],
 					'type' => $fldprops['value_type'],
 					'required' => $fldprops['required'],
 					'validation' => $fldprops['validation'],
-					'value' => isset( $existing_settings[$field_id])
+					'value' => isset($existing_settings[$field_id])
 						? $existing_settings[$field_id]
 						: $fldprops['default'],
 					'css_class' => '',
@@ -2931,8 +2931,8 @@ 
 			}
 
 
-			$settings_template_args['template_form_fields'] = !empty($template_form_field)
-				? $this->_generate_admin_form_fields( $template_form_field, 'string', 'ee_m_activate_form' )
+			$settings_template_args['template_form_fields'] = ! empty($template_form_field)
+				? $this->_generate_admin_form_fields($template_form_field, 'string', 'ee_m_activate_form')
 				: '';
 		}
 
@@ -2949,39 +2949,39 @@ 
 			);
 
 		//make sure any active message types that are existing are included in the hidden fields
-		if ( isset( $this->_m_mt_settings['message_type_tabs'][$messenger->name]['active'] ) ) {
-			foreach ( $this->_m_mt_settings['message_type_tabs'][$messenger->name]['active'] as $mt => $values ) {
+		if (isset($this->_m_mt_settings['message_type_tabs'][$messenger->name]['active'])) {
+			foreach ($this->_m_mt_settings['message_type_tabs'][$messenger->name]['active'] as $mt => $values) {
 				$settings_template_args['hidden_fields']['messenger_settings[message_types]['.$mt.']'] = array(
 						'type' => 'hidden',
 						'value' => $mt
 					);
 			}
 		}
-		$settings_template_args[ 'hidden_fields' ] = $this->_generate_admin_form_fields(
-			$settings_template_args[ 'hidden_fields' ],
+		$settings_template_args['hidden_fields'] = $this->_generate_admin_form_fields(
+			$settings_template_args['hidden_fields'],
 			'array'
 		);
-		$active = $this->_message_resource_manager->is_messenger_active( $messenger->name );
+		$active = $this->_message_resource_manager->is_messenger_active($messenger->name);
 
 		$settings_template_args['messenger'] = $messenger->name;
 		$settings_template_args['description'] = $messenger->description;
 		$settings_template_args['show_hide_edit_form'] = $active ? '' : ' hidden';
 
 
-		$settings_template_args['show_hide_edit_form'] = $this->_message_resource_manager->is_messenger_active( $messenger->name )
+		$settings_template_args['show_hide_edit_form'] = $this->_message_resource_manager->is_messenger_active($messenger->name)
 			? $settings_template_args['show_hide_edit_form']
 			: ' hidden';
 
-		$settings_template_args['show_hide_edit_form'] = empty( $settings_template_args['template_form_fields'] )
+		$settings_template_args['show_hide_edit_form'] = empty($settings_template_args['template_form_fields'])
 			? ' hidden'
 			: $settings_template_args['show_hide_edit_form'];
 
 
 		$settings_template_args['on_off_action'] = $active ? 'messenger-off' : 'messenger-on';
-		$settings_template_args['nonce'] = wp_create_nonce('activate_' . $messenger->name . '_toggle_nonce');
+		$settings_template_args['nonce'] = wp_create_nonce('activate_'.$messenger->name.'_toggle_nonce');
 		$settings_template_args['on_off_status'] = $active ? true : false;
-		$template = EE_MSG_TEMPLATE_PATH . 'ee_msg_m_settings_content.template.php';
-		$content = EEH_Template::display_template( $template, $settings_template_args, true);
+		$template = EE_MSG_TEMPLATE_PATH.'ee_msg_m_settings_content.template.php';
+		$content = EEH_Template::display_template($template, $settings_template_args, true);
 		return $content;
 	}
 
@@ -2995,9 +2995,9 @@ 
 		$success = true;
 		$this->_prep_default_response_for_messenger_or_message_type_toggle();
 		//let's check that we have required data
-		if ( !isset( $this->_req_data[ 'messenger' ] ) ) {
+		if ( ! isset($this->_req_data['messenger'])) {
 			EE_Error::add_error(
-				__( 'Messenger name needed to toggle activation. None given', 'event_espresso' ),
+				__('Messenger name needed to toggle activation. None given', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -3006,14 +3006,14 @@ 
 		}
 
 		//do a nonce check here since we're not arriving via a normal route
-		$nonce = isset($this->_req_data[ 'activate_nonce' ]) ? sanitize_text_field( $this->_req_data[ 'activate_nonce'] ) : '';
-		$nonce_ref = 'activate_' . $this->_req_data['messenger'] . '_toggle_nonce';
+		$nonce = isset($this->_req_data['activate_nonce']) ? sanitize_text_field($this->_req_data['activate_nonce']) : '';
+		$nonce_ref = 'activate_'.$this->_req_data['messenger'].'_toggle_nonce';
 
-		$this->_verify_nonce( $nonce, $nonce_ref );
+		$this->_verify_nonce($nonce, $nonce_ref);
 
 
 
-		if ( !isset( $this->_req_data[ 'status' ])) {
+		if ( ! isset($this->_req_data['status'])) {
 			EE_Error::add_error(
 				__(
 					'Messenger status needed to know whether activation or deactivation is happening. No status is given',
@@ -3029,11 +3029,11 @@ 
 		//do check to verify we have a valid status.
 		$status = $this->_req_data['status'];
 
-		if ( $status != 'off' && $status != 'on' ) {
+		if ($status != 'off' && $status != 'on') {
 			EE_Error::add_error(
 				sprintf(
-					__( 'The given status (%s) is not valid. Must be "off" or "on"', 'event_espresso' ),
-					$this->_req_data[ 'status' ]
+					__('The given status (%s) is not valid. Must be "off" or "on"', 'event_espresso'),
+					$this->_req_data['status']
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -3042,11 +3042,11 @@ 
 			$success = false;
 		}
 
-		if ( $success ) {
+		if ($success) {
 			//made it here?  Stop dawdling then!!
 			$success = $status == 'off'
-				? $this->_deactivate_messenger( $this->_req_data['messenger'] )
-				: $this->_activate_messenger( $this->_req_data['messenger'] );
+				? $this->_deactivate_messenger($this->_req_data['messenger'])
+				: $this->_activate_messenger($this->_req_data['messenger']);
 		}
 
 		$this->_template_args['success'] = $success;
@@ -3069,7 +3069,7 @@ 
 		$this->_prep_default_response_for_messenger_or_message_type_toggle();
 
 		//let's make sure we have the necessary data
-		if ( ! isset( $this->_req_data[ 'message_type' ] ) ) {
+		if ( ! isset($this->_req_data['message_type'])) {
 			EE_Error::add_error(
 				__('Message Type name needed to toggle activation. None given', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
@@ -3077,7 +3077,7 @@ 
 			$success = false;
 		}
 
-		if ( ! isset( $this->_req_data[ 'messenger' ] ) ) {
+		if ( ! isset($this->_req_data['messenger'])) {
 			EE_Error::add_error(
 				__('Messenger name needed to toggle activation. None given', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
@@ -3085,7 +3085,7 @@ 
 			$success = false;
 		}
 
-		if ( ! isset( $this->_req_data[ 'status' ])) {
+		if ( ! isset($this->_req_data['status'])) {
 			EE_Error::add_error(
 				__('Messenger status needed to know whether activation or deactivation is happening. No status is given', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
@@ -3097,7 +3097,7 @@ 
 		//do check to verify we have a valid status.
 		$status = $this->_req_data['status'];
 
-		if ( $status != 'activate' && $status != 'deactivate' ) {
+		if ($status != 'activate' && $status != 'deactivate') {
 			EE_Error::add_error(
 				sprintf(
 					__('The given status (%s) is not valid. Must be "active" or "inactive"', 'event_espresso'),
@@ -3110,16 +3110,16 @@ 
 
 
 		//do a nonce check here since we're not arriving via a normal route
-		$nonce = isset( $this->_req_data['mt_nonce'] ) ? sanitize_text_field( $this->_req_data['mt_nonce'] ) : '';
-		$nonce_ref = $this->_req_data['message_type'] . '_nonce';
+		$nonce = isset($this->_req_data['mt_nonce']) ? sanitize_text_field($this->_req_data['mt_nonce']) : '';
+		$nonce_ref = $this->_req_data['message_type'].'_nonce';
 
-		$this->_verify_nonce( $nonce, $nonce_ref );
+		$this->_verify_nonce($nonce, $nonce_ref);
 
-		if ( $success ) {
+		if ($success) {
 			//made it here? um, what are you waiting for then?
 			$success = $status == 'deactivate'
-				? $this->_deactivate_message_type_for_messenger( $this->_req_data['messenger'], $this->_req_data['message_type'] )
-				: $this->_activate_message_type_for_messenger( $this->_req_data['messenger'], $this->_req_data['message_type'] );
+				? $this->_deactivate_message_type_for_messenger($this->_req_data['messenger'], $this->_req_data['message_type'])
+				: $this->_activate_message_type_for_messenger($this->_req_data['messenger'], $this->_req_data['message_type']);
 		}
 
 		$this->_template_args['success'] = $success;
@@ -3133,30 +3133,30 @@ 
 	 * @param string $messenger_name The name of the messenger being activated
 	 * @return bool
 	 */
-	protected function _activate_messenger( $messenger_name ) {
+	protected function _activate_messenger($messenger_name) {
 		/** @var EE_messenger $active_messenger  This will be present because it can't be toggled if it isn't*/
-		$active_messenger = $this->_message_resource_manager->get_messenger( $messenger_name );
+		$active_messenger = $this->_message_resource_manager->get_messenger($messenger_name);
 		$message_types_to_activate = $active_messenger instanceof EE_Messenger ? $active_messenger->get_default_message_types() : array();
 
 		//ensure is active
-		$this->_message_resource_manager->activate_messenger( $messenger_name, $message_types_to_activate );
+		$this->_message_resource_manager->activate_messenger($messenger_name, $message_types_to_activate);
 
 		//set response_data for reload
-		foreach( $message_types_to_activate as $message_type_name ) {
+		foreach ($message_types_to_activate as $message_type_name) {
 			/** @var EE_message_type $message_type */
-			$message_type = $this->_message_resource_manager->get_message_type( $message_type_name );
-			if ( $this->_message_resource_manager->is_message_type_active_for_messenger( $messenger_name, $message_type_name )
+			$message_type = $this->_message_resource_manager->get_message_type($message_type_name);
+			if ($this->_message_resource_manager->is_message_type_active_for_messenger($messenger_name, $message_type_name)
 			     && $message_type instanceof EE_message_type
 			) {
 				$this->_template_args['data']['active_mts'][] = $message_type_name;
-				if ( $message_type->get_admin_settings_fields() ) {
+				if ($message_type->get_admin_settings_fields()) {
 					$this->_template_args['data']['mt_reload'][] = $message_type_name;
 				}
 			}
 		}
 
 		//add success message for activating messenger
-		return $this->_setup_response_message_for_activating_messenger_with_message_types( $active_messenger );
+		return $this->_setup_response_message_for_activating_messenger_with_message_types($active_messenger);
 
 	}
 
@@ -3167,11 +3167,11 @@ 
 	 * @param string $messenger_name The name of the messenger being activated
 	 * @return bool
 	 */
-	protected function _deactivate_messenger( $messenger_name ) {
+	protected function _deactivate_messenger($messenger_name) {
 		/** @var EE_messenger $active_messenger  This will be present because it can't be toggled if it isn't*/
-		$active_messenger = $this->_message_resource_manager->get_messenger( $messenger_name );
-		$this->_message_resource_manager->deactivate_messenger( $messenger_name );
-		return $this->_setup_response_message_for_deactivating_messenger_with_message_types( $active_messenger );
+		$active_messenger = $this->_message_resource_manager->get_messenger($messenger_name);
+		$this->_message_resource_manager->deactivate_messenger($messenger_name);
+		return $this->_setup_response_message_for_deactivating_messenger_with_message_types($active_messenger);
 	}
 
 
@@ -3182,23 +3182,23 @@ 
 	 * @param string $message_type_name  The name of the message type being activated for the messenger
 	 * @return bool
 	 */
-	protected function _activate_message_type_for_messenger( $messenger_name, $message_type_name ) {
+	protected function _activate_message_type_for_messenger($messenger_name, $message_type_name) {
 		/** @var EE_messenger $active_messenger  This will be present because it can't be toggled if it isn't*/
-		$active_messenger = $this->_message_resource_manager->get_messenger( $messenger_name );
+		$active_messenger = $this->_message_resource_manager->get_messenger($messenger_name);
 		/** @var EE_message_type $message_type_to_activate This will be present because it can't be toggled if it isn't*/
-		$message_type_to_activate = $this->_message_resource_manager->get_message_type( $message_type_name );
+		$message_type_to_activate = $this->_message_resource_manager->get_message_type($message_type_name);
 
 		//ensure is active
-		$this->_message_resource_manager->activate_messenger( $messenger_name, $message_type_name );
+		$this->_message_resource_manager->activate_messenger($messenger_name, $message_type_name);
 
 		//set response for load
-		if ( $this->_message_resource_manager->is_message_type_active_for_messenger( $messenger_name, $message_type_name ) ) {
+		if ($this->_message_resource_manager->is_message_type_active_for_messenger($messenger_name, $message_type_name)) {
 			$this->_template_args['data']['active_mts'][] = $message_type_name;
-			if ( $message_type_to_activate->get_admin_settings_fields() ) {
+			if ($message_type_to_activate->get_admin_settings_fields()) {
 				$this->_template_args['data']['mt_reload'][] = $message_type_name;
 			}
 		}
-		return $this->_setup_response_message_for_activating_messenger_with_message_types( $active_messenger, $message_type_to_activate );
+		return $this->_setup_response_message_for_activating_messenger_with_message_types($active_messenger, $message_type_to_activate);
 	}
 
 
@@ -3210,13 +3210,13 @@ 
 	 * @param string $message_type_name  The name of the message type being deactivated for the messenger
 	 * @return bool
 	 */
-	protected function _deactivate_message_type_for_messenger( $messenger_name, $message_type_name ) {
+	protected function _deactivate_message_type_for_messenger($messenger_name, $message_type_name) {
 		/** @var EE_messenger $active_messenger  This will be present because it can't be toggled if it isn't*/
-		$active_messenger = $this->_message_resource_manager->get_messenger( $messenger_name );
+		$active_messenger = $this->_message_resource_manager->get_messenger($messenger_name);
 		/** @var EE_message_type $message_type_to_activate This will be present because it can't be toggled if it isn't*/
-		$message_type_to_deactivate = $this->_message_resource_manager->get_message_type( $message_type_name );
-		$this->_message_resource_manager->deactivate_message_type_for_messenger( $message_type_name, $messenger_name );
-		return $this->_setup_response_message_for_deactivating_messenger_with_message_types( $active_messenger, $message_type_to_deactivate );
+		$message_type_to_deactivate = $this->_message_resource_manager->get_message_type($message_type_name);
+		$this->_message_resource_manager->deactivate_message_type_for_messenger($message_type_name, $messenger_name);
+		return $this->_setup_response_message_for_deactivating_messenger_with_message_types($active_messenger, $message_type_to_deactivate);
 	}
 
 
@@ -3247,9 +3247,9 @@ 
 		EE_Message_Type $message_type = null
 	) {
 		//if $messenger isn't a valid messenger object then get out.
-		if ( ! $messenger instanceof EE_Messenger ) {
+		if ( ! $messenger instanceof EE_Messenger) {
 			EE_Error::add_error(
-				__( 'The messenger being activated is not a valid messenger', 'event_espresso' ),
+				__('The messenger being activated is not a valid messenger', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -3257,32 +3257,32 @@ 
 			return false;
 		}
 		//activated
-		if ( $this->_template_args['data']['active_mts'] ) {
+		if ($this->_template_args['data']['active_mts']) {
 			EE_Error::overwrite_success();
 			//activated a message type with the messenger
-			if ( $message_type instanceof EE_message_type ) {
+			if ($message_type instanceof EE_message_type) {
 				EE_Error::add_success(
 					sprintf(
 						__('%s message type has been successfully activated with the %s messenger', 'event_espresso'),
-						ucwords( $message_type->label['singular'] ),
-						ucwords( $messenger->label['singular'] )
+						ucwords($message_type->label['singular']),
+						ucwords($messenger->label['singular'])
 					)
 				);
 
 				//if message type was invoice then let's make sure we activate the invoice payment method.
-				if ( $message_type->name == 'invoice' ) {
-					EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-					$pm = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( 'Invoice' );
-					if ( $pm instanceof EE_Payment_Method ) {
-						EE_Error::add_attention( __('Activating the invoice message type also automatically activates the invoice payment method.  If you do not wish the invoice payment method to be active, or to change its settings, visit the payment method admin page.', 'event_espresso' ) );
+				if ($message_type->name == 'invoice') {
+					EE_Registry::instance()->load_lib('Payment_Method_Manager');
+					$pm = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type('Invoice');
+					if ($pm instanceof EE_Payment_Method) {
+						EE_Error::add_attention(__('Activating the invoice message type also automatically activates the invoice payment method.  If you do not wish the invoice payment method to be active, or to change its settings, visit the payment method admin page.', 'event_espresso'));
 					}
 				}
 			//just toggles the entire messenger
 			} else {
 				EE_Error::add_success(
 					sprintf(
-						__( '%s messenger has been successfully activated', 'event_espresso' ),
-						ucwords( $messenger->label[ 'singular' ] )
+						__('%s messenger has been successfully activated', 'event_espresso'),
+						ucwords($messenger->label['singular'])
 					)
 				);
 			}
@@ -3292,12 +3292,12 @@ 
 		//message types after the activation process.  However its possible some messengers don't HAVE any default_message_types
 		//in which case we just give a success message for the messenger being successfully activated.
 		} else {
-			if ( ! $messenger->get_default_message_types() ) {
+			if ( ! $messenger->get_default_message_types()) {
 				//messenger doesn't have any default message types so still a success.
 				EE_Error::add_success(
 					sprintf(
-						__('%s messenger was successfully activated.', 'event_espresso' ),
-						ucwords( $messenger->label['singular'] )
+						__('%s messenger was successfully activated.', 'event_espresso'),
+						ucwords($messenger->label['singular'])
 						)
 				);
 				return true;
@@ -3305,13 +3305,13 @@ 
 				EE_Error::add_error(
 					$message_type instanceof EE_message_type
 						? sprintf(
-						__( '%s message type was not successfully activated with the %s messenger', 'event_espresso' ),
-						ucwords( $message_type->label['singular'] ),
-						ucwords( $messenger->label['singular'] )
+						__('%s message type was not successfully activated with the %s messenger', 'event_espresso'),
+						ucwords($message_type->label['singular']),
+						ucwords($messenger->label['singular'])
 					)
 						: sprintf(
-						__( '%s messenger was not successfully activated', 'event_espresso' ),
-						ucwords( $messenger->label['singular'] )
+						__('%s messenger was not successfully activated', 'event_espresso'),
+						ucwords($messenger->label['singular'])
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -3339,9 +3339,9 @@ 
 		EE_Error::overwrite_success();
 
 		//if $messenger isn't a valid messenger object then get out.
-		if ( ! $messenger instanceof EE_Messenger ) {
+		if ( ! $messenger instanceof EE_Messenger) {
 			EE_Error::add_error(
-				__( 'The messenger being deactivated is not a valid messenger', 'event_espresso' ),
+				__('The messenger being deactivated is not a valid messenger', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -3349,13 +3349,13 @@ 
 			return false;
 		}
 
-		if ( $message_type instanceof EE_message_type ) {
+		if ($message_type instanceof EE_message_type) {
 			$message_type_name = $message_type->name;
 			EE_Error::add_success(
 				sprintf(
 					__('%s message type has been successfully deactivated for the %s messenger.', 'event_espresso'),
-					ucwords( $message_type->label['singular'] ),
-					ucwords ( $messenger->label['singular'] )
+					ucwords($message_type->label['singular']),
+					ucwords($messenger->label['singular'])
 				)
 			);
 		} else {
@@ -3363,20 +3363,20 @@ 
 			EE_Error::add_success(
 				sprintf(
 					__('%s messenger has been successfully deactivated.', 'event_espresso'),
-					ucwords( $messenger->label['singular'] )
+					ucwords($messenger->label['singular'])
 				)
 			);
 		}
 
 		//if messenger was html or message type was invoice then let's make sure we deactivate invoice payment method.
-		if ( $messenger->name == 'html'  || $message_type_name == 'invoice') {
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method( 'invoice' );
-			if ( $count_updated > 0 ) {
+		if ($messenger->name == 'html' || $message_type_name == 'invoice') {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method('invoice');
+			if ($count_updated > 0) {
 				$msg = $message_type_name == 'invoice'
-					? __('Deactivating the invoice message type also automatically deactivates the invoice payment method. In order for invoices to be generated the invoice message type must be active. If you completed this action by mistake, simply reactivate the invoice message type and then visit the payment methods admin page to reactivate the invoice payment method.', 'event_espresso' )
-					: __('Deactivating the html messenger also automatically deactivates the invoice payment method.  In order for invoices to be generated the html messenger must be be active.  If you completed this action by mistake, simply reactivate the html messenger, then visit the payment methods admin page to reactivate the invoice payment method.', 'event_espresso' );
-				EE_Error::add_attention( $msg );
+					? __('Deactivating the invoice message type also automatically deactivates the invoice payment method. In order for invoices to be generated the invoice message type must be active. If you completed this action by mistake, simply reactivate the invoice message type and then visit the payment methods admin page to reactivate the invoice payment method.', 'event_espresso')
+					: __('Deactivating the html messenger also automatically deactivates the invoice payment method.  In order for invoices to be generated the html messenger must be be active.  If you completed this action by mistake, simply reactivate the html messenger, then visit the payment methods admin page to reactivate the invoice payment method.', 'event_espresso');
+				EE_Error::add_attention($msg);
 			}
 		}
 		return true;
@@ -3387,17 +3387,17 @@ 
 	 * handles updating a message type form on messenger activation IF the message type has settings fields. (via ajax)
 	 */
 	public function update_mt_form() {
-		if ( !isset( $this->_req_data['messenger'] ) || !isset( $this->_req_data['message_type'] ) ) {
-			EE_Error::add_error( __('Require message type or messenger to send an updated form'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['messenger']) || ! isset($this->_req_data['message_type'])) {
+			EE_Error::add_error(__('Require message type or messenger to send an updated form'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_return_json();
 		}
 
 		$message_types = $this->get_installed_message_types();
 
-		$message_type = $message_types[ $this->_req_data['message_type'] ];
-		$messenger = $this->_message_resource_manager->get_active_messenger( $this->_req_data['messenger'] );
+		$message_type = $message_types[$this->_req_data['message_type']];
+		$messenger = $this->_message_resource_manager->get_active_messenger($this->_req_data['messenger']);
 
-		$content = $this->_message_type_settings_content ( $message_type, $messenger, true );
+		$content = $this->_message_type_settings_content($message_type, $messenger, true);
 		$this->_template_args['success'] = true;
 		$this->_template_args['content'] = $content;
 		$this->_return_json();
@@ -3411,45 +3411,45 @@ 
 	 *
 	 */
 	public function save_settings() {
-		if ( !isset( $this->_req_data['type'] ) ) {
-			EE_Error::add_error(__('Cannot save settings because type is unknown (messenger settings or messsage type settings?)', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['type'])) {
+			EE_Error::add_error(__('Cannot save settings because type is unknown (messenger settings or messsage type settings?)', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$this->_template_args['error'] = true;
 			$this->_return_json();
 		}
 
 
-		if ( $this->_req_data['type'] == 'messenger' ) {
+		if ($this->_req_data['type'] == 'messenger') {
 			$settings = $this->_req_data['messenger_settings']; //this should be an array.
 			$messenger = $settings['messenger'];
 			//let's setup the settings data
-			foreach ( $settings as $key => $value ) {
-				switch ( $key ) {
+			foreach ($settings as $key => $value) {
+				switch ($key) {
 					case 'messenger' :
-						unset( $settings['messenger'] );
+						unset($settings['messenger']);
 						break;
 					case 'message_types' :
-						unset( $settings['message_types'] );
+						unset($settings['message_types']);
 						break;
 					default :
 						$settings[$key] = $value;
 						break;
 				}
 			}
-			$this->_message_resource_manager->add_settings_for_messenger( $messenger, $settings );
+			$this->_message_resource_manager->add_settings_for_messenger($messenger, $settings);
 		}
 
-		else if ( $this->_req_data['type'] == 'message_type' ) {
+		else if ($this->_req_data['type'] == 'message_type') {
 			$settings = $this->_req_data['message_type_settings'];
 			$messenger = $settings['messenger'];
 			$message_type = $settings['message_type'];
 
-			foreach ( $settings as $key => $value ) {
-				switch ( $key ) {
+			foreach ($settings as $key => $value) {
+				switch ($key) {
 					case 'messenger' :
-						unset( $settings['messenger'] );
+						unset($settings['messenger']);
 						break;
 					case 'message_type' :
-						unset( $settings['message_type'] );
+						unset($settings['message_type']);
 						break;
 					default :
 						$settings[$key] = $value;
@@ -3457,16 +3457,16 @@ 
 				}
 			}
 
-			$this->_message_resource_manager->add_settings_for_message_type( $messenger, $message_type, $settings );
+			$this->_message_resource_manager->add_settings_for_message_type($messenger, $message_type, $settings);
 		}
 
 		//okay we should have the data all setup.  Now we just update!
 		$success = $this->_message_resource_manager->update_active_messengers_option();
 
-		if ( $success ) {
-			EE_Error::add_success( __('Settings updated', 'event_espresso') );
+		if ($success) {
+			EE_Error::add_success(__('Settings updated', 'event_espresso'));
 		} else {
-			EE_Error::add_error( __('Settings did not get updated', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Settings did not get updated', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
 		$this->_template_args['success'] = $success;
@@ -3488,8 +3488,8 @@ 
      */
 	protected function _generate_now() {
 		$msg_ids = $this->_get_msg_ids_from_request();
-		EED_Messages::generate_now( $msg_ids );
-		$this->_redirect_after_action( false, '', '', array(), true );
+		EED_Messages::generate_now($msg_ids);
+		$this->_redirect_after_action(false, '', '', array(), true);
 	}
 
 
@@ -3504,7 +3504,7 @@ 
 	protected function _generate_and_send_now() {
 		$this->_generate_now();
 		$this->_send_now();
-		$this->_redirect_after_action( false, '', '', array(), true );
+		$this->_redirect_after_action(false, '', '', array(), true);
 	}
 
 
@@ -3518,8 +3518,8 @@ 
      */
 	protected function _queue_for_resending() {
 		$msg_ids = $this->_get_msg_ids_from_request();
-		EED_Messages::queue_for_resending( $msg_ids );
-		$this->_redirect_after_action( false, '', '', array(), true );
+		EED_Messages::queue_for_resending($msg_ids);
+		$this->_redirect_after_action(false, '', '', array(), true);
 	}
 
 
@@ -3532,8 +3532,8 @@ 
      */
 	protected function _send_now() {
 		$msg_ids = $this->_get_msg_ids_from_request();
-		EED_Messages::send_now( $msg_ids );
-		$this->_redirect_after_action( false, '', '', array(), true );
+		EED_Messages::send_now($msg_ids);
+		$this->_redirect_after_action(false, '', '', array(), true);
 	}
 
 
@@ -3547,23 +3547,23 @@ 
 	protected function _delete_ee_messages() {
 		$msg_ids = $this->_get_msg_ids_from_request();
 		$deleted_count = 0;
-		foreach ( $msg_ids as $msg_id ) {
-			if ( EEM_Message::instance()->delete_by_ID( $msg_id ) ) {
+		foreach ($msg_ids as $msg_id) {
+			if (EEM_Message::instance()->delete_by_ID($msg_id)) {
 				$deleted_count++;
 			}
 		}
-		if ( $deleted_count ) {
+		if ($deleted_count) {
 			$this->_redirect_after_action(
 				true,
-				_n( 'message', 'messages', $deleted_count, 'event_espresso' ),
+				_n('message', 'messages', $deleted_count, 'event_espresso'),
 				__('deleted', 'event_espresso')
 			);
 		} else {
 			EE_Error::add_error(
-				_n( 'The message was not deleted.', 'The messages were not deleted', count( $msg_ids ), 'event_espresso' ),
+				_n('The message was not deleted.', 'The messages were not deleted', count($msg_ids), 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
-			$this->_redirect_after_action( false, '', '', array(), true );
+			$this->_redirect_after_action(false, '', '', array(), true);
 		}
 	}
 
@@ -3576,10 +3576,10 @@ 
      *  @return array
      */
 	protected function _get_msg_ids_from_request() {
-		if ( ! isset( $this->_req_data['MSG_ID'] ) ) {
+		if ( ! isset($this->_req_data['MSG_ID'])) {
 			return array();
 		}
-		return is_array( $this->_req_data['MSG_ID'] ) ? array_keys( $this->_req_data['MSG_ID'] ) : array( $this->_req_data['MSG_ID'] );
+		return is_array($this->_req_data['MSG_ID']) ? array_keys($this->_req_data['MSG_ID']) : array($this->_req_data['MSG_ID']);
 	}
 
 

admin_pages/support/Support_Admin_Page.core.php

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,8 +30,8 @@ 
 class Support_Admin_Page extends EE_Admin_Page {
 
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -84,14 +84,14 @@ 
 				'nav' => array(
 					'label' => __('Shortcodes', 'event_espresso'),
 					'order' => 30),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_shortcodes_boxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_shortcodes_boxes')),
 				'require_nonce' => FALSE
 				),
 			'contact_support' => array(
 				'nav' => array(
 					'label' => __('Support', 'event_espresso'),
 					'order' => 40),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_support_boxes' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_support_boxes')),
 				'require_nonce' => FALSE
 				),
 			'developers' => array(
@@ -119,8 +119,8 @@ 
 
 
 	protected function _installation() {
-		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_installation.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, '', TRUE);
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_installation.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, '', TRUE);
 		$this->display_admin_page_with_sidebar();
 	}
 
@@ -145,10 +145,10 @@ 
 			'other_resources' => __('Other Resources', 'event_espresso')
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
 		}
 	}
 
@@ -169,15 +169,15 @@ 
 			'shortcodes_event_listings' => __('Event Listings', 'event_espresso'),
 			'shortcodes_ticket_selector' => __('Event Ticket Selector', 'event_espresso'),
 			'shortcodes_category' => __('Event Categories', 'event_espresso'),
-			'shortcodes_attendee' => __( 'Event Attendees', 'event_espresso' )
+			'shortcodes_attendee' => __('Event Attendees', 'event_espresso')
 			/*'shortcodes_single_events' => __('Single Events', 'event_espresso'),*/
 			/*'shortcodes_attendee_listings' => __('Attendee Listings', 'event_espresso'),*/
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
 		}
 	}
 
@@ -196,17 +196,17 @@ 
 			'important_information' => __('Important Information', 'event_espresso')
 			);
 
-		foreach ( $boxes as $box => $label ) {
-			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'support_admin_details_' . $box . '.template.php';
+		foreach ($boxes as $box => $label) {
+			$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'support_admin_details_'.$box.'.template.php';
 			$callback_args = array('template_path' => $template_path, 'template_args' => $this->_template_args);
-			add_meta_box( 'espresso_' . $box . '_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
+			add_meta_box('espresso_'.$box.'_settings', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen->id, 'normal', 'high', $callback_args);
 		}
 	}
 
 
 	protected function _developers() {
-		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH . 'developers_admin_details.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, array(), true );
+		$template_path = EE_SUPPORT_ADMIN_TEMPLATE_PATH.'developers_admin_details.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, array(), true);
 		$this->display_admin_page_with_sidebar();
 	}
 } //end Support_Admin_Page class

caffeinated/admin/extend/support/Extend_Support_Admin_Page.core.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -29,16 +29,16 @@ 
  */
 class Extend_Support_Admin_Page extends Support_Admin_Page {
 
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
-		define( 'EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'support/templates/' );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
+		define('EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'support/templates/');
 	}
 
 
 
 
 	protected function _extend_page_config() {
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'support';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'support';
 		//new routes and new configs (or overrides )
 		$new_page_routes = array(
 			'faq' => array(
@@ -46,7 +46,7 @@ 
 				'capability' => 'ee_read_ee'
 				)
 			);
-		$this->_page_routes = array_merge( $this->_page_routes, $new_page_routes );
+		$this->_page_routes = array_merge($this->_page_routes, $new_page_routes);
 
 		$new_page_config = array(
 			'faq' => array(
@@ -57,7 +57,7 @@ 
 				'require_nonce' => FALSE
 				)
 			);
-		$this->_page_config = array_merge( $this->_page_config, $new_page_config );
+		$this->_page_config = array_merge($this->_page_config, $new_page_config);
 
 		$this->_page_config['default']['metaboxes'][] = '_installation_boxes';
 	}
@@ -66,8 +66,8 @@ 
 
 
 	protected function _faq() {
-		$template_path = EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH . 'support_admin_details_faq.template.php';
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, '', TRUE);
+		$template_path = EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH.'support_admin_details_faq.template.php';
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, '', TRUE);
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -75,8 +75,8 @@ 
 
 
 	protected function _installation_boxes() {
-		$callback_args = array('template_path' => EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH . 'support_admin_details_additional_information.template.php');
-		add_meta_box( 'espresso_additional_information_support', __('Additional Information', 'event_espresso'), create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE);' ), $this->_current_screen->id, 'normal', 'high', $callback_args);
+		$callback_args = array('template_path' => EE_SUPPORT_CAF_ADMIN_TEMPLATE_PATH.'support_admin_details_additional_information.template.php');
+		add_meta_box('espresso_additional_information_support', __('Additional Information', 'event_espresso'), create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], "", TRUE);'), $this->_current_screen->id, 'normal', 'high', $callback_args);
 	}
 
 

core/libraries/messages/EE_Messages_Processor.lib.php

Spacing +108 added lines, -108 removed lines

@@ -35,7 +35,7 @@ 
 	 *
 	 * @param EE_Message_Resource_Manager $message_resource_manager
 	 */
-	public function __construct( EE_Message_Resource_Manager $message_resource_manager ) {
+	public function __construct(EE_Message_Resource_Manager $message_resource_manager) {
 		$this->_message_resource_manager = $message_resource_manager;
 		$this->_init_queue_and_generator();
 	}
@@ -50,7 +50,7 @@ 
 	 * - $_generator = holds the messages generator
 	 */
 	protected function _init_queue_and_generator() {
-		$this->_generator = EE_Registry::factory( 'EE_Messages_Generator' );
+		$this->_generator = EE_Registry::factory('EE_Messages_Generator');
 		$this->_queue = $this->_generator->generation_queue();
 	}
 
@@ -75,31 +75,31 @@ 
 	 * @param EE_Messages_Queue $queue_to_process
 	 * @return bool  true for success false for error.
 	 */
-	public function process_immediately_from_queue( EE_Messages_Queue $queue_to_process ) {
+	public function process_immediately_from_queue(EE_Messages_Queue $queue_to_process) {
 		$success = false;
 		$messages_to_send = array();
 		$messages_to_generate = array();
 		//loop through and setup the various messages from the queue so we know what is being processed
 		$queue_to_process->get_message_repository()->rewind();
-		foreach ( $queue_to_process->get_message_repository() as $message ) {
-			if ( $message->STS_ID() === EEM_Message::status_incomplete ) {
+		foreach ($queue_to_process->get_message_repository() as $message) {
+			if ($message->STS_ID() === EEM_Message::status_incomplete) {
 				$messages_to_generate[] = $message;
 				continue;
 			}
 
-			if ( in_array( $message->STS_ID(), EEM_Message::instance()->stati_indicating_to_send() ) ) {
+			if (in_array($message->STS_ID(), EEM_Message::instance()->stati_indicating_to_send())) {
 				$messages_to_send[] = $message;
 				continue;
 			}
 		}
 
 		//do generation/sends
-		if ( $messages_to_generate ) {
-			$success = $this->batch_generate_from_queue( $messages_to_generate, true );
+		if ($messages_to_generate) {
+			$success = $this->batch_generate_from_queue($messages_to_generate, true);
 		}
 
-		if ( $messages_to_send ) {
-			$sent = $this->batch_send_from_queue( $messages_to_send, true );
+		if ($messages_to_send) {
+			$sent = $this->batch_send_from_queue($messages_to_send, true);
 			//if there was messages to generate and it failed, then we override any success value for the sending process
 			//otherwise we just use the return from batch send.  The intent is that there is a simple response for success/fail.
 			//Either everything was successful or we consider it a fail.  To be clear, this is a limitation of doing
@@ -119,13 +119,13 @@ 
 	 * @return bool|EE_Messages_Queue return false if nothing generated.  This returns a new EE_Message_Queue with
 	 *                                   generated messages.
 	 */
-	public function batch_generate_from_queue( $messages = array(), $clear_queue = false ) {
-		if ( $this->_build_queue_for_generation( $messages, $clear_queue ) ) {
+	public function batch_generate_from_queue($messages = array(), $clear_queue = false) {
+		if ($this->_build_queue_for_generation($messages, $clear_queue)) {
 			$new_queue = $this->_generator->generate();
-			if ( $new_queue instanceof EE_Messages_Queue ) {
+			if ($new_queue instanceof EE_Messages_Queue) {
 				//unlock queue
 				$this->_queue->unlock_queue();
-				$new_queue->initiate_request_by_priority( 'send' );
+				$new_queue->initiate_request_by_priority('send');
 				return $new_queue;
 			}
 		}
@@ -146,24 +146,24 @@ 
 	 *
 	 * @return bool true means queue prepped, false means there was a lock so no generation please.
 	 */
-	protected function _build_queue_for_generation( $messages = array(), $clear_queue = false ) {
+	protected function _build_queue_for_generation($messages = array(), $clear_queue = false) {
 
-		if ( $clear_queue ) {
+		if ($clear_queue) {
 			$this->_init_queue_and_generator();
 		}
 
-		if ( $messages ) {
+		if ($messages) {
 			//if generation is locked then get out now because that means processing is already happening.
-			if ( $this->_queue->is_locked() ) {
+			if ($this->_queue->is_locked()) {
 				return false;
 			}
 
 			$this->_queue->lock_queue();
-			$messages = is_array( $messages ) ? $messages : array( $messages );
-			foreach ( $messages as $message ) {
-				if ( $message instanceof EE_Message ) {
+			$messages = is_array($messages) ? $messages : array($messages);
+			foreach ($messages as $message) {
+				if ($message instanceof EE_Message) {
 					$data = $message->all_extra_meta_array();
-					$this->_queue->add( $message, $data );
+					$this->_queue->add($message, $data);
 				}
 			}
 			return true;
@@ -181,22 +181,22 @@ 
 	 *
 	 * @return bool true means queue prepped, false means there was a lock so no queue prepped.
 	 */
-	protected function _build_queue_for_sending( $messages, $clear_queue = false ) {
+	protected function _build_queue_for_sending($messages, $clear_queue = false) {
 		//if sending is locked then get out now because that means processing is already happening.
-		if ( $this->_queue->is_locked( EE_Messages_Queue::action_sending ) ) {
+		if ($this->_queue->is_locked(EE_Messages_Queue::action_sending)) {
 			return false;
 		}
 
-		$this->_queue->lock_queue( EE_Messages_Queue::action_sending );
+		$this->_queue->lock_queue(EE_Messages_Queue::action_sending);
 
-		if ( $clear_queue ) {
+		if ($clear_queue) {
 			$this->_init_queue_and_generator();
 		}
 
-		$messages = is_array( $messages ) ? $messages : array( $messages );
+		$messages = is_array($messages) ? $messages : array($messages);
 
-		foreach ( $messages as $message ) {
-			$this->_queue->add( $message );
+		foreach ($messages as $message) {
+			$this->_queue->add($message);
 		}
 		return true;
 	}
@@ -212,11 +212,11 @@ 
 	 *
 	 * @return EE_Messages_Queue
 	 */
-	public function batch_send_from_queue( $messages = array(), $clear_queue = false ) {
+	public function batch_send_from_queue($messages = array(), $clear_queue = false) {
 
-		if ( $messages && $this->_build_queue_for_sending( $messages, $clear_queue ) ) {
+		if ($messages && $this->_build_queue_for_sending($messages, $clear_queue)) {
 			$this->_queue->execute();
-			$this->_queue->unlock_queue( EE_Messages_Queue::action_sending );
+			$this->_queue->unlock_queue(EE_Messages_Queue::action_sending);
 		} else {
 			//get messages to send and execute.
 			$this->_queue->get_to_send_batch_and_send();
@@ -239,10 +239,10 @@ 
 	 * @param EE_Message_To_Generate[] $messages_to_generate
 	 * @return EE_Messages_Queue
 	 */
-	public function generate_and_return(  $messages_to_generate ) {
+	public function generate_and_return($messages_to_generate) {
 		$this->_init_queue_and_generator();
-		$this->_queue_for_generation_loop( $messages_to_generate );
-		return $this->_generator->generate( false );
+		$this->_queue_for_generation_loop($messages_to_generate);
+		return $this->_generator->generate(false);
 	}
 
 
@@ -253,8 +253,8 @@ 
 	 * @param  bool     $persist    Indicate whether to instruct the generator to persist the generated queue (true) or not (false).
 	 * @return EE_Messages_Queue
 	 */
-	public function generate_queue( $persist = true ) {
-		return $this->_generator->generate( $persist );
+	public function generate_queue($persist = true) {
+		return $this->_generator->generate($persist);
 	}
 
 
@@ -267,9 +267,9 @@ 
 	 * @param bool                   $test_send             Whether this item is for a test send or not.
 	 * @return  EE_Messages_Queue
 	 */
-	public function queue_for_generation( EE_Message_To_Generate $message_to_generate, $test_send = false ) {
-		if ( $message_to_generate->valid() ) {
-			$this->_generator->create_and_add_message_to_queue( $message_to_generate, $test_send );
+	public function queue_for_generation(EE_Message_To_Generate $message_to_generate, $test_send = false) {
+		if ($message_to_generate->valid()) {
+			$this->_generator->create_and_add_message_to_queue($message_to_generate, $test_send);
 		}
 	}
 
@@ -285,9 +285,9 @@ 
 	 *
 	 * @param EE_Message_To_Generate[] $messages_to_generate
 	 */
-	public function batch_queue_for_generation_and_persist( $messages_to_generate ) {
+	public function batch_queue_for_generation_and_persist($messages_to_generate) {
 		$this->_init_queue_and_generator();
-		$this->_queue_for_generation_loop( $messages_to_generate );
+		$this->_queue_for_generation_loop($messages_to_generate);
 		$this->_queue->save();
 	}
 
@@ -303,9 +303,9 @@ 
 	 *
 	 * @param EE_Message_To_Generate[]  $messages_to_generate
 	 */
-	public function batch_queue_for_generation_no_persist( $messages_to_generate ) {
+	public function batch_queue_for_generation_no_persist($messages_to_generate) {
 		$this->_init_queue_and_generator();
-		$this->_queue_for_generation_loop( $messages_to_generate );
+		$this->_queue_for_generation_loop($messages_to_generate);
 	}
 
 
@@ -317,15 +317,15 @@ 
 	 *
 	 * @param EE_Message_To_Generate[] $messages_to_generate
 	 */
-	protected function _queue_for_generation_loop( $messages_to_generate ) {
+	protected function _queue_for_generation_loop($messages_to_generate) {
 		//make sure is in an array.
-		if ( ! is_array( $messages_to_generate ) ) {
-			$messages_to_generate = array( $messages_to_generate );
+		if ( ! is_array($messages_to_generate)) {
+			$messages_to_generate = array($messages_to_generate);
 		}
 
-		foreach ( $messages_to_generate as $message_to_generate ) {
-			if ( $message_to_generate instanceof EE_Message_To_Generate && $message_to_generate->valid() ) {
-				$this->queue_for_generation( $message_to_generate );
+		foreach ($messages_to_generate as $message_to_generate) {
+			if ($message_to_generate instanceof EE_Message_To_Generate && $message_to_generate->valid()) {
+				$this->queue_for_generation($message_to_generate);
 			}
 		}
 	}
@@ -340,10 +340,10 @@ 
 	 * @param  EE_Message_To_Generate[]
 	 * @return EE_Messages_Queue
 	 */
-	public function generate_and_queue_for_sending( $messages_to_generate ) {
+	public function generate_and_queue_for_sending($messages_to_generate) {
 		$this->_init_queue_and_generator();
-		$this->_queue_for_generation_loop( $messages_to_generate );
-		return $this->_generator->generate( true );
+		$this->_queue_for_generation_loop($messages_to_generate);
+		return $this->_generator->generate(true);
 	}
 
 
@@ -357,10 +357,10 @@ 
 	 * @param   bool                   $test_send                Whether this is a test send or not.
 	 * @return  EE_Messages_Queue | bool   false if unable to generate otherwise the generated queue.
 	 */
-	public function generate_for_preview( EE_Message_To_Generate $message_to_generate, $test_send = false ) {
-		if ( ! $message_to_generate->valid() ) {
+	public function generate_for_preview(EE_Message_To_Generate $message_to_generate, $test_send = false) {
+		if ( ! $message_to_generate->valid()) {
 			EE_Error::add_error(
-				__( 'Unable to generate preview because of invalid data', 'event_espresso' ),
+				__('Unable to generate preview because of invalid data', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -368,14 +368,14 @@ 
 			return false;
 		}
 		//just make sure preview is set on the $message_to_generate (in case client forgot)
-		$message_to_generate->set_preview( true );
+		$message_to_generate->set_preview(true);
 		$this->_init_queue_and_generator();
-		$this->queue_for_generation( $message_to_generate, $test_send );
-		$generated_queue = $this->_generator->generate( false );
-		if ( $generated_queue->execute( false ) ) {
+		$this->queue_for_generation($message_to_generate, $test_send);
+		$generated_queue = $this->_generator->generate(false);
+		if ($generated_queue->execute(false)) {
 			//the first queue item should be the preview
 			$generated_queue->get_message_repository()->rewind();
-			if ( ! $generated_queue->get_message_repository()->valid() ) {
+			if ( ! $generated_queue->get_message_repository()->valid()) {
 				return $generated_queue;
 			}
 			return $generated_queue->get_message_repository()->is_test_send() ? true : $generated_queue;
@@ -392,15 +392,15 @@ 
 	 * @param EE_Message_To_Generate $message_to_generate
 	 * @return bool true or false for success.
 	 */
-	public function queue_for_sending( EE_Message_To_Generate $message_to_generate ) {
-		if ( ! $message_to_generate->valid() ) {
+	public function queue_for_sending(EE_Message_To_Generate $message_to_generate) {
+		if ( ! $message_to_generate->valid()) {
 			return false;
 		}
 		$this->_init_queue_and_generator();
 		$message = $message_to_generate->get_EE_Message();
-		$this->_queue->add( $message );
-		if ( $message->send_now() ) {
-			$this->_queue->execute( false );
+		$this->_queue->add($message);
+		if ($message->send_now()) {
+			$this->_queue->execute(false);
 		} else {
 			$this->_queue->save();
 		}
@@ -413,12 +413,12 @@ 
 	 * @param EE_Message_To_Generate $message_to_generate
 	 * @return EE_Messages_Queue | null
 	 */
-	public function generate_and_send_now( EE_Message_To_Generate $message_to_generate ) {
-		if ( ! $message_to_generate->valid() ) {
+	public function generate_and_send_now(EE_Message_To_Generate $message_to_generate) {
+		if ( ! $message_to_generate->valid()) {
 			return null;
 		}
 		// is there supposed to be a sending messenger for this message?
-		if ( $message_to_generate instanceof EEI_Has_Sending_Messenger ) {
+		if ($message_to_generate instanceof EEI_Has_Sending_Messenger) {
 			// make sure it's valid, but if it's not,
 			// then set the value of $sending_messenger to an EE_Error object
 			// so that downstream code can easily see that things went wrong.
@@ -434,14 +434,14 @@ 
 			$sending_messenger = null;
 		}
 
-		if ( $message_to_generate->get_EE_Message()->STS_ID() === EEM_Message::status_idle ) {
+		if ($message_to_generate->get_EE_Message()->STS_ID() === EEM_Message::status_idle) {
 			$this->_init_queue_and_generator();
-			$this->_queue->add( $message_to_generate->get_EE_Message() );
-			$this->_queue->execute( false, $sending_messenger );
+			$this->_queue->add($message_to_generate->get_EE_Message());
+			$this->_queue->execute(false, $sending_messenger);
 			return $this->_queue;
-		} elseif ( $message_to_generate->get_EE_Message()->STS_ID() === EEM_Message::status_incomplete ) {
-			$generated_queue = $this->generate_and_return( array( $message_to_generate ) );
-			$generated_queue->execute( false, $sending_messenger );
+		} elseif ($message_to_generate->get_EE_Message()->STS_ID() === EEM_Message::status_incomplete) {
+			$generated_queue = $this->generate_and_return(array($message_to_generate));
+			$generated_queue->execute(false, $sending_messenger);
 			return $generated_queue;
 		}
 		return null;
@@ -458,13 +458,13 @@ 
 	 * @param mixed  $data   The data being used for generation.
 	 * @param bool   $persist   Whether to persist the queued messages to the db or not.
 	 */
-	public function generate_for_all_active_messengers( $message_type, $data, $persist = true ) {
-		$messages_to_generate = $this->setup_mtgs_for_all_active_messengers( $message_type, $data );
-		if ( $persist ) {
-			$this->batch_queue_for_generation_and_persist( $messages_to_generate );
+	public function generate_for_all_active_messengers($message_type, $data, $persist = true) {
+		$messages_to_generate = $this->setup_mtgs_for_all_active_messengers($message_type, $data);
+		if ($persist) {
+			$this->batch_queue_for_generation_and_persist($messages_to_generate);
 			$this->_queue->initiate_request_by_priority();
 		} else {
-			$this->batch_queue_for_generation_no_persist( $messages_to_generate );
+			$this->batch_queue_for_generation_no_persist($messages_to_generate);
 		}
 	}
 
@@ -479,11 +479,11 @@ 
 	 *
 	 * @return EE_Message_To_Generate[]
 	 */
-	public function setup_mtgs_for_all_active_messengers( $message_type, $data ) {
+	public function setup_mtgs_for_all_active_messengers($message_type, $data) {
 		$messages_to_generate = array();
-		foreach ( $this->_message_resource_manager->active_messengers() as $messenger_slug => $messenger_object  ) {
-			$message_to_generate = new EE_Message_To_Generate( $messenger_slug, $message_type, $data );
-			if ( $message_to_generate->valid() ) {
+		foreach ($this->_message_resource_manager->active_messengers() as $messenger_slug => $messenger_object) {
+			$message_to_generate = new EE_Message_To_Generate($messenger_slug, $message_type, $data);
+			if ($message_to_generate->valid()) {
 				$messages_to_generate[] = $message_to_generate;
 			}
 		}
@@ -498,29 +498,29 @@ 
 	 * and send.
 	 * @param array $message_ids
 	 */
-	public function setup_messages_from_ids_and_send( $message_ids ) {
+	public function setup_messages_from_ids_and_send($message_ids) {
 		$this->_init_queue_and_generator();
-		$messages = EEM_Message::instance()->get_all( array(
+		$messages = EEM_Message::instance()->get_all(array(
 			array(
-				'MSG_ID' => array( 'IN', $message_ids ),
+				'MSG_ID' => array('IN', $message_ids),
 				'STS_ID' => array(
 					'IN',
 					array_merge(
 						EEM_Message::instance()->stati_indicating_sent(),
-						array( EEM_Message::status_retry )
+						array(EEM_Message::status_retry)
 					),
 				),
 			),
 		));
 		//set the Messages to resend.
-		foreach ( $messages as $message ) {
-			if ( $message instanceof EE_Message ) {
-				$message->set_STS_ID( EEM_Message::status_resend );
-				$this->_queue->add( $message );
+		foreach ($messages as $message) {
+			if ($message instanceof EE_Message) {
+				$message->set_STS_ID(EEM_Message::status_resend);
+				$this->_queue->add($message);
 			}
 		}
 
-		$this->_queue->initiate_request_by_priority( 'send' );
+		$this->_queue->initiate_request_by_priority('send');
 	}
 
 
@@ -534,23 +534,23 @@ 
 	 *
 	 * @return EE_Message_To_Generate[]
 	 */
-	public function setup_messages_to_generate_from_registration_ids_in_request( $registration_ids_key = '_REG_ID' ) {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public function setup_messages_to_generate_from_registration_ids_in_request($registration_ids_key = '_REG_ID') {
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_helper('MSG_Template');
 		$regs_to_send = array();
-		$regIDs = EE_Registry::instance()->REQ->get( $registration_ids_key );
-		if ( empty( $regIDs ) ) {
-			EE_Error::add_error( __('Something went wrong because we\'re missing the registration ID', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		$regIDs = EE_Registry::instance()->REQ->get($registration_ids_key);
+		if (empty($regIDs)) {
+			EE_Error::add_error(__('Something went wrong because we\'re missing the registration ID', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
 		//make sure is an array
-		$regIDs = is_array( $regIDs ) ? $regIDs : array( $regIDs );
+		$regIDs = is_array($regIDs) ? $regIDs : array($regIDs);
 
-		foreach( $regIDs as $regID ) {
-			$reg = EEM_Registration::instance()->get_one_by_ID( $regID );
-			if ( ! $reg instanceof EE_Registration ) {
-				EE_Error::add_error( sprintf( __('Unable to retrieve a registration object for the given reg id (%s)', 'event_espresso'), $regID ) );
+		foreach ($regIDs as $regID) {
+			$reg = EEM_Registration::instance()->get_one_by_ID($regID);
+			if ( ! $reg instanceof EE_Registration) {
+				EE_Error::add_error(sprintf(__('Unable to retrieve a registration object for the given reg id (%s)', 'event_espresso'), $regID));
 				return false;
 			}
 			$regs_to_send[$reg->transaction_ID()][$reg->status_ID()][] = $reg;
@@ -558,13 +558,13 @@ 
 
 		$messages_to_generate = array();
 
-		foreach ( $regs_to_send as $status_group ) {
-			foreach ( $status_group as $status_id => $registrations ) {
+		foreach ($regs_to_send as $status_group) {
+			foreach ($status_group as $status_id => $registrations) {
 				$messages_to_generate = array_merge(
 					$messages_to_generate,
 					$this->setup_mtgs_for_all_active_messengers(
-						EEH_MSG_Template::convert_reg_status_to_message_type( $status_id ),
-						array( $registrations, $status_id )
+						EEH_MSG_Template::convert_reg_status_to_message_type($status_id),
+						array($registrations, $status_id)
 					)
 				);
 			}

core/libraries/messages/EE_Messages_Queue.lib.php

Spacing +97 added lines, -97 removed lines

@@ -71,8 +71,8 @@ 
 	 *
 	 * @param \EE_Message_Repository       $message_repository
 	 */
-	public function __construct( EE_Message_Repository $message_repository ) {
-		$this->_batch_count        = apply_filters( 'FHEE__EE_Messages_Queue___batch_count', 50 );
+	public function __construct(EE_Message_Repository $message_repository) {
+		$this->_batch_count        = apply_filters('FHEE__EE_Messages_Queue___batch_count', 50);
 		$this->_rate_limit         = $this->get_rate_limit();
 		$this->_message_repository = $message_repository;
 	}
@@ -91,10 +91,10 @@ 
 	 *                                 use the messenger send method but typically is based on preview data.
 	 * @return bool          Whether the message was successfully added to the repository or not.
 	 */
-	public function add( EE_Message $message, $data = array(), $preview = false, $test_send = false ) {
+	public function add(EE_Message $message, $data = array(), $preview = false, $test_send = false) {
 		$data['preview'] = $preview;
 		$data['test_send'] = $test_send;
-		return $this->_message_repository->add( $message, $data );
+		return $this->_message_repository->add($message, $data);
 	}
 
 
@@ -106,13 +106,13 @@ 
 	 * @param bool          $persist    This flag indicates whether to attempt to delete the object from the db as well.
 	 * @return bool
 	 */
-	public function remove( EE_Message $message, $persist = false ) {
-		if ( $persist && $this->_message_repository->current() !== $message ) {
+	public function remove(EE_Message $message, $persist = false) {
+		if ($persist && $this->_message_repository->current() !== $message) {
 			//get pointer on right message
-			if ( $this->_message_repository->has( $message ) ) {
+			if ($this->_message_repository->has($message)) {
 				$this->_message_repository->rewind();
-				while( $this->_message_repository->valid() ) {
-					if ( $this->_message_repository->current() === $message ) {
+				while ($this->_message_repository->valid()) {
+					if ($this->_message_repository->current() === $message) {
 						break;
 					}
 					$this->_message_repository->next();
@@ -121,7 +121,7 @@ 
 				return false;
 			}
 		}
-		return $persist ? $this->_message_repository->delete() : $this->_message_repository->remove( $message );
+		return $persist ? $this->_message_repository->delete() : $this->_message_repository->remove($message);
 	}
 
 
@@ -161,29 +161,29 @@ 
 	 * @return bool  true if successfully retrieved batch, false no batch ready.
 	 */
 	public function get_batch_to_generate() {
-		if ( $this->is_locked( EE_Messages_Queue::action_generating ) ) {
+		if ($this->is_locked(EE_Messages_Queue::action_generating)) {
 			return false;
 		}
 
 		//lock batch generation to prevent race conditions.
-		$this->lock_queue( EE_Messages_Queue::action_generating );
+		$this->lock_queue(EE_Messages_Queue::action_generating);
 
 		$query_args = array(
 			// key 0 = where conditions
-			0 => array( 'STS_ID' => EEM_Message::status_incomplete ),
+			0 => array('STS_ID' => EEM_Message::status_incomplete),
 			'order_by' => $this->_get_priority_orderby(),
 			'limit' => $this->_batch_count
 		);
-		$messages = EEM_Message::instance()->get_all( $query_args );
+		$messages = EEM_Message::instance()->get_all($query_args);
 
-		if ( ! $messages ) {
+		if ( ! $messages) {
 			return false; //nothing to generate
 		}
 
-		foreach ( $messages as $message ) {
-			if ( $message instanceof EE_Message ) {
+		foreach ($messages as $message) {
+			if ($message instanceof EE_Message) {
 				$data = $message->all_extra_meta_array();
-				$this->add( $message, $data );
+				$this->add($message, $data);
 			}
 		}
 		return true;
@@ -206,34 +206,34 @@ 
 	 *               to assist with notifying user.
 	 */
 	public function get_to_send_batch_and_send() {
-		if ( $this->is_locked( EE_Messages_Queue::action_sending ) || $this->_rate_limit < 1 ) {
+		if ($this->is_locked(EE_Messages_Queue::action_sending) || $this->_rate_limit < 1) {
 			return false;
 		}
 
-		$this->lock_queue( EE_Messages_Queue::action_sending );
+		$this->lock_queue(EE_Messages_Queue::action_sending);
 
 		$batch = $this->_batch_count < $this->_rate_limit ? $this->_batch_count : $this->_rate_limit;
 
 		$query_args = array(
 			// key 0 = where conditions
-			0 => array( 'STS_ID' => array( 'IN', EEM_Message::instance()->stati_indicating_to_send() ) ),
+			0 => array('STS_ID' => array('IN', EEM_Message::instance()->stati_indicating_to_send())),
 			'order_by' => $this->_get_priority_orderby(),
 			'limit' => $batch
 		);
 
-		$messages_to_send = EEM_Message::instance()->get_all( $query_args );
+		$messages_to_send = EEM_Message::instance()->get_all($query_args);
 
 
 		//any to send?
-		if ( ! $messages_to_send ) {
-			$this->unlock_queue( EE_Messages_Queue::action_sending );
+		if ( ! $messages_to_send) {
+			$this->unlock_queue(EE_Messages_Queue::action_sending);
 			return false;
 		}
 
 		//add to queue.
-		foreach ( $messages_to_send as $message ) {
-			if ( $message instanceof EE_Message ) {
-				$this->add( $message );
+		foreach ($messages_to_send as $message) {
+			if ($message instanceof EE_Message) {
+				$this->add($message);
 			}
 		}
 
@@ -241,7 +241,7 @@ 
 		$this->execute();
 
 		//release lock
-		$this->unlock_queue( EE_Messages_Queue::action_sending );
+		$this->unlock_queue(EE_Messages_Queue::action_sending);
 		return true;
 	}
 
@@ -253,8 +253,8 @@ 
 	 *
 	 * @param   string  $type   The type of queue being locked.
 	 */
-	public function lock_queue( $type = EE_Messages_Queue::action_generating ) {
-		set_transient( $this->_get_lock_key( $type ), 1, $this->_get_lock_expiry( $type ) );
+	public function lock_queue($type = EE_Messages_Queue::action_generating) {
+		set_transient($this->_get_lock_key($type), 1, $this->_get_lock_expiry($type));
 	}
 
 
@@ -265,8 +265,8 @@ 
 	 *
 	 * @param   string  $type   The type of queue being unlocked.
 	 */
-	public function unlock_queue( $type = EE_Messages_Queue::action_generating ) {
-		delete_transient( $this->_get_lock_key( $type ) );
+	public function unlock_queue($type = EE_Messages_Queue::action_generating) {
+		delete_transient($this->_get_lock_key($type));
 	}
 
 
@@ -277,8 +277,8 @@ 
 	 * @param string $type  The type of lock.
 	 * @return string
 	 */
-	protected function _get_lock_key( $type = EE_Messages_Queue::action_generating ) {
-		return '_ee_lock_' . $type;
+	protected function _get_lock_key($type = EE_Messages_Queue::action_generating) {
+		return '_ee_lock_'.$type;
 	}
 
 
@@ -289,8 +289,8 @@ 
 	 * @param string $type  The type of lock
 	 * @return int   time to expiry in seconds.
 	 */
-	protected function _get_lock_expiry( $type = EE_Messages_Queue::action_generating ) {
-		return (int) apply_filters( 'FHEE__EE_Messages_Queue__lock_expiry', HOUR_IN_SECONDS, $type );
+	protected function _get_lock_expiry($type = EE_Messages_Queue::action_generating) {
+		return (int) apply_filters('FHEE__EE_Messages_Queue__lock_expiry', HOUR_IN_SECONDS, $type);
 	}
 
 
@@ -308,7 +308,7 @@ 
 	 * @return int
 	 */
 	protected function _get_rate_limit_expiry() {
-		return (int) apply_filters( 'FHEE__EE_Messages_Queue__rate_limit_expiry', HOUR_IN_SECONDS );
+		return (int) apply_filters('FHEE__EE_Messages_Queue__rate_limit_expiry', HOUR_IN_SECONDS);
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return int
 	 */
 	protected function _default_rate_limit() {
-		return (int) apply_filters( 'FHEE__EE_Messages_Queue___rate_limit', 200 );
+		return (int) apply_filters('FHEE__EE_Messages_Queue___rate_limit', 200);
 	}
 
 
@@ -345,14 +345,14 @@ 
 	 * @param  string $type The type of lock being checked for.
 	 * @return bool
 	 */
-	public function is_locked( $type = EE_Messages_Queue::action_generating ) {
+	public function is_locked($type = EE_Messages_Queue::action_generating) {
 		/**
 		 * This filters the default is_locked behaviour.
 		 */
 		$is_locked = filter_var(
 			apply_filters(
 				'FHEE__EE_Messages_Queue__is_locked',
-				get_transient( $this->_get_lock_key( $type ) ),
+				get_transient($this->_get_lock_key($type)),
 				$this
 			),
 			FILTER_VALIDATE_BOOLEAN
@@ -363,7 +363,7 @@ 
 		 *            Also implemented here because messages processed on the same request should not have any locks applied.
 		 */
 		if (
-			apply_filters( 'FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false )
+			apply_filters('FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false)
 			|| EE_Registry::instance()->NET_CFG->core->do_messages_on_same_request
 		) {
 			$is_locked = false;
@@ -385,9 +385,9 @@ 
 	 * @return int
 	 */
 	public function get_rate_limit() {
-		if ( ! $rate_limit = get_transient( $this->_get_rate_limit_key() ) ) {
+		if ( ! $rate_limit = get_transient($this->_get_rate_limit_key())) {
 			$rate_limit = $this->_default_rate_limit();
-			set_transient( $this->_get_rate_limit_key(), $rate_limit, $this->_get_rate_limit_key() );
+			set_transient($this->_get_rate_limit_key(), $rate_limit, $this->_get_rate_limit_key());
 		}
 		return $rate_limit;
 	}
@@ -399,12 +399,12 @@ 
 	 * This updates existing rate limit with the new limit which is the old minus the batch.
 	 * @param int $batch_completed  This sets the new rate limit based on the given batch that was completed.
 	 */
-	public function set_rate_limit( $batch_completed ) {
+	public function set_rate_limit($batch_completed) {
 		//first get the most up to date rate limit (in case its expired and reset)
 		$rate_limit = $this->get_rate_limit();
 		$new_limit = $rate_limit - $batch_completed;
 		//updating the transient option directly to avoid resetting the expiry.
-		update_option( '_transient_' . $this->_get_rate_limit_key(), $new_limit );
+		update_option('_transient_'.$this->_get_rate_limit_key(), $new_limit);
 	}
 
 
@@ -417,7 +417,7 @@ 
 	 * @param string $task This indicates what type of request is going to be initiated.
 	 * @param int    $priority  This indicates the priority that triggers initiating the request.
 	 */
-	public function initiate_request_by_priority( $task = 'generate', $priority = EEM_Message::priority_high ) {
+	public function initiate_request_by_priority($task = 'generate', $priority = EEM_Message::priority_high) {
 		//determine what status is matched with the priority as part of the trigger conditions.
 		$status = $task == 'generate'
 			? EEM_Message::status_incomplete
@@ -437,19 +437,19 @@ 
 		 *   the same request.
 		 */
 		if (
-			apply_filters( 'FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false )
+			apply_filters('FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false)
 			|| EE_Registry::instance()->NET_CFG->core->do_messages_on_same_request
 		) {
-			$messages_processor = EE_Registry::instance()->load_lib( 'Messages_Processor' );
-			if ( $messages_processor instanceof EE_Messages_Processor ) {
-				return $messages_processor->process_immediately_from_queue( $this );
+			$messages_processor = EE_Registry::instance()->load_lib('Messages_Processor');
+			if ($messages_processor instanceof EE_Messages_Processor) {
+				return $messages_processor->process_immediately_from_queue($this);
 			}
 			//if we get here then that means the messages processor couldn't be loaded so messages will just remain
 			//queued for manual triggering by end user.
 		}
 
-		if ( $this->_message_repository->count_by_priority_and_status( $priority, $status ) ) {
-			EE_Messages_Scheduler::initiate_scheduled_non_blocking_request( $task );
+		if ($this->_message_repository->count_by_priority_and_status($priority, $status)) {
+			EE_Messages_Scheduler::initiate_scheduled_non_blocking_request($task);
 		}
 	}
 
@@ -474,53 +474,53 @@ 
 	 *                    Also, if the messenger is an request type messenger (or a preview),
 	 * 					  its entirely possible that the messenger will exit before
 	 */
-	public function execute( $save = true, $sending_messenger = null, $by_priority = false ) {
+	public function execute($save = true, $sending_messenger = null, $by_priority = false) {
 		$messages_sent = 0;
 		$this->_did_hook = array();
 		$this->_message_repository->rewind();
 
-		while ( $this->_message_repository->valid() ) {
+		while ($this->_message_repository->valid()) {
 			$error_messages = array();
 			/** @type EE_Message $message */
 			$message = $this->_message_repository->current();
 			//only process things that are queued for sending
-			if ( ! in_array( $message->STS_ID(), EEM_Message::instance()->stati_indicating_to_send() ) ) {
+			if ( ! in_array($message->STS_ID(), EEM_Message::instance()->stati_indicating_to_send())) {
 				$this->_message_repository->next();
 				continue;
 			}
 			//if $by_priority is set and does not match then continue;
-			if ( $by_priority && $by_priority != $message->priority() ) {
+			if ($by_priority && $by_priority != $message->priority()) {
 				$this->_message_repository->next();
 				continue;
 			}
 			//error checking
-			if ( ! $message->valid_messenger() ) {
+			if ( ! $message->valid_messenger()) {
 				$error_messages[] = sprintf(
-					__( 'The %s messenger is not active at time of sending.', 'event_espresso' ),
+					__('The %s messenger is not active at time of sending.', 'event_espresso'),
 					$message->messenger()
 				);
 			}
-			if ( ! $message->valid_message_type() ) {
+			if ( ! $message->valid_message_type()) {
 				$error_messages[] = sprintf(
-					__( 'The %s message type is not active at the time of sending.', 'event_espresso' ),
+					__('The %s message type is not active at the time of sending.', 'event_espresso'),
 					$message->message_type()
 				);
 			}
 			// if there was supposed to be a sending messenger for this message, but it was invalid/inactive,
 			// then it will instead be an EE_Error object, so let's check for that
-			if ( $sending_messenger instanceof EE_Error ) {
+			if ($sending_messenger instanceof EE_Error) {
 				$error_messages[] = $sending_messenger->getMessage();
 			}
 			// if there are no errors, then let's process the message
-			if ( empty( $error_messages ) && $this->_process_message( $message, $sending_messenger ) ) {
+			if (empty($error_messages) && $this->_process_message($message, $sending_messenger)) {
 				$messages_sent++;
 			}
-			$this->_set_error_message( $message, $error_messages );
+			$this->_set_error_message($message, $error_messages);
 			//add modified time
-			$message->set_modified( time() );
+			$message->set_modified(time());
 			$this->_message_repository->next();
 		}
-		if ( $save ) {
+		if ($save) {
 			$this->save();
 		}
 		return $messages_sent;
@@ -535,7 +535,7 @@ 
 	 * @param mixed 	 $sending_messenger (optional)
 	 * @return bool
 	 */
-	protected function _process_message( EE_Message $message, $sending_messenger = null ) {
+	protected function _process_message(EE_Message $message, $sending_messenger = null) {
 		// these *should* have been validated in the execute() method above
 		$messenger = $message->messenger_object();
 		$message_type = $message->message_type_object();
@@ -545,20 +545,20 @@ 
 			&& $messenger instanceof EE_messenger
 			&& $sending_messenger->name != $messenger->name
 		) {
-			$messenger->do_secondary_messenger_hooks( $sending_messenger->name );
+			$messenger->do_secondary_messenger_hooks($sending_messenger->name);
 			$messenger = $sending_messenger;
 		}
 		// send using messenger, but double check objects
-		if ( $messenger instanceof EE_messenger && $message_type instanceof EE_message_type ) {
+		if ($messenger instanceof EE_messenger && $message_type instanceof EE_message_type) {
 			//set hook for message type (but only if not using another messenger to send).
-			if ( ! isset( $this->_did_hook[ $message_type->name ] ) ) {
-				$message_type->do_messenger_hooks( $messenger );
-				$this->_did_hook[ $message_type->name ] = 1;
+			if ( ! isset($this->_did_hook[$message_type->name])) {
+				$message_type->do_messenger_hooks($messenger);
+				$this->_did_hook[$message_type->name] = 1;
 			}
 			//if preview then use preview method
 			return $this->_message_repository->is_preview()
-				? $this->_do_preview( $message, $messenger, $message_type, $this->_message_repository->is_test_send() )
-				: $this->_do_send( $message, $messenger, $message_type );
+				? $this->_do_preview($message, $messenger, $message_type, $this->_message_repository->is_test_send())
+				: $this->_do_send($message, $messenger, $message_type);
 		}
 		return false;
 	}
@@ -576,12 +576,12 @@ 
 	 * @param array $status  Stati to check for in queue
 	 * @return int  Count of EE_Message's matching the given status.
 	 */
-	public function count_STS_in_queue( $status ) {
+	public function count_STS_in_queue($status) {
 		$count = 0;
-		$status = is_array( $status ) ? $status : array( $status );
+		$status = is_array($status) ? $status : array($status);
 		$this->_message_repository->rewind();
-		foreach( $this->_message_repository as $message ) {
-			if ( in_array( $message->STS_ID(), $status ) ) {
+		foreach ($this->_message_repository as $message) {
+			if (in_array($message->STS_ID(), $status)) {
 				$count++;
 			}
 		}
@@ -598,15 +598,15 @@ 
 	 * @param $test_send
 	 * @return bool   true means all went well, false means, not so much.
 	 */
-	protected function _do_preview( EE_Message $message, EE_messenger $messenger, EE_message_type $message_type, $test_send ) {
-		if ( $preview = $messenger->get_preview( $message, $message_type, $test_send ) ) {
-			if ( ! $test_send ) {
-				$message->set_content( $preview );
+	protected function _do_preview(EE_Message $message, EE_messenger $messenger, EE_message_type $message_type, $test_send) {
+		if ($preview = $messenger->get_preview($message, $message_type, $test_send)) {
+			if ( ! $test_send) {
+				$message->set_content($preview);
 			}
-			$message->set_STS_ID( EEM_Message::status_sent );
+			$message->set_STS_ID(EEM_Message::status_sent);
 			return true;
 		} else {
-			$message->set_STS_ID( EEM_Message::status_failed );
+			$message->set_STS_ID(EEM_Message::status_failed);
 			return false;
 		}
 	}
@@ -622,12 +622,12 @@ 
 	 * @param EE_message_type $message_type
 	 * @return bool true means all went well, false means, not so much.
 	 */
-	protected function _do_send( EE_Message $message, EE_messenger $messenger, EE_message_type $message_type ) {
-		if ( $messenger->send_message( $message, $message_type ) ) {
-			$message->set_STS_ID( EEM_Message::status_sent );
+	protected function _do_send(EE_Message $message, EE_messenger $messenger, EE_message_type $message_type) {
+		if ($messenger->send_message($message, $message_type)) {
+			$message->set_STS_ID(EEM_Message::status_sent);
 			return true;
 		} else {
-			$message->set_STS_ID( EEM_Message::status_retry );
+			$message->set_STS_ID(EEM_Message::status_retry);
 			return false;
 		}
 	}
@@ -641,21 +641,21 @@ 
 	 * @param EE_Message $message
 	 * @param array      $error_messages the response from the messenger.
 	 */
-	protected function _set_error_message( EE_Message $message, $error_messages ) {
+	protected function _set_error_message(EE_Message $message, $error_messages) {
 		$error_messages = (array) $error_messages;
-		if ( in_array( $message->STS_ID(), EEM_Message::instance()->stati_indicating_failed_sending() ) ) {
+		if (in_array($message->STS_ID(), EEM_Message::instance()->stati_indicating_failed_sending())) {
 			$notices = EE_Error::has_notices();
-			$error_messages[] = __( 'Messenger and Message Type were valid and active, but the messenger send method failed.', 'event_espresso' );
-			if ( $notices === 1 ) {
+			$error_messages[] = __('Messenger and Message Type were valid and active, but the messenger send method failed.', 'event_espresso');
+			if ($notices === 1) {
 				$notices = EE_Error::get_vanilla_notices();
-				$notices['errors'] = isset( $notices['errors'] ) ? $notices['errors'] : array();
-				$error_messages[] = implode( "\n", $notices['errors'] );
+				$notices['errors'] = isset($notices['errors']) ? $notices['errors'] : array();
+				$error_messages[] = implode("\n", $notices['errors']);
 			}
 		}
-		if ( count( $error_messages ) > 0 ) {
-			$msg = __( 'Message was not executed successfully.', 'event_espresso' );
-			$msg = $msg . "\n" . implode( "\n", $error_messages );
-			$message->set_error_message( $msg );
+		if (count($error_messages) > 0) {
+			$msg = __('Message was not executed successfully.', 'event_espresso');
+			$msg = $msg."\n".implode("\n", $error_messages);
+			$message->set_error_message($msg);
 		}
 	}
 

core/EE_Network_Config.core.php

Spacing +29 added lines, -29 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated, and instantiated properly
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Network_Config )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Network_Config)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -73,15 +73,15 @@ 
 	 *  @access 	private
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Network_Config__construct__begin',$this );
+		do_action('AHEE__EE_Network_Config__construct__begin', $this);
 		//set defaults
-		$this->core = apply_filters( 'FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config() );
+		$this->core = apply_filters('FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config());
 		$this->addons = array();
 
 		$this->_load_config();
 
 		// construct__end hook
-		do_action( 'AHEE__EE_Network_Config__construct__end',$this );
+		do_action('AHEE__EE_Network_Config__construct__end', $this);
 	}
 
 
@@ -94,25 +94,25 @@ 
 	 */
 	private function _load_config() {
 		//load network config start hook
-		do_action( 'AHEE__EE_Network_Config___load_config__start', $this );
+		do_action('AHEE__EE_Network_Config___load_config__start', $this);
 		$config = $this->get_config();
-		foreach ( $config as $config_prop => $settings ) {
-			if ( is_object( $settings ) && property_exists( $this, $config_prop ) ) {
-				$this->{$config_prop} = apply_filters( 'FHEE__EE_Network_Config___load_config__config_settings', $settings, $config_prop, $this );
-				if ( method_exists( $settings, 'populate' ) ) {
+		foreach ($config as $config_prop => $settings) {
+			if (is_object($settings) && property_exists($this, $config_prop)) {
+				$this->{$config_prop} = apply_filters('FHEE__EE_Network_Config___load_config__config_settings', $settings, $config_prop, $this);
+				if (method_exists($settings, 'populate')) {
 					$this->{$config_prop}->populate();
 				}
-				if ( method_exists( $settings, 'do_hooks' ) ) {
+				if (method_exists($settings, 'do_hooks')) {
 					$this->{$config_prop}->do_hooks();
 				}
 			}
 		}
-		if ( apply_filters( 'FHEE__EE_Network_Config___load_config__update_network_config', false ) ) {
+		if (apply_filters('FHEE__EE_Network_Config___load_config__update_network_config', false)) {
 			$this->update_config();
 		}
 
 		//load network config end hook
-		do_action( 'AHEE__EE_Network_Config___load_config__end', $this );
+		do_action('AHEE__EE_Network_Config___load_config__end', $this);
 	}
 
 
@@ -126,8 +126,8 @@ 
 	 */
 	public function get_config() {
 		// grab network configuration
-		$CFG = get_site_option( 'ee_network_config', array() );
-		$CFG = apply_filters( 'FHEE__EE_Network_Config__get_config__CFG', $CFG );
+		$CFG = get_site_option('ee_network_config', array());
+		$CFG = apply_filters('FHEE__EE_Network_Config__get_config__CFG', $CFG);
 		return $CFG;
 	}
 
@@ -141,32 +141,32 @@ 
 	 * @param bool $add_error
 	 * @return bool success
 	 */
-	public function update_config( $add_success = FALSE, $add_error = TRUE ) {
-		do_action( 'AHEE__EE_Network_Config__update_config__begin',$this );
+	public function update_config($add_success = FALSE, $add_error = TRUE) {
+		do_action('AHEE__EE_Network_Config__update_config__begin', $this);
 
 		//we have to compare existing saved config with config in memory because if there is no difference that means
 		//that the method executed fine but there just was no update.  WordPress doesn't distinguish between false because
 		//there were 0 records updated because of no change vs false because some error produced problems with the update.
-		$original = get_site_option( 'ee_network_config' );
+		$original = get_site_option('ee_network_config');
 
-		if ( $original == $this ) {
+		if ($original == $this) {
 			return true;
 		}
 		// update
-		$saved = update_site_option( 'ee_network_config', $this );
+		$saved = update_site_option('ee_network_config', $this);
 		
-		do_action( 'AHEE__EE_Network_Config__update_config__end', $this, $saved );
+		do_action('AHEE__EE_Network_Config__update_config__end', $this, $saved);
 		// if config remains the same or was updated successfully
-		if ( $saved ) {
-			if ( $add_success ) {
-				$msg = is_multisite() ? __( 'The Event Espresso Network Configuration Settings have been successfully updated.', 'event_espresso' ) : __( 'Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso' );
-				EE_Error::add_success( $msg );
+		if ($saved) {
+			if ($add_success) {
+				$msg = is_multisite() ? __('The Event Espresso Network Configuration Settings have been successfully updated.', 'event_espresso') : __('Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso');
+				EE_Error::add_success($msg);
 			}
 			return TRUE;
 		} else {
-			if ( $add_error ) {
-				$msg = is_multisite() ? __( 'The Event Espresso Network Configuration Settings were not updated.', 'event_espresso' ) : __( 'Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso' );
-				EE_Error::add_error( $msg , __FILE__, __FUNCTION__, __LINE__ );
+			if ($add_error) {
+				$msg = is_multisite() ? __('The Event Espresso Network Configuration Settings were not updated.', 'event_espresso') : __('Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso');
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 			return FALSE;
 		}
@@ -180,9 +180,9 @@ 
 	 *  @return 	array
 	 */
 	public function __sleep() {
-		return apply_filters( 'FHEE__EE_Network_Config__sleep',array(
+		return apply_filters('FHEE__EE_Network_Config__sleep', array(
 			'core',
-		) );
+		));
 	}
 
 } //end EE_Network_Config.

core/libraries/messages/EE_Messages_Scheduler.lib.php

Spacing +30 added lines, -30 removed lines

@@ -23,18 +23,18 @@ 
 	 */
 	public function __construct() {
 		//register tasks (and make sure only registered once).
-		if ( ! has_action( 'FHEE__EEH_Activation__get_cron_tasks', array( $this, 'register_scheduled_tasks' ) ) ) {
-			add_action( 'FHEE__EEH_Activation__get_cron_tasks', array( $this, 'register_scheduled_tasks' ), 10 );
+		if ( ! has_action('FHEE__EEH_Activation__get_cron_tasks', array($this, 'register_scheduled_tasks'))) {
+			add_action('FHEE__EEH_Activation__get_cron_tasks', array($this, 'register_scheduled_tasks'), 10);
 		}
 
 		//register callbacks for scheduled events (but make sure they are set only once).
-		if ( ! has_action( 'AHEE__EE_Messages_Scheduler__generation', array( 'EE_Messages_Scheduler', 'batch_generation' ) ) ) {
-			add_action( 'AHEE__EE_Messages_Scheduler__generation', array( 'EE_Messages_Scheduler', 'batch_generation') );
-			add_action( 'AHEE__EE_Messages_Scheduler__sending', array( 'EE_Messages_Scheduler', 'batch_sending' ) );
+		if ( ! has_action('AHEE__EE_Messages_Scheduler__generation', array('EE_Messages_Scheduler', 'batch_generation'))) {
+			add_action('AHEE__EE_Messages_Scheduler__generation', array('EE_Messages_Scheduler', 'batch_generation'));
+			add_action('AHEE__EE_Messages_Scheduler__sending', array('EE_Messages_Scheduler', 'batch_sending'));
 		}
 
 		//add custom schedules
-		add_filter( 'cron_schedules', array( $this, 'custom_schedules' ) );
+		add_filter('cron_schedules', array($this, 'custom_schedules'));
 	}
 
 
@@ -44,10 +44,10 @@ 
 	 * Add custom schedules for wp_cron
 	 * @param $schedules
 	 */
-	public function custom_schedules( $schedules ) {
+	public function custom_schedules($schedules) {
 		$schedules['ee_message_cron'] = array(
 			'interval' => self::message_cron_schedule,
-			'display' => __( 'This is the cron time interval for EE Message schedules (defaults to once every 5 minutes)', 'event_espresso' )
+			'display' => __('This is the cron time interval for EE Message schedules (defaults to once every 5 minutes)', 'event_espresso')
 		);
 		return $schedules;
 	}
@@ -58,7 +58,7 @@ 
 	 * @param array $tasks  already existing scheduled tasks
 	 * @return array
 	 */
-	public function register_scheduled_tasks( $tasks ) {
+	public function register_scheduled_tasks($tasks) {
 		$tasks['AHEE__EE_Messages_Scheduler__generation'] = 'ee_message_cron';
 		$tasks['AHEE__EE_Messages_Scheduler__sending'] = 'ee_message_cron';
 		return $tasks;
@@ -70,27 +70,27 @@ 
 	 * Note: The EED_Messages module has the handlers for these requests.
 	 * @param string $task  The task the request is being generated for.
 	 */
-	public static function initiate_scheduled_non_blocking_request( $task ) {
-		if ( apply_filters( 'EE_Messages_Scheduler__initiate_scheduled_non_blocking_request__do_separate_request', true ) ) {
-			$request_url  = add_query_arg(
+	public static function initiate_scheduled_non_blocking_request($task) {
+		if (apply_filters('EE_Messages_Scheduler__initiate_scheduled_non_blocking_request__do_separate_request', true)) {
+			$request_url = add_query_arg(
 				array_merge(
-					array( 'ee' => 'msg_cron_trigger' ),
-					EE_Messages_Scheduler::get_request_params( $task )
+					array('ee' => 'msg_cron_trigger'),
+					EE_Messages_Scheduler::get_request_params($task)
 				),
 				site_url()
 			);
 			$request_args = array(
 				'timeout'     => 300,
-				'blocking'    => ( defined( 'DOING_CRON' ) && DOING_CRON ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ? true : false,
+				'blocking'    => (defined('DOING_CRON') && DOING_CRON) || (defined('DOING_AJAX') && DOING_AJAX) ? true : false,
 				'sslverify'   => false,
 				'redirection' => 10,
 			);
-			$response     = wp_remote_get( $request_url, $request_args );
-			if ( is_wp_error( $response ) ) {
-				trigger_error( $response->get_error_message() );
+			$response = wp_remote_get($request_url, $request_args);
+			if (is_wp_error($response)) {
+				trigger_error($response->get_error_message());
 			}
 		} else {
-			EE_Messages_Scheduler::initiate_immediate_request_on_cron( $task );
+			EE_Messages_Scheduler::initiate_immediate_request_on_cron($task);
 		}
 	}
 
@@ -103,10 +103,10 @@ 
 	 * @param string $task The task the request is for.
 	 * @return array
 	 */
-	public static function get_request_params( $task ) {
+	public static function get_request_params($task) {
 		//transient is used for flood control on msg_cron_trigger requests
-		$transient_key = 'ee_trans_' . uniqid( $task );
-		set_transient( $transient_key, 1, 5 * MINUTE_IN_SECONDS );
+		$transient_key = 'ee_trans_'.uniqid($task);
+		set_transient($transient_key, 1, 5 * MINUTE_IN_SECONDS);
 		return array(
 			'type' => $task,
 			'key' => $transient_key,
@@ -120,11 +120,11 @@ 
 	 * This is used to execute an immediate call to the run_cron task performed by EED_Messages
 	 * @param string $task The task the request is being generated for.
 	 */
-	public static function initiate_immediate_request_on_cron( $task ) {
-		$request_args = EE_Messages_Scheduler::get_request_params( $task );
+	public static function initiate_immediate_request_on_cron($task) {
+		$request_args = EE_Messages_Scheduler::get_request_params($task);
 		//set those request args in the request so it gets picked up
-		foreach ( $request_args as $request_key => $request_value ) {
-			EE_Registry::instance()->REQ->set( $request_key, $request_value );
+		foreach ($request_args as $request_key => $request_value) {
+			EE_Registry::instance()->REQ->set($request_key, $request_value);
 		}
 		EED_Messages::instance()->run_cron();
 	}
@@ -141,10 +141,10 @@ 
 		 * @see filter usage in EE_Messages_Queue::initiate_request_by_priority()
 		 */
 		if (
-			! apply_filters( 'FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false )
+			! apply_filters('FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false)
 			|| ! EE_Registry::instance()->NET_CFG->core->do_messages_on_same_request
 		) {
-			EE_Messages_Scheduler::initiate_immediate_request_on_cron( 'generate' );
+			EE_Messages_Scheduler::initiate_immediate_request_on_cron('generate');
 		}
 	}
 
@@ -159,10 +159,10 @@ 
 		 * @see filter usage in EE_Messages_Queue::initiate_request_by_priority()
 		 */
 		if (
-			! apply_filters( 'FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false )
+			! apply_filters('FHEE__EE_Messages_Processor__initiate_request_by_priority__do_immediate_processing', false)
 			|| ! EE_Registry::instance()->NET_CFG->core->do_messages_on_same_request
 		) {
-			EE_Messages_Scheduler::initiate_immediate_request_on_cron( 'send' );
+			EE_Messages_Scheduler::initiate_immediate_request_on_cron('send');
 		}
 	}