Completed
Branch BUG/3575-event-deletion-previe... (bbeda1)
by
unknown
06:40 queued 04:49
created
Paypal_Express/templates/paypal_express_debug_info.template.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -2,25 +2,25 @@
 block discarded – undo
2 2
 
3 3
     <h4 class="important-notice">
4 4
         <?php esc_html_e(
5
-            'Debug Mode is turned ON. You will be redirected to the PayPal Sandbox environment. Please use your Sandbox PayPal account for the checkout.',
6
-            'event_espresso'
7
-        ); ?></h4>
5
+			'Debug Mode is turned ON. You will be redirected to the PayPal Sandbox environment. Please use your Sandbox PayPal account for the checkout.',
6
+			'event_espresso'
7
+		); ?></h4>
8 8
 
9 9
     <h4><?php esc_html_e('How do I test specific error codes?', 'event_espresso'); ?></h4>
10 10
     <p>
11 11
         <?php esc_html_e(
12
-            'To trigger an error condition on an amount-related field, 
12
+			'To trigger an error condition on an amount-related field, 
13 13
 			specify a error code value as a number with two digits to the right of the decimal point. 
14 14
 			For example, specify a value of 107.55 to trigger the 10755 error.',
15
-            'event_espresso'
16
-        ); ?>
15
+			'event_espresso'
16
+		); ?>
17 17
     </p>
18 18
     <p>
19 19
         <?php printf(
20
-            esc_html__('More details can be found here: %1$s Testing Error Conditions %2$s.', 'event_espresso'),
21
-            '<a href="https://developer.paypal.com/docs/classic/lifecycle/sb_error-conditions">',
22
-            '</a>'
23
-        ); ?>
20
+			esc_html__('More details can be found here: %1$s Testing Error Conditions %2$s.', 'event_espresso'),
21
+			'<a href="https://developer.paypal.com/docs/classic/lifecycle/sb_error-conditions">',
22
+			'</a>'
23
+		); ?>
24 24
     </p>
25 25
 
26 26
 </div>
27 27
\ No newline at end of file
Please login to merge, or discard this patch.
help_tabs/payment_methods_overview_paypalstandard.help_tab.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -23,17 +23,17 @@
 block discarded – undo
23 23
 <li>
24 24
 <strong><?php esc_html_e('PayPal Calculates Taxes', 'event_espresso'); ?></strong><br />
25 25
 <?php printf(esc_html__('If set to "Yes", we will indicate to PayPal that it should calculate the taxes on the order and add it. This means PayPal\'s tax calculations will be used on the order instead of Event Espresso\'s. %1$sRead here for more information.%2$s', 'event_espresso'), "<a href='https://www.paypal.com/ca/cgi-bin/webscr?cmd=xpt/Marketing/shipping/EasyCalculateShipAndTax-outside' target='_blank'>", '</a>'); ?><br/>
26
-<?php esc_html_e('Note: It may confuse users if Event Espresso initially calculates taxes on the order, and then they go to PayPal and it calculates taxes differently. So it is recommended that if PayPal is calculating taxes, that you do not set any taxes in Event Espresso.', 'event_espresso');?>
26
+<?php esc_html_e('Note: It may confuse users if Event Espresso initially calculates taxes on the order, and then they go to PayPal and it calculates taxes differently. So it is recommended that if PayPal is calculating taxes, that you do not set any taxes in Event Espresso.', 'event_espresso'); ?>
27 27
 </li>
28 28
 <li>
29 29
 <strong><?php esc_html_e('PayPal Calculates Shipping', 'event_espresso'); ?></strong><br />
30 30
 <?php esc_html_e('Similar to the "PayPal Calculates Taxes" setting, if this is set to "Yes", we will indicate to PayPal that it should calculate the shipping on each payment (if there are multiple payments for a single transaction, PayPal is permitted to add shipping charges to each payment.)', 'event_espresso'); ?><br/>
31
-<?php esc_html_e('Important Note: PayPal will ONLY calculate shipping on an order if "Shipping Address Options" is set to "Prompt for an Address" (otherwise how will PayPal know how much to charge for shipping if it doesn\'t know where it\'s shipping to?)', 'event_espresso');?>
31
+<?php esc_html_e('Important Note: PayPal will ONLY calculate shipping on an order if "Shipping Address Options" is set to "Prompt for an Address" (otherwise how will PayPal know how much to charge for shipping if it doesn\'t know where it\'s shipping to?)', 'event_espresso'); ?>
32 32
 <li>
33
-<strong><?php esc_html_e('Notes Regarding Paypal Taxes and Shipping', 'event_espresso');?></strong><br/>
34
-<?php esc_html_e('If you want PayPal to calculate taxes and shipping on an order, those changes will NOT appear during the initial registration process until the user is redirected to PayPal for payment.', 'event_espresso');?><br/>
35
-<?php esc_html_e('However, after the user has returned from PayPal, their order in Event Espresso will be updated with the new taxes and added shipping charges (e.g. it will appear on their receipt.)', 'event_espresso');?><br/>
36
-<?php esc_html_e('Also Note: In order for PayPal to properly calculate taxes and shipping, they need to receive the entire order at the same time. So if a user goes to make a payment using PayPal, and their order somehow already has a payment on it, PayPal CANNOT calculate taxes or shipping on that order.', 'event_espresso');?>
33
+<strong><?php esc_html_e('Notes Regarding Paypal Taxes and Shipping', 'event_espresso'); ?></strong><br/>
34
+<?php esc_html_e('If you want PayPal to calculate taxes and shipping on an order, those changes will NOT appear during the initial registration process until the user is redirected to PayPal for payment.', 'event_espresso'); ?><br/>
35
+<?php esc_html_e('However, after the user has returned from PayPal, their order in Event Espresso will be updated with the new taxes and added shipping charges (e.g. it will appear on their receipt.)', 'event_espresso'); ?><br/>
36
+<?php esc_html_e('Also Note: In order for PayPal to properly calculate taxes and shipping, they need to receive the entire order at the same time. So if a user goes to make a payment using PayPal, and their order somehow already has a payment on it, PayPal CANNOT calculate taxes or shipping on that order.', 'event_espresso'); ?>
37 37
 </li>
38 38
 <li>
39 39
 <strong><?php esc_html_e('Shipping Address Options', 'event_espresso'); ?></strong><br />
Please login to merge, or discard this patch.
admin_pages/maintenance/templates/migration_options_from_ee4.template.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -26,16 +26,16 @@  discard block
 block discarded – undo
26 26
                 <tr>
27 27
                     <td>
28 28
                         <?php echo esc_html(
29
-                            apply_filters(
30
-                                'FHEE__ee_migration_page__option_1_main',
31
-                                esc_html__(
32
-                                    'Before updating your database, you should first create a database backup',
33
-                                    "event_espresso"
34
-                                ),
35
-                                $current_db_state,
36
-                                $next_db_state
37
-                            )
38
-                        );
29
+							apply_filters(
30
+								'FHEE__ee_migration_page__option_1_main',
31
+								esc_html__(
32
+									'Before updating your database, you should first create a database backup',
33
+									"event_espresso"
34
+								),
35
+								$current_db_state,
36
+								$next_db_state
37
+							)
38
+						);
39 39
 ?>
40 40
                         <a id="display-migration-details"
41 41
                            class="display-the-hidden lt-grey-text smaller-text hide-if-no-js"
@@ -50,17 +50,17 @@  discard block
 block discarded – undo
50 50
                            class="toggle-migration-monitor button-primary"
51 51
                         >
52 52
                             <?php echo esc_html(
53
-                                apply_filters(
54
-                                    'FHEE__ee_migration_page__option_1_button_text',
55
-                                    sprintf(
56
-                                        esc_html__("My Database Is Backed Up, Continue", "event_espresso"),
57
-                                        $current_db_state,
58
-                                        $next_db_state
59
-                                    ),
60
-                                    $current_db_state,
61
-                                    $next_db_state
62
-                                )
63
-                            ); ?></a>
53
+								apply_filters(
54
+									'FHEE__ee_migration_page__option_1_button_text',
55
+									sprintf(
56
+										esc_html__("My Database Is Backed Up, Continue", "event_espresso"),
57
+										$current_db_state,
58
+										$next_db_state
59
+									),
60
+									$current_db_state,
61
+									$next_db_state
62
+								)
63
+							); ?></a>
64 64
                     </td>
65 65
                 </tr>
66 66
                 <tr>
@@ -68,15 +68,15 @@  discard block
 block discarded – undo
68 68
                         <div id="migration-details-dv" style="display: none; padding: 1em;">
69 69
                             <p>
70 70
                                 <?php printf(
71
-                                    esc_html__(
72
-                                        '%1$sClick Here to Learn How To Backup your Database Yourself%2$s. Or have one of our dedicated support technicians help you by %3$spurchasing a Priority Support Token.%2$s',
73
-                                        "event_espresso"
74
-                                    ),
75
-                                    '<a target="_blank" href="https://eventespresso.com/wiki/how-to-back-up-your-site/">',
76
-                                    "</a>",
77
-                                    "<a target=\"_blank\" href='https://eventespresso.com/product/priority-support-tokens/'>"
78
-                                );
79
-                            ?>
71
+									esc_html__(
72
+										'%1$sClick Here to Learn How To Backup your Database Yourself%2$s. Or have one of our dedicated support technicians help you by %3$spurchasing a Priority Support Token.%2$s',
73
+										"event_espresso"
74
+									),
75
+									'<a target="_blank" href="https://eventespresso.com/wiki/how-to-back-up-your-site/">',
76
+									"</a>",
77
+									"<a target=\"_blank\" href='https://eventespresso.com/product/priority-support-tokens/'>"
78
+								);
79
+							?>
80 80
                             </p>
81 81
                             <?php do_action('AHEE__ee_migration_page__option_1_extra_details'); ?>
82 82
                         </div>
@@ -87,9 +87,9 @@  discard block
 block discarded – undo
87 87
     </div>
88 88
     <p>
89 89
         <?php esc_html_e(
90
-            'Don\'t want to keep your old Event Espresso data? Alternatively, you can delete it all and start fresh.',
91
-            'event_espresso'
92
-        ); ?>
90
+			'Don\'t want to keep your old Event Espresso data? Alternatively, you can delete it all and start fresh.',
91
+			'event_espresso'
92
+		); ?>
93 93
         <a
94 94
             href="<?php echo esc_url_raw($data_reset_page); ?>"
95 95
         >
Please login to merge, or discard this patch.
admin_pages/maintenance/templates/ee_migration_was_borked_page.template.php 2 patches
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -7,13 +7,13 @@  discard block
 block discarded – undo
7 7
 <h1><?php esc_html_e("Data Migration Error", "event_espresso"); ?></h1>
8 8
 <p class='error'>
9 9
     <?php printf(
10
-        esc_html__(
11
-            "Your last Database Update had a %s fatal error and was halted%s.",
12
-            "event_espresso"
13
-        ),
14
-        "<b>",
15
-        "</b>"
16
-    ); ?>
10
+		esc_html__(
11
+			"Your last Database Update had a %s fatal error and was halted%s.",
12
+			"event_espresso"
13
+		),
14
+		"<b>",
15
+		"</b>"
16
+	); ?>
17 17
 </p>
18 18
 <a id="show-hide-migration-warnings" class="display-the-hidden">
19 19
     <?php esc_html_e("Show Errors", 'event_espresso'); ?>
@@ -25,15 +25,15 @@  discard block
 block discarded – undo
25 25
 </ul>
26 26
 <h2>
27 27
     <?php esc_html_e(
28
-        "Fill out the below form to automatically Send Event Espresso a Crash Report",
29
-        "event_espresso"
30
-    ); ?>
28
+		"Fill out the below form to automatically Send Event Espresso a Crash Report",
29
+		"event_espresso"
30
+	); ?>
31 31
 </h2>
32 32
 <form action='<?php echo esc_url_raw(
33
-    EE_Admin_Page::add_query_args_and_nonce(
34
-        ['action' => 'send_migration_crash_report'],
35
-        EE_MAINTENANCE_ADMIN_URL
36
-    )
33
+	EE_Admin_Page::add_query_args_and_nonce(
34
+		['action' => 'send_migration_crash_report'],
35
+		EE_MAINTENANCE_ADMIN_URL
36
+	)
37 37
 );
38 38
 ?>' method='post'
39 39
 >
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
                        type='text'
60 60
                        style="width:200px"
61 61
                        value='<?php printf(
62
-                           esc_html__("Admin of %s", "event_espresso"),
63
-                           get_bloginfo('name', 'display')
64
-                       ); ?>'
62
+						   esc_html__("Admin of %s", "event_espresso"),
63
+						   get_bloginfo('name', 'display')
64
+					   ); ?>'
65 65
                 />
66 66
             </td>
67 67
         </tr>
@@ -72,15 +72,15 @@  discard block
 block discarded – undo
72 72
             <td>
73 73
                 <textarea name="body" id="body" class='system_status_info'>
74 74
                     <?php esc_html_e(
75
-                        "Enter any comments about why you think the error may have occurred",
76
-                        "event_espresso"
77
-                    ); ?>
75
+						"Enter any comments about why you think the error may have occurred",
76
+						"event_espresso"
77
+					); ?>
78 78
                 </textarea>
79 79
                 <p class='description'>
80 80
                     <?php esc_html_e(
81
-                        "Note: the System Information report will also be added to the email's body, which contains information about your Event Espresso, Wordpress, and PHP settings which can be helpful in debugging the problem.",
82
-                        "event_espresso"
83
-                    ); ?>
81
+						"Note: the System Information report will also be added to the email's body, which contains information about your Event Espresso, Wordpress, and PHP settings which can be helpful in debugging the problem.",
82
+						"event_espresso"
83
+					); ?>
84 84
                 </p>
85 85
             </td>
86 86
         </tr>
@@ -96,26 +96,26 @@  discard block
 block discarded – undo
96 96
 <br>
97 97
 <p>
98 98
     <?php printf(
99
-        esc_html__('...or copy-and-paste the below information to %1$s %2$s %3$s', "event_espresso"),
100
-        '<a href="mailto:' . EE_SUPPORT_EMAIL . '">',
101
-        EE_SUPPORT_EMAIL,
102
-        "</a>"
103
-    ); ?>
99
+		esc_html__('...or copy-and-paste the below information to %1$s %2$s %3$s', "event_espresso"),
100
+		'<a href="mailto:' . EE_SUPPORT_EMAIL . '">',
101
+		EE_SUPPORT_EMAIL,
102
+		"</a>"
103
+	); ?>
104 104
 </p>
105 105
 <textarea class="system_status_info">
106 106
     <?php print_r(EEM_System_Status::instance()->get_system_stati()) ?>
107 107
 </textarea>
108 108
 <p>
109 109
     <?php printf(
110
-        esc_html__('%1$sNext Step%2$s', 'event_espresso'),
111
-        "<a href='$next_url'>",
112
-        "</a>"
113
-    ); ?>
110
+		esc_html__('%1$sNext Step%2$s', 'event_espresso'),
111
+		"<a href='$next_url'>",
112
+		"</a>"
113
+	); ?>
114 114
 </p>
115 115
 <p>
116 116
     <?php printf(
117
-        esc_html__('...or %1$sDON\'T send crash report%2$s.', 'event_espresso'),
118
-        "<a href='$next_url'>",
119
-        "</a>"
120
-    ); ?>
117
+		esc_html__('...or %1$sDON\'T send crash report%2$s.', 'event_espresso'),
118
+		"<a href='$next_url'>",
119
+		"</a>"
120
+	); ?>
121 121
 </p>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@
 block discarded – undo
97 97
 <p>
98 98
     <?php printf(
99 99
         esc_html__('...or copy-and-paste the below information to %1$s %2$s %3$s', "event_espresso"),
100
-        '<a href="mailto:' . EE_SUPPORT_EMAIL . '">',
100
+        '<a href="mailto:'.EE_SUPPORT_EMAIL.'">',
101 101
         EE_SUPPORT_EMAIL,
102 102
         "</a>"
103 103
     ); ?>
Please login to merge, or discard this patch.
maintenance/templates/ee_confirm_migration_crash_report_sent.template.php 2 patches
Indentation   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -11,27 +11,27 @@  discard block
 block discarded – undo
11 11
     <h1><?php esc_html_e("Database Update Crash Report Sent", "event_espresso"); ?></h1>
12 12
     <p>
13 13
         <?php esc_html_e(
14
-            "A crash report email was sent to Event Espresso. You should hear back from us soon.",
15
-            "event_espresso"
16
-        ); ?></p>
14
+			"A crash report email was sent to Event Espresso. You should hear back from us soon.",
15
+			"event_espresso"
16
+		); ?></p>
17 17
 <?php } else {// didn't send email properly ?>
18 18
     <h1><?php esc_html_e("Migration Report not sent", "event_espresso"); ?></h1>
19 19
     <p>
20 20
         <?php esc_html_e(
21
-            "An error occurred and we were not able to automatically send a report to Event Espresso support.",
22
-            "event_espresso"
23
-        ); ?></p>
21
+			"An error occurred and we were not able to automatically send a report to Event Espresso support.",
22
+			"event_espresso"
23
+		); ?></p>
24 24
     <p>
25 25
         <?php printf(
26
-            esc_html__("Please copy-and-paste the system information below to %s", "event_espresso"),
27
-            '<a href="mailto:' . EE_SUPPORT_EMAIL . '">' . EE_SUPPORT_EMAIL . "</a>"
28
-        ); ?></p>
26
+			esc_html__("Please copy-and-paste the system information below to %s", "event_espresso"),
27
+			'<a href="mailto:' . EE_SUPPORT_EMAIL . '">' . EE_SUPPORT_EMAIL . "</a>"
28
+		); ?></p>
29 29
     <label>
30 30
         <?php esc_html_e("system status info", "event_espresso"); ?>
31 31
         <textarea name="system_status_info" class="system_status_info">
32 32
             <?php print_r(
33
-                EEM_System_Status::instance()->get_system_stati()
34
-            ); ?></textarea>
33
+				EEM_System_Status::instance()->get_system_stati()
34
+			); ?></textarea>
35 35
     </label>
36 36
 <?php } ?>
37 37
 
@@ -52,32 +52,32 @@  discard block
 block discarded – undo
52 52
             <td>
53 53
                 <p>
54 54
                     <?php
55
-                    printf(
56
-                        esc_html__(
57
-                            'First, %1$s check the forums %2$s to see if there is a solution before re-attempting the Database Update. Often it helps to deactivate other plugins which may have conflicts; or it may help to add %3$s to your %4$s wp-config.php%5$s (which will make the update run slower, but may resolve any memory exhaustion errors.',
58
-                            'event_espresso'
59
-                        ),
60
-                        "<a href='" . EE_SUPPORT_EMAIL . "' target='_blank'>",
61
-                        '</a>',
62
-                        '<pre lang="php">define( \'EE_MIGRATION_STEP_SIZE\', 10 );</pre>',
63
-                        '<b>',
64
-                        '</b>'
65
-                    );
66
-                    ?>
55
+					printf(
56
+						esc_html__(
57
+							'First, %1$s check the forums %2$s to see if there is a solution before re-attempting the Database Update. Often it helps to deactivate other plugins which may have conflicts; or it may help to add %3$s to your %4$s wp-config.php%5$s (which will make the update run slower, but may resolve any memory exhaustion errors.',
58
+							'event_espresso'
59
+						),
60
+						"<a href='" . EE_SUPPORT_EMAIL . "' target='_blank'>",
61
+						'</a>',
62
+						'<pre lang="php">define( \'EE_MIGRATION_STEP_SIZE\', 10 );</pre>',
63
+						'<b>',
64
+						'</b>'
65
+					);
66
+					?>
67 67
                 </p>
68 68
 
69 69
                 <p>
70 70
                     <?php
71
-                    printf(
72
-                        esc_html__(
73
-                            'To retry updating your data: restore to the backup you made before the update and reactivate EE (and any addons you are using) and re-run the Database Update. If you did not make a database backup and are migrating from EE3: delete your EE4 data (use the %1$s Reset/Delete Data tab above%2$s), and then reactivate EE4, and then re-run the migration and updates. If you did not make a database backup, are only updating from a previous install of EE4, have found a solution to the fatal error you received, and are willing to possibly have some data lost, %3$sattempt to continue migrating%2$s.',
74
-                            'event_espresso'
75
-                        ),
76
-                        "<a href='$reset_db_page_url'>",
77
-                        "</a>",
78
-                        "<a class='button-primary' href='$reattempt_action_url'>"
79
-                    );
80
-                    ?>
71
+					printf(
72
+						esc_html__(
73
+							'To retry updating your data: restore to the backup you made before the update and reactivate EE (and any addons you are using) and re-run the Database Update. If you did not make a database backup and are migrating from EE3: delete your EE4 data (use the %1$s Reset/Delete Data tab above%2$s), and then reactivate EE4, and then re-run the migration and updates. If you did not make a database backup, are only updating from a previous install of EE4, have found a solution to the fatal error you received, and are willing to possibly have some data lost, %3$sattempt to continue migrating%2$s.',
74
+							'event_espresso'
75
+						),
76
+						"<a href='$reset_db_page_url'>",
77
+						"</a>",
78
+						"<a class='button-primary' href='$reattempt_action_url'>"
79
+					);
80
+					?>
81 81
                 </p>
82 82
             </td>
83 83
         </tr>
@@ -87,66 +87,66 @@  discard block
 block discarded – undo
87 87
             </td>
88 88
             <td>
89 89
                 <?php
90
-                printf(
91
-                    esc_html__(
92
-                        'Just make sure you\'ve %1$s checked for a solution in the forums,%2$s and properly contacted Support. We will get back to you as soon as possible',
93
-                        'event_espresso'
94
-                    ),
95
-                    "<a href='" . EE_SUPPORT_EMAIL . "'>",
96
-                    "</a>"
97
-                );
98
-                ?>
90
+				printf(
91
+					esc_html__(
92
+						'Just make sure you\'ve %1$s checked for a solution in the forums,%2$s and properly contacted Support. We will get back to you as soon as possible',
93
+						'event_espresso'
94
+					),
95
+					"<a href='" . EE_SUPPORT_EMAIL . "'>",
96
+					"</a>"
97
+				);
98
+				?>
99 99
             </td>
100 100
         </tr>
101 101
         <tr>
102 102
             <td>
103 103
                 <p class='big-text'>
104 104
                     <?php printf(
105
-                        esc_html__('I don\'t need my old EE %s data', 'event_espresso'),
106
-                        $most_recent_migration->slug()
107
-                    ); ?></p>
105
+						esc_html__('I don\'t need my old EE %s data', 'event_espresso'),
106
+						$most_recent_migration->slug()
107
+					); ?></p>
108 108
             </td>
109 109
             <td>
110 110
                 <?php
111
-                printf(
112
-                    esc_html__(
113
-                        'If you are ok with losing all the EE %1$s data, you can skip the Database Updates and %2$s use EE4 with only default Data%3$s',
114
-                        'event_espresso'
115
-                    ),
116
-                    $most_recent_migration->slug(),
117
-                    "<a id='do-not-migrate' class='do-not-migrate button-primary' href='$reset_db_action_url'>",
118
-                    "</a>"
119
-                );
120
-                ?>
111
+				printf(
112
+					esc_html__(
113
+						'If you are ok with losing all the EE %1$s data, you can skip the Database Updates and %2$s use EE4 with only default Data%3$s',
114
+						'event_espresso'
115
+					),
116
+					$most_recent_migration->slug(),
117
+					"<a id='do-not-migrate' class='do-not-migrate button-primary' href='$reset_db_action_url'>",
118
+					"</a>"
119
+				);
120
+				?>
121 121
             </td>
122 122
         </tr>
123 123
         <tr>
124 124
             <td>
125 125
                 <p class='big-text'>
126 126
                     <?php printf(
127
-                        esc_html__('I want to go back to my old version of EE %1$s', 'event_espresso'),
128
-                        $most_recent_migration->slug()
129
-                    ); ?>
127
+						esc_html__('I want to go back to my old version of EE %1$s', 'event_espresso'),
128
+						$most_recent_migration->slug()
129
+					); ?>
130 130
             </td>
131 131
             <td>
132 132
                 <p>
133 133
                     <?php
134
-                    printf(
135
-                        esc_html__(
136
-                            'Then we suggest you re-activate the old version of EE %3$s and restore your database to the backup you made just before the Database Update . If you didn\'t backup your database and are migrating from EE3, you can also delete your EE4 data (use on the %1$s"Reset/Delete Data" tab above%2$s), and then reactivate EE3 from the plugins page. Note: some of your EE3 shortcodes may have been changed to their EE4 equivalents, so you will need to change them back.',
137
-                            'event_espresso'
138
-                        ),
139
-                        "<a href='$reset_db_page_url'>",
140
-                        "</a>",
141
-                        $most_recent_migration->slug()
142
-                    );
143
-                    ?>
134
+					printf(
135
+						esc_html__(
136
+							'Then we suggest you re-activate the old version of EE %3$s and restore your database to the backup you made just before the Database Update . If you didn\'t backup your database and are migrating from EE3, you can also delete your EE4 data (use on the %1$s"Reset/Delete Data" tab above%2$s), and then reactivate EE3 from the plugins page. Note: some of your EE3 shortcodes may have been changed to their EE4 equivalents, so you will need to change them back.',
137
+							'event_espresso'
138
+						),
139
+						"<a href='$reset_db_page_url'>",
140
+						"</a>",
141
+						$most_recent_migration->slug()
142
+					);
143
+					?>
144 144
                 </p>
145 145
                 <p>
146 146
                     <?php esc_html_e(
147
-                        "If you ever decide to re-attempt using EE4, you will again be given the option to migrate your EE3 data or not.",
148
-                        'event_espresso'
149
-                    ); ?></p>
147
+						"If you ever decide to re-attempt using EE4, you will again be given the option to migrate your EE3 data or not.",
148
+						'event_espresso'
149
+					); ?></p>
150 150
             </td>
151 151
         </tr>
152 152
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
     <p>
25 25
         <?php printf(
26 26
             esc_html__("Please copy-and-paste the system information below to %s", "event_espresso"),
27
-            '<a href="mailto:' . EE_SUPPORT_EMAIL . '">' . EE_SUPPORT_EMAIL . "</a>"
27
+            '<a href="mailto:'.EE_SUPPORT_EMAIL.'">'.EE_SUPPORT_EMAIL."</a>"
28 28
         ); ?></p>
29 29
     <label>
30 30
         <?php esc_html_e("system status info", "event_espresso"); ?>
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
                             'First, %1$s check the forums %2$s to see if there is a solution before re-attempting the Database Update. Often it helps to deactivate other plugins which may have conflicts; or it may help to add %3$s to your %4$s wp-config.php%5$s (which will make the update run slower, but may resolve any memory exhaustion errors.',
58 58
                             'event_espresso'
59 59
                         ),
60
-                        "<a href='" . EE_SUPPORT_EMAIL . "' target='_blank'>",
60
+                        "<a href='".EE_SUPPORT_EMAIL."' target='_blank'>",
61 61
                         '</a>',
62 62
                         '<pre lang="php">define( \'EE_MIGRATION_STEP_SIZE\', 10 );</pre>',
63 63
                         '<b>',
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
                         'Just make sure you\'ve %1$s checked for a solution in the forums,%2$s and properly contacted Support. We will get back to you as soon as possible',
93 93
                         'event_espresso'
94 94
                     ),
95
-                    "<a href='" . EE_SUPPORT_EMAIL . "'>",
95
+                    "<a href='".EE_SUPPORT_EMAIL."'>",
96 96
                     "</a>"
97 97
                 );
98 98
                 ?>
Please login to merge, or discard this patch.
admin_pages/maintenance/templates/ee_migration_page.template.php 1 patch
Indentation   +118 added lines, -118 removed lines patch added patch discarded remove patch
@@ -33,55 +33,55 @@  discard block
 block discarded – undo
33 33
             <h3 class="espresso-header">
34 34
                 <span class="dashicons dashicons-flag ee-icon-size-22"></span>
35 35
                 <?php
36
-                echo esc_html(
37
-                    apply_filters(
38
-                        'FHEE__ee_migration_page__header',
39
-                        sprintf(
40
-                            __("Your Event Espresso data needs to be updated.", "event_espresso"),
41
-                            $current_db_state,
42
-                            $next_db_state
43
-                        ),
44
-                        $current_db_state,
45
-                        $next_db_state
46
-                    )
47
-                );
48
-                ?>
36
+				echo esc_html(
37
+					apply_filters(
38
+						'FHEE__ee_migration_page__header',
39
+						sprintf(
40
+							__("Your Event Espresso data needs to be updated.", "event_espresso"),
41
+							$current_db_state,
42
+							$next_db_state
43
+						),
44
+						$current_db_state,
45
+						$next_db_state
46
+					)
47
+				);
48
+				?>
49 49
             </h3>
50 50
         <?php } elseif ($show_most_recent_migration) { ?>
51 51
             <h3 class="espresso-header">
52 52
                 <span class="dashicons dashicons-awards ee-icon-size-22"></span>
53 53
                 <?php echo esc_html(
54
-                    apply_filters(
55
-                        'FHEE__ee_migration_page__done_migration_header',
56
-                        sprintf(
57
-                            __(
58
-                                'Congratulations! Your database is "up-to-date" and you are ready to begin using %s',
59
-                                "event_espresso"
60
-                            ),
61
-                            $ultimate_db_state
62
-                        )
63
-                    )
64
-                ); ?>
54
+					apply_filters(
55
+						'FHEE__ee_migration_page__done_migration_header',
56
+						sprintf(
57
+							__(
58
+								'Congratulations! Your database is "up-to-date" and you are ready to begin using %s',
59
+								"event_espresso"
60
+							),
61
+							$ultimate_db_state
62
+						)
63
+					)
64
+				); ?>
65 65
             </h3>
66 66
             <p>
67 67
                 <?php echo esc_html(
68
-                    apply_filters(
69
-                        'FHEE__ee_migration_page__p_after_done_migration_header',
70
-                        sprintf(
71
-                            __(
72
-                                "Time to find out about all the great new features %s has to offer.",
73
-                                "event_espresso"
74
-                            ),
75
-                            $ultimate_db_state
76
-                        )
77
-                    )
78
-                ); ?> &nbsp;
68
+					apply_filters(
69
+						'FHEE__ee_migration_page__p_after_done_migration_header',
70
+						sprintf(
71
+							__(
72
+								"Time to find out about all the great new features %s has to offer.",
73
+								"event_espresso"
74
+							),
75
+							$ultimate_db_state
76
+						)
77
+					)
78
+				); ?> &nbsp;
79 79
                 <b>
80 80
                     <a class="button-primary"
81 81
                        id='get-started-after-migrate'
82 82
                        href="<?php
83
-                        echo esc_url_raw(add_query_arg(['page' => 'espresso_about'], admin_url('admin.php')));
84
-                        ?>"
83
+						echo esc_url_raw(add_query_arg(['page' => 'espresso_about'], admin_url('admin.php')));
84
+						?>"
85 85
                     >
86 86
                         <?php esc_html_e("Let's Get Started", "event_espresso"); ?>&nbsp;
87 87
                         <span class="dashicons dashicons-arrow-right ee-icon-size-22" style="margin:0;"></span>
@@ -92,46 +92,46 @@  discard block
 block discarded – undo
92 92
 
93 93
 
94 94
         <?php
95
-        if ($show_backup_db_text) {
96
-            echo esc_html($migration_options_html);
97
-        } ?>
95
+		if ($show_backup_db_text) {
96
+			echo esc_html($migration_options_html);
97
+		} ?>
98 98
 
99 99
         <?php
100
-        if ($show_most_recent_migration) {
101
-            if ($most_recent_migration instanceof EE_Data_Migration_Script_Base) {
102
-                if ($most_recent_migration->can_continue()) {
103
-                    // tell the user they should continue their migration because it appears to be unfinished... well, assuming there were no errors ?>
100
+		if ($show_most_recent_migration) {
101
+			if ($most_recent_migration instanceof EE_Data_Migration_Script_Base) {
102
+				if ($most_recent_migration->can_continue()) {
103
+					// tell the user they should continue their migration because it appears to be unfinished... well, assuming there were no errors ?>
104 104
                     <h3 class="espresso-header">
105 105
                         <span class="dashicons dashicons-star-half ee-icon-size-22"></span>
106 106
                         <?php printf(
107
-                            esc_html__(
108
-                                "It appears that your previous Database Update (%s) is incomplete, and should be resumed",
109
-                                "event_espresso"
110
-                            ),
111
-                            $most_recent_migration->pretty_name()
112
-                        ); ?>
107
+							esc_html__(
108
+								"It appears that your previous Database Update (%s) is incomplete, and should be resumed",
109
+								"event_espresso"
110
+							),
111
+							$most_recent_migration->pretty_name()
112
+						); ?>
113 113
                     </h3>
114 114
                     <?php
115
-                } elseif ($most_recent_migration->is_broken()) {
116
-                    // tell the user the migration failed, and they should notify EE?>
115
+				} elseif ($most_recent_migration->is_broken()) {
116
+					// tell the user the migration failed, and they should notify EE?>
117 117
                     <h3 class="espresso-header">
118 118
                         <span class="dashicons dashicons-no ee-icon-size-22"></span>
119 119
                         <?php echo esc_html($most_recent_migration->get_feedback_message()) ?>
120 120
                     </h3>
121 121
                     <?php
122
-                }
123
-                // display errors or not of the most recent migration ran
124
-                if ($most_recent_migration->get_errors()) {
125
-                    ?>
122
+				}
123
+				// display errors or not of the most recent migration ran
124
+				if ($most_recent_migration->get_errors()) {
125
+					?>
126 126
                     <div class="ee-attention">
127 127
                         <strong>
128 128
                             <?php printf(
129
-                                esc_html__(
130
-                                    "Warnings occurred during your last Database Update (%s):",
131
-                                    'event_espresso'
132
-                                ),
133
-                                $most_recent_migration->pretty_name()
134
-                            ); ?>
129
+								esc_html__(
130
+									"Warnings occurred during your last Database Update (%s):",
131
+									'event_espresso'
132
+								),
133
+								$most_recent_migration->pretty_name()
134
+							); ?>
135 135
                         </strong>
136 136
                         <a id="show-hide-migration-warnings" class="display-the-hidden">
137 137
                             <?php esc_html_e("Show Warnings", 'event_espresso'); ?>
@@ -143,32 +143,32 @@  discard block
 block discarded – undo
143 143
                         </ul>
144 144
                     </div>
145 145
                     <?php
146
-                } else {
147
-                    // there were no errors during the last migration, just say so?>
146
+				} else {
147
+					// there were no errors during the last migration, just say so?>
148 148
                     <h2>
149 149
                         <?php printf(
150
-                            esc_html__(
151
-                                "The last Database Update (%s) ran successfully without errors.",
152
-                                "event_espresso"
153
-                            ),
154
-                            $most_recent_migration->pretty_name()
155
-                        ); ?>
150
+							esc_html__(
151
+								"The last Database Update (%s) ran successfully without errors.",
152
+								"event_espresso"
153
+							),
154
+							$most_recent_migration->pretty_name()
155
+						); ?>
156 156
                     </h2>
157 157
                     <?php
158
-                }
159
-            }
160
-        }
161
-        // end of: if ( $show_most_recent_migration )
162
-        ?>
158
+				}
159
+			}
160
+		}
161
+		// end of: if ( $show_most_recent_migration )
162
+		?>
163 163
 
164 164
     </div>
165 165
     <!--end of #migration-prep-->
166 166
 
167 167
     <?php
168
-    if ($show_migration_progress) { ?>
168
+	if ($show_migration_progress) { ?>
169 169
         <div id='migration-monitor' <?php echo $show_backup_db_text ? "style='display:none'" : '' ?>>
170 170
             <?php
171
-            if ($show_backup_db_text) { ?>
171
+			if ($show_backup_db_text) { ?>
172 172
                 <p>
173 173
                     <a class="toggle-migration-monitor small-text" style="cursor: pointer;">
174 174
                         <span class="dashicons dashicons-arrow-left-alt2" style="top:0;"></span>
@@ -178,19 +178,19 @@  discard block
 block discarded – undo
178 178
 
179 179
                 </p>
180 180
                 <?php
181
-            } ?>
181
+			} ?>
182 182
             <div id='progress-area'>
183 183
                 <h3 class="espresso-header">
184 184
                     <?php
185
-                    echo sprintf(
186
-                        _n(
187
-                            "The following task needs to be performed:",
188
-                            "The following %s tasks need to be performed:",
189
-                            count($script_names),
190
-                            "event_espresso"
191
-                        ),
192
-                        count($script_names)
193
-                    ); ?>
185
+					echo sprintf(
186
+						_n(
187
+							"The following task needs to be performed:",
188
+							"The following %s tasks need to be performed:",
189
+							count($script_names),
190
+							"event_espresso"
191
+						),
192
+						count($script_names)
193
+					); ?>
194 194
                 </h3>
195 195
                 <ul style="list-style: inside;">
196 196
                     <?php foreach ($script_names as $script_name) { ?>
@@ -201,9 +201,9 @@  discard block
 block discarded – undo
201 201
                 <?php if (count($script_names) > 1) { ?>
202 202
                     <p>
203 203
                         <?php esc_html_e(
204
-                            "Please note: after each task is completed you will need to continue the Database Update, or report an error to Event Espresso.",
205
-                            "event_espresso"
206
-                        ); ?>
204
+							"Please note: after each task is completed you will need to continue the Database Update, or report an error to Event Espresso.",
205
+							"event_espresso"
206
+						); ?>
207 207
                     </p>
208 208
                 <?php } ?>
209 209
 
@@ -214,19 +214,19 @@  discard block
 block discarded – undo
214 214
                         </span>
215 215
                         <br />
216 216
                         <?php esc_html_e(
217
-                            "Depending on the number of events and the complexity of the information in your database, this could take a few minutes.",
218
-                            "event_espresso"
219
-                        ); ?>
217
+							"Depending on the number of events and the complexity of the information in your database, this could take a few minutes.",
218
+							"event_espresso"
219
+						); ?>
220 220
                     </p>
221 221
                     <p>
222 222
                         <?php printf(
223
-                            esc_html__(
224
-                                "%sPlease be patient and do NOT navigate away from this page once the migration has begun%s. If any issues arise due to existing malformed data, an itemized report will be made available to you after the migration has completed.",
225
-                                "event_espresso"
226
-                            ),
227
-                            '<strong>',
228
-                            '</strong>'
229
-                        ); ?>
223
+							esc_html__(
224
+								"%sPlease be patient and do NOT navigate away from this page once the migration has begun%s. If any issues arise due to existing malformed data, an itemized report will be made available to you after the migration has completed.",
225
+								"event_espresso"
226
+							),
227
+							'<strong>',
228
+							'</strong>'
229
+						); ?>
230 230
                     </p>
231 231
                     <p>
232 232
                         <?php esc_html_e("Click the button below to begin the migration process.", "event_espresso") ?>
@@ -242,8 +242,8 @@  discard block
 block discarded – undo
242 242
 
243 243
                 <button id='start-migration' class='button-primary'>
244 244
                     <?php echo $show_continue_current_migration_script
245
-                        ? esc_html__("Continue Database Update", "event_espresso")
246
-                        : esc_html__("Begin Database Update", "event_espresso"); ?>
245
+						? esc_html__("Continue Database Update", "event_espresso")
246
+						: esc_html__("Begin Database Update", "event_espresso"); ?>
247 247
                 </button>
248 248
                 <br class="clear" />
249 249
 
@@ -259,9 +259,9 @@  discard block
 block discarded – undo
259 259
         </div>
260 260
 
261 261
         <?php
262
-    }
263
-    if ($show_maintenance_switch) {
264
-        ?>
262
+	}
263
+	if ($show_maintenance_switch) {
264
+		?>
265 265
         <h2>
266 266
             <span class="dashicons dashicons-admin-tools"></span>
267 267
             <?php esc_html_e('Set Event Espresso Maintenance Mode', 'event_espresso'); ?>
@@ -276,9 +276,9 @@  discard block
 block discarded – undo
276 276
                                    type='radio'
277 277
                                    value="0"
278 278
                                 <?php echo $mMode_level === EE_Maintenance_Mode::level_0_not_in_maintenance
279
-                                    ? 'checked="checked"'
280
-                                    : ''
281
-                                ?>
279
+									? 'checked="checked"'
280
+									: ''
281
+								?>
282 282
                             />
283 283
                         </td>
284 284
                         <th align="left">
@@ -287,9 +287,9 @@  discard block
 block discarded – undo
287 287
                             </label>
288 288
                             <p class='description' style="font-weight: normal;">
289 289
                                 <?php esc_html_e(
290
-                                    "This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.",
291
-                                    "event_espresso"
292
-                                ); ?>
290
+									"This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.",
291
+									"event_espresso"
292
+								); ?>
293 293
                             </p>
294 294
                         </th>
295 295
                     </tr>
@@ -300,9 +300,9 @@  discard block
 block discarded – undo
300 300
                                    type='radio'
301 301
                                    value="1"
302 302
                                 <?php echo $mMode_level === EE_Maintenance_Mode::level_1_frontend_only_maintenance
303
-                                    ? 'checked="checked"'
304
-                                    : ''
305
-                                ?>
303
+									? 'checked="checked"'
304
+									: ''
305
+								?>
306 306
                             />
307 307
                         </td>
308 308
                         <th align="left">
@@ -311,9 +311,9 @@  discard block
 block discarded – undo
311 311
                             </label>
312 312
                             <p class='description' style="font-weight: normal;">
313 313
                                 <?php esc_html_e(
314
-                                    "This disables Event Espresso frontend functionality for all site visitors that are not administrators, and allows you to configure and/or test things on the frontend of your website before others can see.",
315
-                                    "event_espresso"
316
-                                ); ?>
314
+									"This disables Event Espresso frontend functionality for all site visitors that are not administrators, and allows you to configure and/or test things on the frontend of your website before others can see.",
315
+									"event_espresso"
316
+								); ?>
317 317
                             </p>
318 318
                         </th>
319 319
                     </tr>
@@ -327,6 +327,6 @@  discard block
 block discarded – undo
327 327
             </p>
328 328
         </form>
329 329
         <?php
330
-    } ?>
330
+	} ?>
331 331
 
332 332
 </div>
Please login to merge, or discard this patch.
admin_pages/maintenance/templates/ee_data_reset_and_delete.template.php 1 patch
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
     </h4>
32 32
     <p>
33 33
         <?php esc_html_e(
34
-            'Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities.  Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.',
35
-            'event_espresso'
36
-        ); ?>
34
+			'Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities.  Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.',
35
+			'event_espresso'
36
+		); ?>
37 37
     </p>
38 38
     <div class="float-right"><?php echo $reset_capabilities_button; // already escaped ?></div>
39 39
     <div class="clear"></div>
@@ -47,15 +47,15 @@  discard block
 block discarded – undo
47 47
     </h4>
48 48
     <p>
49 49
         <?php esc_html_e(
50
-            ' This will reset data for Event Espresso 4, and for all active add-ons. Inactive add-ons will not be affected.',
51
-            'event_espresso'
52
-        ); ?>
50
+			' This will reset data for Event Espresso 4, and for all active add-ons. Inactive add-ons will not be affected.',
51
+			'event_espresso'
52
+		); ?>
53 53
     </p>
54 54
     <p>
55 55
         <?php esc_html_e(
56
-            'Your Event Espresso data will return to its default settings. The rest of your website will be unaffected.',
57
-            'event_espresso'
58
-        ); ?>
56
+			'Your Event Espresso data will return to its default settings. The rest of your website will be unaffected.',
57
+			'event_espresso'
58
+		); ?>
59 59
     </p>
60 60
     <div class="float-right">
61 61
         <a class="button button-primary ee-confirm" href="<?php echo esc_url_raw($reset_db_url); ?>">
@@ -74,61 +74,61 @@  discard block
 block discarded – undo
74 74
     </h4>
75 75
     <p>
76 76
         <?php esc_html_e(
77
-            ' This will delete data for Event Espresso 4, and all currently active add-ons. Event Espresso will then be deactivated. You may need to manually deactivate each add-on individually.',
78
-            'event_espresso'
79
-        ); ?>
77
+			' This will delete data for Event Espresso 4, and all currently active add-ons. Event Espresso will then be deactivated. You may need to manually deactivate each add-on individually.',
78
+			'event_espresso'
79
+		); ?>
80 80
     </p>
81 81
     <p>
82 82
         <?php esc_html_e(
83
-            'If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.',
84
-            'event_espresso'
85
-        ); ?>
83
+			'If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.',
84
+			'event_espresso'
85
+		); ?>
86 86
     </p>
87 87
     <p class="important-notice">
88 88
         <?php printf(
89
-            esc_html__('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'),
90
-            '<em>',
91
-            '</em>'
92
-        ); ?>
89
+			esc_html__('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'),
90
+			'<em>',
91
+			'</em>'
92
+		); ?>
93 93
         <br />
94 94
     </p>
95 95
     <ol>
96 96
         <li>
97 97
             <?php printf(
98
-                esc_html__(
99
-                    'First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database . If you receive a "500 Internal Server Error" or a blank white screen, it means the server has timed out due to the large number of records being updated. This is not a cause for concern. Simply %1$srefresh the page%2$s and the Database Update will continue where it left off.',
100
-                    'event_espresso'
101
-                ),
102
-                '<strong>',
103
-                '</strong>'
104
-            ); ?>
98
+				esc_html__(
99
+					'First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database . If you receive a "500 Internal Server Error" or a blank white screen, it means the server has timed out due to the large number of records being updated. This is not a cause for concern. Simply %1$srefresh the page%2$s and the Database Update will continue where it left off.',
100
+					'event_espresso'
101
+				),
102
+				'<strong>',
103
+				'</strong>'
104
+			); ?>
105 105
         </li>
106 106
         <li>
107 107
             <?php printf(
108
-                esc_html__(
109
-                    'Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s',
110
-                    'event_espresso'
111
-                ),
112
-                '<strong>',
113
-                '</strong>'
114
-            ); ?>
108
+				esc_html__(
109
+					'Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s',
110
+					'event_espresso'
111
+				),
112
+				'<strong>',
113
+				'</strong>'
114
+			); ?>
115 115
         </li>
116 116
         <li>
117 117
             <?php printf(
118
-                esc_html__(
119
-                    'Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s',
120
-                    'event_espresso'
121
-                ),
122
-                '<strong>',
123
-                '</strong>'
124
-            ); ?>
118
+				esc_html__(
119
+					'Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s',
120
+					'event_espresso'
121
+				),
122
+				'<strong>',
123
+				'</strong>'
124
+			); ?>
125 125
         </li>
126 126
         <li>
127 127
             <?php printf(
128
-                esc_html__('Note: Event Espresso 4 categories are %snot%s deleted by this script', 'event_espresso'),
129
-                '<strong>',
130
-                '</strong>'
131
-            ); ?>
128
+				esc_html__('Note: Event Espresso 4 categories are %snot%s deleted by this script', 'event_espresso'),
129
+				'<strong>',
130
+				'</strong>'
131
+			); ?>
132 132
             <br>
133 133
             <a href="<?php echo esc_url_raw(admin_url('edit-tags.php?taxonomy=espresso_event_categories')); ?>">
134 134
                 <?php esc_html_e('You can go here to delete Event Espresso categories', 'event_espresso'); ?>
Please login to merge, or discard this patch.
admin_pages/maintenance/templates/migration_options_from_ee3.template.php 1 patch
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -36,27 +36,27 @@  discard block
 block discarded – undo
36 36
                     <td><h3><?php esc_html_e('1', 'event_espresso'); ?></h3></td>
37 37
                     <td>
38 38
                         <?php echo esc_html(
39
-                            apply_filters(
40
-                                'FHEE__ee_migration_page__option_1_main',
41
-                                sprintf(
42
-                                    __(
43
-                                        '%1$sYes. I have backed up my database%2$s, %3$sunderstand the risks involved%4$s, and am ready to migrate my existing %5$s data to %6$s.',
44
-                                        "event_espresso"
45
-                                    ),
46
-                                    '<strong>',
47
-                                    '</strong>',
48
-                                    '<a id="migration-risks" class="" title="'
49
-                                    . esc_attr__('click for more details', "event_espresso")
50
-                                    . '">',
51
-                                    '</a>',
52
-                                    $current_db_state,
53
-                                    $next_db_state
54
-                                ),
55
-                                $current_db_state,
56
-                                $next_db_state
57
-                            )
58
-                        );
59
-                            ?>
39
+							apply_filters(
40
+								'FHEE__ee_migration_page__option_1_main',
41
+								sprintf(
42
+									__(
43
+										'%1$sYes. I have backed up my database%2$s, %3$sunderstand the risks involved%4$s, and am ready to migrate my existing %5$s data to %6$s.',
44
+										"event_espresso"
45
+									),
46
+									'<strong>',
47
+									'</strong>',
48
+									'<a id="migration-risks" class="" title="'
49
+									. esc_attr__('click for more details', "event_espresso")
50
+									. '">',
51
+									'</a>',
52
+									$current_db_state,
53
+									$next_db_state
54
+								),
55
+								$current_db_state,
56
+								$next_db_state
57
+							)
58
+						);
59
+							?>
60 60
                         <a id="display-migration-details"
61 61
                            class="display-the-hidden lt-grey-text smaller-text hide-if-no-js"
62 62
                            rel="migration-details"
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
                            style="display:none;"
70 70
                         >
71 71
                             <?php printf(
72
-                                esc_html__('hide%1$sdetails%1$s-', 'event_espresso'),
73
-                                '&nbsp;'
74
-                            ); ?>
72
+								esc_html__('hide%1$sdetails%1$s-', 'event_espresso'),
73
+								'&nbsp;'
74
+							); ?>
75 75
                         </a>
76 76
                     </td>
77 77
                     <td>
@@ -79,17 +79,17 @@  discard block
 block discarded – undo
79 79
                            class="toggle-migration-monitor button-primary"
80 80
                         >
81 81
                             <?php echo esc_html(
82
-                                apply_filters(
83
-                                    'FHEE__ee_migration_page__option_1_button_text',
84
-                                    sprintf(
85
-                                        __("Migrate My %s Data to %s", "event_espresso"),
86
-                                        $current_db_state,
87
-                                        $next_db_state
88
-                                    ),
89
-                                    $current_db_state,
90
-                                    $next_db_state
91
-                                )
92
-                            ); ?>
82
+								apply_filters(
83
+									'FHEE__ee_migration_page__option_1_button_text',
84
+									sprintf(
85
+										__("Migrate My %s Data to %s", "event_espresso"),
86
+										$current_db_state,
87
+										$next_db_state
88
+									),
89
+									$current_db_state,
90
+									$next_db_state
91
+								)
92
+							); ?>
93 93
                         </a>
94 94
                     </td>
95 95
                 </tr>
@@ -98,34 +98,34 @@  discard block
 block discarded – undo
98 98
                         <div id="migration-details-dv" style="display: none; padding: 1em;">
99 99
                             <span class="reminder-spn">
100 100
                             <?php printf(
101
-                                esc_html__(
102
-                                    "%s Important: %s Before migrating, please back up your database and files.",
103
-                                    "event_espresso"
104
-                                ),
105
-                                "<b>",
106
-                                "</b>"
107
-                            );
101
+								esc_html__(
102
+									"%s Important: %s Before migrating, please back up your database and files.",
103
+									"event_espresso"
104
+								),
105
+								"<b>",
106
+								"</b>"
107
+							);
108 108
 ?>
109 109
                             </span>
110 110
                             <p>
111 111
                                 <?php printf(
112
-                                    esc_html__(
113
-                                        '%1$sNot sure how to backup your existing data?%2$s Here is %3$sWordPress\'s explanation%7$s, and here\'s %6$sour explanation%7$s.%8$sYou can also search the WordPress plugin database for %4$s database backup plugins %7$s,%8$sor have one of our dedicated support technicians help you by purchasing a %5$sPriority Support Token%7$s.',
114
-                                        "event_espresso"
115
-                                    ),
116
-                                    '<b>',
117
-                                    '</b>',
118
-                                    "<a href='https://codex.wordpress.org/Backing_Up_Your_Database'>",
119
-                                    "<a href='"
120
-                                    . admin_url(
121
-                                        'plugin-install.php?tab=search&type=term&s=database+backup&plugin-search-input=Search+Plugins'
122
-                                    )
123
-                                    . "'>",
124
-                                    "<a href='https://eventespresso.com/product/priority-support-tokens/'>",
125
-                                    '<a href="https://eventespresso.com/wiki/how-to-back-up-your-site/">',
126
-                                    "</a>",
127
-                                    '<br/>'
128
-                                );
112
+									esc_html__(
113
+										'%1$sNot sure how to backup your existing data?%2$s Here is %3$sWordPress\'s explanation%7$s, and here\'s %6$sour explanation%7$s.%8$sYou can also search the WordPress plugin database for %4$s database backup plugins %7$s,%8$sor have one of our dedicated support technicians help you by purchasing a %5$sPriority Support Token%7$s.',
114
+										"event_espresso"
115
+									),
116
+									'<b>',
117
+									'</b>',
118
+									"<a href='https://codex.wordpress.org/Backing_Up_Your_Database'>",
119
+									"<a href='"
120
+									. admin_url(
121
+										'plugin-install.php?tab=search&type=term&s=database+backup&plugin-search-input=Search+Plugins'
122
+									)
123
+									. "'>",
124
+									"<a href='https://eventespresso.com/product/priority-support-tokens/'>",
125
+									'<a href="https://eventespresso.com/wiki/how-to-back-up-your-site/">',
126
+									"</a>",
127
+									'<br/>'
128
+								);
129 129
 ?>
130 130
                             </p>
131 131
                             <?php do_action('AHEE__ee_migration_page__option_1_extra_details'); ?>
@@ -138,29 +138,29 @@  discard block
 block discarded – undo
138 138
                     </td>
139 139
                     <td>
140 140
                         <?php echo esc_html(
141
-                            apply_filters(
142
-                                'FHEE__ee_migration_page__option_2_main',
143
-                                sprintf(
144
-                                    __(
145
-                                        'I do NOT want to migrate my %1$s data to %2$s at this time and just want to use %3$s without migrating data.',
146
-                                        "event_espresso"
147
-                                    ),
148
-                                    $current_db_state,
149
-                                    $next_db_state,
150
-                                    $ultimate_db_state
151
-                                ),
152
-                                $current_db_state,
153
-                                $next_db_state,
154
-                                $ultimate_db_state
155
-                            )
156
-                        );
157
-                            ?>
141
+							apply_filters(
142
+								'FHEE__ee_migration_page__option_2_main',
143
+								sprintf(
144
+									__(
145
+										'I do NOT want to migrate my %1$s data to %2$s at this time and just want to use %3$s without migrating data.',
146
+										"event_espresso"
147
+									),
148
+									$current_db_state,
149
+									$next_db_state,
150
+									$ultimate_db_state
151
+								),
152
+								$current_db_state,
153
+								$next_db_state,
154
+								$ultimate_db_state
155
+							)
156
+						);
157
+							?>
158 158
                         <br />
159 159
                         <span class="reminder-spn">
160 160
                             <?php esc_html_e(
161
-                                'Please Note: In order to avoid errors, any existing Event Espresso data (events, ticket, registrations, etc) in your db will be erased! Regular WP data will NOT be affected.',
162
-                                'event_espresso'
163
-                            ); ?>
161
+								'Please Note: In order to avoid errors, any existing Event Espresso data (events, ticket, registrations, etc) in your db will be erased! Regular WP data will NOT be affected.',
162
+								'event_espresso'
163
+							); ?>
164 164
                         </span>
165 165
                         <a id="display-no-migration-details"
166 166
                            class="display-the-hidden lt-grey-text smaller-text hide-if-no-js"
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
174 174
                            style="display:none;"
175 175
                         >
176 176
                             <?php printf(
177
-                                esc_html__('hide%1$sdetails%1$s-', 'event_espresso'),
178
-                                '&nbsp;'
179
-                            );
177
+								esc_html__('hide%1$sdetails%1$s-', 'event_espresso'),
178
+								'&nbsp;'
179
+							);
180 180
 ?>
181 181
                         </a>
182 182
                     </td>
@@ -186,16 +186,16 @@  discard block
 block discarded – undo
186 186
                            href="<?php echo esc_url_raw($reset_db_page_link); ?>"
187 187
                         >
188 188
                             <?php echo esc_html(
189
-                                apply_filters(
190
-                                    'FHEE__ee_migration_page__option_2_button_text',
191
-                                    sprintf(
192
-                                        __("Just Start %s and Delete Existing Data", "event_espresso"),
193
-                                        $ultimate_db_state
194
-                                    ),
195
-                                    $ultimate_db_state
196
-                                )
197
-                            );
198
-                                    ?>
189
+								apply_filters(
190
+									'FHEE__ee_migration_page__option_2_button_text',
191
+									sprintf(
192
+										__("Just Start %s and Delete Existing Data", "event_espresso"),
193
+										$ultimate_db_state
194
+									),
195
+									$ultimate_db_state
196
+								)
197
+							);
198
+									?>
199 199
                         </a>
200 200
                     </td>
201 201
                 </tr>
@@ -204,18 +204,18 @@  discard block
 block discarded – undo
204 204
                         <div id="no-migration-details-dv" style="display: none; padding: 1em;">
205 205
                             <p>
206 206
                                 <?php echo esc_html(
207
-                                    apply_filters(
208
-                                        'FHEE__ee_migration_page__option_2_details',
209
-                                        sprintf(
210
-                                            __(
211
-                                                "If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.",
212
-                                                "event_espresso"
213
-                                            ),
214
-                                            $ultimate_db_state
215
-                                        ),
216
-                                        $ultimate_db_state
217
-                                    )
218
-                                ); ?>
207
+									apply_filters(
208
+										'FHEE__ee_migration_page__option_2_details',
209
+										sprintf(
210
+											__(
211
+												"If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.",
212
+												"event_espresso"
213
+											),
214
+											$ultimate_db_state
215
+										),
216
+										$ultimate_db_state
217
+									)
218
+								); ?>
219 219
                             </p>
220 220
                         </div>
221 221
                     </td>
Please login to merge, or discard this patch.
admin_pages/maintenance/Maintenance_Admin_Page_Init.core.php 2 patches
Indentation   +97 added lines, -97 removed lines patch added patch discarded remove patch
@@ -16,112 +16,112 @@
 block discarded – undo
16 16
 class Maintenance_Admin_Page_Init extends EE_Admin_Page_Init
17 17
 {
18 18
 
19
-    /**
20
-     * @var int
21
-     */
22
-    protected $maintenance_mode_level;
19
+	/**
20
+	 * @var int
21
+	 */
22
+	protected $maintenance_mode_level;
23 23
 
24 24
 
25
-    public function __construct()
26
-    {
27
-        $this->maintenance_mode_level = EE_Maintenance_Mode::instance()->level();
28
-        // define some page related constants
29
-        define('EE_MAINTENANCE_LABEL', esc_html__('Maintenance', 'event_espresso'));
30
-        define('EE_MAINTENANCE_PG_SLUG', 'espresso_maintenance_settings');
31
-        define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page=' . EE_MAINTENANCE_PG_SLUG));
32
-        define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES . 'maintenance/');
33
-        define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN . 'templates/');
34
-        define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL . 'maintenance/assets/');
35
-        // check that if we're in maintenance mode that we tell the admin that
36
-        add_action('admin_notices', [$this, 'check_maintenance_mode']);
37
-        parent::__construct();
38
-    }
25
+	public function __construct()
26
+	{
27
+		$this->maintenance_mode_level = EE_Maintenance_Mode::instance()->level();
28
+		// define some page related constants
29
+		define('EE_MAINTENANCE_LABEL', esc_html__('Maintenance', 'event_espresso'));
30
+		define('EE_MAINTENANCE_PG_SLUG', 'espresso_maintenance_settings');
31
+		define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page=' . EE_MAINTENANCE_PG_SLUG));
32
+		define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES . 'maintenance/');
33
+		define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN . 'templates/');
34
+		define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL . 'maintenance/assets/');
35
+		// check that if we're in maintenance mode that we tell the admin that
36
+		add_action('admin_notices', [$this, 'check_maintenance_mode']);
37
+		parent::__construct();
38
+	}
39 39
 
40 40
 
41
-    protected function _set_init_properties()
42
-    {
43
-        $this->label = EE_MAINTENANCE_LABEL;
44
-    }
41
+	protected function _set_init_properties()
42
+	{
43
+		$this->label = EE_MAINTENANCE_LABEL;
44
+	}
45 45
 
46 46
 
47
-    /**
48
-     * @throws EE_Error
49
-     */
50
-    protected function _set_menu_map()
51
-    {
52
-        $menu_map        = $this->_menu_map();
53
-        $this->_menu_map = $this->maintenance_mode_level === EE_Maintenance_Mode::level_2_complete_maintenance
54
-            ? new EE_Admin_Page_Main_Menu($menu_map)
55
-            : new EE_Admin_Page_Sub_Menu($menu_map);
56
-    }
47
+	/**
48
+	 * @throws EE_Error
49
+	 */
50
+	protected function _set_menu_map()
51
+	{
52
+		$menu_map        = $this->_menu_map();
53
+		$this->_menu_map = $this->maintenance_mode_level === EE_Maintenance_Mode::level_2_complete_maintenance
54
+			? new EE_Admin_Page_Main_Menu($menu_map)
55
+			: new EE_Admin_Page_Sub_Menu($menu_map);
56
+	}
57 57
 
58 58
 
59
-    protected function _menu_map()
60
-    {
61
-        $map = [
62
-            'menu_group'              => 'extras',
63
-            'menu_order'              => 30,
64
-            'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
65
-            'parent_slug'             => 'espresso_events',
66
-            'menu_slug'               => EE_MAINTENANCE_PG_SLUG,
67
-            'menu_label'              => EE_MAINTENANCE_LABEL,
68
-            'capability'              => 'manage_options',
69
-            'maintenance_mode_parent' => EE_MAINTENANCE_PG_SLUG,
70
-            'admin_init_page'         => $this,
71
-        ];
72
-        if ($this->maintenance_mode_level == EE_Maintenance_Mode::level_2_complete_maintenance) {
73
-            $map['menu_group'] = 'main';
74
-            $map['subtitle']   = EE_MAINTENANCE_LABEL;
75
-            $map['menu_label'] = esc_html__('Event Espresso', 'event_espresso');
76
-        }
77
-        return $map;
78
-    }
59
+	protected function _menu_map()
60
+	{
61
+		$map = [
62
+			'menu_group'              => 'extras',
63
+			'menu_order'              => 30,
64
+			'show_on_menu'            => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
65
+			'parent_slug'             => 'espresso_events',
66
+			'menu_slug'               => EE_MAINTENANCE_PG_SLUG,
67
+			'menu_label'              => EE_MAINTENANCE_LABEL,
68
+			'capability'              => 'manage_options',
69
+			'maintenance_mode_parent' => EE_MAINTENANCE_PG_SLUG,
70
+			'admin_init_page'         => $this,
71
+		];
72
+		if ($this->maintenance_mode_level == EE_Maintenance_Mode::level_2_complete_maintenance) {
73
+			$map['menu_group'] = 'main';
74
+			$map['subtitle']   = EE_MAINTENANCE_LABEL;
75
+			$map['menu_label'] = esc_html__('Event Espresso', 'event_espresso');
76
+		}
77
+		return $map;
78
+	}
79 79
 
80 80
 
81
-    /**
82
-     * Checks if we're in maintenance mode, and if so we notify the admin adn tell them how to take the site OUT of
83
-     * maintenance mode
84
-     */
85
-    public function check_maintenance_mode()
86
-    {
87
-        $notice               = '';
88
-        $maintenance_page_url = '';
89
-        if ($this->maintenance_mode_level) {
90
-            $maintenance_page_url = esc_url_raw(
91
-                EE_Admin_Page::add_query_args_and_nonce([], EE_MAINTENANCE_ADMIN_URL)
92
-            );
93
-            switch ($this->maintenance_mode_level) {
94
-                case EE_Maintenance_Mode::level_1_frontend_only_maintenance:
95
-                    $notice = '<div class="update-nag ee-update-nag">';
96
-                    $notice .= sprintf(
97
-                        esc_html__(
98
-                            "Event Espresso is in Frontend-Only MAINTENANCE MODE. This means the front-end (ie, non-wp-admin pages) is disabled for ALL users except site admins. Visit the %s Maintenance Page %s to disable maintenance mode.",
99
-                            "event_espresso"
100
-                        ),
101
-                        "<a href='$maintenance_page_url'>",
102
-                        "</a>"
103
-                    );
104
-                    $notice .= '</div>';
105
-                    break;
106
-                case EE_Maintenance_Mode::level_2_complete_maintenance:
107
-                    $notice = '<div class="error"><p>';
108
-                    $notice .= sprintf(
109
-                        esc_html__(
110
-                            "As part of the process for updating Event Espresso, your database also
81
+	/**
82
+	 * Checks if we're in maintenance mode, and if so we notify the admin adn tell them how to take the site OUT of
83
+	 * maintenance mode
84
+	 */
85
+	public function check_maintenance_mode()
86
+	{
87
+		$notice               = '';
88
+		$maintenance_page_url = '';
89
+		if ($this->maintenance_mode_level) {
90
+			$maintenance_page_url = esc_url_raw(
91
+				EE_Admin_Page::add_query_args_and_nonce([], EE_MAINTENANCE_ADMIN_URL)
92
+			);
93
+			switch ($this->maintenance_mode_level) {
94
+				case EE_Maintenance_Mode::level_1_frontend_only_maintenance:
95
+					$notice = '<div class="update-nag ee-update-nag">';
96
+					$notice .= sprintf(
97
+						esc_html__(
98
+							"Event Espresso is in Frontend-Only MAINTENANCE MODE. This means the front-end (ie, non-wp-admin pages) is disabled for ALL users except site admins. Visit the %s Maintenance Page %s to disable maintenance mode.",
99
+							"event_espresso"
100
+						),
101
+						"<a href='$maintenance_page_url'>",
102
+						"</a>"
103
+					);
104
+					$notice .= '</div>';
105
+					break;
106
+				case EE_Maintenance_Mode::level_2_complete_maintenance:
107
+					$notice = '<div class="error"><p>';
108
+					$notice .= sprintf(
109
+						esc_html__(
110
+							"As part of the process for updating Event Espresso, your database also
111 111
 needs to be updated. Event Espresso is in COMPLETE MAINTENANCE MODE (both WordPress admin pages and front-end event registration pages are disabled) until you run the database update script. %s Visit the Maintenance Page to get started,%s it only takes a moment.",
112
-                            "event_espresso"
113
-                        ),
114
-                        "<a href='$maintenance_page_url'>",
115
-                        "</a>"
116
-                    );
117
-                    $notice .= '</p></div>';
118
-                    break;
119
-            }
120
-        }
121
-        echo apply_filters(
122
-            'FHEE__Maintenance_Admin_Page_Init__check_maintenance_mode__notice',
123
-            $notice, // already escaped
124
-            $maintenance_page_url // already escaped
125
-        );
126
-    }
112
+							"event_espresso"
113
+						),
114
+						"<a href='$maintenance_page_url'>",
115
+						"</a>"
116
+					);
117
+					$notice .= '</p></div>';
118
+					break;
119
+			}
120
+		}
121
+		echo apply_filters(
122
+			'FHEE__Maintenance_Admin_Page_Init__check_maintenance_mode__notice',
123
+			$notice, // already escaped
124
+			$maintenance_page_url // already escaped
125
+		);
126
+	}
127 127
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,10 +28,10 @@
 block discarded – undo
28 28
         // define some page related constants
29 29
         define('EE_MAINTENANCE_LABEL', esc_html__('Maintenance', 'event_espresso'));
30 30
         define('EE_MAINTENANCE_PG_SLUG', 'espresso_maintenance_settings');
31
-        define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page=' . EE_MAINTENANCE_PG_SLUG));
32
-        define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES . 'maintenance/');
33
-        define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN . 'templates/');
34
-        define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL . 'maintenance/assets/');
31
+        define('EE_MAINTENANCE_ADMIN_URL', admin_url('admin.php?page='.EE_MAINTENANCE_PG_SLUG));
32
+        define('EE_MAINTENANCE_ADMIN', EE_ADMIN_PAGES.'maintenance/');
33
+        define('EE_MAINTENANCE_TEMPLATE_PATH', EE_MAINTENANCE_ADMIN.'templates/');
34
+        define('EE_MAINTENANCE_ASSETS_URL', EE_ADMIN_PAGES_URL.'maintenance/assets/');
35 35
         // check that if we're in maintenance mode that we tell the admin that
36 36
         add_action('admin_notices', [$this, 'check_maintenance_mode']);
37 37
         parent::__construct();
Please login to merge, or discard this patch.