eventespresso / event-espresso-core

admin_pages/messages/Messages_Admin_Page.core.php

Braces +2 added lines, -5 removed lines

@@ -1849,8 +1849,7 @@ 
 		$MTP = EEM_Message_Template_Group::instance();
 
 		if ( empty($GRP_ID) )
-			{$this->_message_template_group = $MTP->create_default_object();}
-		else
+			{$this->_message_template_group = $MTP->create_default_object();} else
 			{$this->_message_template_group = $MTP->get_one_by_ID( $GRP_ID );}
 
 		$this->_template_pack = $this->_message_template_group->get_template_pack();
@@ -2977,9 +2976,7 @@ 
 				}
 			}
 			$this->_active_messengers[$messenger]['settings'] = $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'];

Doc Comments +2 added lines, -2 removed lines

@@ -2430,7 +2430,7 @@ 
 	 * @param  int    $GRP_ID The group being deleted
 	 * @param  bool $include_group whether to delete the Message Template Group as well.
 	 *
-	 * @return bool        boolean to indicate the success of the deletes or not.
+	 * @return integer        boolean to indicate the success of the deletes or not.
 	 */
 	private function _delete_mtp_permanently( $GRP_ID, $include_group = true ) {
 		$success = 1;
@@ -2565,7 +2565,7 @@ 
 	 * This just prepares the content for the message type settings
 	 *
 	 * @param  object  $message_type The message type object
-	 * @param  object  $messenger    The messenger object
+	 * @param  EE_messenger|null  $messenger    The messenger object
 	 * @param  boolean $active       Whether the message type is active or not
 	 *
 	 * @return string                html output for the content

Indentation +49 added lines, -49 removed lines

@@ -101,7 +101,7 @@ 
 	 *
 	 *
 	 * @throws EE_Error
-	*/
+	 */
 	protected function _load_message_resource_manager() {
 		$this->_message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
 	}
@@ -211,9 +211,9 @@ 
 
 	/**
 	 * 		an array for storing key => value pairs of request actions and their corresponding methods
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _set_page_routes() {
 		$grp_id = ! empty( $this->_req_data['GRP_ID'] ) && ! is_array( $this->_req_data['GRP_ID'] )
 			? $this->_req_data['GRP_ID']
@@ -517,8 +517,8 @@ 
 	protected function _add_screen_options_global_mtps() {
 		/**
 		 * Note: the reason for the value swap here on $this->_admin_page_title is because $this->_per_page_screen_options
-         * uses the $_admin_page_title property and we want different outputs in the different spots.
-         */
+		 * uses the $_admin_page_title property and we want different outputs in the different spots.
+		 */
 		$page_title = $this->_admin_page_title;
 		$this->_admin_page_title = __('Global Message Templates', 'event_espresso');
 		$this->_per_page_screen_option();
@@ -721,9 +721,9 @@ 
 		$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_and_send_now' => __( 'Generate and Send Now', 'event_espresso' ),
+				'queue_for_resending' => __( 'Queue for Resending', 'event_espresso' ),
+				'send_now' => __( 'Send Now', 'event_espresso' )
 				)
 			: array();
 
@@ -734,10 +734,10 @@ 
 
 		$this->_views = array(
 			 'all' => array(
-			    'slug' => 'all',
-			    'label' => __( 'All', 'event_espresso' ),
-			    'count' => 0,
-			    'bulk_action' => array_merge( $common_bulk_actions, $delete_bulk_action )
+				'slug' => 'all',
+				'label' => __( 'All', 'event_espresso' ),
+				'count' => 0,
+				'bulk_action' => array_merge( $common_bulk_actions, $delete_bulk_action )
 			 )
 		);
 
@@ -1127,9 +1127,9 @@ 
 																			&& in_array($extra_field, $v_fields)
 																			&&
 																			(
-								                                                is_array($validators[$extra_field] )
+																				is_array($validators[$extra_field] )
 																				&& isset( $validators[$extra_field]['msg'] )
-							                                                )
+																			)
 								? 'validate-error ' . $css_class
 								: $css_class;
 
@@ -1414,8 +1414,8 @@ 
 			 $GRP_ID,
 			 false,
 			 add_query_arg(
-			    array( 'action' => 'global_mtps' ),
-			    $this->_admin_base_url
+				array( 'action' => 'global_mtps' ),
+				$this->_admin_base_url
 			 )
 		);
 
@@ -1890,14 +1890,14 @@ 
 
 
 	/**
-     * This returns the shortcode selector skeleton for a given context and field.
-     *
-     * @since 4.9.rc.000
-     *
+	 * This returns the shortcode selector skeleton for a given context and field.
+	 *
+	 * @since 4.9.rc.000
+	 *
 	 * @param string $field  The name of the field retrieving shortcodes for.
-     * @param string $linked_input_id The css id of the input that the shortcodes get added to.
-     * @return string
-    */
+	 * @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 ) {
 		$template_args = array(
 			'shortcodes' => $this->_get_shortcodes( array( $field ), true ),
@@ -2495,9 +2495,9 @@ 
 
 	/**
 	 * 	_learn_more_about_message_templates_link
-	*	@access protected
-	*	@return string
-	*/
+	 *	@access protected
+	 *	@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>';
 	}
@@ -3038,7 +3038,7 @@ 
 			/** @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 instanceof EE_message_type
+				 && $message_type instanceof EE_message_type
 			) {
 				$this->_template_args['data']['active_mts'][] = $message_type_name;
 				if ( $message_type->get_admin_settings_fields() ) {
@@ -3374,10 +3374,10 @@ 
 
 	/**
 	 * This immediately generates any EE_Message ID's that are selected that are EEM_Message::status_incomplete
-     * However, this does not send immediately, it just queues for sending.
-     *
-     * @since 4.9.0
-     */
+	 * However, this does not send immediately, it just queues for sending.
+	 *
+	 * @since 4.9.0
+	 */
 	protected function _generate_now() {
 		$msg_ids = $this->_get_msg_ids_from_request();
 		EED_Messages::generate_now( $msg_ids );
@@ -3388,11 +3388,11 @@ 
 
 	/**
 	 * This immediately generates AND sends any EE_Message's selected that are EEM_Message::status_incomplete or that are
-     * EEM_Message::status_resend or EEM_Message::status_idle
-     *
-     * @since 4.9.0
-     *
-     */
+	 * EEM_Message::status_resend or EEM_Message::status_idle
+	 *
+	 * @since 4.9.0
+	 *
+	 */
 	protected function _generate_and_send_now() {
 		$this->_generate_now();
 		$this->_send_now();
@@ -3405,9 +3405,9 @@ 
 
 	/**
 	 * This queues any EEM_Message::status_sent EE_Message ids in the request for resending.
-     *
-     * @since 4.9.0
-     */
+	 *
+	 * @since 4.9.0
+	 */
 	protected function _queue_for_resending() {
 		$msg_ids = $this->_get_msg_ids_from_request();
 		EED_Messages::queue_for_resending( $msg_ids );
@@ -3419,9 +3419,9 @@ 
 
 	/**
 	 *  This sends immediately any EEM_Message::status_idle or EEM_Message::status_resend messages in the queue
-     *
-     *  @since 4.9.0
-     */
+	 *
+	 *  @since 4.9.0
+	 */
 	protected function _send_now() {
 		$msg_ids = $this->_get_msg_ids_from_request();
 		EED_Messages::send_now( $msg_ids );
@@ -3433,9 +3433,9 @@ 
 
 	/**
 	 * Deletes EE_messages for IDs in the request.
-     *
-     * @since 4.9.0
-     */
+	 *
+	 * @since 4.9.0
+	 */
 	protected function _delete_ee_messages() {
 		$msg_ids = $this->_get_msg_ids_from_request();
 		$deleted_count = 0;
@@ -3464,9 +3464,9 @@ 
 
 	/**
 	 *  This looks for 'MSG_ID' key in the request and returns an array of MSG_ID's if present.
-     *  @since 4.9.0
-     *  @return array
-     */
+	 *  @since 4.9.0
+	 *  @return array
+	 */
 	protected function _get_msg_ids_from_request() {
 		if ( ! isset( $this->_req_data['MSG_ID'] ) ) {
 			return array();

Spacing +605 added lines, -605 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(
@@ -405,7 +405,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(
@@ -440,7 +440,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'),
@@ -496,7 +496,7 @@ 
 						'filename' => 'messages_settings_messengers'
 					),
 				),
-				'help_tour' => array( 'Messages_Settings_Help_Tour' ),
+				'help_tour' => array('Messages_Settings_Help_Tour'),
 				'require_nonce' => false
 			)
 		);
@@ -529,7 +529,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();
 	}
 
@@ -551,37 +551,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);
 	}
 
 
@@ -589,22 +589,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);
 	}
 
 
@@ -612,31 +612,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;
@@ -654,15 +654,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'));
 	}
 
 
@@ -671,22 +671,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');
 	}
@@ -716,40 +716,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 && ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) ) {
+		foreach (EEM_Message::instance()->all_statuses() as $status) {
+			if ($status === EEM_Message::status_debug_only && ( ! defined('WP_DEBUG') || ! WP_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'];
@@ -761,21 +761,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)
 			);
 		}
 	}
@@ -794,8 +794,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();
 	}
 
@@ -808,8 +808,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(
@@ -821,37 +821,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 ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+		if (defined('WP_DEBUG') && WP_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);
 	}
 
 
@@ -861,9 +861,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);
 	}
 
 
@@ -887,31 +887,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);
 
 		}
 
@@ -930,8 +930,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;
@@ -950,24 +950,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!
 
@@ -988,8 +988,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);
 	}
 
 
@@ -1000,14 +1000,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.
@@ -1015,20 +1015,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 {
@@ -1038,7 +1038,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
 			);
 		}
@@ -1052,14 +1052,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(
@@ -1080,7 +1080,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');
 		}
@@ -1090,51 +1090,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
@@ -1150,32 +1150,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',
@@ -1189,14 +1189,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')
 						: '';
@@ -1209,10 +1209,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
@@ -1223,12 +1223,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',
@@ -1241,7 +1241,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',
@@ -1385,13 +1385,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',
@@ -1401,8 +1401,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) )
@@ -1414,7 +1414,7 @@ 
 			 $GRP_ID,
 			 false,
 			 add_query_arg(
-			    array( 'action' => 'global_mtps' ),
+			    array('action' => 'global_mtps'),
 			    $this->_admin_base_url
 			 )
 		);
@@ -1430,7 +1430,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
@@ -1458,17 +1458,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.
@@ -1481,7 +1481,7 @@ 
 	}
 
 
-	public function filter_tinymce_init( $mceInit, $editor_id ) {
+	public function filter_tinymce_init($mceInit, $editor_id) {
 		return $mceInit;
 	}
 
@@ -1492,7 +1492,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() {
@@ -1509,25 +1509,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',
@@ -1537,7 +1537,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(
@@ -1550,7 +1550,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;
 			}
@@ -1572,9 +1572,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.',
@@ -1586,9 +1586,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.
@@ -1596,9 +1596,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.
@@ -1616,32 +1616,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;
 		}
 	}
@@ -1654,7 +1654,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(
@@ -1670,13 +1670,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;
 		}
 
@@ -1686,22 +1686,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 '';
 	}
@@ -1731,9 +1731,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');
 	}
 
 
@@ -1752,14 +1752,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
@@ -1773,7 +1773,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'
@@ -1786,14 +1786,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',
@@ -1810,9 +1810,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);
 	}
 
 
@@ -1843,47 +1843,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>';
 	}
 
 
@@ -1898,13 +1898,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);
 	}
 
 
@@ -1919,13 +1919,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
 		}
 
@@ -1942,7 +1942,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();
 	}
@@ -1964,14 +1964,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();
 	}
 
 
@@ -1984,19 +1984,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();
@@ -2015,7 +2015,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();
@@ -2023,20 +2023,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; ?>>
@@ -2044,7 +2044,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']; ?>
@@ -2071,8 +2071,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 {
@@ -2081,22 +2081,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'])
 		);
 
 
@@ -2108,36 +2108,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;
@@ -2156,7 +2156,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__
@@ -2165,25 +2165,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(
@@ -2196,11 +2196,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__
@@ -2214,46 +2214,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;
 					}
@@ -2263,7 +2263,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'] = '';
@@ -2271,9 +2271,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();
@@ -2281,13 +2281,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'],
@@ -2295,7 +2295,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);
 	}
 
 
@@ -2309,28 +2309,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__);
 		}
 	}
 
@@ -2356,11 +2356,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);
 	}
 
 
@@ -2376,33 +2376,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 {
@@ -2414,13 +2414,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());
 
 	}
 
@@ -2436,24 +2436,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());
 
 	}
 
@@ -2468,20 +2468,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;
@@ -2499,7 +2499,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>';
 	}
 
 
@@ -2517,10 +2517,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 -->';
 
@@ -2539,7 +2539,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;
 		}
 
@@ -2554,10 +2554,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,
@@ -2567,26 +2567,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
@@ -2605,34 +2605,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;
@@ -2652,13 +2652,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;
 	}
 
@@ -2675,27 +2675,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,
@@ -2704,11 +2704,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,
@@ -2721,12 +2721,12 @@ 
 
 
 		//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,
 				create_function(
 					'$post, $metabox',
@@ -2740,14 +2740,14 @@ 
 		}
 
 		//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,
 				create_function(
 					'$post, $metabox',
@@ -2770,13 +2770,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;
@@ -2792,29 +2792,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' => '',
@@ -2823,8 +2823,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')
 				: '';
 		}
 
@@ -2841,39 +2841,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;
 	}
 
@@ -2887,9 +2887,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__
@@ -2898,14 +2898,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',
@@ -2921,11 +2921,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__,
@@ -2934,11 +2934,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;
@@ -2961,7 +2961,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__
@@ -2969,7 +2969,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__
@@ -2977,7 +2977,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__
@@ -2989,7 +2989,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'),
@@ -3002,16 +3002,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;
@@ -3025,30 +3025,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);
 
 	}
 
@@ -3059,11 +3059,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);
 	}
 
 
@@ -3074,23 +3074,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);
 	}
 
 
@@ -3102,13 +3102,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);
 	}
 
 
@@ -3139,9 +3139,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__
@@ -3149,32 +3149,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'])
 					)
 				);
 			}
@@ -3184,12 +3184,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;
@@ -3197,13 +3197,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__,
@@ -3231,9 +3231,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__
@@ -3241,13 +3241,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 {
@@ -3255,20 +3255,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;
@@ -3279,17 +3279,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();
@@ -3303,45 +3303,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;
@@ -3349,16 +3349,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;
@@ -3380,8 +3380,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);
 	}
 
 
@@ -3396,7 +3396,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);
 	}
 
 
@@ -3410,8 +3410,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);
 	}
 
 
@@ -3424,8 +3424,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);
 	}
 
 
@@ -3439,23 +3439,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);
 		}
 	}
 
@@ -3468,10 +3468,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/messages/Messages_Template_List_Table.class.php

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Spacing +39 added lines, -39 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -41,8 +41,8 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->get_admin_page()->get_message_templates( $this->_per_page, $this->_view, FALSE);
-		$this->_all_data_count = $this->get_admin_page()->get_message_templates( $this->_per_page, $this->_view, TRUE, TRUE );
+		$this->_data = $this->get_admin_page()->get_message_templates($this->_per_page, $this->_view, FALSE);
+		$this->_all_data_count = $this->get_admin_page()->get_message_templates($this->_per_page, $this->_view, TRUE, TRUE);
 	}
 
 
@@ -51,21 +51,21 @@ 
 
 	protected function _set_properties() {
 		$this->_wp_list_args = array(
-			'singular' => __('Message Template Group', 'event_espresso' ),
-			'plural' => __('Message Template', 'event_espresso' ),
+			'singular' => __('Message Template Group', 'event_espresso'),
+			'plural' => __('Message Template', 'event_espresso'),
 			'ajax' => TRUE, //for now,
 			'screen' => $this->get_admin_page()->get_current_screen()->id
 			);
 		$this->_columns = array(
 			//'cb' => '<input type="checkbox" />', //no deleting default (global) templates!
 			'message_type' => __('Message Type', 'event_espresso'),
-			'messenger' => __( 'Messenger', 'event_espresso'),
-			'description' => __( 'Description', 'event_espresso' ),
+			'messenger' => __('Messenger', 'event_espresso'),
+			'description' => __('Description', 'event_espresso'),
 			//'messages_sent' => __( 'Total Sent', 'event_espresso' ) //todo this will come later when we've got message tracking in place.
 			);
 
 		$this->_sortable_columns = array(
-			'messenger' => array( 'MTP_messenger' => TRUE ),
+			'messenger' => array('MTP_messenger' => TRUE),
 			//'message_type' => array( 'MTP_message_type' => FALSE )
 			);
 
@@ -84,16 +84,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		$message_type = $item->message_type_obj();
 		$messenger = $item->messenger_obj();
 
-		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger ) {
+		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
 			echo '';
 			return;
 		}
 
-		parent::single_row( $item );
+		parent::single_row($item);
 	}
 
 
@@ -109,33 +109,33 @@ 
 
 		$msgr_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'Show All Messengers', 'event_espresso' )
+			'text' => __('Show All Messengers', 'event_espresso')
 			);
 
 		$mt_default[0] = array(
 			'id' => 'none_selected',
-			'text' => __( 'Show All Message Types', 'event_espresso' )
+			'text' => __('Show All Message Types', 'event_espresso')
 			);
 
-		$msgr_filters = ! empty( $m_values ) ? array_merge( $msgr_default, $m_values ) : array();
-		$mt_filters = ! empty( $mt_values ) ? array_merge( $mt_default, $mt_values ) : array();
+		$msgr_filters = ! empty($m_values) ? array_merge($msgr_default, $m_values) : array();
+		$mt_filters = ! empty($mt_values) ? array_merge($mt_default, $mt_values) : array();
 
-		if ( empty( $m_values ) ) {
+		if (empty($m_values)) {
 			$msgr_filters[0] = array(
 				'id'   => 'no_messenger_options',
-				'text' => __( 'No Messengers active', 'event_espresso' )
+				'text' => __('No Messengers active', 'event_espresso')
 			);
 		}
 
-		if ( empty( $mt_values ) ) {
+		if (empty($mt_values)) {
 			$mt_filters[0] = array(
 				'id'   => 'no_message_type_options',
-				'text' => __( 'No Message Types active', 'event_espresso' )
+				'text' => __('No Message Types active', 'event_espresso')
 			);
 		}
 
-		$filters[] = EEH_Form_Fields::select_input( 'ee_messenger_filter_by', $msgr_filters, isset( $this->_req_data['ee_messenger_filter_by'] ) ? sanitize_key( $this->_req_data['ee_messenger_filter_by'] ) : '' );
-		$filters[] = EEH_Form_Fields::select_input( 'ee_message_type_filter_by', $mt_filters, isset( $this->_req_data['ee_message_type_filter_by'] ) ? sanitize_key( $this->_req_data['ee_message_type_filter_by'] ) : '' );
+		$filters[] = EEH_Form_Fields::select_input('ee_messenger_filter_by', $msgr_filters, isset($this->_req_data['ee_messenger_filter_by']) ? sanitize_key($this->_req_data['ee_messenger_filter_by']) : '');
+		$filters[] = EEH_Form_Fields::select_input('ee_message_type_filter_by', $mt_filters, isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_key($this->_req_data['ee_message_type_filter_by']) : '');
 		return $filters;
 	}
 
@@ -143,20 +143,20 @@ 
 	 * we're just removing the search box for message templates, not needed.
 	 * @return string (empty);
 	 */
-	function search_box( $text, $input_id ) {
+	function search_box($text, $input_id) {
 		return '';
 	}
 
 
 	protected function _add_view_counts() {
-		foreach ( $this->_views as $view => $args )  {
-			$this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates( $this->_per_page, $view, TRUE, TRUE );
+		foreach ($this->_views as $view => $args) {
+			$this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates($this->_per_page, $view, TRUE, TRUE);
 		}
 	}
 
 
 
-	public function column_cb( $item ) {
+	public function column_cb($item) {
 		return '';
 	}
 
@@ -164,8 +164,8 @@ 
 
 
 
-	function column_description( $item ) {
-		return '<p>' . $item->message_type_obj()->description . '</p>';
+	function column_description($item) {
+		return '<p>'.$item->message_type_obj()->description.'</p>';
 	}
 
 
@@ -180,27 +180,27 @@ 
 		$actions = array();
 
 		// edit link but only if item isn't trashed.
-		if ( !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_message_template', 'id'=>$item->GRP_ID() ), EE_MSG_ADMIN_URL );
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template Group', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
+		if ( ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID())) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID()), EE_MSG_ADMIN_URL);
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
 		}
 
-		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template Group', 'event_espresso' ) . '">' . ucwords( $item->messenger_obj()->label['singular'] ) . '</a>' : ucwords( $item->messenger_obj()->label['singular'] );
+		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'.ucwords($item->messenger_obj()->label['singular']).'</a>' : ucwords($item->messenger_obj()->label['singular']);
 
 		//we want to display the contexts in here so we need to set them up
 		$c_label = $item->context_label();
 		$c_configs = $item->contexts_config();
 		$ctxt = array();
 		$context_templates = $item->context_templates();
-		foreach ( $context_templates as $context => $template_fields ) {
-			$mtp_to = !empty( $context_templates[$context]['to'] ) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
-			$inactive = empty( $mtp_to ) && !empty( $context_templates[$context]['to'] ) ? ' class="mtp-inactive"' : '';
+		foreach ($context_templates as $context => $template_fields) {
+			$mtp_to = ! empty($context_templates[$context]['to']) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
+			$inactive = empty($mtp_to) && ! empty($context_templates[$context]['to']) ? ' class="mtp-inactive"' : '';
 			$context_title = ucwords($c_configs[$context]['label']);
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL );
-			$ctxt[] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? '<a' . $inactive . ' href="'. $edit_link . '" title="' . esc_attr__('Edit Context', 'event_espresso') . '">' . $context_title . '</a>' : $context_title;
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL);
+			$ctxt[] = EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a'.$inactive.' href="'.$edit_link.'" title="'.esc_attr__('Edit Context', 'event_espresso').'">'.$context_title.'</a>' : $context_title;
 		}
 
-		$ctx_content = !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? sprintf( __('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural']) ) . implode(' | ', $ctxt) : '';
+		$ctx_content = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? sprintf(__('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural'])).implode(' | ', $ctxt) : '';
 
 
 		//Return the name contents
@@ -208,7 +208,7 @@ 
 										/* $1%s */ $name_link,
 										/* $2%s */ $item->GRP_ID(),
 										/* %4$s */ $ctx_content,
-										/* $3%s */ $this->row_actions( $actions )
+										/* $3%s */ $this->row_actions($actions)
 		);
 	}
 
@@ -218,7 +218,7 @@ 
 	 * @return string       message_type name
 	 */
 	function column_message_type($item) {
-		return ucwords($item->message_type_obj()->label['singular'] );
+		return ucwords($item->message_type_obj()->label['singular']);
 	}
 
 

admin_pages/registrations/qtips/Registration_List_Table_Tips.lib.php

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 
 
 	private function _registration_trash_message() {
-		return '<p>' . __('This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.', 'event_espresso') . '</p>';
+		return '<p>'.__('This lock-icon means that this registration cannot be trashed.  Registrations that belong to a transaction that has payments cannot be trashed.  If you wish to trash this registration then you must delete all payments attached to the related transaction first.', 'event_espresso').'</p>';
 	}
 
 
@@ -104,7 +104,7 @@ 
 	 * @param  EEM_Registration constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _registration_status_legend( $status ) {
+	private function _registration_status_legend($status) {
 
 		$status_array = array(
 			'approved_status' => EEM_Registration::status_id_approved,
@@ -114,6 +114,6 @@ 
 			'cancelled_status' => EEM_Registration::status_id_cancelled
 			);
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 }
\ No newline at end of file

admin_pages/transactions/qtips/Transactions_List_Table_Tips.lib.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
 	 * @param  EEM_Transaction constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _transaction_status_legend( $status ) {
+	private function _transaction_status_legend($status) {
 
 		$status_array = array(
 			'overpaid' => EEM_Transaction::overpaid_status_code,
@@ -92,6 +92,6 @@ 
 			'failed' => EEM_Transaction::failed_status_code,
 		);
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 }
\ No newline at end of file

caffeinated/admin/extend/registrations/EE_Event_Registrations_List_Table.class.php

Indentation +4 added lines, -4 removed lines

@@ -202,7 +202,7 @@ 
 
 	/**
 	 * 		column_REG_att_checked_in
-	*/
+	 */
 	function column__REG_att_checked_in(EE_Registration $item){
 		$attendee = $item->attendee();
 		$attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
@@ -288,7 +288,7 @@ 
 
 	/**
 	 * 		column_REG_final_price
-	*/
+	 */
 	function column__REG_final_price(EE_Registration $item){
 		return '<span class="reg-pad-rght">' .  ' ' . $item->pretty_final_price() . '</span>';
 	}
@@ -299,7 +299,7 @@ 
 
 	/**
 	 * 		column_TXN_paid
-	*/
+	 */
 	function column_TXN_paid(EE_Registration $item){
 
 		if ( $item->count() == 1 ) {
@@ -326,7 +326,7 @@ 
 
 	/**
 	 * 		column_TXN_total
-	*/
+	 */
 	function column_TXN_total(EE_Registration $item){
 		$txn = $item->transaction();
 		$view_txn_url = add_query_arg( array('action' => 'view_transaction', 'TXN_ID' => $txn->ID() ), TXN_ADMIN_URL );

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 
 class EE_Event_Registrations_List_Table extends EE_Admin_List_Table {
@@ -126,8 +128,9 @@ 
 			$evts[] = array('id' => 0, 'text' => __('To toggle Check-in status, select an event', 'event_espresso') );
 			foreach ( $events as $evt ) {
 				//any registrations for this event?
-				if ( ! $evt->get_count_of_all_registrations() )
-					continue;
+				if ( ! $evt->get_count_of_all_registrations() ) {
+									continue;
+				}
 				$evts[] = array( 'id' => $evt->ID(), 'text' => $evt->get('EVT_name') );
 			}
 			$filters[] = EEH_Form_Fields::select_input( 'event_id', $evts );

Spacing +79 added lines, -79 removed lines

@@ -16,7 +16,7 @@ 
 
 
 
-	public function __construct( $admin_page ) {
+	public function __construct($admin_page) {
 		parent::__construct($admin_page);
 		$this->_status = $this->_admin_page->get_registration_status_array();
 	}
@@ -25,15 +25,15 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_event_attendees( $this->_per_page ) : $this->_admin_page->get_event_attendees( $this->_per_page, FALSE, TRUE );
-		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_event_attendees(  $this->_per_page, TRUE ) : $this->_admin_page->get_event_attendees(  $this->_per_page, TRUE, TRUE);
+		$this->_data = $this->_view != 'trash' ? $this->_admin_page->get_event_attendees($this->_per_page) : $this->_admin_page->get_event_attendees($this->_per_page, FALSE, TRUE);
+		$this->_all_data_count = $this->_view != 'trash' ? $this->_admin_page->get_event_attendees($this->_per_page, TRUE) : $this->_admin_page->get_event_attendees($this->_per_page, TRUE, TRUE);
 	}
 
 
 
 
 	protected function _set_properties() {
-		$evt_id = isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : NULL;
+		$evt_id = isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : NULL;
 
 		$this->_wp_list_args = array(
 			'singular' => __('registrant', 'event_espresso'),
@@ -44,7 +44,7 @@ 
 
 		$columns = array();
 		//$columns['_Reg_Status'] = '';
-		if ( !empty( $evt_id ) ) {
+		if ( ! empty($evt_id)) {
 			$columns['cb'] = '<input type="checkbox" />'; //Render a checkbox instead of text
 			$this->_has_checkbox_column = true;
 		}
@@ -60,43 +60,43 @@ 
 				'TXN_total' => __('Total', 'event_espresso')
 			);
 
-		$this->_columns = array_merge( $columns, $this->_columns);
+		$this->_columns = array_merge($columns, $this->_columns);
 
 		$this->_primary_column = '_REG_att_checked_in';
 
-		if ( !empty( $evt_id ) && EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'espresso_registrations_registrations_reports', $evt_id )  ) {
+		if ( ! empty($evt_id) && EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'espresso_registrations_registrations_reports', $evt_id)) {
 			$this->_bottom_buttons = array(
 				'report'=> array(
 					'route' => 'registrations_report',
 					'extra_request' => 
 						array( 
 							'EVT_ID'=> $evt_id, 
-							'return_url' => urlencode( "//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}") )
+							'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}") )
 				)
 			);
 		}
 
 		$this->_sortable_columns = array(
 			 //true means its already sorted
-			'ATT_name' => array( 'ATT_name' => TRUE ),
-			'Event' => array( 'Event.EVT.Name' => FALSE )
+			'ATT_name' => array('ATT_name' => TRUE),
+			'Event' => array('Event.EVT.Name' => FALSE)
 		);
 
 		$this->_hidden_columns = array();
 
 		$this->_evt = EEM_Event::instance()->get_one_by_ID($evt_id);
-		$this->_dtts_for_event = !empty($evt_id) ? $this->_evt->datetimes_ordered() : array();
+		$this->_dtts_for_event = ! empty($evt_id) ? $this->_evt->datetimes_ordered() : array();
 
 	}
 
 
 
 
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip reg-status-' . $item->status_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip reg-status-'.$item->status_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -108,42 +108,42 @@ 
 		$filters = $where = array();
 
 
-		if ( empty( $this->_dtts_for_event ) ) {
+		if (empty($this->_dtts_for_event)) {
 			//this means we don't have an event so let's setup a filter dropdown for all the events to select
 			//note possible capability restrictions
-			if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_events', 'get_events') ) {
-				$where['status**'] =  array( '!=', 'private' );
+			if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_events', 'get_events')) {
+				$where['status**'] = array('!=', 'private');
 			}
 
-			if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
-				$where['EVT_wp_user'] =  get_current_user_id();
+			if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
+				$where['EVT_wp_user'] = get_current_user_id();
 			}
 
-			$events = EEM_Event::instance()->get_all(array( $where, 'order_by' => array( 'Datetime.DTT_EVT_start' => 'DESC' ) ) );
-			$evts[] = array('id' => 0, 'text' => __('To toggle Check-in status, select an event', 'event_espresso') );
-			foreach ( $events as $evt ) {
+			$events = EEM_Event::instance()->get_all(array($where, 'order_by' => array('Datetime.DTT_EVT_start' => 'DESC')));
+			$evts[] = array('id' => 0, 'text' => __('To toggle Check-in status, select an event', 'event_espresso'));
+			foreach ($events as $evt) {
 				//any registrations for this event?
-				if ( ! $evt->get_count_of_all_registrations() )
+				if ( ! $evt->get_count_of_all_registrations())
 					continue;
 				$evts[] = array(
 					'id' => $evt->ID(),
-					'text' => $evt->get( 'EVT_name' ),
+					'text' => $evt->get('EVT_name'),
 					'class' => $evt->is_expired() ? 'ee-expired-event' : ''
 				);
 			}
 			$event_filter = '<div class="ee-event-filter">';
-			$event_filter .= EEH_Form_Fields::select_input( 'event_id', $evts );
-			$event_filter .= '<br><span class="ee-event-filter-toggle"><input type="checkbox" id="js-ee-hide-expired-events" checked>' . ' ' . __( 'Hide Expired Events', 'event_espresso' ) . '</span>';
+			$event_filter .= EEH_Form_Fields::select_input('event_id', $evts);
+			$event_filter .= '<br><span class="ee-event-filter-toggle"><input type="checkbox" id="js-ee-hide-expired-events" checked>'.' '.__('Hide Expired Events', 'event_espresso').'</span>';
 			$event_filter .= '</div>';
 			$filters[] = $event_filter;
 
 		} else {
 			//DTT datetimes filter
-			$cur_dtt = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : $this->_evt->primary_datetime()->ID();
+			$cur_dtt = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : $this->_evt->primary_datetime()->ID();
 			$dtts = array();
-			foreach ( $this->_dtts_for_event as $dtt ) {
-				$datetime_string = $dtt->start_date_and_time() . ' - ' . $dtt->end_date_and_time();
-				$dtts[] = array('id' => $dtt->ID(), 'text' => $datetime_string );
+			foreach ($this->_dtts_for_event as $dtt) {
+				$datetime_string = $dtt->start_date_and_time().' - '.$dtt->end_date_and_time();
+				$dtts[] = array('id' => $dtt->ID(), 'text' => $datetime_string);
 			}
 			$filters[] = EEH_Form_Fields::select_input('DTT_ID', $dtts, $cur_dtt);
 		}
@@ -164,19 +164,19 @@ 
 
 
 	protected function _get_total_event_attendees() {
-		$EVT_ID = isset($this->_req_data['event_id']) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
 		$query_params = array();
-		if ($EVT_ID){
-			$query_params[0]['EVT_ID']=$EVT_ID;
+		if ($EVT_ID) {
+			$query_params[0]['EVT_ID'] = $EVT_ID;
 		}
 		//if DTT is included we do multiple datetimes.  Otherwise we just do primary datetime
-		if ( $DTT_ID ) {
+		if ($DTT_ID) {
 			$query_params[0]['Ticket.Datetime.DTT_ID'] = $DTT_ID;
 		}
-		$status_ids_array = apply_filters( 'FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array( EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved ) );
+		$status_ids_array = apply_filters('FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array(EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved));
 
-		$query_params[0]['STS_ID']= array('IN', $status_ids_array );
+		$query_params[0]['STS_ID'] = array('IN', $status_ids_array);
 
 		return EEM_Registration::instance()->count($query_params);
 	}
@@ -187,8 +187,8 @@ 
 
 
 
-	function column__Reg_Status( EE_Registration $item ) {
-		return '<span class="ee-status-strip ee-status-strip-td reg-status-' . $item->status_ID() . '"></span>';
+	function column__Reg_Status(EE_Registration $item) {
+		return '<span class="ee-status-strip ee-status-strip-td reg-status-'.$item->status_ID().'"></span>';
 	}
 
 
@@ -196,7 +196,7 @@ 
 
 
 	function column_cb($item) {
-		return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', $item->ID() );
+		return sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', $item->ID());
 	}
 
 
@@ -209,18 +209,18 @@ 
 	/**
 	 * 		column_REG_att_checked_in
 	*/
-	function column__REG_att_checked_in(EE_Registration $item){
+	function column__REG_att_checked_in(EE_Registration $item) {
 		$attendee = $item->attendee();
 		$attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-		$DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0;
+		$DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0;
 		$checkinstatus = $item->check_in_status_for_datetime($DTT_ID);
 		$nonce = wp_create_nonce('checkin_nonce');
-		$evt_id = isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : NULL;
-		$toggle_active = !empty ( $evt_id ) && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_checkin', 'espresso_registrations_toggle_checkin_status', $item->ID() ) ? ' clickable trigger-checkin' : '';
+		$evt_id = isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : NULL;
+		$toggle_active = ! empty ($evt_id) && EE_Registry::instance()->CAP->current_user_can('ee_edit_checkin', 'espresso_registrations_toggle_checkin_status', $item->ID()) ? ' clickable trigger-checkin' : '';
 
-		$mobile_view_content = ' <span class="show-on-mobile-view-only">' . $attendee_name . '</span>';
+		$mobile_view_content = ' <span class="show-on-mobile-view-only">'.$attendee_name.'</span>';
 
-		 return '<span class="checkin-icons checkedin-status-' . $checkinstatus . $toggle_active . '" data-_regid="' . $item->ID() . '" data-dttid="' . $DTT_ID . '" data-nonce="' . $nonce . '"></span>' . $mobile_view_content;
+		 return '<span class="checkin-icons checkedin-status-'.$checkinstatus.$toggle_active.'" data-_regid="'.$item->ID().'" data-dttid="'.$DTT_ID.'" data-nonce="'.$nonce.'"></span>'.$mobile_view_content;
 	}
 
 
@@ -229,43 +229,43 @@ 
 
 	function column_ATT_name(EE_Registration $item) {
 		$attendee = $item->attendee();
-		if ( ! $attendee instanceof EE_Attendee ) {
+		if ( ! $attendee instanceof EE_Attendee) {
 			return __('No contact record for this registration.', 'event_espresso');
 		}
 
 		// edit attendee link
-		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
-		$name_link = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_contacts', 'espresso_registrations_edit_attendee' ) ?  '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Contact', 'event_espresso' ) . '">' . $item->attendee()->full_name() . '</a>' : $item->attendee()->full_name();
+		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
+		$name_link = EE_Registry::instance()->CAP->current_user_can('ee_edit_contacts', 'espresso_registrations_edit_attendee') ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Contact', 'event_espresso').'">'.$item->attendee()->full_name().'</a>' : $item->attendee()->full_name();
 		$name_link .= $item->count() == 1 ? '&nbsp;<sup><div class="dashicons dashicons-star-filled lt-blue-icon ee-icon-size-8"></div></sup>	' : '';
 
 		//add group details
-		$name_link .= '&nbsp;' . sprintf(__( '(%s of %s)', 'event_espresso' ),$item->count(), $item->group_size());
+		$name_link .= '&nbsp;'.sprintf(__('(%s of %s)', 'event_espresso'), $item->count(), $item->group_size());
 
 		//add regcode
-		$link = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $item->ID() ), REG_ADMIN_URL );
+		$link = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $item->ID()), REG_ADMIN_URL);
 		$name_link .= '<br>';
-		$name_link .= EE_Registry::instance()->instance()->CAP->current_user_can('ee_read_registration', 'view_registration', $item->ID() )
-			? '<a href="' . $link . '" title="' . esc_attr__('View Registration Details', 'event_espresso') .'">' . $item->reg_code() . '</a>'
+		$name_link .= EE_Registry::instance()->instance()->CAP->current_user_can('ee_read_registration', 'view_registration', $item->ID())
+			? '<a href="'.$link.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'.$item->reg_code().'</a>'
 			: $item->reg_code();
 
 		//status
-		$name_link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+		$name_link .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->status_ID(), false, 'sentence').'</span>';
 
 		$actions = array();
-		$DTT_ID = !empty( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL;
-		$DTT_ID = empty( $DTT_ID ) && !empty( $this->_req_data['event_id'] ) ? EEM_Event::instance()->get_one_by_ID( $this->_req_data['event_id'] )->primary_datetime()->ID() : $DTT_ID;
+		$DTT_ID = ! empty($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL;
+		$DTT_ID = empty($DTT_ID) && ! empty($this->_req_data['event_id']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['event_id'])->primary_datetime()->ID() : $DTT_ID;
 
-		if ( !empty($DTT_ID) && EE_Registry::instance()->CAP->current_user_can( 'ee_read_checkins', 'espresso_registrations_registration_checkins' ) ) {
-			$checkin_list_url = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'registration_checkins', '_REGID' => $item->ID(), 'DTT_ID' => $DTT_ID));
-			$actions['checkin'] = '<a href="' . $checkin_list_url . '" title="' . esc_attr__('View all the check-ins/checkouts for this registrant', 'event_espresso' ) . '">' . __('View', 'event_espresso') . '</a>';
+		if ( ! empty($DTT_ID) && EE_Registry::instance()->CAP->current_user_can('ee_read_checkins', 'espresso_registrations_registration_checkins')) {
+			$checkin_list_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'registration_checkins', '_REGID' => $item->ID(), 'DTT_ID' => $DTT_ID));
+			$actions['checkin'] = '<a href="'.$checkin_list_url.'" title="'.esc_attr__('View all the check-ins/checkouts for this registrant', 'event_espresso').'">'.__('View', 'event_espresso').'</a>';
 		}
 
-		return !empty( $DTT_ID ) ? sprintf( '%1$s %2$s', $name_link, $this->row_actions($actions) ) : $name_link;
+		return ! empty($DTT_ID) ? sprintf('%1$s %2$s', $name_link, $this->row_actions($actions)) : $name_link;
 	}
 
 
 
-	function column_ATT_email( EE_Registration $item ) {
+	function column_ATT_email(EE_Registration $item) {
 		$attendee = $item->attendee();
 		return $attendee instanceof EE_Attendee ? $attendee->email() : '';
 		return $item->get_first_related('Attendee')->email();
@@ -277,8 +277,8 @@ 
 
 	function column_Event(EE_Registration $item) {
 		$event = $this->_evt instanceof EE_Event ? $this->_evt : $item->event();
-		$chkin_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'event_registrations', 'event_id'=>$event->ID() ), REG_ADMIN_URL );
-		$event_label = EE_Registry::instance()->CAP->current_user_can( 'ee_read_checkins', 'espresso_registrations_registration_checkins' ) ?  '<a href="'.$chkin_lnk_url.'" title="' . esc_attr__( 'View Checkins for this Event', 'event_espresso' ) . '">' . $event->name() . '</a>' : $event->name();
+		$chkin_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'event_registrations', 'event_id'=>$event->ID()), REG_ADMIN_URL);
+		$event_label = EE_Registry::instance()->CAP->current_user_can('ee_read_checkins', 'espresso_registrations_registration_checkins') ? '<a href="'.$chkin_lnk_url.'" title="'.esc_attr__('View Checkins for this Event', 'event_espresso').'">'.$event->name().'</a>' : $event->name();
 		return $event_label;
 	}
 
@@ -286,7 +286,7 @@ 
 
 
 
-	function column_PRC_name(EE_Registration $item){
+	function column_PRC_name(EE_Registration $item) {
 		return $item->ticket() instanceof EE_Ticket ? $item->ticket()->name() : __("Unknown", "event_espresso");
 	}
 
@@ -298,8 +298,8 @@ 
 	/**
 	 * 		column_REG_final_price
 	*/
-	function column__REG_final_price(EE_Registration $item){
-		return '<span class="reg-pad-rght">' .  ' ' . $item->pretty_final_price() . '</span>';
+	function column__REG_final_price(EE_Registration $item) {
+		return '<span class="reg-pad-rght">'.' '.$item->pretty_final_price().'</span>';
 	}
 
 
@@ -309,20 +309,20 @@ 
 	/**
 	 * 		column_TXN_paid
 	*/
-	function column_TXN_paid(EE_Registration $item){
+	function column_TXN_paid(EE_Registration $item) {
 
-		if ( $item->count() == 1 ) {
+		if ($item->count() == 1) {
 
-			if ( $item->transaction()->paid() >= $item->transaction()->total() ) {
+			if ($item->transaction()->paid() >= $item->transaction()->total()) {
 				return '<span class="reg-pad-rght"><div class="dashicons dashicons-yes green-icon"></div></span>';
 			} else {
-				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID() ), TXN_ADMIN_URL );
-				return EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ?  '
+				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID()), TXN_ADMIN_URL);
+				return EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '
 				<span class="reg-pad-rght">
-					<a class="status-'. $item->transaction()->status_ID() .'" href="'.$view_txn_lnk_url.'"  title="' . esc_attr__( 'View Transaction', 'event_espresso' ) . '">
-						' . $item->transaction()->pretty_paid(). '
+					<a class="status-'. $item->transaction()->status_ID().'" href="'.$view_txn_lnk_url.'"  title="'.esc_attr__('View Transaction', 'event_espresso').'">
+						' . $item->transaction()->pretty_paid().'
 					</a>
-				<span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_paid() . '</span>';
+				<span>' : '<span class="reg-pad-rght">'.$item->transaction()->pretty_paid().'</span>';
 			}
 		} else {
 			return '<span class="reg-pad-rght"></span>';
@@ -336,13 +336,13 @@ 
 	/**
 	 * 		column_TXN_total
 	*/
-	function column_TXN_total(EE_Registration $item){
+	function column_TXN_total(EE_Registration $item) {
 		$txn = $item->transaction();
-		$view_txn_url = add_query_arg( array('action' => 'view_transaction', 'TXN_ID' => $txn->ID() ), TXN_ADMIN_URL );
-		if ( $item->get('REG_count') == 1 ) {
+		$view_txn_url = add_query_arg(array('action' => 'view_transaction', 'TXN_ID' => $txn->ID()), TXN_ADMIN_URL);
+		if ($item->get('REG_count') == 1) {
 			$line_total_obj = $txn->total_line_item();
 			$txn_total = $line_total_obj instanceof EE_Line_Item ? $line_total_obj->get_pretty('LIN_total') : __('View Transaction', 'event_espresso');
-			return EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ?  '<a href="' . $view_txn_url . '" title="' . esc_attr__('View Transaction', 'event_espresso') . '"><span class="reg-pad-rght">'. $txn_total  .'</span></a>' : '<span class="reg-pad-rght">' . $txn_total . '</span>';
+			return EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '<a href="'.$view_txn_url.'" title="'.esc_attr__('View Transaction', 'event_espresso').'"><span class="reg-pad-rght">'.$txn_total.'</span></a>' : '<span class="reg-pad-rght">'.$txn_total.'</span>';
 		} else {
 			return '<span class="reg-pad-rght"></span>';
 		}

core/EE_Cart.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * Event Espresso

Doc Comments +3 added lines, -3 removed lines

@@ -197,7 +197,7 @@ 
 	 *	@access public
 	 *	@param EE_Ticket $ticket
 	 *	@param int $qty
-	 *	@return TRUE on success, FALSE on fail
+	 *	@return boolean on success, FALSE on fail
 	 */
 	public function add_ticket_to_cart( EE_Ticket $ticket, $qty = 1 ) {
 		EEH_Line_Item::add_ticket_purchase( $this->get_grand_total(), $ticket, $qty );
@@ -284,7 +284,7 @@ 
 	/**
 	 *	@remove ALL items from cart and delete total as well
 	 *	@access public
-	 *	@return bool
+	 *	@return integer
 	 */
 	public function delete_cart() {
 		EE_Registry::instance()->load_helper( 'Line_Item' );
@@ -313,7 +313,7 @@ 
 	  * @save cart to session
 	  * @access public
 	  * @param bool $apply_taxes
-	  * @return TRUE on success, FALSE on fail
+	  * @return boolean on success, FALSE on fail
 	  */
 	public function save_cart( $apply_taxes = TRUE ) {
 		if ( $apply_taxes && $this->_grand_total instanceof EE_Line_Item ) {

Spacing +53 added lines, -53 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );/**
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, ''); /**
  *
  * Event Espresso
  *
@@ -67,24 +67,24 @@ 
 	  * @param EE_Session $session
 	  * @return \EE_Cart
 	  */
-	 public static function instance( EE_Line_Item $grand_total = null, EE_Session $session = null ) {
-		if ( ! empty( $grand_total ) ){
-			self::$_instance = new self( $grand_total, $session );
+	 public static function instance(EE_Line_Item $grand_total = null, EE_Session $session = null) {
+		if ( ! empty($grand_total)) {
+			self::$_instance = new self($grand_total, $session);
 		}
 		// or maybe retrieve an existing one ?
-		if ( ! self::$_instance instanceof EE_Cart ) {
+		if ( ! self::$_instance instanceof EE_Cart) {
 			// try getting the cart out of the session
 			$saved_cart = $session instanceof EE_Session ? $session->cart() : null;
-			self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self( $grand_total, $session );
-			unset( $saved_cart );
+			self::$_instance = $saved_cart instanceof EE_Cart ? $saved_cart : new self($grand_total, $session);
+			unset($saved_cart);
 		}
 		// verify that cart is ok and grand total line item exists
-		if ( ! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item ) {
-			self::$_instance = new self( $grand_total, $session );
+		if ( ! self::$_instance instanceof EE_Cart || ! self::$_instance->_grand_total instanceof EE_Line_Item) {
+			self::$_instance = new self($grand_total, $session);
 		}
 		self::$_instance->get_grand_total();
 		 // once everything is all said and done, save the cart to the EE_Session
-		add_action( 'shutdown', array( self::$_instance, 'save_cart' ), 90 );
+		add_action('shutdown', array(self::$_instance, 'save_cart'), 90);
 		return self::$_instance;
 	}
 
@@ -98,11 +98,11 @@ 
 	  * @param EE_Session $session
 	  * @return \EE_Cart
 	  */
-	 private function __construct( EE_Line_Item $grand_total = null, EE_Session $session = null ) {
-		 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		 $this->set_session( $session );
-		 if ( $grand_total instanceof EE_Line_Item ) {
-			 $this->set_grand_total_line_item( $grand_total );
+	 private function __construct(EE_Line_Item $grand_total = null, EE_Session $session = null) {
+		 do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		 $this->set_session($session);
+		 if ($grand_total instanceof EE_Line_Item) {
+			 $this->set_grand_total_line_item($grand_total);
 		 }
 	 }
 
@@ -114,13 +114,13 @@ 
 	  * @param EE_Session $session
 	  * @return EE_Cart
 	  */
-	 public static function reset( EE_Line_Item $grand_total = null, EE_Session $session = null ) {
-		 remove_action( 'shutdown', array( self::$_instance, 'save_cart' ), 90 );
-		 if ( $session instanceof EE_Session ) {
+	 public static function reset(EE_Line_Item $grand_total = null, EE_Session $session = null) {
+		 remove_action('shutdown', array(self::$_instance, 'save_cart'), 90);
+		 if ($session instanceof EE_Session) {
 			 $session->reset_cart();
 		 }
 		 self::$_instance = null;
-		 return self::instance( $grand_total, $session );
+		 return self::instance($grand_total, $session);
 	 }
 
 
@@ -128,8 +128,8 @@ 
 	 /**
 	  * @param EE_Session $session
 	  */
-	 public function set_session( EE_Session $session = null ) {
-		 $this->_session = $session instanceof EE_Session ? $session : EE_Registry::instance()->load_core( 'Session' );
+	 public function set_session(EE_Session $session = null) {
+		 $this->_session = $session instanceof EE_Session ? $session : EE_Registry::instance()->load_core('Session');
 	 }
 
 
@@ -139,7 +139,7 @@ 
 	  *  know the grand total line item on it
 	  * @param EE_Line_Item $line_item
 	  */
-	 public function set_grand_total_line_item( EE_Line_Item $line_item ) {
+	 public function set_grand_total_line_item(EE_Line_Item $line_item) {
 		 $this->_grand_total = $line_item;
 	 }
 
@@ -152,11 +152,11 @@ 
 	  * @param EE_Session $session
 	  * @return \EE_Cart
 	  */
-	public static function get_cart_from_txn( EE_Transaction $transaction, EE_Session $session = null ) {
+	public static function get_cart_from_txn(EE_Transaction $transaction, EE_Session $session = null) {
 		$grand_total = $transaction->total_line_item();
 		$grand_total->get_items();
 		$grand_total->tax_descendants();
-		return EE_Cart::instance( $grand_total, $session );
+		return EE_Cart::instance($grand_total, $session);
 	}
 
 
@@ -165,7 +165,7 @@ 
 	 * Creates the total line item, and ensures it has its 'tickets' and 'taxes' sub-items
 	 * @return EE_Line_Item
 	 */
-	private function _create_grand_total(){
+	private function _create_grand_total() {
 		$this->_grand_total = EEH_Line_Item::create_total_line_item();
 		return $this->_grand_total;
 	}
@@ -178,7 +178,7 @@ 
 	 *	@return \EE_Line_Item[]
 	 */
 	public function get_tickets() {
-		return EEH_Line_Item::get_ticket_line_items( $this->_grand_total );
+		return EEH_Line_Item::get_ticket_line_items($this->_grand_total);
 	}
 
 
@@ -191,11 +191,11 @@ 
 	 */
 	public function all_ticket_quantity_count() {
 		$tickets = $this->get_tickets();
-		if ( empty( $tickets )) {
+		if (empty($tickets)) {
 			return 0;
 		}
 		$count = 0;
-		foreach ( $tickets as $ticket ) {
+		foreach ($tickets as $ticket) {
 			$count = $count + $ticket->get('LIN_quantity');
 		}
 		return $count;
@@ -207,8 +207,8 @@ 
 	 *  Gets all the tax line items
 	 * @return \EE_Line_Item[]
 	 */
-	public function get_taxes(){
-		return EEH_Line_Item::get_taxes_subtotal( $this->_grand_total )->children();
+	public function get_taxes() {
+		return EEH_Line_Item::get_taxes_subtotal($this->_grand_total)->children();
 	}
 
 
@@ -217,7 +217,7 @@ 
 	 * Gets the total line item (which is a parent of all other line items) on this cart
 	 * @return EE_Line_Item
 	 */
-	public function get_grand_total(){
+	public function get_grand_total() {
 		return $this->_grand_total instanceof EE_Line_Item ? $this->_grand_total : $this->_create_grand_total();
 	}
 
@@ -230,8 +230,8 @@ 
 	 *	@param int $qty
 	 *	@return TRUE on success, FALSE on fail
 	 */
-	public function add_ticket_to_cart( EE_Ticket $ticket, $qty = 1 ) {
-		EEH_Line_Item::add_ticket_purchase( $this->get_grand_total(), $ticket, $qty );
+	public function add_ticket_to_cart(EE_Ticket $ticket, $qty = 1) {
+		EEH_Line_Item::add_ticket_purchase($this->get_grand_total(), $ticket, $qty);
 		return $this->save_cart() ? TRUE : FALSE;
 	}
 
@@ -254,7 +254,7 @@ 
 	 *	@return float
 	 */
 	public function get_applied_taxes() {
-		return EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+		return EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 	}
 
 
@@ -265,7 +265,7 @@ 
 	 *	@return float
 	 */
 	public function get_cart_grand_total() {
-		EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+		EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 		return $this->get_grand_total()->total();
 	}
 
@@ -278,8 +278,8 @@ 
 	 */
 	public function recalculate_all_cart_totals() {
 		$pre_tax_total = $this->get_cart_total_before_tax();
-		$taxes_total = EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
-		$this->_grand_total->set_total( $pre_tax_total + $taxes_total );
+		$taxes_total = EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
+		$this->_grand_total->set_total($pre_tax_total + $taxes_total);
 		$this->_grand_total->save_this_and_descendants_to_txn();
 		return $this->get_grand_total()->total();
 	}
@@ -292,9 +292,9 @@ 
 	 *	@param array|bool|string $line_item_codes
 	 *	@return int on success, FALSE on fail
 	 */
-	public function delete_items( $line_item_codes = FALSE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes );
+	public function delete_items($line_item_codes = FALSE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		return EEH_Line_Item::delete_items($this->get_grand_total(), $line_item_codes);
 	}
 
 
@@ -305,9 +305,9 @@ 
 	 *	@return bool
 	 */
 	public function empty_cart() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_grand_total = $this->_create_grand_total();
-		return $this->save_cart( TRUE );
+		return $this->save_cart(TRUE);
 	}
 
 
@@ -318,8 +318,8 @@ 
 	 *	@return bool
 	 */
 	public function delete_cart() {
-		$deleted = EEH_Line_Item::delete_all_child_items( $this->_grand_total );
-		if ( $deleted ) {
+		$deleted = EEH_Line_Item::delete_all_child_items($this->_grand_total);
+		if ($deleted) {
 			$deleted += $this->_grand_total->delete();
 			$this->_grand_total = null;
 		}
@@ -334,17 +334,17 @@ 
 	  * @param bool $apply_taxes
 	  * @return TRUE on success, FALSE on fail
 	  */
-	public function save_cart( $apply_taxes = TRUE ) {
-		if ( $apply_taxes && $this->_grand_total instanceof EE_Line_Item ) {
-			EEH_Line_Item::ensure_taxes_applied( $this->_grand_total );
+	public function save_cart($apply_taxes = TRUE) {
+		if ($apply_taxes && $this->_grand_total instanceof EE_Line_Item) {
+			EEH_Line_Item::ensure_taxes_applied($this->_grand_total);
 			//make sure we don't cache the transaction because it can get stale
-			if( $this->_grand_total->get_one_from_cache( 'Transaction' ) instanceof EE_Transaction &&
-				$this->_grand_total->get_one_from_cache( 'Transaction' )->ID()) {
-				$this->_grand_total->clear_cache( 'Transaction', null, true );
+			if ($this->_grand_total->get_one_from_cache('Transaction') instanceof EE_Transaction &&
+				$this->_grand_total->get_one_from_cache('Transaction')->ID()) {
+				$this->_grand_total->clear_cache('Transaction', null, true);
 			}
 		}
-		if ( $this->_session instanceof EE_Session ) {
-			return $this->_session->set_cart( $this );
+		if ($this->_session instanceof EE_Session) {
+			return $this->_session->set_cart($this);
 		} else {
 			return false;
 		}

core/admin/templates/admin_details_legend.template.php

Spacing +7 added lines, -7 removed lines

@@ -2,25 +2,25 @@
 //this displays any legends with an array of $items that are indexed by id for each item and each item itself is an array of 'icon' and 'desc'.
 
 //figure out the columns based on the count of items (we want a max of 6 items per column).
-$per_col = isset( $per_column ) ? $per_column : 5;
+$per_col = isset($per_column) ? $per_column : 5;
 $count = 1;
 ?>
 <div class="ee-list-table-legend-container">
 	<h4><?php _e('Legend', 'event_espresso'); ?></h4>
 	<dl class="alignleft ee-list-table-legend">
-		<?php foreach ( $items as $item => $details ) : ?>
-			<?php if ( $per_col < $count ) : ?>
+		<?php foreach ($items as $item => $details) : ?>
+			<?php if ($per_col < $count) : ?>
 				</dl>
 				<dl class="alignleft ee-list-table-legend">
 			<?php $count = 1; endif; ?>
 			<dt id="ee-legend-item-<?php echo $item; ?>">
-				<?php $class = ! empty( $details['class'] ) ? $details['class'] : 'ee-legend-img-container'; ?>
-				<?php if ( strpos( $details[ 'class' ], '<span' ) !== false ) {
+				<?php $class = ! empty($details['class']) ? $details['class'] : 'ee-legend-img-container'; ?>
+				<?php if (strpos($details['class'], '<span') !== false) {
 					echo $class;
 				} else { ?>
 				<span class="<?php echo $class; ?>">
-					<?php if ( ! empty( $details[ 'icon' ] ) ) : ?>
-						<img src="<?php echo $details[ 'icon' ]; ?>" class="ee-legend-icon" alt="<?php echo esc_attr( $details[ 'desc' ] ); ?>"/>
+					<?php if ( ! empty($details['icon'])) : ?>
+						<img src="<?php echo $details['icon']; ?>" class="ee-legend-icon" alt="<?php echo esc_attr($details['desc']); ?>"/>
 					<?php endif; ?>
 				</span>
 				<?php } ?>

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_questions.dmsstage.php

Spacing +32 added lines, -32 removed lines

@@ -55,21 +55,21 @@ 
 					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed','event_espresso'), false, false)
 				)
  */
-class EE_DMS_4_1_0_questions extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_questions extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_new_table;
 	private $_option_table;
-	function _migration_step($num_items=50){
+	function _migration_step($num_items = 50) {
 		global $wpdb;
 		$start_at_record = $this->count_records_migrated();
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
 		$items_actually_migrated = 0;
-		foreach($rows as $question_row){
+		foreach ($rows as $question_row) {
 			$new_id = $this->_insert_new_question($question_row);
 			$this->get_migration_script()->set_mapping($this->_old_table, $question_row['id'], $this->_new_table, $new_id);
 			$items_actually_migrated++;
 		}
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -87,14 +87,14 @@ 
 		$this->_option_table = $wpdb->prefix."esp_question_option";
 		parent::__construct();
 	}
-	private function _insert_new_question($old_question){
+	private function _insert_new_question($old_question) {
 		global $wpdb;
 		//if this pretends to be a 'system' question, check if we already have a
 		//system question for that string. If so, pretend THAT new question
 		//is what we just isnerted
-		if($old_question['system_name']){
-			$id_of_new_system_question = intval($wpdb->get_var($wpdb->prepare("SELECT QST_ID FROM {$this->_new_table} WHERE QST_system = %s",$old_question['system_name'])));
-			if($id_of_new_system_question){
+		if ($old_question['system_name']) {
+			$id_of_new_system_question = intval($wpdb->get_var($wpdb->prepare("SELECT QST_ID FROM {$this->_new_table} WHERE QST_system = %s", $old_question['system_name'])));
+			if ($id_of_new_system_question) {
 				return $id_of_new_system_question;
 			}
 			//ok so this must be the first one. Carry on.
@@ -113,27 +113,27 @@ 
 			'QST_deleted'=>false
 		);
 		$datatypes = array(
-			'%s',//QST_display_text
-			'%s',//QST-admin_label
-			'%s',//QST_system
-			'%s',//QST_type
-			'%d',//QST_required
-			'%s',//QST_required_text
-			'%d',//QST_order
-			'%d',//QST_admin_only
-			'%d',//QST_wp_user
-			'%d',//QST_deleted
+			'%s', //QST_display_text
+			'%s', //QST-admin_label
+			'%s', //QST_system
+			'%s', //QST_type
+			'%d', //QST_required
+			'%s', //QST_required_text
+			'%d', //QST_order
+			'%d', //QST_admin_only
+			'%d', //QST_wp_user
+			'%d', //QST_deleted
 		);
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}
 		$new_id = $wpdb->insert_id;
 		//now take care of posisbly adding question options
-		if(in_array($old_question['question_type'],array('DROPDOWN','SINGLE','MULTIPLE'))){
-			$options = explode(",",$old_question['response']);
-			foreach($options as $option){
+		if (in_array($old_question['question_type'], array('DROPDOWN', 'SINGLE', 'MULTIPLE'))) {
+			$options = explode(",", $old_question['response']);
+			foreach ($options as $option) {
 				$this->_insert_question_option($option, $new_id);
 			}
 		}
@@ -146,7 +146,7 @@ 
 	 * @param int $question_id
 	 * @return int
 	 */
-	private function _insert_question_option($option,$question_id){
+	private function _insert_question_option($option, $question_id) {
 		$option = trim($option);
 		global $wpdb;
 		$cols_n_values = array(
@@ -154,14 +154,14 @@ 
 			'QSO_value'=>$option,
 			'QSO_deleted'=>false
 		);
-		$datatypes= array(
-			'%d',//QST_ID
-			'%s',//QSO_value
-			'%d',//QSO_deleted
+		$datatypes = array(
+			'%d', //QST_ID
+			'%s', //QSO_value
+			'%d', //QSO_deleted
 		);
-		$success = $wpdb->insert($this->_option_table,$cols_n_values,$datatypes);
-		if ( ! $success ){
-			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option'=>$option,'new_question_id'=>$question_id), $this->_option_table, $cols_n_values, $datatypes));
+		$success = $wpdb->insert($this->_option_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option'=>$option, 'new_question_id'=>$question_id), $this->_option_table, $cols_n_values, $datatypes));
 			return 0;
 		}
 		return $wpdb->insert_id;

core/data_migration_scripts/4_8_0_stages/EE_DMS_4_8_0_event_subtotals.dmsstage.php

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,68 +12,68 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_DMS_4_8_0_event_subtotals extends EE_Data_Migration_Script_Stage_Table{
-	function __construct(){
+class EE_DMS_4_8_0_event_subtotals extends EE_Data_Migration_Script_Stage_Table {
+	function __construct() {
 		global $wpdb;
-		$this->_old_table = $wpdb->prefix . 'esp_line_item';
+		$this->_old_table = $wpdb->prefix.'esp_line_item';
 		$this->_extra_where_sql = ' WHERE LIN_type="sub-total" AND LIN_code="pre-tax-subtotal"';
 		$this->_pretty_name = __('Event Sub-total line items', 'event_espresso');
 		parent::__construct();
 	}
-	protected function _migrate_old_row( $line_item_row ) {
+	protected function _migrate_old_row($line_item_row) {
 		global $wpdb;
 		//what event is this line item for? this can be found by looking at its transaction's registration's EVT_ID
-		$event_id = $wpdb->get_var( $wpdb->prepare( 'SELECT EVT_ID FROM ' . $wpdb->prefix . 'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row[ 'TXN_ID' ] ) );
+		$event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM '.$wpdb->prefix.'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
 		$new_line_item_data = array(
-					'LIN_code' => 'event-' . $event_id,
-					'TXN_ID' => $line_item_row[ 'TXN_ID' ],
-					'LIN_name' => __( 'Event', 'event_espresso' ),
-					'LIN_desc' => $line_item_row[ 'LIN_desc' ],
-					'LIN_unit_price' => $line_item_row[ 'LIN_unit_price' ],
-					'LIN_percent' => $line_item_row[ 'LIN_percent' ],
-					'LIN_is_taxable' => $line_item_row[ 'LIN_is_taxable' ],
-					'LIN_order' => $line_item_row[ 'LIN_order' ],
-					'LIN_total' => $line_item_row[ 'LIN_total' ],
-					'LIN_quantity' => $line_item_row[ 'LIN_quantity' ],
-					'LIN_parent' => $line_item_row[ 'LIN_ID'],
+					'LIN_code' => 'event-'.$event_id,
+					'TXN_ID' => $line_item_row['TXN_ID'],
+					'LIN_name' => __('Event', 'event_espresso'),
+					'LIN_desc' => $line_item_row['LIN_desc'],
+					'LIN_unit_price' => $line_item_row['LIN_unit_price'],
+					'LIN_percent' => $line_item_row['LIN_percent'],
+					'LIN_is_taxable' => $line_item_row['LIN_is_taxable'],
+					'LIN_order' => $line_item_row['LIN_order'],
+					'LIN_total' => $line_item_row['LIN_total'],
+					'LIN_quantity' => $line_item_row['LIN_quantity'],
+					'LIN_parent' => $line_item_row['LIN_ID'],
 					'LIN_type' => 'sub-total',
 					'OBJ_type' => 'Event',
 					'OBJ_ID' => $event_id,
 				);
 		$new_line_item_datatypes = array(
-					'%s',//LIN_code
-					'%d',//TXN_ID
-					'%s',//LIN_name
-					'%s',//LIN_desc
-					'%f',//LIN_unit_price
-					'%f',//LIN_percent
-					'%d',//LIN_is_taxable
-					'%d',//LIN_order
-					'%f',//LIN_total
-					'%d',//LIN_quantity
-					'%d',//LIN_parent
-					'%s',//LIN_type
-					'%s',//OBJ_type
-					'%d',//OBJ_ID
+					'%s', //LIN_code
+					'%d', //TXN_ID
+					'%s', //LIN_name
+					'%s', //LIN_desc
+					'%f', //LIN_unit_price
+					'%f', //LIN_percent
+					'%d', //LIN_is_taxable
+					'%d', //LIN_order
+					'%f', //LIN_total
+					'%d', //LIN_quantity
+					'%d', //LIN_parent
+					'%s', //LIN_type
+					'%s', //OBJ_type
+					'%d', //OBJ_ID
 				);
 		//insert the new event subtotal line item, pointing to this line item
-		$success = $wpdb->insert( $this->_old_table, $new_line_item_data, $new_line_item_datatypes );
-		if( ! $success ) {
-			$this->add_error( $this->_create_error_message_for_db_insertion( $this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes ) );
+		$success = $wpdb->insert($this->_old_table, $new_line_item_data, $new_line_item_datatypes);
+		if ( ! $success) {
+			$this->add_error($this->_create_error_message_for_db_insertion($this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes));
 		}
 		$new_line_item_id = $wpdb->insert_id;
-		$this->get_migration_script()->set_mapping($this->_old_table, $line_item_row[ 'LIN_ID' ], $this->_old_table, $new_line_item_id );
+		$this->get_migration_script()->set_mapping($this->_old_table, $line_item_row['LIN_ID'], $this->_old_table, $new_line_item_id);
 		$query = $wpdb->prepare(
 					"UPDATE {$this->_old_table} SET LIN_parent=%d WHERE LIN_parent = %d AND LIN_ID != %d LIMIT 100",
 					$new_line_item_id,
-					$line_item_row[ 'LIN_ID' ],
+					$line_item_row['LIN_ID'],
 					$new_line_item_id );
-		$success = $wpdb->query( $query );
-		if( $success === false ) {
+		$success = $wpdb->query($query);
+		if ($success === false) {
 			$this->add_error(
-					sprintf( __( 'Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso' ),
+					sprintf(__('Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso'),
 					$new_line_item_id,
-					$line_item_row[ 'LIN_ID' ],
+					$line_item_row['LIN_ID'],
 					$wpdb->last_error,
 					$query,
 					$success) );