Completed
Branch BUG-10738-inconsistency-in-ses... (4fb977)
by
unknown
104:46 queued 94:10
created
admin_pages/events/templates/event_category_details.template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,15 +5,15 @@
 block discarded – undo
5 5
 			<th><label for="category_name">
6 6
 					<?php _e('Category Name', 'event_espresso'); ?>
7 7
 					<em title="<?php esc_attr_e('This field is required', 'event_espresso') ?>"> *</em></label></th>
8
-			<td><input id="category_name" type="text" name="category_name" value="<?php echo $category->category_name;?>" /></td>
8
+			<td><input id="category_name" type="text" name="category_name" value="<?php echo $category->category_name; ?>" /></td>
9 9
 		</tr>
10 10
 		<tr>
11 11
 			<th><label for="cat_id">
12 12
 					<?php _e('Unique ID', 'event_espresso'); ?>
13 13
 					<?php echo $unique_id_info_help_link; ?>
14 14
 				</label></th>
15
-			<td><input id="cat_id"  type="text" name="category_identifier" value="<?php echo $category->category_identifier;?>"<?php echo $disable; ?>/>
16
-				<?php if ( $disabled_message ) : ?>
15
+			<td><input id="cat_id"  type="text" name="category_identifier" value="<?php echo $category->category_identifier; ?>"<?php echo $disable; ?>/>
16
+				<?php if ($disabled_message) : ?>
17 17
 					<br />
18 18
 					<p class="small-text"><?php _e('This is a default category so you can edit the label and the description but not the slug', 'event_espresso'); ?></p>
19 19
 				<?php endif; ?>
Please login to merge, or discard this patch.
admin_pages/events/templates/event_publish_box_extras.template.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,22 +1,22 @@  discard block
 block discarded – undo
1 1
 
2 2
 <div class="misc-pub-section">
3 3
 	<span class="dashicons dashicons-groups ee-icon-color-ee-green ee-icon-size-20"></span>
4
-	<a href="<?php echo $view_approved_reg_url;?>">
5
-		<?php printf( __('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence') ); ?>
4
+	<a href="<?php echo $view_approved_reg_url; ?>">
5
+		<?php printf(__('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')); ?>
6 6
 	</a>:
7 7
 	<?php echo $approved_regs; ?>
8 8
 </div>
9 9
 <div class="misc-pub-section">
10 10
 	<span class="dashicons dashicons-groups ee-icon-color-ee-blue ee-icon-size-20"></span>
11
-	<a href="<?php echo $view_pending_payment_reg_url;?>">
12
-		<?php printf( __('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence') ); ?>
11
+	<a href="<?php echo $view_pending_payment_reg_url; ?>">
12
+		<?php printf(__('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence')); ?>
13 13
 	</a>:
14 14
 	<?php echo $pending_payment_regs; ?>
15 15
 </div>
16 16
 <div class="misc-pub-section">
17 17
 	<span class="dashicons dashicons-groups ee-icon-color-ee-orange ee-icon-size-20"></span>
18
-	<a href="<?php echo $view_not_approved_reg_url;?>">
19
-		<?php printf( __('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence') ); ?>
18
+	<a href="<?php echo $view_not_approved_reg_url; ?>">
19
+		<?php printf(__('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence')); ?>
20 20
 	</a>:
21 21
 	<?php echo $not_approved_regs; ?>
22 22
 </div>
@@ -29,4 +29,4 @@  discard block
 block discarded – undo
29 29
 	</a>
30 30
 </div> /**/ ?>
31 31
 
32
-<?php echo $event_editor_overview_add;?>
33 32
\ No newline at end of file
33
+<?php echo $event_editor_overview_add; ?>
34 34
\ No newline at end of file
Please login to merge, or discard this patch.
admin_pages/events/templates/event_settings.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@
 block discarded – undo
10 10
 					</label>
11 11
 				</th>
12 12
 				<td>
13
-					<p><?php echo EEH_Form_Fields::select_input('default_reg_status', $reg_status_array, $default_reg_status ) ?></p>
13
+					<p><?php echo EEH_Form_Fields::select_input('default_reg_status', $reg_status_array, $default_reg_status) ?></p>
14 14
 					<p class="description">
15 15
 						<?php _e('This setting allows you to preselect what the default registration status setting is when creating an event.  Note that changing this setting does NOT retroactively apply it to existing events.', 'event_espresso'); ?>
16 16
 					</p>
17 17
 				</td>
18 18
 			</tr>
19 19
 
20
-		<?php do_action( 'AHEE__event_settings__template', $template_args ); ?>
20
+		<?php do_action('AHEE__event_settings__template', $template_args); ?>
21 21
 
22 22
 		</tbody>
23 23
 	</table>
Please login to merge, or discard this patch.
admin_pages/events/templates/event_tickets_metabox_ticket_row.template.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 		<span class="ticket-price-info-display ticket-price-dollar-sign-display"><?php echo $price_currency_symbol; ?></span>
16 16
 	</td>
17 17
 	<td>	
18
-		<?php if ( empty( $disabled ) ) : ?>
18
+		<?php if (empty($disabled)) : ?>
19 19
 			<input type="text" size="1" class="edit-price-PRC_amount ee-small-text-inp ee-inp-right" name="edit_prices[<?php echo $ticketrow; ?>][1][PRC_amount]" value="<?php echo $PRC_amount; ?>">
20 20
 		<?php else : ?>
21 21
 			<input type="text" size="1" class="edit-price-PRC_amount ee-small-text-inp ee-inp-right" name="disabled_price_amount" value="<?php echo $PRC_amount; ?>"<?php echo $disabled; ?>>
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		<input type="hidden" name="edit_prices[<?php echo $ticketrow; ?>][1][PRC_is_default]" class="edit-price-PRC_is_default" value="<?php echo $PRC_is_default; ?>">
28 28
 	</td>
29 29
 	<td>
30
-		<?php if ( empty( $disabled ) ) : ?>
30
+		<?php if (empty($disabled)) : ?>
31 31
 			<input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-inp-right" name="<?php echo $edit_ticketrow_name; ?>[<?php echo $ticketrow; ?>][TKT_qty]" value="<?php echo $TKT_qty; ?>">
32 32
 		<?php else : ?>
33 33
 			<input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-inp-right" name="disabled_tkt_qty" value="<?php echo $TKT_qty; ?>"<?php echo $disabled; ?>>
Please login to merge, or discard this patch.
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,8 +17,11 @@  discard block
 block discarded – undo
17 17
 	<td>	
18 18
 		<?php if ( empty( $disabled ) ) : ?>
19 19
 			<input type="text" size="1" class="edit-price-PRC_amount ee-small-text-inp ee-inp-right" name="edit_prices[<?php echo $ticketrow; ?>][1][PRC_amount]" value="<?php echo $PRC_amount; ?>">
20
-		<?php else : ?>
21
-			<input type="text" size="1" class="edit-price-PRC_amount ee-small-text-inp ee-inp-right" name="disabled_price_amount" value="<?php echo $PRC_amount; ?>"<?php echo $disabled; ?>>
20
+		<?php else {
21
+	: ?>
22
+			<input type="text" size="1" class="edit-price-PRC_amount ee-small-text-inp ee-inp-right" name="disabled_price_amount" value="<?php echo $PRC_amount;
23
+}
24
+?>"<?php echo $disabled; ?>>
22 25
 			<input type="hidden" size="1" class="edit-price-PRC_amount ee-small-text-inp ee-inp-right" name="edit_prices[<?php echo $ticketrow; ?>][1][PRC_amount]" value="<?php echo $PRC_amount; ?>">
23 26
 		<?php endif; ?>
24 27
 
@@ -29,8 +32,11 @@  discard block
 block discarded – undo
29 32
 	<td>
30 33
 		<?php if ( empty( $disabled ) ) : ?>
31 34
 			<input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-inp-right" name="<?php echo $edit_ticketrow_name; ?>[<?php echo $ticketrow; ?>][TKT_qty]" value="<?php echo $TKT_qty; ?>">
32
-		<?php else : ?>
33
-			<input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-inp-right" name="disabled_tkt_qty" value="<?php echo $TKT_qty; ?>"<?php echo $disabled; ?>>
35
+		<?php else {
36
+	: ?>
37
+			<input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-inp-right" name="disabled_tkt_qty" value="<?php echo $TKT_qty;
38
+}
39
+?>"<?php echo $disabled; ?>>
34 40
 			<input type="hidden" class="edit-ticket-TKT_qty ee-small-text-inp ee-inp-right" name="<?php echo $edit_ticketrow_name; ?>[<?php echo $ticketrow; ?>][TKT_qty]" value="<?php echo $TKT_qty; ?>">
35 41
 		<?php endif; ?>
36 42
 	</td>
Please login to merge, or discard this patch.
admin_pages/general_settings/General_Settings_Admin_Page_Init.core.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
 /**
@@ -33,12 +33,12 @@  discard block
 block discarded – undo
33 33
 
34 34
 	public function __construct() {
35 35
 		//define some constants
36
-		define( 'GEN_SET_PG_SLUG', 'espresso_general_settings' );
37
-		define( 'GEN_SET_LABEL', __('General Settings', 'event_espresso'));
38
-		define( 'GEN_SET_ADMIN', EE_ADMIN_PAGES . 'general_settings' . DS );
39
-		define( 'GEN_SET_ADMIN_URL', admin_url( 'admin.php?page=' . GEN_SET_PG_SLUG ));
40
-		define( 'GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN . 'templates' . DS );
41
-		define( 'GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL . 'general_settings/assets/' );
36
+		define('GEN_SET_PG_SLUG', 'espresso_general_settings');
37
+		define('GEN_SET_LABEL', __('General Settings', 'event_espresso'));
38
+		define('GEN_SET_ADMIN', EE_ADMIN_PAGES.'general_settings'.DS);
39
+		define('GEN_SET_ADMIN_URL', admin_url('admin.php?page='.GEN_SET_PG_SLUG));
40
+		define('GEN_SET_TEMPLATE_PATH', GEN_SET_ADMIN.'templates'.DS);
41
+		define('GEN_SET_ASSETS_URL', EE_ADMIN_PAGES_URL.'general_settings/assets/');
42 42
 
43 43
 		parent::__construct();
44 44
 	}
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	}
49 49
 
50 50
 	protected function _set_menu_map() {
51
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
51
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
52 52
 			'menu_group' => 'settings',
53 53
 			'menu_order' => 20,
54 54
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
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/general_settings/help_tours/Admin_Options_Help_Tour.class.php 2 patches
Spacing   +7 added lines, -7 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
 /**
@@ -81,24 +81,24 @@  discard block
 block discarded – undo
81 81
 
82 82
 
83 83
 	protected function _start() {
84
-		$content = '<h3>' . __('Admin Options', 'event_espresso') . '</h3>';
85
-		$content .= '<p>' . __('This tour of the Admin Options page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
84
+		$content = '<h3>'.__('Admin Options', 'event_espresso').'</h3>';
85
+		$content .= '<p>'.__('This tour of the Admin Options page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
86 86
 		return $content;
87 87
 	}
88 88
 
89 89
 	protected function _use_full_logging_stop() {
90
-		return '<p>' . __('When enabled, a log file is created which can be useful for debugging. Please disable this option when you are finished debugging.', 'event_espresso') . '</p>';
90
+		return '<p>'.__('When enabled, a log file is created which can be useful for debugging. Please disable this option when you are finished debugging.', 'event_espresso').'</p>';
91 91
 	}
92 92
 
93 93
 	protected function _use_remote_logging_stop() {
94
-		return '<p>' . __(' This option sends all Event Espresso debugging data and get / post variables to the specified URL below.', 'event_espresso') . '</p>';
94
+		return '<p>'.__(' This option sends all Event Espresso debugging data and get / post variables to the specified URL below.', 'event_espresso').'</p>';
95 95
 	}
96 96
 
97 97
 	protected function _show_reg_footer_stop() {
98
-		return '<p>' . __('Support us by adding a small link to Event Espresso in your event pages. You can even earn money for yourself by adding your affiliate link there!', 'event_espresso') . '</p>';
98
+		return '<p>'.__('Support us by adding a small link to Event Espresso in your event pages. You can even earn money for yourself by adding your affiliate link there!', 'event_espresso').'</p>';
99 99
 	}
100 100
 	
101 101
 	protected function _help_tour_activation_stop() {
102
-		return '<p>' . __('Turn these help tours on / off for Event Espresso pages.', 'event_espresso') . '</p>';
102
+		return '<p>'.__('Turn these help tours on / off for Event Espresso pages.', 'event_espresso').'</p>';
103 103
 	}
104 104
 }
105 105
\ 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/general_settings/help_tours/Countries_Help_Tour.class.php 2 patches
Spacing   +6 added lines, -6 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
 /**
@@ -71,20 +71,20 @@  discard block
 block discarded – undo
71 71
 
72 72
 
73 73
 	protected function _start() {
74
-		$content = '<h3>' . __('Countries Settings', 'event_espresso') . '</h3>';
75
-		$content .= '<p>' . __('This tour of the Countries Page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
74
+		$content = '<h3>'.__('Countries Settings', 'event_espresso').'</h3>';
75
+		$content .= '<p>'.__('This tour of the Countries Page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
76 76
 		return $content;
77 77
 	}
78 78
 
79 79
 	protected function _country_selector_stop() {
80
-		return '<p>' . __('Select the country where your business or organization is located. This affects the currency that is used in Event Espresso.', 'event_espresso') . '</p>';
80
+		return '<p>'.__('Select the country where your business or organization is located. This affects the currency that is used in Event Espresso.', 'event_espresso').'</p>';
81 81
 	}
82 82
 
83 83
 	protected function _country_details_stop() {
84
-		return '<p>' . __('Here you can fine tune country and currency settings.', 'event_espresso') . '</p>';
84
+		return '<p>'.__('Here you can fine tune country and currency settings.', 'event_espresso').'</p>';
85 85
 	}
86 86
 
87 87
 	protected function _country_states_settings_stop() {
88
-		return '<p>' . __('Used in certain areas of the plugin, here you can define what states/provinces will be displayed in case you do not do business in certain areas.', 'event_espresso') . '</p>';
88
+		return '<p>'.__('Used in certain areas of the plugin, here you can define what states/provinces will be displayed in case you do not do business in certain areas.', 'event_espresso').'</p>';
89 89
 	}
90 90
 }
91 91
\ 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/general_settings/help_tours/Critical_Pages_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
 /**
@@ -80,25 +80,25 @@  discard block
 block discarded – undo
80 80
 
81 81
 
82 82
 	protected function _start() {
83
-		$content = '<h3>' . __('Critical Pages', 'event_espresso') . '</h3>';
84
-		$content .= '<p>' . __('This section lists the pages that Event Espresso needs in order to function. Should you wish to change a page that is used you will need to move the shortcode to the new page and then allocate it here. Otherwise your registrations will not work correctly.', 'event_espresso') . '</p>';
85
-		$content .= '<p>' . __('This section also provides a status of the page to show you at a glance if something is not right.', 'event_espresso') . '</p>';
83
+		$content = '<h3>'.__('Critical Pages', 'event_espresso').'</h3>';
84
+		$content .= '<p>'.__('This section lists the pages that Event Espresso needs in order to function. Should you wish to change a page that is used you will need to move the shortcode to the new page and then allocate it here. Otherwise your registrations will not work correctly.', 'event_espresso').'</p>';
85
+		$content .= '<p>'.__('This section also provides a status of the page to show you at a glance if something is not right.', 'event_espresso').'</p>';
86 86
 		return $content;
87 87
 	}
88 88
 
89 89
 	protected function _reg_page_id_stop() {
90
-		return '<p>' . __('This page processes the registrations and is required, even if it is not visible in your menus. ', 'event_espresso') . '</p>';
90
+		return '<p>'.__('This page processes the registrations and is required, even if it is not visible in your menus. ', 'event_espresso').'</p>';
91 91
 	}
92 92
 
93 93
 	protected function _txn_page_id_stop() {
94
-		return '<p>' . __('This page processes payments. It should not be visible on your menus, and the page should not contain anything other than the shortcode.', 'event_espresso') . '</p>';
94
+		return '<p>'.__('This page processes payments. It should not be visible on your menus, and the page should not contain anything other than the shortcode.', 'event_espresso').'</p>';
95 95
 	}
96 96
 
97 97
 	protected function _thank_you_page_id_stop() {
98
-		return '<p>' . __('This page is displayed after a successful transaction. Feel free to add extra content to this page to personalise it!', 'event_espresso') . '</p>';
98
+		return '<p>'.__('This page is displayed after a successful transaction. Feel free to add extra content to this page to personalise it!', 'event_espresso').'</p>';
99 99
 	}
100 100
 
101 101
 	protected function _cancel_page_id_stop() {
102
-		return '<p>' . __('This page is displayed after an unsuccessful transaction. Feel free to add extra content to this page to personalise it!', 'event_espresso') . '</p>';
102
+		return '<p>'.__('This page is displayed after an unsuccessful transaction. Feel free to add extra content to this page to personalise it!', 'event_espresso').'</p>';
103 103
 	}
104 104
 }
105 105
\ 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.
general_settings/templates/country_details_settings.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 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 ); 
4
+		foreach ($inputs as $ID => $input) { 
5
+			echo EEH_Form_Fields::generate_form_input($input); 
6 6
 		 }
7 7
 		?>
8 8
 			<tr>
Please login to merge, or discard this patch.