eventespresso / event-espresso-core

admin_pages/maintenance/templates/ee_system_stati_page.template.php

Braces +3 added lines, -5 removed lines

@@ -30,8 +30,7 @@ 
 				</tbody>
 			</table>
 			<?php
-		}
-		else {
+		} else {
 			?>
 			<ul>
 				<?php
@@ -41,7 +40,7 @@ 
 			</ul>
 			<?php
 		}
-	}else {
+	} else {
 		//simple value
 		echo $data;
 	}
@@ -86,8 +85,7 @@ 
 				}?>
 			</tbody>
 			<?php
-			}
-			else {
+			} else {
 				?>
 				<tbody>
 					<tr>

Spacing +9 added lines, -9 removed lines

@@ -7,7 +7,7 @@ 
 
 function ee_resurse_into_array($data) {
 	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {//is_object($incomplete_class) actually returns false, hence why we check for it
-		$data = (array)$data;
+		$data = (array) $data;
 	}
 	if (is_array($data)) {
 		if (EEH_Array::is_associative_array($data)) {
@@ -19,10 +19,10 @@ 
 						?>
 						<tr>
 							<td>
-								<?php echo $data_key;?>
+								<?php echo $data_key; ?>
 							</td>
 							<td>
-								<?php ee_resurse_into_array($data_values);?>
+								<?php ee_resurse_into_array($data_values); ?>
 							</td>
 						</tr>
 						<?php
@@ -36,31 +36,31 @@ 
 			<ul>
 				<?php
 				foreach ($data as $datum) {
-					echo "<li>";ee_resurse_into_array($datum);echo "</li>";
+					echo "<li>"; ee_resurse_into_array($datum); echo "</li>";
 				}?>
 			</ul>
 			<?php
 		}
-	}else {
+	} else {
 		//simple value
 		echo $data;
 	}
 }
 ?>
 <h1>
-	<?php _e("System Information", "event_espresso");?>
+	<?php _e("System Information", "event_espresso"); ?>
 </h1>
 <div class="padding">
-	<h2><?php _e("Raw System Data", "event_espresso");?></h2>
+	<h2><?php _e("Raw System Data", "event_espresso"); ?></h2>
 	<textarea class="system_status_info">
 		<?php print_r($system_stati)?>
 	</textarea>
-	<h2><?php _e("System Data (formatted)", "event_espresso");?></h2>
+	<h2><?php _e("System Data (formatted)", "event_espresso"); ?></h2>
 	<table class="widefat">
 		<?php
 		foreach ($system_stati as $status_category_slug => $data) {
 			if (is_object($data)) {
-				$data = (array)$data;
+				$data = (array) $data;
 			}
 			?>
 			<thead>

admin_pages/maintenance/templates/ee_upgrade_addons_before_migrating.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@
 <?php
 
 ?>
-<h1><?php _e("You must upgrade your Event Espresso Add-ons before Migrating", "event_espresso");?></h1>
-<p><?php printf(__("Please %s visit the plugins page%s and upgade all Event Espresso before migrating.", "event_espresso"), "<a href='".admin_url('/plugins.php')."'>","</a>");?></p>
-<p><?php _e("You can also deactivate the addons, but all of their data will be lost when your database is migrated", "event_espresso");?></p>
\ No newline at end of file
+<h1><?php _e("You must upgrade your Event Espresso Add-ons before Migrating", "event_espresso"); ?></h1>
+<p><?php printf(__("Please %s visit the plugins page%s and upgade all Event Espresso before migrating.", "event_espresso"), "<a href='".admin_url('/plugins.php')."'>", "</a>"); ?></p>
+<p><?php _e("You can also deactivate the addons, but all of their data will be lost when your database is migrated", "event_espresso"); ?></p>
\ No newline at end of file

admin_pages/messages/Messages_Admin_Page_Init.core.php

Indentation +23 added lines, -23 removed lines

@@ -1,29 +1,29 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION') )
 	exit('NO direct script access allowed');
 /**
- * Event Espresso
- *
- * Event Registration and Management Plugin for Wordpress
- *
- * @package		Event Espresso
- * @author		Seth Shoultes
- * @copyright	(c)2009-2012 Event Espresso All Rights Reserved.
- * @license		@link http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing * *
- * @link		http://www.eventespresso.com
- * @version		4.0
- *
- * ------------------------------------------------------------------------
- *
- * Messages_Admin_Page_Init
- *
- * for setup of the message admin pages
- *
- * @package		Event Espresso
- * @subpackage	includes/core/message/EE_Message_Admin_Page_Init.core.php
- * @author		Darren Ethier
- *
- * ------------------------------------------------------------------------
- */
+	 * Event Espresso
+	 *
+	 * Event Registration and Management Plugin for Wordpress
+	 *
+	 * @package		Event Espresso
+	 * @author		Seth Shoultes
+	 * @copyright	(c)2009-2012 Event Espresso All Rights Reserved.
+	 * @license		@link http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing * *
+	 * @link		http://www.eventespresso.com
+	 * @version		4.0
+	 *
+	 * ------------------------------------------------------------------------
+	 *
+	 * Messages_Admin_Page_Init
+	 *
+	 * for setup of the message admin pages
+	 *
+	 * @package		Event Espresso
+	 * @subpackage	includes/core/message/EE_Message_Admin_Page_Init.core.php
+	 * @author		Darren Ethier
+	 *
+	 * ------------------------------------------------------------------------
+	 */
 class Messages_Admin_Page_Init extends EE_Admin_Page_Init  {
 	/**
 	 *constructor

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 /**
  * Event Espresso
@@ -24,7 +24,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class Messages_Admin_Page_Init extends EE_Admin_Page_Init  {
+class Messages_Admin_Page_Init extends EE_Admin_Page_Init {
 	/**
 	 *constructor
 	 *@Constructor
@@ -33,16 +33,16 @@ 
 	 */
 	public function __construct() {
 
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		define( 'EE_MSG_PG_SLUG', 'espresso_messages' );
-		define( 'EE_MSG_PG_NAME', ucwords( str_replace( '_', '', EE_MSG_PG_SLUG )));
-		define( 'EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages' . DS );
-		define( 'EE_MSG_ADMIN_URL', admin_url( 'admin.php?page=' . EE_MSG_PG_SLUG ));
-		define( 'EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets' . DS );
-		define( 'EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL  . 'messages/assets/' );
-		define( 'EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates' . DS );
-		define( 'EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/' );
+		define('EE_MSG_PG_SLUG', 'espresso_messages');
+		define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
+		define('EE_MSG_ADMIN', EE_ADMIN_PAGES.'messages'.DS);
+		define('EE_MSG_ADMIN_URL', admin_url('admin.php?page='.EE_MSG_PG_SLUG));
+		define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN.'assets'.DS);
+		define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL.'messages/assets/');
+		define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN.'templates'.DS);
+		define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'messages/templates/');
 
 		parent::__construct();
 	}
@@ -57,7 +57,7 @@ 
 
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'management',
 			'menu_order' => 10,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,

Braces +2 added lines, -1 removed lines

@@ -1,5 +1,6 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
+<?php if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 /**
  * Event Espresso
  *

admin_pages/messages/Messages_Template_List_Table.class.php

Spacing +44 added lines, -44 removed lines

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

Braces +8 added lines, -5 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
@@ -128,17 +129,19 @@ 
 		$msgr_filters = !empty($m_values) ? array_merge( $msgr_default, $m_values ) : array();
 		$mt_filters = !empty($mt_values) ? array_merge( $mt_default, $mt_values ) : array();
 
-		if ( empty( $m_values ) )
-			$msgr_filters[0] = array(
+		if ( empty( $m_values ) ) {
+					$msgr_filters[0] = array(
 				'id' => 'no_messenger_options',
 				'text' => __('No Messengers active', 'event_espresso')
 				);
+		}
 
-		if ( empty($mt_values) )
-			$mt_filters[0] = array(
+		if ( empty($mt_values) ) {
+					$mt_filters[0] = array(
 				'id' => 'no_message_type_options',
 				'text' => __('No Message Types active', 'event_espresso')
 				);
+		}
 
 		if ( count( $messengers ) >= 1  && !empty( $m_values ) ) {
 			unset( $msgr_filters[0] );

admin_pages/messages/espresso_events_Messages_Hooks.class.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,7 +30,7 @@ 
 class espresso_events_Messages_Hooks extends EE_Admin_Hooks {
 
 
-	public function __construct( EE_Admin_Page $admin_page ) {
+	public function __construct(EE_Admin_Page $admin_page) {
 		parent::__construct($admin_page);
 	}
 

Braces +2 added lines, -1 removed lines

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

admin_pages/messages/help_tabs/messages_overview_messengers.help_tab.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <h3><?php _e('Messengers', 'event_espresso'); ?></h3>
 <p>
-<?php printf( __('Messengers are the vehicles that deliver messages to individuals (recipients). By default, every install of Event Espresso has the %sEmail%s messenger active. The Email messenger is a vehicle for delivering messages.  Other possible vehicles might be any social media applications, 3rd party API\'s etc.', 'event_espresso'), '<strong>', '</strong>' ); ?>
+<?php printf(__('Messengers are the vehicles that deliver messages to individuals (recipients). By default, every install of Event Espresso has the %sEmail%s messenger active. The Email messenger is a vehicle for delivering messages.  Other possible vehicles might be any social media applications, 3rd party API\'s etc.', 'event_espresso'), '<strong>', '</strong>'); ?>
 </p>
\ No newline at end of file

admin_pages/messages/help_tabs/messages_settings_messengers.help_tab.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <h3><?php _e('Activating / Deactivating Messengers', 'event_espresso'); ?></h3>
 <p><?php _e('You can select Messengers via the tabs across the top of the settings page. The available messengers you see depends on what version of Event Espresso you have and what addons are installed. Every install include an "Email" messenger tab.  When you click one of those tabs it will display that messenger.', 'event_espresso'); ?></p>
 <p><?php _e('There are two ways to determine whether a messenger is active or not.  The first way is via the messenger tab itself.', 'event_espresso'); ?></p>
-<p><?php echo _e('The green colored gear <img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-active.png' . '" alt="' . esc_attr__('Active Email Tab', 'event_espresso') . '" /> indicates that this messenger is currently active.', 'event_espresso'); echo _e(' The white colored gear <img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-inactive.png' . '" alt="' . esc_attr__('Inactive Email Tab', 'event_espresso') . '" /> indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.', 'event_espresso'); ?></p>
+<p><?php echo _e('The green colored gear <img class="inline-text" src="'.EE_MSG_ASSETS_URL.'images/email-tab-active.png'.'" alt="'.esc_attr__('Active Email Tab', 'event_espresso').'" /> indicates that this messenger is currently active.', 'event_espresso'); echo _e(' The white colored gear <img class="inline-text" src="'.EE_MSG_ASSETS_URL.'images/email-tab-inactive.png'.'" alt="'.esc_attr__('Inactive Email Tab', 'event_espresso').'" /> indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.', 'event_espresso'); ?></p>
 <p><?php _e('The second way to determine whether a messenger is active or not is via the "on/off" button in the top right corner of the active messenger displayed content:', 'event_espresso'); ?></p>
-<p><?php printf( __('%1$s means of course that the messenger is active and %2$s means the messenger is inactive.', 'event_espresso'), '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" checked="checked" disabled><label for="ee-on-off-toggle-on"></label></div>', '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" disabled><label for="ee-on-off-toggle-on"></label></div>' ); ?></p>
-<p><?php _e( 'The on/off toggle is also what you use to activate or deactivate a messenger.', 'event_espresso' ); ?></p>
-<p><?php _e( 'What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then. Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.', 'event_espresso'); ?></p>
-<p><?php _e( 'When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger. If there are you will be unable to deactivate the messenger. This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.', 'event_espresso'); ?></p>
+<p><?php printf(__('%1$s means of course that the messenger is active and %2$s means the messenger is inactive.', 'event_espresso'), '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" checked="checked" disabled><label for="ee-on-off-toggle-on"></label></div>', '<div class="switch"><input id="ee-on-off-toggle-on" class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" disabled><label for="ee-on-off-toggle-on"></label></div>'); ?></p>
+<p><?php _e('The on/off toggle is also what you use to activate or deactivate a messenger.', 'event_espresso'); ?></p>
+<p><?php _e('What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then. Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.', 'event_espresso'); ?></p>
+<p><?php _e('When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger. If there are you will be unable to deactivate the messenger. This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.', 'event_espresso'); ?></p>
 <p><strong><?php _e('Important', 'event_espresso'); ?></strong><br />
 <?php _e('Although customizations made to global templates are preserved when a messenger is deactivated, any settings for that messenger (or the message types that were attached to it) are lost on deactivation.  Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.', 'event_espresso'); ?></p>

admin_pages/messages/help_tabs/messages_templates.help_tab.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <h3><?php _e('Message Templates', 'event_espresso'); ?></h3>
 <p><?php _e('Message Templates are the <em>format</em> of the messages going out. Think of them as a “form letter”. Templates tell the Messages system how to style your messages and the content (information) they will have when they are delivered.', 'event_espresso'); ?></p>
 <p><?php _e('There is a template created for each Messenger / Message Type and context combination. For example, messages that are sent for Payment Confirmation have a template for Event Administrator and a different one for Primary Registrant.  Whereas, messages that are sent for the Registration confirmation have 3 templates: one for Event Administrator, one for the Primary Registrant, and another for each additional Registrant(s).', 'event_espresso'); ?></p>
-<p><?php _e('With the Event Espresso Messages system, every Messenger, Message Type, and context will have a global template created with some default content on creation. You have the ability to edit the global template that will be used for all events you create. Additionally, you have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").', 'event_espresso' ); ?></p>
\ No newline at end of file
+<p><?php _e('With the Event Espresso Messages system, every Messenger, Message Type, and context will have a global template created with some default content on creation. You have the ability to edit the global template that will be used for all events you create. Additionally, you have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").', 'event_espresso'); ?></p>
\ No newline at end of file

admin_pages/messages/help_tours/Message_Templates_Edit_Help_Tour.class.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -96,38 +96,38 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Message Template Editor', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Message Template Editor page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Message Template Editor', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Message Template Editor page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 		return $content;
 	}
 
 
 	protected function _context_switcher_stop() {
-		return '<p>' . __('This dropdown allows you to swap between the different recipients templates that are available in this message type. Be sure to save changes befor switching to a different context.', 'event_espresso') . '</p>';
+		return '<p>'.__('This dropdown allows you to swap between the different recipients templates that are available in this message type. Be sure to save changes befor switching to a different context.', 'event_espresso').'</p>';
 	}
 
 
 	protected function _preview_button_stop() {
-		return '<p>' . __('Clicking this button will show you a preview of how your message will look.', 'event_espresso') . '</p>';
+		return '<p>'.__('Clicking this button will show you a preview of how your message will look.', 'event_espresso').'</p>';
 	}
 
 
 	protected function _template_area_stop() {
-		return '<p>' . __('Depending on the messenger (recipient) and the message type, the main screen can show different boxes. Overall the screen allows you to confirm who the messages go to and who from, and the actual content of the message.', 'event_espresso') . '</p>';
+		return '<p>'.__('Depending on the messenger (recipient) and the message type, the main screen can show different boxes. Overall the screen allows you to confirm who the messages go to and who from, and the actual content of the message.', 'event_espresso').'</p>';
 	}
 
 	protected function _mtp_valid_shortcodes_stop() {
-		return '<p>' . __('These shortcodes allow you to quickly add data into your messages, without touching code. From emails, to ticket details, to your company logo, building messages with shortcodes is easy and fast.', 'event_espresso') . '</p>';
+		return '<p>'.__('These shortcodes allow you to quickly add data into your messages, without touching code. From emails, to ticket details, to your company logo, building messages with shortcodes is easy and fast.', 'event_espresso').'</p>';
 	}
 
 
 	protected function _mtp_extra_actions_stop() {
-		return '<p>' . __('Here you will find miscellaneous options to assist you, including a test send button and a reset button.', 'event_espresso') . '</p>';
+		return '<p>'.__('Here you will find miscellaneous options to assist you, including a test send button and a reset button.', 'event_espresso').'</p>';
 	}
 
 
 	protected function _update_metabox_stop() {
-		return '<p>' . __('When done creating your message, click here to save it.', 'event_espresso') . '</p>';
+		return '<p>'.__('When done creating your message, click here to save it.', 'event_espresso').'</p>';
 	}
 
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

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