Completed
Branch BUG/duplicate-event-categories (935838)
by
unknown
64:31 queued 46:29
created
admin_pages/messages/templates/ee_msg_message_type_help_tab.template.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,31 +1,31 @@
 block discarded – undo
1 1
 <h2><?php esc_html_e('What are Message Types?', 'event_espresso'); ?></h2>
2 2
 <p>
3 3
     <?php printf(
4
-        esc_html__(
5
-            '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).',
6
-            'event_espresso'
7
-        ),
8
-        '<em>',
9
-        '</em>'
10
-    ); ?></p>
4
+		esc_html__(
5
+			'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).',
6
+			'event_espresso'
7
+		),
8
+		'<em>',
9
+		'</em>'
10
+	); ?></p>
11 11
 <p>
12 12
     <?php esc_html_e(
13
-        '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',
14
-        'event_espresso'
15
-    ); ?></p>
13
+		'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',
14
+		'event_espresso'
15
+	); ?></p>
16 16
 
17 17
 <h3><?php esc_html_e('Contexts', 'event_espresso'); ?></h3>
18 18
 <p>
19 19
     <?php printf(
20
-        esc_html__(
21
-            '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]).',
22
-            'event_espresso'
23
-        ),
24
-        '<em>',
25
-        '</em>'
26
-    ); ?></p>
20
+		esc_html__(
21
+			'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]).',
22
+			'event_espresso'
23
+		),
24
+		'<em>',
25
+		'</em>'
26
+	); ?></p>
27 27
 <p>
28 28
     <?php esc_html_e(
29
-        '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',
30
-        'event_espresso'
31
-    ); ?></p>
32 29
\ No newline at end of file
30
+		'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',
31
+		'event_espresso'
32
+	); ?></p>
33 33
\ No newline at end of file
Please login to merge, or discard this patch.
admin_pages/messages/Messages_Admin_Page_Init.core.php 2 patches
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -12,52 +12,52 @@
 block discarded – undo
12 12
  */
13 13
 class Messages_Admin_Page_Init extends EE_Admin_Page_Init
14 14
 {
15
-    /**
16
-     *constructor
17
-     *
18
-     * @Constructor
19
-     * @access public
20
-     * @return void
21
-     */
22
-    public function __construct()
23
-    {
15
+	/**
16
+	 *constructor
17
+	 *
18
+	 * @Constructor
19
+	 * @access public
20
+	 * @return void
21
+	 */
22
+	public function __construct()
23
+	{
24 24
 
25
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
25
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
26 26
 
27
-        if (! defined('EE_MSG_PG_SLUG')) {
28
-            define('EE_MSG_PG_SLUG', 'espresso_messages');
29
-            define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
30
-            define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages' . DS);
31
-            define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
32
-            define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets' . DS);
33
-            define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
34
-            define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates' . DS);
35
-            define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
36
-        }
27
+		if (! defined('EE_MSG_PG_SLUG')) {
28
+			define('EE_MSG_PG_SLUG', 'espresso_messages');
29
+			define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
30
+			define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages' . DS);
31
+			define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
32
+			define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets' . DS);
33
+			define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
34
+			define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates' . DS);
35
+			define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
36
+		}
37 37
 
38
-        parent::__construct();
39
-    }
38
+		parent::__construct();
39
+	}
40 40
 
41 41
 
42
-    protected function _set_init_properties()
43
-    {
44
-        $this->label = __('Messages System', 'event_espresso');
45
-    }
42
+	protected function _set_init_properties()
43
+	{
44
+		$this->label = __('Messages System', 'event_espresso');
45
+	}
46 46
 
47 47
 
48
-    protected function _set_menu_map()
49
-    {
50
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
51
-            array(
52
-                'menu_group'      => 'management',
53
-                'menu_order'      => 10,
54
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
55
-                'parent_slug'     => 'espresso_events',
56
-                'menu_slug'       => EE_MSG_PG_SLUG,
57
-                'menu_label'      => __('Messages', 'event_espresso'),
58
-                'capability'      => 'ee_read_global_messages',
59
-                'admin_init_page' => $this,
60
-            )
61
-        );
62
-    }
48
+	protected function _set_menu_map()
49
+	{
50
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
51
+			array(
52
+				'menu_group'      => 'management',
53
+				'menu_order'      => 10,
54
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
55
+				'parent_slug'     => 'espresso_events',
56
+				'menu_slug'       => EE_MSG_PG_SLUG,
57
+				'menu_label'      => __('Messages', 'event_espresso'),
58
+				'capability'      => 'ee_read_global_messages',
59
+				'admin_init_page' => $this,
60
+			)
61
+		);
62
+	}
63 63
 }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,15 +24,15 @@
 block discarded – undo
24 24
 
25 25
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
26 26
 
27
-        if (! defined('EE_MSG_PG_SLUG')) {
27
+        if ( ! defined('EE_MSG_PG_SLUG')) {
28 28
             define('EE_MSG_PG_SLUG', 'espresso_messages');
29 29
             define('EE_MSG_PG_NAME', ucwords(str_replace('_', '', EE_MSG_PG_SLUG)));
30
-            define('EE_MSG_ADMIN', EE_ADMIN_PAGES . 'messages' . DS);
31
-            define('EE_MSG_ADMIN_URL', admin_url('admin.php?page=' . EE_MSG_PG_SLUG));
32
-            define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN . 'assets' . DS);
33
-            define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'messages/assets/');
34
-            define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN . 'templates' . DS);
35
-            define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'messages/templates/');
30
+            define('EE_MSG_ADMIN', EE_ADMIN_PAGES.'messages'.DS);
31
+            define('EE_MSG_ADMIN_URL', admin_url('admin.php?page='.EE_MSG_PG_SLUG));
32
+            define('EE_MSG_ASSETS_PATH', EE_MSG_ADMIN.'assets'.DS);
33
+            define('EE_MSG_ASSETS_URL', EE_ADMIN_PAGES_URL.'messages/assets/');
34
+            define('EE_MSG_TEMPLATE_PATH', EE_MSG_ADMIN.'templates'.DS);
35
+            define('EE_MSG_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'messages/templates/');
36 36
         }
37 37
 
38 38
         parent::__construct();
Please login to merge, or discard this patch.
general_settings/help_tabs/general_settings_admin_options.help_tab.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
 <?php _e('This option will save all Event Espresso registration form data, and debugging information to a file in the /wp-content/uploads/espresso/logs directory on your server. This will occur each time a page is accessed on your site until this option is turned off.', 'event_espresso'); ?>
13 13
 <br/>
14 14
 <?php printf(
15
-    __('Note that if you are accessing your filesystem over FTP or SSH, and logging writes to the filesystem on every request, you should put your credentials in your wp-config.php file, as described %1$shere.%2$s', 'event_espresso'),
16
-    '<a href="https://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants" target="_blank">',
17
-    '</a>'
15
+	__('Note that if you are accessing your filesystem over FTP or SSH, and logging writes to the filesystem on every request, you should put your credentials in your wp-config.php file, as described %1$shere.%2$s', 'event_espresso'),
16
+	'<a href="https://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants" target="_blank">',
17
+	'</a>'
18 18
 ); ?>
19 19
 </li>
20 20
 <li>
Please login to merge, or discard this patch.
admin_pages/general_settings/General_Settings_Admin_Page_Init.core.php 2 patches
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -18,37 +18,37 @@
 block discarded – undo
18 18
 class General_Settings_Admin_Page_Init extends EE_Admin_Page_Init
19 19
 {
20 20
 
21
-    public function __construct()
22
-    {
23
-        // define some constants
24
-        define('GEN_SET_PG_SLUG', 'espresso_general_settings');
25
-        define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
26
-        define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings' . DS);
27
-        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
28
-        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates' . DS);
29
-        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
21
+	public function __construct()
22
+	{
23
+		// define some constants
24
+		define('GEN_SET_PG_SLUG', 'espresso_general_settings');
25
+		define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
26
+		define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings' . DS);
27
+		define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
28
+		define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates' . DS);
29
+		define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
30 30
 
31
-        parent::__construct();
32
-    }
31
+		parent::__construct();
32
+	}
33 33
 
34
-    protected function _set_init_properties()
35
-    {
36
-        $this->label = GEN_SET_LABEL;
37
-    }
34
+	protected function _set_init_properties()
35
+	{
36
+		$this->label = GEN_SET_LABEL;
37
+	}
38 38
 
39
-    protected function _set_menu_map()
40
-    {
41
-        $this->_menu_map = new EE_Admin_Page_Sub_Menu(
42
-            array(
43
-                'menu_group'      => 'settings',
44
-                'menu_order'      => 20,
45
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
46
-                'parent_slug'     => 'espresso_events',
47
-                'menu_slug'       => GEN_SET_PG_SLUG,
48
-                'menu_label'      => GEN_SET_LABEL,
49
-                'capability'      => 'manage_options',
50
-                'admin_init_page' => $this,
51
-            )
52
-        );
53
-    }
39
+	protected function _set_menu_map()
40
+	{
41
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(
42
+			array(
43
+				'menu_group'      => 'settings',
44
+				'menu_order'      => 20,
45
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
46
+				'parent_slug'     => 'espresso_events',
47
+				'menu_slug'       => GEN_SET_PG_SLUG,
48
+				'menu_label'      => GEN_SET_LABEL,
49
+				'capability'      => 'manage_options',
50
+				'admin_init_page' => $this,
51
+			)
52
+		);
53
+	}
54 54
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,10 +23,10 @@
 block discarded – undo
23 23
         // define some constants
24 24
         define('GEN_SET_PG_SLUG', 'espresso_general_settings');
25 25
         define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
26
-        define('GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings' . DS);
27
-        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page=' . GEN_SET_PG_SLUG));
28
-        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates' . DS);
29
-        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/');
26
+        define('GEN_SET_ADMIN', EE_ADMIN_PAGES.'general_settings'.DS);
27
+        define('GEN_SET_ADMIN_URL', admin_url('admin.php?page='.GEN_SET_PG_SLUG));
28
+        define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN.'templates'.DS);
29
+        define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL.'general_settings/assets/');
30 30
 
31 31
         parent::__construct();
32 32
     }
Please login to merge, or discard this patch.
admin_pages/general_settings/templates/espresso_page_settings.template.php 1 patch
Indentation   +82 added lines, -82 removed lines patch added patch discarded remove patch
@@ -5,15 +5,15 @@  discard block
 block discarded – undo
5 5
     </h2>
6 6
     <p class="ee-attention">
7 7
         <?php
8
-        echo sprintf(
9
-            __(
10
-                '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.',
11
-                'event_espresso'
12
-            ),
13
-            '<a href="admin.php?page=espresso_support">',
14
-            '</a>'
15
-        );
16
-        ?>
8
+		echo sprintf(
9
+			__(
10
+				'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.',
11
+				'event_espresso'
12
+			),
13
+			'<a href="admin.php?page=espresso_support">',
14
+			'</a>'
15
+		);
16
+		?>
17 17
     </p>
18 18
 
19 19
     <table class="form-table">
@@ -39,21 +39,21 @@  discard block
 block discarded – undo
39 39
                 </select>
40 40
                 <span>
41 41
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
42
-                        $reg_page_obj,
43
-                        '[ESPRESSO_CHECKOUT]'
44
-                    ); ?>
42
+						$reg_page_obj,
43
+						'[ESPRESSO_CHECKOUT]'
44
+					); ?>
45 45
                 </span>
46 46
                 <br/>
47 47
                 <p class="description">
48 48
                     <?php
49
-                    echo sprintf(
50
-                        __(
51
-                            'This page can be hidden from navigation if desired, but should always contain the %s shortcode.',
52
-                            'event_espresso'
53
-                        ),
54
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CHECKOUT]</span>'
55
-                    );
56
-                    ?>
49
+					echo sprintf(
50
+						__(
51
+							'This page can be hidden from navigation if desired, but should always contain the %s shortcode.',
52
+							'event_espresso'
53
+						),
54
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CHECKOUT]</span>'
55
+					);
56
+					?>
57 57
                 </p>
58 58
                 <br/><br/>
59 59
             </td>
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
                     <br/>
70 70
                     <span class="lt-grey-text">
71 71
                         <?php _e(
72
-                            'Notify URL (processes payments)',
73
-                            'event_espresso'
74
-                        ); ?></span><br/>
72
+							'Notify URL (processes payments)',
73
+							'event_espresso'
74
+						); ?></span><br/>
75 75
                     <?php echo General_Settings_Admin_Page::edit_view_links($txn_page_id); ?>
76 76
                 </label>
77 77
             </th>
@@ -84,21 +84,21 @@  discard block
 block discarded – undo
84 84
                 </select>
85 85
                 <span>
86 86
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
87
-                        $txn_page_obj,
88
-                        '[ESPRESSO_TXN_PAGE]'
89
-                    ); ?>
87
+						$txn_page_obj,
88
+						'[ESPRESSO_TXN_PAGE]'
89
+					); ?>
90 90
                 </span>
91 91
                 <br/>
92 92
                 <p class="description">
93 93
                     <?php
94
-                    echo sprintf(
95
-                        __(
96
-                            'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
97
-                            'event_espresso'
98
-                        ),
99
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
100
-                    );
101
-                    ?>
94
+					echo sprintf(
95
+						__(
96
+							'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
97
+							'event_espresso'
98
+						),
99
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
100
+					);
101
+					?>
102 102
                 </p>
103 103
                 <br/><br/>
104 104
             </td>
@@ -124,21 +124,21 @@  discard block
 block discarded – undo
124 124
                 </select>
125 125
                 <span>
126 126
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
127
-                        $thank_you_page_obj,
128
-                        '[ESPRESSO_THANK_YOU]'
129
-                    ); ?>
127
+						$thank_you_page_obj,
128
+						'[ESPRESSO_THANK_YOU]'
129
+					); ?>
130 130
                 </span>
131 131
                 <br/>
132 132
                 <p class="description">
133 133
                     <?php
134
-                    echo sprintf(
135
-                        __(
136
-                            'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
137
-                            'event_espresso'
138
-                        ),
139
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
140
-                    );
141
-                    ?>
134
+					echo sprintf(
135
+						__(
136
+							'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.',
137
+							'event_espresso'
138
+						),
139
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
140
+					);
141
+					?>
142 142
                 </p>
143 143
                 <br/><br/>
144 144
             </td>
@@ -164,21 +164,21 @@  discard block
 block discarded – undo
164 164
                 </select>
165 165
                 <span>
166 166
                     <?php echo General_Settings_Admin_Page::page_and_shortcode_status(
167
-                        $cancel_page_obj,
168
-                        '[ESPRESSO_CANCELLED]'
169
-                    ); ?>
167
+						$cancel_page_obj,
168
+						'[ESPRESSO_CANCELLED]'
169
+					); ?>
170 170
                 </span>
171 171
                 <br/>
172 172
                 <p class="description">
173 173
                     <?php
174
-                    echo sprintf(
175
-                        __(
176
-                            '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.',
177
-                            'event_espresso'
178
-                        ),
179
-                        '<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
180
-                    );
181
-                    ?>
174
+					echo sprintf(
175
+						__(
176
+							'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.',
177
+							'event_espresso'
178
+						),
179
+						'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
180
+					);
181
+					?>
182 182
                 </p>
183 183
                 <br/><br/>
184 184
             </td>
@@ -194,27 +194,27 @@  discard block
 block discarded – undo
194 194
                     <br/>
195 195
                     <a href='<?php echo get_post_type_archive_link('espresso_events') ?>'>
196 196
                         <?php _e(
197
-                            'View',
198
-                            'event_espresso'
199
-                        ); ?></a>
197
+							'View',
198
+							'event_espresso'
199
+						); ?></a>
200 200
                 </label>
201 201
             </th>
202 202
             <td>
203 203
                 <p class="description">
204 204
                     <?php echo __(
205
-                        'Events are custom post types and use WordPress\' normal archive pages for displaying events.',
206
-                        'event_espresso'
207
-                    ) ?>
205
+						'Events are custom post types and use WordPress\' normal archive pages for displaying events.',
206
+						'event_espresso'
207
+					) ?>
208 208
                 </p>
209 209
                 <p class="description">
210 210
                     <?php printf(
211
-                        __(
212
-                            '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',
213
-                            'event_espresso'
214
-                        ),
215
-                        '<a href="admin.php?page=espresso_support">',
216
-                        '</a>'
217
-                    ) ?>
211
+						__(
212
+							'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',
213
+							'event_espresso'
214
+						),
215
+						'<a href="admin.php?page=espresso_support">',
216
+						'</a>'
217
+					) ?>
218 218
                 </p>
219 219
                 <br/><br/>
220 220
             </td>
@@ -230,27 +230,27 @@  discard block
 block discarded – undo
230 230
                     <br/>
231 231
                     <a href='<?php echo get_post_type_archive_link('espresso_venues') ?>'>
232 232
                         <?php _e(
233
-                            'View',
234
-                            'event_espresso'
235
-                        ); ?></a>
233
+							'View',
234
+							'event_espresso'
235
+						); ?></a>
236 236
                 </label>
237 237
             </th>
238 238
             <td>
239 239
                 <p class="description">
240 240
                     <?php echo __(
241
-                        'Venues are custom post types and use WordPress\' normal archive pages for displaying events.',
242
-                        'event_espresso'
243
-                    ) ?>
241
+						'Venues are custom post types and use WordPress\' normal archive pages for displaying events.',
242
+						'event_espresso'
243
+					) ?>
244 244
                 </p>
245 245
                 <p class="description">
246 246
                     <?php printf(
247
-                        __(
248
-                            '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',
249
-                            'event_espresso'
250
-                        ),
251
-                        '<a href="admin.php?page=espresso_support">',
252
-                        '</a>'
253
-                    ) ?>
247
+						__(
248
+							'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',
249
+							'event_espresso'
250
+						),
251
+						'<a href="admin.php?page=espresso_support">',
252
+						'</a>'
253
+					) ?>
254 254
                 </p>
255 255
             </td>
256 256
         </tr>
Please login to merge, or discard this patch.
admin_pages/general_settings/templates/state_details_settings.template.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -5,24 +5,24 @@  discard block
 block discarded – undo
5 5
         <th><?php _e('Name', 'event_espresso'); ?></th>
6 6
         <th colspan="2"><span class="small-text">
7 7
                 <?php _e(
8
-                    'State Appears in<br/>Dropdown Select Lists ',
9
-                    'event_espresso'
10
-                ); ?></span></th>
8
+					'State Appears in<br/>Dropdown Select Lists ',
9
+					'event_espresso'
10
+				); ?></span></th>
11 11
     </tr>
12 12
     </thead>
13 13
     <tbody>
14 14
     <?php
15
-    if ($states) {
16
-        foreach ($states as $STA_ID => $state) {
17
-        ?>
15
+	if ($states) {
16
+		foreach ($states as $STA_ID => $state) {
17
+		?>
18 18
         <tr id="state-<?php echo $STA_ID; ?>-tr" class="country-state-columns">
19 19
             <?php
20
-            foreach ($state['inputs'] as $ID => $input) {
21
-                if ($ID != 'STA_ID' && $ID != 'CNT_ISO') {
22
-                    echo EEH_Form_Fields::generate_form_input($input);
23
-                }
24
-            }
25
-            ?>
20
+			foreach ($state['inputs'] as $ID => $input) {
21
+				if ($ID != 'STA_ID' && $ID != 'CNT_ISO') {
22
+					echo EEH_Form_Fields::generate_form_input($input);
23
+				}
24
+			}
25
+			?>
26 26
             <td class="delete-state-td">
27 27
                 <a id="delete-state-<?php echo $STA_ID; ?>-lnk"
28 28
                    class="dashicons dashicons-post-trash ee-icon-size-20 delete-state-lnk" rel="<?php echo $STA_ID; ?>"
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
             </td>
32 32
         </tr>
33 33
         <?php
34
-        }
35
-    ?>
34
+		}
35
+	?>
36 36
     </tbody>
37 37
 </table>
38 38
 <br/>
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
        value="<?php _e('Save States/Provinces', 'event_espresso'); ?>"/><br/>
41 41
 
42 42
 <?php
43
-    }
43
+	}
44 44
 ?>
45 45
 <table class="form-table add-new-state-tbl">
46 46
     <tbody>
Please login to merge, or discard this patch.
general_settings/templates/country_details_settings.template.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <table id="general-setting-country-details-tbl" class="form-table">
2 2
     <tbody>
3 3
     <?php
4
-    foreach ($inputs as $ID => $input) {
5
-        echo EEH_Form_Fields::generate_form_input($input);
6
-    }
7
-    ?>
4
+	foreach ($inputs as $ID => $input) {
5
+		echo EEH_Form_Fields::generate_form_input($input);
6
+	}
7
+	?>
8 8
     <tr>
9 9
         <th></th>
10 10
         <td><br/><input id="country_settings_save_2" class="button-primary save" type="submit" name="save"
Please login to merge, or discard this patch.
general_settings/templates/your_organization_settings.template.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@  discard block
 block discarded – undo
6 6
 
7 7
 <div class="padding">
8 8
     <?php
9
-    // we'll only show site-license keys if this is main_site() (which works for both multi-site and single-site wp installations)
9
+	// we'll only show site-license keys if this is main_site() (which works for both multi-site and single-site wp installations)
10 10
 
11
-    if (is_main_site()) { ?>
11
+	if (is_main_site()) { ?>
12 12
         <h2 class="ee-admin-settings-hdr" style="width:300px;">
13 13
             <?php _e('Your Event Espresso License Key', 'event_espresso'); ?>
14 14
         </h2>
@@ -16,14 +16,14 @@  discard block
 block discarded – undo
16 16
         <table class="form-table">
17 17
             <tbody>
18 18
             <tr <?php echo isset($_REQUEST['license_key']) && $_REQUEST['license_key'] == true ? 'class="yellow_alert"'
19
-                : '' ?>>
19
+				: '' ?>>
20 20
                 <th>
21 21
                     <label for="site_license_key">
22 22
                         <?php _e('Support License Key', 'event_espresso'); ?>
23 23
 
24 24
                         <?php echo EEH_Template::get_help_tab_link(
25
-                            'site_license_key_info'
26
-                        ); ?>
25
+							'site_license_key_info'
26
+						); ?>
27 27
                     </label>
28 28
                 </th>
29 29
                 <td>
@@ -32,13 +32,13 @@  discard block
 block discarded – undo
32 32
                     <br/>
33 33
                     <p class="description">
34 34
                         <?php printf(
35
-                            __(
36
-                                'Adding a valid Support License Key will enable automatic update notifications and backend updates for Event Espresso Core and any installed add-ons. If this is a Development or Test site, %sDO NOT%s enter your Support License Key.',
37
-                                'event_espresso'
38
-                            ),
39
-                            '<strong>',
40
-                            '</strong>'
41
-                        ); ?>
35
+							__(
36
+								'Adding a valid Support License Key will enable automatic update notifications and backend updates for Event Espresso Core and any installed add-ons. If this is a Development or Test site, %sDO NOT%s enter your Support License Key.',
37
+								'event_espresso'
38
+							),
39
+							'<strong>',
40
+							'</strong>'
41
+						); ?>
42 42
                     </p>
43 43
                 </td>
44 44
             </tr>
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 
51 51
     <h2 id="contact_info_h4" class="ee-admin-settings-hdr">
52 52
         <?php _e('Contact Information', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
53
-            'contact_info_info'
54
-        ); ?>
53
+			'contact_info_info'
54
+		); ?>
55 55
     </h2>
56 56
 
57 57
     <table class="form-table">
@@ -127,13 +127,13 @@  discard block
 block discarded – undo
127 127
                        value="<?php echo esc_textarea($organization_email); ?>"/>
128 128
                 <p class="description">
129 129
                     <?php echo sprintf(
130
-                        esc_html__(
131
-                            'This is where notifications go to when you use the %1$s and %2$s shortcodes in the message templates.',
132
-                            'event_espresso'
133
-                        ),
134
-                        '<code>[CO_FORMATTED_EMAIL]</code>',
135
-                        '<code>[CO_EMAIL]</code>'
136
-                    ); ?>
130
+						esc_html__(
131
+							'This is where notifications go to when you use the %1$s and %2$s shortcodes in the message templates.',
132
+							'event_espresso'
133
+						),
134
+						'<code>[CO_FORMATTED_EMAIL]</code>',
135
+						'<code>[CO_EMAIL]</code>'
136
+					); ?>
137 137
                 </p>
138 138
             </td>
139 139
         </tr>
@@ -170,8 +170,8 @@  discard block
 block discarded – undo
170 170
 
171 171
     <h2 class="ee-admin-settings-hdr">
172 172
         <?php _e('Company Logo', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
173
-            'organization_logo_info'
174
-        ); ?>
173
+			'organization_logo_info'
174
+		); ?>
175 175
     </h2>
176 176
 
177 177
     <table class="form-table">
@@ -188,9 +188,9 @@  discard block
 block discarded – undo
188 188
                 <input id="upload_image_button" type="button" value="<?php _e('Upload Image', 'event_espresso'); ?>"/>
189 189
                 <p class="description">
190 190
                     <?php _e(
191
-                        'Your logo will be used on custom invoices, tickets, certificates, and payment templates.',
192
-                        'event_espresso'
193
-                    ); ?>
191
+						'Your logo will be used on custom invoices, tickets, certificates, and payment templates.',
192
+						'event_espresso'
193
+					); ?>
194 194
                 </p>
195 195
             </td>
196 196
         </tr>
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
             </th>
204 204
             <td>
205 205
                 <?php
206
-                if ($organization_logo_url) {
207
-                    ?>
206
+				if ($organization_logo_url) {
207
+					?>
208 208
                     <p id="default-logo-thumb">
209 209
                         <img id="current-image-thumb" src="<?php echo esc_url($organization_logo_url) ?>" alt=""/><br/>
210 210
                         <a id='remove-image' href='#' title='<?php esc_attr_e('Remove Image', 'event_espresso'); ?>'
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
                         </a>
214 214
                     </p>
215 215
                     <?php
216
-                } ?>
216
+				} ?>
217 217
             </td>
218 218
         </tr>
219 219
 
@@ -223,14 +223,14 @@  discard block
 block discarded – undo
223 223
 
224 224
     <h2 class="ee-admin-settings-hdr">
225 225
         <?php _e('Social Links', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
226
-            'social_links_info'
227
-        ); ?>
226
+			'social_links_info'
227
+		); ?>
228 228
     </h2>
229 229
     <p class="description">
230 230
         <?php _e(
231
-            'Enter any links to social accounts for your organization here',
232
-            'event_espresso'
233
-        ); ?></p>
231
+			'Enter any links to social accounts for your organization here',
232
+			'event_espresso'
233
+		); ?></p>
234 234
 
235 235
     <table class="form-table">
236 236
         <tbody>
@@ -331,19 +331,19 @@  discard block
 block discarded – undo
331 331
                 </th>
332 332
                 <td>
333 333
                     <?php
334
-                    $values = array(
335
-                        array(
336
-                            'id' => 'yes',
337
-                            'text' => __('Yes! I want to help improve Event Espresso!', 'event_espresso'),
338
-                        ),
339
-                        array('id' => 'no', 'text' => __('Not at this time. Maybe later.', 'event_espresso')),
340
-                    );
341
-                    echo EEH_Form_Fields::select_input(
342
-                        'ueip_optin',
343
-                        $values,
344
-                        ! empty($ee_ueip_optin) ? $ee_ueip_optin : 'yes'
345
-                    );
346
-                    ?>
334
+					$values = array(
335
+						array(
336
+							'id' => 'yes',
337
+							'text' => __('Yes! I want to help improve Event Espresso!', 'event_espresso'),
338
+						),
339
+						array('id' => 'no', 'text' => __('Not at this time. Maybe later.', 'event_espresso')),
340
+					);
341
+					echo EEH_Form_Fields::select_input(
342
+						'ueip_optin',
343
+						$values,
344
+						! empty($ee_ueip_optin) ? $ee_ueip_optin : 'yes'
345
+					);
346
+					?>
347 347
                 </td>
348 348
             </tr>
349 349
 
Please login to merge, or discard this patch.
admin_pages/general_settings/templates/countries_settings.template.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 block discarded – undo
7 7
 
8 8
     <h2 class="ee-admin-settings-hdr">
9 9
         <?php _e(
10
-            'Countries and States/Provinces',
11
-            'event_espresso'
12
-        ); ?><?php echo EEH_Template::get_help_tab_link('country_select_info'); ?></h2>
10
+			'Countries and States/Provinces',
11
+			'event_espresso'
12
+		); ?><?php echo EEH_Template::get_help_tab_link('country_select_info'); ?></h2>
13 13
     <table class="form-table">
14 14
         <tbody>
15 15
         <?php echo EEH_Form_Fields::generate_form_input($countries); ?>
@@ -18,25 +18,25 @@  discard block
 block discarded – undo
18 18
     <br/>
19 19
     <p>
20 20
         <?php _e(
21
-            'The country that is selected above will populate the Country Details settings and the options for States/Provinces. This information will be used throughout Event Espresso including for registration purposes and how currency is displayed. If you make a change to the country on this page, it is important that you also update your Contact Information on the Your Organization tab.',
22
-            'event_espresso'
23
-        ); ?>
21
+			'The country that is selected above will populate the Country Details settings and the options for States/Provinces. This information will be used throughout Event Espresso including for registration purposes and how currency is displayed. If you make a change to the country on this page, it is important that you also update your Contact Information on the Your Organization tab.',
22
+			'event_espresso'
23
+		); ?>
24 24
     </p>
25 25
     <div id="country-details-settings-dv">
26 26
         <h2 class="ee-admin-settings-hdr">
27 27
             <?php _e(
28
-                'Country Details',
29
-                'event_espresso'
30
-            ); ?><?php echo EEH_Template::get_help_tab_link('country_details_info'); ?></h2>
28
+				'Country Details',
29
+				'event_espresso'
30
+			); ?><?php echo EEH_Template::get_help_tab_link('country_details_info'); ?></h2>
31 31
         <div id="country-details-dv"><?php echo $country_details_settings; ?></div>
32 32
     </div>
33 33
 
34 34
     <div id="country-states-settings-dv">
35 35
         <h2 class="ee-admin-settings-hdr">
36 36
             <?php _e(
37
-                'States/Provinces',
38
-                'event_espresso'
39
-            ); ?><?php echo EEH_Template::get_help_tab_link('country_states_info'); ?></h2>
37
+				'States/Provinces',
38
+				'event_espresso'
39
+			); ?><?php echo EEH_Template::get_help_tab_link('country_states_info'); ?></h2>
40 40
         <div id="country-states-dv"><?php echo $country_states_settings; ?></div>
41 41
     </div>
42 42
 
Please login to merge, or discard this patch.