Completed
Branch BUG-10738-inconsistency-in-ses... (4fb977)
by
unknown
104:46 queued 94:10
created
admin_pages/maintenance/templates/ee_system_stati_page.template.php 3 patches
Braces   +3 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,8 +30,7 @@  discard block
 block discarded – undo
30 30
 				</tbody>
31 31
 			</table>
32 32
 			<?php
33
-		}
34
-		else {
33
+		} else {
35 34
 			?>
36 35
 			<ul>
37 36
 				<?php
@@ -41,7 +40,7 @@  discard block
 block discarded – undo
41 40
 			</ul>
42 41
 			<?php
43 42
 		}
44
-	}else {
43
+	} else {
45 44
 		//simple value
46 45
 		echo $data;
47 46
 	}
@@ -86,8 +85,7 @@  discard block
 block discarded – undo
86 85
 				}?>
87 86
 			</tbody>
88 87
 			<?php
89
-			}
90
-			else {
88
+			} else {
91 89
 				?>
92 90
 				<tbody>
93 91
 					<tr>
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
  */
12 12
 function ee_recurse_into_array_for_display($data) {
13 13
 	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {//is_object($incomplete_class) actually returns false, hence why we check for it
14
-        $data = json_decode(json_encode($data), true);
14
+		$data = json_decode(json_encode($data), true);
15 15
 	}
16 16
 	if (is_array($data)) {
17 17
 		if (EEH_Array::is_associative_array($data)) {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,10 +23,10 @@  discard block
 block discarded – undo
23 23
 						?>
24 24
 						<tr>
25 25
 							<td>
26
-								<?php echo $data_key;?>
26
+								<?php echo $data_key; ?>
27 27
 							</td>
28 28
 							<td>
29
-								<?php ee_recurse_into_array_for_display($data_values);?>
29
+								<?php ee_recurse_into_array_for_display($data_values); ?>
30 30
 							</td>
31 31
 						</tr>
32 32
 						<?php
@@ -40,19 +40,19 @@  discard block
 block discarded – undo
40 40
 			<ul>
41 41
 				<?php
42 42
 				foreach ($data as $datum) {
43
-					echo "<li>";ee_recurse_into_array_for_display($datum);echo "</li>";
43
+					echo "<li>"; ee_recurse_into_array_for_display($datum); echo "</li>";
44 44
 				}?>
45 45
 			</ul>
46 46
 			<?php
47 47
 		}
48
-	}else {
48
+	} else {
49 49
 		//simple value
50 50
 		echo $data;
51 51
 	}
52 52
 }
53 53
 ?>
54 54
 <h1>
55
-	<?php _e("System Information", "event_espresso");?> <a href="<?php echo $download_system_status_url;?>" class="button-secondary"><?php esc_html_e( 'Download to File', 'event_espresso' );?></a>
55
+	<?php _e("System Information", "event_espresso"); ?> <a href="<?php echo $download_system_status_url; ?>" class="button-secondary"><?php esc_html_e('Download to File', 'event_espresso'); ?></a>
56 56
 </h1>
57 57
 <div class="padding">
58 58
 
Please login to merge, or discard this patch.
admin_pages/messages/Messages_Admin_Page_Init.core.php 3 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,29 +1,29 @@
 block discarded – undo
1 1
 <?php if (!defined('EVENT_ESPRESSO_VERSION') )
2 2
 	exit('NO direct script access allowed');
3 3
 /**
4
- * Event Espresso
5
- *
6
- * Event Registration and Management Plugin for Wordpress
7
- *
8
- * @package		Event Espresso
9
- * @author		Seth Shoultes
10
- * @copyright	(c)2009-2012 Event Espresso All Rights Reserved.
11
- * @license		@link http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing * *
12
- * @link		http://www.eventespresso.com
13
- * @version		4.0
14
- *
15
- * ------------------------------------------------------------------------
16
- *
17
- * Messages_Admin_Page_Init
18
- *
19
- * for setup of the message admin pages
20
- *
21
- * @package		Event Espresso
22
- * @subpackage	includes/core/message/EE_Message_Admin_Page_Init.core.php
23
- * @author		Darren Ethier
24
- *
25
- * ------------------------------------------------------------------------
26
- */
4
+	 * Event Espresso
5
+	 *
6
+	 * Event Registration and Management Plugin for Wordpress
7
+	 *
8
+	 * @package		Event Espresso
9
+	 * @author		Seth Shoultes
10
+	 * @copyright	(c)2009-2012 Event Espresso All Rights Reserved.
11
+	 * @license		@link http://eventespresso.com/support/terms-conditions/  ** see Plugin Licensing * *
12
+	 * @link		http://www.eventespresso.com
13
+	 * @version		4.0
14
+	 *
15
+	 * ------------------------------------------------------------------------
16
+	 *
17
+	 * Messages_Admin_Page_Init
18
+	 *
19
+	 * for setup of the message admin pages
20
+	 *
21
+	 * @package		Event Espresso
22
+	 * @subpackage	includes/core/message/EE_Message_Admin_Page_Init.core.php
23
+	 * @author		Darren Ethier
24
+	 *
25
+	 * ------------------------------------------------------------------------
26
+	 */
27 27
 class Messages_Admin_Page_Init extends EE_Admin_Page_Init  {
28 28
 	/**
29 29
 	 *constructor
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,6 @@
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
1
+<?php if (!defined('EVENT_ESPRESSO_VERSION') ) {
2 2
 	exit('NO direct script access allowed');
3
+}
3 4
 /**
4 5
  * Event Espresso
5 6
  *
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION') )
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
2 2
 	exit('NO direct script access allowed');
3 3
 /**
4 4
  * Event Espresso
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  *
25 25
  * ------------------------------------------------------------------------
26 26
  */
27
-class Messages_Admin_Page_Init extends EE_Admin_Page_Init  {
27
+class Messages_Admin_Page_Init extends EE_Admin_Page_Init {
28 28
 	/**
29 29
 	 *constructor
30 30
 	 *@Constructor
@@ -33,18 +33,18 @@  discard block
 block discarded – undo
33 33
 	 */
34 34
 	public function __construct() {
35 35
 
36
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
36
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
37 37
 
38
-		if ( ! defined( 'EE_MSG_PG_SLUG' ) ) {
38
+		if ( ! defined('EE_MSG_PG_SLUG')) {
39 39
 
40
-			define( 'EE_MSG_PG_SLUG', 'espresso_messages' );
41
-			define( 'EE_MSG_PG_NAME', ucwords( str_replace( '_', '', EE_MSG_PG_SLUG ) ) );
42
-			define( 'EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages' . DS );
43
-			define( 'EE_MSG_ADMIN_URL', admin_url( 'admin.php?page=' . EE_MSG_PG_SLUG ) );
44
-			define( 'EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets' . DS );
45
-			define( 'EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/' );
46
-			define( 'EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates' . DS );
47
-			define( 'EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/' );
40
+			define('EE_MSG_PG_SLUG', 'espresso_messages');
41
+			define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
42
+			define('EE_MSG_ADMIN', EE_ADMIN_PAGES.'messages'.DS);
43
+			define('EE_MSG_ADMIN_URL', admin_url('admin.php?page='.EE_MSG_PG_SLUG));
44
+			define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN.'assets'.DS);
45
+			define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL.'messages/assets/');
46
+			define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN.'templates'.DS);
47
+			define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'messages/templates/');
48 48
 		}
49 49
 
50 50
 		parent::__construct();
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
 
62 62
 	protected function _set_menu_map() {
63
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
63
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
64 64
 			'menu_group' => 'management',
65 65
 			'menu_order' => 10,
66 66
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
Please login to merge, or discard this patch.
admin_pages/messages/espresso_events_Messages_Hooks.class.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 class espresso_events_Messages_Hooks extends EE_Admin_Hooks {
31 31
 
32 32
 
33
-	public function __construct( EE_Admin_Page $admin_page ) {
33
+	public function __construct(EE_Admin_Page $admin_page) {
34 34
 		parent::__construct($admin_page);
35 35
 	}
36 36
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
admin_pages/messages/help_tours/Message_Templates_Edit_Help_Tour.class.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -96,38 +96,38 @@  discard block
 block discarded – undo
96 96
 
97 97
 
98 98
 	protected function _start() {
99
-		$content = '<h3>' . __('Message Template Editor', 'event_espresso') . '</h3>';
100
-		$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>';
99
+		$content = '<h3>'.__('Message Template Editor', 'event_espresso').'</h3>';
100
+		$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>';
101 101
 		return $content;
102 102
 	}
103 103
 
104 104
 
105 105
 	protected function _context_switcher_stop() {
106
-		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>';
106
+		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>';
107 107
 	}
108 108
 
109 109
 
110 110
 	protected function _preview_button_stop() {
111
-		return '<p>' . __('Clicking this button will show you a preview of how your message will look.', 'event_espresso') . '</p>';
111
+		return '<p>'.__('Clicking this button will show you a preview of how your message will look.', 'event_espresso').'</p>';
112 112
 	}
113 113
 
114 114
 
115 115
 	protected function _template_area_stop() {
116
-		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>';
116
+		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>';
117 117
 	}
118 118
 
119 119
 	protected function _mtp_valid_shortcodes_stop() {
120
-		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>';
120
+		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>';
121 121
 	}
122 122
 
123 123
 
124 124
 	protected function _mtp_extra_actions_stop() {
125
-		return '<p>' . __('Here you will find miscellaneous options to assist you, including a test send button and a reset button.', 'event_espresso') . '</p>';
125
+		return '<p>'.__('Here you will find miscellaneous options to assist you, including a test send button and a reset button.', 'event_espresso').'</p>';
126 126
 	}
127 127
 
128 128
 
129 129
 	protected function _update_metabox_stop() {
130
-		return '<p>' . __('When done creating your message, click here to save it.', 'event_espresso') . '</p>';
130
+		return '<p>'.__('When done creating your message, click here to save it.', 'event_espresso').'</p>';
131 131
 	}
132 132
 
133 133
 }
134 134
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
admin_pages/messages/help_tours/Messages_Overview_Help_Tour.class.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -99,32 +99,32 @@  discard block
 block discarded – undo
99 99
 
100 100
 
101 101
 	protected function _start() {
102
-		$content = '<h3>' . __('Messages Overview', 'event_espresso') . '</h3>';
103
-		$content .= '<p>' . __('This tour of the Messages Overview page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
102
+		$content = '<h3>'.__('Messages Overview', 'event_espresso').'</h3>';
103
+		$content .= '<p>'.__('This tour of the Messages Overview page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
104 104
 		return $content;
105 105
 	}
106 106
 
107 107
 	protected function event_column_stop() {
108
-		return '<p>' . __('View if a message is associated with one event or multiple events. Can be sorted in ascending and descending order.', 'event_espresso') . '</p>';
108
+		return '<p>'.__('View if a message is associated with one event or multiple events. Can be sorted in ascending and descending order.', 'event_espresso').'</p>';
109 109
 	}
110 110
 
111 111
 	protected function _message_type_column_stop() {
112
-		return '<p>' . __('View the type of message. Can be sorted in ascending or descending order.', 'event_espresso') . '</p>';
112
+		return '<p>'.__('View the type of message. Can be sorted in ascending or descending order.', 'event_espresso').'</p>';
113 113
 	}
114 114
 
115 115
 	protected function _messenger_column_stop() {
116
-		return '<p>' . __('View who messages will be sent to. Can be sorted in ascending or descending order.', 'event_espresso') . '</p>';
116
+		return '<p>'.__('View who messages will be sent to. Can be sorted in ascending or descending order.', 'event_espresso').'</p>';
117 117
 	}
118 118
 	
119 119
 	protected function _description_column_stop() {
120
-		return '<p>' . __('View the description for each message type.', 'event_espresso') . '</p>';
120
+		return '<p>'.__('View the description for each message type.', 'event_espresso').'</p>';
121 121
 	}
122 122
 
123 123
 	protected function _bulk_actions_stop() {
124
-		return '<p>' . __('Perform bulk actions to multiple message types.', 'event_espresso') . '</p>';
124
+		return '<p>'.__('Perform bulk actions to multiple message types.', 'event_espresso').'</p>';
125 125
 	}
126 126
 
127 127
 	protected function _filters_stop() {
128
-		return '<p>' . __('You can filter by different notifications by making a selection below and clicking on the filter button. To reset your selection, just click on the reset filters button.', 'event_espresso') . '</p>';
128
+		return '<p>'.__('You can filter by different notifications by making a selection below and clicking on the filter button. To reset your selection, just click on the reset filters button.', 'event_espresso').'</p>';
129 129
 	}
130 130
 }
131 131
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
admin_pages/messages/help_tours/Messages_Settings_Help_Tour.class.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -89,28 +89,28 @@  discard block
 block discarded – undo
89 89
 
90 90
 
91 91
 	protected function _start() {
92
-		$content = '<h3>' . __('Messages Settings', 'event_espresso') . '</h3>';
93
-		$content .= '<p>' . __('This tour of the Messages Settings page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
92
+		$content = '<h3>'.__('Messages Settings', 'event_espresso').'</h3>';
93
+		$content .= '<p>'.__('This tour of the Messages Settings page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
94 94
 		return $content;
95 95
 	}
96 96
 
97 97
 	protected function _messenger_links_stop() {
98
-		return '<p>' . __('Available messengers are shown above.', 'event_espresso') . '</p>';
98
+		return '<p>'.__('Available messengers are shown above.', 'event_espresso').'</p>';
99 99
 	}
100 100
 
101 101
 	protected function _email_settings_metabox_stop() {
102
-		return '<p>' . __('View the different message types that are currently active.', 'event_espresso') . '</p>';
102
+		return '<p>'.__('View the different message types that are currently active.', 'event_espresso').'</p>';
103 103
 	}
104 104
 
105 105
 	protected function _on_off_toggle_stop() {
106
-		return '<p>' . __('This toggle will turn all messages on or off for this message type.', 'event_espresso') . '</p>';
106
+		return '<p>'.__('This toggle will turn all messages on or off for this message type.', 'event_espresso').'</p>';
107 107
 	}
108 108
 
109 109
 	protected function _active_mts_container_stop() {
110
-		return '<p>' . __('These are your active message types. Click them to see a description and settings for each one.', 'event_espresso') . '</p>';
110
+		return '<p>'.__('These are your active message types. Click them to see a description and settings for each one.', 'event_espresso').'</p>';
111 111
 	}
112 112
 
113 113
 	protected function _inactive_mts_container_stop() {
114
-		return '<p>' . __('Drag message types here to deactivate them. Drag them from here to the active box to reactivate them.', 'event_espresso') . '</p>';
114
+		return '<p>'.__('Drag message types here to deactivate them. Drag them from here to the active box to reactivate them.', 'event_espresso').'</p>';
115 115
 	}
116 116
 }
117 117
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
admin_pages/messages/templates/ee_msg_admin_overview.template.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,31 +1,31 @@
 block discarded – undo
1 1
 
2 2
 		<ul class="subsubsub">
3
-			<?php foreach ( $view_RLs as $vw ) : ?>
4
-				<li class="<?php echo $vw['slug']; ?>"><a class="<?php echo $vw['class']; ?>" href="<?php echo $vw['url'];?>"><?php echo $vw['label']; ?><span class="count">(<?php echo $vw['count']; ?>)</span></a></li>
3
+			<?php foreach ($view_RLs as $vw) : ?>
4
+				<li class="<?php echo $vw['slug']; ?>"><a class="<?php echo $vw['class']; ?>" href="<?php echo $vw['url']; ?>"><?php echo $vw['label']; ?><span class="count">(<?php echo $vw['count']; ?>)</span></a></li>
5 5
 		 	<?php endforeach; ?>
6 6
 		 		<li>
7 7
 		 		</li>
8 8
 		</ul>
9 9
 		<div class="clear"></div>
10 10
 		<div id="ee-messenger-filters-dv">
11
-			<form id="ee-messenger-filters-frm" action="<?php echo $ee_msg_overview_url;?>" method="post" name="ee-messenger-filters-frm">
11
+			<form id="ee-messenger-filters-frm" action="<?php echo $ee_msg_overview_url; ?>" method="post" name="ee-messenger-filters-frm">
12 12
 				<select name="ee_messenger_filter_by" id="ee_messenger_filter_by">
13
-					<?php foreach ( $active_messengers as $messenger => $args ) : ?>
14
-					<option value="<?php echo $messenger; ?>"><?php echo ucwords(str_replace('_', ' ', $messenger) ); ?></option>
13
+					<?php foreach ($active_messengers as $messenger => $args) : ?>
14
+					<option value="<?php echo $messenger; ?>"><?php echo ucwords(str_replace('_', ' ', $messenger)); ?></option>
15 15
 					<?php endforeach; ?>
16 16
 				</select>
17 17
 				<input id="submit-ee-messenger-filters-sbmt" class="button-secondary" type="submit" value="Filter Messenger">
18 18
 
19 19
 				<select name="ee_message_type_filter_by" id="ee_message_type_filter_by">
20
-					<?php foreach ( $active_message_types as $message_type => $args ) : ?>
21
-					<option value="<?php echo $message_type; ?>"><?php echo ucwords(str_replace('_', ' ', $message_type) ); ?></option>
20
+					<?php foreach ($active_message_types as $message_type => $args) : ?>
21
+					<option value="<?php echo $message_type; ?>"><?php echo ucwords(str_replace('_', ' ', $message_type)); ?></option>
22 22
 					<?php endforeach; ?>
23 23
 				</select>
24 24
 				<input id="submit-ee-message-type-filters-sbmt" class="button-secondary" type="submit" value="Filter Message Type">
25 25
 			</form>
26 26
 		</div>
27 27
 
28
-        <form id="ee-messages-overview-frm" action="<?php echo $ee_msg_overview_url;?>" method="get">
28
+        <form id="ee-messages-overview-frm" action="<?php echo $ee_msg_overview_url; ?>" method="get">
29 29
             <input type="hidden" name="page" value="<?php echo $_REQUEST['page'] ?>" />
30 30
             <input type="hidden" id="per_page" name="per_page" value="" />
31 31
             <?php echo $list_table->display(); ?>
Please login to merge, or discard this patch.
messages/templates/ee_msg_details_main_add_meta_box.template.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,32 +1,32 @@
 block discarded – undo
1 1
 <div id="admin-primary-mbox-dv" class="admin-primary-mbox-dv">
2 2
 	
3
-	<h4 class="admin-primary-mbox-h4"><?php echo ($event_name) ? $event_name . ' Custom Template' : ''; ?></h4>
3
+	<h4 class="admin-primary-mbox-h4"><?php echo ($event_name) ? $event_name.' Custom Template' : ''; ?></h4>
4 4
 	<p><?php echo $action_message; ?></p>
5 5
 
6 6
 	<form id="ee-msg-add-message-template-frm" action="<?php echo $edit_message_template_form_url; ?>" method="post">
7 7
 		<input type="hidden" id="evt_id" name="EVT_ID" value="<?php echo ($EVT_ID) ? $EVT_ID : ''; ?>" />
8
-		<?php if ( isset( $hidden_fields ) ) echo $hidden_fields; ?>
8
+		<?php if (isset($hidden_fields)) echo $hidden_fields; ?>
9 9
 		
10 10
 		<!--active_messengers -->
11 11
 		<label for="MTP_messenger"><?php _e('Select Messenger', 'event_espresso'); ?></label>
12 12
 		<select name="MTP_messenger" id="MTP-messenger">
13
-			<?php foreach ( $active_messengers as $messenger => $values ) : ?>
14
-			<option value="<?php echo $messenger; ?>"><?php echo ucwords(str_replace('_', ' ', $messenger) ); ?></option>
13
+			<?php foreach ($active_messengers as $messenger => $values) : ?>
14
+			<option value="<?php echo $messenger; ?>"><?php echo ucwords(str_replace('_', ' ', $messenger)); ?></option>
15 15
 			<?php endforeach; ?>
16 16
 		</select>
17 17
 
18 18
 		<label for="MTP_message_type"><?php _e('Select Message Type', 'event_espresso'); ?></label>
19 19
 		<select name="MTP_message_type" id="MTP-message-type">
20
-			<?php foreach ( $active_message_types as $message_type => $values ) : ?>
21
-			<option value="<?php echo $message_type; ?>"><?php echo ucwords(str_replace('_', ' ', $message_type) ); ?></option>
20
+			<?php foreach ($active_message_types as $message_type => $values) : ?>
21
+			<option value="<?php echo $message_type; ?>"><?php echo ucwords(str_replace('_', ' ', $message_type)); ?></option>
22 22
 			<?php endforeach; ?>
23 23
 		</select>
24 24
 
25 25
 		<!-- events if we don't have an EVENT_ID -->
26
-		<?php if ( !empty( $active_events ) ) : ?>
26
+		<?php if ( ! empty($active_events)) : ?>
27 27
 			<label for="EVT_ID_select"><?php _e('Select Event', 'event_espresso'); ?></label>
28 28
 			<select name="EVT_ID" id="EVT_ID_select">
29
-				<?php foreach ( $active_events as $event ) : ?>
29
+				<?php foreach ($active_events as $event) : ?>
30 30
 				<option value="<?php echo $event->event_id; ?>"><?php echo $event->event_name; ?></option>
31 31
 				<?php endforeach; ?>
32 32
 			</select>
Please login to merge, or discard this patch.
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,10 @@
 block discarded – undo
5 5
 
6 6
 	<form id="ee-msg-add-message-template-frm" action="<?php echo $edit_message_template_form_url; ?>" method="post">
7 7
 		<input type="hidden" id="evt_id" name="EVT_ID" value="<?php echo ($EVT_ID) ? $EVT_ID : ''; ?>" />
8
-		<?php if ( isset( $hidden_fields ) ) echo $hidden_fields; ?>
8
+		<?php if ( isset( $hidden_fields ) ) {
9
+	echo $hidden_fields;
10
+}
11
+?>
9 12
 		
10 13
 		<!--active_messengers -->
11 14
 		<label for="MTP_messenger"><?php _e('Select Messenger', 'event_espresso'); ?></label>
Please login to merge, or discard this patch.
messages/templates/ee_msg_details_main_edit_meta_box.template.php 2 patches
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,8 +19,11 @@
 block discarded – undo
19 19
 					<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>
20 20
 				</p>
21 21
 			</div>
22
-		<?php else: ?>
23
-			<input type="hidden" name="ee_msg_non_global_fields[MTP_name]" value="<?php echo $MTP->name(); ?>">
22
+		<?php else {
23
+	: ?>
24
+			<input type="hidden" name="ee_msg_non_global_fields[MTP_name]" value="<?php echo $MTP->name();
25
+}
26
+?>">
24 27
 			<input type="hidden" name="ee_msg_non_global_fields[MTP_description]" value="<?php echo $MTP->description(); ?>">
25 28
 		<?php endif; ?>
26 29
 		<!-- we need to loop through the template_fields so we know our structure -->
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
1 1
 <div id="admin-primary-mbox-dv" class="admin-primary-mbox-dv">
2 2
 
3
-	<h3 class="admin-primary-mbox-h4"><?php echo isset($event_name) ? $event_name . ' Custom Template' : ''; ?></h3>
3
+	<h3 class="admin-primary-mbox-h4"><?php echo isset($event_name) ? $event_name.' Custom Template' : ''; ?></h3>
4 4
 		<input type="hidden" id="ee-msg-current-context" name="MTP_context" value="<?php echo $context; ?>"  />
5 5
 		<!-- if this is not a global template then let's show the name and description fields -->
6
-		<?php if ( ! $MTP->is_global() ) : ?>
6
+		<?php if ( ! $MTP->is_global()) : ?>
7 7
 			<div class="non-global-mtp-fields">
8 8
 				<p>
9 9
 					<?php _e('This is a custom template.  Custom Templates have an editable name and description to help you differentiate between templates.', 'event_espresso'); ?>
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		<?php endif; ?>
26 26
 		<!-- we need to loop through the template_fields so we know our structure -->
27 27
 		<?php
28
-		if ( isset($template_fields) && !empty($template_fields) && !is_wp_error($template_fields) ) {
28
+		if (isset($template_fields) && ! empty($template_fields) && ! is_wp_error($template_fields)) {
29 29
 				echo $template_fields;
30 30
 		} else {
31 31
 			?>
Please login to merge, or discard this patch.