eventespresso / event-espresso-core

admin_pages/events/templates/event_tickets_metabox_main.template.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php do_action( 'AHEE__event_tickets_metabox_main__before_content' ); ?>
+<?php do_action('AHEE__event_tickets_metabox_main__before_content'); ?>
 <div id="event-and-ticket-form-content">
 	<h4 class="event-tickets-datetimes-title"><?php _e('Event Datetime', 'event_espresso'); ?></h4><?php echo $event_datetime_help_link; ?>
 	<div class="event-datetimes-container">
@@ -29,11 +29,11 @@ 
 						</td>
 						<td class="event-datetime-column reg-limit-column">
 							<?php
-								$reg_limit = $time->get_pretty('DTT_reg_limit','input');
+								$reg_limit = $time->get_pretty('DTT_reg_limit', 'input');
 							?>
 							<input type="text" name="edit_event_datetimes[1][DTT_reg_limit]" id="event-datetime-DTT_reg_limit-1" class="ee-small-text-inp ee-inp-right event-datetime-DTT_reg_limit" value="<?php echo $reg_limit; ?>">
 						</td>
-						<td class="datetime-tickets-sold"><?php printf( __('Tickets Sold: %s', 'event_espresso'), $time->get('DTT_sold') ); ?></td>
+						<td class="datetime-tickets-sold"><?php printf(__('Tickets Sold: %s', 'event_espresso'), $time->get('DTT_sold')); ?></td>
 					</tr>
 				</tbody>
 			</table>
@@ -71,7 +71,7 @@ 
 	<div style="clear:both"></div>
 </div> <!-- end #event-and-ticket-form-content -->
 
-<?php do_action( 'AHEE__event_tickets_metabox_main__after_content' ); ?>
+<?php do_action('AHEE__event_tickets_metabox_main__after_content'); ?>
 
 <table id="new-ticket-row-form" class="hidden">
 	<tbody><?php echo $ticket_js_structure; ?></tbody>

admin_pages/general_settings/help_tabs/general_settings_critical_pages.help_tab.php

Spacing +10 added lines, -10 removed lines

@@ -6,41 +6,41 @@
 <ul>
 <li>
 <strong><?php _e('Registration Checkout Page', 'event_espresso'); ?></strong><br />
-<?php printf( __('This page displays all your events and is required. It is important that this page always contain the %s shortcode. It is not required to be in your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CHECKOUT]</strong>' ); ?>
+<?php printf(__('This page displays all your events and is required. It is important that this page always contain the %s shortcode. It is not required to be in your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CHECKOUT]</strong>'); ?>
 </li>
 <li>
 <strong><?php _e('Transactions Page', 'event_espresso'); ?></strong><br />
-<?php printf( __('This page processes the payments and is required. It should only contain the %s shortcode. No other content should be added and it should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_TXN_PAGE]</strong>' ); ?>
+<?php printf(__('This page processes the payments and is required. It should only contain the %s shortcode. No other content should be added and it should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_TXN_PAGE]</strong>'); ?>
 </li>
 <li>
 <strong><?php _e('Thank You Page', 'event_espresso'); ?></strong><br />
-<?php printf( __('This page is displayed after a successful transaction and is required. It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_THANK_YOU]</strong>' ); ?>
+<?php printf(__('This page is displayed after a successful transaction and is required. It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_THANK_YOU]</strong>'); ?>
 </li>
 <li>
 <strong><?php _e('Cancel / Return Page', 'event_espresso'); ?></strong><br />
-<?php printf( __('This page is displayed after an unsuccessful transaction and is required.  It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CANCELLED]</strong>' ); ?>
+<?php printf(__('This page is displayed after an unsuccessful transaction and is required.  It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CANCELLED]</strong>'); ?>
 </li>
 <li>
 <strong><?php _e('Event List', 'event_espresso'); ?></strong><br />
-<?php printf(__('If you would like to style the look of your events archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">','</a>'); ?>
+<?php printf(__('If you would like to style the look of your events archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">', '</a>'); ?>
 <ul>
 <li style="list-style-type: circle;">
-<?php printf( __('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_events.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
+<?php printf(__('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_events.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
 </li>
 <li style="list-style-type: circle;">
-<?php printf( __('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_events.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
+<?php printf(__('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_events.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
 </li>
 </ul>
 </li>
 <li>
 <strong><?php _e('Venue List', 'event_espresso'); ?></strong><br />
-<?php printf(__('If you would like to style the look of your venues archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">','</a>'); ?>
+<?php printf(__('If you would like to style the look of your venues archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">', '</a>'); ?>
 <ul>
 <li style="list-style-type: circle;">
-<?php printf( __('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_venues.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
+<?php printf(__('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_venues.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
 </li>
 <li style="list-style-type: circle;">
-<?php printf( __('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_venues.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
+<?php printf(__('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_venues.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
 </li>
 </ul>
 </li>

admin_pages/general_settings/templates/espresso_page_settings.template.php

Spacing +19 added lines, -19 removed lines

@@ -24,7 +24,7 @@ 
 						</strong>
 						<?php echo EEH_Template::get_help_tab_link('registration_page_info'); ?>
 						<br />
-						<?php echo General_Settings_Admin_Page::edit_view_links( $reg_page_id );?>
+						<?php echo General_Settings_Admin_Page::edit_view_links($reg_page_id); ?>
 					</label>
 				</th>
 				<td>
@@ -32,10 +32,10 @@ 
 						<option value="0">
 							<?php _e('Main Page', 'event_espresso'); ?>
 						</option>
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $reg_page_id ); ?>
+						<?php General_Settings_Admin_Page::page_settings_dropdown($reg_page_id); ?>
 					</select>
 					<span>
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $reg_page_obj, '[ESPRESSO_CHECKOUT]' ); ?>
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($reg_page_obj, '[ESPRESSO_CHECKOUT]'); ?>
 					</span>
 					<br />
 					<p class="description">
@@ -59,7 +59,7 @@ 
 						<?php echo EEH_Template::get_help_tab_link('notify_url_info'); ?>
 						<br />
 						<span class="lt-grey-text"><?php _e('Notify URL (processes payments)', 'event_espresso'); ?></span><br/>
-						<?php echo General_Settings_Admin_Page::edit_view_links( $txn_page_id );?>
+						<?php echo General_Settings_Admin_Page::edit_view_links($txn_page_id); ?>
 					</label>
 				</th>
 				<td>
@@ -67,16 +67,16 @@ 
 						<option value="0">
 							<?php _e('Main Page', 'event_espresso'); ?>
 						</option>
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $txn_page_id ); ?>
+						<?php General_Settings_Admin_Page::page_settings_dropdown($txn_page_id); ?>
 					</select>
 					<span>
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $txn_page_obj, '[ESPRESSO_TXN_PAGE]' ); ?>
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($txn_page_obj, '[ESPRESSO_TXN_PAGE]'); ?>
 					</span>
 					<br />
 					<p class="description">
 						<?php
 						echo sprintf(
-							__( 'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso' ),
+							__('This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso'),
 							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
 						);
 						?>
@@ -93,7 +93,7 @@ 
 						</strong>
 						<?php echo EEH_Template::get_help_tab_link('return_url_info'); ?>
 						<br />
-						<?php echo General_Settings_Admin_Page::edit_view_links( $thank_you_page_id );?>
+						<?php echo General_Settings_Admin_Page::edit_view_links($thank_you_page_id); ?>
 					</label>
 				</th>
 				<td>
@@ -101,16 +101,16 @@ 
 						<option value="0">
 							<?php _e('Main Page', 'event_espresso'); ?>
 						</option>
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $thank_you_page_id ); ?>
+						<?php General_Settings_Admin_Page::page_settings_dropdown($thank_you_page_id); ?>
 					</select>
 					<span>
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $thank_you_page_obj, '[ESPRESSO_THANK_YOU]' ); ?>
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($thank_you_page_obj, '[ESPRESSO_THANK_YOU]'); ?>
 					</span>
 					<br />
 					<p class="description">
 						<?php
 						echo sprintf(
-							__( 'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso' ),
+							__('This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso'),
 							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
 						);
 						?>
@@ -127,7 +127,7 @@ 
 						</strong>
 						<?php echo EEH_Template::get_help_tab_link('cancel_return_info'); ?>
 						<br />
-						<?php echo General_Settings_Admin_Page::edit_view_links( $cancel_page_id );?>
+						<?php echo General_Settings_Admin_Page::edit_view_links($cancel_page_id); ?>
 					</label>
 				</th>
 				<td>
@@ -135,16 +135,16 @@ 
 						<option value="0">
 							<?php _e('Main Page', 'event_espresso'); ?>
 						</option>
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $cancel_page_id ); ?>
+						<?php General_Settings_Admin_Page::page_settings_dropdown($cancel_page_id); ?>
 					</select>
 					<span>
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $cancel_page_obj, '[ESPRESSO_CANCELLED]' ); ?>
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($cancel_page_obj, '[ESPRESSO_CANCELLED]'); ?>
 					</span>
 					<br />
 					<p class="description">
 						<?php
 						echo sprintf(
-							__( 'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.', 'event_espresso' ),
+							__('This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.', 'event_espresso'),
 							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
 						);
 						?>
@@ -161,7 +161,7 @@ 
 						</strong>
 						<?php echo EEH_Template::get_help_tab_link('event_list_cpt_info'); ?>
 						<br />
-						<a href='<?php echo get_post_type_archive_link('espresso_events') ?>'><?php	_e('View', 'event_espresso');?></a>
+						<a href='<?php echo get_post_type_archive_link('espresso_events') ?>'><?php	_e('View', 'event_espresso'); ?></a>
 					</label>
 				</th>
 				<td>
@@ -169,7 +169,7 @@ 
 						<?php echo __('Events are custom post types and use WordPress\' normal archive pages for displaying events.', 'event_espresso') ?>
 					</p>
 					<p class="description">
-						<?php printf(__('If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'),'<a href="admin.php?page=espresso_support">','</a>') ?>
+						<?php printf(__('If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'), '<a href="admin.php?page=espresso_support">', '</a>') ?>
 					</p>
 					<br/><br/>
 				</td>
@@ -183,7 +183,7 @@ 
 						</strong>
 						<?php echo EEH_Template::get_help_tab_link('venue_list_cpt_info'); ?>
 						<br />
-						<a href='<?php echo get_post_type_archive_link('espresso_venues') ?>'><?php	_e('View', 'event_espresso');?></a>
+						<a href='<?php echo get_post_type_archive_link('espresso_venues') ?>'><?php	_e('View', 'event_espresso'); ?></a>
 					</label>
 				</th>
 				<td>
@@ -191,7 +191,7 @@ 
 						<?php echo __('Venues are custom post types and use WordPress\' normal archive pages for displaying events.', 'event_espresso') ?>
 					</p>
 					<p class="description">
-						<?php printf(__('If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'),'<a href="admin.php?page=espresso_support">','</a>') ?>
+						<?php printf(__('If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'), '<a href="admin.php?page=espresso_support">', '</a>') ?>
 					</p>
 				</td>
 			</tr>

admin_pages/messages/Messages_Admin_Page.core.php

Indentation +23 added lines, -23 removed lines

@@ -190,9 +190,9 @@ 
 
 	/**
 	 * 		an array for storing key => value pairs of request actions and their corresponding methods
-	*		@access protected
-	*		@return void
-	*/
+	 *		@access protected
+	 *		@return void
+	 */
 	protected function _set_page_routes() {
 		$grp_id = ! empty( $this->_req_data['GRP_ID'] ) && ! is_array( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : 0;
 		$grp_id = empty( $grp_id ) && !empty( $this->_req_data['id'] ) ? $this->_req_data['id'] : $grp_id;
@@ -379,18 +379,18 @@ 
 							'title' => __('Message Template Editor', 'event_espresso'),
 							'callback' => 'edit_message_template_help_tab'
 							),
-                        'message_templates_help_tab' => array(
-                            'title' => __('Message Templates', 'event_espresso'),
-                            'filename' => 'messages_templates'
-                            ),
+						'message_templates_help_tab' => array(
+							'title' => __('Message Templates', 'event_espresso'),
+							'filename' => 'messages_templates'
+							),
 						'message_template_shortcodes' => array(
 							'title' => __('Message Shortcodes', 'event_espresso'),
 							'callback' => 'message_template_shortcodes_help_tab'
 							),
-                        'message_preview_help_tab' => array(
-                            'title' => __('Message Preview', 'event_espresso'),
-                            'filename' => 'messages_preview'
-                            ),
+						'message_preview_help_tab' => array(
+							'title' => __('Message Preview', 'event_espresso'),
+							'filename' => 'messages_preview'
+							),
 					),
 				'require_nonce' => FALSE
 				),
@@ -415,7 +415,7 @@ 
 					'order' => 20
 					),
 				'metaboxes' => array('_messages_settings_metaboxes'),
-                'help_tabs' => array(
+				'help_tabs' => array(
 						'messages_settings_help_tab' => array(
 							'title' => __('Messages Settings', 'event_espresso'),
 							'filename' => 'messages_settings'
@@ -428,7 +428,7 @@ 
 							'title' => __('Activating / Deactivating Messengers', 'event_espresso'),
 							'filename' => 'messages_settings_messengers'
 							),
-                    ),
+					),
 				'help_tour' => array( 'Messages_Settings_Help_Tour' ),
 				'require_nonce' => FALSE
 				)
@@ -1564,14 +1564,14 @@ 
 
 
 	/**
-     * This returns the shortcode selector skeleton for a given context and field.
-     *
-     * @since 4.9.rc.000
-     *
+	 * This returns the shortcode selector skeleton for a given context and field.
+	 *
+	 * @since 4.9.rc.000
+	 *
 	 * @param string $field  The name of the field retrieving shortcodes for.
-     * @param string $linked_input_id The css id of the input that the shortcodes get added to.
-     * @return string
-    */
+	 * @param string $linked_input_id The css id of the input that the shortcodes get added to.
+	 * @return string
+	 */
 	protected function _get_shortcode_selector( $field, $linked_input_id ) {
 		$template_args = array(
 			'shortcodes' => $this->_get_shortcodes( array( $field ), true ),
@@ -2111,9 +2111,9 @@ 
 
 	/**
 	 * 	_learn_more_about_message_templates_link
-	*	@access protected
-	*	@return string
-	*/
+	 *	@access protected
+	 *	@return string
+	 */
 	protected function _learn_more_about_message_templates_link() {
 		return '<a class="hidden" style="margin:0 20px; cursor:pointer; font-size:12px;" >' . __('learn more about how message templates works', 'event_espresso') . '</a>';
 	}

Spacing +505 added lines, -505 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -73,7 +73,7 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function __construct( $routing = TRUE ) {
+	public function __construct($routing = TRUE) {
 		//make sure MSG Template helper is loaded.
 		EE_Registry::instance()->load_helper('MSG_Template');
 		//make sure messages autoloader is running
@@ -94,13 +94,13 @@ 
 
 		$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;
 
-		EE_Registry::instance()->load_lib( 'messages' );
+		EE_Registry::instance()->load_lib('messages');
 		//we're also going to set the active messengers and active message types in here.
 		$this->_active_messengers = EEH_MSG_Template::get_active_messengers_in_db();
-		$this->_active_messengers = !empty($this->_active_messengers) ?  $this->_active_messengers : array();
-		$this->_active_message_types = !empty($this->_active_messenger) && !empty($this->_active_messengers[$this->_active_messenger]) && ! empty(  $this->_active_messengers[$this->_active_messenger]['settings'][$this->_active_messenger . '-message_types'] ) ? array_keys($this->_active_messengers[$this->_active_messenger]['settings'][$this->_active_messenger . '-message_types']) : array();
+		$this->_active_messengers = ! empty($this->_active_messengers) ? $this->_active_messengers : array();
+		$this->_active_message_types = ! empty($this->_active_messenger) && ! empty($this->_active_messengers[$this->_active_messenger]) && ! empty($this->_active_messengers[$this->_active_messenger]['settings'][$this->_active_messenger.'-message_types']) ? array_keys($this->_active_messengers[$this->_active_messenger]['settings'][$this->_active_messenger.'-message_types']) : array();
 
 
 		//what about saving the objects in the active_messengers and active_message_types?
@@ -118,15 +118,15 @@ 
 	 * @return void
 	 */
 	protected function _load_active_messenger_objects() {
-		foreach ( $this->_active_messengers as $messenger => $values ) {
-			$ref = ucwords( str_replace( '_' , ' ', $messenger) );
-			$ref = str_replace( ' ', '_', $ref );
-			$classname = 'EE_' . $ref . '_messenger';
-			require_once( EE_LIBRARIES . 'messages'. DS .'messenger' . DS . $classname . '.class.php' );
-			if ( !class_exists($classname) )
-				throw new EE_Error( sprintf( __('There is no messenger for the given classname (%s)', 'event_espresso'), $classname ) );
-
-			$a = new ReflectionClass( $classname );
+		foreach ($this->_active_messengers as $messenger => $values) {
+			$ref = ucwords(str_replace('_', ' ', $messenger));
+			$ref = str_replace(' ', '_', $ref);
+			$classname = 'EE_'.$ref.'_messenger';
+			require_once(EE_LIBRARIES.'messages'.DS.'messenger'.DS.$classname.'.class.php');
+			if ( ! class_exists($classname))
+				throw new EE_Error(sprintf(__('There is no messenger for the given classname (%s)', 'event_espresso'), $classname));
+
+			$a = new ReflectionClass($classname);
 			$this->_active_messengers[$messenger]['obj'] = $a->newInstance();
 		}
 	}
@@ -141,16 +141,16 @@ 
 	 * @return void
 	 */
 	protected function _load_active_message_type_objects() {
-		if ( empty($this->_active_message_types) ) return;
-		foreach ( $this->_active_message_types as $message_type ) {
-			$ref = ucwords( str_replace( '_' , ' ', $message_type) );
-			$ref = str_replace( ' ', '_', $ref );
-			$classname = 'EE_' . $ref . '_message_type';
+		if (empty($this->_active_message_types)) return;
+		foreach ($this->_active_message_types as $message_type) {
+			$ref = ucwords(str_replace('_', ' ', $message_type));
+			$ref = str_replace(' ', '_', $ref);
+			$classname = 'EE_'.$ref.'_message_type';
 
-			if ( !class_exists($classname) )
-				throw new EE_Error( sprintf( __('There is no message type for the given classname (%s)', 'event_espresso'), $classname ) );
+			if ( ! class_exists($classname))
+				throw new EE_Error(sprintf(__('There is no message type for the given classname (%s)', 'event_espresso'), $classname));
 
-			$a = new ReflectionClass( $classname );
+			$a = new ReflectionClass($classname);
 			$this->_active_message_types[$message_type]['obj'] = $a->newInstance();
 		}
 	}
@@ -158,11 +158,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'));
 	}
 
 
@@ -194,8 +194,8 @@ 
 	*		@return void
 	*/
 	protected function _set_page_routes() {
-		$grp_id = ! empty( $this->_req_data['GRP_ID'] ) && ! is_array( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : 0;
-		$grp_id = empty( $grp_id ) && !empty( $this->_req_data['id'] ) ? $this->_req_data['id'] : $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']) ? $this->_req_data['id'] : $grp_id;
 
 		$this->_page_routes = array(
 				'default'=> array(
@@ -231,35 +231,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(
@@ -338,7 +338,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(
@@ -373,7 +373,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'),
@@ -429,7 +429,7 @@ 
 							'filename' => 'messages_settings_messengers'
 							),
                     ),
-				'help_tour' => array( 'Messages_Settings_Help_Tour' ),
+				'help_tour' => array('Messages_Settings_Help_Tour'),
 				'require_nonce' => FALSE
 				)
 			/*'reports' => array(
@@ -479,43 +479,43 @@ 
 
 
 	public function messages_help_tab() {
-		$templatepath = EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_help_tab.template.php';
-		EEH_Template::display_template( $templatepath, array());
+		$templatepath = EE_MSG_TEMPLATE_PATH.'ee_msg_messages_help_tab.template.php';
+		EEH_Template::display_template($templatepath, array());
 	}
 
 
 	public function messengers_help_tab() {
-		$templatepath = EE_MSG_TEMPLATE_PATH . 'ee_msg_messenger_help_tab.template.php';
-		EEH_Template::display_template( $templatepath, array());
+		$templatepath = EE_MSG_TEMPLATE_PATH.'ee_msg_messenger_help_tab.template.php';
+		EEH_Template::display_template($templatepath, array());
 	}
 
 
 	public function message_types_help_tab() {
-		$templatepath = EE_MSG_TEMPLATE_PATH . 'ee_msg_message_type_help_tab.template.php';
-		EEH_Template::display_template( $templatepath, array());
+		$templatepath = EE_MSG_TEMPLATE_PATH.'ee_msg_message_type_help_tab.template.php';
+		EEH_Template::display_template($templatepath, array());
 	}
 
 
 	public function messages_overview_help_tab() {
-		$templatepath = EE_MSG_TEMPLATE_PATH . 'ee_msg_overview_help_tab.template.php';
-		EEH_Template::display_template( $templatepath, array());
+		$templatepath = EE_MSG_TEMPLATE_PATH.'ee_msg_overview_help_tab.template.php';
+		EEH_Template::display_template($templatepath, array());
 	}
 
 
 	public function message_templates_help_tab() {
-		$templatepath = EE_MSG_TEMPLATE_PATH . 'ee_msg_message_templates_help_tab.template.php';
-		EEH_Template::display_template( $templatepath, array());
+		$templatepath = EE_MSG_TEMPLATE_PATH.'ee_msg_message_templates_help_tab.template.php';
+		EEH_Template::display_template($templatepath, array());
 	}
 
 
 	public function edit_message_template_help_tab() {
-		$templatepath = EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_templates_editor_help_tab.template.php';
-		$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( $templatepath, $args);
+		$templatepath = EE_MSG_TEMPLATE_PATH.'ee_msg_messages_templates_editor_help_tab.template.php';
+		$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($templatepath, $args);
 	}
 
 
@@ -523,25 +523,25 @@ 
 	public function message_template_shortcodes_help_tab() {
 		$this->_set_shortcodes();
 		$args['shortcodes'] = $this->_shortcodes;
-		$template_path = EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_shortcodes_help_tab.template.php';
-		EEH_Template::display_template( $template_path, $args );
+		$template_path = EE_MSG_TEMPLATE_PATH.'ee_msg_messages_shortcodes_help_tab.template.php';
+		EEH_Template::display_template($template_path, $args);
 	}
 
 
 
 	public function preview_message_help_tab() {
-		$templatepath = EE_MSG_TEMPLATE_PATH . 'ee_msg_preview_help_tab.template.php';
-		EEH_Template::display_template( $templatepath, array());
+		$templatepath = EE_MSG_TEMPLATE_PATH.'ee_msg_preview_help_tab.template.php';
+		EEH_Template::display_template($templatepath, array());
 	}
 
 
 	public function settings_help_tab() {
-		$templatepath = EE_MSG_TEMPLATE_PATH . 'ee_msg_messages_settings_help_tab.template.php';
-		$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') . '" />';
+		$templatepath = EE_MSG_TEMPLATE_PATH.'ee_msg_messages_settings_help_tab.template.php';
+		$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( $templatepath, $args);
+		EEH_Template::display_template($templatepath, $args);
 	}
 
 
@@ -549,24 +549,24 @@ 
 
 
 	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-messages-settings', EE_MSG_ASSETS_URL.'ee-messages-settings.js', array('jquery-ui-droppable', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 
 
 
 
-	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;
@@ -584,37 +584,37 @@ 
 			$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'));
 	}
 
 
 
 	public function load_scripts_styles_display_preview_message() {
 		$this->_set_message_template_group();
-		if ( isset( $this->_req_data['messenger'] ) ) {
+		if (isset($this->_req_data['messenger'])) {
 			$this->_active_messenger = $this->_active_messengers[$this->_req_data['messenger']]['obj'];
 		}
 
-		$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');
 	}
@@ -650,9 +650,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);
 	}
 
 
@@ -674,7 +674,7 @@ 
 	 * @param bool $global whether to return just global (true) or custom templates (false)
 	 * @return array|WP_Error object
 	 */
-	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) {
 		global $espresso_wp_user;
 		// start with an empty array
 		$message_templates = array();
@@ -684,24 +684,24 @@ 
 		$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);
 
 		}
 
@@ -737,7 +737,7 @@ 
 		$imts = $installed_objects['message_types'];
 		$installed = array();
 
-		foreach ( $imts as $message_type ) {
+		foreach ($imts as $message_type) {
 			$installed[$message_type->name]['obj'] = $message_type;
 		}
 
@@ -769,24 +769,24 @@ 
 	 * @access  protected
 	 * @return void
 	 */
-	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 )  )
+		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!
 
@@ -805,8 +805,8 @@ 
 	 * @param string $messenger    messenger slug
 	 * @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);
 	}
 
 
@@ -817,36 +817,36 @@ 
 	 * @return void
 	 */
 	protected function _edit_message_template() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		//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'] ) : FALSE;
+		$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.
 		$message_template_group = $this->_message_template_group;
 		$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'] ) ? strtolower($this->_req_data['context']) : key($c_config);
+		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_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 ), EE_MSG_ADMIN_URL );
+			$edit_message_template_form_url = add_query_arg(array('action' => $action, 'noheader' => TRUE), EE_MSG_ADMIN_URL);
 		} else {
 			$action = 'update_message_template';
 			$button_both = TRUE;
 			$button_text = array();
 			$button_actions = array();
 			$referrer = $this->_admin_base_url;
-			$edit_message_template_form_url = add_query_arg( array( 'action' => $action, 'noheader' => TRUE ), EE_MSG_ADMIN_URL );
+			$edit_message_template_form_url = add_query_arg(array('action' => $action, 'noheader' => TRUE), EE_MSG_ADMIN_URL);
 		}
 
 		//set active messenger for this view
@@ -856,13 +856,13 @@ 
 
 		//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'] ));
+		$context_label = sprintf(__('(%s %s)', 'event_espresso'), $c_config[$context]['label'], ucwords($c_label['label']));
 
-		$title = sprintf( __(' %s %s Template %s', 'event_espresso'), ucwords($message_template_group->messenger_obj()->label['singular']), ucwords($message_template_group->message_type_obj()->label['singular']), $context_label );
+		$title = sprintf(__(' %s %s Template %s', 'event_espresso'), ucwords($message_template_group->messenger_obj()->label['singular']), ucwords($message_template_group->message_type_obj()->label['singular']), $context_label);
 
 		$this->_template_args['GRP_ID'] = $GRP_ID;
 		$this->_template_args['message_template'] = $message_template_group;
@@ -873,7 +873,7 @@ 
 		$MSG = new EE_messages();
 		$template_field_structure = $MSG->get_fields($message_template_group->messenger(), $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');
 		}
@@ -883,38 +883,38 @@ 
 
 
 		//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) ) {
-			$id_prefix= 'ee-msg-edit-template-fields-';
-			foreach ( $template_field_structure[$context] as $template_field => $field_setup_array ) {
+		if ( ! empty($template_field_structure)) {
+			$id_prefix = 'ee-msg-edit-template-fields-';
+			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 ) {
-						foreach ( $new_fields_array as $extra_field =>  $extra_array ) {
+					foreach ($field_setup_array as $reference_field => $new_fields_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 ) )
+							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]['css_class'] = !empty( $v_fields ) && in_array($extra_field, $v_fields) && ( is_array($validators[$extra_field] ) && isset( $validators[$extra_field]['msg'] ) ) ? 'validate-error ' . $css_class : $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) && in_array($extra_field, $v_fields) && (is_array($validators[$extra_field]) && isset($validators[$extra_field]['msg'])) ? 'validate-error '.$css_class : $css_class;
 							$content = $message_templates[$context][$reference_field]->get('MTP_content');
-							$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
 							$template_form_fields[$field_id]['value'] = isset($validators[$extra_field]) ? $validators[$extra_field]['value'] : $template_form_fields[$field_id]['value'];
@@ -924,32 +924,32 @@ 
 
 							//shortcode selector
 							$field_name_to_use = $extra_field == 'main' ? 'content' : $extra_field;
-							$template_form_fields[$field_id]['append_content'] = $this->_get_shortcode_selector( $field_name_to_use, $field_id );
+							$template_form_fields[$field_id]['append_content'] = $this->_get_shortcode_selector($field_name_to_use, $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") );
+								$template_form_fields[$field_id]['value'] = stripslashes(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_templates[$context][$reference_field]->ID() : '',
+							'value' => ! empty($message_templates) ? $message_templates[$context][$reference_field]->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',
@@ -963,10 +963,10 @@ 
 					}
 					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]';
-					$template_form_fields[$field_id]['value'] = !empty($message_templates) && is_array($message_templates[$context]) && isset($message_templates[$context][$template_field]) ?$message_templates[$context][$template_field]->get('MTP_content') : '';
+					$template_form_fields[$field_id]['name'] = 'MTP_template_fields['.$template_field.'][content]';
+					$template_form_fields[$field_id]['value'] = ! empty($message_templates) && is_array($message_templates[$context]) && isset($message_templates[$context][$template_field]) ? $message_templates[$context][$template_field]->get('MTP_content') : '';
 
 					//do we have a validator error for this field?  if we do then we'll use that value instead
 					$template_form_fields[$field_id]['value'] = isset($validators[$template_field]) ? $validators[$template_field]['value'] : $template_form_fields[$field_id]['value'];
@@ -974,12 +974,12 @@ 
 
 					$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 : $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
-					$template_form_fields[$field_id]['append_content'] = $this->_get_shortcode_selector( $template_field, $field_id );
+					$template_form_fields[$field_id]['append_content'] = $this->_get_shortcode_selector($template_field, $field_id);
 
-					if ( isset( $field_setup_array['input'] ) && $field_setup_array['input'] == 'wp_editor' ) {
+					if (isset($field_setup_array['input']) && $field_setup_array['input'] == 'wp_editor') {
 						//we want to decode the entities
 						$template_form_fields[$field_id]['value'] = $template_form_fields[$field_id]['value'];
 					}/**/
@@ -987,25 +987,25 @@ 
 
 				//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',
 					'required' => FALSE,
 					'validation' => TRUE,
-					'value' => !empty($message_templates) ? $message_templates[$context][$template_field]->ID() : '',
+					'value' => ! empty($message_templates) ? $message_templates[$context][$template_field]->ID() : '',
 					'css_class' => '',
 					'format' => '%d',
 					'db-col' => 'MTP_ID'
 				);
 
 				$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',
@@ -1149,15 +1149,15 @@ 
 				'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')
 				);
 
 			$sidebar_array = array('ee-msg-is-global', 'ee-msg-is-override', 'ee-msg-deleted', 'ee-msg-is-active');
 
-			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',
@@ -1167,19 +1167,19 @@ 
 			}
 
 
-			$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) )
 
 		//set extra content for publish box
 		$this->_template_args['publish_box_extra_content'] = $sidebar_fields;
-		$this->_set_publish_post_box_vars( 'id', $GRP_ID );
+		$this->_set_publish_post_box_vars('id', $GRP_ID);
 
 		//add preview button
-		$preview_url = parent::add_query_args_and_nonce( array( 'message_type' => $message_template_group->message_type(), 'messenger' => $message_template_group->messenger(), 'context' => $context,'GRP_ID' => $GRP_ID, 'action' => 'preview_message' ), $this->_admin_base_url );
-		$preview_button = '<a href="' . $preview_url . '" class="button-secondary messages-preview-button">' . __('Preview', 'event_espresso') . '</a>';
+		$preview_url = parent::add_query_args_and_nonce(array('message_type' => $message_template_group->message_type(), 'messenger' => $message_template_group->messenger(), 'context' => $context, 'GRP_ID' => $GRP_ID, 'action' => 'preview_message'), $this->_admin_base_url);
+		$preview_button = '<a href="'.$preview_url.'" class="button-secondary messages-preview-button">'.__('Preview', 'event_espresso').'</a>';
 
 
 		//setup context switcher
@@ -1206,16 +1206,16 @@ 
 		$this->_template_args['before_admin_page_content'] .= $this->_add_form_element_before();
 		$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';
+		$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';
 
 		//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.
@@ -1228,7 +1228,7 @@ 
 	}
 
 
-	public function filter_tinymce_init( $mceInit, $editor_id ) {
+	public function filter_tinymce_init($mceInit, $editor_id) {
 		return $mceInit;
 	}
 
@@ -1239,7 +1239,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() {
@@ -1257,32 +1257,32 @@ 
 	 * @return json json object
 	 */
 	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
-			$mtpg = EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
+			$mtpg = EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
 
-			$mtpg->set_template_pack_name( $template_pack );
+			$mtpg->set_template_pack_name($template_pack);
 			$this->_req_data['msgr'] = $mtpg->messenger();
 			$this->_req_data['mt'] = $mtpg->message_type();
 
 			$query_args = $this->_reset_to_default_template();
 
-			if ( empty( $query_args['id'] ) ) {
-				EE_Error::add_error( __('Something went wrong with switching the template pack. Please try again or contact EE support', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+			if (empty($query_args['id'])) {
+				EE_Error::add_error(__('Something went wrong with switching the template pack. Please try again or contact EE support', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				$this->_template_args['error'] = TRUE;
 			} else {
-				$template_label =$mtpg->get_template_pack()->label;
+				$template_label = $mtpg->get_template_pack()->label;
 				$template_pack_labels = $mtpg->messenger_obj()->get_supports_labels();
-				EE_Error::add_success( sprintf( __('This message template has been successfully switched to use the %s %s.  Please wait while the page reloads with your new template.', 'event_espresso'), $template_label, $template_pack_labels->template_pack ) );
+				EE_Error::add_success(sprintf(__('This message template has been successfully switched to use the %s %s.  Please wait while the page reloads with your new template.', 'event_espresso'), $template_label, $template_pack_labels->template_pack));
 				//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;
 			}
@@ -1303,56 +1303,56 @@ 
 	protected function _reset_to_default_template() {
 		$success = TRUE;
 		$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'] ) && !isset( $this->_req_data['mt'] ) && !isset( $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.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['msgr']) && ! isset($this->_req_data['mt']) && ! isset($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.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
 
 		//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.
-			$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID( $GRP_ID );
+			$MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
 
 
 			//note this is ONLY deleteing 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.  This means that if a custom template is reset it resets to whatever the related global template is.  HOWEVER, we DO keep the template pack and template variation set for the current custom template when resetting.
-				$templates = $this->_generate_new_templates( $this->_req_data['msgr'], $this->_req_data['mt'], $GRP_ID, TRUE );
+				$templates = $this->_generate_new_templates($this->_req_data['msgr'], $this->_req_data['mt'], $GRP_ID, TRUE);
 			}
 
 		}
 
 		//any error messages?
-		if ( !$success ) {
-			EE_Error::add_error( __('Something went wrong with deleting existing templates. Unable to reset to default', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $success) {
+			EE_Error::add_error(__('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' : 'default'
+			'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' : 'default'
 			);
 
 		//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);
 		}
 
 	}
@@ -1365,20 +1365,20 @@ 
 	 * @param bool $send if TRUE then we are doing an actual TEST send with the results of the preview.
 	 * @return void
 	 */
-	public function _preview_message( $send = FALSE ) {
+	public function _preview_message($send = FALSE) {
 		//first make sure we've got the necessary parameters
-		if ( !isset( $this->_req_data['message_type'] ) || !isset( $this->_req_data['messenger'] ) || !isset( $this->_req_data['messenger'] ) || !isset( $this->_req_data['GRP_ID'] ) ) {
-			EE_Error::add_error( __('Missing necessary parameters for displaying preview', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['message_type']) || ! isset($this->_req_data['messenger']) || ! isset($this->_req_data['messenger']) || ! isset($this->_req_data['GRP_ID'])) {
+			EE_Error::add_error(__('Missing necessary parameters for displaying preview', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		EE_Registry::instance()->REQ->set( 'GRP_ID', $this->_req_data['GRP_ID'] );
+		EE_Registry::instance()->REQ->set('GRP_ID', $this->_req_data['GRP_ID']);
 
 		$MSG = new EE_messages();
 
 		//get the preview!
-		$preview = $MSG->preview_message( $this->_req_data['message_type'], $this->_req_data['context'], $this->_req_data['messenger'], $send );
+		$preview = $MSG->preview_message($this->_req_data['message_type'], $this->_req_data['context'], $this->_req_data['messenger'], $send);
 
-		if ( $send ) {
+		if ($send) {
 			return $preview;
 		}
 
@@ -1388,16 +1388,16 @@ 
 			'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>';
 
 		//let's provide a helpful title for context
-		$preview_title = sprintf( __('Viewing Preview for %s %s Message Template', 'event_espresso'), ucwords($this->_active_messengers[$this->_req_data['messenger']]['obj']->label['singular']), ucwords($this->_active_message_types[$this->_req_data['message_type']]['obj']->label['singular']) );
+		$preview_title = sprintf(__('Viewing Preview for %s %s Message Template', 'event_espresso'), ucwords($this->_active_messengers[$this->_req_data['messenger']]['obj']->label['singular']), ucwords($this->_active_message_types[$this->_req_data['message_type']]['obj']->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;
 	}
 
@@ -1425,9 +1425,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');
 	}
 
 
@@ -1448,10 +1448,10 @@ 
 
 		$tp_select_values = array();
 
-		foreach ( $template_packs as $tp ) {
+		foreach ($template_packs 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()] ) || ! in_array( $this->_message_template_group->message_type(), $supports[$this->_message_template_group->messenger()] ) ) {
+			if ( ! isset($supports[$this->_message_template_group->messenger()]) || ! in_array($this->_message_template_group->message_type(), $supports[$this->_message_template_group->messenger()])) {
 				//not supported
 				continue;
 			}
@@ -1463,7 +1463,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'
@@ -1471,27 +1471,27 @@ 
 		}
 
 		//setup variation select values for the currently selected template.
-		$variations = $this->_message_template_group->get_template_pack()->get_variations( $this->_message_template_group->messenger(), $this->_message_template_group->message_type() );
+		$variations = $this->_message_template_group->get_template_pack()->get_variations($this->_message_template_group->messenger(), $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', $tp_select_values, $this->_message_template_group->get_template_pack_name() );
-		$template_args['variations_selector'] = EEH_Form_Fields::select_input( 'MTP_template_variation', $variations_select_values, $this->_message_template_group->get_template_pack_variation() );
+		$template_args['template_packs_selector'] = EEH_Form_Fields::select_input('MTP_template_pack', $tp_select_values, $this->_message_template_group->get_template_pack_name());
+		$template_args['variations_selector'] = EEH_Form_Fields::select_input('MTP_template_variation', $variations_select_values, $this->_message_template_group->get_template_pack_variation());
 		$template_args['template_pack_label'] = $template_pack_labels->template_pack;
 		$template_args['template_variation_label'] = $template_pack_labels->template_variation;
 		$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);
 	}
 
 
@@ -1512,52 +1512,52 @@ 
 			'GRP_ID' => $this->_message_template_group->GRP_ID()
 			);
 
-		$button = $this->get_action_link_or_button( 'reset_to_default', 'reset', $extra_args, 'button-primary reset-default-button' );
+		$button = $this->get_action_link_or_button('reset_to_default', 'reset', $extra_args, 'button-primary reset-default-button');
 
 
 		//test button
 		//first we need to see if there are any fields
 		$fields = $this->_message_template_group->messenger_obj()->get_test_settings_fields();
 
-		if ( !empty( $fields ) ) {
+		if ( ! empty($fields)) {
 			//yup there be fields
-			foreach ( $fields as $field => $config ) {
-				$field_id = $this->_message_template_group->messenger() . '_' . $field;
+			foreach ($fields as $field => $config) {
+				$field_id = $this->_message_template_group->messenger().'_'.$field;
 				$existing = $this->_message_template_group->messenger_obj()->get_existing_test_settings();
-				$default = isset( $config['default'] ) ? $config['default'] : '';
-				$default = isset( $config['value'] ) ? $config['value'] : $default;
+				$default = isset($config['default']) ? $config['default'] : '';
+				$default = isset($config['value']) ? $config['value'] : $default;
 
 				//if type is hidden and the value is empty something may have gone wrong so let's correct with the defaults
 				$fix = $config['input'] == 'hidden' && isset($existing[$field]) && empty($existing[$field]) ? $default : '';
-				$existing[$field] = isset( $existing[$field] ) && empty( $fix ) ? $existing[$field] : $fix;
+				$existing[$field] = isset($existing[$field]) && empty($fix) ? $existing[$field] : $fix;
 
 				$template_form_fields[$field_id] = array(
-					'name' => 'test_settings_fld[' . $field . ']',
+					'name' => 'test_settings_fld['.$field.']',
 					'label' => $config['label'],
 					'input' => $config['input'],
 					'type' => $config['type'],
 					'required' => $config['required'],
 					'validation' => $config['validation'],
-					'value' => isset( $existing[$field] ) ? $existing[$field] : $default,
+					'value' => isset($existing[$field]) ? $existing[$field] : $default,
 					'css_class' => $config['css_class'],
-					'options' => isset( $config['options'] ) ? $config['options'] : array(),
+					'options' => isset($config['options']) ? $config['options'] : array(),
 					'default' => $default,
 					'format' => $config['format']
 					);
 			}
 		}
 
-		$test_settings_fields = !empty( $template_form_fields) ? $this->_generate_admin_form_fields( $template_form_fields, 'string', 'ee_tst_settings_flds' ) : '';
+		$test_settings_fields = ! empty($template_form_fields) ? $this->_generate_admin_form_fields($template_form_fields, 'string', 'ee_tst_settings_flds') : '';
 
 		$test_settings_html = '';
 		//print out $test_settings_fields
-		if ( !empty( $test_settings_fields ) ) {
+		if ( ! empty($test_settings_fields)) {
 			echo $test_settings_fields;
-			$test_settings_html = '<input type="submit" class="button-primary mtp-test-button alignright" name="test_button" value="' . __('Test Send', 'event_espresso') . '" /><div style="clear:both"></div>';
+			$test_settings_html = '<input type="submit" class="button-primary mtp-test-button alignright" name="test_button" value="'.__('Test Send', 'event_espresso').'" /><div style="clear:both"></div>';
 		}
 
 		//and button
-		echo $test_settings_html . '<p>' . __('Need to reset this message type and start over?', 'event_espresso') . '</p>' . '<div class="publishing-action alignright resetbutton">' . $button . '</div><div style="clear:both"></div>';
+		echo $test_settings_html.'<p>'.__('Need to reset this message type and start over?', 'event_espresso').'</p>'.'<div class="publishing-action alignright resetbutton">'.$button.'</div><div style="clear:both"></div>';
 	}
 
 
@@ -1572,13 +1572,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);
 	}
 
 
@@ -1592,13 +1592,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
 		}
 
@@ -1615,7 +1615,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();
 	}
@@ -1632,14 +1632,14 @@ 
 	 * @param  boolean $merged Whether to merge all the shortcodes into one list of unique shortcodes
 	 * @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();
 	}
 
 
@@ -1652,19 +1652,19 @@ 
 	 */
 	protected function _set_message_template_group() {
 
-		if ( !empty( $this->_message_template_group ) )
+		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) )
+		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();
@@ -1690,26 +1690,26 @@ 
 		<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; ?>><?php echo $context_details[$context]['label']; ?></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']; ?>
@@ -1733,8 +1733,8 @@ 
 	 * @param int $index This helps us know which template field to select from the request 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 {
@@ -1766,27 +1766,27 @@ 
 
 
 
-	protected function _insert_or_update_message_template($new = FALSE ) {
+	protected function _insert_or_update_message_template($new = FALSE) {
 
-		do_action ( 'AHEE_log', __FILE__, __FUNCTION__, '');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 		$success = 0;
 		$override = FALSE;
 
 		//setup notices description
-		$messenger = !empty($this->_req_data['MTP_messenger']) ? ucwords(str_replace('_', ' ', $this->_req_data['MTP_messenger'] ) ) : false;
-		$message_type = !empty($this->_req_data['MTP_message_type']) ? ucwords(str_replace('_', ' ', $this->_req_data['MTP_message_type'] ) ) : false;
-		$context = !empty($this->_req_data['MTP_context']) ? ucwords(str_replace('_', ' ', $this->_req_data['MTP_context'] ) ) : false;
+		$messenger = ! empty($this->_req_data['MTP_messenger']) ? ucwords(str_replace('_', ' ', $this->_req_data['MTP_messenger'])) : false;
+		$message_type = ! empty($this->_req_data['MTP_message_type']) ? ucwords(str_replace('_', ' ', $this->_req_data['MTP_message_type'])) : false;
+		$context = ! empty($this->_req_data['MTP_context']) ? ucwords(str_replace('_', ' ', $this->_req_data['MTP_context'])) : false;
 
-		$item_desc = $messenger ? $messenger . ' ' . $message_type . ' ' . $context . ' ' : '';
+		$item_desc = $messenger ? $messenger.' '.$message_type.' '.$context.' ' : '';
 		$item_desc .= 'Message Template';
 		$query_args = array();
 		$validates = '';
 
 		//if this is "new" then we need to generate the default contexts for the selected messenger/message_type for user to edit.
-		if ( $new ) {
-			$GRP_ID = !empty( $this->_req_data['GRP_ID'] ) ? $this->_req_data['GRP_ID'] : 0;
-			if ( $edit_array = $this->_generate_new_templates($messenger, $message_type, $GRP_ID ) ) {
-				if ( empty($edit_array) ) {
+		if ($new) {
+			$GRP_ID = ! empty($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : 0;
+			if ($edit_array = $this->_generate_new_templates($messenger, $message_type, $GRP_ID)) {
+				if (empty($edit_array)) {
 					$success = 0;
 				} else {
 					$success = 1;
@@ -1805,34 +1805,34 @@ 
 
 
 			//run update for each template field in displayed context
-			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__ );
+			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__);
 				$success = 0;
 				$action_desc = '';
 
 			} else {
 				//first validate all fields!
-				$validates = $MTPG->validate($this->_req_data['MTP_template_fields'], $this->_req_data['MTP_context'],  $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type']);
+				$validates = $MTPG->validate($this->_req_data['MTP_template_fields'], $this->_req_data['MTP_context'], $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type']);
 
 				//if $validate returned error messages (i.e. is_array()) then we need to process them and setup an appropriate response. HMM, dang this isn't correct, $validates will ALWAYS be an array.  WE need to make sure there is no actual error messages in validates.
-				if ( is_array($validates) && !empty($validates) ) {
+				if (is_array($validates) && ! empty($validates)) {
 					//add the transient so when the form loads we know which fields to highlight
-					$this->_add_transient( 'edit_message_template', $validates );
+					$this->_add_transient('edit_message_template', $validates);
 
 					$success = 0;
-					$action_desc ='';
+					$action_desc = '';
 
 					//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 {
-					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( 'MTP_ID' => $this->_req_data['MTP_template_fields'][$template_field]['MTP_ID']);
+						$where_cols_n_values = array('MTP_ID' => $this->_req_data['MTP_template_fields'][$template_field]['MTP_ID']);
 
 						$message_template_fields = array(
 							'GRP_ID' => $set_column_values['GRP_ID'],
@@ -1840,10 +1840,10 @@ 
 							'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 ) {
-								$msg = sprintf( __('%s field was NOT updated for some reason', 'event_espresso'), $template_field );
-								EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__ );
+						if ($updated = $MTP->update($message_template_fields, array($where_cols_n_values))) {
+							if ($updated === FALSE) {
+								$msg = sprintf(__('%s field was NOT updated for some reason', 'event_espresso'), $template_field);
+								EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 							} else {
 								$success = 1;
 							}
@@ -1860,24 +1860,24 @@ 
 						'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_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'] : ''
 						);
 
-					$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 ) {
-						$msg = sprintf( __('The Message Template Group (%d) was NOT updated for some reason', 'event_espresso'), $set_column_values['GRP_ID'] );
-						EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__ );
+					if ($updated === FALSE) {
+						$msg = sprintf(__('The Message Template Group (%d) was NOT updated for some reason', 'event_espresso'), $set_column_values['GRP_ID']);
+						EE_Error::add_error($msg, __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' ] ) ? $this->_req_data['MTP_template_pack'] : 'default';
-						$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 );
+						$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']) ? $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);
 						}
 						$success = 1;
 					}
@@ -1887,7 +1887,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'] = '';
@@ -1895,9 +1895,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();
@@ -1905,13 +1905,13 @@ 
 
 
 		//was a test send triggered?
-		if ( isset( $this->_req_data['test_button'] ) ) {
+		if (isset($this->_req_data['test_button'])) {
 			EE_Error::overwrite_success();
-			$this->_do_test_send( $this->_req_data['MTP_context'],  $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type'] );
+			$this->_do_test_send($this->_req_data['MTP_context'], $this->_req_data['MTP_messenger'], $this->_req_data['MTP_message_type']);
 			$override = TRUE;
 		}
 
-		if ( empty( $query_args ) ) {
+		if (empty($query_args)) {
 			$query_args = array(
 				'id' => $this->_req_data['GRP_ID'],
 				'context' => $this->_req_data['MTP_context'],
@@ -1919,7 +1919,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);
 	}
 
 
@@ -1932,24 +1932,24 @@ 
 	 * @param  string $message_type message type being tested
 	 * @return void
 	 */
-	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'] : '';
+		$this->_req_data['GRP_ID'] = isset($this->_req_data['GRP_ID']) ? $this->_req_data['GRP_ID'] : '';
 
 		//let's save any existing fields that might be required by the messenger
-		if ( isset( $this->_req_data['test_settings_fld'] ) ) {
-			$this->_active_messengers[$messenger]['obj']->set_existing_test_settings( $this->_req_data['test_settings_fld'] );
+		if (isset($this->_req_data['test_settings_fld'])) {
+			$this->_active_messengers[$messenger]['obj']->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__);
 		}
 	}
 
@@ -1971,12 +1971,12 @@ 
 	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;
 
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
-		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);
 
 	}
 
@@ -1992,33 +1992,33 @@ 
 	 * @param boolean $all whether this is going to trash/restore all contexts within a template group (TRUE) OR just an individual context (FALSE).
 	 * @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 {
@@ -2030,13 +2030,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());
 
 	}
 
@@ -2052,26 +2052,26 @@ 
 	 * @return void
 	 */
 	protected function _delete_message_template() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$success = 1;
 
 		//checkboxes
-		if ( !empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'] ) ) {
+		if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) {
 			//if array has more than one element 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());
 
 	}
 
@@ -2084,20 +2084,20 @@ 
 	 * @param  bool $include_group whether to delete the Message Template Group as well.
 	 * @return success        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 )
+		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;
@@ -2115,7 +2115,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>';
 	}
 
 
@@ -2129,14 +2129,14 @@ 
 	 */
 	protected function _settings() {
 
-		EE_Registry::instance()->load_helper( 'Tabbed_Content' );
+		EE_Registry::instance()->load_helper('Tabbed_Content');
 
 		$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 -->';
 
@@ -2155,10 +2155,10 @@ 
 	 */
 	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;
 
-		$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';
 
 		//get all installed messengers and message_types
 		$installed_message_objects = $this->_get_installed_message_objects();
@@ -2168,10 +2168,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' => isset( $this->_active_messengers[$messenger->name] ) ? 'messenger-active' : '',
+				'class' => isset($this->_active_messengers[$messenger->name]) ? 'messenger-active' : '',
 				'href' => $messenger->name,
 				'title' => __('Modify this Messenger', 'event_espresso'),
 				'slug' => $messenger->name,
@@ -2181,23 +2181,23 @@ 
 			$message_types_for_messenger = $messenger->get_valid_message_types();
 
 			//assemble the array for the ACTIVE and INACTIVE message types with the selected messenger //note that all message types will be in the inactive box if the messenger is NOT active.
-			$selected_settings = isset( $this->_active_messengers[$messenger->name]['settings'] ) ? $this->_active_messengers[$messenger->name]['settings'] : array();
-			foreach ( $message_types as $message_type ) {
+			$selected_settings = isset($this->_active_messengers[$messenger->name]['settings']) ? $this->_active_messengers[$messenger->name]['settings'] : array();
+			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 = isset( $selected_settings[$messenger->name . '-message_types'][$message_type->name] ) && $selected_settings[$messenger->name . '-message_types'][$message_type->name] ? 'active' : 'inactive';
+				$a_or_i = isset($selected_settings[$messenger->name.'-message_types'][$message_type->name]) && $selected_settings[$messenger->name.'-message_types'][$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',
+						'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'),
-						'content' => $a_or_i == 'active' ? $this->_message_type_settings_content( $message_type, $messenger, TRUE ) : $this->_message_type_settings_content( $message_type, $messenger ),
+						'content' => $a_or_i == 'active' ? $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
@@ -2214,34 +2214,34 @@ 
 	 * @param  boolean $active       Whether the message type is active or not
 	 * @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;
@@ -2261,13 +2261,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;
 	}
 
@@ -2284,21 +2284,21 @@ 
 		$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';
 
-		foreach ( $this->_m_mt_settings['messenger_tabs'] as $messenger => $tab_array ) {
+		foreach ($this->_m_mt_settings['messenger_tabs'] as $messenger => $tab_array) {
 
-			$hide_on_message = isset( $this->_active_messengers[$messenger] ) ? '' : 'hidden';
-			$hide_off_message = isset( $this->_active_messengers[$messenger] ) ? 'hidden' : '';
+			$hide_on_message = isset($this->_active_messengers[$messenger]) ? '' : 'hidden';
+			$hide_off_message = isset($this->_active_messengers[$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'] : '';
-			$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'] ) : '',
-					'content' => $this->_get_messenger_box_content( $tab_array['obj'] ),
+			$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_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']),
 					'hidden' => $active ? '' : ' hidden',
 					'hide_on_message' => $hide_on_message,
 					'messenger' => $messenger,
@@ -2307,10 +2307,10 @@ 
 
 
 			//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,
 				'hide_off_message' => $hide_off_message,
@@ -2320,19 +2320,19 @@ 
 		}
 
 		//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 );
-			add_meta_box( 'espresso_' . $msgr . '_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 );
+		$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', $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);
 		}
 
 		//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 ) {
-			$callback_args = array( 'template_path' => $mt_template_path, 'template_args' => $mt_template_args[$box] );
-			$mt = str_replace( '_i_box', '', $box );
-			add_meta_box( 'espresso_' . $mt . '_inactive_mts', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen_id, 'side', 'high', $callback_args );
+		$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]);
+			$mt = str_replace('_i_box', '', $box);
+			add_meta_box('espresso_'.$mt.'_inactive_mts', $label, create_function('$post, $metabox', 'echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );'), $this->_current_screen_id, 'side', 'high', $callback_args);
 		}
 
 	}
@@ -2343,13 +2343,13 @@ 
 	 * @param  array $tab_array  This is an array of message type tab details used to generate the tabs
 	 * @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;
@@ -2363,7 +2363,7 @@ 
 	 * @param  object $messenger The messenger we're setting up content for
 	 * @return string            html formatted content
 	 */
-	protected function _get_messenger_box_content( $messenger ) {
+	protected function _get_messenger_box_content($messenger) {
 
 		$fields = $messenger->get_admin_settings_fields();
 		$settings_template_args['template_form_fields'] = '';
@@ -2372,27 +2372,27 @@ 
 		$settings_template_args['active'] = isset($this->_active_messengers[$messenger->name]) ? TRUE : FALSE;
 
 
-		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]) ? $existing_settings[$field_id] : $fldprops['default'],
+					'value' => isset($existing_settings[$field_id]) ? $existing_settings[$field_id] : $fldprops['default'],
 					'css_class' => '',
 					'format' => $fldprops['format']
 					);
 			}
 
 
-			$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') : '';
 		}
 
 		//we also need some hidden fields
@@ -2408,8 +2408,8 @@ 
 			);
 
 		//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
@@ -2417,25 +2417,25 @@ 
 			}
 		}
 
-		$settings_template_args['hidden_fields'] = $this->_generate_admin_form_fields( $settings_template_args['hidden_fields'], 'array' );
+		$settings_template_args['hidden_fields'] = $this->_generate_admin_form_fields($settings_template_args['hidden_fields'], 'array');
 
-		$active = isset( $this->_active_messengers[$messenger->name] ) ? TRUE : FALSE;
+		$active = isset($this->_active_messengers[$messenger->name]) ? TRUE : FALSE;
 
 		$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'] = isset( $this->_active_messengers[$messenger->name] ) ? $settings_template_args['show_hide_edit_form'] : ' hidden';
+		$settings_template_args['show_hide_edit_form'] = isset($this->_active_messengers[$messenger->name]) ? $settings_template_args['show_hide_edit_form'] : ' hidden';
 
-		$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['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;
 	}
 
@@ -2449,39 +2449,39 @@ 
 	public function activate_messenger_toggle() {
 		$success = TRUE;
 		//let's check that we have required data
-		if ( !isset( $this->_req_data[ 'messenger' ] ) ) {
-			EE_Error::add_error( __('Messenger name needed to toggle activation. None given', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['messenger'])) {
+			EE_Error::add_error(__('Messenger name needed to toggle activation. None given', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
 
 		//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' ])) {
-			EE_Error::add_error( __('Messenger status needed to know whether activation or deactivation is happening. No status is given', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		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__);
 			$success = FALSE;
 		}
 
 		//do check to verify we have a valid status.
 		$status = $this->_req_data['status'];
 
-		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'] ), __FILE__, __FUNCTION__, __LINE__ );
+		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']), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
 
-		if ( $success ) {
+		if ($success) {
 			//made it here?  Stop dawdling then!!
-			if ( $status == 'off' ) {
+			if ($status == 'off') {
 				//off = deactivate.  get it?
-				$success = $this->_activate_messenger( $this->_req_data['messenger'], TRUE );
+				$success = $this->_activate_messenger($this->_req_data['messenger'], TRUE);
 			} else {
-				$success = $this->_activate_messenger( $this->_req_data['messenger'] );
+				$success = $this->_activate_messenger($this->_req_data['messenger']);
 			}
 		}
 
@@ -2507,26 +2507,26 @@ 
 
 
 		//let's make sure we have the necessary data
-		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__ );
+		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__);
 			$success = FALSE;
 		}
 
 
 		//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 ( !isset( $this->_req_data[ 'messenger' ] ) ) {
-			EE_Error::add_error( __('Messenger name needed to toggle activation. None given', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! isset($this->_req_data['messenger'])) {
+			EE_Error::add_error(__('Messenger name needed to toggle activation. None given', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
 
-		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__ );
+		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__);
 			$success = FALSE;
 		}
 
@@ -2534,16 +2534,16 @@ 
 		//do check to verify we have a valid status.
 		$status = $this->_req_data['status'];
 
-		if ( $status != 'activate' && $status != 'deactivate' ) {
-			EE_Error::add_error( sprintf( __('The given status (%s) is not valid. Must be "active" or "inactive"', 'event_espresso'), $this->_req_data['status'] ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($status != 'activate' && $status != 'deactivate') {
+			EE_Error::add_error(sprintf(__('The given status (%s) is not valid. Must be "active" or "inactive"', 'event_espresso'), $this->_req_data['status']), __FILE__, __FUNCTION__, __LINE__);
 			$success = FALSE;
 		}
 
 
-		if ( $success ) {
+		if ($success) {
 			//made it here? um, what are you waiting for then?
 			$deactivate = $status == 'deactivate' ? TRUE : FALSE;
-			$success = $this->_activate_messenger( $this->_req_data['messenger'], $deactivate, $this->_req_data['message_type'] );
+			$success = $this->_activate_messenger($this->_req_data['messenger'], $deactivate, $this->_req_data['message_type']);
 		}
 
 		$this->_template_args['success'] = $success;
@@ -2570,28 +2570,28 @@ 
 		$templates = TRUE;
 		$this->_set_m_mt_settings();
 
-		if ( !$deactivate ) {
+		if ( ! $deactivate) {
 
 
 			//we are activating.  we can use $this->_m_mt_settings to get all the installed messengers
-			$this->_active_messengers[$messenger]['settings'] = !isset($this->_active_messengers[$messenger]['settings']) ? array() : $this->_active_messengers[$messenger]['settings'];
+			$this->_active_messengers[$messenger]['settings'] = ! isset($this->_active_messengers[$messenger]['settings']) ? array() : $this->_active_messengers[$messenger]['settings'];
 			$this->_active_messengers[$messenger]['obj'] = $this->_m_mt_settings['messenger_tabs'][$messenger]['obj'];
 
 			//get has_active so we can sure its kept up to date.
-			$has_activated = get_option( 'ee_has_activated_messages' );
+			$has_activated = get_option('ee_has_activated_messages');
 
-			if ( empty( $has_activated[$messenger] ) ) {
+			if (empty($has_activated[$messenger])) {
 				$has_activated[$messenger] = array();
 			}
 
 			//k we need to get what default message types are to be associated with the messenger that's been activated.
 			$default_types = $message_type ? (array) $message_type : $this->_active_messengers[$messenger]['obj']->get_default_message_types();
 
-			foreach ( $default_types as $type ) {
+			foreach ($default_types as $type) {
 				$settings_fields = $this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'][$type]['obj']->get_admin_settings_fields();
-				if ( !empty( $settings_fields ) ) {
+				if ( ! empty($settings_fields)) {
 					//we have fields for this message type so let's get the defaults for saving.
-					foreach ( $settings_fields as $field => $values ) {
+					foreach ($settings_fields as $field => $values) {
 						$settings[$field] = $values['default'];
 					}
 					//let's set the data for reloading this message type form in ajax
@@ -2599,9 +2599,9 @@ 
 				} else {
 					$settings = array();
 				}
-				$this->_active_messengers[$messenger]['settings'][$messenger . '-message_types'][$type]['settings'] =  $settings;
+				$this->_active_messengers[$messenger]['settings'][$messenger.'-message_types'][$type]['settings'] = $settings;
 
-				if ( ! in_array( $type, $has_activated[$messenger] ) ) {
+				if ( ! in_array($type, $has_activated[$messenger])) {
 					$has_activated[$messenger][] = $type;
 				}
 			}
@@ -2609,41 +2609,41 @@ 
 			//any default settings for the messenger?
 			$msgr_settings = $this->_active_messengers[$messenger]['obj']->get_admin_settings_fields();
 
-			if ( !empty( $msgr_settings ) ) {
-				foreach ( $msgr_settings as $field => $value ) {
+			if ( ! empty($msgr_settings)) {
+				foreach ($msgr_settings as $field => $value) {
 					$this->_active_messengers[$messenger]['settings'][$field] = $value;
 				}
 			}
 
 			//update settings in database
-			EEH_MSG_Template::update_active_messengers_in_db( $this->_active_messengers );
-			update_option( 'ee_has_activated_messages', $has_activated );
+			EEH_MSG_Template::update_active_messengers_in_db($this->_active_messengers);
+			update_option('ee_has_activated_messages', $has_activated);
 
 
 			//generate new templates (if necessary)
-			$templates = $this->_generate_new_templates( $messenger, $default_types, 0, TRUE );
+			$templates = $this->_generate_new_templates($messenger, $default_types, 0, TRUE);
 
 			EE_Error::overwrite_success();
 
 			//if generation failed then we need to remove the active messenger.
-			if ( !$templates ) {
+			if ( ! $templates) {
 				unset($this->_active_messengers[$messenger]);
-				EEH_MSG_Template::update_active_messengers_in_db( $this->_active_messengers );
+				EEH_MSG_Template::update_active_messengers_in_db($this->_active_messengers);
 			} else {
 				//all is good let's do a success message
-				if ( $message_type ) {
-					EE_Error::add_success( sprintf( __('%s message type has been successfully activated with the %s messenger', 'event_espresso'),ucwords($this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'][$message_type]['obj']->label['singular']), ucwords( $this->_active_messengers[$messenger]['obj']->label['singular'] ) ) );
+				if ($message_type) {
+					EE_Error::add_success(sprintf(__('%s message type has been successfully activated with the %s messenger', 'event_espresso'), ucwords($this->_m_mt_settings['message_type_tabs'][$messenger]['inactive'][$message_type]['obj']->label['singular']), ucwords($this->_active_messengers[$messenger]['obj']->label['singular'])));
 
 					//if message type was invoice then let's make sure we activate the invoice payment method.
-					if ( $message_type == '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 == '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'));
 						}
 					}
 				} else {
-					EE_Error::add_success( sprintf( __('%s messenger has been successfully activated', 'event_espresso'), ucwords( $this->_active_messengers[$messenger]['obj']->label['singular'] ) ) );
+					EE_Error::add_success(sprintf(__('%s messenger has been successfully activated', 'event_espresso'), ucwords($this->_active_messengers[$messenger]['obj']->label['singular'])));
 				}
 			}
 
@@ -2659,36 +2659,36 @@ 
 			$update_array = array(
 				'MTP_messenger' => $messenger);
 
-			if ( $message_type ) {
+			if ($message_type) {
 				$update_array['MTP_message_type'] = $message_type;
 			}
 
-			$success = $MTP->update( array( 'MTP_is_active' => 0 ), array($update_array) );
+			$success = $MTP->update(array('MTP_is_active' => 0), array($update_array));
 
 			$messenger_obj = $this->_active_messengers[$messenger]['obj'];
 
 			//if this is a message type deactivation then we're only unsetting the message type otherwise unset the messenger
-			if ( $message_type ) {
-				unset( $this->_active_messengers[$messenger]['settings'][$messenger . '-message_types'][$message_type] );
+			if ($message_type) {
+				unset($this->_active_messengers[$messenger]['settings'][$messenger.'-message_types'][$message_type]);
 			} else {
-				unset( $this->_active_messengers[$messenger] );
+				unset($this->_active_messengers[$messenger]);
 			}
 
-			EEH_MSG_Template::update_active_messengers_in_db( $this->_active_messengers );
+			EEH_MSG_Template::update_active_messengers_in_db($this->_active_messengers);
 			EE_Error::overwrite_success();
-			if ( $message_type ) {
-				EE_Error::add_success( sprintf( __('%s message type has been successfully deactivated', 'event_espresso'), ucwords($this->_m_mt_settings['message_type_tabs'][$messenger]['active'][$message_type]['obj']->label['singular']) ) );
+			if ($message_type) {
+				EE_Error::add_success(sprintf(__('%s message type has been successfully deactivated', 'event_espresso'), ucwords($this->_m_mt_settings['message_type_tabs'][$messenger]['active'][$message_type]['obj']->label['singular'])));
 			} else {
-				EE_Error::add_success( sprintf( __('%s messenger has been successfully deactivated', 'event_espresso'), ucwords($messenger_obj->label['singular'] ) ) );
+				EE_Error::add_success(sprintf(__('%s messenger has been successfully deactivated', 'event_espresso'), ucwords($messenger_obj->label['singular'])));
 			}
 
 			//if messenger was html or message type was invoice then let's make sure we deactivate invoice payment method.
-			if ( $messenger == 'html'  || $message_type == '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 == '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 vist 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 );
+			if ($messenger == 'html' || $message_type == '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 == '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 vist 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);
 				}
 			}
 
@@ -2705,8 +2705,8 @@ 
 	 * @return string html data
 	 */
 	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();
 		}
 
@@ -2715,7 +2715,7 @@ 
 		$message_type = $message_types[$this->_req_data['message_type']]['obj'];
 		$messenger = $this->_active_messengers[$this->_req_data['messenger']]['obj'];
 
-		$content = $this->_message_type_settings_content ( $message_type, $messenger, TRUE, TRUE );
+		$content = $this->_message_type_settings_content($message_type, $messenger, TRUE, TRUE);
 		$this->_template_args['success'] = true;
 		$this->_template_args['content'] = $content;
 		$this->_return_json();
@@ -2729,36 +2729,36 @@ 
 	 * @return json success or fail message
 	 */
 	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' :
-						if ( isset( $this->_active_messengers[$messenger]['settings'][$messenger . '-message_types'] ) ) {
-							foreach ( $this->_active_messengers[$messenger]['settings'][$messenger . '-message_types'] as $mt => $v ) {
-								if ( isset( $settings['message_types'][$mt] ) )
-									$settings[$messenger . '-message_types'][$mt]['settings'] = isset( $this->_active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt] ) ? $this->_active_messengers[$messenger]['settings'][$messenger . '-message_types'][$mt] : array();
+						if (isset($this->_active_messengers[$messenger]['settings'][$messenger.'-message_types'])) {
+							foreach ($this->_active_messengers[$messenger]['settings'][$messenger.'-message_types'] as $mt => $v) {
+								if (isset($settings['message_types'][$mt]))
+									$settings[$messenger.'-message_types'][$mt]['settings'] = isset($this->_active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt]) ? $this->_active_messengers[$messenger]['settings'][$messenger.'-message_types'][$mt] : array();
 							}
 						} else {
-							foreach ( $value as $mt => $v ) {
+							foreach ($value as $mt => $v) {
 								//let's see if this message type is already present and has settings.
-								$settings[$messenger . '-message_types'][$mt]['settings'] = array();
+								$settings[$messenger.'-message_types'][$mt]['settings'] = array();
 							}
 						}
 						//k settings are set let's get rid of the message types index
-						unset( $settings['message_types'] );
+						unset($settings['message_types']);
 						break;
 					default :
 						$settings[$key] = $value;
@@ -2768,36 +2768,36 @@ 
 			$this->_active_messengers[$messenger]['settings'] = $settings;
 		}
 
-		else if ( $this->_req_data['type'] == 'message_type' ) {
+		else if ($this->_req_data['type'] == 'message_type') {
 			$settings = $this->_req_data['message_type_settings'];
 			$messenger = $settings['messenger'];
 			$message_type = $settings['message_type'];
 
-			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['settings'][$key] = $value;
-						unset( $settings[$key] );
+						unset($settings[$key]);
 						break;
 				}
 			}
 
-			$this->_active_messengers[$messenger]['settings'][$messenger . '-message_types'][$message_type] = $settings;
+			$this->_active_messengers[$messenger]['settings'][$messenger.'-message_types'][$message_type] = $settings;
 		}
 
 		//okay we should have the data all setup.  Now we just update!
-		$success = EEH_MSG_Template::update_active_messengers_in_db( $this->_active_messengers );
+		$success = EEH_MSG_Template::update_active_messengers_in_db($this->_active_messengers);
 
-		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;

admin_pages/messages/templates/shortcode_selector_skeleton.template.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * This file contains the template for the Messages Shortcode selector.
- *
- * Template args available are:
- * @type    array   $shortcodes An array indexed by shortcode and the values are the labels.
- * @type    string  $fieldname  The name of the field the chooser is associated with.
- * @type    string  $linked_input_id The name of the input that the shortcode gets inserted to.
- */
+			 * This file contains the template for the Messages Shortcode selector.
+			 *
+			 * Template args available are:
+			 * @type    array   $shortcodes An array indexed by shortcode and the values are the labels.
+			 * @type    string  $fieldname  The name of the field the chooser is associated with.
+			 * @type    string  $linked_input_id The name of the input that the shortcode gets inserted to.
+			 */
 if ( ! empty( $shortcodes ) ) : ?>
 <span class="ee-messages-shortcodes-chooser js-open-list-trigger dashicons dashicons-menu">
 	<ul id="ee_shortcode_chooser_<?php echo $fieldname; ?>" class="ee_shortcode_chooser_container hidden">

Spacing +4 added lines, -4 removed lines

@@ -7,14 +7,14 @@
  * @type    string  $fieldname  The name of the field the chooser is associated with.
  * @type    string  $linked_input_id The name of the input that the shortcode gets inserted to.
  */
-if ( ! empty( $shortcodes ) ) : ?>
+if ( ! empty($shortcodes)) : ?>
 <span class="ee-messages-shortcodes-chooser js-open-list-trigger dashicons dashicons-menu">
 	<ul id="ee_shortcode_chooser_<?php echo $fieldname; ?>" class="ee_shortcode_chooser_container hidden">
-		<?php foreach( $shortcodes as $shortcode => $label ) : ?>
+		<?php foreach ($shortcodes as $shortcode => $label) : ?>
 			<li>
-				<span class="js-shortcode-selection" data-value="<?php echo esc_attr( $shortcode ); ?>" data-linked-input-id="<?php echo esc_attr( $linked_input_id ); ?>"><?php echo $shortcode; ?></span>
+				<span class="js-shortcode-selection" data-value="<?php echo esc_attr($shortcode); ?>" data-linked-input-id="<?php echo esc_attr($linked_input_id); ?>"><?php echo $shortcode; ?></span>
 			</li>
 		<?php endforeach; ?>
 	</ul>
 </span>
-<?php endif ; ?>
\ No newline at end of file
+<?php endif; ?>
\ No newline at end of file

admin_pages/registration_form/Registration_Form_Admin_Page.core.php

Spacing +135 added lines, -135 removed lines

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

Braces +8 added lines, -10 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -328,10 +329,7 @@ 
 			else if ( $fieldName == 'QST_admin_label' && ( isset( $this->_req_data['QST_admin_label'] ) && empty( $this->_req_data['QST_admin_label'] )  )) {
 				$QST_text = isset( $this->_req_data['QST_display_text'] ) ? $this->_req_data['QST_display_text'] : '' ;
 				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text,10));
-			}
-
-
-			else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
+			} else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
 				$set_column_values[$fieldName] = 0;
 			}
 
@@ -366,7 +364,7 @@ 
 			$question=$this->_question_model->get_one_by_ID($ID);
 			$additional_hidden_fields=array('QST_ID'=>array('type'=>'hidden','value'=>$ID));
 			$this->_set_add_edit_form_tags('update_question', $additional_hidden_fields);
-		}else{
+		} else{
 			$question= EE_Question::new_instance();
 			$question->set_order_to_latest();
 			$this->_set_add_edit_form_tags('insert_question');
@@ -401,7 +399,7 @@ 
 			$ID=$this->_question_model->insert($set_column_values);
 			$success = $ID ? true : false;
 			$action_desc = 'added';
-		}else{
+		} else{
 			$ID=absint($this->_req_data['QST_ID']);
 			$pk=$this->_question_model->primary_key_name();
 			$wheres=array($pk=>$ID);
@@ -422,7 +420,7 @@ 
 					$option_req_index=$this->_get_option_req_data_index($option_ID);
 					if($option_req_index!==FALSE){
 						$option->save($this->_req_data['question_options'][$option_req_index]);
-					}else{
+					} else{
 						//not found, remove it
 						$option->delete();
 					}
@@ -498,7 +496,7 @@ 
 						'QSG_name'=>array('LIKE',"%$search_string%"),
 						'QSG_desc'=>array('LIKE',"%$search_string%"))
 					);
-			}else{
+			} else{
 				$query_params[0]=array(
 					'QST_display_text'=>array('LIKE',"%$search_string%")
 					);
@@ -548,7 +546,7 @@ 
 		if ($count){
 			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
 			$results = $QST->count($where);
-		}else{
+		} else{
 			$results = $QST->get_all($query_params);
 		}
 		return $results;

admin_pages/registration_form/templates/questions_main_meta_box.template.php

Spacing +48 added lines, -48 removed lines

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

admin_pages/registrations/EE_Registrations_List_Table.class.php

Indentation +10 added lines, -10 removed lines

@@ -332,12 +332,12 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-    function column_cb($item){
+	function column_cb($item){
 	/** checkbox/lock **/
 	$transaction = $item->get_first_related( 'Transaction' );
 	$payment_count = $transaction instanceof EE_Transaction ? $transaction->count_related( 'Payment' ) : 0;
 	return $payment_count > 0 ? sprintf( '<input type="checkbox" name="_REG_ID[]" value="%1$s" />', $item->ID() ) . '<span class="ee-lock-icon"></span>' : sprintf( '<input type="checkbox" name="_REG_ID[]" value="%1$s" />', $item->ID() );
-    }
+	}
 
 
 
@@ -371,7 +371,7 @@ 
 	 */
 	function column__REG_date(EE_Registration $item){
 		$this->_set_related_details($item);
-       		 //Build row actions
+	   		 //Build row actions
 		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=> $this->_transaction_details['id'] ), TXN_ADMIN_URL );
 		$view_link = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '<a class="ee-status-color-' . $this->_transaction_details['status'] . '" href="'.$view_lnk_url.'" title="' . esc_attr( $this->_transaction_details['title_attr'] ) . '">' . $item->get_i18n_datetime( 'REG_date' ) . '</a>' : $item->get_i18n_datetime( 'REG_date' );
 		$view_link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $this->_transaction_details['status'], false, 'sentence' ) . '</span>';
@@ -423,7 +423,7 @@ 
 		} else {
 			return __( 'There is no ticket on this registration', 'event_espresso' );
 		}
-    }
+	}
 
 
 
@@ -445,14 +445,14 @@ 
 		$t = $item->get_first_related('Transaction');
 		$payment_count = $t instanceof EE_Transaction ? $t->count_related('Payment') : 0;
 
-	    //append group count to name
-	    $link .= '&nbsp;' . sprintf(__( '(%1$s / %2$s)', 'event_espresso' ), $item->count(), $item->group_size());
+		//append group count to name
+		$link .= '&nbsp;' . sprintf(__( '(%1$s / %2$s)', 'event_espresso' ), $item->count(), $item->group_size());
 
-	    //append reg_code
-	    $link .= '<br>' . sprintf( __( 'Reg Code: %s', 'event_espresso' ), $item->get('REG_code') );
+		//append reg_code
+		$link .= '<br>' . sprintf( __( 'Reg Code: %s', 'event_espresso' ), $item->get('REG_code') );
 
-	    //reg status text for accessibility
-	    $link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+		//reg status text for accessibility
+		$link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
 
 		//trash/restore/delete actions
 		$actions = array();

Spacing +159 added lines, -159 removed lines

@@ -57,20 +57,20 @@ 
 	 * @param \EE_Admin_Page $admin_page
 	 * @return EE_Registrations_List_Table
 	 */
-	function __construct( $admin_page ){
+	function __construct($admin_page) {
 
-		if ( ! empty( $_GET['event_id'] ) ) {
+		if ( ! empty($_GET['event_id'])) {
 			$extra_query_args = array();
-			foreach ( $admin_page->get_views() as $key => $view_details ) {
-				$extra_query_args[$view_details['slug']] = array( 'event_id' => $_GET['event_id'] );
+			foreach ($admin_page->get_views() as $key => $view_details) {
+				$extra_query_args[$view_details['slug']] = array('event_id' => $_GET['event_id']);
 			}
-			$this->_views = $admin_page->get_list_table_view_RLs( $extra_query_args );
+			$this->_views = $admin_page->get_list_table_view_RLs($extra_query_args);
 		}
 
 		parent::__construct($admin_page);
 		$this->_status = $this->_admin_page->get_registration_status_array();
 
-		EE_Registry::instance()->load_helper( 'Template' );
+		EE_Registry::instance()->load_helper('Template');
 	}
 
 
@@ -81,8 +81,8 @@ 
 	 * @return void
 	 */
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_registrations( $this->_per_page );
-		$this->_all_data_count = $this->_admin_page->get_registrations( $this->_per_page, TRUE, FALSE, FALSE );
+		$this->_data = $this->_admin_page->get_registrations($this->_per_page);
+		$this->_all_data_count = $this->_admin_page->get_registrations($this->_per_page, TRUE, FALSE, FALSE);
 	}
 
 
@@ -101,36 +101,36 @@ 
 			);
 
 
-		if ( isset( $_GET['event_id'] )) {
+		if (isset($_GET['event_id'])) {
 			$this->_columns = array(
 				'cb' => '<input type="checkbox" />', //Render a checkbox instead of text
-				'_REG_ID' => __( 'ID', 'event_espresso' ),
-				'ATT_fname' => __( 'Name', 'event_espresso' ),
+				'_REG_ID' => __('ID', 'event_espresso'),
+				'ATT_fname' => __('Name', 'event_espresso'),
 				'ATT_email' =>  __('Email', 'event_espresso'),
-				'_REG_date' => __( 'Reg Date', 'event_espresso' ),
-				'PRC_amount' => __( 'TKT Price', 'event_espresso' ),
-				'_REG_final_price' => __( 'Final Price', 'event_espresso' ),
-				'TXN_total' => __( 'Total Txn', 'event_espresso' ),
+				'_REG_date' => __('Reg Date', 'event_espresso'),
+				'PRC_amount' => __('TKT Price', 'event_espresso'),
+				'_REG_final_price' => __('Final Price', 'event_espresso'),
+				'TXN_total' => __('Total Txn', 'event_espresso'),
 				'TXN_paid' => __('Paid', 'event_espresso'),
-				'actions' => __( 'Actions', 'event_espresso' )
+				'actions' => __('Actions', 'event_espresso')
 				);
 			$this->_bottom_buttons = array(
 					'report'=> array(
 					'route' => 'registrations_report',
-					'extra_request' => isset( $this->_req_data['event_id'] ) ? array('EVT_ID'=>$this->_req_data['event_id']) : NULL
+					'extra_request' => isset($this->_req_data['event_id']) ? array('EVT_ID'=>$this->_req_data['event_id']) : NULL
 				),
 			);
 		} else {
 			$this->_columns = array(
 				'cb' => '<input type="checkbox" />', //Render a checkbox instead of text
-				'_REG_ID' => __( 'ID', 'event_espresso' ),
-				'ATT_fname' => __( 'Name', 'event_espresso' ),
-				'_REG_date' => __( 'TXN Date', 'event_espresso' ),
-				'event_name' => __( 'Event', 'event_espresso' ),
-					'DTT_EVT_start' => __( 'Event Date', 'event_espresso' ),
-				'_REG_final_price' => __( 'Price', 'event_espresso' ),
-				'_REG_paid' => __( 'Paid', 'event_espresso' ),
-				'actions' => __( 'Actions', 'event_espresso' )
+				'_REG_ID' => __('ID', 'event_espresso'),
+				'ATT_fname' => __('Name', 'event_espresso'),
+				'_REG_date' => __('TXN Date', 'event_espresso'),
+				'event_name' => __('Event', 'event_espresso'),
+					'DTT_EVT_start' => __('Event Date', 'event_espresso'),
+				'_REG_final_price' => __('Price', 'event_espresso'),
+				'_REG_paid' => __('Paid', 'event_espresso'),
+				'actions' => __('Actions', 'event_espresso')
 			);
 			$this->_bottom_buttons = array(
 				'report_all'=> array(
@@ -142,11 +142,11 @@ 
 		$this->_primary_column = '_REG_ID';
 
 		$this->_sortable_columns = array(
-			'_REG_date' => array( '_REG_date' => TRUE ),   //true means its already sorted
-			'ATT_fname' => array( 'ATT_fname' => FALSE ),
-			'event_name' => array( 'event_name' => FALSE ),
-			'DTT_EVT_start'	=> array( 'DTT_EVT_start' => FALSE ),
-			'_REG_ID' => array( '_REG_ID' => FALSE ),
+			'_REG_date' => array('_REG_date' => TRUE), //true means its already sorted
+			'ATT_fname' => array('ATT_fname' => FALSE),
+			'event_name' => array('event_name' => FALSE),
+			'DTT_EVT_start'	=> array('DTT_EVT_start' => FALSE),
+			'_REG_ID' => array('_REG_ID' => FALSE),
 		);
 
 		$this->_hidden_columns = array();
@@ -155,11 +155,11 @@ 
 
 
 
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip reg-status-' . $item->status_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip reg-status-'.$item->status_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -172,15 +172,15 @@ 
 	 *
 	 * @param EE_Registration $registration
 	 */
-	protected function _set_related_details( EE_Registration $registration ) {
+	protected function _set_related_details(EE_Registration $registration) {
 
-		$transaction = $registration->get_first_related( 'Transaction' );
+		$transaction = $registration->get_first_related('Transaction');
 		$status = $transaction instanceof EE_Transaction ? $transaction->status_ID() : EEM_Transaction::failed_status_code;
 		$this->_transaction_details = array(
 			'transaction' => $transaction,
 			'status' => $status,
 			'id' => $transaction instanceof EE_Transaction ? $transaction->ID() : 0,
-			'title_attr' => sprintf( __('View Transaction Details (%s)', 'event_espresso'), EEH_Template::pretty_status( $status, false, 'sentence' ) )
+			'title_attr' => sprintf(__('View Transaction Details (%s)', 'event_espresso'), EEH_Template::pretty_status($status, false, 'sentence'))
 			);
 
 		$event = $registration->event();
@@ -189,7 +189,7 @@ 
 			'event' => $event,
 			'status' => $status,
 			'id' => $event instanceof EE_Event ? $event->ID() : 0,
-			'title_attr' => sprintf( __('Edit Event (%s)', 'event_espresso'), EEH_Template::pretty_status( $status, false, 'sentence' ) )
+			'title_attr' => sprintf(__('Edit Event (%s)', 'event_espresso'), EEH_Template::pretty_status($status, false, 'sentence'))
 			);
 	}
 
@@ -204,26 +204,26 @@ 
 		$filters = array();
 
 		//todo we're currently using old functions here. We need to move things into the Events_Admin_Page() class as methods.
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
+		EE_Registry::instance()->load_helper('Form_Fields');
 
-		$cur_date = isset( $this->_req_data['month_range'] ) ? $this->_req_data['month_range'] : '';
-		$cur_category = isset( $this->_req_data['EVT_CAT'] ) ? $this->_req_data['EVT_CAT'] : -1;
-		$reg_status = isset( $this->_req_data['_reg_status'] ) ? $this->_req_data['_reg_status'] : '';
+		$cur_date = isset($this->_req_data['month_range']) ? $this->_req_data['month_range'] : '';
+		$cur_category = isset($this->_req_data['EVT_CAT']) ? $this->_req_data['EVT_CAT'] : -1;
+		$reg_status = isset($this->_req_data['_reg_status']) ? $this->_req_data['_reg_status'] : '';
 
-		$filters[] = EEH_Form_Fields::generate_registration_months_dropdown( $cur_date, $reg_status, $cur_category );
-		$filters[] = EEH_Form_Fields::generate_event_category_dropdown( $cur_category );
+		$filters[] = EEH_Form_Fields::generate_registration_months_dropdown($cur_date, $reg_status, $cur_category);
+		$filters[] = EEH_Form_Fields::generate_event_category_dropdown($cur_category);
 
 		$status = array();
-		$status[] = array( 'id' => 0, 'text' => __('Select Status', 'event_espresso') );
-		foreach ( $this->_status as $key => $value ) {
-			$status[] = array( 'id' => $key, 'text' => $value );
+		$status[] = array('id' => 0, 'text' => __('Select Status', 'event_espresso'));
+		foreach ($this->_status as $key => $value) {
+			$status[] = array('id' => $key, 'text' => $value);
 		}
-		if ( $this->_view != 'incomplete' ) {
-			$filters[] = EEH_Form_Fields::select_input('_reg_status', $status, isset( $this->_req_data['_reg_status'] ) ? strtoupper( sanitize_key( $this->_req_data['_reg_status'] )) : '' );
+		if ($this->_view != 'incomplete') {
+			$filters[] = EEH_Form_Fields::select_input('_reg_status', $status, isset($this->_req_data['_reg_status']) ? strtoupper(sanitize_key($this->_req_data['_reg_status'])) : '');
 		}
 
-		if ( isset( $this->_req_data['event_id'] ) ) {
-			$filters[] = EEH_Form_Fields::hidden_input( 'event_id',  $this->_req_data['event_id'], 'reg_event_id' );
+		if (isset($this->_req_data['event_id'])) {
+			$filters[] = EEH_Form_Fields::hidden_input('event_id', $this->_req_data['event_id'], 'reg_event_id');
 		}
 
 		return $filters;
@@ -240,9 +240,9 @@ 
 		$this->_views['all']['count'] = $this->_total_registrations();
 		$this->_views['month']['count'] = $this->_total_registrations_this_month();
 		$this->_views['today']['count'] = $this->_total_registrations_today();
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registrations', 'espresso_registrations_trash_registrations' ) ) {
-			$this->_views['incomplete']['count'] = $this->_total_registrations( 'incomplete' );
-			$this->_views['trash']['count'] = $this->_total_registrations( 'trash' );
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registrations', 'espresso_registrations_trash_registrations')) {
+			$this->_views['incomplete']['count'] = $this->_total_registrations('incomplete');
+			$this->_views['trash']['count'] = $this->_total_registrations('trash');
 		}
 	}
 
@@ -254,23 +254,23 @@ 
 	 * @param string $view
 	 * @return int
 	 */
-	protected function _total_registrations( $view = '' ){
+	protected function _total_registrations($view = '') {
 		$_where = array();
-		$EVT_ID = isset( $this->_req_data['event_id'] ) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		if( $EVT_ID ) {
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		if ($EVT_ID) {
 			$_where['EVT_ID'] = $EVT_ID;
 		}
-		switch ( $view ) {
+		switch ($view) {
 			case 'trash' :
-				return EEM_Registration::instance()->count_deleted( array( $_where ));
+				return EEM_Registration::instance()->count_deleted(array($_where));
 				break;
 			case 'incomplete' :
 				$_where['STS_ID'] = EEM_Registration::status_id_incomplete;
 				break;
 			default :
-				$_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete );
+				$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
 		}
-		return EEM_Registration::instance()->count( array( $_where ));
+		return EEM_Registration::instance()->count(array($_where));
 	}
 
 
@@ -280,24 +280,24 @@ 
 	 * @access protected
 	 * @return int
 	 */
-	protected function _total_registrations_this_month(){
-		$EVT_ID = isset( $this->_req_data['event_id'] ) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$_where = $EVT_ID ? array( 'EVT_ID' => $EVT_ID ) : array();
+	protected function _total_registrations_this_month() {
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		$_where = $EVT_ID ? array('EVT_ID' => $EVT_ID) : array();
 		$this_year_r = date('Y', current_time('timestamp'));
 		$time_start = ' 00:00:00';
 		$time_end = ' 23:59:59';
 		$this_month_r = date('m', current_time('timestamp'));
-		$days_this_month = date( 't', current_time('timestamp') );
+		$days_this_month = date('t', current_time('timestamp'));
 		//setup date query.
-		$beginning_string = EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start, 'Y-m-d H:i:s' );
-		$end_string = EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end, 'Y-m-d H:i:s' );
-		$_where['REG_date']= array('BETWEEN',
+		$beginning_string = EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-01'.' '.$time_start, 'Y-m-d H:i:s');
+		$end_string = EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' '.$time_end, 'Y-m-d H:i:s');
+		$_where['REG_date'] = array('BETWEEN',
 			array(
 				$beginning_string,
 				$end_string
 		));
-		$_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete );
-		return EEM_Registration::instance()->count(array( $_where ) );
+		$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
+		return EEM_Registration::instance()->count(array($_where));
 	}
 
 
@@ -307,20 +307,20 @@ 
 	 * @access protected
 	 * @return int
 	 */
-	protected function _total_registrations_today(){
+	protected function _total_registrations_today() {
 
-		$EVT_ID = isset( $this->_req_data['event_id'] ) ? absint( $this->_req_data['event_id'] ) : FALSE;
-		$_where = $EVT_ID ? array( 'EVT_ID' => $EVT_ID ) : array();
+		$EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE;
+		$_where = $EVT_ID ? array('EVT_ID' => $EVT_ID) : array();
 		$current_date = date('Y-m-d', current_time('timestamp'));
 		$time_start = ' 00:00:00';
 		$time_end = ' 23:59:59';
-		$_where['REG_date']= array('BETWEEN',
+		$_where['REG_date'] = array('BETWEEN',
 			array(
-				EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $current_date . $time_start, 'Y-m-d H:i:s' ),
-				EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $current_date . $time_end, 'Y-m-d H:i:s' )
+				EEM_Registration::instance()->convert_datetime_for_query('REG_date', $current_date.$time_start, 'Y-m-d H:i:s'),
+				EEM_Registration::instance()->convert_datetime_for_query('REG_date', $current_date.$time_end, 'Y-m-d H:i:s')
 		));
-		$_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete );
-		return EEM_Registration::instance()->count(array( $_where ) );
+		$_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete);
+		return EEM_Registration::instance()->count(array($_where));
 	}
 
 
@@ -332,11 +332,11 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-    function column_cb($item){
+    function column_cb($item) {
 	/** checkbox/lock **/
-	$transaction = $item->get_first_related( 'Transaction' );
-	$payment_count = $transaction instanceof EE_Transaction ? $transaction->count_related( 'Payment' ) : 0;
-	return $payment_count > 0 ? sprintf( '<input type="checkbox" name="_REG_ID[]" value="%1$s" />', $item->ID() ) . '<span class="ee-lock-icon"></span>' : sprintf( '<input type="checkbox" name="_REG_ID[]" value="%1$s" />', $item->ID() );
+	$transaction = $item->get_first_related('Transaction');
+	$payment_count = $transaction instanceof EE_Transaction ? $transaction->count_related('Payment') : 0;
+	return $payment_count > 0 ? sprintf('<input type="checkbox" name="_REG_ID[]" value="%1$s" />', $item->ID()).'<span class="ee-lock-icon"></span>' : sprintf('<input type="checkbox" name="_REG_ID[]" value="%1$s" />', $item->ID());
     }
 
 
@@ -348,14 +348,14 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	function column__REG_ID(EE_Registration $item){
+	function column__REG_ID(EE_Registration $item) {
 		$attendee = $item->attendee();
 		$content = $item->ID();
 		$content .= '<div class="show-on-mobile-view-only">';
 		$content .= '<br>';
 		$content .= $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-		$content .= '&nbsp;' . sprintf(__( '(%1$s / %2$s)', 'event_espresso' ), $item->count(), $item->group_size());
-		$content .= '<br>' . sprintf( __( 'Reg Code: %s', 'event_espresso' ), $item->get('REG_code') );
+		$content .= '&nbsp;'.sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
+		$content .= '<br>'.sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
 		$content .= '</div>';
 		return $content;
 	}
@@ -369,12 +369,12 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	function column__REG_date(EE_Registration $item){
+	function column__REG_date(EE_Registration $item) {
 		$this->_set_related_details($item);
        		 //Build row actions
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=> $this->_transaction_details['id'] ), TXN_ADMIN_URL );
-		$view_link = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '<a class="ee-status-color-' . $this->_transaction_details['status'] . '" href="'.$view_lnk_url.'" title="' . esc_attr( $this->_transaction_details['title_attr'] ) . '">' . $item->get_i18n_datetime( 'REG_date' ) . '</a>' : $item->get_i18n_datetime( 'REG_date' );
-		$view_link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $this->_transaction_details['status'], false, 'sentence' ) . '</span>';
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=> $this->_transaction_details['id']), TXN_ADMIN_URL);
+		$view_link = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? '<a class="ee-status-color-'.$this->_transaction_details['status'].'" href="'.$view_lnk_url.'" title="'.esc_attr($this->_transaction_details['title_attr']).'">'.$item->get_i18n_datetime('REG_date').'</a>' : $item->get_i18n_datetime('REG_date');
+		$view_link .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($this->_transaction_details['status'], false, 'sentence').'</span>';
 		return $view_link;
 	}
 
@@ -387,18 +387,18 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	function column_event_name(EE_Registration $item){
-		$this->_set_related_details( $item );
+	function column_event_name(EE_Registration $item) {
+		$this->_set_related_details($item);
 		// page=espresso_events&action=edit_event&EVT_ID=2&edit_event_nonce=cf3a7e5b62
-		$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$item->event_ID() ), EVENTS_ADMIN_URL );
+		$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$item->event_ID()), EVENTS_ADMIN_URL);
 		$event_name = $item->event_name();
 		$event_name = $event_name ? $event_name : __("No Associated Event", 'event_espresso');
-		$edit_event = EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'edit_event', $item->event_ID() ) ? '<a class="ee-status-color-' . $this->_event_details['status'] . '" href="' . $edit_event_url . '" title="' . esc_attr( $this->_event_details['title_attr'] ) .'">' .  wp_trim_words( $event_name, 30, '...' ) . '</a>' : wp_trim_words( $event_name, 30, '...' ) ;
+		$edit_event = EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'edit_event', $item->event_ID()) ? '<a class="ee-status-color-'.$this->_event_details['status'].'" href="'.$edit_event_url.'" title="'.esc_attr($this->_event_details['title_attr']).'">'.wp_trim_words($event_name, 30, '...').'</a>' : wp_trim_words($event_name, 30, '...');
 
-		$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'event_id'=>$item->event_ID() ), REG_ADMIN_URL );
-		$actions['event_filter'] = '<a href="' . $edit_event_url . '" title="' . sprintf( esc_attr__( 'Filter this list to only show registrations for %s', 'event_espresso' ), $event_name ) .'">' .  __( 'View Registrations', 'event_espresso' ) . '</a>';
+		$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('event_id'=>$item->event_ID()), REG_ADMIN_URL);
+		$actions['event_filter'] = '<a href="'.$edit_event_url.'" title="'.sprintf(esc_attr__('Filter this list to only show registrations for %s', 'event_espresso'), $event_name).'">'.__('View Registrations', 'event_espresso').'</a>';
 
-		return sprintf('%1$s %2$s', $edit_event, $this->row_actions($actions) );
+		return sprintf('%1$s %2$s', $edit_event, $this->row_actions($actions));
 	}
 
 
@@ -410,18 +410,18 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-   	function column_DTT_EVT_start(EE_Registration $item){
+   	function column_DTT_EVT_start(EE_Registration $item) {
 		$datetime_strings = array();
-		$ticket = $item->ticket( TRUE );
-		if ( $ticket instanceof EE_Ticket ) {
+		$ticket = $item->ticket(TRUE);
+		if ($ticket instanceof EE_Ticket) {
 			$remove_defaults = array('default_where_conditions' => 'none');
 			$datetimes = $ticket->datetimes($remove_defaults);
-			foreach($datetimes as $datetime){
-				$datetime_strings[] = $datetime->get_i18n_datetime( 'DTT_EVT_start' );
+			foreach ($datetimes as $datetime) {
+				$datetime_strings[] = $datetime->get_i18n_datetime('DTT_EVT_start');
 			}
-			return implode("<br />",$datetime_strings);
+			return implode("<br />", $datetime_strings);
 		} else {
-			return __( 'There is no ticket on this registration', 'event_espresso' );
+			return __('There is no ticket on this registration', 'event_espresso');
 		}
     }
 
@@ -434,45 +434,45 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-   	function column_ATT_fname(EE_Registration $item){
+   	function column_ATT_fname(EE_Registration $item) {
    		$attendee = $item->attendee();
 
-		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
+		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
 		$attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : '';
-		$link = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . $attendee_name . '</a>' : $attendee_name;
+		$link = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'.$attendee_name.'</a>' : $attendee_name;
 		$link .= $item->count() == 1 ? '&nbsp;<sup><div class="dashicons dashicons-star-filled lt-blue-icon ee-icon-size-8"></div></sup>' : '';
 
 		$t = $item->get_first_related('Transaction');
 		$payment_count = $t instanceof EE_Transaction ? $t->count_related('Payment') : 0;
 
 	    //append group count to name
-	    $link .= '&nbsp;' . sprintf(__( '(%1$s / %2$s)', 'event_espresso' ), $item->count(), $item->group_size());
+	    $link .= '&nbsp;'.sprintf(__('(%1$s / %2$s)', 'event_espresso'), $item->count(), $item->group_size());
 
 	    //append reg_code
-	    $link .= '<br>' . sprintf( __( 'Reg Code: %s', 'event_espresso' ), $item->get('REG_code') );
+	    $link .= '<br>'.sprintf(__('Reg Code: %s', 'event_espresso'), $item->get('REG_code'));
 
 	    //reg status text for accessibility
-	    $link .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+	    $link .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->status_ID(), false, 'sentence').'</span>';
 
 		//trash/restore/delete actions
 		$actions = array();
-		if ( $this->_view != 'trash' && $payment_count === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registration', 'espresso_registrations_trash_registrations', $item->ID() ) ) {
-			$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'trash_registrations', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
-			$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="' . esc_attr__( 'Trash Registration', 'event_espresso' ) . '">' . __( 'Trash', 'event_espresso' ) . '</a>';
-		} elseif ( $this->_view == 'trash' ) {
+		if ($this->_view != 'trash' && $payment_count === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_registration', 'espresso_registrations_trash_registrations', $item->ID())) {
+			$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'trash_registrations', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
+			$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Trash Registration', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>';
+		} elseif ($this->_view == 'trash') {
 			// restore registration link
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registration', 'espresso_registrations_restore_registrations', $item->ID() ) ) {
-				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_registrations', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
-				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Registration', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registration', 'espresso_registrations_restore_registrations', $item->ID())) {
+				$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_registrations', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
+				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Registration', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
 			}
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registration', 'espresso_registrations_ee_delete_registrations', $item->ID() ) ) {
-				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_registrations', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registration', 'espresso_registrations_ee_delete_registrations', $item->ID())) {
+				$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_registrations', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
 
-				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Registration Permanently', 'event_espresso' ). '">' . __( 'Delete', 'event_espresso' ) . '</a>';
+				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Registration Permanently', 'event_espresso').'">'.__('Delete', 'event_espresso').'</a>';
 			}
 		}
 
-		return sprintf('%1$s %2$s', $link, $this->row_actions($actions) );
+		return sprintf('%1$s %2$s', $link, $this->row_actions($actions));
 	}
 
 
@@ -484,7 +484,7 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	function column_ATT_email( EE_Registration $item ) {
+	function column_ATT_email(EE_Registration $item) {
 		$attendee = $item->get_first_related('Attendee');
 		return ! $attendee instanceof EE_Attendee ? __('No attached contact record.', 'event_espresso') : $attendee->email();
 	}
@@ -498,8 +498,8 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	function column__REG_count(EE_Registration $item){
-		return  sprintf(__( '%1$s / %2$s', 'event_espresso' ), $item->count(), $item->group_size());
+	function column__REG_count(EE_Registration $item) {
+		return  sprintf(__('%1$s / %2$s', 'event_espresso'), $item->count(), $item->group_size());
 	}
 
 
@@ -511,16 +511,16 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	function column_PRC_amount(EE_Registration $item){
+	function column_PRC_amount(EE_Registration $item) {
 		$ticket = $item->ticket();
 
-		$content = isset( $_GET['event_id'] ) && $ticket instanceof EE_Ticket ? '<span class="TKT_name">' . $ticket->name() . '</span><br />' : '';
+		$content = isset($_GET['event_id']) && $ticket instanceof EE_Ticket ? '<span class="TKT_name">'.$ticket->name().'</span><br />' : '';
 
-		if ( $item->final_price() > 0 ) {
-			$content .= '<span class="reg-pad-rght">' . $item->pretty_final_price() . '</span>';
+		if ($item->final_price() > 0) {
+			$content .= '<span class="reg-pad-rght">'.$item->pretty_final_price().'</span>';
 		} else {
 			// free event
-			$content .= '<span class="reg-overview-free-event-spn reg-pad-rght">' . __( 'free', 'event_espresso' ) . '</span>';
+			$content .= '<span class="reg-overview-free-event-spn reg-pad-rght">'.__('free', 'event_espresso').'</span>';
 		}
 
 		return $content;
@@ -536,11 +536,11 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	function column__REG_final_price(EE_Registration $item){
+	function column__REG_final_price(EE_Registration $item) {
 		$ticket = $item->ticket();
-		$content = isset( $_GET['event_id'] ) || ! $ticket instanceof EE_Ticket ? '' : '<span class="TKT_name">' . $ticket->name() . '</span><br />';
+		$content = isset($_GET['event_id']) || ! $ticket instanceof EE_Ticket ? '' : '<span class="TKT_name">'.$ticket->name().'</span><br />';
 
-		$content .= '<span class="reg-pad-rght">' .  $item->pretty_final_price() . '</span>';
+		$content .= '<span class="reg-pad-rght">'.$item->pretty_final_price().'</span>';
 		return $content;
 
 	}
@@ -554,8 +554,8 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	function column__REG_paid(EE_Registration $item){
-		return '<span class="reg-pad-rght">' .  $item->pretty_paid() . '</span>';
+	function column__REG_paid(EE_Registration $item) {
+		return '<span class="reg-pad-rght">'.$item->pretty_paid().'</span>';
 	}
 
 
@@ -567,11 +567,11 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	function column_TXN_total(EE_Registration $item){
-		if($item->transaction()){
-			$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID() ), TXN_ADMIN_URL );
-			return EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction', $item->transaction_ID() ) ? '<span class="reg-pad-rght"><a class="status-'. $item->transaction()->status_ID() .'" href="'.$view_txn_lnk_url.'"  title="' . esc_attr__( 'View Transaction', 'event_espresso' ) . '">'  . $item->transaction()->pretty_total() . '</a></span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_total() . '</span>';
-		}else{
+	function column_TXN_total(EE_Registration $item) {
+		if ($item->transaction()) {
+			$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID()), TXN_ADMIN_URL);
+			return EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction', $item->transaction_ID()) ? '<span class="reg-pad-rght"><a class="status-'.$item->transaction()->status_ID().'" href="'.$view_txn_lnk_url.'"  title="'.esc_attr__('View Transaction', 'event_espresso').'">'.$item->transaction()->pretty_total().'</a></span>' : '<span class="reg-pad-rght">'.$item->transaction()->pretty_total().'</span>';
+		} else {
 			return __("None", "event_espresso");
 		}
 	}
@@ -585,15 +585,15 @@ 
 	 * @param \EE_Registration $item
 	 * @return string
 	 */
-	function column_TXN_paid(EE_Registration $item){
+	function column_TXN_paid(EE_Registration $item) {
 
-		if ( $item->count() == 1 ) {
+		if ($item->count() == 1) {
 			$transaction = $item->transaction() ? $item->transaction() : EE_Transaction::new_instance();
-			if ( $transaction->paid() >= $transaction->total() ) {
+			if ($transaction->paid() >= $transaction->total()) {
 				return '<span class="reg-pad-rght"><div class="dashicons dashicons-yes green-icon"></div></span>';
 			} else {
-				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID() ), TXN_ADMIN_URL );
-				return EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction', $item->transaction_ID() ) ? '<span class="reg-pad-rght"><a class="status-'. $transaction->status_ID() .'" href="'.$view_txn_lnk_url.'"  title="' . esc_attr__( 'View Transaction', 'event_espresso' ) . '">' . $item->transaction()->pretty_paid() . '</a><span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_paid() . '</span>';
+				$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->transaction_ID()), TXN_ADMIN_URL);
+				return EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction', $item->transaction_ID()) ? '<span class="reg-pad-rght"><a class="status-'.$transaction->status_ID().'" href="'.$view_txn_lnk_url.'"  title="'.esc_attr__('View Transaction', 'event_espresso').'">'.$item->transaction()->pretty_paid().'</a><span>' : '<span class="reg-pad-rght">'.$item->transaction()->pretty_paid().'</span>';
 			}
 		}
 
@@ -614,44 +614,44 @@ 
 		EE_Registry::instance()->load_helper('MSG_Template');
 		$attendee = $item->attendee();
 		$ticket = $item->ticket();
-		$this->_set_related_details( $item );
+		$this->_set_related_details($item);
 
 		//Build row actions
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL );
-		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$item->attendee_ID() ), REG_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$item->ID()), REG_ADMIN_URL);
+		$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$item->attendee_ID()), REG_ADMIN_URL);
 
 		// page=attendees&event_admin_reports=resend_email&registration_id=43653465634&event_id=2&form_action=resend_email
 		//$resend_reg_lnk_url_params = array( 'action'=>'resend_registration', '_REG_ID'=>$item->REG_ID );
-		$resend_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'resend_registration', '_REG_ID'=>$item->ID() ), REG_ADMIN_URL, true );
+		$resend_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'resend_registration', '_REG_ID'=>$item->ID()), REG_ADMIN_URL, true);
 
 
 		//Build row actions
-		$view_lnk = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '
+		$view_lnk = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '
 			<li>
-			<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '" class="tiny-text">
+			<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'" class="tiny-text">
 				<div class="dashicons dashicons-clipboard"></div>
 			</a>
 			</li>' : '';
 
-		$edit_lnk = EE_Registry::instance()->CAP->current_user_can('ee_edit_contacts', 'espresso_registrations_edit_attendee' ) &&  $attendee instanceof EE_Attendee ?'
+		$edit_lnk = EE_Registry::instance()->CAP->current_user_can('ee_edit_contacts', 'espresso_registrations_edit_attendee') && $attendee instanceof EE_Attendee ? '
 			<li>
-			<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Contact Details', 'event_espresso' ) . '" class="tiny-text">
+			<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Contact Details', 'event_espresso').'" class="tiny-text">
 				<div class="ee-icon ee-icon-user-edit ee-icon-size-16"></div>
 			</a>
 			</li>' : '';
 
-		 $resend_reg_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration', $item->ID() ) ? '
+		 $resend_reg_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration', $item->ID()) ? '
 			<li>
-			<a href="'.$resend_reg_lnk_url.'" title="' . esc_attr__( 'Resend Registration Details', 'event_espresso' ) . '" class="tiny-text">
+			<a href="'.$resend_reg_lnk_url.'" title="'.esc_attr__('Resend Registration Details', 'event_espresso').'" class="tiny-text">
 				<div class="dashicons dashicons-email-alt"></div>
 			</a>
 			</li>' : '';
 
 		// page=transactions&action=view_transaction&txn=256&_wpnonce=6414da4dbb
-		$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$this->_transaction_details['id'] ), TXN_ADMIN_URL );
-		$view_txn_lnk = EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction', $this->_transaction_details['id'] ) ? '
+		$view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$this->_transaction_details['id']), TXN_ADMIN_URL);
+		$view_txn_lnk = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction', $this->_transaction_details['id']) ? '
 			<li>
-			<a class="ee-status-color-' . $this->_transaction_details['status'] . '" href="'.$view_txn_lnk_url.'"  title="' . $this->_transaction_details['title_attr'] . '" class="tiny-text">
+			<a class="ee-status-color-' . $this->_transaction_details['status'].'" href="'.$view_txn_lnk_url.'"  title="'.$this->_transaction_details['title_attr'].'" class="tiny-text">
 				<div class="dashicons dashicons-cart"></div>
 			</a>
 			</li>' : '';
@@ -659,10 +659,10 @@ 
 		//invoice link
 		$dl_invoice_lnk_url = $item->invoice_url();
 		//only show invoice link if message type is active.
-		if ( $item->is_primary_registrant() && $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'invoice' ) ) {
+		if ($item->is_primary_registrant() && $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('invoice')) {
 			$dl_invoice_lnk = '
 		<li>
-			<a title="' . esc_attr__( 'View Transaction Invoice', 'event_espresso' ) . '" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
+			<a title="' . esc_attr__('View Transaction Invoice', 'event_espresso').'" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
 				<span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
 			</a>
 		</li>';
@@ -670,7 +670,7 @@ 
 			$dl_invoice_lnk = '';
 		}
 
-			return $this->_action_string( $view_lnk . $edit_lnk . $resend_reg_lnk . $view_txn_lnk . $dl_invoice_lnk, $item, 'ul', 'reg-overview-actions-ul' );
+			return $this->_action_string($view_lnk.$edit_lnk.$resend_reg_lnk.$view_txn_lnk.$dl_invoice_lnk, $item, 'ul', 'reg-overview-actions-ul');
 	}
 
 }

admin_pages/transactions/EE_Admin_Transactions_List_Table.class.php

Spacing +84 added lines, -84 removed lines

@@ -33,8 +33,8 @@ 
 	 * @param \EE_Admin_Page $admin_page
 	 * @return EE_Admin_Transactions_List_Table
 	 */
-	function __construct( EE_Admin_Page $admin_page ){
-   		parent::__construct( $admin_page );
+	function __construct(EE_Admin_Page $admin_page) {
+   		parent::__construct($admin_page);
    		$this->_status = $this->_admin_page->get_transaction_status_array();
 
 	}
@@ -44,9 +44,9 @@ 
 
 
 	protected function _setup_data() {
-		$this->_data = $this->_admin_page->get_transactions( $this->_per_page );
-		$status = ! empty( $this->_req_data['status'] )? $this->_req_data['status'] : 'all';
-		$this->_all_data_count = $this->_admin_page->get_transactions( $this->_per_page, TRUE, $status );
+		$this->_data = $this->_admin_page->get_transactions($this->_per_page);
+		$status = ! empty($this->_req_data['status']) ? $this->_req_data['status'] : 'all';
+		$this->_all_data_count = $this->_admin_page->get_transactions($this->_per_page, TRUE, $status);
 	}
 
 
@@ -65,20 +65,20 @@ 
 			);
 
 		$this->_columns = array(
-			'TXN_ID' => __( 'ID', 'event_espresso' ),
-			'TXN_timestamp'	=> __( 'Transaction Date', 'event_espresso' ),
-			'TXN_total' => __( 'Total', 'event_espresso' ),
-			'TXN_paid' => __( 'Paid', 'event_espresso' ),
-			'ATT_fname' => __( 'Primary Registrant', 'event_espresso' ),
-			'event_name' => __( 'Event', 'event_espresso' ),
-			'actions' => __( 'Actions', 'event_espresso' )
+			'TXN_ID' => __('ID', 'event_espresso'),
+			'TXN_timestamp'	=> __('Transaction Date', 'event_espresso'),
+			'TXN_total' => __('Total', 'event_espresso'),
+			'TXN_paid' => __('Paid', 'event_espresso'),
+			'ATT_fname' => __('Primary Registrant', 'event_espresso'),
+			'event_name' => __('Event', 'event_espresso'),
+			'actions' => __('Actions', 'event_espresso')
 		);
 
 		$this->_sortable_columns = array(
-			'TXN_ID' => array( 'TXN_ID' => FALSE ),
-			'event_name' => array( 'event_name'=> FALSE ),
-			'ATT_fname'	=> array( 'ATT_fname'=> FALSE ),
-			'TXN_timestamp'	=> array( 'TXN_timestamp'=> TRUE ) //true means its already sorted
+			'TXN_ID' => array('TXN_ID' => FALSE),
+			'event_name' => array('event_name'=> FALSE),
+			'ATT_fname'	=> array('ATT_fname'=> FALSE),
+			'TXN_timestamp'	=> array('TXN_timestamp'=> TRUE) //true means its already sorted
 		);
 
 		$this->_primary_column = 'TXN_ID';
@@ -88,11 +88,11 @@ 
 
 
 
-	protected function _get_row_class( $item ) {
-		$class = parent::_get_row_class( $item );
+	protected function _get_row_class($item) {
+		$class = parent::_get_row_class($item);
 		//add status class
-		$class .= ' ee-status-strip txn-status-' . $item->status_ID();
-		if ( $this->_has_checkbox_column ) {
+		$class .= ' ee-status-strip txn-status-'.$item->status_ID();
+		if ($this->_has_checkbox_column) {
 			$class .= ' has-checkbox-column';
 		}
 		return $class;
@@ -109,8 +109,8 @@ 
 	 */
 	protected function _get_table_filters() {
 		$filters = array();
-		$start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' ));
-		$end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' );
+		$start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year'));
+		$end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y');
 		ob_start();
 		?>
 		<label for="txn-filter-start-date">Display Transactions from </label>
@@ -128,9 +128,9 @@ 
 
 
 	protected function _add_view_counts() {
-		$this->_views['all']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'all' );
-		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'abandoned' );
-		$this->_views['failed']['count'] = $this->_admin_page->get_transactions( $this->_per_page, TRUE, 'failed' );
+		$this->_views['all']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'all');
+		$this->_views['abandoned']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'abandoned');
+		$this->_views['failed']['count'] = $this->_admin_page->get_transactions($this->_per_page, TRUE, 'failed');
 	}
 
 
@@ -139,29 +139,29 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-   function column_TXN_ID( EE_Transaction $item ){
-    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-	   $content = '<a href="' . $view_lnk_url . '" title="' . esc_attr__( 'Go to Transaction Details', 'event_espresso' ) . '">' . $item->ID() . '</a>';
+   function column_TXN_ID(EE_Transaction $item) {
+    	$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+	   $content = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('Go to Transaction Details', 'event_espresso').'">'.$item->ID().'</a>';
 
 	   //txn timestamp
-	   $content .= '  <span class="show-on-mobile-view-only">' . $this->_get_txn_timestamp( $item ) . '</span>';
+	   $content .= '  <span class="show-on-mobile-view-only">'.$this->_get_txn_timestamp($item).'</span>';
 	   return $content;
 	}
 
 
 
-	protected function _get_txn_timestamp( EE_Transaction $item ) {
+	protected function _get_txn_timestamp(EE_Transaction $item) {
 		//txn timestamp
 		// is TXN less than 2 hours old ?
 		if (
-			( ( time() - EE_Registry::instance()->SSN->lifespan() )
-			< $item->datetime( false, true )
+			((time() - EE_Registry::instance()->SSN->lifespan())
+			< $item->datetime(false, true)
 			)
-		&& ( $item->failed() || $item->is_abandoned() )
+		&& ($item->failed() || $item->is_abandoned())
 		) {
-			$timestamp = __( 'TXN in progress...', 'event_espresso' );
+			$timestamp = __('TXN in progress...', 'event_espresso');
 	   } else {
-			$timestamp = $item->get_i18n_datetime( 'TXN_timestamp' );
+			$timestamp = $item->get_i18n_datetime('TXN_timestamp');
 		}
 		return $timestamp;
 	}
@@ -173,8 +173,8 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-	function column_cb($item ){
-		return sprintf( '<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'],  $item->ID());
+	function column_cb($item) {
+		return sprintf('<input type="checkbox" name="%1$s[]" value="%2$s" />', $this->_wp_list_args['singular'], $item->ID());
 	}
 
 
@@ -185,11 +185,11 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-	function column_TXN_timestamp( EE_Transaction $item ){
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
-		$txn_date = '<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details for TXN #', 'event_espresso' ) . $item->ID() . '">' . $this->_get_txn_timestamp( $item ) . '</a>';
+	function column_TXN_timestamp(EE_Transaction $item) {
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
+		$txn_date = '<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details for TXN #', 'event_espresso').$item->ID().'">'.$this->_get_txn_timestamp($item).'</a>';
 		//status
-		$txn_date .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ) . '</span>';
+		$txn_date .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->status_ID(), false, 'sentence').'</span>';
 		return $txn_date;
 	}
 
@@ -199,11 +199,11 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-	function column_TXN_total( EE_Transaction $item ){
-		if ( $item->get('TXN_total') > 0 ) {
-			return '<span class="txn-pad-rght">' . apply_filters( 'FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item ) . '</span>';
+	function column_TXN_total(EE_Transaction $item) {
+		if ($item->get('TXN_total') > 0) {
+			return '<span class="txn-pad-rght">'.apply_filters('FHEE__EE_Admin_Transactions_List_Table__column_TXN_total__TXN_total', $item->get_pretty('TXN_total'), $item).'</span>';
 		} else {
-			return '<span class="txn-overview-free-event-spn">' . __( 'free', 'event_espresso' ) . '</span>';
+			return '<span class="txn-overview-free-event-spn">'.__('free', 'event_espresso').'</span>';
 		}
 	}
 
@@ -213,19 +213,19 @@ 
 	 * @param \EE_Transaction $item
 	 * @return mixed|string
 	 */
-	function column_TXN_paid( EE_Transaction $item ){
+	function column_TXN_paid(EE_Transaction $item) {
 		$transaction_total = $item->get('TXN_total');
 		$transaction_paid = $item->get('TXN_paid');
 
-		if (( $transaction_total > 0 ) && ( $transaction_paid >= $transaction_total )) {
+		if (($transaction_total > 0) && ($transaction_paid >= $transaction_total)) {
 			// paid in full
 			$span_class = 'txn-overview-full-payment-spn';
 
-		} elseif (( $transaction_total > 0 ) && ( $transaction_paid > 0 )) {
+		} elseif (($transaction_total > 0) && ($transaction_paid > 0)) {
 			// monies owing
 			$span_class = 'txn-overview-part-payment-spn';
 
-		} elseif (( $transaction_total > 0 ) && ( $transaction_paid == 0 )) {
+		} elseif (($transaction_total > 0) && ($transaction_paid == 0)) {
 			// no payments made
 			$span_class = 'txn-overview-no-payment-spn';
 
@@ -235,11 +235,11 @@ 
 		}
 
 		$payment_method = $item->payment_method();
-		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __( 'Unknown', 'event_espresso' );
+		$payment_method_name = $payment_method instanceof EE_Payment_Method ? $payment_method->admin_name() : __('Unknown', 'event_espresso');
 
-		$content = '<span class="' . $span_class . ' txn-pad-rght">' . $transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid . '</span>';
-		if ( $transaction_paid > 0 ) {
-			$content .= '<br><span class="ee-status-text-small">' . sprintf( __( '...via %s', 'event_espresso' ), $payment_method_name ) . '</span>';
+		$content = '<span class="'.$span_class.' txn-pad-rght">'.$transaction_paid !== 0 ? $item->get_pretty('TXN_paid') : $transaction_paid.'</span>';
+		if ($transaction_paid > 0) {
+			$content .= '<br><span class="ee-status-text-small">'.sprintf(__('...via %s', 'event_espresso'), $payment_method_name).'</span>';
 		}
 		return $content;
 	}
@@ -250,13 +250,13 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-	function column_ATT_fname( EE_Transaction $item ){
+	function column_ATT_fname(EE_Transaction $item) {
 		$primary_reg = $item->primary_registration();
 		$attendee = $primary_reg->get_first_related('Attendee');
-		if ( $attendee instanceof EE_Attendee ) {
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$primary_reg->ID() ), REG_ADMIN_URL );
-			$content = EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID() ) ? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' . $attendee->full_name() . '</a>' : $attendee->full_name();
-			$content .= '<br>' . $attendee->email();
+		if ($attendee instanceof EE_Attendee) {
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$primary_reg->ID()), REG_ADMIN_URL);
+			$content = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $primary_reg->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">'.$attendee->full_name().'</a>' : $attendee->full_name();
+			$content .= '<br>'.$attendee->email();
 			return $content;
 		}
 		return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
@@ -268,10 +268,10 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-	function column_ATT_email( EE_Transaction $item ){
+	function column_ATT_email(EE_Transaction $item) {
 		$attendee = $item->primary_registration()->get_first_related('Attendee');
-		if ( !empty( $attendee ) )
-			return '<a href="mailto:' . $attendee->get('ATT_email') . '">' . $attendee->get('ATT_email') . '</a>';
+		if ( ! empty($attendee))
+			return '<a href="mailto:'.$attendee->get('ATT_email').'">'.$attendee->get('ATT_email').'</a>';
 		else
 			return $item->failed() || $item->is_abandoned() ? __('no contact record.', 'event_espresso') : __('No contact record, because the transaction was abandoned or the registration process failed.', 'event_espresso');
 		;
@@ -283,20 +283,20 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string|void
 	 */
-    function column_event_name( EE_Transaction $item ){
+    function column_event_name(EE_Transaction $item) {
     	$actions = array();
 		$event = $item->primary_registration()->get_first_related('Event');
-		if ( !empty( $event ) ) {
-			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$event->ID() ), EVENTS_ADMIN_URL );
+		if ( ! empty($event)) {
+			$edit_event_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$event->ID()), EVENTS_ADMIN_URL);
 			$event_name = $event->get('EVT_name');
 
 			//filter this view by transactions for this event
-			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event->ID() ) );
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ) {
-				$actions['filter_by_event'] = '<a href="' . $txn_by_event_lnk . '" title="' . esc_attr__('Filter transactions by this event', 'event_espresso') . '">' . __('View Transactions for this event', 'event_espresso') . '</a>';
+			$txn_by_event_lnk = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event->ID()));
+			if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID())) {
+				$actions['filter_by_event'] = '<a href="'.$txn_by_event_lnk.'" title="'.esc_attr__('Filter transactions by this event', 'event_espresso').'">'.__('View Transactions for this event', 'event_espresso').'</a>';
 			}
 
-			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $event->ID() ) ? '<a href="' . $edit_event_url . '" title="' . sprintf( esc_attr__( 'Edit Event: %s', 'event_espresso' ), $event->get('EVT_name') ) .'">' .  wp_trim_words( $event_name, 30, '...' ) . '</a>' : wp_trim_words( $event_name, 30, '...' ), $this->row_actions($actions) );
+			return sprintf('%1$s %2$s', EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $event->ID()) ? '<a href="'.$edit_event_url.'" title="'.sprintf(esc_attr__('Edit Event: %s', 'event_espresso'), $event->get('EVT_name')).'">'.wp_trim_words($event_name, 30, '...').'</a>' : wp_trim_words($event_name, 30, '...'), $this->row_actions($actions));
 		} else {
 			return __('The event associated with this transaction via the primary registration cannot be retrieved.', 'event_espresso');
 		}
@@ -308,33 +308,33 @@ 
 	 * @param \EE_Transaction $item
 	 * @return string
 	 */
-    function column_actions( EE_Transaction $item ){
+    function column_actions(EE_Transaction $item) {
 
     	$registration = $item->primary_registration();
     	$attendee = $registration->attendee();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
         //Build row actions
-		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_transaction', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_transaction', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
 		$dl_invoice_lnk_url = $registration->invoice_url();
 		$dl_receipt_lnk_url = $registration->receipt_url();
-		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'view_registration', '_REG_ID'=>$registration->ID() ), REG_ADMIN_URL );
-		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID() ), TXN_ADMIN_URL );
+		$view_reg_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'view_registration', '_REG_ID'=>$registration->ID()), REG_ADMIN_URL);
+		$send_pay_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_payment_reminder', 'TXN_ID'=>$item->ID()), TXN_ADMIN_URL);
 
 		//Build row actions
 		$view_lnk = '
 			<li>
-				<a href="'.$view_lnk_url.'" title="' . esc_attr__( 'View Transaction Details', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$view_lnk_url.'" title="'.esc_attr__('View Transaction Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-cart"></span>
 				</a>
 			</li>';
 
 
 	//only show invoice link if message type is active.
-	if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'invoice' ) ) {
+	if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('invoice')) {
 		$dl_invoice_lnk = '
 		<li>
-			<a title="' . esc_attr__( 'View Transaction Invoice', 'event_espresso' ) . '" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
+			<a title="' . esc_attr__('View Transaction Invoice', 'event_espresso').'" target="_blank" href="'.$dl_invoice_lnk_url.'" class="tiny-text">
 				<span class="dashicons dashicons-media-spreadsheet ee-icon-size-18"></span>
 			</a>
 		</li>';
@@ -343,10 +343,10 @@ 
 	}
 
 	//only show receipt link if message type is active.
-	if ( $attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active( 'receipt' ) ) {
+	if ($attendee instanceof EE_Attendee && EEH_MSG_Template::is_mt_active('receipt')) {
 		$dl_receipt_lnk = '
 		<li>
-			<a title="' . esc_attr__( 'View Transaction Receipt', 'event_espresso' ) . '" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
+			<a title="' . esc_attr__('View Transaction Receipt', 'event_espresso').'" target="_blank" href="'.$dl_receipt_lnk_url.'" class="tiny-text">
 				<span class="dashicons dashicons-media-default ee-icon-size-18"></span>
 			</a>
 		</li>';
@@ -355,10 +355,10 @@ 
 	}
 
       		//only show payment reminder link if the message type is active.
-      		if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
-		$send_pay_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ? '
+      		if (EEH_MSG_Template::is_mt_active('payment_reminder')) {
+		$send_pay_lnk = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder') ? '
 			<li>
-				<a href="'.$send_pay_lnk_url.'" title="' . esc_attr__( 'Send Payment Reminder', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$send_pay_lnk_url.'" title="'.esc_attr__('Send Payment Reminder', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-email-alt"></span>
 				</a>
 			</li>' : '';
@@ -367,14 +367,14 @@ 
 			$send_pay_lnk = '';
 		}
 
-		$view_reg_lnk = EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $registration->ID() ) ? '
+		$view_reg_lnk = EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $registration->ID()) ? '
 			<li>
-				<a href="'.$view_reg_lnk_url.'" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '" class="tiny-text">
+				<a href="'.$view_reg_lnk_url.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'" class="tiny-text">
 					<span class="dashicons dashicons-clipboard"></span>
 				</a>
 			</li>' : '';
 
-	return $this->_action_string( $view_lnk . $dl_invoice_lnk . $dl_receipt_lnk . $view_reg_lnk . $send_pay_lnk, $item, 'ul', 'txn-overview-actions-ul' );
+	return $this->_action_string($view_lnk.$dl_invoice_lnk.$dl_receipt_lnk.$view_reg_lnk.$send_pay_lnk, $item, 'ul', 'txn-overview-actions-ul');
     }