eventespresso / event-espresso-core

admin_pages/messages/templates/ee_msg_admin_overview.template.php

Indentation +6 added lines, -6 removed lines

@@ -15,9 +15,9 @@ 
             <?php foreach ($active_messengers as $messenger => $args) : ?>
                 <option value="<?php echo $messenger; ?>">
                     <?php
-                    echo ucwords(
-                        str_replace('_', ' ', $messenger)
-                    ); ?></option>
+					echo ucwords(
+						str_replace('_', ' ', $messenger)
+					); ?></option>
             <?php endforeach; ?>
         </select>
         <input id="submit-ee-messenger-filters-sbmt" class="button-secondary" type="submit" value="Filter Messenger">
@@ -26,9 +26,9 @@ 
             <?php foreach ($active_message_types as $message_type => $args) : ?>
                 <option value="<?php echo $message_type; ?>">
                     <?php
-                    echo ucwords(
-                        str_replace('_', ' ', $message_type)
-                    ); ?></option>
+					echo ucwords(
+						str_replace('_', ' ', $message_type)
+					); ?></option>
             <?php endforeach; ?>
         </select>
         <input id="submit-ee-message-type-filters-sbmt" class="button-secondary" type="submit"

admin_pages/messages/templates/ee_msg_messages_settings_help_tab.template.php

Indentation +32 added lines, -32 removed lines

@@ -3,56 +3,56 @@
 
 <h3><?php _e('1. Defaults', 'event_espresso'); ?></h3>
 <p><?php _e(
-    'When Event Espresso is first activated, the plugin takes care of setting up the core messenger (Email) and message types (Registration, and Payment).  This is so users don\'t have to worry about any setup of templates etc. and it just works right out of the box.  So when you first visit the page you\'ll see the Email messenger displayed with those two message types in the "Active" area for that messenger',
-    'event_espresso'
+	'When Event Espresso is first activated, the plugin takes care of setting up the core messenger (Email) and message types (Registration, and Payment).  This is so users don\'t have to worry about any setup of templates etc. and it just works right out of the box.  So when you first visit the page you\'ll see the Email messenger displayed with those two message types in the "Active" area for that messenger',
+	'event_espresso'
 ); ?></p>
 <h3><?php _e('2. Activating or 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 will see at the very least an "Email" messenger tab.  When you click one of those tabs it will display that messenger.',
-    'event_espresso'
+	'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 will see at the very least 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'
+	'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 $img1;
-    _e('The green colored gear indicates that this messenger is currently active.', 'event_espresso');
-    echo $img2;
-    _e(
-        'Here the white colored gear 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>
+	_e('The green colored gear indicates that this messenger is currently active.', 'event_espresso');
+	echo $img2;
+	_e(
+		'Here the white colored gear 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'
+	'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 echo $img3;
-    printf(
-        __('On means of course that the messenger is active and %s means the messenger is inactive.', 'event_espresso'),
-        $img4
-    ); ?></p>
+	printf(
+		__('On means of course that the messenger is active and %s means the messenger is inactive.', 'event_espresso'),
+		$img4
+	); ?></p>
 <p><?php _e(
-    'Incidentally, the on/off toggle is also what you use to activate or deactivate a messenger.',
-    'event_espresso'
+	'Incidentally, 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'
+	'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'
+	'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(
-    __(
-        '%sVery important!%s 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.  Keep that in mind. Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.',
-        'event_espresso'
-    ),
-    '<strong>',
-    '</strong>'
+	__(
+		'%sVery important!%s 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.  Keep that in mind. Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.',
+		'event_espresso'
+	),
+	'<strong>',
+	'</strong>'
 ); ?></p>
 <h3><?php _e('3. Activating or Deactivating Message Types', 'event_espresso'); ?></h3>
 <p><?php _e(
-    'There may be times where you just want to deactivate (or activate new) message types for a particular messenger.  The messages system makes it super easy to do so.  To deactivate, what you do is drag the message type box from the "active area" below the messenger description (of an active messenger) into the "inactive" area in the right sidebar.  To activate you do the reverse.  Just remember that when you deactivate a message type, if that message type has any settings, the settings will be lost.  However, any message templates that match the messenger and message type you deactivated will be preserved, they are just marked "inactive" in the database',
-    'event_espresso'
+	'There may be times where you just want to deactivate (or activate new) message types for a particular messenger.  The messages system makes it super easy to do so.  To deactivate, what you do is drag the message type box from the "active area" below the messenger description (of an active messenger) into the "inactive" area in the right sidebar.  To activate you do the reverse.  Just remember that when you deactivate a message type, if that message type has any settings, the settings will be lost.  However, any message templates that match the messenger and message type you deactivated will be preserved, they are just marked "inactive" in the database',
+	'event_espresso'
 ); ?></p>
\ No newline at end of file

admin_pages/messages/templates/ee_msg_messages_help_tab.template.php

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <h2><?php esc_html_e('What is the Event Espresso Messages System?', 'event_espresso'); ?></h2>
 <p>
     <?php printf(
-        esc_html__(
-            'The Event Espresso Messages system is a powerful framework that Event Espresso uses to prepare %1$smessages%2$s for different types of use (message types) and delivered by different %1$smessengers%2$s.',
-            'event_espresso'
-        ),
-        '<strong>',
-        '</strong>'
-    ); ?></p>
+		esc_html__(
+			'The Event Espresso Messages system is a powerful framework that Event Espresso uses to prepare %1$smessages%2$s for different types of use (message types) and delivered by different %1$smessengers%2$s.',
+			'event_espresso'
+		),
+		'<strong>',
+		'</strong>'
+	); ?></p>
 <p>
     <?php esc_html_e(
-        'We\'ve intentionally created this framework so that we have as much flexibility as possible for future ideas that we think of (or customers think of) for the kinds of messages that get sent out related to your events.',
-        'event_espresso'
-    ); ?></p>
\ No newline at end of file
+		'We\'ve intentionally created this framework so that we have as much flexibility as possible for future ideas that we think of (or customers think of) for the kinds of messages that get sent out related to your events.',
+		'event_espresso'
+	); ?></p>
\ No newline at end of file

admin_pages/messages/templates/ee_msg_details_main_edit_meta_box.template.php

Indentation +18 added lines, -18 removed lines

@@ -4,21 +4,21 @@ 
     <input type="hidden" id="ee-msg-current-context" name="MTP_context" value="<?php echo $context; ?>"/>
     <!-- if this is not a global template then let's show the name and description fields -->
     <?php
-    if (! $MTP->is_global()) : ?>
+	if (! $MTP->is_global()) : ?>
         <div class="non-global-mtp-fields">
             <p>
                 <?php _e(
-                    'This is a custom template.  Custom Templates have an editable name and description to help you differentiate between templates.',
-                    'event_espresso'
-                ); ?>
+					'This is a custom template.  Custom Templates have an editable name and description to help you differentiate between templates.',
+					'event_espresso'
+				); ?>
             </p>
             <div id="titlediv">
                 <div id="titlewrap">
                     <label for="title" class="label-MTP_name" style="visibility:hidden">
                         <?php _e(
-                            'Message Template Name:',
-                            'event_espresso'
-                        ); ?></label>
+							'Message Template Name:',
+							'event_espresso'
+						); ?></label>
                     <input id="title" type="text" class="regular-text" name="ee_msg_non_global_fields[MTP_name]"
                            value="<?php echo $MTP->name(); ?>">
                 </div>
@@ -27,29 +27,29 @@ 
                 <label for="ee-msg-non-global-fields-MTP_description" class="label-MTP_description"
                        style="visibility:hidden;">
                     <?php _e(
-                        'Message Template Description:',
-                        'event_espresso'
-                    ); ?></label>
+						'Message Template Description:',
+						'event_espresso'
+					); ?></label>
                 <textarea id="ee-msg-non-global-fields-MTP_description" class="large-text"
                           name="ee_msg_non_global_fields[MTP_description]"><?php echo $MTP->description(); ?></textarea>
             </p>
         </div>
     <?php
-    else :
-    ?>
+	else :
+	?>
         <input type="hidden" name="ee_msg_non_global_fields[MTP_name]" value="<?php echo $MTP->name(); ?>">
         <input type="hidden" name="ee_msg_non_global_fields[MTP_description]"
                value="<?php echo $MTP->description(); ?>">
     <?php endif; ?>
     <!-- we need to loop through the template_fields so we know our structure -->
     <?php
-    if (isset($template_fields) && ! empty($template_fields) && ! is_wp_error($template_fields)) {
-        echo $template_fields;
-    } else {
-        ?>
+	if (isset($template_fields) && ! empty($template_fields) && ! is_wp_error($template_fields)) {
+		echo $template_fields;
+	} else {
+		?>
         <p><?php _e('Something has gone wrong, there are no template fields to output.', 'event_espresso'); ?></p>
         <?php
-    }
+	}
 
-    ?>
+	?>
 </div> <!-- end #admin-primary-mbox-dv -->

Spacing +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <div id="admin-primary-mbox-dv" class="admin-primary-mbox-dv">
 
-    <h3 class="admin-primary-mbox-h4"><?php echo isset($event_name) ? $event_name . ' Custom Template' : ''; ?></h3>
+    <h3 class="admin-primary-mbox-h4"><?php echo isset($event_name) ? $event_name.' Custom Template' : ''; ?></h3>
     <input type="hidden" id="ee-msg-current-context" name="MTP_context" value="<?php echo $context; ?>"/>
     <!-- if this is not a global template then let's show the name and description fields -->
     <?php
-    if (! $MTP->is_global()) : ?>
+    if ( ! $MTP->is_global()) : ?>
         <div class="non-global-mtp-fields">
             <p>
                 <?php _e(

Braces +5 added lines, -2 removed lines

@@ -35,9 +35,12 @@
             </p>
         </div>
     <?php
-    else :
+    else {
+    	:
     ?>
-        <input type="hidden" name="ee_msg_non_global_fields[MTP_name]" value="<?php echo $MTP->name(); ?>">
+        <input type="hidden" name="ee_msg_non_global_fields[MTP_name]" value="<?php echo $MTP->name();
+    }
+    ?>">
         <input type="hidden" name="ee_msg_non_global_fields[MTP_description]"
                value="<?php echo $MTP->description(); ?>">
     <?php endif; ?>

admin_pages/messages/templates/ee_msg_details_messenger_meta_box.template.php

Indentation +16 added lines, -16 removed lines

@@ -1,28 +1,28 @@
 <div class="<?php echo $messenger; ?>-content">
     <?php
-    if (empty($inactive_message_types) && empty($active_message_types)) :
-        echo '<p>'
-             . __(
-                 'This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.',
-                 'event_espresso'
-             ) . '</p>';
-    else : ?>
+	if (empty($inactive_message_types) && empty($active_message_types)) :
+		echo '<p>'
+			 . __(
+				 'This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.',
+				 'event_espresso'
+			 ) . '</p>';
+	else : ?>
         <p class="inactive-on-message <?php echo $hide_on_message; ?>">
             <?php _e(
-                'Below are message types that are currently inactive with this messenger.  Drag them over to the messenger box to activate them.',
-                'event_espresso'
-            ); ?>
+				'Below are message types that are currently inactive with this messenger.  Drag them over to the messenger box to activate them.',
+				'event_espresso'
+			); ?>
         <p>
         <p class="inactive-off-message <?php echo $hide_off_message; ?>">
             <?php _e(
-                'This messenger is currently inactive.  Once the messenger is activated any inactive message types associated with the messenger will be shown here.',
-                'event_espresso'
-            ); ?>
+				'This messenger is currently inactive.  Once the messenger is activated any inactive message types associated with the messenger will be shown here.',
+				'event_espresso'
+			); ?>
         </p>
         <div<?php
-        if ($active) :
-            ?> id="inactive-message-types"<?php
-        endif; ?>
+		if ($active) :
+			?> id="inactive-message-types"<?php
+		endif; ?>
             class="inactive-message-types mt-tab-container ui-widget-content-ui-state-default <?php echo $hide_on_message; ?>">
             <ul class="messenger-activation">
                 <?php echo $inactive_message_types; ?>

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
              . __(
                  'This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.',
                  'event_espresso'
-             ) . '</p>';
+             ).'</p>';
     else : ?>
         <p class="inactive-on-message <?php echo $hide_on_message; ?>">
             <?php _e(

Braces +5 added lines, -2 removed lines

@@ -6,8 +6,11 @@
                  'This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.',
                  'event_espresso'
              ) . '</p>';
-    else : ?>
-        <p class="inactive-on-message <?php echo $hide_on_message; ?>">
+    else {
+    	: ?>
+        <p class="inactive-on-message <?php echo $hide_on_message;
+    }
+    ?>">
             <?php _e(
                 'Below are message types that are currently inactive with this messenger.  Drag them over to the messenger box to activate them.',
                 'event_espresso'

admin_pages/messages/templates/ee_msg_message_type_help_tab.template.php

Indentation +20 added lines, -20 removed lines

@@ -1,31 +1,31 @@
 <h2><?php esc_html_e('What are Message Types?', 'event_espresso'); ?></h2>
 <p>
     <?php printf(
-        esc_html__(
-            'Message Types are the %1$skinds%2$s of messages that get delivered.  Think of them as the "type" of package that is being delivered by the messenger.  For example, Event Espresso comes with two Message Types attached to the Email messenger:  Registration Confirmation (which is triggered by frontend event registrations), and Payment Confirmation (which is triggered by frontend payments).',
-            'event_espresso'
-        ),
-        '<em>',
-        '</em>'
-    ); ?></p>
+		esc_html__(
+			'Message Types are the %1$skinds%2$s of messages that get delivered.  Think of them as the "type" of package that is being delivered by the messenger.  For example, Event Espresso comes with two Message Types attached to the Email messenger:  Registration Confirmation (which is triggered by frontend event registrations), and Payment Confirmation (which is triggered by frontend payments).',
+			'event_espresso'
+		),
+		'<em>',
+		'</em>'
+	); ?></p>
 <p>
     <?php esc_html_e(
-        'Future iterations of Event Espresso 4.0 (premium versions), will include more and more different message types that can be attached to the various messengers that are available',
-        'event_espresso'
-    ); ?></p>
+		'Future iterations of Event Espresso 4.0 (premium versions), will include more and more different message types that can be attached to the various messengers that are available',
+		'event_espresso'
+	); ?></p>
 
 <h3><?php esc_html_e('Contexts', 'event_espresso'); ?></h3>
 <p>
     <?php printf(
-        esc_html__(
-            'Each message type (or %1$skind%1$s of message remember!) has different contexts for messages created for that message type. Contexts are dynamic but generally speaking they tend to represent recipients. So for example, Registration Confirmation message type has three types of recipients for every time a registration confirmation is triggered: Event Administrator, Primary Registrant, and Registrant (which may be multiple messages if there are more than one attendee per event). Whereas the Payment Message Type only has two recipients (Event Administrator, Primary Registrant [the one making the payment]).',
-            'event_espresso'
-        ),
-        '<em>',
-        '</em>'
-    ); ?></p>
+		esc_html__(
+			'Each message type (or %1$skind%1$s of message remember!) has different contexts for messages created for that message type. Contexts are dynamic but generally speaking they tend to represent recipients. So for example, Registration Confirmation message type has three types of recipients for every time a registration confirmation is triggered: Event Administrator, Primary Registrant, and Registrant (which may be multiple messages if there are more than one attendee per event). Whereas the Payment Message Type only has two recipients (Event Administrator, Primary Registrant [the one making the payment]).',
+			'event_espresso'
+		),
+		'<em>',
+		'</em>'
+	); ?></p>
 <p>
     <?php esc_html_e(
-        'You will most likely never see the word "context" in any of the Messages system labelling because they are dynamic per message type.  Usually, contexts will be labelled "Recipients" but there may be cases down the road where a message type might use contexts to represent something totally different',
-        'event_espresso'
-    ); ?></p>
\ No newline at end of file
+		'You will most likely never see the word "context" in any of the Messages system labelling because they are dynamic per message type.  Usually, contexts will be labelled "Recipients" but there may be cases down the road where a message type might use contexts to represent something totally different',
+		'event_espresso'
+	); ?></p>
\ No newline at end of file

admin_pages/messages/Messages_Admin_Page_Init.core.php

Indentation +41 added lines, -41 removed lines

@@ -12,52 +12,52 @@
  */
 class Messages_Admin_Page_Init extends EE_Admin_Page_Init
 {
-    /**
-     *constructor
-     *
-     * @Constructor
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
+	/**
+	 *constructor
+	 *
+	 * @Constructor
+	 * @access public
+	 * @return void
+	 */
+	public function __construct()
+	{
 
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        if (! defined('EE_MSG_PG_SLUG')) {
-            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/');
-        }
+		if (! defined('EE_MSG_PG_SLUG')) {
+			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();
-    }
+		parent::__construct();
+	}
 
 
-    protected function _set_init_properties()
-    {
-        $this->label = __('Messages System', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = __('Messages System', 'event_espresso');
+	}
 
 
-    protected function _set_menu_map()
-    {
-        $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,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => EE_MSG_PG_SLUG,
-                'menu_label'      => __('Messages', 'event_espresso'),
-                'capability'      => 'ee_read_global_messages',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$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,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => EE_MSG_PG_SLUG,
+				'menu_label'      => __('Messages', 'event_espresso'),
+				'capability'      => 'ee_read_global_messages',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -24,15 +24,15 @@
 
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-        if (! defined('EE_MSG_PG_SLUG')) {
+        if ( ! defined('EE_MSG_PG_SLUG')) {
             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_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();

admin_pages/general_settings/General_Settings_Admin_Page_Init.core.php

Indentation +30 added lines, -30 removed lines

@@ -18,37 +18,37 @@
 class General_Settings_Admin_Page_Init extends EE_Admin_Page_Init
 {
 
-    public function __construct()
-    {
-        // define some constants
-        define('GEN_SET_PG_SLUG', 'espresso_general_settings');
-        define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
-        define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings' . DS);
-        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
-        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates' . DS);
-        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
+	public function __construct()
+	{
+		// define some constants
+		define('GEN_SET_PG_SLUG', 'espresso_general_settings');
+		define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
+		define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings' . DS);
+		define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
+		define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates' . DS);
+		define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
 
-        parent::__construct();
-    }
+		parent::__construct();
+	}
 
-    protected function _set_init_properties()
-    {
-        $this->label = GEN_SET_LABEL;
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = GEN_SET_LABEL;
+	}
 
-    protected function _set_menu_map()
-    {
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
-            array(
-                'menu_group'      => 'settings',
-                'menu_order'      => 20,
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
-                'parent_slug'     => 'espresso_events',
-                'menu_slug'       => GEN_SET_PG_SLUG,
-                'menu_label'      => GEN_SET_LABEL,
-                'capability'      => 'manage_options',
-                'admin_init_page' => $this,
-            )
-        );
-    }
+	protected function _set_menu_map()
+	{
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
+			array(
+				'menu_group'      => 'settings',
+				'menu_order'      => 20,
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
+				'parent_slug'     => 'espresso_events',
+				'menu_slug'       => GEN_SET_PG_SLUG,
+				'menu_label'      => GEN_SET_LABEL,
+				'capability'      => 'manage_options',
+				'admin_init_page' => $this,
+			)
+		);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
         // define some constants
         define('GEN_SET_PG_SLUG', 'espresso_general_settings');
         define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
-        define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings' . DS);
-        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
-        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates' . DS);
-        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
+        define('GEN_SET_ADMIN', EE_ADMIN_PAGES.'general_settings'.DS);
+        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page='.GEN_SET_PG_SLUG));
+        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN.'templates'.DS);
+        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL.'general_settings/assets/');
 
         parent::__construct();
     }

admin_pages/general_settings/templates/espresso_page_settings.template.php

Indentation +82 added lines, -82 removed lines

@@ -5,15 +5,15 @@ 
     </h2>
     <p class="ee-attention">
         <?php
-        echo sprintf(
-            __(
-                'The following shortcodes and page settings are required for Event Espresso to function properly. These shortcodes should not be replaced with any other shortcodes. Please view %sthis page%s for a list of optional shortcodes you can use on other pages.',
-                'event_espresso'
-            ),
-            '<a href="admin.php?page=espresso_support">',
-            '</a>'
-        );
-        ?>
+		echo sprintf(
+			__(
+				'The following shortcodes and page settings are required for Event Espresso to function properly. These shortcodes should not be replaced with any other shortcodes. Please view %sthis page%s for a list of optional shortcodes you can use on other pages.',
+				'event_espresso'
+			),
+			'<a href="admin.php?page=espresso_support">',
+			'</a>'
+		);
+		?>
     </p>
 
     <table class="form-table">
@@ -39,21 +39,21 @@ 
                 </select>
                 <span>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $reg_page_obj,
-                        '[ESPRESSO_CHECKOUT]'
-                    ); ?>
+						$reg_page_obj,
+						'[ESPRESSO_CHECKOUT]'
+					); ?>
                 </span>
                 <br/>
                 <p class="description">
                     <?php
-                    echo sprintf(
-                        __(
-                            'This page can be hidden from navigation if desired, but should always contain the %s shortcode.',
-                            'event_espresso'
-                        ),
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CHECKOUT]</span>'
-                    );
-                    ?>
+					echo sprintf(
+						__(
+							'This page can be hidden from navigation if desired, but should always contain the %s shortcode.',
+							'event_espresso'
+						),
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CHECKOUT]</span>'
+					);
+					?>
                 </p>
                 <br/><br/>
             </td>
@@ -69,9 +69,9 @@ 
                     <br/>
                     <span class="lt-grey-text">
                         <?php _e(
-                            'Notify URL (processes payments)',
-                            'event_espresso'
-                        ); ?></span><br/>
+							'Notify URL (processes payments)',
+							'event_espresso'
+						); ?></span><br/>
                     <?php echo General_Settings_Admin_Page::edit_view_links($txn_page_id); ?>
                 </label>
             </th>
@@ -84,21 +84,21 @@ 
                 </select>
                 <span>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $txn_page_obj,
-                        '[ESPRESSO_TXN_PAGE]'
-                    ); ?>
+						$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'
-                        ),
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
-                    );
-                    ?>
+					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'
+						),
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
+					);
+					?>
                 </p>
                 <br/><br/>
             </td>
@@ -124,21 +124,21 @@ 
                 </select>
                 <span>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $thank_you_page_obj,
-                        '[ESPRESSO_THANK_YOU]'
-                    ); ?>
+						$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'
-                        ),
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
-                    );
-                    ?>
+					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'
+						),
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
+					);
+					?>
                 </p>
                 <br/><br/>
             </td>
@@ -164,21 +164,21 @@ 
                 </select>
                 <span>
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
-                        $cancel_page_obj,
-                        '[ESPRESSO_CANCELLED]'
-                    ); ?>
+						$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'
-                        ),
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
-                    );
-                    ?>
+					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'
+						),
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
+					);
+					?>
                 </p>
                 <br/><br/>
             </td>
@@ -194,27 +194,27 @@ 
                     <br/>
                     <a href='<?php echo get_post_type_archive_link('espresso_events') ?>'>
                         <?php _e(
-                            'View',
-                            'event_espresso'
-                        ); ?></a>
+							'View',
+							'event_espresso'
+						); ?></a>
                 </label>
             </th>
             <td>
                 <p class="description">
                     <?php echo __(
-                        'Events are custom post types and use WordPress\' normal archive pages for displaying events.',
-                        'event_espresso'
-                    ) ?>
+						'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>'
-                    ) ?>
+						__(
+							'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>
@@ -230,27 +230,27 @@ 
                     <br/>
                     <a href='<?php echo get_post_type_archive_link('espresso_venues') ?>'>
                         <?php _e(
-                            'View',
-                            'event_espresso'
-                        ); ?></a>
+							'View',
+							'event_espresso'
+						); ?></a>
                 </label>
             </th>
             <td>
                 <p class="description">
                     <?php echo __(
-                        'Venues are custom post types and use WordPress\' normal archive pages for displaying events.',
-                        'event_espresso'
-                    ) ?>
+						'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>'
-                    ) ?>
+						__(
+							'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>