Completed
Branch BUG-9469-post-shortcode-tracki... (8e8ba9)
by
unknown
735:40 queued 720:33
created
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
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
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
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
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
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
general_settings/help_tours/Your_Organization_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>' . __('Organization Settings', 'event_espresso') . '</h3>';
103
-		$content .= '<p>' . __('This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
102
+		$content = '<h3>'.__('Organization Settings', 'event_espresso').'</h3>';
103
+		$content .= '<p>'.__('This tour of the Your Organization 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 _site_license_key_stop() {
108
-		return '<p>' . __('Enter your support license key here to enable one-click updates.', 'event_espresso') . '</p>';
108
+		return '<p>'.__('Enter your support license key here to enable one-click updates.', 'event_espresso').'</p>';
109 109
 	}
110 110
 
111 111
 	protected function _contact_information_stop() {
112
-		return '<p>' . __('You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.', 'event_espresso') . '</p>';
112
+		return '<p>'.__('You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.', 'event_espresso').'</p>';
113 113
 	}
114 114
 
115 115
 	protected function _upload_image_stop() {
116
-		return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
116
+		return '<p>'.__('Add a logo. This can be used for invoices and tickets.', 'event_espresso').'</p>';
117 117
 	}
118 118
 
119 119
 	protected function _organization_facebook_stop() {
120
-		return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
120
+		return '<p>'.__('Add links to various social media networks.', 'event_espresso').'</p>';
121 121
 	}
122 122
 
123 123
 	protected function _ueip_option_stop() {
124
-		return '<p>' . __('Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.', 'event_espresso') . '</p>';
124
+		return '<p>'.__('Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.', 'event_espresso').'</p>';
125 125
 	}
126 126
 
127 127
 	protected function _end_tour_stop() {
128
-		return '<p>' . __('You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.', 'event_espresso') . '</p>';
128
+		return '<p>'.__('You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.', '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
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
admin_pages/general_settings/templates/admin_option_settings.template.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <div class="padding">
2 2
 
3
-	<?php do_action( 'AHEE__admin_option_settings__template__before', $template_args ); ?>
3
+	<?php do_action('AHEE__admin_option_settings__template__before', $template_args); ?>
4 4
 
5 5
 	<?php /* @todo put back once we have a dashboard widget to use
6 6
 	<h4 class="ee-admin-settings-hdr">
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 	</table>
66 66
 <?php endif; */ ?>
67 67
 
68
-	<?php if ( EE_Registry::instance()->CAP->current_user_can( 'manage_options', 'display_admin_settings_options_promote_and_affiliate' ) ) : ?>
68
+	<?php if (EE_Registry::instance()->CAP->current_user_can('manage_options', 'display_admin_settings_options_promote_and_affiliate')) : ?>
69 69
 		<h4 class="ee-admin-settings-hdr">
70 70
 			<?php _e('Promote Event Espresso', 'event_espresso'); ?> <span id="affiliate_info"><?php echo EEH_Template::get_help_tab_link('affiliate_info'); ?></span>
71 71
 		</h4>
@@ -80,13 +80,13 @@  discard block
 block discarded – undo
80 80
 						</label>
81 81
 					</th>
82 82
 					<td>
83
-						<?php echo EEH_Form_Fields::select_input('show_reg_footer', $values, $show_reg_footer ); ?>
83
+						<?php echo EEH_Form_Fields::select_input('show_reg_footer', $values, $show_reg_footer); ?>
84 84
 					</td>
85 85
 				</tr>
86 86
 
87 87
 				<tr>
88 88
 					<th>
89
-						<?php printf( __('Event Espresso %sAffiliate%s ID', 'event_espresso'), '<a href="http://eventespresso.com/affiliates/" target="_blank">', '</a>' ); ?>
89
+						<?php printf(__('Event Espresso %sAffiliate%s ID', 'event_espresso'), '<a href="http://eventespresso.com/affiliates/" target="_blank">', '</a>'); ?>
90 90
 					</th>
91 91
 					<td>
92 92
 						<input name="affiliate_id" class="regular-text" type="text" value="<?php echo $affiliate_id; ?>" />
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 					</label>
116 116
 				</th>
117 117
 				<td>
118
-					<?php echo EEH_Form_Fields::select_input('help_tour_activation', $values, $help_tour_activation ); ?>
118
+					<?php echo EEH_Form_Fields::select_input('help_tour_activation', $values, $help_tour_activation); ?>
119 119
 				</td>
120 120
 			</tr>
121 121
 		</tbody>
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.
admin_pages/general_settings/templates/state_details_settings.template.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,27 +1,27 @@  discard block
 block discarded – undo
1 1
 	<table id="general-setting-country-states-tbl" class="form-table">
2 2
 		<thead>
3 3
 			<tr>
4
-				<th><?php _e( 'Code', 'event_espresso' );?></th>
5
-				<th><?php _e( 'Name', 'event_espresso' );?></th>
6
-				<th colspan="2"><span class="small-text"><?php _e( 'State Appears in<br/>Dropdown Select Lists ', 'event_espresso' );?></span></th>
4
+				<th><?php _e('Code', 'event_espresso'); ?></th>
5
+				<th><?php _e('Name', 'event_espresso'); ?></th>
6
+				<th colspan="2"><span class="small-text"><?php _e('State Appears in<br/>Dropdown Select Lists ', 'event_espresso'); ?></span></th>
7 7
 			</tr>
8 8
 		</thead>
9 9
 		<tbody>
10 10
 		<?php
11 11
 		//EEH_Debug_Tools::printr( $states, '$states  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
12
-		if ( $states ) {
13
-			foreach ( $states as $STA_ID => $state ) {
12
+		if ($states) {
13
+			foreach ($states as $STA_ID => $state) {
14 14
 		?>
15 15
 			<tr id="state-<?php echo $STA_ID; ?>-tr" class="country-state-columns">
16 16
 			<?php
17
-				foreach ( $state['inputs'] as $ID => $input ) {
18
-					if ( $ID != 'STA_ID' && $ID != 'CNT_ISO' ) {
19
-						echo EEH_Form_Fields::generate_form_input( $input );
17
+				foreach ($state['inputs'] as $ID => $input) {
18
+					if ($ID != 'STA_ID' && $ID != 'CNT_ISO') {
19
+						echo EEH_Form_Fields::generate_form_input($input);
20 20
 					}
21 21
 				 }
22 22
 			 ?>
23 23
 				<td class="delete-state-td">
24
-					<a id="delete-state-<?php echo $STA_ID; ?>-lnk" class="dashicons dashicons-post-trash ee-icon-size-20 delete-state-lnk" rel="<?php echo $STA_ID; ?>" title="<?php esc_attr_e( 'Delete State #', 'event_espresso' ); ?><?php echo $STA_ID; ?>?" href="<?php echo $state['delete_state_url']; ?>"></a>
24
+					<a id="delete-state-<?php echo $STA_ID; ?>-lnk" class="dashicons dashicons-post-trash ee-icon-size-20 delete-state-lnk" rel="<?php echo $STA_ID; ?>" title="<?php esc_attr_e('Delete State #', 'event_espresso'); ?><?php echo $STA_ID; ?>?" href="<?php echo $state['delete_state_url']; ?>"></a>
25 25
 				</td>
26 26
 			</tr>
27 27
 		<?php
@@ -38,23 +38,23 @@  discard block
 block discarded – undo
38 38
 	<table class="form-table add-new-state-tbl">
39 39
 		<tbody>
40 40
 			<tr>
41
-				<td colspan="2"><h4><?php _e( 'Add New State/Province', 'event_espresso' );?></h4></td>
41
+				<td colspan="2"><h4><?php _e('Add New State/Province', 'event_espresso'); ?></h4></td>
42 42
 			</tr>
43 43
 
44 44
 			<tr>
45 45
 				<td class="general-settings-country-state-input-td">
46
-					<label for="STA_abbrev_XXX"><?php _e( 'Code', 'event_espresso' );?></label><br />
46
+					<label for="STA_abbrev_XXX"><?php _e('Code', 'event_espresso'); ?></label><br />
47 47
 					<input id="STA_abbrev-XXX" class="STA_abbrev mid-text " type="text" title="" value=""
48 48
 						   name="STA_abbrev_XXX">
49 49
 				</td>
50 50
 				<td class="general-settings-country-state-input-td">
51
-					<label for="STA_name_XXX"><?php _e( 'Name', 'event_espresso' );?></label><br/>
51
+					<label for="STA_name_XXX"><?php _e('Name', 'event_espresso'); ?></label><br/>
52 52
 					<input id="STA_name-XXX" class="STA_name regular-text " type="text" title="" value="" name="STA_name_XXX">
53 53
 				</td>
54 54
 			</tr>
55 55
 			<tr>
56 56
 				<td colspan="2">
57
-					<input  type="submit" id="add-new-state-btn" class="secondary-button button right" value="<?php _e( 'Add New State/Province', 'event_espresso' );?>" />
57
+					<input  type="submit" id="add-new-state-btn" class="secondary-button button right" value="<?php _e('Add New State/Province', 'event_espresso'); ?>" />
58 58
 
59 59
 				</td>
60 60
 			</tr>
Please login to merge, or discard this patch.
general_settings/templates/your_organization_settings.template.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <div class="padding">
2 2
 	<?php
3 3
 		//we'll only show site-license keys if this is main_site() (which works for both multi-site and single-site wp installations)
4
-		if ( is_main_site() ) { ?>
4
+		if (is_main_site()) { ?>
5 5
 		<h4 class="ee-admin-settings-hdr" style="width:300px;">
6 6
 			<?php _e('Your Event Espresso License Key', 'event_espresso'); ?>
7 7
 		</h4>
@@ -11,13 +11,13 @@  discard block
 block discarded – undo
11 11
 				<tr <?php echo isset($_REQUEST['license_key']) && $_REQUEST['license_key'] == true ? 'class="yellow_alert"' : '' ?>>
12 12
 					<th>
13 13
 						<label for="site_license_key">
14
-							<?php _e('Support License Key', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('site_license_key_info');?>
14
+							<?php _e('Support License Key', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('site_license_key_info'); ?>
15 15
 						</label>
16 16
 					</th>
17 17
 					<td>
18 18
 						<input name="site_license_key" id="site_license_key" size="10" class="regular-text" type="text" value="<?php echo $site_license_key; ?>" /><?php echo $site_license_key_verified; ?><br/>
19 19
 						<p class="description">
20
-							<?php printf( __('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.', 'event_espresso'), '<strong>', '</strong>' ); ?>
20
+							<?php printf(__('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.', 'event_espresso'), '<strong>', '</strong>'); ?>
21 21
 						</p>
22 22
 					</td>
23 23
 				</tr>
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
 
32 32
 	<h4 id="contact_info_h4" class="ee-admin-settings-hdr">
33
-		<?php _e('Contact Information', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('contact_info_info');?>
33
+		<?php _e('Contact Information', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('contact_info_info'); ?>
34 34
 	</h4>
35 35
 
36 36
 	<table class="form-table">
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
 					<input id="organization_city" class="regular-text" type="text" name="organization_city" value="<?php echo $organization_city; ?>" />
79 79
 				</td>
80 80
 			</tr>
81
-			<?php echo EEH_Form_Fields::generate_form_input( $states ); ?>
82
-			<?php echo EEH_Form_Fields::generate_form_input( $countries ); ?>
81
+			<?php echo EEH_Form_Fields::generate_form_input($states); ?>
82
+			<?php echo EEH_Form_Fields::generate_form_input($countries); ?>
83 83
 			<tr>
84 84
 				<th>
85 85
 					<label for="organization_zip">
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	</table>
134 134
 
135 135
 	<h4 class="ee-admin-settings-hdr">
136
-		<?php _e('Company Logo', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('organization_logo_info');?>
136
+		<?php _e('Company Logo', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('organization_logo_info'); ?>
137 137
 	</h4>
138 138
 
139 139
 	<table class="form-table">
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 				</th>
162 162
 				<td>
163 163
 					<?php
164
-					if ( $organization_logo_url ) {
164
+					if ($organization_logo_url) {
165 165
 						?>
166 166
 						<p id="default-logo-thumb">
167 167
 							<img id="current-image-thumb" src="<?php echo $organization_logo_url ?>" alt="" /><br />
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 	<br/><br/>
180 180
 
181 181
 	<h4 class="ee-admin-settings-hdr">
182
-		<?php _e('Social Links', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('social_links_info');?>
182
+		<?php _e('Social Links', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('social_links_info'); ?>
183 183
 	</h4>
184 184
 	<p class="description"><?php _e('Enter any links to social accounts for your organization here', 'event_espresso'); ?></p>
185 185
 
@@ -256,9 +256,9 @@  discard block
 block discarded – undo
256 256
 	<br/><br/>
257 257
 
258 258
 
259
-	<?php if ( is_main_site() ) : ?>
259
+	<?php if (is_main_site()) : ?>
260 260
 		<p>
261
-			<?php echo  EE_PUE::espresso_data_collection_optin_text( FALSE ); ?>
261
+			<?php echo  EE_PUE::espresso_data_collection_optin_text(FALSE); ?>
262 262
 		</p>
263 263
 
264 264
 		<table class="form-table">
@@ -272,11 +272,11 @@  discard block
 block discarded – undo
272 272
 					</th>
273 273
 					<td>
274 274
 						<?php
275
-							$values=array(
276
-								array('id'=>'yes','text'=> __('Yes! I want to help improve Event Espresso!','event_espresso')),
277
-								array('id'=>'no','text'=> __('Not at this time. Maybe later.','event_espresso'))
275
+							$values = array(
276
+								array('id'=>'yes', 'text'=> __('Yes! I want to help improve Event Espresso!', 'event_espresso')),
277
+								array('id'=>'no', 'text'=> __('Not at this time. Maybe later.', 'event_espresso'))
278 278
 							);
279
-							echo EEH_Form_Fields::select_input('ueip_optin', $values, !empty($ee_ueip_optin) ? $ee_ueip_optin : 'yes');
279
+							echo EEH_Form_Fields::select_input('ueip_optin', $values, ! empty($ee_ueip_optin) ? $ee_ueip_optin : 'yes');
280 280
 						?>
281 281
 					</td>
282 282
 				</tr>
Please login to merge, or discard this patch.
admin_pages/maintenance/Maintenance_Admin_Page.core.php 2 patches
Spacing   +88 added lines, -88 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,8 +30,8 @@  discard block
 block discarded – undo
30 30
 class Maintenance_Admin_Page extends EE_Admin_Page {
31 31
 
32 32
 
33
-	public function __construct( $routing = TRUE ) {
34
-		parent::__construct( $routing );
33
+	public function __construct($routing = TRUE) {
34
+		parent::__construct($routing);
35 35
 	}
36 36
 
37 37
 
@@ -46,8 +46,8 @@  discard block
 block discarded – undo
46 46
 
47 47
 
48 48
 	protected function _ajax_hooks() {
49
-		add_action('wp_ajax_migration_step',array($this,'migration_step'));
50
-		add_action('wp_ajax_add_error_to_migrations_ran',array($this,'add_error_to_migrations_ran'));
49
+		add_action('wp_ajax_migration_step', array($this, 'migration_step'));
50
+		add_action('wp_ajax_add_error_to_migrations_ran', array($this, 'add_error_to_migrations_ran'));
51 51
 	}
52 52
 
53 53
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		$this->_admin_page_title = EE_MAINTENANCE_LABEL;
57 57
 		$this->_labels = array(
58 58
 			'buttons' => array(
59
-				'reset_capabilities' => __( 'Reset Event Espresso Capabilities', 'event_espresso' )
59
+				'reset_capabilities' => __('Reset Event Espresso Capabilities', 'event_espresso')
60 60
 				)
61 61
 			);
62 62
 	}
@@ -155,23 +155,23 @@  discard block
 block discarded – undo
155 155
 	 * default maintenance page. If we're in maintenance mode level 2, then we need to show
156 156
 	 * the migration scripts and all that UI.
157 157
 	 */
158
-	public function _maintenance(){
158
+	public function _maintenance() {
159 159
 		//it all depends if we're in maintenance model level 1 (frontend-only) or
160 160
 		//level 2 (everything except maintenance page)
161
-		try{
161
+		try {
162 162
 			//get the current maintenance level and check if
163 163
 			//we are removed
164 164
 			$mm = EE_Maintenance_Mode::instance()->level();
165 165
 			$placed_in_mm = EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
166
-			if( $mm == EE_Maintenance_Mode::level_2_complete_maintenance && ! $placed_in_mm){
166
+			if ($mm == EE_Maintenance_Mode::level_2_complete_maintenance && ! $placed_in_mm) {
167 167
 				//we just took the site out of maintenance mode, so notify the user.
168 168
 				//unfortunately this message appears to be echoed on the NEXT page load...
169 169
 				//oh well, we should really be checking for this on addon deactivation anyways
170
-				EE_Error::add_attention( __( 'Site taken out of maintenance mode because no data migration scripts are required', 'event_espresso' ) );
171
-				$this->_process_notices( array( 'page' => 'espresso_maintenance_settings'), false );
170
+				EE_Error::add_attention(__('Site taken out of maintenance mode because no data migration scripts are required', 'event_espresso'));
171
+				$this->_process_notices(array('page' => 'espresso_maintenance_settings'), false);
172 172
 			}
173 173
 			//in case an exception is thrown while trying to handle migrations
174
-			switch(EE_Maintenance_Mode::instance()->level()){
174
+			switch (EE_Maintenance_Mode::instance()->level()) {
175 175
 				case EE_Maintenance_Mode::level_0_not_in_maintenance:
176 176
 				case EE_Maintenance_Mode::level_1_frontend_only_maintenance:
177 177
 					$show_maintenance_switch = true;
@@ -183,18 +183,18 @@  discard block
 block discarded – undo
183 183
 				case EE_Maintenance_Mode::level_2_complete_maintenance:
184 184
 					$show_maintenance_switch = false;
185 185
 					$show_migration_progress = true;
186
-					if(isset($this->_req_data['continue_migration'])){
186
+					if (isset($this->_req_data['continue_migration'])) {
187 187
 						$show_backup_db_text = false;
188
-					}else{
188
+					} else {
189 189
 						$show_backup_db_text = true;
190 190
 					}
191 191
 					$scripts_needing_to_run = EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts();
192 192
 					$addons_should_be_upgraded_first = EE_Data_Migration_Manager::instance()->addons_need_updating();
193 193
 					$script_names = array();
194 194
 					$current_script = NULL;
195
-					foreach($scripts_needing_to_run as $script){
196
-						if($script instanceof EE_Data_Migration_Script_Base){
197
-							if( ! $current_script){
195
+					foreach ($scripts_needing_to_run as $script) {
196
+						if ($script instanceof EE_Data_Migration_Script_Base) {
197
+							if ( ! $current_script) {
198 198
 								$current_script = $script;
199 199
 								$current_script->migration_page_hooks();
200 200
 							}
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
 			}
206 206
 			$most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
207 207
 			$exception_thrown = false;
208
-		}catch(EE_Error $e){
208
+		} catch (EE_Error $e) {
209 209
 
210 210
 			EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
211 211
 			//now, just so we can display the page correctly, make a error migration script stage object
@@ -215,57 +215,57 @@  discard block
 block discarded – undo
215 215
 			$exception_thrown = true;
216 216
 		}
217 217
 		$current_db_state = EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set();
218
-		if($exception_thrown ||
219
-				(	$most_recent_migration &&
218
+		if ($exception_thrown ||
219
+				($most_recent_migration &&
220 220
 					$most_recent_migration instanceof EE_Data_Migration_Script_Base &&
221 221
 					$most_recent_migration->is_broken()
222
-				)){
223
-			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_was_borked_page.template.php';
224
-			$this->_template_args[ 'support_url' ] = 'http://eventespresso.com/support/forums/';
225
-			$this->_template_args[ 'next_url' ] = EEH_URL::add_query_args_and_nonce(array( 'action' => 'confirm_migration_crash_report_sent', 'success' => '0' ), EE_MAINTENANCE_ADMIN_URL );
226
-		}elseif($addons_should_be_upgraded_first){
227
-			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_upgrade_addons_before_migrating.template.php';
228
-		}else{
229
-			if($most_recent_migration &&
230
-					$most_recent_migration instanceof EE_Data_Migration_Script_Base  &&
231
-					$most_recent_migration->can_continue()){
222
+				)) {
223
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_migration_was_borked_page.template.php';
224
+			$this->_template_args['support_url'] = 'http://eventespresso.com/support/forums/';
225
+			$this->_template_args['next_url'] = EEH_URL::add_query_args_and_nonce(array('action' => 'confirm_migration_crash_report_sent', 'success' => '0'), EE_MAINTENANCE_ADMIN_URL);
226
+		}elseif ($addons_should_be_upgraded_first) {
227
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_upgrade_addons_before_migrating.template.php';
228
+		} else {
229
+			if ($most_recent_migration &&
230
+					$most_recent_migration instanceof EE_Data_Migration_Script_Base &&
231
+					$most_recent_migration->can_continue()) {
232 232
 				$show_backup_db_text = false;
233 233
 				$show_continue_current_migration_script = true;
234 234
 				$show_most_recent_migration = true;
235
-			}elseif(isset($this->_req_data['continue_migration'])){
235
+			}elseif (isset($this->_req_data['continue_migration'])) {
236 236
 				$show_most_recent_migration = true;
237 237
 				$show_continue_current_migration_script = false;
238
-			}else{
238
+			} else {
239 239
 				$show_most_recent_migration = false;
240 240
 				$show_continue_current_migration_script = false;
241 241
 			}
242 242
 
243
-			if(isset($current_script)){
243
+			if (isset($current_script)) {
244 244
 				$migrates_to = $current_script->migrates_to_version();
245
-				$plugin_slug = $migrates_to[ 'slug' ];
246
-				$new_version = $migrates_to[ 'version' ];
247
-				$this->_template_args = array_merge($this->_template_args,array(
248
-					'current_db_state'=>  sprintf(__("EE%s (%s)", "event_espresso"), isset($current_db_state[$plugin_slug]) ? $current_db_state[$plugin_slug] : 3,$plugin_slug),
249
-					'next_db_state'=>isset($current_script) ? sprintf(__("EE%s (%s)", 'event_espresso'),$new_version,$plugin_slug) : NULL));
245
+				$plugin_slug = $migrates_to['slug'];
246
+				$new_version = $migrates_to['version'];
247
+				$this->_template_args = array_merge($this->_template_args, array(
248
+					'current_db_state'=>  sprintf(__("EE%s (%s)", "event_espresso"), isset($current_db_state[$plugin_slug]) ? $current_db_state[$plugin_slug] : 3, $plugin_slug),
249
+					'next_db_state'=>isset($current_script) ? sprintf(__("EE%s (%s)", 'event_espresso'), $new_version, $plugin_slug) : NULL));
250 250
 			}
251 251
 
252
-			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_page.template.php';
252
+			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_migration_page.template.php';
253 253
 			$this->_template_args = array_merge(
254 254
 				$this->_template_args,
255 255
 				array(
256
-					'show_most_recent_migration' => $show_most_recent_migration,//flag for showing the most recent migration's status and/or errors
257
-					'show_migration_progress' => $show_migration_progress,//flag for showing the option to run migrations and see their progress
258
-					'show_backup_db_text' => $show_backup_db_text,//flag for showing text telling the user to backup their DB
259
-					'show_maintenance_switch'=> $show_maintenance_switch,//flag for showing the option to change maintenance mode between levels 0 and 1
260
-					'script_names'=>$script_names,//array of names of scripts that have run
261
-					'show_continue_current_migration_script'=>$show_continue_current_migration_script,//flag to change wording to indicating that we're only CONTINUING a migration script (somehow it got interrupted0
256
+					'show_most_recent_migration' => $show_most_recent_migration, //flag for showing the most recent migration's status and/or errors
257
+					'show_migration_progress' => $show_migration_progress, //flag for showing the option to run migrations and see their progress
258
+					'show_backup_db_text' => $show_backup_db_text, //flag for showing text telling the user to backup their DB
259
+					'show_maintenance_switch'=> $show_maintenance_switch, //flag for showing the option to change maintenance mode between levels 0 and 1
260
+					'script_names'=>$script_names, //array of names of scripts that have run
261
+					'show_continue_current_migration_script'=>$show_continue_current_migration_script, //flag to change wording to indicating that we're only CONTINUING a migration script (somehow it got interrupted0
262 262
 					'reset_db_page_link' => EE_Admin_Page::add_query_args_and_nonce(array('action'=>'reset_db'), EE_MAINTENANCE_ADMIN_URL),
263
-					'update_migration_script_page_link' => EE_Admin_Page::add_query_args_and_nonce(array('action'=>'change_maintenance_level'),EE_MAINTENANCE_ADMIN_URL),
264
-					'ultimate_db_state'=>  sprintf(__("EE%s", 'event_espresso'),espresso_version()),
263
+					'update_migration_script_page_link' => EE_Admin_Page::add_query_args_and_nonce(array('action'=>'change_maintenance_level'), EE_MAINTENANCE_ADMIN_URL),
264
+					'ultimate_db_state'=>  sprintf(__("EE%s", 'event_espresso'), espresso_version()),
265 265
 				)
266 266
 			);
267 267
 		//make sure we have the form fields helper available. It usually is, but sometimes it isn't
268
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
268
+		EE_Registry::instance()->load_helper('Form_Fields');
269 269
 		//localize script stuff
270 270
 		wp_localize_script('ee-maintenance', 'ee_maintenance', array(
271 271
 			'migrating'=>  __("Migrating...", "event_espresso"),
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 			'status_fatal_error'=>  EE_Data_Migration_Manager::status_fatal_error,
277 277
 			'status_completed'=>  EE_Data_Migration_Manager::status_completed));
278 278
 		}
279
-		$this->_template_args['most_recent_migration'] = $most_recent_migration;//the actual most recently ran migration
279
+		$this->_template_args['most_recent_migration'] = $most_recent_migration; //the actual most recently ran migration
280 280
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, TRUE);
281 281
 		$this->display_admin_page_with_sidebar();
282 282
 	}
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 	/**
287 287
 	 * returns JSON and executes another step of the currently-executing data migration (called via ajax)
288 288
 	 */
289
-	public function migration_step(){
289
+	public function migration_step() {
290 290
 		$this->_template_args['data'] = EE_Data_Migration_Manager::instance()->response_to_migration_ajax_request();
291 291
 		$this->_return_json();
292 292
 	}
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 	 * Can be used by js when it notices a response with HTML in it in order
298 298
 	 * to log the malformed response
299 299
 	 */
300
-	public function add_error_to_migrations_ran(){
300
+	public function add_error_to_migrations_ran() {
301 301
 		EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($this->_req_data['message']);
302 302
 		$this->_template_args['data'] = array('ok'=>true);
303 303
 		$this->_return_json();
@@ -308,14 +308,14 @@  discard block
 block discarded – undo
308 308
 	/**
309 309
 	 * changes the maintenance level, provided there are still no migration scripts that shoudl run
310 310
 	 */
311
-	public function _change_maintenance_level(){
311
+	public function _change_maintenance_level() {
312 312
 		$new_level = intval($this->_req_data['maintenance_mode_level']);
313
-		if( ! EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){
313
+		if ( ! EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()) {
314 314
 			EE_Maintenance_Mode::instance()->set_maintenance_level($new_level);
315 315
 			$success = true;
316
-		}else{
316
+		} else {
317 317
 			EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
318
-			$success= false;
318
+			$success = false;
319 319
 		}
320 320
 		$this->_redirect_after_action($success, 'Maintenance Mode', __("Updated", "event_espresso"));
321 321
 	}
@@ -325,9 +325,9 @@  discard block
 block discarded – undo
325 325
 	/**
326 326
 	 * a tab with options for reseting and/or deleting EE data
327 327
 	 */
328
-	public function _data_reset_and_delete(){
329
-		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_data_reset_and_delete.template.php';
330
-		$this->_template_args['reset_capabilities_button'] = $this->get_action_link_or_button( 'reset_capabilities', 'reset_capabilities', array(),  'button button-primary' );
328
+	public function _data_reset_and_delete() {
329
+		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_data_reset_and_delete.template.php';
330
+		$this->_template_args['reset_capabilities_button'] = $this->get_action_link_or_button('reset_capabilities', 'reset_capabilities', array(), 'button button-primary');
331 331
 		$this->_template_args['delete_db_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_db'), EE_MAINTENANCE_ADMIN_URL);
332 332
 		$this->_template_args['reset_db_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'reset_db'), EE_MAINTENANCE_ADMIN_URL);
333 333
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, TRUE);
@@ -337,9 +337,9 @@  discard block
 block discarded – undo
337 337
 
338 338
 
339 339
 	protected function _reset_capabilities() {
340
-		EE_Registry::instance()->CAP->init_caps( true );
341
-		EE_Error::add_success( __('Default Event Espresso capabilities have been restored for all current roles.', 'event_espresso' ) );
342
-		$this->_redirect_after_action( FALSE, '', '', array( 'action' => 'data_reset' ), TRUE );
340
+		EE_Registry::instance()->CAP->init_caps(true);
341
+		EE_Error::add_success(__('Default Event Espresso capabilities have been restored for all current roles.', 'event_espresso'));
342
+		$this->_redirect_after_action(FALSE, '', '', array('action' => 'data_reset'), TRUE);
343 343
 	}
344 344
 
345 345
 	/**
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
 	 */
350 350
 	protected function _reattempt_migration() {
351 351
 		EE_Data_Migration_Manager::instance()->reattempt();
352
-		$this->_redirect_after_action( FALSE, '', '', array( 'action' => 'default' ), TRUE );
352
+		$this->_redirect_after_action(FALSE, '', '', array('action' => 'default'), TRUE);
353 353
 	}
354 354
 
355 355
 
@@ -358,8 +358,8 @@  discard block
 block discarded – undo
358 358
 	/**
359 359
 	 * shows the big ol' System Information page
360 360
 	 */
361
-	public function _system_status(){
362
-		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_system_stati_page.template.php';
361
+	public function _system_status() {
362
+		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_system_stati_page.template.php';
363 363
 		$this->_template_args['system_stati'] = EEM_System_Status::instance()->get_system_stati();
364 364
 		EE_Registry::instance()->load_helper('Array');
365 365
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, TRUE);
@@ -368,30 +368,30 @@  discard block
 block discarded – undo
368 368
 
369 369
 
370 370
 
371
-	public function _send_migration_crash_report(){
371
+	public function _send_migration_crash_report() {
372 372
 		$from = $this->_req_data['from'];
373 373
 		$from_name = $this->_req_data['from_name'];
374 374
 		$body = $this->_req_data['body'];
375
-		try{
375
+		try {
376 376
 		$success = wp_mail(EE_SUPPORT_EMAIL,
377 377
 				'Migration Crash Report',
378
-				$body."/r/n<br>".  print_r(EEM_System_Status::instance()->get_system_stati(),true),
378
+				$body."/r/n<br>".print_r(EEM_System_Status::instance()->get_system_stati(), true),
379 379
 				array(
380 380
 					"from:$from_name<$from>",
381 381
 //					'content-type:text/html charset=UTF-8'
382 382
 					));
383
-		}catch( Exception $e ){
383
+		} catch (Exception $e) {
384 384
 			$success = FALSE;
385 385
 		}
386
-		$this->_redirect_after_action($success, __("Migration Crash Report", "event_espresso"), __("sent", "event_espresso"),array('success'=>$success,'action'=>'confirm_migration_crash_report_sent'));
386
+		$this->_redirect_after_action($success, __("Migration Crash Report", "event_espresso"), __("sent", "event_espresso"), array('success'=>$success, 'action'=>'confirm_migration_crash_report_sent'));
387 387
 	}
388 388
 
389 389
 
390 390
 
391
-	public function _confirm_migration_crash_report_sent(){
392
-		try{
391
+	public function _confirm_migration_crash_report_sent() {
392
+		try {
393 393
 			$most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
394
-		}catch(EE_Error $e){
394
+		} catch (EE_Error $e) {
395 395
 
396 396
 			EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
397 397
 			//now, just so we can display the page correctly, make a error migration script stage object
@@ -399,14 +399,14 @@  discard block
 block discarded – undo
399 399
 			$most_recent_migration = new EE_DMS_Unknown_1_0_0();
400 400
 			$most_recent_migration->add_error($e->getMessage());
401 401
 		}
402
-		$success = $this->_req_data['success']=='1' ? true : false;
402
+		$success = $this->_req_data['success'] == '1' ? true : false;
403 403
 		$this->_template_args['success'] = $success;
404
-		$this->_template_args[ 'most_recent_migration' ] = $most_recent_migration;
404
+		$this->_template_args['most_recent_migration'] = $most_recent_migration;
405 405
 		$this->_template_args['reset_db_action_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'reset_db'), EE_MAINTENANCE_ADMIN_URL);
406
-		$this->_template_args[ 'reset_db_page_url' ] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'data_reset'), EE_MAINTENANCE_ADMIN_URL);
407
-		$this->_template_args[ 'reattempt_action_url' ] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'reattempt_migration'), EE_MAINTENANCE_ADMIN_URL );
408
-		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_confirm_migration_crash_report_sent.template.php';
409
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path,$this->_template_args,TRUE);
406
+		$this->_template_args['reset_db_page_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'data_reset'), EE_MAINTENANCE_ADMIN_URL);
407
+		$this->_template_args['reattempt_action_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'reattempt_migration'), EE_MAINTENANCE_ADMIN_URL);
408
+		$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH.'ee_confirm_migration_crash_report_sent.template.php';
409
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_template_path, $this->_template_args, TRUE);
410 410
 		$this->display_admin_page_with_sidebar();
411 411
 	}
412 412
 
@@ -419,19 +419,19 @@  discard block
 block discarded – undo
419 419
 	 * @param boolean $nuke_old_ee4_data controls whether or not we
420 420
 	 * destroy the old ee4 data, or just try initializing ee4 default data
421 421
 	 */
422
-	public function _reset_db( $nuke_old_ee4_data = TRUE ){
422
+	public function _reset_db($nuke_old_ee4_data = TRUE) {
423 423
 		EE_Registry::instance()->load_helper('Activation');
424 424
 		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
425 425
 
426
-		if( $nuke_old_ee4_data ){
426
+		if ($nuke_old_ee4_data) {
427 427
 			EEH_Activation::delete_all_espresso_cpt_data();
428
-			EEH_Activation::delete_all_espresso_tables_and_data( FALSE );
428
+			EEH_Activation::delete_all_espresso_tables_and_data(FALSE);
429 429
 			EEH_Activation::remove_cron_tasks();
430 430
 		}
431 431
 		//make sure when we reset the registry's config that it
432 432
 		//switches to using the new singleton
433
-		EE_Registry::instance()->CFG = EE_Registry::instance()->CFG->reset( TRUE );
434
-		EE_System::instance()->initialize_db_if_no_migrations_required( TRUE );
433
+		EE_Registry::instance()->CFG = EE_Registry::instance()->CFG->reset(TRUE);
434
+		EE_System::instance()->initialize_db_if_no_migrations_required(TRUE);
435 435
 		EE_System::instance()->redirect_to_about_ee();
436 436
 	}
437 437
 
@@ -440,21 +440,21 @@  discard block
 block discarded – undo
440 440
 	/**
441 441
 	 * Deletes ALL EE tables, Records, and Options from the database.
442 442
 	 */
443
-	public function _delete_db(){
443
+	public function _delete_db() {
444 444
 		EE_Registry::instance()->load_helper('Activation');
445 445
 		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
446 446
 		EEH_Activation::delete_all_espresso_cpt_data();
447 447
 		EEH_Activation::delete_all_espresso_tables_and_data();
448 448
 		EEH_Activation::remove_cron_tasks();
449 449
 		EEH_Activation::deactivate_event_espresso();
450
-		wp_safe_redirect( admin_url( 'plugins.php' ));
450
+		wp_safe_redirect(admin_url('plugins.php'));
451 451
 		exit;
452 452
 	}
453 453
 
454 454
 	/**
455 455
 	 * sets up EE4 to rerun the migrations from ee3 to ee4
456 456
 	 */
457
-	public function _rerun_migration_from_ee3(){
457
+	public function _rerun_migration_from_ee3() {
458 458
 		EE_Registry::instance()->load_helper('Activation');
459 459
 		EE_Maintenance_Mode::instance()->set_maintenance_level(EE_Maintenance_Mode::level_0_not_in_maintenance);
460 460
 		EEH_Activation::delete_all_espresso_cpt_data();
@@ -482,9 +482,9 @@  discard block
 block discarded – undo
482 482
 		wp_enqueue_script('ee_admin_js');
483 483
 //		wp_enqueue_media();
484 484
 //		wp_enqueue_script('media-upload');
485
-		wp_enqueue_script('ee-maintenance',EE_MAINTENANCE_ASSETS_URL.'/ee-maintenance.js',array('jquery'),EVENT_ESPRESSO_VERSION,true);
485
+		wp_enqueue_script('ee-maintenance', EE_MAINTENANCE_ASSETS_URL.'/ee-maintenance.js', array('jquery'), EVENT_ESPRESSO_VERSION, true);
486 486
 
487
-		wp_register_style( 'espresso_maintenance', EE_MAINTENANCE_ASSETS_URL . 'ee-maintenance.css', array(), EVENT_ESPRESSO_VERSION );
487
+		wp_register_style('espresso_maintenance', EE_MAINTENANCE_ASSETS_URL.'ee-maintenance.css', array(), EVENT_ESPRESSO_VERSION);
488 488
 		wp_enqueue_style('espresso_maintenance');
489 489
 	}
490 490
 
Please login to merge, or discard this patch.
Braces   +11 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  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 6
 /**
6 7
  * Event Espresso
@@ -185,7 +186,7 @@  discard block
 block discarded – undo
185 186
 					$show_migration_progress = true;
186 187
 					if(isset($this->_req_data['continue_migration'])){
187 188
 						$show_backup_db_text = false;
188
-					}else{
189
+					} else{
189 190
 						$show_backup_db_text = true;
190 191
 					}
191 192
 					$scripts_needing_to_run = EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts();
@@ -205,7 +206,7 @@  discard block
 block discarded – undo
205 206
 			}
206 207
 			$most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
207 208
 			$exception_thrown = false;
208
-		}catch(EE_Error $e){
209
+		} catch(EE_Error $e){
209 210
 
210 211
 			EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
211 212
 			//now, just so we can display the page correctly, make a error migration script stage object
@@ -223,19 +224,19 @@  discard block
 block discarded – undo
223 224
 			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_migration_was_borked_page.template.php';
224 225
 			$this->_template_args[ 'support_url' ] = 'http://eventespresso.com/support/forums/';
225 226
 			$this->_template_args[ 'next_url' ] = EEH_URL::add_query_args_and_nonce(array( 'action' => 'confirm_migration_crash_report_sent', 'success' => '0' ), EE_MAINTENANCE_ADMIN_URL );
226
-		}elseif($addons_should_be_upgraded_first){
227
+		} elseif($addons_should_be_upgraded_first){
227 228
 			$this->_template_path = EE_MAINTENANCE_TEMPLATE_PATH . 'ee_upgrade_addons_before_migrating.template.php';
228
-		}else{
229
+		} else{
229 230
 			if($most_recent_migration &&
230 231
 					$most_recent_migration instanceof EE_Data_Migration_Script_Base  &&
231 232
 					$most_recent_migration->can_continue()){
232 233
 				$show_backup_db_text = false;
233 234
 				$show_continue_current_migration_script = true;
234 235
 				$show_most_recent_migration = true;
235
-			}elseif(isset($this->_req_data['continue_migration'])){
236
+			} elseif(isset($this->_req_data['continue_migration'])){
236 237
 				$show_most_recent_migration = true;
237 238
 				$show_continue_current_migration_script = false;
238
-			}else{
239
+			} else{
239 240
 				$show_most_recent_migration = false;
240 241
 				$show_continue_current_migration_script = false;
241 242
 			}
@@ -313,7 +314,7 @@  discard block
 block discarded – undo
313 314
 		if( ! EE_Data_Migration_Manager::instance()->check_for_applicable_data_migration_scripts()){
314 315
 			EE_Maintenance_Mode::instance()->set_maintenance_level($new_level);
315 316
 			$success = true;
316
-		}else{
317
+		} else{
317 318
 			EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old();
318 319
 			$success= false;
319 320
 		}
@@ -380,7 +381,7 @@  discard block
 block discarded – undo
380 381
 					"from:$from_name<$from>",
381 382
 //					'content-type:text/html charset=UTF-8'
382 383
 					));
383
-		}catch( Exception $e ){
384
+		} catch( Exception $e ){
384 385
 			$success = FALSE;
385 386
 		}
386 387
 		$this->_redirect_after_action($success, __("Migration Crash Report", "event_espresso"), __("sent", "event_espresso"),array('success'=>$success,'action'=>'confirm_migration_crash_report_sent'));
@@ -391,7 +392,7 @@  discard block
 block discarded – undo
391 392
 	public function _confirm_migration_crash_report_sent(){
392 393
 		try{
393 394
 			$most_recent_migration = EE_Data_Migration_Manager::instance()->get_last_ran_script(true);
394
-		}catch(EE_Error $e){
395
+		} catch(EE_Error $e){
395 396
 
396 397
 			EE_Data_Migration_Manager::instance()->add_error_to_migrations_ran($e->getMessage());
397 398
 			//now, just so we can display the page correctly, make a error migration script stage object
Please login to merge, or discard this patch.