eventespresso / event-espresso-core

caffeinated/core/libraries/shortcodes/EE_Newsletter_Shortcodes.lib.php

Indentation +65 added lines, -65 removed lines

@@ -20,81 +20,81 @@
  */
 class EE_Newsletter_Shortcodes extends EE_Shortcodes {
 
-    protected function _init_props() {
-        $this->label = __("Batch Messages Shortcodes", 'event_espresso');
-        $this->description = __('All shortcodes used for the batch message type', 'event_espresso');
-        $this->_shortcodes = array(
-            '[NEWSLETTER_CONTENT]' => __('This will parse to whatever is found in the related [newsletter_content] field.  Note that when triggering a batch message, whatever is added for the custom message will be inserted where this shortcode is placed.', 'event_espresso')
-            );
-    }
+	protected function _init_props() {
+		$this->label = __("Batch Messages Shortcodes", 'event_espresso');
+		$this->description = __('All shortcodes used for the batch message type', 'event_espresso');
+		$this->_shortcodes = array(
+			'[NEWSLETTER_CONTENT]' => __('This will parse to whatever is found in the related [newsletter_content] field.  Note that when triggering a batch message, whatever is added for the custom message will be inserted where this shortcode is placed.', 'event_espresso')
+			);
+	}
 
 
 
-    protected function _parser( $shortcode ) {
-        if ( $shortcode == '[NEWSLETTER_CONTENT]' ) {
-            $this->_validate_list_requirements();
-            $valid_shortcodes = array('recipient_details', 'organization');
-            $template = $this->_data['template']['newsletter_content'];
-            $data = $this->_data;
-            return $this->_shortcode_helper->parse_message_template( $template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
-        }
-    }
+	protected function _parser( $shortcode ) {
+		if ( $shortcode == '[NEWSLETTER_CONTENT]' ) {
+			$this->_validate_list_requirements();
+			$valid_shortcodes = array('recipient_details', 'organization');
+			$template = $this->_data['template']['newsletter_content'];
+			$data = $this->_data;
+			return $this->_shortcode_helper->parse_message_template( $template, $data['data'], $valid_shortcodes, $this->_message_type, $this->_messenger, $this->_message );
+		}
+	}
 
 
-    /**
-     * Callback set in args for EE_Register_Messages_Shortcode_Library::register for 'msgr_validator_callback'.
-     *
-     * EE_Register_Messages_Shortcode_Library::register registers this callback with the
-     * 'FHEE__EE_messenger__get_validator_config' filter.
-     *
-     * @since    4.3.0
-     * @param  array        $validator_config  current validator configuration array
-     * @param  EE_messenger $messenger
-     * @return  array                                             new validator config.
-     */
-    public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $validator_config;
+	/**
+	 * Callback set in args for EE_Register_Messages_Shortcode_Library::register for 'msgr_validator_callback'.
+	 *
+	 * EE_Register_Messages_Shortcode_Library::register registers this callback with the
+	 * 'FHEE__EE_messenger__get_validator_config' filter.
+	 *
+	 * @since    4.3.0
+	 * @param  array        $validator_config  current validator configuration array
+	 * @param  EE_messenger $messenger
+	 * @return  array                                             new validator config.
+	 */
+	public static function messenger_validator_config( $validator_config, EE_messenger $messenger ) {
+		if ( $messenger->name !== 'email' )
+			return $validator_config;
 
-        $validator_config['content']['shortcodes'][] = 'newsletter';
-        $validator_config['newsletter_content'] = array(
-            'shortcodes' => array('recipient_details', 'organization'),
-            'required' => array('[NEWSLETTER_CONTENT]')
-            );
-        return $validator_config;
-    }
+		$validator_config['content']['shortcodes'][] = 'newsletter';
+		$validator_config['newsletter_content'] = array(
+			'shortcodes' => array('recipient_details', 'organization'),
+			'required' => array('[NEWSLETTER_CONTENT]')
+			);
+		return $validator_config;
+	}
 
 
 
 
-    /**
-     * Callback set in args for EE_Register_Messages_Shortcode_Library::register for
-     * 'msgr_template_fields_callback'.
-     *
-     * EE_Register_Messages_Shortcode_Library::register registers this callback with the
-     * FHEE__EE_messenger__get_template_fields filter.
-     *
-     * @since    4.3.0
-     *
-     * @param  array        $template_fields current template fields setup array.
-     * @param  EE_messenger $messenger
-     * @return  array                                           new/modified template fields array.
-     */
-    public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
-        if ( $messenger->name !== 'email' )
-            return $template_fields;
+	/**
+	 * Callback set in args for EE_Register_Messages_Shortcode_Library::register for
+	 * 'msgr_template_fields_callback'.
+	 *
+	 * EE_Register_Messages_Shortcode_Library::register registers this callback with the
+	 * FHEE__EE_messenger__get_template_fields filter.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param  array        $template_fields current template fields setup array.
+	 * @param  EE_messenger $messenger
+	 * @return  array                                           new/modified template fields array.
+	 */
+	public static function messenger_template_fields( $template_fields, EE_messenger $messenger ) {
+		if ( $messenger->name !== 'email' )
+			return $template_fields;
 
-        $template_fields['extra']['content']['newsletter_content'] = array(
-            'input' => 'wp_editor',
-            'label' => '[NEWSLETTER_CONTENT]',
-            'type' => 'string',
-            'required' => TRUE,
-            'validation' => TRUE,
-            'format' => '%s',
-            'rows' => '15',
-            'shortcodes_required' => array('[NEWSLETTER_CONTENT]')
-            );
-        return $template_fields;
-    }
+		$template_fields['extra']['content']['newsletter_content'] = array(
+			'input' => 'wp_editor',
+			'label' => '[NEWSLETTER_CONTENT]',
+			'type' => 'string',
+			'required' => TRUE,
+			'validation' => TRUE,
+			'format' => '%s',
+			'rows' => '15',
+			'shortcodes_required' => array('[NEWSLETTER_CONTENT]')
+			);
+		return $template_fields;
+	}
 
 } //end class EE_Newsletter_Shortcodes

admin_pages/events/Events_Admin_Page.core.php

Spacing +595 added lines, -595 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');
 }
 
 
@@ -63,7 +63,7 @@ 
 		);
 		add_action(
 			'AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object',
-			array( $this, 'verify_event_edit' )
+			array($this, 'verify_event_edit')
 		);
 	}
 
@@ -79,22 +79,22 @@ 
 		$this->_admin_page_title = EVENTS_LABEL;
 		$this->_labels = array(
 			'buttons'      => array(
-				'add'             => esc_html__( 'Add New Event', 'event_espresso' ),
-				'edit'            => esc_html__( 'Edit Event', 'event_espresso' ),
-				'delete'          => esc_html__( 'Delete Event', 'event_espresso' ),
-				'add_category'    => esc_html__( 'Add New Category', 'event_espresso' ),
-				'edit_category'   => esc_html__( 'Edit Category', 'event_espresso' ),
-				'delete_category' => esc_html__( 'Delete Category', 'event_espresso' ),
+				'add'             => esc_html__('Add New Event', 'event_espresso'),
+				'edit'            => esc_html__('Edit Event', 'event_espresso'),
+				'delete'          => esc_html__('Delete Event', 'event_espresso'),
+				'add_category'    => esc_html__('Add New Category', 'event_espresso'),
+				'edit_category'   => esc_html__('Edit Category', 'event_espresso'),
+				'delete_category' => esc_html__('Delete Category', 'event_espresso'),
 			),
 			'editor_title' => array(
-				'espresso_events' => esc_html__( 'Enter event title here', 'event_espresso' ),
+				'espresso_events' => esc_html__('Enter event title here', 'event_espresso'),
 			),
 			'publishbox'   => array(
-				'create_new'        => esc_html__( 'Save New Event', 'event_espresso' ),
-				'edit'              => esc_html__( 'Update Event', 'event_espresso' ),
-				'add_category'      => esc_html__( 'Save New Category', 'event_espresso' ),
-				'edit_category'     => esc_html__( 'Update Category', 'event_espresso' ),
-				'template_settings' => esc_html__( 'Update Settings', 'event_espresso' ),
+				'create_new'        => esc_html__('Save New Event', 'event_espresso'),
+				'edit'              => esc_html__('Update Event', 'event_espresso'),
+				'add_category'      => esc_html__('Save New Category', 'event_espresso'),
+				'edit_category'     => esc_html__('Update Category', 'event_espresso'),
+				'template_settings' => esc_html__('Update Settings', 'event_espresso'),
 			),
 		);
 	}
@@ -105,9 +105,9 @@ 
 		//load formatter helper
 		//load field generator helper
 		//is there a evt_id in the request?
-		$evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] )
+		$evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID'])
 			? $this->_req_data['EVT_ID'] : 0;
-		$evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id;
+		$evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id;
 		$this->_page_routes = array(
 			'default'                       => array(
 				'func'       => '_events_overview_list_table',
@@ -130,27 +130,27 @@ 
 			),
 			'trash_event'                   => array(
 				'func'       => '_trash_or_restore_event',
-				'args'       => array( 'event_status' => 'trash' ),
+				'args'       => array('event_status' => 'trash'),
 				'capability' => 'ee_delete_event',
 				'obj_id'     => $evt_id,
 				'noheader'   => true,
 			),
 			'trash_events'                  => array(
 				'func'       => '_trash_or_restore_events',
-				'args'       => array( 'event_status' => 'trash' ),
+				'args'       => array('event_status' => 'trash'),
 				'capability' => 'ee_delete_events',
 				'noheader'   => true,
 			),
 			'restore_event'                 => array(
 				'func'       => '_trash_or_restore_event',
-				'args'       => array( 'event_status' => 'draft' ),
+				'args'       => array('event_status' => 'draft'),
 				'capability' => 'ee_delete_event',
 				'obj_id'     => $evt_id,
 				'noheader'   => true,
 			),
 			'restore_events'                => array(
 				'func'       => '_trash_or_restore_events',
-				'args'       => array( 'event_status' => 'draft' ),
+				'args'       => array('event_status' => 'draft'),
 				'capability' => 'ee_delete_events',
 				'noheader'   => true,
 			),
@@ -186,12 +186,12 @@ 
 			'add_category'                  => array(
 				'func'       => '_category_details',
 				'capability' => 'ee_edit_event_category',
-				'args'       => array( 'add' ),
+				'args'       => array('add'),
 			),
 			'edit_category'                 => array(
 				'func'       => '_category_details',
 				'capability' => 'ee_edit_event_category',
-				'args'       => array( 'edit' ),
+				'args'       => array('edit'),
 			),
 			'delete_categories'             => array(
 				'func'       => '_delete_categories',
@@ -205,13 +205,13 @@ 
 			),
 			'insert_category' => array(
 				'func'       => '_insert_or_update_category',
-				'args'       => array( 'new_category' => true ),
+				'args'       => array('new_category' => true),
 				'capability' => 'ee_edit_event_category',
 				'noheader'   => true,
 			),
 			'update_category' => array(
 				'func'       => '_insert_or_update_category',
-				'args'       => array( 'new_category' => false ),
+				'args'       => array('new_category' => false),
 				'capability' => 'ee_edit_event_category',
 				'noheader'   => true,
 			),
@@ -228,29 +228,29 @@ 
 		$this->_page_config = array(
 			'default'                => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Overview', 'event_espresso' ),
+					'label' => esc_html__('Overview', 'event_espresso'),
 					'order' => 10,
 				),
 				'list_table'    => 'Events_Admin_List_Table',
 				'help_tabs'     => array(
 					'events_overview_help_tab'                       => array(
-						'title'    => esc_html__( 'Events Overview', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview', 'event_espresso'),
 						'filename' => 'events_overview',
 					),
 					'events_overview_table_column_headings_help_tab' => array(
-						'title'    => esc_html__( 'Events Overview Table Column Headings', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Table Column Headings', 'event_espresso'),
 						'filename' => 'events_overview_table_column_headings',
 					),
 					'events_overview_filters_help_tab'               => array(
-						'title'    => esc_html__( 'Events Overview Filters', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Filters', 'event_espresso'),
 						'filename' => 'events_overview_filters',
 					),
 					'events_overview_view_help_tab'                  => array(
-						'title'    => esc_html__( 'Events Overview Views', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Views', 'event_espresso'),
 						'filename' => 'events_overview_views',
 					),
 					'events_overview_other_help_tab'                 => array(
-						'title'    => esc_html__( 'Events Overview Other', 'event_espresso' ),
+						'title'    => esc_html__('Events Overview Other', 'event_espresso'),
 						'filename' => 'events_overview_other',
 					),
 				),
@@ -265,218 +265,218 @@ 
 			),
 			'create_new'             => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Add Event', 'event_espresso' ),
+					'label'      => esc_html__('Add Event', 'event_espresso'),
 					'order'      => 5,
 					'persistent' => false,
 				),
-				'metaboxes'     => array( '_register_event_editor_meta_boxes' ),
+				'metaboxes'     => array('_register_event_editor_meta_boxes'),
 				'help_tabs'     => array(
 					'event_editor_help_tab'                            => array(
-						'title'    => esc_html__( 'Event Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Editor', 'event_espresso'),
 						'filename' => 'event_editor',
 					),
 					'event_editor_title_richtexteditor_help_tab'       => array(
-						'title'    => esc_html__( 'Event Title & Rich Text Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Title & Rich Text Editor', 'event_espresso'),
 						'filename' => 'event_editor_title_richtexteditor',
 					),
 					'event_editor_venue_details_help_tab'              => array(
-						'title'    => esc_html__( 'Event Venue Details', 'event_espresso' ),
+						'title'    => esc_html__('Event Venue Details', 'event_espresso'),
 						'filename' => 'event_editor_venue_details',
 					),
 					'event_editor_event_datetimes_help_tab'            => array(
-						'title'    => esc_html__( 'Event Datetimes', 'event_espresso' ),
+						'title'    => esc_html__('Event Datetimes', 'event_espresso'),
 						'filename' => 'event_editor_event_datetimes',
 					),
 					'event_editor_event_tickets_help_tab'              => array(
-						'title'    => esc_html__( 'Event Tickets', 'event_espresso' ),
+						'title'    => esc_html__('Event Tickets', 'event_espresso'),
 						'filename' => 'event_editor_event_tickets',
 					),
 					'event_editor_event_registration_options_help_tab' => array(
-						'title'    => esc_html__( 'Event Registration Options', 'event_espresso' ),
+						'title'    => esc_html__('Event Registration Options', 'event_espresso'),
 						'filename' => 'event_editor_event_registration_options',
 					),
 					'event_editor_tags_categories_help_tab'            => array(
-						'title'    => esc_html__( 'Event Tags & Categories', 'event_espresso' ),
+						'title'    => esc_html__('Event Tags & Categories', 'event_espresso'),
 						'filename' => 'event_editor_tags_categories',
 					),
 					'event_editor_questions_registrants_help_tab'      => array(
-						'title'    => esc_html__( 'Questions for Registrants', 'event_espresso' ),
+						'title'    => esc_html__('Questions for Registrants', 'event_espresso'),
 						'filename' => 'event_editor_questions_registrants',
 					),
 					'event_editor_save_new_event_help_tab'             => array(
-						'title'    => esc_html__( 'Save New Event', 'event_espresso' ),
+						'title'    => esc_html__('Save New Event', 'event_espresso'),
 						'filename' => 'event_editor_save_new_event',
 					),
 					'event_editor_other_help_tab'                      => array(
-						'title'    => esc_html__( 'Event Other', 'event_espresso' ),
+						'title'    => esc_html__('Event Other', 'event_espresso'),
 						'filename' => 'event_editor_other',
 					),
 				),
 				'help_tour'     => array(
 					'Event_Editor_Help_Tour',
 				),
-				'qtips'         => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips'         => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => false,
 			),
 			'edit'                   => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Edit Event', 'event_espresso' ),
+					'label'      => esc_html__('Edit Event', 'event_espresso'),
 					'order'      => 5,
 					'persistent' => false,
-					'url'        => isset( $this->_req_data['post'] )
+					'url'        => isset($this->_req_data['post'])
 						? EE_Admin_Page::add_query_args_and_nonce(
-							array( 'post' => $this->_req_data['post'], 'action' => 'edit' ),
+							array('post' => $this->_req_data['post'], 'action' => 'edit'),
 							$this->_current_page_view_url
 						)
 						: $this->_admin_base_url,
 				),
-				'metaboxes'     => array( '_register_event_editor_meta_boxes' ),
+				'metaboxes'     => array('_register_event_editor_meta_boxes'),
 				'help_tabs'     => array(
 					'event_editor_help_tab'                            => array(
-						'title'    => esc_html__( 'Event Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Editor', 'event_espresso'),
 						'filename' => 'event_editor',
 					),
 					'event_editor_title_richtexteditor_help_tab'       => array(
-						'title'    => esc_html__( 'Event Title & Rich Text Editor', 'event_espresso' ),
+						'title'    => esc_html__('Event Title & Rich Text Editor', 'event_espresso'),
 						'filename' => 'event_editor_title_richtexteditor',
 					),
 					'event_editor_venue_details_help_tab'              => array(
-						'title'    => esc_html__( 'Event Venue Details', 'event_espresso' ),
+						'title'    => esc_html__('Event Venue Details', 'event_espresso'),
 						'filename' => 'event_editor_venue_details',
 					),
 					'event_editor_event_datetimes_help_tab'            => array(
-						'title'    => esc_html__( 'Event Datetimes', 'event_espresso' ),
+						'title'    => esc_html__('Event Datetimes', 'event_espresso'),
 						'filename' => 'event_editor_event_datetimes',
 					),
 					'event_editor_event_tickets_help_tab'              => array(
-						'title'    => esc_html__( 'Event Tickets', 'event_espresso' ),
+						'title'    => esc_html__('Event Tickets', 'event_espresso'),
 						'filename' => 'event_editor_event_tickets',
 					),
 					'event_editor_event_registration_options_help_tab' => array(
-						'title'    => esc_html__( 'Event Registration Options', 'event_espresso' ),
+						'title'    => esc_html__('Event Registration Options', 'event_espresso'),
 						'filename' => 'event_editor_event_registration_options',
 					),
 					'event_editor_tags_categories_help_tab'            => array(
-						'title'    => esc_html__( 'Event Tags & Categories', 'event_espresso' ),
+						'title'    => esc_html__('Event Tags & Categories', 'event_espresso'),
 						'filename' => 'event_editor_tags_categories',
 					),
 					'event_editor_questions_registrants_help_tab'      => array(
-						'title'    => esc_html__( 'Questions for Registrants', 'event_espresso' ),
+						'title'    => esc_html__('Questions for Registrants', 'event_espresso'),
 						'filename' => 'event_editor_questions_registrants',
 					),
 					'event_editor_save_new_event_help_tab'             => array(
-						'title'    => esc_html__( 'Save New Event', 'event_espresso' ),
+						'title'    => esc_html__('Save New Event', 'event_espresso'),
 						'filename' => 'event_editor_save_new_event',
 					),
 					'event_editor_other_help_tab'                      => array(
-						'title'    => esc_html__( 'Event Other', 'event_espresso' ),
+						'title'    => esc_html__('Event Other', 'event_espresso'),
 						'filename' => 'event_editor_other',
 					),
 				),
 				/*'help_tour' => array(
 					'Event_Edit_Help_Tour'
 				),*/
-				'qtips'         => array( 'EE_Event_Editor_Decaf_Tips' ),
+				'qtips'         => array('EE_Event_Editor_Decaf_Tips'),
 				'require_nonce' => false,
 			),
 			'default_event_settings' => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Default Settings', 'event_espresso' ),
+					'label' => esc_html__('Default Settings', 'event_espresso'),
 					'order' => 40,
 				),
-				'metaboxes'     => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'labels'        => array(
-					'publishbox' => esc_html__( 'Update Settings', 'event_espresso' ),
+					'publishbox' => esc_html__('Update Settings', 'event_espresso'),
 				),
 				'help_tabs'     => array(
 					'default_settings_help_tab'        => array(
-						'title'    => esc_html__( 'Default Event Settings', 'event_espresso' ),
+						'title'    => esc_html__('Default Event Settings', 'event_espresso'),
 						'filename' => 'events_default_settings',
 					),
 					'default_settings_status_help_tab' => array(
-						'title'    => esc_html__( 'Default Registration Status', 'event_espresso' ),
+						'title'    => esc_html__('Default Registration Status', 'event_espresso'),
 						'filename' => 'events_default_settings_status',
 					),
 				),
-				'help_tour'     => array( 'Event_Default_Settings_Help_Tour' ),
+				'help_tour'     => array('Event_Default_Settings_Help_Tour'),
 				'require_nonce' => false,
 			),
 			//template settings
 			'template_settings'      => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Templates', 'event_espresso' ),
+					'label' => esc_html__('Templates', 'event_espresso'),
 					'order' => 30,
 				),
 				'metaboxes'     => $this->_default_espresso_metaboxes,
 				'help_tabs'     => array(
 					'general_settings_templates_help_tab' => array(
-						'title'    => esc_html__( 'Templates', 'event_espresso' ),
+						'title'    => esc_html__('Templates', 'event_espresso'),
 						'filename' => 'general_settings_templates',
 					),
 				),
-				'help_tour'     => array( 'Templates_Help_Tour' ),
+				'help_tour'     => array('Templates_Help_Tour'),
 				'require_nonce' => false,
 			),
 			//event category stuff
 			'add_category'           => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Add Category', 'event_espresso' ),
+					'label'      => esc_html__('Add Category', 'event_espresso'),
 					'order'      => 15,
 					'persistent' => false,
 				),
 				'help_tabs'     => array(
 					'add_category_help_tab' => array(
-						'title'    => esc_html__( 'Add New Event Category', 'event_espresso' ),
+						'title'    => esc_html__('Add New Event Category', 'event_espresso'),
 						'filename' => 'events_add_category',
 					),
 				),
-				'help_tour'     => array( 'Event_Add_Category_Help_Tour' ),
-				'metaboxes'     => array( '_publish_post_box' ),
+				'help_tour'     => array('Event_Add_Category_Help_Tour'),
+				'metaboxes'     => array('_publish_post_box'),
 				'require_nonce' => false,
 			),
 			'edit_category'          => array(
 				'nav'           => array(
-					'label'      => esc_html__( 'Edit Category', 'event_espresso' ),
+					'label'      => esc_html__('Edit Category', 'event_espresso'),
 					'order'      => 15,
 					'persistent' => false,
-					'url'        => isset( $this->_req_data['EVT_CAT_ID'] )
+					'url'        => isset($this->_req_data['EVT_CAT_ID'])
 						? add_query_arg(
-							array( 'EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID'] ),
+							array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']),
 							$this->_current_page_view_url
 						)
 						: $this->_admin_base_url,
 				),
 				'help_tabs'     => array(
 					'edit_category_help_tab' => array(
-						'title'    => esc_html__( 'Edit Event Category', 'event_espresso' ),
+						'title'    => esc_html__('Edit Event Category', 'event_espresso'),
 						'filename' => 'events_edit_category',
 					),
 				),
 				/*'help_tour' => array('Event_Edit_Category_Help_Tour'),*/
-				'metaboxes'     => array( '_publish_post_box' ),
+				'metaboxes'     => array('_publish_post_box'),
 				'require_nonce' => false,
 			),
 			'category_list'          => array(
 				'nav'           => array(
-					'label' => esc_html__( 'Categories', 'event_espresso' ),
+					'label' => esc_html__('Categories', 'event_espresso'),
 					'order' => 20,
 				),
 				'list_table'    => 'Event_Categories_Admin_List_Table',
 				'help_tabs'     => array(
 					'events_categories_help_tab'                       => array(
-						'title'    => esc_html__( 'Event Categories', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories', 'event_espresso'),
 						'filename' => 'events_categories',
 					),
 					'events_categories_table_column_headings_help_tab' => array(
-						'title'    => esc_html__( 'Event Categories Table Column Headings', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories Table Column Headings', 'event_espresso'),
 						'filename' => 'events_categories_table_column_headings',
 					),
 					'events_categories_view_help_tab'                  => array(
-						'title'    => esc_html__( 'Event Categories Views', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories Views', 'event_espresso'),
 						'filename' => 'events_categories_views',
 					),
 					'events_categories_other_help_tab'                 => array(
-						'title'    => esc_html__( 'Event Categories Other', 'event_espresso' ),
+						'title'    => esc_html__('Event Categories Other', 'event_espresso'),
 						'filename' => 'events_categories_other',
 					),
 				),
@@ -505,7 +505,7 @@ 
 
 	protected function _add_screen_options_category_list() {
 		$page_title = $this->_admin_page_title;
-		$this->_admin_page_title = esc_html__( 'Categories', 'event_espresso' );
+		$this->_admin_page_title = esc_html__('Categories', 'event_espresso');
 		$this->_per_page_screen_option();
 		$this->_admin_page_title = $page_title;
 	}
@@ -521,20 +521,20 @@ 
 	public function load_scripts_styles() {
 		wp_register_style(
 			'events-admin-css',
-			EVENTS_ASSETS_URL . 'events-admin-page.css',
+			EVENTS_ASSETS_URL.'events-admin-page.css',
 			array(),
 			EVENT_ESPRESSO_VERSION
 		);
-		wp_register_style( 'ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'events-admin-css' );
-		wp_enqueue_style( 'ee-cat-admin' );
+		wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('events-admin-css');
+		wp_enqueue_style('ee-cat-admin');
 		//todo note: we also need to load_scripts_styles per view (i.e. default/view_report/event_details
 		//registers for all views
 		//scripts
 		wp_register_script(
 			'event_editor_js',
-			EVENTS_ASSETS_URL . 'event_editor.js',
-			array( 'ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon' ),
+			EVENTS_ASSETS_URL.'event_editor.js',
+			array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'),
 			EVENT_ESPRESSO_VERSION,
 			true
 		);
@@ -560,22 +560,22 @@ 
 	 */
 	public function load_scripts_styles_edit() {
 		//styles
-		wp_enqueue_style( 'espresso-ui-theme' );
+		wp_enqueue_style('espresso-ui-theme');
 		wp_register_style(
 			'event-editor-css',
-			EVENTS_ASSETS_URL . 'event-editor.css',
-			array( 'ee-admin-css' ),
+			EVENTS_ASSETS_URL.'event-editor.css',
+			array('ee-admin-css'),
 			EVENT_ESPRESSO_VERSION
 		);
-		wp_enqueue_style( 'event-editor-css' );
+		wp_enqueue_style('event-editor-css');
 		//scripts
 		wp_register_script(
 			'event-datetime-metabox',
-			EVENTS_ASSETS_URL . 'event-datetime-metabox.js',
-			array( 'event_editor_js', 'ee-datepicker' ),
+			EVENTS_ASSETS_URL.'event-datetime-metabox.js',
+			array('event_editor_js', 'ee-datepicker'),
 			EVENT_ESPRESSO_VERSION
 		);
-		wp_enqueue_script( 'event-datetime-metabox' );
+		wp_enqueue_script('event-datetime-metabox');
 	}
 
 
@@ -595,10 +595,10 @@ 
 		$this->_views = array(
 			'all' => array(
 				'slug'        => 'all',
-				'label'       => esc_html__( 'All', 'event_espresso' ),
+				'label'       => esc_html__('All', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'delete_categories' => esc_html__( 'Delete Permanently', 'event_espresso' ),
+					'delete_categories' => esc_html__('Delete Permanently', 'event_espresso'),
 				),
 			),
 		);
@@ -634,14 +634,14 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function verify_event_edit( $event = null ) {
+	public function verify_event_edit($event = null) {
 		// no event?
-		if ( empty( $event ) ) {
+		if (empty($event)) {
 			// set event
 			$event = $this->_cpt_model_obj;
 		}
 		// STILL no event?
-		if ( empty ( $event ) ) {
+		if (empty ($event)) {
 			return;
 		}
 		$orig_status = $event->status();
@@ -655,32 +655,32 @@ 
 			return;
 		}
 		//made it here so it IS active... next check that any of the tickets are sold.
-		if ( $event->is_sold_out( true ) ) {
-			if ( $orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status ) {
+		if ($event->is_sold_out(true)) {
+			if ($orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status) {
 				EE_Error::add_attention(
 					sprintf(
 						esc_html__(
 							'Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event.  However, this change is not permanent until you update the event.  You can change the status back to something else before updating if you wish.',
 							'event_espresso'
 						),
-						EEH_Template::pretty_status( EEM_Event::sold_out, false, 'sentence' )
+						EEH_Template::pretty_status(EEM_Event::sold_out, false, 'sentence')
 					)
 				);
 			}
 			return;
-		} else if ( $orig_status === EEM_Event::sold_out ) {
+		} else if ($orig_status === EEM_Event::sold_out) {
 			EE_Error::add_attention(
 				sprintf(
 					esc_html__(
 						'Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets.  However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.',
 						'event_espresso'
 					),
-					EEH_Template::pretty_status( $event->status(), false, 'sentence' )
+					EEH_Template::pretty_status($event->status(), false, 'sentence')
 				)
 			);
 		}
 		//now we need to determine if the event has any tickets on sale.  If not then we dont' show the error
-		if ( ! $event->tickets_on_sale() ) {
+		if ( ! $event->tickets_on_sale()) {
 			return;
 		}
 		//made it here so show warning
@@ -698,7 +698,7 @@ 
 	 */
 	protected function _edit_event_warning() {
 		// we don't want to add warnings during these requests
-		if ( isset( $this->_req_data['action'] ) && $this->_req_data['action'] === 'editpost' ) {
+		if (isset($this->_req_data['action']) && $this->_req_data['action'] === 'editpost') {
 			return;
 		}
 		EE_Error::add_attention(
@@ -717,14 +717,14 @@ 
 	 * @return string
 	 */
 	protected function _create_new_cpt_item() {
-		$gmt_offset = get_option( 'gmt_offset' );
+		$gmt_offset = get_option('gmt_offset');
 		//only nag them about setting their timezone if it's their first event, and they haven't already done it
-		if( $gmt_offset === '0' && ! EEM_Event::instance()->exists(array()) ) {
+		if ($gmt_offset === '0' && ! EEM_Event::instance()->exists(array())) {
 			EE_Error::add_attention(
 				sprintf(
-					__( 'Your website\'s timezone is currently set to UTC + 0. We recommend updating your timezone to a city
+					__('Your website\'s timezone is currently set to UTC + 0. We recommend updating your timezone to a city
 			        or region near you before you create an event. Your timezone can be updated through the %1$sGeneral Settings%2$s page.'),
-					'<a href="' . admin_url( 'options-general.php' ) . '">',
+					'<a href="'.admin_url('options-general.php').'">',
 					'</a>'
 				),
 				__FILE__,
@@ -741,29 +741,29 @@ 
 		$this->_views = array(
 			'all'   => array(
 				'slug'        => 'all',
-				'label'       => esc_html__( 'View All Events', 'event_espresso' ),
+				'label'       => esc_html__('View All Events', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'trash_events' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_events' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 			'draft' => array(
 				'slug'        => 'draft',
-				'label'       => esc_html__( 'Draft', 'event_espresso' ),
+				'label'       => esc_html__('Draft', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'trash_events' => esc_html__( 'Move to Trash', 'event_espresso' ),
+					'trash_events' => esc_html__('Move to Trash', 'event_espresso'),
 				),
 			),
 		);
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) {
 			$this->_views['trash'] = array(
 				'slug'        => 'trash',
-				'label'       => esc_html__( 'Trash', 'event_espresso' ),
+				'label'       => esc_html__('Trash', 'event_espresso'),
 				'count'       => 0,
 				'bulk_action' => array(
-					'restore_events' => esc_html__( 'Restore From Trash', 'event_espresso' ),
-					'delete_events'  => esc_html__( 'Delete Permanently', 'event_espresso' ),
+					'restore_events' => esc_html__('Restore From Trash', 'event_espresso'),
+					'delete_events'  => esc_html__('Delete Permanently', 'event_espresso'),
 				),
 			);
 		}
@@ -778,50 +778,50 @@ 
 		$items = array(
 			'view_details'   => array(
 				'class' => 'dashicons dashicons-search',
-				'desc'  => esc_html__( 'View Event', 'event_espresso' ),
+				'desc'  => esc_html__('View Event', 'event_espresso'),
 			),
 			'edit_event'     => array(
 				'class' => 'ee-icon ee-icon-calendar-edit',
-				'desc'  => esc_html__( 'Edit Event Details', 'event_espresso' ),
+				'desc'  => esc_html__('Edit Event Details', 'event_espresso'),
 			),
 			'view_attendees' => array(
 				'class' => 'dashicons dashicons-groups',
-				'desc'  => esc_html__( 'View Registrations for Event', 'event_espresso' ),
+				'desc'  => esc_html__('View Registrations for Event', 'event_espresso'),
 			),
 		);
-		$items = apply_filters( 'FHEE__Events_Admin_Page___event_legend_items__items', $items );
+		$items = apply_filters('FHEE__Events_Admin_Page___event_legend_items__items', $items);
 		$statuses = array(
 			'sold_out_status'  => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::sold_out,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::sold_out, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::sold_out,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::sold_out, false, 'sentence'),
 			),
 			'active_status'    => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::active,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::active, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::active,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::active, false, 'sentence'),
 			),
 			'upcoming_status'  => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::upcoming,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::upcoming, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::upcoming,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::upcoming, false, 'sentence'),
 			),
 			'postponed_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::postponed,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::postponed, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::postponed,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::postponed, false, 'sentence'),
 			),
 			'cancelled_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::cancelled,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::cancelled, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::cancelled,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::cancelled, false, 'sentence'),
 			),
 			'expired_status'   => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::expired,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::expired, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::expired,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::expired, false, 'sentence'),
 			),
 			'inactive_status'  => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::inactive,
-				'desc'  => EEH_Template::pretty_status( EE_Datetime::inactive, false, 'sentence' ),
+				'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::inactive,
+				'desc'  => EEH_Template::pretty_status(EE_Datetime::inactive, false, 'sentence'),
 			),
 		);
-		$statuses = apply_filters( 'FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses );
-		return array_merge( $items, $statuses );
+		$statuses = apply_filters('FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses);
+		return array_merge($items, $statuses);
 	}
 
 
@@ -832,8 +832,8 @@ 
 	 * @return EEM_Event
 	 */
 	private function _event_model() {
-		if ( ! $this->_event_model instanceof EEM_Event ) {
-			$this->_event_model = EE_Registry::instance()->load_model( 'Event' );
+		if ( ! $this->_event_model instanceof EEM_Event) {
+			$this->_event_model = EE_Registry::instance()->load_model('Event');
 		}
 		return $this->_event_model;
 	}
@@ -850,12 +850,12 @@ 
 	 * @param  string $new_slug  what the slug is
 	 * @return string            The new html string for the permalink area
 	 */
-	public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) {
+	public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) {
 		//make sure this is only when editing
-		if ( ! empty( $id ) ) {
-			$post = get_post( $id );
+		if ( ! empty($id)) {
+			$post = get_post($id);
 			$return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#"  tabindex="-1">'
-			           . esc_html__( 'Shortcode', 'event_espresso' )
+			           . esc_html__('Shortcode', 'event_espresso')
 			           . '</a> ';
 			$return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id='
 			           . $post->ID
@@ -874,14 +874,14 @@ 
 	 * @return void
 	 */
 	protected function _events_overview_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(
-			get_post_type_archive_link( 'espresso_events' ),
-			esc_html__( "View Event Archive Page", "event_espresso" ),
+			get_post_type_archive_link('espresso_events'),
+			esc_html__("View Event Archive Page", "event_espresso"),
 			'button'
 		);
-		$this->_template_args['after_list_table'] .= $this->_display_legend( $this->_event_legend_items() );
-		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+		$this->_template_args['after_list_table'] .= $this->_display_legend($this->_event_legend_items());
+		$this->_admin_page_title .= ' '.$this->get_action_link_or_button(
 				'create_new',
 				'add',
 				array(),
@@ -907,48 +907,48 @@ 
 	 * @param string $post_id
 	 * @param object $post
 	 */
-	protected function _insert_update_cpt_item( $post_id, $post ) {
-		if ( $post instanceof WP_Post && $post->post_type !== 'espresso_events' ) {
+	protected function _insert_update_cpt_item($post_id, $post) {
+		if ($post instanceof WP_Post && $post->post_type !== 'espresso_events') {
 			//get out we're not processing an event save.
 			return;
 		}
 		$event_values = array(
-			'EVT_display_desc'                => ! empty( $this->_req_data['display_desc'] ) ? 1 : 0,
-			'EVT_display_ticket_selector'     => ! empty( $this->_req_data['display_ticket_selector'] ) ? 1 : 0,
+			'EVT_display_desc'                => ! empty($this->_req_data['display_desc']) ? 1 : 0,
+			'EVT_display_ticket_selector'     => ! empty($this->_req_data['display_ticket_selector']) ? 1 : 0,
 			'EVT_additional_limit'            => min(
-				apply_filters( 'FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255 ),
-				! empty( $this->_req_data['additional_limit'] ) ? $this->_req_data['additional_limit'] : null
+				apply_filters('FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255),
+				! empty($this->_req_data['additional_limit']) ? $this->_req_data['additional_limit'] : null
 			),
-			'EVT_default_registration_status' => ! empty( $this->_req_data['EVT_default_registration_status'] )
+			'EVT_default_registration_status' => ! empty($this->_req_data['EVT_default_registration_status'])
 				? $this->_req_data['EVT_default_registration_status']
 				: EE_Registry::instance()->CFG->registration->default_STS_ID,
-			'EVT_member_only'                 => ! empty( $this->_req_data['member_only'] ) ? 1 : 0,
-			'EVT_allow_overflow'              => ! empty( $this->_req_data['EVT_allow_overflow'] ) ? 1 : 0,
-			'EVT_timezone_string'             => ! empty( $this->_req_data['timezone_string'] )
+			'EVT_member_only'                 => ! empty($this->_req_data['member_only']) ? 1 : 0,
+			'EVT_allow_overflow'              => ! empty($this->_req_data['EVT_allow_overflow']) ? 1 : 0,
+			'EVT_timezone_string'             => ! empty($this->_req_data['timezone_string'])
 				? $this->_req_data['timezone_string'] : null,
-			'EVT_external_URL'                => ! empty( $this->_req_data['externalURL'] )
+			'EVT_external_URL'                => ! empty($this->_req_data['externalURL'])
 				? $this->_req_data['externalURL'] : null,
-			'EVT_phone'                       => ! empty( $this->_req_data['event_phone'] )
+			'EVT_phone'                       => ! empty($this->_req_data['event_phone'])
 				? $this->_req_data['event_phone'] : null,
 		);
 		//update event
-		$success = $this->_event_model()->update_by_ID( $event_values, $post_id );
+		$success = $this->_event_model()->update_by_ID($event_values, $post_id);
 		//get event_object for other metaboxes... though it would seem to make sense to just use $this->_event_model()->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id!
-		$get_one_where = array( $this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status );
-		$event = $this->_event_model()->get_one( array( $get_one_where ) );
+		$get_one_where = array($this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status);
+		$event = $this->_event_model()->get_one(array($get_one_where));
 		//the following are default callbacks for event attachment updates that can be overridden by caffeinated functionality and/or addons.
 		$event_update_callbacks = apply_filters(
 			'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks',
-			array( array( $this, '_default_venue_update' ), array( $this, '_default_tickets_update' ) )
+			array(array($this, '_default_venue_update'), array($this, '_default_tickets_update'))
 		);
 		$att_success = true;
-		foreach ( $event_update_callbacks as $e_callback ) {
-			$_succ = call_user_func_array( $e_callback, array( $event, $this->_req_data ) );
+		foreach ($event_update_callbacks as $e_callback) {
+			$_succ = call_user_func_array($e_callback, array($event, $this->_req_data));
 			$att_success = ! $att_success ? $att_success
 				: $_succ; //if ANY of these updates fail then we want the appropriate global error message
 		}
 		//any errors?
-		if ( $success && false === $att_success ) {
+		if ($success && false === $att_success) {
 			EE_Error::add_error(
 				esc_html__(
 					'Event Details saved successfully but something went wrong with saving attachments.',
@@ -958,9 +958,9 @@ 
 				__FUNCTION__,
 				__LINE__
 			);
-		} else if ( $success === false ) {
+		} else if ($success === false) {
 			EE_Error::add_error(
-				esc_html__( 'Event Details did not save successfully.', 'event_espresso' ),
+				esc_html__('Event Details did not save successfully.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -975,14 +975,14 @@ 
 	 * @param int $post_id
 	 * @param int $revision_id
 	 */
-	protected function _restore_cpt_item( $post_id, $revision_id ) {
+	protected function _restore_cpt_item($post_id, $revision_id) {
 		//copy existing event meta to new post
-		$post_evt = $this->_event_model()->get_one_by_ID( $post_id );
-		if ( $post_evt instanceof EE_Event ) {
+		$post_evt = $this->_event_model()->get_one_by_ID($post_id);
+		if ($post_evt instanceof EE_Event) {
 			//meta revision restore
-			$post_evt->restore_revision( $revision_id );
+			$post_evt->restore_revision($revision_id);
 			//related objs restore
-			$post_evt->restore_revision( $revision_id, array( 'Venue', 'Datetime', 'Price' ) );
+			$post_evt->restore_revision($revision_id, array('Venue', 'Datetime', 'Price'));
 		}
 	}
 
@@ -995,49 +995,49 @@ 
 	 * @param  array     $data   The request data from the form
 	 * @return bool           Success or fail.
 	 */
-	protected function _default_venue_update( \EE_Event $evtobj, $data ) {
-		require_once( EE_MODELS . 'EEM_Venue.model.php' );
-		$venue_model = EE_Registry::instance()->load_model( 'Venue' );
+	protected function _default_venue_update(\EE_Event $evtobj, $data) {
+		require_once(EE_MODELS.'EEM_Venue.model.php');
+		$venue_model = EE_Registry::instance()->load_model('Venue');
 		$rows_affected = null;
-		$venue_id = ! empty( $data['venue_id'] ) ? $data['venue_id'] : null;
+		$venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : null;
 		// very important.  If we don't have a venue name...
 		// then we'll get out because not necessary to create empty venue
-		if ( empty( $data['venue_title'] ) ) {
+		if (empty($data['venue_title'])) {
 			return false;
 		}
 		$venue_array = array(
-			'VNU_wp_user'         => $evtobj->get( 'EVT_wp_user' ),
-			'VNU_name'            => ! empty( $data['venue_title'] ) ? $data['venue_title'] : null,
-			'VNU_desc'            => ! empty( $data['venue_description'] ) ? $data['venue_description'] : null,
-			'VNU_identifier'      => ! empty( $data['venue_identifier'] ) ? $data['venue_identifier'] : null,
-			'VNU_short_desc'      => ! empty( $data['venue_short_description'] ) ? $data['venue_short_description']
+			'VNU_wp_user'         => $evtobj->get('EVT_wp_user'),
+			'VNU_name'            => ! empty($data['venue_title']) ? $data['venue_title'] : null,
+			'VNU_desc'            => ! empty($data['venue_description']) ? $data['venue_description'] : null,
+			'VNU_identifier'      => ! empty($data['venue_identifier']) ? $data['venue_identifier'] : null,
+			'VNU_short_desc'      => ! empty($data['venue_short_description']) ? $data['venue_short_description']
 				: null,
-			'VNU_address'         => ! empty( $data['address'] ) ? $data['address'] : null,
-			'VNU_address2'        => ! empty( $data['address2'] ) ? $data['address2'] : null,
-			'VNU_city'            => ! empty( $data['city'] ) ? $data['city'] : null,
-			'STA_ID'              => ! empty( $data['state'] ) ? $data['state'] : null,
-			'CNT_ISO'             => ! empty( $data['countries'] ) ? $data['countries'] : null,
-			'VNU_zip'             => ! empty( $data['zip'] ) ? $data['zip'] : null,
-			'VNU_phone'           => ! empty( $data['venue_phone'] ) ? $data['venue_phone'] : null,
-			'VNU_capacity'        => ! empty( $data['venue_capacity'] ) ? $data['venue_capacity'] : null,
-			'VNU_url'             => ! empty( $data['venue_url'] ) ? $data['venue_url'] : null,
-			'VNU_virtual_phone'   => ! empty( $data['virtual_phone'] ) ? $data['virtual_phone'] : null,
-			'VNU_virtual_url'     => ! empty( $data['virtual_url'] ) ? $data['virtual_url'] : null,
-			'VNU_enable_for_gmap' => isset( $data['enable_for_gmap'] ) ? 1 : 0,
+			'VNU_address'         => ! empty($data['address']) ? $data['address'] : null,
+			'VNU_address2'        => ! empty($data['address2']) ? $data['address2'] : null,
+			'VNU_city'            => ! empty($data['city']) ? $data['city'] : null,
+			'STA_ID'              => ! empty($data['state']) ? $data['state'] : null,
+			'CNT_ISO'             => ! empty($data['countries']) ? $data['countries'] : null,
+			'VNU_zip'             => ! empty($data['zip']) ? $data['zip'] : null,
+			'VNU_phone'           => ! empty($data['venue_phone']) ? $data['venue_phone'] : null,
+			'VNU_capacity'        => ! empty($data['venue_capacity']) ? $data['venue_capacity'] : null,
+			'VNU_url'             => ! empty($data['venue_url']) ? $data['venue_url'] : null,
+			'VNU_virtual_phone'   => ! empty($data['virtual_phone']) ? $data['virtual_phone'] : null,
+			'VNU_virtual_url'     => ! empty($data['virtual_url']) ? $data['virtual_url'] : null,
+			'VNU_enable_for_gmap' => isset($data['enable_for_gmap']) ? 1 : 0,
 			'status'              => 'publish',
 		);
 		//if we've got the venue_id then we're just updating the existing venue so let's do that and then get out.
-		if ( ! empty( $venue_id ) ) {
-			$update_where = array( $venue_model->primary_key_name() => $venue_id );
-			$rows_affected = $venue_model->update( $venue_array, array( $update_where ) );
+		if ( ! empty($venue_id)) {
+			$update_where = array($venue_model->primary_key_name() => $venue_id);
+			$rows_affected = $venue_model->update($venue_array, array($update_where));
 			//we've gotta make sure that the venue is always attached to a revision.. add_relation_to should take care of making sure that the relation is already present.
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
+			$evtobj->_add_relation_to($venue_id, 'Venue');
 			return $rows_affected > 0 ? true : false;
 		} else {
 			//we insert the venue
-			$venue_id = $venue_model->insert( $venue_array );
-			$evtobj->_add_relation_to( $venue_id, 'Venue' );
-			return ! empty( $venue_id ) ? true : false;
+			$venue_id = $venue_model->insert($venue_array);
+			$evtobj->_add_relation_to($venue_id, 'Venue');
+			return ! empty($venue_id) ? true : false;
 		}
 		//when we have the ancestor come in it's already been handled by the revision save.
 	}
@@ -1051,51 +1051,51 @@ 
 	 * @param  array    $data   The request data from the form
 	 * @return array
 	 */
-	protected function _default_tickets_update( EE_Event $evtobj, $data ) {
+	protected function _default_tickets_update(EE_Event $evtobj, $data) {
 		$success = true;
 		$saved_dtt = null;
 		$saved_tickets = array();
-		$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
-		foreach ( $data['edit_event_datetimes'] as $row => $dtt ) {
+		$incoming_date_formats = array('Y-m-d', 'h:i a');
+		foreach ($data['edit_event_datetimes'] as $row => $dtt) {
 			//trim all values to ensure any excess whitespace is removed.
-			$dtt = array_map( 'trim', $dtt );
-			$dtt['DTT_EVT_end'] = isset( $dtt['DTT_EVT_end'] ) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end']
+			$dtt = array_map('trim', $dtt);
+			$dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty($dtt['DTT_EVT_end']) ? $dtt['DTT_EVT_end']
 				: $dtt['DTT_EVT_start'];
 			$datetime_values = array(
-				'DTT_ID'        => ! empty( $dtt['DTT_ID'] ) ? $dtt['DTT_ID'] : null,
+				'DTT_ID'        => ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : null,
 				'DTT_EVT_start' => $dtt['DTT_EVT_start'],
 				'DTT_EVT_end'   => $dtt['DTT_EVT_end'],
-				'DTT_reg_limit' => empty( $dtt['DTT_reg_limit'] ) ? EE_INF : $dtt['DTT_reg_limit'],
+				'DTT_reg_limit' => empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'],
 				'DTT_order'     => $row,
 			);
 			//if we have an id then let's get existing object first and then set the new values.  Otherwise we instantiate a new object for save.
-			if ( ! empty( $dtt['DTT_ID'] ) ) {
+			if ( ! empty($dtt['DTT_ID'])) {
 				$DTM = EE_Registry::instance()
-				                  ->load_model( 'Datetime', array( $evtobj->get_timezone() ) )
-				                  ->get_one_by_ID( $dtt['DTT_ID'] );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				                  ->load_model('Datetime', array($evtobj->get_timezone()))
+				                  ->get_one_by_ID($dtt['DTT_ID']);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 				//make sure the $dtt_id here is saved just in case after the add_relation_to() the autosave replaces it.  We need to do this so we dont' TRASH the parent DTT.
-				$saved_dtts[ $DTM->ID() ] = $DTM;
+				$saved_dtts[$DTM->ID()] = $DTM;
 			} else {
-				$DTM = EE_Registry::instance()->load_class( 'Datetime', array( $datetime_values ), false, false );
-				$DTM->set_date_format( $incoming_date_formats[0] );
-				$DTM->set_time_format( $incoming_date_formats[1] );
-				$DTM->set_timezone( $evtobj->get_timezone() );
-				foreach ( $datetime_values as $field => $value ) {
-					$DTM->set( $field, $value );
+				$DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values), false, false);
+				$DTM->set_date_format($incoming_date_formats[0]);
+				$DTM->set_time_format($incoming_date_formats[1]);
+				$DTM->set_timezone($evtobj->get_timezone());
+				foreach ($datetime_values as $field => $value) {
+					$DTM->set($field, $value);
 				}
 			}
 			$DTM->save();
-			$DTT = $evtobj->_add_relation_to( $DTM, 'Datetime' );
+			$DTT = $evtobj->_add_relation_to($DTM, 'Datetime');
 			//load DTT helper
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if ( $DTT->get_raw( 'DTT_EVT_start' ) > $DTT->get_raw( 'DTT_EVT_end' ) ) {
-				$DTT->set( 'DTT_EVT_end', $DTT->get( 'DTT_EVT_start' ) );
-				$DTT = EEH_DTT_Helper::date_time_add( $DTT, 'DTT_EVT_end', 'days' );
+			if ($DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end')) {
+				$DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start'));
+				$DTT = EEH_DTT_Helper::date_time_add($DTT, 'DTT_EVT_end', 'days');
 				$DTT->save();
 			}
 			//now we got to make sure we add the new DTT_ID to the $saved_dtts array  because it is possible there was a new one created for the autosave.
@@ -1106,20 +1106,20 @@ 
 		}
 		//no dtts get deleted so we don't do any of that logic here.
 		//update tickets next
-		$old_tickets = isset( $data['ticket_IDs'] ) ? explode( ',', $data['ticket_IDs'] ) : array();
-		foreach ( $data['edit_tickets'] as $row => $tkt ) {
-			$incoming_date_formats = array( 'Y-m-d', 'h:i a' );
+		$old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array();
+		foreach ($data['edit_tickets'] as $row => $tkt) {
+			$incoming_date_formats = array('Y-m-d', 'h:i a');
 			$update_prices = false;
-			$ticket_price = isset( $data['edit_prices'][ $row ][1]['PRC_amount'] )
-				? $data['edit_prices'][ $row ][1]['PRC_amount'] : 0;
+			$ticket_price = isset($data['edit_prices'][$row][1]['PRC_amount'])
+				? $data['edit_prices'][$row][1]['PRC_amount'] : 0;
 			// trim inputs to ensure any excess whitespace is removed.
-			$tkt = array_map( 'trim', $tkt );
-			if ( empty( $tkt['TKT_start_date'] ) ) {
+			$tkt = array_map('trim', $tkt);
+			if (empty($tkt['TKT_start_date'])) {
 				//let's use now in the set timezone.
-				$now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) );
-				$tkt['TKT_start_date'] = $now->format( $incoming_date_formats[0] . ' ' . $incoming_date_formats[1] );
+				$now = new DateTime('now', new DateTimeZone($evtobj->get_timezone()));
+				$tkt['TKT_start_date'] = $now->format($incoming_date_formats[0].' '.$incoming_date_formats[1]);
 			}
-			if ( empty( $tkt['TKT_end_date'] ) ) {
+			if (empty($tkt['TKT_end_date'])) {
 				//use the start date of the first datetime
 				$dtt = $evtobj->first_datetime();
 				$tkt['TKT_end_date'] = $dtt->start_date_and_time(
@@ -1128,22 +1128,22 @@ 
 				);
 			}
 			$TKT_values = array(
-				'TKT_ID'          => ! empty( $tkt['TKT_ID'] ) ? $tkt['TKT_ID'] : null,
-				'TTM_ID'          => ! empty( $tkt['TTM_ID'] ) ? $tkt['TTM_ID'] : 0,
-				'TKT_name'        => ! empty( $tkt['TKT_name'] ) ? $tkt['TKT_name'] : '',
-				'TKT_description' => ! empty( $tkt['TKT_description'] ) ? $tkt['TKT_description'] : '',
+				'TKT_ID'          => ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : null,
+				'TTM_ID'          => ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0,
+				'TKT_name'        => ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '',
+				'TKT_description' => ! empty($tkt['TKT_description']) ? $tkt['TKT_description'] : '',
 				'TKT_start_date'  => $tkt['TKT_start_date'],
 				'TKT_end_date'    => $tkt['TKT_end_date'],
-				'TKT_qty'         => ! isset( $tkt['TKT_qty'] ) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
-				'TKT_uses'        => ! isset( $tkt['TKT_uses'] ) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
-				'TKT_min'         => empty( $tkt['TKT_min'] ) ? 0 : $tkt['TKT_min'],
-				'TKT_max'         => empty( $tkt['TKT_max'] ) ? EE_INF : $tkt['TKT_max'],
+				'TKT_qty'         => ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'],
+				'TKT_uses'        => ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'],
+				'TKT_min'         => empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'],
+				'TKT_max'         => empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'],
 				'TKT_row'         => $row,
-				'TKT_order'       => isset( $tkt['TKT_order'] ) ? $tkt['TKT_order'] : $row,
+				'TKT_order'       => isset($tkt['TKT_order']) ? $tkt['TKT_order'] : $row,
 				'TKT_price'       => $ticket_price,
 			);
 			//if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly, which means in turn that the prices will become new prices as well.
-			if ( isset( $tkt['TKT_is_default'] ) && $tkt['TKT_is_default'] ) {
+			if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) {
 				$TKT_values['TKT_ID'] = 0;
 				$TKT_values['TKT_is_default'] = 0;
 				$TKT_values['TKT_price'] = $ticket_price;
@@ -1152,110 +1152,110 @@ 
 			//if we have a TKT_ID then we need to get that existing TKT_obj and update it
 			//we actually do our saves a head of doing any add_relations to because its entirely possible that this ticket didn't removed or added to any datetime in the session but DID have it's items modified.
 			//keep in mind that if the TKT has been sold (and we have changed pricing information), then we won't be updating the tkt but instead a new tkt will be created and the old one archived.
-			if ( ! empty( $tkt['TKT_ID'] ) ) {
+			if ( ! empty($tkt['TKT_ID'])) {
 				$TKT = EE_Registry::instance()
-						->load_model( 'Ticket', array( $evtobj->get_timezone() ) )
-						->get_one_by_ID( $tkt['TKT_ID'] );
-				if ( $TKT instanceof EE_Ticket ) {
+						->load_model('Ticket', array($evtobj->get_timezone()))
+						->get_one_by_ID($tkt['TKT_ID']);
+				if ($TKT instanceof EE_Ticket) {
 					$ticket_sold = $TKT->count_related(
 						'Registration',
 						array(
 							array(
 								'STS_ID' => array(
 									'NOT IN',
-									array( EEM_Registration::status_id_incomplete ),
+									array(EEM_Registration::status_id_incomplete),
 								),
 							),
 						)
 					) > 0 ? true : false;
 					//let's just check the total price for the existing ticket and determine if it matches the new total price.  if they are different then we create a new ticket (if tkts sold) if they aren't different then we go ahead and modify existing ticket.
-					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get( 'TKT_price' )
+					$create_new_TKT = $ticket_sold && $ticket_price != $TKT->get('TKT_price')
 					                  && ! $TKT->get(
 						'TKT_deleted'
 					) ? true : false;
-					$TKT->set_date_format( $incoming_date_formats[0] );
-					$TKT->set_time_format( $incoming_date_formats[1] );
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 					//if $create_new_TKT is false then we can safely update the existing ticket.  Otherwise we have to create a new ticket.
-					if ( $create_new_TKT ) {
+					if ($create_new_TKT) {
 						//archive the old ticket first
-						$TKT->set( 'TKT_deleted', 1 );
+						$TKT->set('TKT_deleted', 1);
 						$TKT->save();
 						//make sure this ticket is still recorded in our saved_tkts so we don't run it through the regular trash routine.
-						$saved_tickets[ $TKT->ID() ] = $TKT;
+						$saved_tickets[$TKT->ID()] = $TKT;
 						//create new ticket that's a copy of the existing except a new id of course (and not archived) AND has the new TKT_price associated with it.
 						$TKT = clone $TKT;
-						$TKT->set( 'TKT_ID', 0 );
-						$TKT->set( 'TKT_deleted', 0 );
-						$TKT->set( 'TKT_price', $ticket_price );
-						$TKT->set( 'TKT_sold', 0 );
+						$TKT->set('TKT_ID', 0);
+						$TKT->set('TKT_deleted', 0);
+						$TKT->set('TKT_price', $ticket_price);
+						$TKT->set('TKT_sold', 0);
 						//now we need to make sure that $new prices are created as well and attached to new ticket.
 						$update_prices = true;
 					}
 					//make sure price is set if it hasn't been already
-					$TKT->set( 'TKT_price', $ticket_price );
+					$TKT->set('TKT_price', $ticket_price);
 				}
 			} else {
 				//no TKT_id so a new TKT
 				$TKT_values['TKT_price'] = $ticket_price;
-				$TKT = EE_Registry::instance()->load_class( 'Ticket', array( $TKT_values ), false, false );
-				if ( $TKT instanceof EE_Ticket ) {
+				$TKT = EE_Registry::instance()->load_class('Ticket', array($TKT_values), false, false);
+				if ($TKT instanceof EE_Ticket) {
 					//need to reset values to properly account for the date formats
-					$TKT->set_date_format( $incoming_date_formats[0] );
-					$TKT->set_time_format( $incoming_date_formats[1] );
-					$TKT->set_timezone( $evtobj->get_timezone() );
+					$TKT->set_date_format($incoming_date_formats[0]);
+					$TKT->set_time_format($incoming_date_formats[1]);
+					$TKT->set_timezone($evtobj->get_timezone());
 					//set new values
-					foreach ( $TKT_values as $field => $value ) {
-						if ( $field == 'TKT_qty' ) {
-							$TKT->set_qty( $value );
+					foreach ($TKT_values as $field => $value) {
+						if ($field == 'TKT_qty') {
+							$TKT->set_qty($value);
 						} else {
-							$TKT->set( $field, $value );
+							$TKT->set($field, $value);
 						}
 					}
 					$update_prices = true;
 				}
 			}
 			// cap ticket qty by datetime reg limits
-			$TKT->set_qty( min( $TKT->qty(), $TKT->qty( 'reg_limit' ) ) );
+			$TKT->set_qty(min($TKT->qty(), $TKT->qty('reg_limit')));
 			//update ticket.
 			$TKT->save();
 			//before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date.
-			if ( $TKT->get_raw( 'TKT_start_date' ) > $TKT->get_raw( 'TKT_end_date' ) ) {
-				$TKT->set( 'TKT_end_date', $TKT->get( 'TKT_start_date' ) );
-				$TKT = EEH_DTT_Helper::date_time_add( $TKT, 'TKT_end_date', 'days' );
+			if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) {
+				$TKT->set('TKT_end_date', $TKT->get('TKT_start_date'));
+				$TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days');
 				$TKT->save();
 			}
 			//initially let's add the ticket to the dtt
-			$saved_dtt->_add_relation_to( $TKT, 'Ticket' );
-			$saved_tickets[ $TKT->ID() ] = $TKT;
+			$saved_dtt->_add_relation_to($TKT, 'Ticket');
+			$saved_tickets[$TKT->ID()] = $TKT;
 			//add prices to ticket
-			$this->_add_prices_to_ticket( $data['edit_prices'][ $row ], $TKT, $update_prices );
+			$this->_add_prices_to_ticket($data['edit_prices'][$row], $TKT, $update_prices);
 		}
 		//however now we need to handle permanently deleting tickets via the ui.  Keep in mind that the ui does not allow deleting/archiving tickets that have ticket sold.  However, it does allow for deleting tickets that have no tickets sold, in which case we want to get rid of permanently because there is no need to save in db.
-		$old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets;
-		$tickets_removed = array_diff( $old_tickets, array_keys( $saved_tickets ) );
-		foreach ( $tickets_removed as $id ) {
-			$id = absint( $id );
+		$old_tickets = isset($old_tickets[0]) && $old_tickets[0] == '' ? array() : $old_tickets;
+		$tickets_removed = array_diff($old_tickets, array_keys($saved_tickets));
+		foreach ($tickets_removed as $id) {
+			$id = absint($id);
 			//get the ticket for this id
-			$tkt_to_remove = EE_Registry::instance()->load_model( 'Ticket' )->get_one_by_ID( $id );
+			$tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id);
 			//need to get all the related datetimes on this ticket and remove from every single one of them (remember this process can ONLY kick off if there are NO tkts_sold)
-			$dtts = $tkt_to_remove->get_many_related( 'Datetime' );
-			foreach ( $dtts as $dtt ) {
-				$tkt_to_remove->_remove_relation_to( $dtt, 'Datetime' );
+			$dtts = $tkt_to_remove->get_many_related('Datetime');
+			foreach ($dtts as $dtt) {
+				$tkt_to_remove->_remove_relation_to($dtt, 'Datetime');
 			}
 			//need to do the same for prices (except these prices can also be deleted because again, tickets can only be trashed if they don't have any TKTs sold (otherwise they are just archived))
-			$tkt_to_remove->delete_related_permanently( 'Price' );
+			$tkt_to_remove->delete_related_permanently('Price');
 			//finally let's delete this ticket (which should not be blocked at this point b/c we've removed all our relationships)
 			$tkt_to_remove->delete_permanently();
 		}
-		return array( $saved_dtt, $saved_tickets );
+		return array($saved_dtt, $saved_tickets);
 	}
 
 
@@ -1272,29 +1272,29 @@ 
 	 * @param bool      $new_prices Whether attach existing incoming prices or create new ones.
 	 * @return  void
 	 */
-	private function _add_prices_to_ticket( $prices, EE_Ticket $ticket, $new_prices = false ) {
-		foreach ( $prices as $row => $prc ) {
+	private function _add_prices_to_ticket($prices, EE_Ticket $ticket, $new_prices = false) {
+		foreach ($prices as $row => $prc) {
 			$PRC_values = array(
-				'PRC_ID'         => ! empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : null,
-				'PRT_ID'         => ! empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : null,
-				'PRC_amount'     => ! empty( $prc['PRC_amount'] ) ? $prc['PRC_amount'] : 0,
-				'PRC_name'       => ! empty( $prc['PRC_name'] ) ? $prc['PRC_name'] : '',
-				'PRC_desc'       => ! empty( $prc['PRC_desc'] ) ? $prc['PRC_desc'] : '',
+				'PRC_ID'         => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : null,
+				'PRT_ID'         => ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : null,
+				'PRC_amount'     => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0,
+				'PRC_name'       => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '',
+				'PRC_desc'       => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '',
 				'PRC_is_default' => 0, //make sure prices are NOT set as default from this context
 				'PRC_order'      => $row,
 			);
-			if ( $new_prices || empty( $PRC_values['PRC_ID'] ) ) {
+			if ($new_prices || empty($PRC_values['PRC_ID'])) {
 				$PRC_values['PRC_ID'] = 0;
-				$PRC = EE_Registry::instance()->load_class( 'Price', array( $PRC_values ), false, false );
+				$PRC = EE_Registry::instance()->load_class('Price', array($PRC_values), false, false);
 			} else {
-				$PRC = EE_Registry::instance()->load_model( 'Price' )->get_one_by_ID( $prc['PRC_ID'] );
+				$PRC = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']);
 				//update this price with new values
-				foreach ( $PRC_values as $field => $newprc ) {
-					$PRC->set( $field, $newprc );
+				foreach ($PRC_values as $field => $newprc) {
+					$PRC->set($field, $newprc);
 				}
 				$PRC->save();
 			}
-			$ticket->_add_relation_to( $PRC, 'Price' );
+			$ticket->_add_relation_to($PRC, 'Price');
 		}
 	}
 
@@ -1326,7 +1326,7 @@ 
 	private function _generate_publish_box_extra_content() {
 		//load formatter helper
 		//args for getting related registrations
-		$approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved ) );
+		$approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved));
 		$not_approved_query_args = array(
 			array(
 				'REG_deleted' => 0,
@@ -1397,7 +1397,7 @@ 
 		$publish_box_extra_args['event_editor_overview_add'] = ob_get_clean();
 		// load template
 		EEH_Template::display_template(
-			EVENTS_TEMPLATE_PATH . 'event_publish_box_extras.template.php',
+			EVENTS_TEMPLATE_PATH.'event_publish_box_extras.template.php',
 			$publish_box_extra_args
 		);
 	}
@@ -1431,16 +1431,16 @@ 
 		$this->verify_cpt_object();
 		add_meta_box(
 			'espresso_event_editor_tickets',
-			esc_html__( 'Event Datetime & Ticket', 'event_espresso' ),
-			array( $this, 'ticket_metabox' ),
+			esc_html__('Event Datetime & Ticket', 'event_espresso'),
+			array($this, 'ticket_metabox'),
 			$this->page_slug,
 			'normal',
 			'high'
 		);
 		add_meta_box(
 			'espresso_event_editor_event_options',
-			esc_html__( 'Event Registration Options', 'event_espresso' ),
-			array( $this, 'registration_options_meta_box' ),
+			esc_html__('Event Registration Options', 'event_espresso'),
+			array($this, 'registration_options_meta_box'),
 			$this->page_slug,
 			'side',
 			'default'
@@ -1468,65 +1468,65 @@ 
 			'trash_icon'               => 'ee-lock-icon',
 			'disabled'                 => '',
 		);
-		$event_id = is_object( $this->_cpt_model_obj ) ? $this->_cpt_model_obj->ID() : null;
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		$event_id = is_object($this->_cpt_model_obj) ? $this->_cpt_model_obj->ID() : null;
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		/**
 		 * 1. Start with retrieving Datetimes
 		 * 2. Fore each datetime get related tickets
 		 * 3. For each ticket get related prices
 		 */
-		$times = EE_Registry::instance()->load_model( 'Datetime' )->get_all_event_dates( $event_id );
+		$times = EE_Registry::instance()->load_model('Datetime')->get_all_event_dates($event_id);
 		/** @type EE_Datetime $first_datetime */
-		$first_datetime = reset( $times );
+		$first_datetime = reset($times);
 		//do we get related tickets?
-		if ( $first_datetime instanceof EE_Datetime
+		if ($first_datetime instanceof EE_Datetime
 		     && $first_datetime->ID() !== 0
 		) {
-			$existing_datetime_ids[] = $first_datetime->get( 'DTT_ID' );
+			$existing_datetime_ids[] = $first_datetime->get('DTT_ID');
 			$template_args['time'] = $first_datetime;
 			$related_tickets = $first_datetime->tickets(
 				array(
-					array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ),
+					array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)),
 					'default_where_conditions' => 'none',
 				)
 			);
-			if ( ! empty( $related_tickets ) ) {
-				$template_args['total_ticket_rows'] = count( $related_tickets );
+			if ( ! empty($related_tickets)) {
+				$template_args['total_ticket_rows'] = count($related_tickets);
 				$row = 0;
-				foreach ( $related_tickets as $ticket ) {
-					$existing_ticket_ids[] = $ticket->get( 'TKT_ID' );
-					$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket, false, $row );
+				foreach ($related_tickets as $ticket) {
+					$existing_ticket_ids[] = $ticket->get('TKT_ID');
+					$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, false, $row);
 					$row++;
 				}
 			} else {
 				$template_args['total_ticket_rows'] = 1;
 				/** @type EE_Ticket $ticket */
-				$ticket = EE_Registry::instance()->load_model( 'Ticket' )->create_default_object();
-				$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket );
+				$ticket = EE_Registry::instance()->load_model('Ticket')->create_default_object();
+				$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket);
 			}
 		} else {
 			$template_args['time'] = $times[0];
 			/** @type EE_Ticket $ticket */
-			$ticket = EE_Registry::instance()->load_model( 'Ticket' )->get_all_default_tickets();
-			$template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket[1] );
+			$ticket = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets();
+			$template_args['ticket_rows'] .= $this->_get_ticket_row($ticket[1]);
 			// NOTE: we're just sending the first default row
 			// (decaf can't manage default tickets so this should be sufficient);
 		}
 		$template_args['event_datetime_help_link'] = $this->_get_help_tab_link(
 			'event_editor_event_datetimes_help_tab'
 		);
-		$template_args['ticket_options_help_link'] = $this->_get_help_tab_link( 'ticket_options_info' );
-		$template_args['existing_datetime_ids'] = implode( ',', $existing_datetime_ids );
-		$template_args['existing_ticket_ids'] = implode( ',', $existing_ticket_ids );
+		$template_args['ticket_options_help_link'] = $this->_get_help_tab_link('ticket_options_info');
+		$template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids);
+		$template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids);
 		$template_args['ticket_js_structure'] = $this->_get_ticket_row(
-			EE_Registry::instance()->load_model( 'Ticket' )->create_default_object(),
+			EE_Registry::instance()->load_model('Ticket')->create_default_object(),
 			true
 		);
 		$template = apply_filters(
 			'FHEE__Events_Admin_Page__ticket_metabox__template',
-			EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php'
+			EVENTS_TEMPLATE_PATH.'event_tickets_metabox_main.template.php'
 		);
-		EEH_Template::display_template( $template, $template_args );
+		EEH_Template::display_template($template, $template_args);
 	}
 
 
@@ -1540,74 +1540,74 @@ 
 	 * @param int        $row
 	 * @return string generated html for the ticket row.
 	 */
-	private function _get_ticket_row( $ticket, $skeleton = false, $row = 0 ) {
+	private function _get_ticket_row($ticket, $skeleton = false, $row = 0) {
 		$template_args = array(
-			'tkt_status_class'    => ' tkt-status-' . $ticket->ticket_status(),
+			'tkt_status_class'    => ' tkt-status-'.$ticket->ticket_status(),
 			'tkt_archive_class'   => $ticket->ticket_status() === EE_Ticket::archived && ! $skeleton ? ' tkt-archived'
 				: '',
 			'ticketrow'           => $skeleton ? 'TICKETNUM' : $row,
-			'TKT_ID'              => $ticket->get( 'TKT_ID' ),
-			'TKT_name'            => $ticket->get( 'TKT_name' ),
-			'TKT_start_date'      => $skeleton ? '' : $ticket->get_date( 'TKT_start_date', 'Y-m-d h:i a' ),
-			'TKT_end_date'        => $skeleton ? '' : $ticket->get_date( 'TKT_end_date', 'Y-m-d h:i a' ),
-			'TKT_is_default'      => $ticket->get( 'TKT_is_default' ),
-			'TKT_qty'             => $ticket->get_pretty( 'TKT_qty', 'input' ),
+			'TKT_ID'              => $ticket->get('TKT_ID'),
+			'TKT_name'            => $ticket->get('TKT_name'),
+			'TKT_start_date'      => $skeleton ? '' : $ticket->get_date('TKT_start_date', 'Y-m-d h:i a'),
+			'TKT_end_date'        => $skeleton ? '' : $ticket->get_date('TKT_end_date', 'Y-m-d h:i a'),
+			'TKT_is_default'      => $ticket->get('TKT_is_default'),
+			'TKT_qty'             => $ticket->get_pretty('TKT_qty', 'input'),
 			'edit_ticketrow_name' => $skeleton ? 'TICKETNAMEATTR' : 'edit_tickets',
-			'TKT_sold'            => $skeleton ? 0 : $ticket->get( 'TKT_sold' ),
-			'trash_icon'          => ( $skeleton || ( ! empty( $ticket ) && ! $ticket->get( 'TKT_deleted' ) ) )
-			                         && ( ! empty( $ticket ) && $ticket->get( 'TKT_sold' ) === 0 )
+			'TKT_sold'            => $skeleton ? 0 : $ticket->get('TKT_sold'),
+			'trash_icon'          => ($skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted')))
+			                         && ( ! empty($ticket) && $ticket->get('TKT_sold') === 0)
 				? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon',
-			'disabled'            => $skeleton || ( ! empty( $ticket ) && ! $ticket->get( 'TKT_deleted' ) ) ? ''
+			'disabled'            => $skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted')) ? ''
 				: ' disabled=disabled',
 		);
 		$price = $ticket->ID() !== 0
-			? $ticket->get_first_related( 'Price', array( 'default_where_conditions' => 'none' ) )
-			: EE_Registry::instance()->load_model( 'Price' )->create_default_object();
+			? $ticket->get_first_related('Price', array('default_where_conditions' => 'none'))
+			: EE_Registry::instance()->load_model('Price')->create_default_object();
 		$price_args = array(
 			'price_currency_symbol' => EE_Registry::instance()->CFG->currency->sign,
-			'PRC_amount'            => $price->get( 'PRC_amount' ),
-			'PRT_ID'                => $price->get( 'PRT_ID' ),
-			'PRC_ID'                => $price->get( 'PRC_ID' ),
-			'PRC_is_default'        => $price->get( 'PRC_is_default' ),
+			'PRC_amount'            => $price->get('PRC_amount'),
+			'PRT_ID'                => $price->get('PRT_ID'),
+			'PRC_ID'                => $price->get('PRC_ID'),
+			'PRC_is_default'        => $price->get('PRC_is_default'),
 		);
 		//make sure we have default start and end dates if skeleton
 		//handle rows that should NOT be empty
-		if ( empty( $template_args['TKT_start_date'] ) ) {
+		if (empty($template_args['TKT_start_date'])) {
 			//if empty then the start date will be now.
-			$template_args['TKT_start_date'] = date( 'Y-m-d h:i a', current_time( 'timestamp' ) );
+			$template_args['TKT_start_date'] = date('Y-m-d h:i a', current_time('timestamp'));
 		}
-		if ( empty( $template_args['TKT_end_date'] ) ) {
+		if (empty($template_args['TKT_end_date'])) {
 			//get the earliest datetime (if present);
 			$earliest_dtt = $this->_cpt_model_obj->ID() > 0
 				? $this->_cpt_model_obj->get_first_related(
 					'Datetime',
-					array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) )
+					array('order_by' => array('DTT_EVT_start' => 'ASC'))
 				)
 				: null;
-			if ( ! empty( $earliest_dtt ) ) {
-				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime( 'DTT_EVT_start', 'Y-m-d', 'h:i a' );
+			if ( ! empty($earliest_dtt)) {
+				$template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a');
 			} else {
 				$template_args['TKT_end_date'] = date(
 					'Y-m-d h:i a',
-					mktime( 0, 0, 0, date( "m" ), date( "d" ) + 7, date( "Y" ) )
+					mktime(0, 0, 0, date("m"), date("d") + 7, date("Y"))
 				);
 			}
 		}
-		$template_args = array_merge( $template_args, $price_args );
+		$template_args = array_merge($template_args, $price_args);
 		$template = apply_filters(
 			'FHEE__Events_Admin_Page__get_ticket_row__template',
-			EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_ticket_row.template.php',
+			EVENTS_TEMPLATE_PATH.'event_tickets_metabox_ticket_row.template.php',
 			$ticket
 		);
-		return EEH_Template::display_template( $template, $template_args, true );
+		return EEH_Template::display_template($template, $template_args, true);
 	}
 
 
 
 	public function registration_options_meta_box() {
 		$yes_no_values = array(
-			array( 'id' => true, 'text' => esc_html__( 'Yes', 'event_espresso' ) ),
-			array( 'id' => false, 'text' => esc_html__( 'No', 'event_espresso' ) ),
+			array('id' => true, 'text' => esc_html__('Yes', 'event_espresso')),
+			array('id' => false, 'text' => esc_html__('No', 'event_espresso')),
 		);
 		$default_reg_status_values = EEM_Registration::reg_status_array(
 			array(
@@ -1619,7 +1619,7 @@ 
 		);
 		//$template_args['is_active_select'] = EEH_Form_Fields::select_input('is_active', $yes_no_values, $this->_cpt_model_obj->is_active());
 		$template_args['_event'] = $this->_cpt_model_obj;
-		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status( false );
+		$template_args['active_status'] = $this->_cpt_model_obj->pretty_active_status(false);
 		$template_args['additional_limit'] = $this->_cpt_model_obj->additional_limit();
 		$template_args['default_registration_status'] = EEH_Form_Fields::select_input(
 			'default_reg_status',
@@ -1647,7 +1647,7 @@ 
 			$default_reg_status_values
 		);
 		EEH_Template::display_template(
-			EVENTS_TEMPLATE_PATH . 'event_registration_options.template.php',
+			EVENTS_TEMPLATE_PATH.'event_registration_options.template.php',
 			$template_args
 		);
 	}
@@ -1666,97 +1666,97 @@ 
 	 *                           that match the given _view and paging parameters.
 	 * @return array an array of event objects.
 	 */
-	public function get_events( $per_page = 10, $current_page = 1, $count = false ) {
+	public function get_events($per_page = 10, $current_page = 1, $count = false) {
 		$EEME = $this->_event_model();
-		$offset = ( $current_page - 1 ) * $per_page;
-		$limit = $count ? null : $offset . ',' . $per_page;
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'EVT_ID';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : "DESC";
-		if ( isset( $this->_req_data['month_range'] ) ) {
-			$pieces = explode( ' ', $this->_req_data['month_range'], 3 );
-			$month_r = ! empty( $pieces[0] ) ? date( 'm', strtotime( $pieces[0] ) ) : '';
-			$year_r = ! empty( $pieces[1] ) ? $pieces[1] : '';
+		$offset = ($current_page - 1) * $per_page;
+		$limit = $count ? null : $offset.','.$per_page;
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'EVT_ID';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : "DESC";
+		if (isset($this->_req_data['month_range'])) {
+			$pieces = explode(' ', $this->_req_data['month_range'], 3);
+			$month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : '';
+			$year_r = ! empty($pieces[1]) ? $pieces[1] : '';
 		}
 		$where = array();
-		$status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : null;
+		$status = isset($this->_req_data['status']) ? $this->_req_data['status'] : null;
 		//determine what post_status our condition will have for the query.
-		switch ( $status ) {
+		switch ($status) {
 			case 'month' :
 			case 'today' :
 			case null :
 			case 'all' :
 				break;
 			case 'draft' :
-				$where['status'] = array( 'IN', array( 'draft', 'auto-draft' ) );
+				$where['status'] = array('IN', array('draft', 'auto-draft'));
 				break;
 			default :
 				$where['status'] = $status;
 		}
 		//categories?
-		$category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0
+		$category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0
 			? $this->_req_data['EVT_CAT'] : null;
-		if ( ! empty ( $category ) ) {
+		if ( ! empty ($category)) {
 			$where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
 			$where['Term_Taxonomy.term_id'] = $category;
 		}
 		//date where conditions
-		$start_formats = EEM_Datetime::instance()->get_formats_for( 'DTT_EVT_start' );
-		if ( isset( $this->_req_data['month_range'] ) && $this->_req_data['month_range'] != '' ) {
+		$start_formats = EEM_Datetime::instance()->get_formats_for('DTT_EVT_start');
+		if (isset($this->_req_data['month_range']) && $this->_req_data['month_range'] != '') {
 			$DateTime = new DateTime(
-				$year_r . '-' . $month_r . '-01 00:00:00',
-				new DateTimeZone( EEM_Datetime::instance()->get_timezone() )
+				$year_r.'-'.$month_r.'-01 00:00:00',
+				new DateTimeZone(EEM_Datetime::instance()->get_timezone())
 			);
-			$start = $DateTime->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setDate( $year_r, $month_r, $DateTime->format( 't' ) )->setTime( 23, 59, 59 )->format(
-				implode( ' ', $start_formats )
+			$start = $DateTime->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate($year_r, $month_r, $DateTime->format('t'))->setTime(23, 59, 59)->format(
+				implode(' ', $start_formats)
 			);
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
-		} else if ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'today' ) {
-			$DateTime = new DateTime( 'now', new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
-		} else if ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'month' ) {
-			$now = date( 'Y-m-01' );
-			$DateTime = new DateTime( $now, new DateTimeZone( EEM_Event::instance()->get_timezone() ) );
-			$start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) );
-			$end = $DateTime->setDate( date( 'Y' ), date( 'm' ), $DateTime->format( 't' ) )
-			                ->setTime( 23, 59, 59 )
-			                ->format( implode( ' ', $start_formats ) );
-			$where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) );
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
+		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'today') {
+			$DateTime = new DateTime('now', new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setTime(23, 59, 59)->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
+		} else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'month') {
+			$now = date('Y-m-01');
+			$DateTime = new DateTime($now, new DateTimeZone(EEM_Event::instance()->get_timezone()));
+			$start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats));
+			$end = $DateTime->setDate(date('Y'), date('m'), $DateTime->format('t'))
+			                ->setTime(23, 59, 59)
+			                ->format(implode(' ', $start_formats));
+			$where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end));
 		}
-		if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) {
+		if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) {
 			$where['EVT_wp_user'] = get_current_user_id();
 		} else {
-			if ( ! isset( $where['status'] ) ) {
-				if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_events', 'get_events' ) ) {
+			if ( ! isset($where['status'])) {
+				if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_events', 'get_events')) {
 					$where['OR'] = array(
-						'status*restrict_private' => array( '!=', 'private' ),
+						'status*restrict_private' => array('!=', 'private'),
 						'AND'                     => array(
-							'status*inclusive' => array( '=', 'private' ),
+							'status*inclusive' => array('=', 'private'),
 							'EVT_wp_user'      => get_current_user_id(),
 						),
 					);
 				}
 			}
 		}
-		if ( isset( $this->_req_data['EVT_wp_user'] ) ) {
-			if ( $this->_req_data['EVT_wp_user'] != get_current_user_id()
-			     && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' )
+		if (isset($this->_req_data['EVT_wp_user'])) {
+			if ($this->_req_data['EVT_wp_user'] != get_current_user_id()
+			     && EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')
 			) {
 				$where['EVT_wp_user'] = $this->_req_data['EVT_wp_user'];
 			}
 		}
 		//search query handling
-		if ( isset( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'EVT_name'       => array( 'LIKE', $search_string ),
-				'EVT_desc'       => array( 'LIKE', $search_string ),
-				'EVT_short_desc' => array( 'LIKE', $search_string ),
+				'EVT_name'       => array('LIKE', $search_string),
+				'EVT_desc'       => array('LIKE', $search_string),
+				'EVT_short_desc' => array('LIKE', $search_string),
 			);
 		}
-		$where = apply_filters( 'FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data );
+		$where = apply_filters('FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data);
 		$query_params = apply_filters(
 			'FHEE__Events_Admin_Page__get_events__query_params',
 			array(
@@ -1769,23 +1769,23 @@ 
 			$this->_req_data
 		);
 		//let's first check if we have special requests coming in.
-		if ( isset( $this->_req_data['active_status'] ) ) {
-			switch ( $this->_req_data['active_status'] ) {
+		if (isset($this->_req_data['active_status'])) {
+			switch ($this->_req_data['active_status']) {
 				case 'upcoming' :
-					return $EEME->get_upcoming_events( $query_params, $count );
+					return $EEME->get_upcoming_events($query_params, $count);
 					break;
 				case 'expired' :
-					return $EEME->get_expired_events( $query_params, $count );
+					return $EEME->get_expired_events($query_params, $count);
 					break;
 				case 'active' :
-					return $EEME->get_active_events( $query_params, $count );
+					return $EEME->get_active_events($query_params, $count);
 					break;
 				case 'inactive' :
-					return $EEME->get_inactive_events( $query_params, $count );
+					return $EEME->get_inactive_events($query_params, $count);
 					break;
 			}
 		}
-		$events = $count ? $EEME->count( array( $where ), 'EVT_ID', true ) : $EEME->get_all( $query_params );
+		$events = $count ? $EEME->count(array($where), 'EVT_ID', true) : $EEME->get_all($query_params);
 		return $events;
 	}
 
@@ -1796,9 +1796,9 @@ 
 	 *
 	 * @param string $post_id
 	 */
-	public function trash_cpt_item( $post_id ) {
+	public function trash_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'trash', false );
+		$this->_trash_or_restore_event('trash', false);
 	}
 
 
@@ -1806,9 +1806,9 @@ 
 	/**
 	 * @param string $post_id
 	 */
-	public function restore_cpt_item( $post_id ) {
+	public function restore_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_trash_or_restore_event( 'draft', false );
+		$this->_trash_or_restore_event('draft', false);
 	}
 
 
@@ -1816,9 +1816,9 @@ 
 	/**
 	 * @param string $post_id
 	 */
-	public function delete_cpt_item( $post_id ) {
+	public function delete_cpt_item($post_id) {
 		$this->_req_data['EVT_ID'] = $post_id;
-		$this->_delete_event( false );
+		$this->_delete_event(false);
 	}
 
 
@@ -1830,23 +1830,23 @@ 
 	 * @param  string $event_status
 	 * @param bool    $redirect_after
 	 */
-	protected function _trash_or_restore_event( $event_status = 'trash', $redirect_after = true ) {
+	protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = true) {
 		//determine the event id and set to array.
-		$EVT_ID = isset( $this->_req_data['EVT_ID'] ) ? absint( $this->_req_data['EVT_ID'] ) : false;
+		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : false;
 		// loop thru events
-		if ( $EVT_ID ) {
+		if ($EVT_ID) {
 			// clean status
-			$event_status = sanitize_key( $event_status );
+			$event_status = sanitize_key($event_status);
 			// grab status
-			if ( ! empty( $event_status ) ) {
-				$success = $this->_change_event_status( $EVT_ID, $event_status );
+			if ( ! empty($event_status)) {
+				$success = $this->_change_event_status($EVT_ID, $event_status);
 			} else {
 				$success = false;
 				$msg = esc_html__(
 					'An error occurred. The event could not be moved to the trash because a valid event status was not not supplied.',
 					'event_espresso'
 				);
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		} else {
 			$success = false;
@@ -1854,11 +1854,11 @@ 
 				'An error occurred. The event could not be moved to the trash because a valid event ID was not not supplied.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
-		if ( $redirect_after ) {
-			$this->_redirect_after_action( $success, 'Event', $action, array( 'action' => 'default' ) );
+		if ($redirect_after) {
+			$this->_redirect_after_action($success, 'Event', $action, array('action' => 'default'));
 		}
 	}
 
@@ -1871,18 +1871,18 @@ 
 	 * @param  string $event_status
 	 * @return void
 	 */
-	protected function _trash_or_restore_events( $event_status = 'trash' ) {
+	protected function _trash_or_restore_events($event_status = 'trash') {
 		// clean status
-		$event_status = sanitize_key( $event_status );
+		$event_status = sanitize_key($event_status);
 		// grab status
-		if ( ! empty( $event_status ) ) {
+		if ( ! empty($event_status)) {
 			$success = true;
 			//determine the event id and set to array.
-			$EVT_IDs = isset( $this->_req_data['EVT_IDs'] ) ? (array) $this->_req_data['EVT_IDs'] : array();
+			$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
 			// loop thru events
-			foreach ( $EVT_IDs as $EVT_ID ) {
-				if ( $EVT_ID = absint( $EVT_ID ) ) {
-					$results = $this->_change_event_status( $EVT_ID, $event_status );
+			foreach ($EVT_IDs as $EVT_ID) {
+				if ($EVT_ID = absint($EVT_ID)) {
+					$results = $this->_change_event_status($EVT_ID, $event_status);
 					$success = $results !== false ? $success : false;
 				} else {
 					$msg = sprintf(
@@ -1892,7 +1892,7 @@ 
 						),
 						$EVT_ID
 					);
-					EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 					$success = false;
 				}
 			}
@@ -1902,12 +1902,12 @@ 
 				'An error occurred. The event could not be moved to the trash because a valid event status was not not supplied.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// in order to force a pluralized result message we need to send back a success status greater than 1
 		$success = $success ? 2 : false;
 		$action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash';
-		$this->_redirect_after_action( $success, 'Events', $action, array( 'action' => 'default' ) );
+		$this->_redirect_after_action($success, 'Events', $action, array('action' => 'default'));
 	}
 
 
@@ -1920,30 +1920,30 @@ 
 	 * @param  string $event_status
 	 * @return bool
 	 */
-	private function _change_event_status( $EVT_ID = 0, $event_status = '' ) {
+	private function _change_event_status($EVT_ID = 0, $event_status = '') {
 		// grab event id
-		if ( ! $EVT_ID ) {
+		if ( ! $EVT_ID) {
 			$msg = esc_html__(
 				'An error occurred. No Event ID or an invalid Event ID was received.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+		$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 		// clean status
-		$event_status = sanitize_key( $event_status );
+		$event_status = sanitize_key($event_status);
 		// grab status
-		if ( empty( $event_status ) ) {
+		if (empty($event_status)) {
 			$msg = esc_html__(
 				'An error occurred. No Event Status or an invalid Event Status was received.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// was event trashed or restored ?
-		switch ( $event_status ) {
+		switch ($event_status) {
 			case 'draft' :
 				$action = 'restored from the trash';
 				$hook = 'AHEE_event_restored_from_trash';
@@ -1957,15 +1957,15 @@ 
 				$hook = false;
 		}
 		//use class to change status
-		$this->_cpt_model_obj->set_status( $event_status );
+		$this->_cpt_model_obj->set_status($event_status);
 		$success = $this->_cpt_model_obj->save();
-		if ( $success === false ) {
-			$msg = sprintf( esc_html__( 'An error occurred. The event could not be %s.', 'event_espresso' ), $action );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		if ($success === false) {
+			$msg = sprintf(esc_html__('An error occurred. The event could not be %s.', 'event_espresso'), $action);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( $hook ) {
-			do_action( $hook );
+		if ($hook) {
+			do_action($hook);
 		}
 		return true;
 	}
@@ -1978,34 +1978,34 @@ 
 	 * @access protected
 	 * @param bool $redirect_after
 	 */
-	protected function _delete_event( $redirect_after = true ) {
+	protected function _delete_event($redirect_after = true) {
 		//determine the event id and set to array.
-		$EVT_ID = isset( $this->_req_data['EVT_ID'] ) ? absint( $this->_req_data['EVT_ID'] ) : null;
-		$EVT_ID = isset( $this->_req_data['post'] ) ? absint( $this->_req_data['post'] ) : $EVT_ID;
+		$EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : null;
+		$EVT_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $EVT_ID;
 		// loop thru events
-		if ( $EVT_ID ) {
-			$success = $this->_permanently_delete_event( $EVT_ID );
+		if ($EVT_ID) {
+			$success = $this->_permanently_delete_event($EVT_ID);
 			// get list of events with no prices
-			$espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', array() );
+			$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', array());
 			// remove this event from the list of events with no prices
-			if ( isset( $espresso_no_ticket_prices[ $EVT_ID ] ) ) {
-				unset( $espresso_no_ticket_prices[ $EVT_ID ] );
+			if (isset($espresso_no_ticket_prices[$EVT_ID])) {
+				unset($espresso_no_ticket_prices[$EVT_ID]);
 			}
-			update_option( 'ee_no_ticket_prices', $espresso_no_ticket_prices );
+			update_option('ee_no_ticket_prices', $espresso_no_ticket_prices);
 		} else {
 			$success = false;
 			$msg = esc_html__(
 				'An error occurred. An event could not be deleted because a valid event ID was not not supplied.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		}
-		if ( $redirect_after ) {
+		if ($redirect_after) {
 			$this->_redirect_after_action(
 				$success,
 				'Event',
 				'deleted',
-				array( 'action' => 'default', 'status' => 'trash' )
+				array('action' => 'default', 'status' => 'trash')
 			);
 		}
 	}
@@ -2021,30 +2021,30 @@ 
 	protected function _delete_events() {
 		$success = true;
 		// get list of events with no prices
-		$espresso_no_ticket_prices = get_option( 'ee_no_ticket_prices', array() );
+		$espresso_no_ticket_prices = get_option('ee_no_ticket_prices', array());
 		//determine the event id and set to array.
-		$EVT_IDs = isset( $this->_req_data['EVT_IDs'] ) ? (array) $this->_req_data['EVT_IDs'] : array();
+		$EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array();
 		// loop thru events
-		foreach ( $EVT_IDs as $EVT_ID ) {
-			$EVT_ID = absint( $EVT_ID );
-			if ( $EVT_ID ) {
-				$results = $this->_permanently_delete_event( $EVT_ID );
+		foreach ($EVT_IDs as $EVT_ID) {
+			$EVT_ID = absint($EVT_ID);
+			if ($EVT_ID) {
+				$results = $this->_permanently_delete_event($EVT_ID);
 				$success = $results !== false ? $success : false;
 				// remove this event from the list of events with no prices
-				unset( $espresso_no_ticket_prices[ $EVT_ID ] );
+				unset($espresso_no_ticket_prices[$EVT_ID]);
 			} else {
 				$success = false;
 				$msg = esc_html__(
 					'An error occurred. An event could not be deleted because a valid event ID was not not supplied.',
 					'event_espresso'
 				);
-				EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			}
 		}
-		update_option( 'ee_no_ticket_prices', $espresso_no_ticket_prices );
+		update_option('ee_no_ticket_prices', $espresso_no_ticket_prices);
 		// in order to force a pluralized result message we need to send back a success status greater than 1
 		$success = $success ? 2 : false;
-		$this->_redirect_after_action( $success, 'Events', 'deleted', array( 'action' => 'default' ) );
+		$this->_redirect_after_action($success, 'Events', 'deleted', array('action' => 'default'));
 	}
 
 
@@ -2056,70 +2056,70 @@ 
 	 * @param  int $EVT_ID
 	 * @return bool
 	 */
-	private function _permanently_delete_event( $EVT_ID = 0 ) {
+	private function _permanently_delete_event($EVT_ID = 0) {
 		// grab event id
-		if ( ! $EVT_ID ) {
+		if ( ! $EVT_ID) {
 			$msg = esc_html__(
 				'An error occurred. No Event ID or an invalid Event ID was received.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		if (
 			! $this->_cpt_model_obj instanceof EE_Event
 			|| $this->_cpt_model_obj->ID() !== $EVT_ID
 		) {
-			$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID );
+			$this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID);
 		}
-		if ( ! $this->_cpt_model_obj instanceof EE_Event ) {
+		if ( ! $this->_cpt_model_obj instanceof EE_Event) {
 			return false;
 		}
 		//need to delete related tickets and prices first.
-		$datetimes = $this->_cpt_model_obj->get_many_related( 'Datetime' );
-		foreach ( $datetimes as $datetime ) {
-			$this->_cpt_model_obj->_remove_relation_to( $datetime, 'Datetime' );
-			$tickets = $datetime->get_many_related( 'Ticket' );
-			foreach ( $tickets as $ticket ) {
-				$ticket->_remove_relation_to( $datetime, 'Datetime' );
-				$ticket->delete_related_permanently( 'Price' );
+		$datetimes = $this->_cpt_model_obj->get_many_related('Datetime');
+		foreach ($datetimes as $datetime) {
+			$this->_cpt_model_obj->_remove_relation_to($datetime, 'Datetime');
+			$tickets = $datetime->get_many_related('Ticket');
+			foreach ($tickets as $ticket) {
+				$ticket->_remove_relation_to($datetime, 'Datetime');
+				$ticket->delete_related_permanently('Price');
 				$ticket->delete_permanently();
 			}
 			$datetime->delete();
 		}
 		//what about related venues or terms?
-		$venues = $this->_cpt_model_obj->get_many_related( 'Venue' );
-		foreach ( $venues as $venue ) {
-			$this->_cpt_model_obj->_remove_relation_to( $venue, 'Venue' );
+		$venues = $this->_cpt_model_obj->get_many_related('Venue');
+		foreach ($venues as $venue) {
+			$this->_cpt_model_obj->_remove_relation_to($venue, 'Venue');
 		}
 		//any attached question groups?
-		$question_groups = $this->_cpt_model_obj->get_many_related( 'Question_Group' );
-		if ( ! empty( $question_groups ) ) {
-			foreach ( $question_groups as $question_group ) {
-				$this->_cpt_model_obj->_remove_relation_to( $question_group, 'Question_Group' );
+		$question_groups = $this->_cpt_model_obj->get_many_related('Question_Group');
+		if ( ! empty($question_groups)) {
+			foreach ($question_groups as $question_group) {
+				$this->_cpt_model_obj->_remove_relation_to($question_group, 'Question_Group');
 			}
 		}
 		//Message Template Groups
-		$this->_cpt_model_obj->_remove_relations( 'Message_Template_Group' );
+		$this->_cpt_model_obj->_remove_relations('Message_Template_Group');
 		/** @type EE_Term_Taxonomy[] $term_taxonomies */
 		$term_taxonomies = $this->_cpt_model_obj->term_taxonomies();
-		foreach ( $term_taxonomies as $term_taxonomy ) {
-			$this->_cpt_model_obj->remove_relation_to_term_taxonomy( $term_taxonomy );
+		foreach ($term_taxonomies as $term_taxonomy) {
+			$this->_cpt_model_obj->remove_relation_to_term_taxonomy($term_taxonomy);
 		}
 		$success = $this->_cpt_model_obj->delete_permanently();
 		// did it all go as planned ?
-		if ( $success ) {
-			$msg = sprintf( esc_html__( 'Event ID # %d has been deleted.', 'event_espresso' ), $EVT_ID );
-			EE_Error::add_success( $msg );
+		if ($success) {
+			$msg = sprintf(esc_html__('Event ID # %d has been deleted.', 'event_espresso'), $EVT_ID);
+			EE_Error::add_success($msg);
 		} else {
 			$msg = sprintf(
-				esc_html__( 'An error occurred. Event ID # %d could not be deleted.', 'event_espresso' ),
+				esc_html__('An error occurred. Event ID # %d could not be deleted.', 'event_espresso'),
 				$EVT_ID
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		do_action( 'AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID );
+		do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID);
 		return true;
 	}
 
@@ -2132,7 +2132,7 @@ 
 	 * @return int
 	 */
 	public function total_events() {
-		$count = EEM_Event::instance()->count( array( 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array('caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2146,9 +2146,9 @@ 
 	 */
 	public function total_events_draft() {
 		$where = array(
-			'status' => array( 'IN', array( 'draft', 'auto-draft' ) ),
+			'status' => array('IN', array('draft', 'auto-draft')),
 		);
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2164,7 +2164,7 @@ 
 		$where = array(
 			'status' => 'trash',
 		);
-		$count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true );
+		$count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true);
 		return $count;
 	}
 
@@ -2195,12 +2195,12 @@ 
 			EE_Registry::instance()->CFG->registration->default_STS_ID,
 			$this->_template_args['reg_status_array']
 		)
-			? sanitize_text_field( EE_Registry::instance()->CFG->registration->default_STS_ID )
+			? sanitize_text_field(EE_Registry::instance()->CFG->registration->default_STS_ID)
 			: EEM_Registration::status_id_pending_payment;
-		$this->_set_add_edit_form_tags( 'update_default_event_settings' );
-		$this->_set_publish_post_box_vars( null, false, false, null, false );
+		$this->_set_add_edit_form_tags('update_default_event_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EVENTS_TEMPLATE_PATH . 'event_settings.template.php',
+			EVENTS_TEMPLATE_PATH.'event_settings.template.php',
 			$this->_template_args,
 			true
 		);
@@ -2216,8 +2216,8 @@ 
 	 * @return void
 	 */
 	protected function _update_default_event_settings() {
-		EE_Config::instance()->registration->default_STS_ID = isset( $this->_req_data['default_reg_status'] )
-			? sanitize_text_field( $this->_req_data['default_reg_status'] )
+		EE_Config::instance()->registration->default_STS_ID = isset($this->_req_data['default_reg_status'])
+			? sanitize_text_field($this->_req_data['default_reg_status'])
 			: EEM_Registration::status_id_pending_payment;
 		$what = 'Default Event Settings';
 		$success = $this->_update_espresso_configuration(
@@ -2227,7 +2227,7 @@ 
 			__FUNCTION__,
 			__LINE__
 		);
-		$this->_redirect_after_action( $success, $what, 'updated', array( 'action' => 'default_event_settings' ) );
+		$this->_redirect_after_action($success, $what, 'updated', array('action' => 'default_event_settings'));
 	}
 
 
@@ -2237,20 +2237,20 @@ 
 
 
 	protected function _template_settings() {
-		$this->_admin_page_title = esc_html__( 'Template Settings (Preview)', 'event_espresso' );
+		$this->_admin_page_title = esc_html__('Template Settings (Preview)', 'event_espresso');
 		$this->_template_args['preview_img'] = '<img src="'
 		                                       . EVENTS_ASSETS_URL
 		                                       . DS
 		                                       . 'images'
 		                                       . DS
 		                                       . 'caffeinated_template_features.jpg" alt="'
-		                                       . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' )
+		                                       . esc_attr__('Template Settings Preview screenshot', 'event_espresso')
 		                                       . '" />';
-		$this->_template_args['preview_text'] = '<strong>' . esc_html__(
+		$this->_template_args['preview_text'] = '<strong>'.esc_html__(
 				'Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.',
 				'event_espresso'
-			) . '</strong>';
-		$this->display_admin_caf_preview_page( 'template_settings_tab' );
+			).'</strong>';
+		$this->display_admin_caf_preview_page('template_settings_tab');
 	}
 
 
@@ -2262,18 +2262,18 @@ 
 	 * @return void
 	 */
 	private function _set_category_object() {
-		if ( isset( $this->_category->id ) && ! empty( $this->_category->id ) ) {
+		if (isset($this->_category->id) && ! empty($this->_category->id)) {
 			return;
 		} //already have the category object so get out.
 		//set default category object
 		$this->_set_empty_category_object();
 		//only set if we've got an id
-		if ( ! isset( $this->_req_data['EVT_CAT_ID'] ) ) {
+		if ( ! isset($this->_req_data['EVT_CAT_ID'])) {
 			return;
 		}
-		$category_id = absint( $this->_req_data['EVT_CAT_ID'] );
-		$term = get_term( $category_id, 'espresso_event_categories' );
-		if ( ! empty( $term ) ) {
+		$category_id = absint($this->_req_data['EVT_CAT_ID']);
+		$term = get_term($category_id, 'espresso_event_categories');
+		if ( ! empty($term)) {
 			$this->_category->category_name = $term->name;
 			$this->_category->category_identifier = $term->slug;
 			$this->_category->category_desc = $term->description;
@@ -2293,9 +2293,9 @@ 
 
 
 	protected function _category_list_table() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
-		$this->_search_btn_label = esc_html__( 'Categories', 'event_espresso' );
-		$this->_admin_page_title .= ' ' . $this->get_action_link_or_button(
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->_search_btn_label = esc_html__('Categories', 'event_espresso');
+		$this->_admin_page_title .= ' '.$this->get_action_link_or_button(
 				'add_category',
 				'add_category',
 				array(),
@@ -2309,20 +2309,20 @@ 
 	/**
 	 * @param $view
 	 */
-	protected function _category_details( $view ) {
+	protected function _category_details($view) {
 		//load formatter helper
 		//load field generator helper
 		$route = $view == 'edit' ? 'update_category' : 'insert_category';
-		$this->_set_add_edit_form_tags( $route );
+		$this->_set_add_edit_form_tags($route);
 		$this->_set_category_object();
-		$id = ! empty( $this->_category->id ) ? $this->_category->id : '';
+		$id = ! empty($this->_category->id) ? $this->_category->id : '';
 		$delete_action = 'delete_category';
 		//custom redirect
 		$redirect = EE_Admin_Page::add_query_args_and_nonce(
-			array( 'action' => 'category_list' ),
+			array('action' => 'category_list'),
 			$this->_admin_base_url
 		);
-		$this->_set_publish_post_box_vars( 'EVT_CAT_ID', $id, $delete_action, $redirect );
+		$this->_set_publish_post_box_vars('EVT_CAT_ID', $id, $delete_action, $redirect);
 		//take care of contents
 		$this->_template_args['admin_page_content'] = $this->_category_details_content();
 		$this->display_admin_page_with_sidebar();
@@ -2336,21 +2336,21 @@ 
 	protected function _category_details_content() {
 		$editor_args['category_desc'] = array(
 			'type'          => 'wp_editor',
-			'value'         => EEH_Formatter::admin_format_content( $this->_category->category_desc ),
+			'value'         => EEH_Formatter::admin_format_content($this->_category->category_desc),
 			'class'         => 'my_editor_custom',
-			'wpeditor_args' => array( 'media_buttons' => false ),
+			'wpeditor_args' => array('media_buttons' => false),
 		);
-		$_wp_editor = $this->_generate_admin_form_fields( $editor_args, 'array' );
+		$_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array');
 		$all_terms = get_terms(
-			array( 'espresso_event_categories' ),
-			array( 'hide_empty' => 0, 'exclude' => array( $this->_category->id ) )
+			array('espresso_event_categories'),
+			array('hide_empty' => 0, 'exclude' => array($this->_category->id))
 		);
 		//setup category select for term parents.
 		$category_select_values[] = array(
-			'text' => esc_html__( 'No Parent', 'event_espresso' ),
+			'text' => esc_html__('No Parent', 'event_espresso'),
 			'id'   => 0,
 		);
-		foreach ( $all_terms as $term ) {
+		foreach ($all_terms as $term) {
 			$category_select_values[] = array(
 				'text' => $term->name,
 				'id'   => $term->term_id,
@@ -2364,28 +2364,28 @@ 
 		$template_args = array(
 			'category'                 => $this->_category,
 			'category_select'          => $category_select,
-			'unique_id_info_help_link' => $this->_get_help_tab_link( 'unique_id_info' ),
+			'unique_id_info_help_link' => $this->_get_help_tab_link('unique_id_info'),
 			'category_desc_editor'     => $_wp_editor['category_desc']['field'],
 			'disable'                  => '',
 			'disabled_message'         => false,
 		);
-		$template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php';
-		return EEH_Template::display_template( $template, $template_args, true );
+		$template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php';
+		return EEH_Template::display_template($template, $template_args, true);
 	}
 
 
 
 	protected function _delete_categories() {
-		$cat_ids = isset( $this->_req_data['EVT_CAT_ID'] ) ? (array) $this->_req_data['EVT_CAT_ID']
+		$cat_ids = isset($this->_req_data['EVT_CAT_ID']) ? (array) $this->_req_data['EVT_CAT_ID']
 			: (array) $this->_req_data['category_id'];
-		foreach ( $cat_ids as $cat_id ) {
-			$this->_delete_category( $cat_id );
+		foreach ($cat_ids as $cat_id) {
+			$this->_delete_category($cat_id);
 		}
 		//doesn't matter what page we're coming from... we're going to the same place after delete.
 		$query_args = array(
 			'action' => 'category_list',
 		);
-		$this->_redirect_after_action( 0, '', '', $query_args );
+		$this->_redirect_after_action(0, '', '', $query_args);
 	}
 
 
@@ -2393,9 +2393,9 @@ 
 	/**
 	 * @param $cat_id
 	 */
-	protected function _delete_category( $cat_id ) {
-		$cat_id = absint( $cat_id );
-		wp_delete_term( $cat_id, 'espresso_event_categories' );
+	protected function _delete_category($cat_id) {
+		$cat_id = absint($cat_id);
+		wp_delete_term($cat_id, 'espresso_event_categories');
 	}
 
 
@@ -2403,18 +2403,18 @@ 
 	/**
 	 * @param $new_category
 	 */
-	protected function _insert_or_update_category( $new_category ) {
-		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category( true );
+	protected function _insert_or_update_category($new_category) {
+		$cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(true);
 		$success = 0; //we already have a success message so lets not send another.
-		if ( $cat_id ) {
+		if ($cat_id) {
 			$query_args = array(
 				'action'     => 'edit_category',
 				'EVT_CAT_ID' => $cat_id,
 			);
 		} else {
-			$query_args = array( 'action' => 'add_category' );
+			$query_args = array('action' => 'add_category');
 		}
-		$this->_redirect_after_action( $success, '', '', $query_args, true );
+		$this->_redirect_after_action($success, '', '', $query_args, true);
 	}
 
 
@@ -2423,14 +2423,14 @@ 
 	 * @param bool $update
 	 * @return bool|mixed|string
 	 */
-	private function _insert_category( $update = false ) {
+	private function _insert_category($update = false) {
 		$cat_id = $update ? $this->_req_data['EVT_CAT_ID'] : '';
-		$category_name = isset( $this->_req_data['category_name'] ) ? $this->_req_data['category_name'] : '';
-		$category_desc = isset( $this->_req_data['category_desc'] ) ? $this->_req_data['category_desc'] : '';
-		$category_parent = isset( $this->_req_data['category_parent'] ) ? $this->_req_data['category_parent'] : 0;
-		if ( empty( $category_name ) ) {
-			$msg = esc_html__( 'You must add a name for the category.', 'event_espresso' );
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+		$category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : '';
+		$category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : '';
+		$category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0;
+		if (empty($category_name)) {
+			$msg = esc_html__('You must add a name for the category.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$term_args = array(
@@ -2439,22 +2439,22 @@ 
 			'parent'      => $category_parent,
 		);
 		//was the category_identifier input disabled?
-		if ( isset( $this->_req_data['category_identifier'] ) ) {
+		if (isset($this->_req_data['category_identifier'])) {
 			$term_args['slug'] = $this->_req_data['category_identifier'];
 		}
 		$insert_ids = $update
-			? wp_update_term( $cat_id, 'espresso_event_categories', $term_args )
-			: wp_insert_term( $category_name, 'espresso_event_categories', $term_args );
-		if ( ! is_array( $insert_ids ) ) {
+			? wp_update_term($cat_id, 'espresso_event_categories', $term_args)
+			: wp_insert_term($category_name, 'espresso_event_categories', $term_args);
+		if ( ! is_array($insert_ids)) {
 			$msg = esc_html__(
 				'An error occurred and the category has not been saved to the database.',
 				'event_espresso'
 			);
-			EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			$cat_id = $insert_ids['term_id'];
-			$msg = sprintf( esc_html__( 'The category %s was successfully saved', 'event_espresso' ), $category_name );
-			EE_Error::add_success( $msg );
+			$msg = sprintf(esc_html__('The category %s was successfully saved', 'event_espresso'), $category_name);
+			EE_Error::add_success($msg);
 		}
 		return $cat_id;
 	}
@@ -2467,28 +2467,28 @@ 
 	 * @param bool $count
 	 * @return \EE_Base_Class[]|int
 	 */
-	public function get_categories( $per_page = 10, $current_page = 1, $count = false ) {
+	public function get_categories($per_page = 10, $current_page = 1, $count = false) {
 		//testing term stuff
-		$orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'Term.term_id';
-		$order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'DESC';
-		$limit = ( $current_page - 1 ) * $per_page;
-		$where = array( 'taxonomy' => 'espresso_event_categories' );
-		if ( isset( $this->_req_data['s'] ) ) {
-			$sstr = '%' . $this->_req_data['s'] . '%';
+		$orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id';
+		$order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC';
+		$limit = ($current_page - 1) * $per_page;
+		$where = array('taxonomy' => 'espresso_event_categories');
+		if (isset($this->_req_data['s'])) {
+			$sstr = '%'.$this->_req_data['s'].'%';
 			$where['OR'] = array(
-				'Term.name'   => array( 'LIKE', $sstr ),
-				'description' => array( 'LIKE', $sstr ),
+				'Term.name'   => array('LIKE', $sstr),
+				'description' => array('LIKE', $sstr),
 			);
 		}
 		$query_params = array(
 			$where,
-			'order_by'   => array( $orderby => $order ),
-			'limit'      => $limit . ',' . $per_page,
-			'force_join' => array( 'Term' ),
+			'order_by'   => array($orderby => $order),
+			'limit'      => $limit.','.$per_page,
+			'force_join' => array('Term'),
 		);
 		$categories = $count
-			? EEM_Term_Taxonomy::instance()->count( $query_params, 'term_id' )
-			: EEM_Term_Taxonomy::instance()->get_all( $query_params );
+			? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id')
+			: EEM_Term_Taxonomy::instance()->get_all($query_params);
 		return $categories;
 	}
 

caffeinated/core/libraries/messages/message_type/newsletter/EE_Newsletter_message_type.class.php

Spacing +28 added lines, -28 removed lines

@@ -22,10 +22,10 @@ 
 
 	public function __construct() {
 		$this->name = 'newsletter';
-		$this->description = __( 'Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like MailChimp, because sending non-related mail-outs to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.', 'event_espresso' );
+		$this->description = __('Batch message type messages are triggered manually by the admin for sending notifications to a selected group of recipients. This should only be used for more general notification type messages that contain information specific for the recipients. For "newsletter" type messages we recommend using an email list service like MailChimp, because sending non-related mail-outs to contacts increases the risk of your site domain getting added to spam lists, which will prevent messages getting to users.', 'event_espresso');
 		$this->label = array(
-			'singular' => __( 'batch', 'event_espresso' ),
-			'plural' => __( 'batches', 'event_espresso' )
+			'singular' => __('batch', 'event_espresso'),
+			'plural' => __('batches', 'event_espresso')
 			);
 		$this->_master_templates = array(
 			'email' => 'registration',
@@ -49,9 +49,9 @@ 
 
 
 
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
 		//newsletter message type data handler is 'Registrations' and it expects an array of EE_Registration objects.
-		return array( $registration );
+		return array($registration);
 	}
 
 
@@ -64,15 +64,15 @@ 
 
 	protected function _set_contexts() {
 		$this->_context_label = array(
-			'label' => __( 'recipient', 'event_espresso' ),
-			'plural' => __( 'recipients', 'event_espresso' ),
-			'description' => __( 'Recipient\'s are who will receive the message.', 'event_espresso' )
+			'label' => __('recipient', 'event_espresso'),
+			'plural' => __('recipients', 'event_espresso'),
+			'description' => __('Recipient\'s are who will receive the message.', 'event_espresso')
 			);
 
 		$this->_contexts = array(
 			'attendee' => array(
-				'label' => __( 'Registrant', 'event_espresso' ),
-				'description' => __( 'This template goes to selected registrants.', 'event_espresso' )
+				'label' => __('Registrant', 'event_espresso'),
+				'description' => __('This template goes to selected registrants.', 'event_espresso')
 				)
 			);
 	}
@@ -98,13 +98,13 @@ 
 			'newsletter',
 			);
 
-		foreach ( $this->_valid_shortcodes as $context => $shortcodes ) {
-			foreach ( $shortcodes as $key => $shortcode ) {
-				if ( ! in_array( $shortcode, $included_shortcodes ) ) {
-					unset( $this->_valid_shortcodes[ $context ][ $key ] );
+		foreach ($this->_valid_shortcodes as $context => $shortcodes) {
+			foreach ($shortcodes as $key => $shortcode) {
+				if ( ! in_array($shortcode, $included_shortcodes)) {
+					unset($this->_valid_shortcodes[$context][$key]);
 				}
 			}
-			$this->_valid_shortcodes[ $context ][] = 'newsletter';
+			$this->_valid_shortcodes[$context][] = 'newsletter';
 		}
 
 	}
@@ -118,44 +118,44 @@ 
 		$addressee = array();
 
 		//looping through registrations
-		foreach ( $this->_data->registrations as $reg_id => $details ) {
+		foreach ($this->_data->registrations as $reg_id => $details) {
 			//set $attendee array to blank on each loop
 			$aee = array();
 
 			//need to get the attendee from this registration.
-			$attendee = isset( $details['att_obj'] ) && $details['att_obj'] instanceof EE_Attendee
+			$attendee = isset($details['att_obj']) && $details['att_obj'] instanceof EE_Attendee
 				? $details['att_obj']
 				: null;
 
-			if ( ! $attendee instanceof EE_Attendee ) {
+			if ( ! $attendee instanceof EE_Attendee) {
 				continue;
 			}
 
 			//set $aee from attendee object
 			$aee['att_obj'] = $attendee;
-			$aee['reg_objs'] = isset( $this->_data->attendees[ $attendee->ID() ]['reg_objs'] )
-				? $this->_data->attendees[ $attendee->ID() ]['reg_objs']
+			$aee['reg_objs'] = isset($this->_data->attendees[$attendee->ID()]['reg_objs'])
+				? $this->_data->attendees[$attendee->ID()]['reg_objs']
 				: array();
 			$aee['attendee_email'] = $attendee->email();
-			$aee['tkt_objs'] = isset( $this->_data->attendees[ $attendee->ID() ]['tkt_objs'] )
-				? $this->_data->attendees[ $attendee->ID() ]['tkt_objs']
+			$aee['tkt_objs'] = isset($this->_data->attendees[$attendee->ID()]['tkt_objs'])
+				? $this->_data->attendees[$attendee->ID()]['tkt_objs']
 				: array();
 
-			if ( isset( $this->_data->attendees[ $attendee->ID() ]['evt_objs'] ) ) {
-				$aee['evt_objs'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
-				$aee['events'] = $this->_data->attendees[ $attendee->ID() ]['evt_objs'];
+			if (isset($this->_data->attendees[$attendee->ID()]['evt_objs'])) {
+				$aee['evt_objs'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
+				$aee['events'] = $this->_data->attendees[$attendee->ID()]['evt_objs'];
 			} else {
 				$aee['evt_objs'] = $aee['events'] = array();
 			}
 
-			$aee['reg_obj'] = isset( $details['reg_obj'] )
+			$aee['reg_obj'] = isset($details['reg_obj'])
 				? $details['reg_obj']
 				: null;
 			$aee['attendees'] = $this->_data->attendees;
 
 			//merge in the primary attendee data
-			$aee = array_merge( $this->_default_addressee_data, $aee );
-			$addressee[] = new EE_Messages_Addressee( $aee );
+			$aee = array_merge($this->_default_addressee_data, $aee);
+			$addressee[] = new EE_Messages_Addressee($aee);
 		}
 		return $addressee;
 	}

admin_pages/messages/Messages_Admin_Page.core.php

Spacing +657 added lines, -657 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'); }
 
 /**
  *
@@ -74,10 +74,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);
 	}
 
 
@@ -91,7 +91,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();
 	}
 
@@ -105,7 +105,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,21 +116,21 @@ 
 	public function get_messengers_for_list_table() {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
-			__( 'This method is no longer in use.  There is no replacement for it. The method was used to generate a set of
+			__('This method is no longer in use.  There is no replacement for it. The method was used to generate a set of
 			values for use in creating a messenger filter dropdown which is now generated differently via
-			 Messages_Admin_Page::get_messengers_select_input', 'event_espresso' ),
+			 Messages_Admin_Page::get_messengers_select_input', 'event_espresso'),
 			'4.9.9.rc.014'
 		);
 
 		$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() );
-				$i ++;
+		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++;
 			}
 		}
 		return $m_values;
@@ -144,20 +144,20 @@ 
 	public function get_message_types_for_list_table() {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
-			__( 'This method is no longer in use.  There is no replacement for it. The method was used to generate a set of
+			__('This method is no longer in use.  There is no replacement for it. The method was used to generate a set of
 			values for use in creating a message type filter dropdown which is now generated differently via
-			 Messages_Admin_Page::get_message_types_select_input', 'event_espresso' ),
+			 Messages_Admin_Page::get_message_types_select_input', 'event_espresso'),
 			'4.9.9.rc.014'
 		);
 
 		$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() );
-				$i ++;
+		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++;
 			}
 		}
 		return $mt_values;
@@ -171,21 +171,21 @@ 
 	public function get_contexts_for_message_types_for_list_table() {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
-			__( 'This method is no longer in use.  There is no replacement for it. The method was used to generate a set of
+			__('This method is no longer in use.  There is no replacement for it. The method was used to generate a set of
 			values for use in creating a message type context filter dropdown which is now generated differently via
-			 Messages_Admin_Page::get_contexts_for_message_types_select_input', 'event_espresso' ),
+			 Messages_Admin_Page::get_contexts_for_message_types_select_input', 'event_espresso'),
 			'4.9.9.rc.014'
 		);
 
 		$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'];
 					}
 				}
 			}
@@ -201,17 +201,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_messengers_select_input( $messenger_options ) {
+	public function get_messengers_select_input($messenger_options) {
 		//if empty or just one value then just return an empty string
-		if ( empty( $messenger_options )
-		     || ! is_array( $messenger_options )
-		     ||  count( $messenger_options ) === 1
+		if (empty($messenger_options)
+		     || ! is_array($messenger_options)
+		     ||  count($messenger_options) === 1
 		) {
 			return '';
 		}
 		//merge in default
 		$messenger_options = array_merge(
-			array( 'none_selected' => __( 'Show All Messengers', 'event_espresso' ) ),
+			array('none_selected' => __('Show All Messengers', 'event_espresso')),
 			$messenger_options
 		);
 		$input = new EE_Select_Input(
@@ -220,8 +220,8 @@ 
 				'html_name'  => 'ee_messenger_filter_by',
 				'html_id'    => 'ee_messenger_filter_by',
 				'html_class' => 'wide',
-				'default'    => isset( $this->_req_data['ee_messenger_filter_by'] )
-					? sanitize_title( $this->_req_data['ee_messenger_filter_by'] )
+				'default'    => isset($this->_req_data['ee_messenger_filter_by'])
+					? sanitize_title($this->_req_data['ee_messenger_filter_by'])
 					: 'none_selected'
 			)
 		);
@@ -237,17 +237,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_message_types_select_input( $message_type_options ) {
+	public function get_message_types_select_input($message_type_options) {
 		//if empty or count of options is 1 then just return an empty string
-		if ( empty( $message_type_options )
-			|| ! is_array( $message_type_options )
-			|| count( $message_type_options ) === 1
+		if (empty($message_type_options)
+			|| ! is_array($message_type_options)
+			|| count($message_type_options) === 1
 		) {
 			return '';
 		}
 		//merge in default
 		$message_type_options = array_merge(
-			array( 'none_selected' => __( 'Show All Message Types', 'event_espresso' ) ),
+			array('none_selected' => __('Show All Message Types', 'event_espresso')),
 			$message_type_options
 		);
 		$input = new EE_Select_Input(
@@ -256,8 +256,8 @@ 
 				'html_name'  => 'ee_message_type_filter_by',
 				'html_id'    => 'ee_message_type_filter_by',
 				'html_class' => 'wide',
-				'default'    => isset( $this->_req_data['ee_message_type_filter_by'] )
-					? sanitize_title( $this->_req_data['ee_message_type_filter_by'] )
+				'default'    => isset($this->_req_data['ee_message_type_filter_by'])
+					? sanitize_title($this->_req_data['ee_message_type_filter_by'])
 					: 'none_selected',
 			)
 		);
@@ -273,17 +273,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_contexts_for_message_types_select_input( $context_options ) {
+	public function get_contexts_for_message_types_select_input($context_options) {
 		//if empty or count of options is one then just return empty string
-		if ( empty( $context_options )
-			|| ! is_array( $context_options )
-			|| count( $context_options ) === 1
+		if (empty($context_options)
+			|| ! is_array($context_options)
+			|| count($context_options) === 1
 		) {
 			return '';
 		}
 		//merge in default
 		$context_options = array_merge(
-			array( 'none_selected' => __( 'Show all Contexts', 'event_espresso' ) ),
+			array('none_selected' => __('Show all Contexts', 'event_espresso')),
 			$context_options
 		);
 		$input = new EE_Select_Input(
@@ -292,8 +292,8 @@ 
 				'html_name'  => 'ee_context_filter_by',
 				'html_id'    => 'ee_context_filter_by',
 				'html_class' => 'wide',
-				'default'    => isset( $this->_req_data['ee_context_filter_by'] )
-					? sanitize_title( $this->_req_data['ee_context_filter_by'] )
+				'default'    => isset($this->_req_data['ee_context_filter_by'])
+					? sanitize_title($this->_req_data['ee_context_filter_by'])
 					: 'none_selected',
 			)
 		);
@@ -303,11 +303,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'));
 	}
 
 
@@ -339,13 +339,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;
 
@@ -387,35 +387,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(
@@ -534,7 +534,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(
@@ -569,7 +569,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'),
@@ -625,7 +625,7 @@ 
 						'filename' => 'messages_settings_messengers'
 					),
 				),
-				'help_tour' => array( 'Messages_Settings_Help_Tour' ),
+				'help_tour' => array('Messages_Settings_Help_Tour'),
 				'require_nonce' => false
 			)
 		);
@@ -658,7 +658,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();
 	}
 
@@ -680,37 +680,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);
 	}
 
 
@@ -718,22 +718,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);
 	}
 
 
@@ -741,31 +741,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;
@@ -783,15 +783,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'));
 	}
 
 
@@ -800,22 +800,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');
 	}
@@ -845,40 +845,40 @@ 
 	 * set views array for message queue list table
 	 */
 	public function _set_list_table_views_default() {
-		EE_Registry::instance()->load_helper( 'Template' );
+		EE_Registry::instance()->load_helper('Template');
 
-		$common_bulk_actions = EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'message_list_table_bulk_actions' )
+		$common_bulk_actions = EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'message_list_table_bulk_actions')
 			? array(
-				'generate_now' => __( 'Generate Now', 'event_espresso' ),
-		        'generate_and_send_now' => __( 'Generate and Send Now', 'event_espresso' ),
-		        'queue_for_resending' => __( 'Queue for Resending', 'event_espresso' ),
-		        'send_now' => __( 'Send Now', 'event_espresso' )
+				'generate_now' => __('Generate Now', 'event_espresso'),
+		        'generate_and_send_now' => __('Generate and Send Now', 'event_espresso'),
+		        'queue_for_resending' => __('Queue for Resending', 'event_espresso'),
+		        'send_now' => __('Send Now', 'event_espresso')
 				)
 			: array();
 
-		$delete_bulk_action = EE_Registry::instance()->CAP->current_user_can( 'ee_delete_messages', 'message_list_table_bulk_actions' )
-			? array( 'delete_ee_messages' => __( 'Delete Messages', 'event_espresso' ) )
+		$delete_bulk_action = EE_Registry::instance()->CAP->current_user_can('ee_delete_messages', 'message_list_table_bulk_actions')
+			? array('delete_ee_messages' => __('Delete Messages', 'event_espresso'))
 			: array();
 
 
 		$this->_views = array(
 			 'all' => array(
 			    'slug' => 'all',
-			    'label' => __( 'All', 'event_espresso' ),
+			    'label' => __('All', 'event_espresso'),
 			    'count' => 0,
-			    'bulk_action' => array_merge( $common_bulk_actions, $delete_bulk_action )
+			    'bulk_action' => array_merge($common_bulk_actions, $delete_bulk_action)
 			 )
 		);
 
 
-		foreach ( EEM_Message::instance()->all_statuses() as $status ) {
-			if ( $status === EEM_Message::status_debug_only && ! EEM_Message::debug() ) {
+		foreach (EEM_Message::instance()->all_statuses() as $status) {
+			if ($status === EEM_Message::status_debug_only && ! EEM_Message::debug()) {
 				continue;
 			}
 			$status_bulk_actions = $common_bulk_actions;
 			//unset bulk actions not applying to status
-			if ( ! empty( $status_bulk_actions ) ) {
-				switch ( $status ) {
+			if ( ! empty($status_bulk_actions)) {
+				switch ($status) {
 					case EEM_Message::status_idle :
 					case EEM_Message::status_resend :
 						$status_bulk_actions['send_now'] = $common_bulk_actions['send_now'];
@@ -890,21 +890,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)
 			);
 		}
 	}
@@ -923,8 +923,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();
 	}
 
@@ -937,8 +937,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(
@@ -950,37 +950,37 @@ 
 		/** @type array $status_items status legend setup*/
 		$status_items = array(
 			'sent_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_sent,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_sent, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_sent,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_sent, false, 'sentence')
 				),
 			'idle_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_idle,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_idle, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_idle,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_idle, false, 'sentence')
 				),
 			'failed_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_failed,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_failed, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_failed,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_failed, false, 'sentence')
 			),
 			'resend_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_resend,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_resend, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_resend,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_resend, false, 'sentence')
 				),
 			'incomplete_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_incomplete,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_incomplete, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_incomplete,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_incomplete, false, 'sentence')
 				),
 			'retry_status' => array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_retry,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_retry, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_retry,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_retry, false, 'sentence')
 				)
 		);
-		if ( EEM_Message::debug() ) {
+		if (EEM_Message::debug()) {
 			$status_items['debug_only_status'] = array(
-				'class' => 'ee-status-legend ee-status-legend-' . EEM_Message::status_debug_only,
-				'desc' => EEH_Template::pretty_status( EEM_Message::status_debug_only, false, 'sentence' )
+				'class' => 'ee-status-legend ee-status-legend-'.EEM_Message::status_debug_only,
+				'desc' => EEH_Template::pretty_status(EEM_Message::status_debug_only, false, 'sentence')
 			);
 		}
-		return array_merge( $action_items, $status_items );
+		return array_merge($action_items, $status_items);
 	}
 
 
@@ -990,9 +990,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);
 	}
 
 
@@ -1016,31 +1016,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);
 
 		}
 
@@ -1059,8 +1059,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;
@@ -1079,24 +1079,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!
 
@@ -1117,8 +1117,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);
 	}
 
 
@@ -1129,14 +1129,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.
@@ -1144,20 +1144,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 {
@@ -1167,7 +1167,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
 			);
 		}
@@ -1181,14 +1181,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(
@@ -1209,7 +1209,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');
 		}
@@ -1219,51 +1219,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
@@ -1279,32 +1279,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',
@@ -1318,14 +1318,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')
 						: '';
@@ -1338,10 +1338,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
@@ -1352,12 +1352,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',
@@ -1370,7 +1370,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',
@@ -1514,13 +1514,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',
@@ -1530,8 +1530,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) )
@@ -1543,7 +1543,7 @@ 
 			 $GRP_ID,
 			 false,
 			 add_query_arg(
-			    array( 'action' => 'global_mtps' ),
+			    array('action' => 'global_mtps'),
 			    $this->_admin_base_url
 			 )
 		);
@@ -1559,7 +1559,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
@@ -1587,17 +1587,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.
@@ -1610,7 +1610,7 @@ 
 	}
 
 
-	public function filter_tinymce_init( $mceInit, $editor_id ) {
+	public function filter_tinymce_init($mceInit, $editor_id) {
 		return $mceInit;
 	}
 
@@ -1621,7 +1621,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() {
@@ -1638,25 +1638,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',
@@ -1666,7 +1666,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(
@@ -1679,7 +1679,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;
 			}
@@ -1701,9 +1701,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.',
@@ -1715,9 +1715,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.
@@ -1725,9 +1725,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.
@@ -1745,32 +1745,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;
 		}
 	}
@@ -1783,7 +1783,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(
@@ -1799,13 +1799,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;
 		}
 
@@ -1815,22 +1815,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 '';
 	}
@@ -1860,9 +1860,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');
 	}
 
 
@@ -1881,14 +1881,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
@@ -1902,7 +1902,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'
@@ -1915,14 +1915,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',
@@ -1939,9 +1939,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);
 	}
 
 
@@ -1965,46 +1965,46 @@ 
 		//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] = 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" ';
 			$test_settings_html .= 'name="test_button" value="';
@@ -2013,7 +2013,7 @@ 
 		}
 
 		//and button
-		$test_settings_html .= '<p>' . __('Need to reset this message type and start over?', 'event_espresso') . '</p>';
+		$test_settings_html .= '<p>'.__('Need to reset this message type and start over?', 'event_espresso').'</p>';
 		$test_settings_html .= '<div class="publishing-action alignright resetbutton">';
 		$test_settings_html .= $this->get_action_link_or_button(
 			'reset_to_default',
@@ -2037,13 +2037,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);
 	}
 
 
@@ -2058,13 +2058,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
 		}
 
@@ -2081,7 +2081,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();
 	}
@@ -2103,14 +2103,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();
 	}
 
 
@@ -2123,19 +2123,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();
@@ -2154,7 +2154,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();
@@ -2162,20 +2162,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; ?>>
@@ -2183,7 +2183,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']; ?>
@@ -2210,8 +2210,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 {
@@ -2220,22 +2220,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'])
 		);
 
 
@@ -2247,42 +2247,42 @@ 
 
 
 
-	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_slug = ! empty( $this->_req_data['MTP_messenger'] ) ? $this->_req_data['MTP_messenger'] : '';
+		$messenger_slug = ! empty($this->_req_data['MTP_messenger']) ? $this->_req_data['MTP_messenger'] : '';
 
 		//need the message type and messenger objects to be able to use the labels for the notices
-		$messenger_object = $this->_message_resource_manager->get_messenger( $messenger_slug );
-		$messenger_label = $messenger_object instanceof EE_messenger ? ucwords( $messenger_object->label['singular'] ) : '';
+		$messenger_object = $this->_message_resource_manager->get_messenger($messenger_slug);
+		$messenger_label = $messenger_object instanceof EE_messenger ? ucwords($messenger_object->label['singular']) : '';
 
-		$message_type_slug = ! empty( $this->_req_data['MTP_message_type'] ) ? $this->_req_data['MTP_message_type'] : '';
-		$message_type_object = $this->_message_resource_manager->get_message_type( $message_type_slug );
+		$message_type_slug = ! empty($this->_req_data['MTP_message_type']) ? $this->_req_data['MTP_message_type'] : '';
+		$message_type_object = $this->_message_resource_manager->get_message_type($message_type_slug);
 
 		$message_type_label = $message_type_object instanceof EE_message_type
-			? ucwords( $message_type_object->label['singular'] )
+			? ucwords($message_type_object->label['singular'])
 			: '';
 
-		$context_slug = ! empty( $this->_req_data['MTP_context'] )
+		$context_slug = ! empty($this->_req_data['MTP_context'])
 			? $this->_req_data['MTP_context']
 			: '';
-		$context = ucwords( str_replace( '_', ' ', $context_slug ) );
+		$context = ucwords(str_replace('_', ' ', $context_slug));
 
-		$item_desc = $messenger_label && $message_type_label ? $messenger_label. ' ' . $message_type_label . ' ' . $context . ' ' : '';
+		$item_desc = $messenger_label && $message_type_label ? $messenger_label.' '.$message_type_label.' '.$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_slug, $message_type_slug, $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_slug, $message_type_slug, $GRP_ID)) {
+				if (empty($edit_array)) {
 					$success = 0;
 				} else {
 					$success = 1;
@@ -2301,7 +2301,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__
@@ -2310,25 +2310,25 @@ 
 
 			} else {
 				//first validate all fields!
-				$validates = $MTPG->validate($this->_req_data['MTP_template_fields'], $context_slug,  $messenger_slug, $message_type_slug);
+				$validates = $MTPG->validate($this->_req_data['MTP_template_fields'], $context_slug, $messenger_slug, $message_type_slug);
 
 				//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(
@@ -2341,11 +2341,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__
@@ -2359,46 +2359,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;
 					}
@@ -2408,7 +2408,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'] = '';
@@ -2416,9 +2416,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();
@@ -2426,13 +2426,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( $context,  $messenger_slug, $message_type_slug );
+			$this->_do_test_send($context, $messenger_slug, $message_type_slug);
 			$override = true;
 		}
 
-		if ( empty( $query_args ) ) {
+		if (empty($query_args)) {
 			$query_args = array(
 				'id' => $this->_req_data['GRP_ID'],
 				'context' => $context_slug,
@@ -2440,7 +2440,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);
 	}
 
 
@@ -2454,28 +2454,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__);
 		}
 	}
 
@@ -2501,11 +2501,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);
 	}
 
 
@@ -2521,33 +2521,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 {
@@ -2559,13 +2559,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());
 
 	}
 
@@ -2581,24 +2581,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());
 
 	}
 
@@ -2613,20 +2613,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;
@@ -2644,7 +2644,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>';
 	}
 
 
@@ -2662,10 +2662,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 -->';
 
@@ -2684,7 +2684,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;
 		}
 
@@ -2699,10 +2699,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,
@@ -2712,26 +2712,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
@@ -2750,34 +2750,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;
@@ -2797,13 +2797,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;
 	}
 
@@ -2820,27 +2820,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,
@@ -2849,11 +2849,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,
@@ -2866,15 +2866,15 @@ 
 
 
 		//register messenger metaboxes
-		$m_template_path = EE_MSG_TEMPLATE_PATH . 'ee_msg_details_messenger_mt_meta_box.template.php';
-		foreach ( $m_boxes as $box => $label ) {
-			$callback_args = array( 'template_path' => $m_template_path, 'template_args' => $m_template_args[$box] );
-			$msgr = str_replace( '_a_box', '', $box );
+		$m_template_path = EE_MSG_TEMPLATE_PATH.'ee_msg_details_messenger_mt_meta_box.template.php';
+		foreach ($m_boxes as $box => $label) {
+			$callback_args = array('template_path' => $m_template_path, 'template_args' => $m_template_args[$box]);
+			$msgr = str_replace('_a_box', '', $box);
 			add_meta_box(
-				'espresso_' . $msgr . '_settings',
+				'espresso_'.$msgr.'_settings',
 				$label,
-				function( $post, $metabox ) {
-					echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );
+				function($post, $metabox) {
+					echo EEH_Template::display_template($metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE);
 				},
 				$this->_current_screen->id,
 				'normal',
@@ -2884,17 +2884,17 @@ 
 		}
 
 		//register message type metaboxes
-		$mt_template_path = EE_MSG_TEMPLATE_PATH . 'ee_msg_details_messenger_meta_box.template.php';
-		foreach ( $mt_boxes as $box => $label ) {
+		$mt_template_path = EE_MSG_TEMPLATE_PATH.'ee_msg_details_messenger_meta_box.template.php';
+		foreach ($mt_boxes as $box => $label) {
 			$callback_args = array(
-				'template_path' => $mt_template_path, 'template_args' => $mt_template_args[ $box ]
+				'template_path' => $mt_template_path, 'template_args' => $mt_template_args[$box]
 			);
-			$mt = str_replace( '_i_box', '', $box );
+			$mt = str_replace('_i_box', '', $box);
 			add_meta_box(
-				'espresso_' . $mt . '_inactive_mts',
+				'espresso_'.$mt.'_inactive_mts',
 				$label,
-				function( $post, $metabox ) {
-					echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );
+				function($post, $metabox) {
+					echo EEH_Template::display_template($metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE);
 				},
 				$this->_current_screen->id,
 				'side',
@@ -2905,11 +2905,11 @@ 
 
 		//register metabox for global messages settings but only when on the main site.  On single site installs this will
 		//always result in the metabox showing, on multisite installs the metabox will only show on the main site.
-		if ( is_main_site() ) {
+		if (is_main_site()) {
 			add_meta_box(
 				'espresso_global_message_settings',
-				__( 'Global Message Settings', 'event_espresso' ),
-				array( $this, 'global_messages_settings_metabox_content' ),
+				__('Global Message Settings', 'event_espresso'),
+				array($this, 'global_messages_settings_metabox_content'),
 				$this->_current_screen->id,
 				'normal',
 				'low',
@@ -2929,7 +2929,7 @@ 
 	public function global_messages_settings_metabox_content() {
 		$form = $this->_generate_global_settings_form();
 		echo $form->form_open(
-			$this->add_query_args_and_nonce( array( 'action' => 'update_global_settings' ), EE_MSG_ADMIN_URL ),
+			$this->add_query_args_and_nonce(array('action' => 'update_global_settings'), EE_MSG_ADMIN_URL),
 			'POST'
 		)
 		. $form->get_html()
@@ -2942,7 +2942,7 @@ 
 	 * @return EE_Form_Section_Proper
 	 */
 	protected function _generate_global_settings_form() {
-		EE_Registry::instance()->load_helper( 'HTML' );
+		EE_Registry::instance()->load_helper('HTML');
 		/** @var EE_Network_Core_Config $network_config */
 		$network_config = EE_Registry::instance()->NET_CFG->core;
 		return new EE_Form_Section_Proper(
@@ -2961,13 +2961,13 @@ 
 							),
 							array(
 								'default' => $network_config->do_messages_on_same_request,
-								'html_label_text' => __( 'Generate and send all messages:', 'event_espresso' ),
-								'html_help_text' => __( 'By default the messages system uses a more efficient means of processing messages on separate requests and utilizes the wp-cron scheduling system.  This makes things execute faster for people registering for your events.  However, if the wp-cron system is disabled on your site and there is no alternative in place, then you can change this so messages are always executed on the same request.', 'event_espresso' ),
+								'html_label_text' => __('Generate and send all messages:', 'event_espresso'),
+								'html_help_text' => __('By default the messages system uses a more efficient means of processing messages on separate requests and utilizes the wp-cron scheduling system.  This makes things execute faster for people registering for your events.  However, if the wp-cron system is disabled on your site and there is no alternative in place, then you can change this so messages are always executed on the same request.', 'event_espresso'),
 							)
 						),
 						'update_settings' => new EE_Submit_Input(
 							array(
-								'default' => __( 'Update', 'event_espresso' ),
+								'default' => __('Update', 'event_espresso'),
 								'html_label_text' => '&nbsp'
 							)
 						)
@@ -2986,28 +2986,28 @@ 
 		/** @var EE_Network_Core_Config $network_config */
 		$network_config = EE_Registry::instance()->NET_CFG->core;
 		$form = $this->_generate_global_settings_form();
-		if ( $form->was_submitted() ) {
+		if ($form->was_submitted()) {
 			$form->receive_form_submission();
-			if ( $form->is_valid() ) {
+			if ($form->is_valid()) {
 				$valid_data = $form->valid_data();
-				foreach( $valid_data as $property => $value ) {
-					$setter = 'set_' . $property;
-					if ( method_exists( $network_config, $setter ) ) {
-						$network_config->{$setter}( $value );
+				foreach ($valid_data as $property => $value) {
+					$setter = 'set_'.$property;
+					if (method_exists($network_config, $setter)) {
+						$network_config->{$setter}($value);
 					} else if (
-						property_exists( $network_config, $property )
+						property_exists($network_config, $property)
 						&& $network_config->{$property} !== $value
 					) {
 						$network_config->{$property} = $value;
 					}
 				}
 				//only update if the form submission was valid!
-				EE_Registry::instance()->NET_CFG->update_config( true, false );
+				EE_Registry::instance()->NET_CFG->update_config(true, false);
 				EE_Error::overwrite_success();
-				EE_Error::add_success( __( 'Global message settings were updated', 'event_espresso' ) );
+				EE_Error::add_success(__('Global message settings were updated', 'event_espresso'));
 			}
 		}
-		$this->_redirect_after_action( 0, '', '', array( 'action' => 'settings' ), true );
+		$this->_redirect_after_action(0, '', '', array('action' => 'settings'), true);
 	}
 
 
@@ -3018,13 +3018,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;
@@ -3040,29 +3040,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' => '',
@@ -3071,8 +3071,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')
 				: '';
 		}
 
@@ -3089,39 +3089,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;
 	}
 
@@ -3135,9 +3135,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__
@@ -3146,14 +3146,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',
@@ -3169,11 +3169,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__,
@@ -3182,11 +3182,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;
@@ -3209,7 +3209,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__
@@ -3217,7 +3217,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__
@@ -3225,7 +3225,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__
@@ -3237,7 +3237,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'),
@@ -3250,16 +3250,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;
@@ -3273,30 +3273,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);
 
 	}
 
@@ -3307,11 +3307,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);
 	}
 
 
@@ -3322,23 +3322,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);
 	}
 
 
@@ -3350,13 +3350,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);
 	}
 
 
@@ -3387,9 +3387,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__
@@ -3397,32 +3397,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'])
 					)
 				);
 			}
@@ -3432,12 +3432,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;
@@ -3445,13 +3445,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__,
@@ -3479,9 +3479,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__
@@ -3489,13 +3489,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 {
@@ -3503,20 +3503,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;
@@ -3527,17 +3527,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();
@@ -3551,45 +3551,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;
@@ -3597,16 +3597,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;
@@ -3628,8 +3628,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);
 	}
 
 
@@ -3644,7 +3644,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);
 	}
 
 
@@ -3658,8 +3658,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);
 	}
 
 
@@ -3672,8 +3672,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);
 	}
 
 
@@ -3687,23 +3687,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);
 		}
 	}
 
@@ -3716,10 +3716,10 @@ 
      *  @return array
      */
 	protected function _get_msg_ids_from_request() {
-		if ( ! isset( $this->_req_data['MSG_ID'] ) ) {
+		if ( ! isset($this->_req_data['MSG_ID'])) {
 			return array();
 		}
-		return is_array( $this->_req_data['MSG_ID'] ) ? array_keys( $this->_req_data['MSG_ID'] ) : array( $this->_req_data['MSG_ID'] );
+		return is_array($this->_req_data['MSG_ID']) ? array_keys($this->_req_data['MSG_ID']) : array($this->_req_data['MSG_ID']);
 	}
 
 

admin_pages/support/Support_Admin_Page.core.php

Spacing +19 added lines, -19 removed lines

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

payment_methods/Paypal_Standard/EEG_Paypal_Standard.gateway.php

Indentation +30 added lines, -30 removed lines

@@ -274,26 +274,26 @@ 
 		if ( ! $this->validate_ipn( $update_info, $payment ) ) {
 			return $payment;
 		}
-        // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
-        // registrations, ticket counts, etc)
-        if (
-            (
-                $update_info[ 'payment_status' ] === 'Refunded'
-                || $update_info[ 'payment_status' ] === 'Partially_Refunded'
-            )
-            && apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true )
-        ) {
-            throw new EventEspresso\core\exceptions\IpnException(
-                sprintf(
-                    esc_html__( 'Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
-                    $update_info['payment_status']
-                ),
-                EventEspresso\core\exceptions\IpnException::UNSUPPORTED,
-                null,
-                $payment,
-                $update_info
-            );
-        }
+		// kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
+		// registrations, ticket counts, etc)
+		if (
+			(
+				$update_info[ 'payment_status' ] === 'Refunded'
+				|| $update_info[ 'payment_status' ] === 'Partially_Refunded'
+			)
+			&& apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true )
+		) {
+			throw new EventEspresso\core\exceptions\IpnException(
+				sprintf(
+					esc_html__( 'Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
+					$update_info['payment_status']
+				),
+				EventEspresso\core\exceptions\IpnException::UNSUPPORTED,
+				null,
+				$payment,
+				$update_info
+			);
+		}
 		//ok, well let's process this payment then!
 		switch ( $update_info[ 'payment_status' ] ) {
 
@@ -541,17 +541,17 @@ 
 
 		//might paypal have changed the taxes?
 		if( $this->_paypal_taxes && $payment_was_itemized ) {
-            // note that we're doing this BEFORE adding shipping;
+			// note that we're doing this BEFORE adding shipping;
 			// we actually want PayPal's shipping to remain non-taxable
-            $this->_line_item->set_line_items_taxable( $transaction_total_line_item, true, 'paypal_shipping' );
-            $this->_line_item->set_total_tax_to(
-	            $transaction_total_line_item,
-                (float)$update_info['tax'],
-                esc_html__( 'Taxes', 'event_espresso' ),
-                esc_html__( 'Calculated by Paypal', 'event_espresso' ),
-                'paypal_tax'
-            );
-            $grand_total_needs_resaving = TRUE;
+			$this->_line_item->set_line_items_taxable( $transaction_total_line_item, true, 'paypal_shipping' );
+			$this->_line_item->set_total_tax_to(
+				$transaction_total_line_item,
+				(float)$update_info['tax'],
+				esc_html__( 'Taxes', 'event_espresso' ),
+				esc_html__( 'Calculated by Paypal', 'event_espresso' ),
+				'paypal_tax'
+			);
+			$grand_total_needs_resaving = TRUE;
 		}
 
 		$shipping_amount = (float)$update_info[ 'mc_shipping' ];

Spacing +122 added lines, -122 removed lines

@@ -70,7 +70,7 @@ 
 	 * @return EEG_Paypal_Standard
 	 */
 	public function __construct() {
-		$this->set_uses_separate_IPN_request( true ) ;
+		$this->set_uses_separate_IPN_request(true);
 		parent::__construct();
 	}
 
@@ -80,7 +80,7 @@ 
 	 * Also sets the gateway url class variable based on whether debug mode is enabled or not
 	 * @param array $settings_array
 	 */
-	public function set_settings($settings_array){
+	public function set_settings($settings_array) {
 		parent::set_settings($settings_array);
 		$this->_gateway_url = $this->_debug_mode
 			? 'https://www.sandbox.paypal.com/cgi-bin/webscr'
@@ -114,42 +114,42 @@ 
 
 		$total_discounts_to_cart_total = $transaction->paid();
 		//only itemize the order if we're paying for the rest of the order's amount
-		if( EEH_Money::compare_floats( $payment->amount(), $transaction->total(), '==' ) ) {
-			$payment->update_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, true );
+		if (EEH_Money::compare_floats($payment->amount(), $transaction->total(), '==')) {
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true);
 			//this payment is for the remaining transaction amount,
 			//keep track of exactly how much the itemized order amount equals
 			$itemized_sum = 0;
 			$shipping_previously_added = 0;
 			//so let's show all the line items
-			foreach($total_line_item->get_items() as $line_item){
-				if ( $line_item instanceof EE_Line_Item ) {
+			foreach ($total_line_item->get_items() as $line_item) {
+				if ($line_item instanceof EE_Line_Item) {
 					//it's some kind of discount
-					if( $line_item->total() < 0 ) {
-						$total_discounts_to_cart_total += abs( $line_item->total() );
+					if ($line_item->total() < 0) {
+						$total_discounts_to_cart_total += abs($line_item->total());
 						$itemized_sum += $line_item->total();
 						continue;
 					}
 					//dont include shipping again.
-					if( strpos( $line_item->code(), 'paypal_shipping_') === 0 ) {
+					if (strpos($line_item->code(), 'paypal_shipping_') === 0) {
 						$shipping_previously_added = $line_item->total();
 						continue;
 					}
-					$redirect_args[ 'item_name_' . $item_num ] = substr(
-						$this->_format_line_item_name( $line_item, $payment ),
+					$redirect_args['item_name_'.$item_num] = substr(
+						$this->_format_line_item_name($line_item, $payment),
 						0, 127
 					);
-					$redirect_args[ 'amount_' . $item_num ] = $line_item->unit_price();
-					$redirect_args[ 'quantity_' . $item_num ] = $line_item->quantity();
+					$redirect_args['amount_'.$item_num] = $line_item->unit_price();
+					$redirect_args['quantity_'.$item_num] = $line_item->quantity();
 					//if we're not letting PayPal calculate shipping, tell them its 0
-					if ( ! $this->_paypal_shipping ) {
-						$redirect_args[ 'shipping_' . $item_num ] = '0';
-						$redirect_args[ 'shipping2_' . $item_num ] = '0';
+					if ( ! $this->_paypal_shipping) {
+						$redirect_args['shipping_'.$item_num] = '0';
+						$redirect_args['shipping2_'.$item_num] = '0';
 					}
 					$item_num++;
 					$itemized_sum += $line_item->total();
 				}
 			}
-			$taxes_li = $this->_line_item->get_taxes_subtotal( $total_line_item );
+			$taxes_li = $this->_line_item->get_taxes_subtotal($total_line_item);
 			//ideally itemized sum equals the transaction total. but if not (which is weird)
 			//and the itemized sum is LESS than the transaction total
 			//add another line item
@@ -159,47 +159,47 @@ 
 				$transaction->total() - $itemized_sum - $taxes_li->total() - $shipping_previously_added,
 				2
 			);
-			if( $itemized_sum_diff_from_txn_total < 0 ) {
+			if ($itemized_sum_diff_from_txn_total < 0) {
 				//itemized sum is too big
-				$total_discounts_to_cart_total += abs( $itemized_sum_diff_from_txn_total );
-			} elseif( $itemized_sum_diff_from_txn_total > 0 ) {
-				$redirect_args[ 'item_name_' . $item_num ] = substr(
-						__( 'Other charges', 'event_espresso' ), 0, 127 );
-				$redirect_args[ 'amount_' . $item_num ] = $this->format_currency( $itemized_sum_diff_from_txn_total );
-				$redirect_args[ 'quantity_' . $item_num ] = 1;
+				$total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total);
+			} elseif ($itemized_sum_diff_from_txn_total > 0) {
+				$redirect_args['item_name_'.$item_num] = substr(
+						__('Other charges', 'event_espresso'), 0, 127 );
+				$redirect_args['amount_'.$item_num] = $this->format_currency($itemized_sum_diff_from_txn_total);
+				$redirect_args['quantity_'.$item_num] = 1;
 				$item_num++;
 			}
-			if( $total_discounts_to_cart_total > 0 ) {
-				$redirect_args[ 'discount_amount_cart' ] = $this->format_currency( $total_discounts_to_cart_total );
+			if ($total_discounts_to_cart_total > 0) {
+				$redirect_args['discount_amount_cart'] = $this->format_currency($total_discounts_to_cart_total);
 			}
 			//add our taxes to the order if we're NOT using PayPal's
-			if( ! $this->_paypal_taxes ){
+			if ( ! $this->_paypal_taxes) {
 				$redirect_args['tax_cart'] = $total_line_item->get_total_tax();
 			}
 		} else {
-			$payment->update_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, false );
+			$payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false);
 			//partial payment that's not for the remaining amount, so we can't send an itemized list
-			$redirect_args['item_name_' . $item_num] = substr(
-				$this->_format_partial_payment_line_item_name( $payment ),
+			$redirect_args['item_name_'.$item_num] = substr(
+				$this->_format_partial_payment_line_item_name($payment),
 				0, 127
 			);
-			$redirect_args['amount_' . $item_num] = $payment->amount();
-			$redirect_args['shipping_' . $item_num ] = '0';
-			$redirect_args['shipping2_' . $item_num ] = '0';
+			$redirect_args['amount_'.$item_num] = $payment->amount();
+			$redirect_args['shipping_'.$item_num] = '0';
+			$redirect_args['shipping2_'.$item_num] = '0';
 			$redirect_args['tax_cart'] = '0';
 			$item_num++;
 		}
 
-		if($this->_debug_mode){
-			$redirect_args['item_name_' . $item_num] = 'DEBUG INFO (this item only added in sandbox mode';
-			$redirect_args['amount_' . $item_num] = 0;
+		if ($this->_debug_mode) {
+			$redirect_args['item_name_'.$item_num] = 'DEBUG INFO (this item only added in sandbox mode';
+			$redirect_args['amount_'.$item_num] = 0;
 			$redirect_args['on0_'.$item_num] = 'NOTIFY URL';
-			$redirect_args['os0_' . $item_num] = $notify_url;
+			$redirect_args['os0_'.$item_num] = $notify_url;
 			$redirect_args['on1_'.$item_num] = 'RETURN URL';
-			$redirect_args['os1_' . $item_num] = $return_url;
+			$redirect_args['os1_'.$item_num] = $return_url;
 //			$redirect_args['option_index_' . $item_num] = 1; // <-- dunno if this is needed ?
-			$redirect_args['shipping_' . $item_num ] = '0';
-			$redirect_args['shipping2_' . $item_num ] = '0';
+			$redirect_args['shipping_'.$item_num] = '0';
+			$redirect_args['shipping2_'.$item_num] = '0';
 		}
 
 		$redirect_args['business'] = $this->_paypal_id;
@@ -209,14 +209,14 @@ 
 		$redirect_args['cmd'] = '_cart';
 		$redirect_args['upload'] = 1;
 		$redirect_args['currency_code'] = $payment->currency_code();
-		$redirect_args['rm'] = 2;//makes the user return with method=POST
-		if($this->_image_url){
+		$redirect_args['rm'] = 2; //makes the user return with method=POST
+		if ($this->_image_url) {
 			$redirect_args['image_url'] = $this->_image_url;
 		}
 		$redirect_args['no_shipping'] = $this->_shipping_details;
-		$redirect_args['bn'] = 'EventEspresso_SP';//EE will blow up if you change this
+		$redirect_args['bn'] = 'EventEspresso_SP'; //EE will blow up if you change this
 
-		$redirect_args = apply_filters( "FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this );
+		$redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this);
 
 		$payment->set_redirect_url($this->_gateway_url);
 		$payment->set_redirect_args($redirect_args);
@@ -224,7 +224,7 @@ 
 		$this->log(
 			array(
 				'message'     => sprintf(
-					__( 'PayPal payment request initiated.', 'event_espresso' )
+					__('PayPal payment request initiated.', 'event_espresso')
 				),
 				'transaction' => $transaction->model_field_array(),
 			),
@@ -244,14 +244,14 @@ 
 	 * @return \EEI_Payment updated
 	 * @throws \EE_Error, IpnException
 	 */
-	public function handle_payment_update( $update_info, $transaction ){
+	public function handle_payment_update($update_info, $transaction) {
 		// verify there's payment data that's been sent
-		if ( empty( $update_info[ 'payment_status' ] ) || empty( $update_info[ 'txn_id' ] ) ) {
+		if (empty($update_info['payment_status']) || empty($update_info['txn_id'])) {
 			// log the results
 			$this->log(
 				array(
 					'message' => sprintf(
-						__( 'PayPal IPN response is missing critical payment data. This may indicate a PDT request and require your PayPal account settings to be corrected.', 'event_espresso' )
+						__('PayPal IPN response is missing critical payment data. This may indicate a PDT request and require your PayPal account settings to be corrected.', 'event_espresso')
 					),
 					'update_info' => $update_info,
 				),
@@ -259,33 +259,33 @@ 
 			);
 			// waaaait... is this a PDT request? (see https://developer.paypal.com/docs/classic/products/payment-data-transfer/)
 			// indicated by the "tx" argument? If so, we don't need it. We'll just use the IPN data when it comes
-			if ( isset( $update_info[ 'tx' ] ) ) {
+			if (isset($update_info['tx'])) {
 				return $transaction->last_payment();
 			} else {
 				return null;
 			}
 		}
-		$payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr( $update_info[ 'txn_id' ] );
-		if ( ! $payment instanceof EEI_Payment ) {
+		$payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']);
+		if ( ! $payment instanceof EEI_Payment) {
 			$payment = $transaction->last_payment();
 		}
 		// ok, then validate the IPN. Even if we've already processed this payment,
 		// let PayPal know we don't want to hear from them anymore!
-		if ( ! $this->validate_ipn( $update_info, $payment ) ) {
+		if ( ! $this->validate_ipn($update_info, $payment)) {
 			return $payment;
 		}
         // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction,
         // registrations, ticket counts, etc)
         if (
             (
-                $update_info[ 'payment_status' ] === 'Refunded'
-                || $update_info[ 'payment_status' ] === 'Partially_Refunded'
+                $update_info['payment_status'] === 'Refunded'
+                || $update_info['payment_status'] === 'Partially_Refunded'
             )
-            && apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true )
+            && apply_filters('FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true)
         ) {
             throw new EventEspresso\core\exceptions\IpnException(
                 sprintf(
-                    esc_html__( 'Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
+                    esc_html__('Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'),
                     $update_info['payment_status']
                 ),
                 EventEspresso\core\exceptions\IpnException::UNSUPPORTED,
@@ -295,34 +295,34 @@ 
             );
         }
 		//ok, well let's process this payment then!
-		switch ( $update_info[ 'payment_status' ] ) {
+		switch ($update_info['payment_status']) {
 
 			case 'Completed' :
 				$status = $this->_pay_model->approved_status();
-				$gateway_response = esc_html__( 'The payment is approved.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment is approved.', 'event_espresso');
 				break;
 
 			case 'Pending' :
 				$status = $this->_pay_model->pending_status();
-				$gateway_response = esc_html__( 'The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso');
 				break;
 
 			case 'Denied' :
 				$status = $this->_pay_model->declined_status();
-				$gateway_response = esc_html__( 'The payment has been declined.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment has been declined.', 'event_espresso');
 				break;
 
 			case 'Expired' :
 			case 'Failed' :
 				$status = $this->_pay_model->failed_status();
-				$gateway_response = esc_html__( 'The payment failed for technical reasons or expired.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment failed for technical reasons or expired.', 'event_espresso');
 				break;
 
 			case 'Refunded' :
 			case 'Partially_Refunded' :
 				// even though it's a refund, we consider the payment as approved, it just has a negative value
 				$status = $this->_pay_model->approved_status();
-				$gateway_response = esc_html__( 'The payment has been refunded. Please update registrations accordingly.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment has been refunded. Please update registrations accordingly.', 'event_espresso');
 				break;
 
 			case 'Voided' :
@@ -330,19 +330,19 @@ 
 			case 'Canceled_Reversal' :
 			default :
 				$status = $this->_pay_model->cancelled_status();
-				$gateway_response = esc_html__( 'The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso' );
+				$gateway_response = esc_html__('The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso');
 				break;
 
 		}
 
 		//check if we've already processed this payment
-		if ( $payment instanceof EEI_Payment ) {
+		if ($payment instanceof EEI_Payment) {
 			//payment exists. if this has the exact same status and amount, don't bother updating. just return
-			if ( $payment->status() === $status && (float)$payment->amount() === (float)$update_info[ 'mc_gross' ] ) {
+			if ($payment->status() === $status && (float) $payment->amount() === (float) $update_info['mc_gross']) {
 				// DUPLICATED IPN! don't bother updating transaction
 				throw new IpnException(
 					sprintf(
-						esc_html__( 'It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso' ),
+						esc_html__('It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso'),
 						$payment->ID()
 					),
 					IpnException::DUPLICATE,
@@ -352,14 +352,14 @@ 
 				);
 			} else {
 				// new payment yippee !!!
-				$payment->set_status( $status );
-				$payment->set_amount( (float)$update_info[ 'mc_gross' ] );
-				$payment->set_gateway_response( $gateway_response );
-				$payment->set_details( $update_info );
-				$payment->set_txn_id_chq_nmbr( $update_info[ 'txn_id' ] );
+				$payment->set_status($status);
+				$payment->set_amount((float) $update_info['mc_gross']);
+				$payment->set_gateway_response($gateway_response);
+				$payment->set_details($update_info);
+				$payment->set_txn_id_chq_nmbr($update_info['txn_id']);
 				$this->log(
 					array(
-						'message'  => esc_html__( 'Updated payment either from IPN or as part of POST from PayPal', 'event_espresso' ),
+						'message'  => esc_html__('Updated payment either from IPN or as part of POST from PayPal', 'event_espresso'),
 						'url'      => $this->_process_response_url(),
 						'payment'  => $payment->model_field_array(),
 						'IPN_data' => $update_info
@@ -369,7 +369,7 @@ 
 			}
 
 		}
-		do_action( 'FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this );
+		do_action('FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this);
 		return $payment;
 	}
 
@@ -384,9 +384,9 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function validate_ipn( $update_info, $payment ) {
+	public function validate_ipn($update_info, $payment) {
 		//allow us to skip validating IPNs with PayPal (useful for testing)
-		if ( apply_filters( 'FHEE__EEG_Paypal_Standard__validate_ipn__skip', false ) ) {
+		if (apply_filters('FHEE__EEG_Paypal_Standard__validate_ipn__skip', false)) {
 			return true;
 		}
 		//...otherwise, we actually don't care what the $update_info is, we need to look
@@ -394,22 +394,22 @@ 
 		// Reading POSTed data directly from $_POST causes serialization issues with array data in the POST.
 		// Instead, read raw POST data from the input stream.
 		// @see https://gist.github.com/xcommerce-gists/3440401
-		$raw_post_data = file_get_contents( 'php://input' );
-		$raw_post_array = explode( '&', $raw_post_data );
+		$raw_post_data = file_get_contents('php://input');
+		$raw_post_array = explode('&', $raw_post_data);
 		$update_info = array();
-		foreach ( $raw_post_array as $keyval ) {
-			$keyval = explode( '=', $keyval );
-			if ( count( $keyval ) === 2 ) {
-				$update_info[ $keyval[ 0 ] ] = urldecode( $keyval[ 1 ] );
+		foreach ($raw_post_array as $keyval) {
+			$keyval = explode('=', $keyval);
+			if (count($keyval) === 2) {
+				$update_info[$keyval[0]] = urldecode($keyval[1]);
 			}
 		}
 		// read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
 		$req = 'cmd=_notify-validate';
-		$uses_get_magic_quotes = function_exists( 'get_magic_quotes_gpc' ) && get_magic_quotes_gpc() === 1
+		$uses_get_magic_quotes = function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc() === 1
 			? true
 			: false;
-		foreach ( $update_info as $key => $value ) {
-			$value = $uses_get_magic_quotes ? urlencode( stripslashes( $value ) ) : urlencode( $value );
+		foreach ($update_info as $key => $value) {
+			$value = $uses_get_magic_quotes ? urlencode(stripslashes($value)) : urlencode($value);
 			$req .= "&$key=$value";
 		}
 		// HTTP POST the complete, unaltered IPN back to PayPal
@@ -418,38 +418,38 @@ 
 			array(
 				'body' 				=> $req,
 				'sslverify' 		=> false,
-				'timeout' 		=> 60 ,
+				'timeout' 		=> 60,
 				// make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal
 				// plz see: https://github.com/websharks/s2member/issues/610
-				'user-agent' 	=> 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(),
+				'user-agent' 	=> 'Event Espresso v'.EVENT_ESPRESSO_VERSION.'; '.home_url(),
 				'httpversion' => '1.1'
 			)
 		);
 		// then check the response
 		if (
-			array_key_exists( 'body', $response )
-			&& ! is_wp_error( $response )
-			&& strcmp( $response[ 'body' ], "VERIFIED" ) === 0
+			array_key_exists('body', $response)
+			&& ! is_wp_error($response)
+			&& strcmp($response['body'], "VERIFIED") === 0
 		) {
 			return true;
 		}
 		// huh, something's wack... the IPN didn't validate. We must have replied to the IPN incorrectly,
 		// or their API must have changed: http://www.paypalobjects.com/en_US/ebook/PP_OrderManagement_IntegrationGuide/ipn.html
-		if( $response instanceof WP_Error ) {
+		if ($response instanceof WP_Error) {
 			$error_msg = sprintf(
-				esc_html__( 'WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso' ),
+				esc_html__('WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso'),
 				$response->get_error_code(),
 				$response->get_error_message(),
-				print_r( $response->get_error_data(), true )
+				print_r($response->get_error_data(), true)
 			);
-		} elseif( is_array( $response ) && isset( $response[ 'body' ] ) ) {
-			$error_msg = $response[ 'body' ];
+		} elseif (is_array($response) && isset($response['body'])) {
+			$error_msg = $response['body'];
 		} else {
-			$error_msg = print_r( $response, true );
+			$error_msg = print_r($response, true);
 		}
-		$payment->set_gateway_response( sprintf( esc_html__( "IPN Validation failed! Paypal responded with '%s'", "event_espresso" ), $error_msg ) );
-		$payment->set_details( array( 'REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response ) );
-		$payment->set_status( EEM_Payment::status_id_failed );
+		$payment->set_gateway_response(sprintf(esc_html__("IPN Validation failed! Paypal responded with '%s'", "event_espresso"), $error_msg));
+		$payment->set_details(array('REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response));
+		$payment->set_status(EEM_Payment::status_id_failed);
 		// log the results
 		$this->log(
 			array(
@@ -469,9 +469,9 @@ 
 	 * @return string
 	 */
 	protected function _process_response_url() {
-		if ( isset( $_SERVER[ 'HTTP_HOST' ], $_SERVER[ 'REQUEST_URI' ] ) ) {
+		if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) {
 			$url = is_ssl() ? 'https://' : 'http://';
-			$url .= EEH_URL::filter_input_server_url( 'HTTP_HOST' );
+			$url .= EEH_URL::filter_input_server_url('HTTP_HOST');
 			$url .= EEH_URL::filter_input_server_url();
 		} else {
 			$url = 'unknown';
@@ -488,12 +488,12 @@ 
 	 * @param EEI_Payment $payment
 	 * @throws \EE_Error
 	 */
-	public function update_txn_based_on_payment( $payment ) {
+	public function update_txn_based_on_payment($payment) {
 		$update_info = $payment->details();
 		/** @var EE_Transaction $transaction */
 		$transaction = $payment->transaction();
-		$payment_was_itemized = $payment->get_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, true, false );
-		if( ! $transaction ){
+		$payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false);
+		if ( ! $transaction) {
 			$this->log(
 				esc_html__(
 					'Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly',
@@ -503,10 +503,10 @@ 
 			);
 			return;
 		}
-		if(
-			! is_array( $update_info )
-			|| ! isset( $update_info[ 'mc_shipping' ] )
-			|| ! isset( $update_info[ 'tax' ] )
+		if (
+			! is_array($update_info)
+			|| ! isset($update_info['mc_shipping'])
+			|| ! isset($update_info['tax'])
 		) {
 			$this->log(
 				array(
@@ -521,7 +521,7 @@ 
 			);
 			return;
 		}
-		if( $payment->status() !== $this->_pay_model->approved_status() ) {
+		if ($payment->status() !== $this->_pay_model->approved_status()) {
 			$this->log(
 				array(
 					'message' => esc_html__(
@@ -540,44 +540,44 @@ 
 		$transaction_total_line_item = $transaction->total_line_item();
 
 		//might paypal have changed the taxes?
-		if( $this->_paypal_taxes && $payment_was_itemized ) {
+		if ($this->_paypal_taxes && $payment_was_itemized) {
             // note that we're doing this BEFORE adding shipping;
 			// we actually want PayPal's shipping to remain non-taxable
-            $this->_line_item->set_line_items_taxable( $transaction_total_line_item, true, 'paypal_shipping' );
+            $this->_line_item->set_line_items_taxable($transaction_total_line_item, true, 'paypal_shipping');
             $this->_line_item->set_total_tax_to(
 	            $transaction_total_line_item,
-                (float)$update_info['tax'],
-                esc_html__( 'Taxes', 'event_espresso' ),
-                esc_html__( 'Calculated by Paypal', 'event_espresso' ),
+                (float) $update_info['tax'],
+                esc_html__('Taxes', 'event_espresso'),
+                esc_html__('Calculated by Paypal', 'event_espresso'),
                 'paypal_tax'
             );
             $grand_total_needs_resaving = TRUE;
 		}
 
-		$shipping_amount = (float)$update_info[ 'mc_shipping' ];
+		$shipping_amount = (float) $update_info['mc_shipping'];
 		//might paypal have added shipping?
-		if( $this->_paypal_shipping && $shipping_amount && $payment_was_itemized ){
+		if ($this->_paypal_shipping && $shipping_amount && $payment_was_itemized) {
 			$this->_line_item->add_unrelated_item(
 				$transaction_total_line_item,
-				sprintf( esc_html__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID() ),
+				sprintf(esc_html__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID()),
 				$shipping_amount,
 				esc_html__('Shipping charges calculated by Paypal', 'event_espresso'),
 				1,
 				false,
-				'paypal_shipping_' . $transaction->ID()
+				'paypal_shipping_'.$transaction->ID()
 			);
 			$grand_total_needs_resaving = true;
 		}
 
-		if( $grand_total_needs_resaving ){
-			$transaction_total_line_item->save_this_and_descendants_to_txn( $transaction->ID() );
+		if ($grand_total_needs_resaving) {
+			$transaction_total_line_item->save_this_and_descendants_to_txn($transaction->ID());
 			/** @var EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
-			$registration_processor->update_registration_final_prices( $transaction );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
+			$registration_processor->update_registration_final_prices($transaction);
 		}
 		$this->log(
 			array(
-				'message'                     => esc_html__( 'Updated transaction related to payment', 'event_espresso' ),
+				'message'                     => esc_html__('Updated transaction related to payment', 'event_espresso'),
 				'url'                         => $this->_process_response_url(),
 				'transaction (updated)'       => $transaction->model_field_array(),
 				'payment (updated)'           => $payment->model_field_array(),

core/EE_Payment_Processor.core.php

Indentation +35 added lines, -37 removed lines

@@ -13,9 +13,9 @@ 
  */
 class EE_Payment_Processor extends EE_Processor_Base {
 	/**
-     * 	@var EE_Payment_Processor $_instance
+	 * 	@var EE_Payment_Processor $_instance
 	 * 	@access 	private
-     */
+	 */
 	private static $_instance;
 
 
@@ -50,7 +50,6 @@ 
 	/**
 	 * Using the selected gateway, processes the payment for that transaction, and updates the transaction appropriately.
 	 * Saves the payment that is generated
-
 	 *
 *@param EE_Payment_Method    $payment_method
 	 * @param EE_Transaction       $transaction
@@ -130,7 +129,6 @@ 
 
 
 	/**
-
 	 * @param EE_Transaction|int $transaction
 	 * @param EE_Payment_Method $payment_method
 	 * @throws EE_Error
@@ -221,22 +219,22 @@ 
 				/** @type EE_Payment_Method $payment_method */
 				$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method);
 				if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
-				    try {
-                        $payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction);
-                        $log->set_object($payment);
-                    } catch( EventEspresso\core\exceptions\IpnException $e ) {
-                        EEM_Change_Log::instance()->log(
-                            EEM_Change_Log::type_gateway,
-                            array(
-                                'message' => 'IPN Exception: ' . $e->getMessage(),
-                                'current_url' => EEH_URL::current_url(),
-                                'payment' => $e->getPaymentProperties(),
-                                'IPN_data' => $e->getIpnData()
-                            ),
-                            $obj_for_log
-                        );
-                        return $e->getPayment();
-                    }
+					try {
+						$payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction);
+						$log->set_object($payment);
+					} catch( EventEspresso\core\exceptions\IpnException $e ) {
+						EEM_Change_Log::instance()->log(
+							EEM_Change_Log::type_gateway,
+							array(
+								'message' => 'IPN Exception: ' . $e->getMessage(),
+								'current_url' => EEH_URL::current_url(),
+								'payment' => $e->getPaymentProperties(),
+								'IPN_data' => $e->getIpnData()
+							),
+							$obj_for_log
+						);
+						return $e->getPayment();
+					}
 				} else {
 					// not a payment
 					EE_Error::add_error(
@@ -262,18 +260,18 @@ 
 						);
 						break;
 					} catch( EventEspresso\core\exceptions\IpnException $e ) {
-                        EEM_Change_Log::instance()->log(
-                            EEM_Change_Log::type_gateway,
-                            array(
-                                'message' => 'IPN Exception: ' . $e->getMessage(),
-                                'current_url' => EEH_URL::current_url(),
-                                'payment' => $e->getPaymentProperties(),
-                                'IPN_data' => $e->getIpnData()
-                            ),
-                            $obj_for_log
-                        );
-                        return $e->getPayment();
-                    } catch( EE_Error $e ) {
+						EEM_Change_Log::instance()->log(
+							EEM_Change_Log::type_gateway,
+							array(
+								'message' => 'IPN Exception: ' . $e->getMessage(),
+								'current_url' => EEH_URL::current_url(),
+								'payment' => $e->getPaymentProperties(),
+								'IPN_data' => $e->getIpnData()
+							),
+							$obj_for_log
+						);
+						return $e->getPayment();
+					} catch( EE_Error $e ) {
 						//that's fine- it apparently couldn't handle the IPN
 					}
 				}
@@ -709,12 +707,12 @@ 
 	}
 	
 	/**
- 	 * Force posts to PayPal to use TLS v1.2. See:
- 	 * https://core.trac.wordpress.org/ticket/36320
- 	 * https://core.trac.wordpress.org/ticket/34924#comment:15
- 	 * https://www.paypal-knowledge.com/infocenter/index?page=content&widgetview=true&id=FAQ1914&viewlocale=en_US
+	 * Force posts to PayPal to use TLS v1.2. See:
+	 * https://core.trac.wordpress.org/ticket/36320
+	 * https://core.trac.wordpress.org/ticket/34924#comment:15
+	 * https://www.paypal-knowledge.com/infocenter/index?page=content&widgetview=true&id=FAQ1914&viewlocale=en_US
 	 * This will affect paypal standard, pro, express, and payflow.
- 	 */
+	 */
  	public static function _curl_requests_to_paypal_use_tls( $handle, $r, $url ) {
  		if ( strstr( $url, 'https://' ) && strstr( $url, '.paypal.com' ) ) {
 			//Use the value of the constant CURL_SSLVERSION_TLSv1 = 1

Spacing +135 added lines, -135 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 /**
  *
  * EE_Payment_Processor
@@ -27,7 +27,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Payment_Processor ) {
+		if ( ! self::$_instance instanceof EE_Payment_Processor) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -41,8 +41,8 @@ 
 	 *@access private
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Payment_Processor__construct' );
-		add_action( 'http_api_curl', array( $this, '_curl_requests_to_paypal_use_tls' ), 10, 3 );
+		do_action('AHEE__EE_Payment_Processor__construct');
+		add_action('http_api_curl', array($this, '_curl_requests_to_paypal_use_tls'), 10, 3);
 	}
 
 
@@ -81,7 +81,7 @@ 
 		$update_txn = true,
 		$cancel_url = ''
 	) {
-		if( (float)$amount < 0 ) {
+		if ((float) $amount < 0) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -94,33 +94,33 @@ 
 			);
 		}
 		// verify payment method
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj( $payment_method, TRUE );
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, TRUE);
 		// verify transaction
-		EEM_Transaction::instance()->ensure_is_obj( $transaction );
-		$transaction->set_payment_method_ID( $payment_method->ID() );
+		EEM_Transaction::instance()->ensure_is_obj($transaction);
+		$transaction->set_payment_method_ID($payment_method->ID());
 		// verify payment method type
-		if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
 			$payment = $payment_method->type_obj()->process_payment(
 				$transaction,
-				min( $amount, $transaction->remaining() ),//make sure we don't overcharge
+				min($amount, $transaction->remaining()), //make sure we don't overcharge
 				$billing_form,
 				$return_url,
-				add_query_arg( array( 'ee_cancel_payment' => true ), $cancel_url ),
+				add_query_arg(array('ee_cancel_payment' => true), $cancel_url),
 				$method,
 				$by_admin
 			);
 			// check if payment method uses an off-site gateway
-			if ( $payment_method->type_obj()->payment_occurs() !== EE_PMT_Base::offsite ) {
+			if ($payment_method->type_obj()->payment_occurs() !== EE_PMT_Base::offsite) {
 				// don't process payments for off-site gateways yet because no payment has occurred yet
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			}
 			return $payment;
 		} else {
 			EE_Error::add_error(
 				sprintf(
-					__( 'A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+					__('A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				), __FILE__, __FUNCTION__, __LINE__
 			);
 			return NULL;
@@ -136,11 +136,11 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function get_ipn_url_for_payment_method( $transaction, $payment_method ){
+	public function get_ipn_url_for_payment_method($transaction, $payment_method) {
 		/** @type \EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg instanceof EE_Registration ){
+		if ( ! $primary_reg instanceof EE_Registration) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -151,7 +151,7 @@ 
 				)
 			);
 		}
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method,true);
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, true);
 		$url = add_query_arg(
 			array(
 				'e_reg_url_link'=>$primary_reg->reg_url_link(),
@@ -188,47 +188,47 @@ 
 		$update_txn = true,
 		$separate_IPN_request = true
 	) {
-		EE_Registry::instance()->load_model( 'Change_Log' );
-		$_req_data = $this->_remove_unusable_characters_from_array( (array)$_req_data );
-		EE_Processor_Base::set_IPN( $separate_IPN_request );
+		EE_Registry::instance()->load_model('Change_Log');
+		$_req_data = $this->_remove_unusable_characters_from_array((array) $_req_data);
+		EE_Processor_Base::set_IPN($separate_IPN_request);
 		$obj_for_log = null;
-		if( $transaction instanceof EE_Transaction ){
+		if ($transaction instanceof EE_Transaction) {
 			$obj_for_log = $transaction;
-			if( $payment_method instanceof EE_Payment_Method ) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				$obj_for_log = EEM_Payment::instance()->get_one(
 					array(
-						array( 'TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID() ),
-						'order_by' => array( 'PAY_timestamp' => 'desc' )
+						array('TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID()),
+						'order_by' => array('PAY_timestamp' => 'desc')
 					)
 				);
 			}
-		} else if( $payment_method instanceof EE_Payment ) {
+		} else if ($payment_method instanceof EE_Payment) {
 			$obj_for_log = $payment_method;
 		}
 		$log = EEM_Change_Log::instance()->log(
 			EEM_Change_Log::type_gateway,
-			array( 'IPN data received' => $_req_data ),
+			array('IPN data received' => $_req_data),
 			$obj_for_log
 		);
-		try{
+		try {
 			/**
 			 * @var EE_Payment $payment
 			 */
 			$payment = NULL;
-			if($transaction && $payment_method){
+			if ($transaction && $payment_method) {
 				/** @type EE_Transaction $transaction */
 				$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 				/** @type EE_Payment_Method $payment_method */
 				$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method);
-				if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
+				if ($payment_method->type_obj() instanceof EE_PMT_Base) {
 				    try {
                         $payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction);
                         $log->set_object($payment);
-                    } catch( EventEspresso\core\exceptions\IpnException $e ) {
+                    } catch (EventEspresso\core\exceptions\IpnException $e) {
                         EEM_Change_Log::instance()->log(
                             EEM_Change_Log::type_gateway,
                             array(
-                                'message' => 'IPN Exception: ' . $e->getMessage(),
+                                'message' => 'IPN Exception: '.$e->getMessage(),
                                 'current_url' => EEH_URL::current_url(),
                                 'payment' => $e->getPaymentProperties(),
                                 'IPN_data' => $e->getIpnData()
@@ -241,31 +241,31 @@ 
 					// not a payment
 					EE_Error::add_error(
 						sprintf(
-							__( 'A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso' ),
+							__('A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso'),
 							'<br/>',
-							EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+							EE_Registry::instance()->CFG->organization->get_pretty('email')
 						),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
-			}else{
+			} else {
 				//that's actually pretty ok. The IPN just wasn't able
 				//to identify which transaction or payment method this was for
 				// give all active payment methods a chance to claim it
 				$active_payment_methods = EEM_Payment_Method::instance()->get_all_active();
-				foreach( $active_payment_methods as $active_payment_method ){
-					try{
-						$payment = $active_payment_method->type_obj()->handle_unclaimed_ipn( $_req_data );
+				foreach ($active_payment_methods as $active_payment_method) {
+					try {
+						$payment = $active_payment_method->type_obj()->handle_unclaimed_ipn($_req_data);
 						$payment_method = $active_payment_method;
 						EEM_Change_Log::instance()->log(
 							EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment
 						);
 						break;
-					} catch( EventEspresso\core\exceptions\IpnException $e ) {
+					} catch (EventEspresso\core\exceptions\IpnException $e) {
                         EEM_Change_Log::instance()->log(
                             EEM_Change_Log::type_gateway,
                             array(
-                                'message' => 'IPN Exception: ' . $e->getMessage(),
+                                'message' => 'IPN Exception: '.$e->getMessage(),
                                 'current_url' => EEH_URL::current_url(),
                                 'payment' => $e->getPaymentProperties(),
                                 'IPN_data' => $e->getIpnData()
@@ -273,33 +273,33 @@ 
                             $obj_for_log
                         );
                         return $e->getPayment();
-                    } catch( EE_Error $e ) {
+                    } catch (EE_Error $e) {
 						//that's fine- it apparently couldn't handle the IPN
 					}
 				}
 
 			}
 // 			EEM_Payment_Log::instance()->log("got to 7",$transaction,$payment_method);
-			if( $payment instanceof EE_Payment){
+			if ($payment instanceof EE_Payment) {
 				$payment->save();
 				//  update the TXN
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request );
-			}else{
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn, $separate_IPN_request);
+			} else {
 				//we couldn't find the payment for this IPN... let's try and log at least SOMETHING
-				if($payment_method){
+				if ($payment_method) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method);
-				}elseif($transaction){
+				}elseif ($transaction) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction);
 				}
 			}
 			return $payment;
 
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			do_action(
 				'AHEE__log', __FILE__, __FUNCTION__, sprintf(
-					__( 'Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso' ),
-					print_r( $transaction, TRUE ),
-					print_r( $_req_data, TRUE ),
+					__('Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso'),
+					print_r($transaction, TRUE),
+					print_r($_req_data, TRUE),
 					$e->getMessage()
 				)
 			);
@@ -314,10 +314,10 @@ 
 	 * @param  array $request_data
 	 * @return array
 	 */
-	protected function _remove_unusable_characters_from_array( array $request_data ) {
+	protected function _remove_unusable_characters_from_array(array $request_data) {
 		$return_data = array();
-		foreach( $request_data as $key => $value ) {
-			$return_data[ $this->_remove_unusable_characters( $key ) ] = $this->_remove_unusable_characters( $value );
+		foreach ($request_data as $key => $value) {
+			$return_data[$this->_remove_unusable_characters($key)] = $this->_remove_unusable_characters($value);
 		}
 		return $return_data;
 	}
@@ -329,8 +329,8 @@ 
 	 * @param string $request_data
 	 * @return string
 	 */
-	protected function _remove_unusable_characters( $request_data ) {
-		return preg_replace( '/[^[:print:]]/', '', $request_data );
+	protected function _remove_unusable_characters($request_data) {
+		return preg_replace('/[^[:print:]]/', '', $request_data);
 	}
 
 
@@ -352,13 +352,13 @@ 
 	 * @deprecated 4.6.24 method is no longer used. Instead it is up to client code, like SPCO,
 	 *                                      to call handle_ipn() for offsite gateways that don't receive separate IPNs
 	 */
-	public function finalize_payment_for( $transaction, $update_txn = TRUE ){
+	public function finalize_payment_for($transaction, $update_txn = TRUE) {
 		/** @var $transaction EE_Transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$last_payment_method = $transaction->payment_method();
-		if ( $last_payment_method instanceof EE_Payment_Method ) {
-			$payment = $last_payment_method->type_obj()->finalize_payment_for( $transaction );
-			$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+		if ($last_payment_method instanceof EE_Payment_Method) {
+			$payment = $last_payment_method->type_obj()->finalize_payment_for($transaction);
+			$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			return $payment;
 		} else {
 			return NULL;
@@ -381,9 +381,9 @@ 
 		EE_Payment $payment_to_refund,
 		$refund_info = array()
 	) {
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds() ) {
-			$payment_method->type_obj()->process_refund( $payment_to_refund, $refund_info );
-			$this->update_txn_based_on_payment( $payment_to_refund->transaction(), $payment_to_refund );
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds()) {
+			$payment_method->type_obj()->process_refund($payment_to_refund, $refund_info);
+			$this->update_txn_based_on_payment($payment_to_refund->transaction(), $payment_to_refund);
 		}
 		return $payment_to_refund;
 	}
@@ -424,12 +424,12 @@ 
 	 *                        TXN is locked before updating
 	 * @throws \EE_Error
 	 */
-	public function update_txn_based_on_payment( $transaction, $payment, $update_txn = true, $IPN = false ){
+	public function update_txn_based_on_payment($transaction, $payment, $update_txn = true, $IPN = false) {
 		$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__not_successful';
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		// can we freely update the TXN at this moment?
-		if ( $IPN && $transaction->is_locked() ) {
+		if ($IPN && $transaction->is_locked()) {
 			// don't update the transaction at this exact moment
 			// because the TXN is active in another request
 			EE_Cron_Tasks::schedule_update_transaction_with_payment(
@@ -439,38 +439,38 @@ 
 			);
 		} else {
 			// verify payment and that it has been saved
-			if ( $payment instanceof EE_Payment && $payment->ID() ) {
-				if(
+			if ($payment instanceof EE_Payment && $payment->ID()) {
+				if (
 					$payment->payment_method() instanceof EE_Payment_Method
 					&& $payment->payment_method()->type_obj() instanceof EE_PMT_Base
-				){
-					$payment->payment_method()->type_obj()->update_txn_based_on_payment( $payment );
+				) {
+					$payment->payment_method()->type_obj()->update_txn_based_on_payment($payment);
 					// update TXN registrations with payment info
-					$this->process_registration_payments( $transaction, $payment );
+					$this->process_registration_payments($transaction, $payment);
 				}
 				$do_action = $payment->just_approved()
 					? 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__successful'
 					: $do_action;
 			} else {
 				// send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 				$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__no_payment_made';
 			}
-			if ( $payment->status() !== EEM_Payment::status_id_failed ) {
+			if ($payment->status() !== EEM_Payment::status_id_failed) {
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// set new value for total paid
-				$transaction_payments->calculate_total_payments_and_update_status( $transaction );
+				$transaction_payments->calculate_total_payments_and_update_status($transaction);
 				// call EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment() ???
-				if ( $update_txn ) {
-					$this->_post_payment_processing( $transaction, $payment, $IPN );
+				if ($update_txn) {
+					$this->_post_payment_processing($transaction, $payment, $IPN);
 				}
 			}
 			// granular hook for others to use.
-			do_action( $do_action, $transaction, $payment );
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action' );
+			do_action($do_action, $transaction, $payment);
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action');
 			//global hook for others to use.
-			do_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment );
+			do_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment);
 		}
 	}
 
@@ -490,25 +490,25 @@ 
 		$registrations = array()
 	) {
 		// only process if payment was successful
-		if ( $payment->status() !== EEM_Payment::status_id_approved ) {
+		if ($payment->status() !== EEM_Payment::status_id_approved) {
 			return;
 		}
 		//EEM_Registration::instance()->show_next_x_db_queries();
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// find registrations with monies owing that can receive a payment
 			$registrations = $transaction->registrations(
 				array(
 					array(
 						// only these reg statuses can receive payments
-						'STS_ID'           => array( 'IN', EEM_Registration::reg_statuses_that_allow_payment() ),
-						'REG_final_price'  => array( '!=', 0 ),
-						'REG_final_price*' => array( '!=', 'REG_paid', true ),
+						'STS_ID'           => array('IN', EEM_Registration::reg_statuses_that_allow_payment()),
+						'REG_final_price'  => array('!=', 0),
+						'REG_final_price*' => array('!=', 'REG_paid', true),
 					)
 				)
 			);
 		}
 		// still nothing ??!??
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			return;
 		}
 		// todo: break out the following logic into a separate strategy class
@@ -520,28 +520,28 @@ 
 
 		$refund = $payment->is_a_refund();
 		// how much is available to apply to registrations?
-		$available_payment_amount = abs( $payment->amount() );
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		$available_payment_amount = abs($payment->amount());
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration) {
 				// nothing left?
-				if ( $available_payment_amount <= 0 ) {
+				if ($available_payment_amount <= 0) {
 					break;
 				}
-				if ( $refund ) {
-					$available_payment_amount = $this->process_registration_refund( $registration, $payment, $available_payment_amount );
+				if ($refund) {
+					$available_payment_amount = $this->process_registration_refund($registration, $payment, $available_payment_amount);
 				} else {
-					$available_payment_amount = $this->process_registration_payment( $registration, $payment, $available_payment_amount );
+					$available_payment_amount = $this->process_registration_payment($registration, $payment, $available_payment_amount);
 				}
 			}
 		}
-		if ( $available_payment_amount > 0 && apply_filters( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false ) ) {
+		if ($available_payment_amount > 0 && apply_filters('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false)) {
 			EE_Error::add_attention(
 				sprintf(
-					__( 'A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso' ),
-					EEH_Template::format_currency( $available_payment_amount ),
-					implode( ', ',  array_keys( $registrations ) ),
+					__('A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso'),
+					EEH_Template::format_currency($available_payment_amount),
+					implode(', ', array_keys($registrations)),
 					'<br/>',
-					EEH_Template::format_currency( $payment->amount() )
+					EEH_Template::format_currency($payment->amount())
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -559,17 +559,17 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public function process_registration_payment( EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00 ) {
+	public function process_registration_payment(EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00) {
 		$owing = $registration->final_price() - $registration->paid();
-		if ( $owing > 0 ) {
+		if ($owing > 0) {
 			// don't allow payment amount to exceed the available payment amount, OR the amount owing
-			$payment_amount = min( $available_payment_amount, $owing );
+			$payment_amount = min($available_payment_amount, $owing);
 			// update $available_payment_amount
 			$available_payment_amount -= $payment_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() + $payment_amount );
+			$registration->set_paid($registration->paid() + $payment_amount);
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $payment_amount );
+			$this->_apply_registration_payment($registration, $payment, $payment_amount);
 		}
 		return $available_payment_amount;
 	}
@@ -585,19 +585,19 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _apply_registration_payment( EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00 ) {
+	protected function _apply_registration_payment(EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00) {
 		// find any existing reg payment records for this registration and payment
 		$existing_reg_payment = EEM_Registration_Payment::instance()->get_one(
-			array( array( 'REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID() ) )
+			array(array('REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID()))
 		);
 		// if existing registration payment exists
-		if ( $existing_reg_payment instanceof EE_Registration_Payment ) {
+		if ($existing_reg_payment instanceof EE_Registration_Payment) {
 			// then update that record
-			$existing_reg_payment->set_amount( $payment_amount );
+			$existing_reg_payment->set_amount($payment_amount);
 			$existing_reg_payment->save();
 		} else {
 			// or add new relation between registration and payment and set amount
-			$registration->_add_relation_to( $payment, 'Payment', array( 'RPY_amount' => $payment_amount ) );
+			$registration->_add_relation_to($payment, 'Payment', array('RPY_amount' => $payment_amount));
 			// make it stick
 			$registration->save();
 		}
@@ -614,21 +614,21 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public function process_registration_refund( EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00 ) {
+	public function process_registration_refund(EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00) {
 		//EEH_Debug_Tools::printr( $payment->amount(), '$payment->amount()', __FILE__, __LINE__ );
-		if ( $registration->paid() > 0 ) {
+		if ($registration->paid() > 0) {
 			// ensure $available_refund_amount is NOT negative
-			$available_refund_amount = (float)abs( $available_refund_amount );
+			$available_refund_amount = (float) abs($available_refund_amount);
 			// don't allow refund amount to exceed the available payment amount, OR the amount paid
-			$refund_amount = min( $available_refund_amount, (float)$registration->paid() );
+			$refund_amount = min($available_refund_amount, (float) $registration->paid());
 			// update $available_payment_amount
 			$available_refund_amount -= $refund_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() - $refund_amount );
+			$registration->set_paid($registration->paid() - $refund_amount);
 			// convert payment amount back to a negative value for storage in the db
-			$refund_amount = (float)abs( $refund_amount ) * -1;
+			$refund_amount = (float) abs($refund_amount) * -1;
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $refund_amount );
+			$this->_apply_registration_payment($registration, $payment, $refund_amount);
 		}
 		return $available_refund_amount;
 	}
@@ -647,53 +647,53 @@ 
 	 * @param bool           $IPN
 	 * @throws \EE_Error
 	 */
-	protected function _post_payment_processing( EE_Transaction $transaction, EE_Payment $payment, $IPN = false ) {
+	protected function _post_payment_processing(EE_Transaction $transaction, EE_Payment $payment, $IPN = false) {
 
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// is the Payment Options Reg Step completed ?
-		$payment_options_step_completed = $transaction->reg_step_completed( 'payment_options' );
+		$payment_options_step_completed = $transaction->reg_step_completed('payment_options');
 		// if the Payment Options Reg Step is completed...
 		$revisit = $payment_options_step_completed === true ? true : false;
 		// then this is kinda sorta a revisit with regards to payments at least
-		$transaction_processor->set_revisit( $revisit );
+		$transaction_processor->set_revisit($revisit);
 		// if this is an IPN, let's consider the Payment Options Reg Step completed if not already
 		if (
 			$IPN &&
 			$payment_options_step_completed !== true &&
-			( $payment->is_approved() || $payment->is_pending() )
+			($payment->is_approved() || $payment->is_pending())
 		) {
 			$payment_options_step_completed = $transaction->set_reg_step_completed(
 				'payment_options'
 			);
 		}
 		// maybe update status, but don't save transaction just yet
-		$transaction->update_status_based_on_total_paid( false );
+		$transaction->update_status_based_on_total_paid(false);
 		// check if 'finalize_registration' step has been completed...
-		$finalized = $transaction->reg_step_completed( 'finalize_registration' );
+		$finalized = $transaction->reg_step_completed('finalize_registration');
 		//  if this is an IPN and the final step has not been initiated
-		if ( $IPN && $payment_options_step_completed && $finalized === false ) {
+		if ($IPN && $payment_options_step_completed && $finalized === false) {
 			// and if it hasn't already been set as being started...
-			$finalized = $transaction->set_reg_step_initiated( 'finalize_registration' );
+			$finalized = $transaction->set_reg_step_initiated('finalize_registration');
 		}
 		$transaction->save();
 		// because the above will return false if the final step was not fully completed, we need to check again...
-		if ( $IPN && $finalized !== false ) {
+		if ($IPN && $finalized !== false) {
 			// and if we are all good to go, then send out notifications
-			add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+			add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 			//ok, now process the transaction according to the payment
-			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $transaction, $payment );
+			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($transaction, $payment);
 		}
 		// DEBUG LOG
 		$payment_method = $payment->payment_method();
-		if ( $payment_method instanceof EE_Payment_Method ) {
+		if ($payment_method instanceof EE_Payment_Method) {
 			$payment_method_type_obj = $payment_method->type_obj();
-			if ( $payment_method_type_obj instanceof EE_PMT_Base ) {
+			if ($payment_method_type_obj instanceof EE_PMT_Base) {
 				$gateway = $payment_method_type_obj->get_gateway();
-				if ( $gateway instanceof EE_Gateway ){
+				if ($gateway instanceof EE_Gateway) {
 					$gateway->log(
 						array(
-							'message'               => __( 'Post Payment Transaction Details', 'event_espresso' ),
+							'message'               => __('Post Payment Transaction Details', 'event_espresso'),
 							'transaction'           => $transaction->model_field_array(),
 							'finalized'             => $finalized,
 							'IPN'                   => $IPN,
@@ -715,11 +715,11 @@ 
  	 * https://www.paypal-knowledge.com/infocenter/index?page=content&widgetview=true&id=FAQ1914&viewlocale=en_US
 	 * This will affect paypal standard, pro, express, and payflow.
  	 */
- 	public static function _curl_requests_to_paypal_use_tls( $handle, $r, $url ) {
- 		if ( strstr( $url, 'https://' ) && strstr( $url, '.paypal.com' ) ) {
+ 	public static function _curl_requests_to_paypal_use_tls($handle, $r, $url) {
+ 		if (strstr($url, 'https://') && strstr($url, '.paypal.com')) {
 			//Use the value of the constant CURL_SSLVERSION_TLSv1 = 1
 			//instead of the constant because it might not be defined
- 			curl_setopt( $handle, CURLOPT_SSLVERSION, 1 );
+ 			curl_setopt($handle, CURLOPT_SSLVERSION, 1);
  		}
  	}
  }

core/exceptions/IpnException.php

Indentation +51 added lines, -51 removed lines

@@ -2,7 +2,7 @@ 
 namespace EventEspresso\core\exceptions;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -21,71 +21,71 @@ 
 class IpnException extends \LogicException
 {
 
-    const DUPLICATE          = 1;
+	const DUPLICATE          = 1;
 
-    const UNABLE_TO_VALIDATE = 2;
+	const UNABLE_TO_VALIDATE = 2;
 
-    const UNSUPPORTED        = 3;
+	const UNSUPPORTED        = 3;
 
-    /**
-     * @var \EE_Payment
-     */
-    protected $payment;
+	/**
+	 * @var \EE_Payment
+	 */
+	protected $payment;
 
-    /**
-     * @var mixed IPN data, usually an array or object
-     */
-    protected $ipn_data;
+	/**
+	 * @var mixed IPN data, usually an array or object
+	 */
+	protected $ipn_data;
 
 
 
-    public function __construct(
-        $message,
-        $code = 0,
-        \Exception $previous = null,
-        \EE_Payment $payment = null,
-        $ipn_data = array()
-    ) {
-        parent::__construct($message, $code, $previous);
-        $this->payment = $payment;
-        $this->ipn_data = $ipn_data;
-    }
+	public function __construct(
+		$message,
+		$code = 0,
+		\Exception $previous = null,
+		\EE_Payment $payment = null,
+		$ipn_data = array()
+	) {
+		parent::__construct($message, $code, $previous);
+		$this->payment = $payment;
+		$this->ipn_data = $ipn_data;
+	}
 
 
 
-    /**
-     * Gets the payment associated with this IPN, if known
-     *
-     * @return \EE_Payment
-     */
-    public function getPayment()
-    {
-        return $this->payment;
-    }
+	/**
+	 * Gets the payment associated with this IPN, if known
+	 *
+	 * @return \EE_Payment
+	 */
+	public function getPayment()
+	{
+		return $this->payment;
+	}
 
 
 
-    /**
-     * Returns the payment's properties as an array (even if there is no payment, in which case it's an empty array)
-     *
-     * @return array
-     * @throws \EE_Error
-     */
-    public function getPaymentProperties()
-    {
-        return $this->getPayment() instanceof \EE_Payment ? $this->getPayment()->model_field_array() : array();
-    }
+	/**
+	 * Returns the payment's properties as an array (even if there is no payment, in which case it's an empty array)
+	 *
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function getPaymentProperties()
+	{
+		return $this->getPayment() instanceof \EE_Payment ? $this->getPayment()->model_field_array() : array();
+	}
 
 
 
-    /**
-     * Returns an array, object, or string, however, the IPN data was received
-     *
-     * @return mixed
-     */
-    public function getIpnData()
-    {
-        return $this->ipn_data;
-    }
+	/**
+	 * Returns an array, object, or string, however, the IPN data was received
+	 *
+	 * @return mixed
+	 */
+	public function getIpnData()
+	{
+		return $this->ipn_data;
+	}
 
 }
\ No newline at end of file

core/helpers/EEH_URL.helper.php

Spacing +59 added lines, -59 removed lines

@@ -9,7 +9,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEH_URL{
+class EEH_URL {
 
 	/**
 	 * _add_query_arg
@@ -21,30 +21,30 @@ 
 	 * @param bool  $exclude_nonce  If true then the nonce will be excluded from the generated url.
 	 * @return string
 	 */
-	public static function add_query_args_and_nonce( $args = array(), $url = '', $exclude_nonce = false ) {
-		if ( empty( $url ) ) {
-			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso' );
-			$dev_msg = $user_msg . "\n" . sprintf(
-					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso' ),
+	public static function add_query_args_and_nonce($args = array(), $url = '', $exclude_nonce = false) {
+		if (empty($url)) {
+			$user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso');
+			$dev_msg = $user_msg."\n".sprintf(
+					__('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso'),
 					__CLASS__
 				);
-			EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 		// check that an action exists and add nonce
-		if ( ! $exclude_nonce ) {
-			if ( isset( $args['action'] ) && ! empty( $args['action'] ) ) {
-				$args = array_merge( $args, array( $args['action'] . '_nonce' => wp_create_nonce( $args['action'] . '_nonce' ) ) );
+		if ( ! $exclude_nonce) {
+			if (isset($args['action']) && ! empty($args['action'])) {
+				$args = array_merge($args, array($args['action'].'_nonce' => wp_create_nonce($args['action'].'_nonce')));
 			} else {
-				$args = array_merge( $args, array( 'action' => 'default', 'default_nonce' => wp_create_nonce( 'default_nonce' ) ) );
+				$args = array_merge($args, array('action' => 'default', 'default_nonce' => wp_create_nonce('default_nonce')));
 			}
 		}
 
 		//finally, let's always add a return address (if present) :)
-		$args = ! empty( $_REQUEST['action'] ) && ! isset( $_REQUEST[ 'return' ] )
-			? array_merge( $args, array( 'return' => $_REQUEST['action'] ) )
+		$args = ! empty($_REQUEST['action']) && ! isset($_REQUEST['return'])
+			? array_merge($args, array('return' => $_REQUEST['action']))
 			: $args;
 
-		return add_query_arg( $args, $url );
+		return add_query_arg($args, $url);
 
 	}
 
@@ -57,17 +57,17 @@ 
 	 * @param boolean $sslverify whether we care if the SSL certificate for the requested site is setup properly
 	 * @return boolean
 	 */
-	public static function remote_file_exists( $url, $args = array() ){
-		$results = wp_remote_request($url,array_merge( array(
+	public static function remote_file_exists($url, $args = array()) {
+		$results = wp_remote_request($url, array_merge(array(
 			'method'=>'GET',
 			'redirection'=>1
-		), $args ) );
-		if( ! $results instanceof WP_Error &&
+		), $args));
+		if ( ! $results instanceof WP_Error &&
 				isset($results['response']) &&
 				isset($results['response']['code']) &&
-				$results['response']['code'] == '200'){
+				$results['response']['code'] == '200') {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -83,29 +83,29 @@ 
 	 * @param bool   $base_url_only - TRUE will only return the scheme and host with no other parameters
 	 * @return string
 	 */
-	public static function refactor_url( $url = '', $remove_query = TRUE, $base_url_only = FALSE ) {
+	public static function refactor_url($url = '', $remove_query = TRUE, $base_url_only = FALSE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// HTTP or HTTPS ?
-		$scheme = isset( $url_bits[ 'scheme' ] ) ? $url_bits[ 'scheme' ] . '://' : 'http://';
+		$scheme = isset($url_bits['scheme']) ? $url_bits['scheme'].'://' : 'http://';
 		// domain
-		$host = isset( $url_bits[ 'host' ] ) ? $url_bits[ 'host' ] : '';
+		$host = isset($url_bits['host']) ? $url_bits['host'] : '';
 		// if only the base URL is requested, then return that now
-		if ( $base_url_only ) {
-			return $scheme . $host;
+		if ($base_url_only) {
+			return $scheme.$host;
 		}
-		$port = isset( $url_bits[ 'port' ] ) ? ':' . $url_bits[ 'port' ] : '';
-		$user = isset( $url_bits[ 'user' ] ) ? $url_bits[ 'user' ] : '';
-		$pass = isset( $url_bits[ 'pass' ] ) ? ':' . $url_bits[ 'pass' ] : '';
-		$pass = ( $user || $pass ) ? $pass . '@' : '';
-		$path = isset( $url_bits[ 'path' ] ) ? $url_bits[ 'path' ] : '';
+		$port = isset($url_bits['port']) ? ':'.$url_bits['port'] : '';
+		$user = isset($url_bits['user']) ? $url_bits['user'] : '';
+		$pass = isset($url_bits['pass']) ? ':'.$url_bits['pass'] : '';
+		$pass = ($user || $pass) ? $pass.'@' : '';
+		$path = isset($url_bits['path']) ? $url_bits['path'] : '';
 		// if the query string is not required, then return what we have so far
-		if ( $remove_query ) {
-			return $scheme . $user . $pass . $host . $port . $path;
+		if ($remove_query) {
+			return $scheme.$user.$pass.$host.$port.$path;
 		}
-		$query = isset( $url_bits[ 'query' ] ) ? '?' . $url_bits[ 'query' ] : '';
-		$fragment = isset( $url_bits[ 'fragment' ] ) ? '#' . $url_bits[ 'fragment' ] : '';
-		return $scheme . $user . $pass . $host . $port . $path . $query . $fragment;
+		$query = isset($url_bits['query']) ? '?'.$url_bits['query'] : '';
+		$fragment = isset($url_bits['fragment']) ? '#'.$url_bits['fragment'] : '';
+		return $scheme.$user.$pass.$host.$port.$path.$query.$fragment;
 	}
 
 
@@ -118,29 +118,29 @@ 
 	 * @param bool   $as_array TRUE (default) will return query params as an array of key value pairs, FALSE will simply return the query string
 	 * @return string|array
 	 */
-	public static function get_query_string( $url = '', $as_array = TRUE ) {
+	public static function get_query_string($url = '', $as_array = TRUE) {
 		// break apart incoming URL
-		$url_bits = parse_url( $url );
+		$url_bits = parse_url($url);
 		// grab query string from URL
-		$query = isset( $url_bits[ 'query' ] ) ? $url_bits[ 'query' ] : '';
+		$query = isset($url_bits['query']) ? $url_bits['query'] : '';
 		// if we don't want the query string formatted into an array of key => value pairs, then just return it as is
-		if ( ! $as_array ) {
+		if ( ! $as_array) {
 			return $query;
 		}
 		// if no query string exists then just return an empty array now
-		if ( empty( $query )) {
+		if (empty($query)) {
 			return array();
 		}
 		// empty array to hold results
 		$query_params = array();
 		// now break apart the query string into separate params
-		$query = explode( '&', $query );
+		$query = explode('&', $query);
 		// loop thru our query params
-		foreach ( $query as $query_args ) {
+		foreach ($query as $query_args) {
 			// break apart the key value pairs
-			$query_args = explode( '=', $query_args );
+			$query_args = explode('=', $query_args);
 			// and add to our results array
-			$query_params[ $query_args[0] ] = $query_args[1];
+			$query_params[$query_args[0]] = $query_args[1];
 		}
 		return $query_params;
 	}
@@ -151,7 +151,7 @@ 
 	 * prevent_prefetching
 	 * @return void
 	 */
-	public static function prevent_prefetching(){
+	public static function prevent_prefetching() {
 		// prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process
 		remove_action('wp_head', 'adjacent_posts_rel_link_wp_head');
 	}
@@ -166,9 +166,9 @@ 
 	 * @param   string $prefix Use this to prefix the string with something.
 	 * @return string
 	 */
-	public static function generate_unique_token( $prefix = '' ) {
-		$token =  md5( uniqid() . mt_rand() );
-		return $prefix ? $prefix . '_' . $token : $token;
+	public static function generate_unique_token($prefix = '') {
+		$token = md5(uniqid().mt_rand());
+		return $prefix ? $prefix.'_'.$token : $token;
 	}
 
 
@@ -177,7 +177,7 @@ 
 	 * add_nocache_headers
 	 * @return void
 	 */
-	public static function add_nocache_headers(){
+	public static function add_nocache_headers() {
 		// add no cache headers
 //		add_action( 'wp_head' , array( 'EED_Single_Page_Checkout', 'nocache_headers' ), 10 );
 		// plus a little extra for nginx
@@ -194,19 +194,19 @@ 
 	 * @param string $server_variable
 	 * @return string
 	 */
-	public static function filter_input_server_url( $server_variable = 'REQUEST_URI' ){
+	public static function filter_input_server_url($server_variable = 'REQUEST_URI') {
 		$URL = '';
 		$server_variables = array(
 			'REQUEST_URI' => 1,
 			'HTTP_HOST' => 1,
 			'PHP_SELF' => 1,
 		);
-		$server_variable = strtoupper( $server_variable );
+		$server_variable = strtoupper($server_variable);
 		// whitelist INPUT_SERVER var
-		if ( isset( $server_variables[ $server_variable ] ) ) {
-			$URL = filter_input( INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE );
-			if ( empty( $URL ) ) {
-				$URL = esc_url( $_SERVER[ $server_variable ] );
+		if (isset($server_variables[$server_variable])) {
+			$URL = filter_input(INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE);
+			if (empty($URL)) {
+				$URL = esc_url($_SERVER[$server_variable]);
 			}
 		}
 		return $URL;
@@ -219,10 +219,10 @@ 
 	 * @return string
 	 */
 	public static function current_url() {
-		if ( isset( $_SERVER[ 'HTTP_HOST' ], $_SERVER[ 'REQUEST_URI' ] ) ) {
+		if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) {
 			$url = is_ssl() ? 'https://' : 'http://';
-			$url .= \EEH_URL::filter_input_server_url( 'HTTP_HOST' );
-			$url .= \EEH_URL::filter_input_server_url( 'REQUEST_URI' );
+			$url .= \EEH_URL::filter_input_server_url('HTTP_HOST');
+			$url .= \EEH_URL::filter_input_server_url('REQUEST_URI');
 		} else {
 			$url = 'unknown';
 		}