@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | if ($show_backup_db_text) { ?> |
21 | 21 | <h1><span class="dashicons dashicons-migrate"></span> |
22 | 22 | <?php esc_html_e( |
23 | - "Database Update Manager", |
|
24 | - "event_espresso" |
|
25 | - ); ?> |
|
23 | + "Database Update Manager", |
|
24 | + "event_espresso" |
|
25 | + ); ?> |
|
26 | 26 | </h1> |
27 | 27 | <?php } ?> |
28 | 28 | <div class="padding"> |
@@ -32,43 +32,43 @@ discard block |
||
32 | 32 | <h3 class="espresso-header"> |
33 | 33 | <span class="dashicons dashicons-flag ee-icon-size-22"></span> |
34 | 34 | <?php |
35 | - echo apply_filters( |
|
36 | - 'FHEE__ee_migration_page__header', |
|
37 | - sprintf( |
|
38 | - esc_html__("Your Event Espresso data needs to be updated.", "event_espresso"), |
|
39 | - $current_db_state, |
|
40 | - $next_db_state |
|
41 | - ), |
|
42 | - $current_db_state, |
|
43 | - $next_db_state |
|
44 | - ); |
|
45 | - ?> |
|
35 | + echo apply_filters( |
|
36 | + 'FHEE__ee_migration_page__header', |
|
37 | + sprintf( |
|
38 | + esc_html__("Your Event Espresso data needs to be updated.", "event_espresso"), |
|
39 | + $current_db_state, |
|
40 | + $next_db_state |
|
41 | + ), |
|
42 | + $current_db_state, |
|
43 | + $next_db_state |
|
44 | + ); |
|
45 | + ?> |
|
46 | 46 | </h3> |
47 | 47 | <?php } elseif ($show_most_recent_migration) { ?> |
48 | 48 | <h3 class="espresso-header"> |
49 | 49 | <span class="dashicons dashicons-awards ee-icon-size-22"></span> |
50 | 50 | <?php echo apply_filters( |
51 | - 'FHEE__ee_migration_page__done_migration_header', |
|
52 | - sprintf( |
|
53 | - esc_html__( |
|
54 | - 'Congratulations! Your database is "up-to-date" and you are ready to begin using %s', |
|
55 | - "event_espresso" |
|
56 | - ), |
|
57 | - $ultimate_db_state |
|
58 | - ) |
|
59 | - ); ?> |
|
51 | + 'FHEE__ee_migration_page__done_migration_header', |
|
52 | + sprintf( |
|
53 | + esc_html__( |
|
54 | + 'Congratulations! Your database is "up-to-date" and you are ready to begin using %s', |
|
55 | + "event_espresso" |
|
56 | + ), |
|
57 | + $ultimate_db_state |
|
58 | + ) |
|
59 | + ); ?> |
|
60 | 60 | </h3> |
61 | 61 | <p> |
62 | 62 | <?php echo apply_filters( |
63 | - 'FHEE__ee_migration_page__p_after_done_migration_header', |
|
64 | - sprintf( |
|
65 | - esc_html__( |
|
66 | - "Time to find out about all the great new features %s has to offer.", |
|
67 | - "event_espresso" |
|
68 | - ), |
|
69 | - $ultimate_db_state |
|
70 | - ) |
|
71 | - ); ?> |
|
63 | + 'FHEE__ee_migration_page__p_after_done_migration_header', |
|
64 | + sprintf( |
|
65 | + esc_html__( |
|
66 | + "Time to find out about all the great new features %s has to offer.", |
|
67 | + "event_espresso" |
|
68 | + ), |
|
69 | + $ultimate_db_state |
|
70 | + ) |
|
71 | + ); ?> |
|
72 | 72 | <b><a id="get-started-after-migrate" class="button-primary" |
73 | 73 | href="<?php echo add_query_arg(array('page' => 'espresso_about'), admin_url('admin.php')); ?>"> |
74 | 74 | <?php esc_html_e("Let's Get Started", "event_espresso"); ?> <span |
@@ -79,51 +79,51 @@ discard block |
||
79 | 79 | |
80 | 80 | |
81 | 81 | <?php |
82 | - if ($show_backup_db_text) { |
|
83 | - echo $migration_options_html; |
|
84 | - } ?> |
|
82 | + if ($show_backup_db_text) { |
|
83 | + echo $migration_options_html; |
|
84 | + } ?> |
|
85 | 85 | |
86 | 86 | <?php |
87 | - if ($show_most_recent_migration) { |
|
88 | - if ($most_recent_migration && $most_recent_migration instanceof EE_Data_Migration_Script_Base) { |
|
89 | - if ($most_recent_migration->can_continue()) { |
|
90 | - // tell the user they should continue their migration because it appears to be unfinished... well, assuming there were no errors ?> |
|
87 | + if ($show_most_recent_migration) { |
|
88 | + if ($most_recent_migration && $most_recent_migration instanceof EE_Data_Migration_Script_Base) { |
|
89 | + if ($most_recent_migration->can_continue()) { |
|
90 | + // tell the user they should continue their migration because it appears to be unfinished... well, assuming there were no errors ?> |
|
91 | 91 | <h3 class="espresso-header"> |
92 | 92 | <span class="dashicons dashicons-star-half ee-icon-size-22"></span> |
93 | 93 | <?php printf( |
94 | - esc_html__( |
|
95 | - "It appears that your previous Database Update (%s) is incomplete, and should be resumed", |
|
96 | - "event_espresso" |
|
97 | - ), |
|
98 | - $most_recent_migration->pretty_name() |
|
99 | - ); ?> |
|
94 | + esc_html__( |
|
95 | + "It appears that your previous Database Update (%s) is incomplete, and should be resumed", |
|
96 | + "event_espresso" |
|
97 | + ), |
|
98 | + $most_recent_migration->pretty_name() |
|
99 | + ); ?> |
|
100 | 100 | </h3> |
101 | 101 | <?php |
102 | - } elseif ($most_recent_migration->is_broken()) { |
|
103 | - // tell the user the migration failed and they should notify EE?> |
|
102 | + } elseif ($most_recent_migration->is_broken()) { |
|
103 | + // tell the user the migration failed and they should notify EE?> |
|
104 | 104 | <h3 class="espresso-header"> |
105 | 105 | <span class="dashicons dashicons-no ee-icon-size-22"></span> |
106 | 106 | <?php echo $most_recent_migration->get_feedback_message() ?> |
107 | 107 | </h3> |
108 | 108 | <?php |
109 | - } |
|
110 | - // display errors or not of the most recent migration ran |
|
111 | - if ($most_recent_migration->get_errors()) { |
|
112 | - ?> |
|
109 | + } |
|
110 | + // display errors or not of the most recent migration ran |
|
111 | + if ($most_recent_migration->get_errors()) { |
|
112 | + ?> |
|
113 | 113 | <div class="ee-attention"> |
114 | 114 | <strong> |
115 | 115 | <?php printf( |
116 | - esc_html__( |
|
117 | - "Warnings occurred during your last Database Update (%s):", |
|
118 | - 'event_espresso' |
|
119 | - ), |
|
120 | - $most_recent_migration->pretty_name() |
|
121 | - ) ?></strong> |
|
116 | + esc_html__( |
|
117 | + "Warnings occurred during your last Database Update (%s):", |
|
118 | + 'event_espresso' |
|
119 | + ), |
|
120 | + $most_recent_migration->pretty_name() |
|
121 | + ) ?></strong> |
|
122 | 122 | <a id="show-hide-migration-warnings" class="display-the-hidden"> |
123 | 123 | <?php esc_html_e( |
124 | - "Show Warnings", |
|
125 | - 'event_espresso' |
|
126 | - ); ?></a> |
|
124 | + "Show Warnings", |
|
125 | + 'event_espresso' |
|
126 | + ); ?></a> |
|
127 | 127 | <ul class="migration-warnings" style="display:none"> |
128 | 128 | <?php foreach ($most_recent_migration->get_errors() as $error) { ?> |
129 | 129 | <li><?php echo htmlentities($error) ?></li> |
@@ -131,31 +131,31 @@ discard block |
||
131 | 131 | </ul> |
132 | 132 | </div> |
133 | 133 | <?php |
134 | - } else { |
|
135 | - // there were no errors during the last migration, just say so?> |
|
134 | + } else { |
|
135 | + // there were no errors during the last migration, just say so?> |
|
136 | 136 | <h2> |
137 | 137 | <?php printf( |
138 | - esc_html__( |
|
139 | - "The last Database Update (%s) ran successfully without errors.", |
|
140 | - "event_espresso" |
|
141 | - ), |
|
142 | - $most_recent_migration->pretty_name() |
|
143 | - ) ?></h2> |
|
138 | + esc_html__( |
|
139 | + "The last Database Update (%s) ran successfully without errors.", |
|
140 | + "event_espresso" |
|
141 | + ), |
|
142 | + $most_recent_migration->pretty_name() |
|
143 | + ) ?></h2> |
|
144 | 144 | <?php |
145 | - } |
|
146 | - } |
|
147 | - } |
|
148 | - // end of: if ( $show_most_recent_migration ) |
|
149 | - ?> |
|
145 | + } |
|
146 | + } |
|
147 | + } |
|
148 | + // end of: if ( $show_most_recent_migration ) |
|
149 | + ?> |
|
150 | 150 | |
151 | 151 | </div> |
152 | 152 | <!--end of #migration-prep--> |
153 | 153 | |
154 | 154 | <?php |
155 | - if ($show_migration_progress) { ?> |
|
155 | + if ($show_migration_progress) { ?> |
|
156 | 156 | <div id='migration-monitor' <?php echo $show_backup_db_text ? "style='display:none'" : '' ?>> |
157 | 157 | <?php |
158 | - if ($show_backup_db_text) { ?> |
|
158 | + if ($show_backup_db_text) { ?> |
|
159 | 159 | <p> |
160 | 160 | <a class="toggle-migration-monitor small-text" style="cursor: pointer;"> |
161 | 161 | <span class="dashicons dashicons-arrow-left-alt2" |
@@ -165,19 +165,19 @@ discard block |
||
165 | 165 | |
166 | 166 | </p> |
167 | 167 | <?php |
168 | - } ?> |
|
168 | + } ?> |
|
169 | 169 | <div id='progress-area'> |
170 | 170 | <h3 class="espresso-header"> |
171 | 171 | <?php |
172 | - echo sprintf( |
|
173 | - _n( |
|
174 | - "The following task needs to be performed:", |
|
175 | - "The following %s tasks need to be performed:", |
|
176 | - count($script_names), |
|
177 | - "event_espresso" |
|
178 | - ), |
|
179 | - count($script_names) |
|
180 | - ); ?> |
|
172 | + echo sprintf( |
|
173 | + _n( |
|
174 | + "The following task needs to be performed:", |
|
175 | + "The following %s tasks need to be performed:", |
|
176 | + count($script_names), |
|
177 | + "event_espresso" |
|
178 | + ), |
|
179 | + count($script_names) |
|
180 | + ); ?> |
|
181 | 181 | </h3> |
182 | 182 | <ul style="list-style: inside;"> |
183 | 183 | <?php foreach ($script_names as $script_name) { ?> |
@@ -188,9 +188,9 @@ discard block |
||
188 | 188 | <?php if (count($script_names) > 1) { ?> |
189 | 189 | <p> |
190 | 190 | <?php esc_html_e( |
191 | - "Please note: after each task is completed you will need to continue the Database Update, or report an error to Event Espresso.", |
|
192 | - "event_espresso" |
|
193 | - ); ?></p> |
|
191 | + "Please note: after each task is completed you will need to continue the Database Update, or report an error to Event Espresso.", |
|
192 | + "event_espresso" |
|
193 | + ); ?></p> |
|
194 | 194 | <?php } ?> |
195 | 195 | |
196 | 196 | <div class="ee-attention"> |
@@ -200,19 +200,19 @@ discard block |
||
200 | 200 | </span> |
201 | 201 | <br/> |
202 | 202 | <?php esc_html_e( |
203 | - "Depending on the number of events and the complexity of the information in your database, this could take a few minutes.", |
|
204 | - "event_espresso" |
|
205 | - ); ?> |
|
203 | + "Depending on the number of events and the complexity of the information in your database, this could take a few minutes.", |
|
204 | + "event_espresso" |
|
205 | + ); ?> |
|
206 | 206 | </p> |
207 | 207 | <p> |
208 | 208 | <?php printf( |
209 | - esc_html__( |
|
210 | - "%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.", |
|
211 | - "event_espresso" |
|
212 | - ), |
|
213 | - '<strong>', |
|
214 | - '</strong>' |
|
215 | - ); ?> |
|
209 | + esc_html__( |
|
210 | + "%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.", |
|
211 | + "event_espresso" |
|
212 | + ), |
|
213 | + '<strong>', |
|
214 | + '</strong>' |
|
215 | + ); ?> |
|
216 | 216 | </p> |
217 | 217 | <p> |
218 | 218 | <?php esc_html_e("Click the button below to begin the migration process.", "event_espresso") ?> |
@@ -228,10 +228,10 @@ discard block |
||
228 | 228 | |
229 | 229 | <button id='start-migration' class='button-primary'> |
230 | 230 | <?php echo $show_continue_current_migration_script ? esc_html__( |
231 | - "Continue Database Update", |
|
232 | - "event_espresso" |
|
233 | - ) |
|
234 | - : esc_html__("Begin Database Update", "event_espresso"); ?> |
|
231 | + "Continue Database Update", |
|
232 | + "event_espresso" |
|
233 | + ) |
|
234 | + : esc_html__("Begin Database Update", "event_espresso"); ?> |
|
235 | 235 | </button> |
236 | 236 | <br class="clear"/> |
237 | 237 | |
@@ -247,14 +247,14 @@ discard block |
||
247 | 247 | </div> |
248 | 248 | |
249 | 249 | <?php |
250 | - } |
|
251 | - if ($show_maintenance_switch) { |
|
252 | - ?> |
|
250 | + } |
|
251 | + if ($show_maintenance_switch) { |
|
252 | + ?> |
|
253 | 253 | <h2><span class="dashicons dashicons-admin-tools"></span> |
254 | 254 | <?php esc_html_e( |
255 | - 'Set Event Espresso Maintenance Mode', |
|
256 | - 'event_espresso' |
|
257 | - ); ?></h2> |
|
255 | + 'Set Event Espresso Maintenance Mode', |
|
256 | + 'event_espresso' |
|
257 | + ); ?></h2> |
|
258 | 258 | <form method='post' action='<?php echo $update_migration_script_page_link ?>'> |
259 | 259 | <div class="ee-table-wrap"> |
260 | 260 | <table> |
@@ -262,20 +262,20 @@ discard block |
||
262 | 262 | <td width="40px" align="center"> |
263 | 263 | <input type="radio" id="maintenance_mode_level_off" name="maintenance_mode_level" |
264 | 264 | value="0" <?php echo EE_Maintenance_Mode::instance()->level() |
265 | - == EE_Maintenance_Mode::level_0_not_in_maintenance |
|
266 | - ? 'checked="checked"' : '' ?>> |
|
265 | + == EE_Maintenance_Mode::level_0_not_in_maintenance |
|
266 | + ? 'checked="checked"' : '' ?>> |
|
267 | 267 | </td> |
268 | 268 | <th align="left"> |
269 | 269 | <label for="maintenance_mode_level_off"> |
270 | 270 | <?php esc_html_e( |
271 | - 'Maintenance Mode OFF', |
|
272 | - 'event_espresso' |
|
273 | - ); ?></label> |
|
271 | + 'Maintenance Mode OFF', |
|
272 | + 'event_espresso' |
|
273 | + ); ?></label> |
|
274 | 274 | <p class='description' style="font-weight: normal;"> |
275 | 275 | <?php esc_html_e( |
276 | - "This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.", |
|
277 | - "event_espresso" |
|
278 | - ); ?> |
|
276 | + "This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.", |
|
277 | + "event_espresso" |
|
278 | + ); ?> |
|
279 | 279 | </p> |
280 | 280 | </th> |
281 | 281 | </tr> |
@@ -283,8 +283,8 @@ discard block |
||
283 | 283 | <td width="40px" align="center"> |
284 | 284 | <input type="radio" id="maintenance_mode_level_on" name="maintenance_mode_level" |
285 | 285 | value="1" <?php echo EE_Maintenance_Mode::instance()->level() |
286 | - == EE_Maintenance_Mode::level_1_frontend_only_maintenance |
|
287 | - ? 'checked="checked"' : '' ?>> |
|
286 | + == EE_Maintenance_Mode::level_1_frontend_only_maintenance |
|
287 | + ? 'checked="checked"' : '' ?>> |
|
288 | 288 | </td> |
289 | 289 | <th align="left"> |
290 | 290 | <label for="maintenance_mode_level_on"> |
@@ -292,9 +292,9 @@ discard block |
||
292 | 292 | </label> |
293 | 293 | <p class='description' style="font-weight: normal;"> |
294 | 294 | <?php esc_html_e( |
295 | - "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.", |
|
296 | - "event_espresso" |
|
297 | - ); ?> |
|
295 | + "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.", |
|
296 | + "event_espresso" |
|
297 | + ); ?> |
|
298 | 298 | </p> |
299 | 299 | </th> |
300 | 300 | </tr> |
@@ -306,6 +306,6 @@ discard block |
||
306 | 306 | </p> |
307 | 307 | </form> |
308 | 308 | <?php |
309 | - } ?> |
|
309 | + } ?> |
|
310 | 310 | |
311 | 311 | </div> |
@@ -4,15 +4,15 @@ |
||
4 | 4 | <h1><?php esc_html_e("You must upgrade your Event Espresso Add-ons before Migrating", "event_espresso"); ?></h1> |
5 | 5 | <p> |
6 | 6 | <?php printf( |
7 | - esc_html__( |
|
8 | - "Please %s visit the plugins page%s and update all Event Espresso addon plugins before updating your database.", |
|
9 | - "event_espresso" |
|
10 | - ), |
|
11 | - "<a href='" . admin_url('/plugins.php') . "'>", |
|
12 | - "</a>" |
|
13 | - ); ?></p> |
|
7 | + esc_html__( |
|
8 | + "Please %s visit the plugins page%s and update all Event Espresso addon plugins before updating your database.", |
|
9 | + "event_espresso" |
|
10 | + ), |
|
11 | + "<a href='" . admin_url('/plugins.php') . "'>", |
|
12 | + "</a>" |
|
13 | + ); ?></p> |
|
14 | 14 | <p> |
15 | 15 | <?php esc_html_e( |
16 | - "You can also deactivate the addons, but all of their data will be lost when your database is migrated", |
|
17 | - "event_espresso" |
|
18 | - ); ?></p> |
|
19 | 16 | \ No newline at end of file |
17 | + "You can also deactivate the addons, but all of their data will be lost when your database is migrated", |
|
18 | + "event_espresso" |
|
19 | + ); ?></p> |
|
20 | 20 | \ No newline at end of file |
@@ -8,7 +8,7 @@ |
||
8 | 8 | "Please %s visit the plugins page%s and update all Event Espresso addon plugins before updating your database.", |
9 | 9 | "event_espresso" |
10 | 10 | ), |
11 | - "<a href='" . admin_url('/plugins.php') . "'>", |
|
11 | + "<a href='".admin_url('/plugins.php')."'>", |
|
12 | 12 | "</a>" |
13 | 13 | ); ?></p> |
14 | 14 | <p> |
@@ -67,7 +67,7 @@ |
||
67 | 67 | <p> |
68 | 68 | <?php printf( |
69 | 69 | esc_html__('...or copy-and-paste the below information to %1$s %2$s %3$s', "event_espresso"), |
70 | - '<a href="mailto:' . EE_SUPPORT_EMAIL . '">', |
|
70 | + '<a href="mailto:'.EE_SUPPORT_EMAIL.'">', |
|
71 | 71 | EE_SUPPORT_EMAIL, |
72 | 72 | "</a>" |
73 | 73 | ); ?></p> |
@@ -3,19 +3,19 @@ discard block |
||
3 | 3 | ?> |
4 | 4 | <h1><?php esc_html_e("Data Migration Error", "event_espresso"); ?></h1> |
5 | 5 | <p class='error'><?php |
6 | - printf( |
|
7 | - esc_html__( |
|
8 | - "Your last Database Update had a %s fatal error and was halted%s.", |
|
9 | - "event_espresso" |
|
10 | - ), |
|
11 | - "<b>", |
|
12 | - "</b>" |
|
13 | - ); ?></p> |
|
6 | + printf( |
|
7 | + esc_html__( |
|
8 | + "Your last Database Update had a %s fatal error and was halted%s.", |
|
9 | + "event_espresso" |
|
10 | + ), |
|
11 | + "<b>", |
|
12 | + "</b>" |
|
13 | + ); ?></p> |
|
14 | 14 | <a id="show-hide-migration-warnings" class="display-the-hidden"><?php |
15 | - esc_html_e( |
|
16 | - "Show Errors", |
|
17 | - 'event_espresso' |
|
18 | - ); ?></a> |
|
15 | + esc_html_e( |
|
16 | + "Show Errors", |
|
17 | + 'event_espresso' |
|
18 | + ); ?></a> |
|
19 | 19 | <ul class="migration-warnings" style="display:none"> |
20 | 20 | <?php foreach ($most_recent_migration->get_errors() as $error) { ?> |
21 | 21 | <li style="overflow-y:auto;max-height:100px"><?php echo esc_html($error) ?></li> |
@@ -23,12 +23,12 @@ discard block |
||
23 | 23 | </ul> |
24 | 24 | <h2> |
25 | 25 | <?php esc_html_e( |
26 | - "Fill out the below form to automatically Send Event Espresso a Crash Report", |
|
27 | - "event_espresso" |
|
28 | - ); ?></h2> |
|
26 | + "Fill out the below form to automatically Send Event Espresso a Crash Report", |
|
27 | + "event_espresso" |
|
28 | + ); ?></h2> |
|
29 | 29 | <form action='<?php echo EE_Admin_Page::add_query_args_and_nonce( |
30 | - array('action' => 'send_migration_crash_report'), |
|
31 | - EE_MAINTENANCE_ADMIN_URL |
|
30 | + array('action' => 'send_migration_crash_report'), |
|
31 | + EE_MAINTENANCE_ADMIN_URL |
|
32 | 32 | ); ?>' method='post'> |
33 | 33 | <table class='widefat'> |
34 | 34 | <tr> |
@@ -39,46 +39,46 @@ discard block |
||
39 | 39 | <tr> |
40 | 40 | <td><label for='from_name'><?php esc_html_e("Your Name", "event_espresso"); ?></label></td> |
41 | 41 | <td><input name='from_name' id='from_name' type='text' style="width:200px" value='<?php |
42 | - printf( |
|
43 | - esc_html__("Admin of %s", "event_espresso"), |
|
44 | - get_bloginfo('name', 'display') |
|
45 | - ); ?>'></td> |
|
42 | + printf( |
|
43 | + esc_html__("Admin of %s", "event_espresso"), |
|
44 | + get_bloginfo('name', 'display') |
|
45 | + ); ?>'></td> |
|
46 | 46 | </tr> |
47 | 47 | <tr> |
48 | 48 | <td><label for='body'><?php esc_html_e("Comments", "event_espresso"); ?></label></td> |
49 | 49 | <td><textarea name="body" id="body" class='system_status_info'> |
50 | 50 | <?php esc_html_e( |
51 | - "Enter any comments about why you think the error may have occurred", |
|
52 | - "event_espresso" |
|
53 | - ); ?></textarea> |
|
51 | + "Enter any comments about why you think the error may have occurred", |
|
52 | + "event_espresso" |
|
53 | + ); ?></textarea> |
|
54 | 54 | <p class='description'> |
55 | 55 | <?php esc_html_e( |
56 | - "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.", |
|
57 | - "event_espresso" |
|
58 | - ); ?></p></td> |
|
56 | + "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.", |
|
57 | + "event_espresso" |
|
58 | + ); ?></p></td> |
|
59 | 59 | </tr> |
60 | 60 | <tr> |
61 | 61 | <td colspan="2"><input type="submit" value="<?php |
62 | - esc_html_e( |
|
63 | - "Mail Crash Report to Event Espresso", |
|
64 | - "event_espresso" |
|
65 | - ); ?>"/></td> |
|
62 | + esc_html_e( |
|
63 | + "Mail Crash Report to Event Espresso", |
|
64 | + "event_espresso" |
|
65 | + ); ?>"/></td> |
|
66 | 66 | </tr> |
67 | 67 | </table> |
68 | 68 | </form> |
69 | 69 | <br> |
70 | 70 | <p> |
71 | 71 | <?php printf( |
72 | - esc_html__('...or copy-and-paste the below information to %1$s %2$s %3$s', "event_espresso"), |
|
73 | - '<a href="mailto:' . EE_SUPPORT_EMAIL . '">', |
|
74 | - EE_SUPPORT_EMAIL, |
|
75 | - "</a>" |
|
76 | - ); ?></p> |
|
72 | + esc_html__('...or copy-and-paste the below information to %1$s %2$s %3$s', "event_espresso"), |
|
73 | + '<a href="mailto:' . EE_SUPPORT_EMAIL . '">', |
|
74 | + EE_SUPPORT_EMAIL, |
|
75 | + "</a>" |
|
76 | + ); ?></p> |
|
77 | 77 | <textarea class="system_status_info"><?php print_r(EEM_System_Status::instance()->get_system_stati()) ?></textarea> |
78 | 78 | <p><?php printf(esc_html__('%1$sNext Step%2$s', 'event_espresso'), "<a href='$next_url'>", "</a>"); ?></p> |
79 | 79 | <p> |
80 | 80 | <?php printf( |
81 | - esc_html__('...or %1$sDON\'T send crash report%2$s.', 'event_espresso'), |
|
82 | - "<a href='$next_url'>", |
|
83 | - "</a>" |
|
84 | - ); ?></p> |
|
81 | + esc_html__('...or %1$sDON\'T send crash report%2$s.', 'event_espresso'), |
|
82 | + "<a href='$next_url'>", |
|
83 | + "</a>" |
|
84 | + ); ?></p> |
@@ -25,38 +25,38 @@ discard block |
||
25 | 25 | <tr> |
26 | 26 | <td> |
27 | 27 | <?php |
28 | - echo apply_filters( |
|
29 | - 'FHEE__ee_migration_page__option_1_main', |
|
30 | - esc_html__( |
|
31 | - 'Before updating your database, you should first create a database backup', |
|
32 | - "event_espresso" |
|
33 | - ), |
|
34 | - $current_db_state, |
|
35 | - $next_db_state |
|
36 | - ); |
|
37 | - ?> |
|
28 | + echo apply_filters( |
|
29 | + 'FHEE__ee_migration_page__option_1_main', |
|
30 | + esc_html__( |
|
31 | + 'Before updating your database, you should first create a database backup', |
|
32 | + "event_espresso" |
|
33 | + ), |
|
34 | + $current_db_state, |
|
35 | + $next_db_state |
|
36 | + ); |
|
37 | + ?> |
|
38 | 38 | <a id="display-migration-details" |
39 | 39 | class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" |
40 | 40 | rel="migration-details"> |
41 | 41 | <?php esc_html_e( |
42 | - 'How Do I Make a Database Backup?', |
|
43 | - "event_espresso" |
|
44 | - ); ?> |
|
42 | + 'How Do I Make a Database Backup?', |
|
43 | + "event_espresso" |
|
44 | + ); ?> |
|
45 | 45 | +</a> |
46 | 46 | </td> |
47 | 47 | <td> |
48 | 48 | <a id="db-backed-up" |
49 | 49 | class="toggle-migration-monitor button-primary"> |
50 | 50 | <?php echo apply_filters( |
51 | - 'FHEE__ee_migration_page__option_1_button_text', |
|
52 | - sprintf( |
|
53 | - esc_html__("My Database Is Backed Up, Continue", "event_espresso"), |
|
54 | - $current_db_state, |
|
55 | - $next_db_state |
|
56 | - ), |
|
57 | - $current_db_state, |
|
58 | - $next_db_state |
|
59 | - ); ?></a> |
|
51 | + 'FHEE__ee_migration_page__option_1_button_text', |
|
52 | + sprintf( |
|
53 | + esc_html__("My Database Is Backed Up, Continue", "event_espresso"), |
|
54 | + $current_db_state, |
|
55 | + $next_db_state |
|
56 | + ), |
|
57 | + $current_db_state, |
|
58 | + $next_db_state |
|
59 | + ); ?></a> |
|
60 | 60 | </td> |
61 | 61 | </tr> |
62 | 62 | <tr> |
@@ -64,16 +64,16 @@ discard block |
||
64 | 64 | <div id="migration-details-dv" style="display: none; padding: 1em;"> |
65 | 65 | <p> |
66 | 66 | <?php |
67 | - printf( |
|
68 | - esc_html__( |
|
69 | - '%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', |
|
70 | - "event_espresso" |
|
71 | - ), |
|
72 | - '<a target="_blank" href="http://eventespresso.com/wiki/how-to-back-up-your-site/">', |
|
73 | - "</a>", |
|
74 | - "<a target=\"_blank\" href='http://eventespresso.com/product/priority-support-tokens/'>" |
|
75 | - ); |
|
76 | - ?> |
|
67 | + printf( |
|
68 | + esc_html__( |
|
69 | + '%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', |
|
70 | + "event_espresso" |
|
71 | + ), |
|
72 | + '<a target="_blank" href="http://eventespresso.com/wiki/how-to-back-up-your-site/">', |
|
73 | + "</a>", |
|
74 | + "<a target=\"_blank\" href='http://eventespresso.com/product/priority-support-tokens/'>" |
|
75 | + ); |
|
76 | + ?> |
|
77 | 77 | </p> |
78 | 78 | <?php do_action('AHEE__ee_migration_page__option_1_extra_details'); ?> |
79 | 79 | </div> |
@@ -84,12 +84,12 @@ discard block |
||
84 | 84 | </div> |
85 | 85 | <p> |
86 | 86 | <?php esc_html_e( |
87 | - 'Don\'t want to keep your old Event Espresso data? Alternatively, you can delete it all and start fresh.', |
|
88 | - 'event_espresso' |
|
89 | - ); ?> <a |
|
87 | + 'Don\'t want to keep your old Event Espresso data? Alternatively, you can delete it all and start fresh.', |
|
88 | + 'event_espresso' |
|
89 | + ); ?> <a |
|
90 | 90 | href="<?php echo $data_reset_page; ?>"><?php esc_html_e( |
91 | - 'Visit the Maintenance Page and Reset Your Event Espresso Data', |
|
92 | - 'event_espresso' |
|
93 | - ); ?></a></p> |
|
91 | + 'Visit the Maintenance Page and Reset Your Event Espresso Data', |
|
92 | + 'event_espresso' |
|
93 | + ); ?></a></p> |
|
94 | 94 | <?php do_action('AHEE__ee_migration_page__after_migration_options_table'); ?> |
95 | 95 | </div> |
96 | 96 | \ No newline at end of file |
@@ -27,9 +27,9 @@ discard block |
||
27 | 27 | <?php esc_html_e("Migration Options", "event_espresso"); ?> |
28 | 28 | <span class="tiny-text lt-grey-text"> |
29 | 29 | <?php esc_html_e( |
30 | - ' to migrate or not to migrate?', |
|
31 | - "event_espresso" |
|
32 | - ); ?></span> |
|
30 | + ' to migrate or not to migrate?', |
|
31 | + "event_espresso" |
|
32 | + ); ?></span> |
|
33 | 33 | </h2> |
34 | 34 | <div class="ee-table-wrap"> |
35 | 35 | <table> |
@@ -38,26 +38,26 @@ discard block |
||
38 | 38 | <td><h3><?php esc_html_e('1', 'event_espresso'); ?></h3></td> |
39 | 39 | <td> |
40 | 40 | <?php |
41 | - echo apply_filters( |
|
42 | - 'FHEE__ee_migration_page__option_1_main', |
|
43 | - sprintf( |
|
44 | - esc_html__( |
|
45 | - '%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.', |
|
46 | - "event_espresso" |
|
47 | - ), |
|
48 | - '<strong>', |
|
49 | - '</strong>', |
|
50 | - '<a id="migration-risks" class="" title="' |
|
51 | - . esc_attr__('click for more details', "event_espresso") |
|
52 | - . '">', |
|
53 | - '</a>', |
|
54 | - $current_db_state, |
|
55 | - $next_db_state |
|
56 | - ), |
|
57 | - $current_db_state, |
|
58 | - $next_db_state |
|
59 | - ); |
|
60 | - ?> |
|
41 | + echo apply_filters( |
|
42 | + 'FHEE__ee_migration_page__option_1_main', |
|
43 | + sprintf( |
|
44 | + esc_html__( |
|
45 | + '%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.', |
|
46 | + "event_espresso" |
|
47 | + ), |
|
48 | + '<strong>', |
|
49 | + '</strong>', |
|
50 | + '<a id="migration-risks" class="" title="' |
|
51 | + . esc_attr__('click for more details', "event_espresso") |
|
52 | + . '">', |
|
53 | + '</a>', |
|
54 | + $current_db_state, |
|
55 | + $next_db_state |
|
56 | + ), |
|
57 | + $current_db_state, |
|
58 | + $next_db_state |
|
59 | + ); |
|
60 | + ?> |
|
61 | 61 | <a id="display-migration-details" |
62 | 62 | class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" |
63 | 63 | rel="migration-details"><?php esc_html_e('click for more details', "event_espresso"); ?> |
@@ -67,26 +67,26 @@ discard block |
||
67 | 67 | rel="migration-details" |
68 | 68 | style="display:none;"> |
69 | 69 | <?php echo sprintf( |
70 | - esc_html__( |
|
71 | - 'hide%1$sdetails%1$s-', |
|
72 | - 'event_espresso' |
|
73 | - ), |
|
74 | - ' ' |
|
75 | - ); ?></a> |
|
70 | + esc_html__( |
|
71 | + 'hide%1$sdetails%1$s-', |
|
72 | + 'event_espresso' |
|
73 | + ), |
|
74 | + ' ' |
|
75 | + ); ?></a> |
|
76 | 76 | </td> |
77 | 77 | <td> |
78 | 78 | <a id="db-backed-up" |
79 | 79 | class="toggle-migration-monitor button-primary"> |
80 | 80 | <?php echo apply_filters( |
81 | - 'FHEE__ee_migration_page__option_1_button_text', |
|
82 | - sprintf( |
|
83 | - esc_html__("Migrate My %s Data to %s", "event_espresso"), |
|
84 | - $current_db_state, |
|
85 | - $next_db_state |
|
86 | - ), |
|
87 | - $current_db_state, |
|
88 | - $next_db_state |
|
89 | - ); ?></a> |
|
81 | + 'FHEE__ee_migration_page__option_1_button_text', |
|
82 | + sprintf( |
|
83 | + esc_html__("Migrate My %s Data to %s", "event_espresso"), |
|
84 | + $current_db_state, |
|
85 | + $next_db_state |
|
86 | + ), |
|
87 | + $current_db_state, |
|
88 | + $next_db_state |
|
89 | + ); ?></a> |
|
90 | 90 | </td> |
91 | 91 | </tr> |
92 | 92 | <tr> |
@@ -94,34 +94,34 @@ discard block |
||
94 | 94 | <div id="migration-details-dv" style="display: none; padding: 1em;"> |
95 | 95 | <span class="reminder-spn"> |
96 | 96 | <?php printf( |
97 | - esc_html__( |
|
98 | - "%s Important: %s Before migrating, please back up your database and files.", |
|
99 | - "event_espresso" |
|
100 | - ), |
|
101 | - "<b>", |
|
102 | - "</b>" |
|
103 | - ); ?></span> |
|
97 | + esc_html__( |
|
98 | + "%s Important: %s Before migrating, please back up your database and files.", |
|
99 | + "event_espresso" |
|
100 | + ), |
|
101 | + "<b>", |
|
102 | + "</b>" |
|
103 | + ); ?></span> |
|
104 | 104 | <p> |
105 | 105 | <?php |
106 | - printf( |
|
107 | - esc_html__( |
|
108 | - '%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.', |
|
109 | - "event_espresso" |
|
110 | - ), |
|
111 | - '<b>', |
|
112 | - '</b>', |
|
113 | - "<a href='http://codex.wordpress.org/Backing_Up_Your_Database'>", |
|
114 | - "<a href='" |
|
115 | - . admin_url( |
|
116 | - 'plugin-install.php?tab=search&type=term&s=database+backup&plugin-search-input=Search+Plugins' |
|
117 | - ) |
|
118 | - . "'>", |
|
119 | - "<a href='http://eventespresso.com/product/priority-support-tokens/'>", |
|
120 | - '<a href="http://eventespresso.com/wiki/how-to-back-up-your-site/">', |
|
121 | - "</a>", |
|
122 | - '<br/>' |
|
123 | - ); |
|
124 | - ?> |
|
106 | + printf( |
|
107 | + esc_html__( |
|
108 | + '%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.', |
|
109 | + "event_espresso" |
|
110 | + ), |
|
111 | + '<b>', |
|
112 | + '</b>', |
|
113 | + "<a href='http://codex.wordpress.org/Backing_Up_Your_Database'>", |
|
114 | + "<a href='" |
|
115 | + . admin_url( |
|
116 | + 'plugin-install.php?tab=search&type=term&s=database+backup&plugin-search-input=Search+Plugins' |
|
117 | + ) |
|
118 | + . "'>", |
|
119 | + "<a href='http://eventespresso.com/product/priority-support-tokens/'>", |
|
120 | + '<a href="http://eventespresso.com/wiki/how-to-back-up-your-site/">', |
|
121 | + "</a>", |
|
122 | + '<br/>' |
|
123 | + ); |
|
124 | + ?> |
|
125 | 125 | </p> |
126 | 126 | <?php do_action('AHEE__ee_migration_page__option_1_extra_details'); ?> |
127 | 127 | </div> |
@@ -131,25 +131,25 @@ discard block |
||
131 | 131 | <td><h3><?php esc_html_e('2', 'event_espresso'); ?></h3></td> |
132 | 132 | <td> |
133 | 133 | <?php echo apply_filters( |
134 | - 'FHEE__ee_migration_page__option_2_main', |
|
135 | - sprintf( |
|
136 | - esc_html__( |
|
137 | - '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.', |
|
138 | - "event_espresso" |
|
139 | - ), |
|
140 | - $current_db_state, |
|
141 | - $next_db_state, |
|
142 | - $ultimate_db_state |
|
143 | - ), |
|
144 | - $current_db_state, |
|
145 | - $next_db_state, |
|
146 | - $ultimate_db_state |
|
147 | - ); ?><br/> |
|
134 | + 'FHEE__ee_migration_page__option_2_main', |
|
135 | + sprintf( |
|
136 | + esc_html__( |
|
137 | + '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.', |
|
138 | + "event_espresso" |
|
139 | + ), |
|
140 | + $current_db_state, |
|
141 | + $next_db_state, |
|
142 | + $ultimate_db_state |
|
143 | + ), |
|
144 | + $current_db_state, |
|
145 | + $next_db_state, |
|
146 | + $ultimate_db_state |
|
147 | + ); ?><br/> |
|
148 | 148 | <span class="reminder-spn"> |
149 | 149 | <?php esc_html_e( |
150 | - '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.', |
|
151 | - 'event_espresso' |
|
152 | - ); ?></span> |
|
150 | + '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.', |
|
151 | + 'event_espresso' |
|
152 | + ); ?></span> |
|
153 | 153 | <a id="display-no-migration-details" |
154 | 154 | class="display-the-hidden lt-grey-text smaller-text hide-if-no-js" |
155 | 155 | rel="no-migration-details"><?php esc_html_e('click for more details', "event_espresso"); ?> |
@@ -159,24 +159,24 @@ discard block |
||
159 | 159 | rel="no-migration-details" |
160 | 160 | style="display:none;"> |
161 | 161 | <?php echo sprintf( |
162 | - esc_html__( |
|
163 | - 'hide%1$sdetails%1$s-', |
|
164 | - 'event_espresso' |
|
165 | - ), |
|
166 | - ' ' |
|
167 | - ); ?></a> |
|
162 | + esc_html__( |
|
163 | + 'hide%1$sdetails%1$s-', |
|
164 | + 'event_espresso' |
|
165 | + ), |
|
166 | + ' ' |
|
167 | + ); ?></a> |
|
168 | 168 | </td> |
169 | 169 | <td> |
170 | 170 | <a id="do-not-migrate" class="do-not-migrate button-primary" |
171 | 171 | href="<?php echo $reset_db_page_link; ?>"> |
172 | 172 | <?php echo apply_filters( |
173 | - 'FHEE__ee_migration_page__option_2_button_text', |
|
174 | - sprintf( |
|
175 | - esc_html__("Just Start %s and Delete Existing Data", "event_espresso"), |
|
176 | - $ultimate_db_state |
|
177 | - ), |
|
178 | - $ultimate_db_state |
|
179 | - ); ?></a> |
|
173 | + 'FHEE__ee_migration_page__option_2_button_text', |
|
174 | + sprintf( |
|
175 | + esc_html__("Just Start %s and Delete Existing Data", "event_espresso"), |
|
176 | + $ultimate_db_state |
|
177 | + ), |
|
178 | + $ultimate_db_state |
|
179 | + ); ?></a> |
|
180 | 180 | </td> |
181 | 181 | </tr> |
182 | 182 | <tr> |
@@ -184,16 +184,16 @@ discard block |
||
184 | 184 | <div id="no-migration-details-dv" style="display: none; padding: 1em;"> |
185 | 185 | <p> |
186 | 186 | <?php echo apply_filters( |
187 | - 'FHEE__ee_migration_page__option_2_details', |
|
188 | - sprintf( |
|
189 | - esc_html__( |
|
190 | - "If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.", |
|
191 | - "event_espresso" |
|
192 | - ), |
|
193 | - $ultimate_db_state |
|
194 | - ), |
|
195 | - $ultimate_db_state |
|
196 | - ); ?> |
|
187 | + 'FHEE__ee_migration_page__option_2_details', |
|
188 | + sprintf( |
|
189 | + esc_html__( |
|
190 | + "If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.", |
|
191 | + "event_espresso" |
|
192 | + ), |
|
193 | + $ultimate_db_state |
|
194 | + ), |
|
195 | + $ultimate_db_state |
|
196 | + ); ?> |
|
197 | 197 | </p> |
198 | 198 | </div> |
199 | 199 | </td> |
@@ -12,19 +12,19 @@ discard block |
||
12 | 12 | */ |
13 | 13 | function ee_recurse_into_array_for_display($data) |
14 | 14 | { |
15 | - if (is_object($data) |
|
16 | - || $data instanceof __PHP_Incomplete_Class |
|
17 | - ) {// is_object($incomplete_class) actually returns false, hence why we check for it |
|
18 | - $data = json_decode(json_encode($data), true); |
|
19 | - } |
|
20 | - if (is_array($data)) { |
|
21 | - if (EEH_Array::is_associative_array($data)) { |
|
22 | - ?> |
|
15 | + if (is_object($data) |
|
16 | + || $data instanceof __PHP_Incomplete_Class |
|
17 | + ) {// is_object($incomplete_class) actually returns false, hence why we check for it |
|
18 | + $data = json_decode(json_encode($data), true); |
|
19 | + } |
|
20 | + if (is_array($data)) { |
|
21 | + if (EEH_Array::is_associative_array($data)) { |
|
22 | + ?> |
|
23 | 23 | <table class="widefat"> |
24 | 24 | <tbody> |
25 | 25 | <?php |
26 | - foreach ($data as $data_key => $data_values) { |
|
27 | - ?> |
|
26 | + foreach ($data as $data_key => $data_values) { |
|
27 | + ?> |
|
28 | 28 | <tr> |
29 | 29 | <td> |
30 | 30 | <?php echo $data_key; ?> |
@@ -34,26 +34,26 @@ discard block |
||
34 | 34 | </td> |
35 | 35 | </tr> |
36 | 36 | <?php |
37 | - } ?> |
|
37 | + } ?> |
|
38 | 38 | </tbody> |
39 | 39 | </table> |
40 | 40 | <?php |
41 | - } else { |
|
42 | - ?> |
|
41 | + } else { |
|
42 | + ?> |
|
43 | 43 | <ul> |
44 | 44 | <?php |
45 | - foreach ($data as $datum) { |
|
46 | - echo "<li>"; |
|
47 | - ee_recurse_into_array_for_display($datum); |
|
48 | - echo "</li>"; |
|
49 | - } ?> |
|
45 | + foreach ($data as $datum) { |
|
46 | + echo "<li>"; |
|
47 | + ee_recurse_into_array_for_display($datum); |
|
48 | + echo "</li>"; |
|
49 | + } ?> |
|
50 | 50 | </ul> |
51 | 51 | <?php |
52 | - } |
|
53 | - } else { |
|
54 | - // simple value |
|
55 | - echo $data; |
|
56 | - } |
|
52 | + } |
|
53 | + } else { |
|
54 | + // simple value |
|
55 | + echo $data; |
|
56 | + } |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | ?> |
@@ -61,19 +61,19 @@ discard block |
||
61 | 61 | <?php _e("System Information", "event_espresso"); ?> <a href="<?php echo $download_system_status_url; ?>" |
62 | 62 | class="button-secondary"> |
63 | 63 | <?php esc_html_e( |
64 | - 'Download to File', |
|
65 | - 'event_espresso' |
|
66 | - ); ?></a> |
|
64 | + 'Download to File', |
|
65 | + 'event_espresso' |
|
66 | + ); ?></a> |
|
67 | 67 | </h1> |
68 | 68 | <div class="padding"> |
69 | 69 | |
70 | 70 | <table class="widefat"> |
71 | 71 | <?php |
72 | - foreach ($system_stati as $status_category_slug => $data) { |
|
73 | - if (is_object($data)) { |
|
74 | - $data = json_decode(json_encode($data), true); |
|
75 | - } |
|
76 | - ?> |
|
72 | + foreach ($system_stati as $status_category_slug => $data) { |
|
73 | + if (is_object($data)) { |
|
74 | + $data = json_decode(json_encode($data), true); |
|
75 | + } |
|
76 | + ?> |
|
77 | 77 | <thead> |
78 | 78 | <tr> |
79 | 79 | <th colspan=2> |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | </thead> |
84 | 84 | <tbody> |
85 | 85 | <?php |
86 | - if (is_array($data)) { |
|
87 | - foreach ($data as $data_key => $data_values) { |
|
88 | - ?> |
|
86 | + if (is_array($data)) { |
|
87 | + foreach ($data as $data_key => $data_values) { |
|
88 | + ?> |
|
89 | 89 | <tr> |
90 | 90 | <td> |
91 | 91 | <?php echo $data_key ?> |
@@ -95,11 +95,11 @@ discard block |
||
95 | 95 | </td> |
96 | 96 | </tr> |
97 | 97 | <?php |
98 | - } ?> |
|
98 | + } ?> |
|
99 | 99 | </tbody> |
100 | 100 | <?php |
101 | - } else { |
|
102 | - ?> |
|
101 | + } else { |
|
102 | + ?> |
|
103 | 103 | <tbody> |
104 | 104 | <tr> |
105 | 105 | <td colspan=2> |
@@ -108,9 +108,9 @@ discard block |
||
108 | 108 | </tr> |
109 | 109 | </tbody> |
110 | 110 | <?php |
111 | - } |
|
112 | - } |
|
113 | - ?> |
|
111 | + } |
|
112 | + } |
|
113 | + ?> |
|
114 | 114 | </table> |
115 | 115 | |
116 | 116 | </div> |
117 | 117 | \ No newline at end of file |
@@ -15,80 +15,80 @@ |
||
15 | 15 | { |
16 | 16 | |
17 | 17 | |
18 | - protected function _set_tips_array() |
|
19 | - { |
|
20 | - $this->_qtipsa = array( |
|
21 | - 0 => array( |
|
22 | - 'content_id' => 'payment-status-' . EEM_Payment::status_id_approved, |
|
23 | - 'target' => '.pymt-status-' . EEM_Payment::status_id_approved, |
|
24 | - 'content' => $this->_payment_status_legend(EEM_Payment::status_id_approved), |
|
25 | - 'options' => array( |
|
26 | - 'position' => array( |
|
27 | - 'target' => 'mouse', |
|
28 | - ), |
|
29 | - ), |
|
30 | - ), |
|
31 | - 1 => array( |
|
32 | - 'content_id' => 'payment-status-' . EEM_Payment::status_id_pending, |
|
33 | - 'target' => '.pymt-status-' . EEM_Payment::status_id_pending, |
|
34 | - 'content' => $this->_payment_status_legend(EEM_Payment::status_id_pending), |
|
35 | - 'options' => array( |
|
36 | - 'position' => array( |
|
37 | - 'target' => 'mouse', |
|
38 | - ), |
|
39 | - ), |
|
40 | - ), |
|
41 | - 2 => array( |
|
42 | - 'content_id' => 'payment-status-' . EEM_Payment::status_id_cancelled, |
|
43 | - 'target' => '.pymt-status-' . EEM_Payment::status_id_cancelled, |
|
44 | - 'content' => $this->_payment_status_legend(EEM_Payment::status_id_cancelled), |
|
45 | - 'options' => array( |
|
46 | - 'position' => array( |
|
47 | - 'target' => 'mouse', |
|
48 | - ), |
|
49 | - ), |
|
50 | - ), |
|
51 | - 3 => array( |
|
52 | - 'content_id' => 'payment-status-' . EEM_Payment::status_id_declined, |
|
53 | - 'target' => '.pymt-status-' . EEM_Payment::status_id_declined, |
|
54 | - 'content' => $this->_payment_status_legend(EEM_Payment::status_id_declined), |
|
55 | - 'options' => array( |
|
56 | - 'position' => array( |
|
57 | - 'target' => 'mouse', |
|
58 | - ), |
|
59 | - ), |
|
60 | - ), |
|
61 | - 4 => array( |
|
62 | - 'content_id' => 'payment-status-' . EEM_Payment::status_id_failed, |
|
63 | - 'target' => '.pymt-status-' . EEM_Payment::status_id_failed, |
|
64 | - 'content' => $this->_payment_status_legend(EEM_Payment::status_id_failed), |
|
65 | - 'options' => array( |
|
66 | - 'position' => array( |
|
67 | - 'target' => 'mouse', |
|
68 | - ), |
|
69 | - ), |
|
70 | - ), |
|
71 | - ); |
|
72 | - } |
|
18 | + protected function _set_tips_array() |
|
19 | + { |
|
20 | + $this->_qtipsa = array( |
|
21 | + 0 => array( |
|
22 | + 'content_id' => 'payment-status-' . EEM_Payment::status_id_approved, |
|
23 | + 'target' => '.pymt-status-' . EEM_Payment::status_id_approved, |
|
24 | + 'content' => $this->_payment_status_legend(EEM_Payment::status_id_approved), |
|
25 | + 'options' => array( |
|
26 | + 'position' => array( |
|
27 | + 'target' => 'mouse', |
|
28 | + ), |
|
29 | + ), |
|
30 | + ), |
|
31 | + 1 => array( |
|
32 | + 'content_id' => 'payment-status-' . EEM_Payment::status_id_pending, |
|
33 | + 'target' => '.pymt-status-' . EEM_Payment::status_id_pending, |
|
34 | + 'content' => $this->_payment_status_legend(EEM_Payment::status_id_pending), |
|
35 | + 'options' => array( |
|
36 | + 'position' => array( |
|
37 | + 'target' => 'mouse', |
|
38 | + ), |
|
39 | + ), |
|
40 | + ), |
|
41 | + 2 => array( |
|
42 | + 'content_id' => 'payment-status-' . EEM_Payment::status_id_cancelled, |
|
43 | + 'target' => '.pymt-status-' . EEM_Payment::status_id_cancelled, |
|
44 | + 'content' => $this->_payment_status_legend(EEM_Payment::status_id_cancelled), |
|
45 | + 'options' => array( |
|
46 | + 'position' => array( |
|
47 | + 'target' => 'mouse', |
|
48 | + ), |
|
49 | + ), |
|
50 | + ), |
|
51 | + 3 => array( |
|
52 | + 'content_id' => 'payment-status-' . EEM_Payment::status_id_declined, |
|
53 | + 'target' => '.pymt-status-' . EEM_Payment::status_id_declined, |
|
54 | + 'content' => $this->_payment_status_legend(EEM_Payment::status_id_declined), |
|
55 | + 'options' => array( |
|
56 | + 'position' => array( |
|
57 | + 'target' => 'mouse', |
|
58 | + ), |
|
59 | + ), |
|
60 | + ), |
|
61 | + 4 => array( |
|
62 | + 'content_id' => 'payment-status-' . EEM_Payment::status_id_failed, |
|
63 | + 'target' => '.pymt-status-' . EEM_Payment::status_id_failed, |
|
64 | + 'content' => $this->_payment_status_legend(EEM_Payment::status_id_failed), |
|
65 | + 'options' => array( |
|
66 | + 'position' => array( |
|
67 | + 'target' => 'mouse', |
|
68 | + ), |
|
69 | + ), |
|
70 | + ), |
|
71 | + ); |
|
72 | + } |
|
73 | 73 | |
74 | 74 | |
75 | - /** |
|
76 | - * output the relevant ee-status-legend with the designated status highlighted. |
|
77 | - * |
|
78 | - * @param EEM_Payment constant $status What status is set (by class) |
|
79 | - * @return string The status legend with the related status highlighted |
|
80 | - */ |
|
81 | - private function _payment_status_legend($status) |
|
82 | - { |
|
75 | + /** |
|
76 | + * output the relevant ee-status-legend with the designated status highlighted. |
|
77 | + * |
|
78 | + * @param EEM_Payment constant $status What status is set (by class) |
|
79 | + * @return string The status legend with the related status highlighted |
|
80 | + */ |
|
81 | + private function _payment_status_legend($status) |
|
82 | + { |
|
83 | 83 | |
84 | - $status_array = array( |
|
85 | - 'approved' => EEM_Payment::status_id_approved, |
|
86 | - 'pending' => EEM_Payment::status_id_pending, |
|
87 | - 'cancelled' => EEM_Payment::status_id_cancelled, |
|
88 | - 'declined' => EEM_Payment::status_id_declined, |
|
89 | - 'failed' => EEM_Payment::status_id_failed, |
|
90 | - ); |
|
84 | + $status_array = array( |
|
85 | + 'approved' => EEM_Payment::status_id_approved, |
|
86 | + 'pending' => EEM_Payment::status_id_pending, |
|
87 | + 'cancelled' => EEM_Payment::status_id_cancelled, |
|
88 | + 'declined' => EEM_Payment::status_id_declined, |
|
89 | + 'failed' => EEM_Payment::status_id_failed, |
|
90 | + ); |
|
91 | 91 | |
92 | - return EEH_Template::status_legend($status_array, $status); |
|
93 | - } |
|
92 | + return EEH_Template::status_legend($status_array, $status); |
|
93 | + } |
|
94 | 94 | } |
@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | { |
20 | 20 | $this->_qtipsa = array( |
21 | 21 | 0 => array( |
22 | - 'content_id' => 'payment-status-' . EEM_Payment::status_id_approved, |
|
23 | - 'target' => '.pymt-status-' . EEM_Payment::status_id_approved, |
|
22 | + 'content_id' => 'payment-status-'.EEM_Payment::status_id_approved, |
|
23 | + 'target' => '.pymt-status-'.EEM_Payment::status_id_approved, |
|
24 | 24 | 'content' => $this->_payment_status_legend(EEM_Payment::status_id_approved), |
25 | 25 | 'options' => array( |
26 | 26 | 'position' => array( |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | ), |
30 | 30 | ), |
31 | 31 | 1 => array( |
32 | - 'content_id' => 'payment-status-' . EEM_Payment::status_id_pending, |
|
33 | - 'target' => '.pymt-status-' . EEM_Payment::status_id_pending, |
|
32 | + 'content_id' => 'payment-status-'.EEM_Payment::status_id_pending, |
|
33 | + 'target' => '.pymt-status-'.EEM_Payment::status_id_pending, |
|
34 | 34 | 'content' => $this->_payment_status_legend(EEM_Payment::status_id_pending), |
35 | 35 | 'options' => array( |
36 | 36 | 'position' => array( |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | ), |
40 | 40 | ), |
41 | 41 | 2 => array( |
42 | - 'content_id' => 'payment-status-' . EEM_Payment::status_id_cancelled, |
|
43 | - 'target' => '.pymt-status-' . EEM_Payment::status_id_cancelled, |
|
42 | + 'content_id' => 'payment-status-'.EEM_Payment::status_id_cancelled, |
|
43 | + 'target' => '.pymt-status-'.EEM_Payment::status_id_cancelled, |
|
44 | 44 | 'content' => $this->_payment_status_legend(EEM_Payment::status_id_cancelled), |
45 | 45 | 'options' => array( |
46 | 46 | 'position' => array( |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | ), |
50 | 50 | ), |
51 | 51 | 3 => array( |
52 | - 'content_id' => 'payment-status-' . EEM_Payment::status_id_declined, |
|
53 | - 'target' => '.pymt-status-' . EEM_Payment::status_id_declined, |
|
52 | + 'content_id' => 'payment-status-'.EEM_Payment::status_id_declined, |
|
53 | + 'target' => '.pymt-status-'.EEM_Payment::status_id_declined, |
|
54 | 54 | 'content' => $this->_payment_status_legend(EEM_Payment::status_id_declined), |
55 | 55 | 'options' => array( |
56 | 56 | 'position' => array( |
@@ -59,8 +59,8 @@ discard block |
||
59 | 59 | ), |
60 | 60 | ), |
61 | 61 | 4 => array( |
62 | - 'content_id' => 'payment-status-' . EEM_Payment::status_id_failed, |
|
63 | - 'target' => '.pymt-status-' . EEM_Payment::status_id_failed, |
|
62 | + 'content_id' => 'payment-status-'.EEM_Payment::status_id_failed, |
|
63 | + 'target' => '.pymt-status-'.EEM_Payment::status_id_failed, |
|
64 | 64 | 'content' => $this->_payment_status_legend(EEM_Payment::status_id_failed), |
65 | 65 | 'options' => array( |
66 | 66 | 'position' => array( |
@@ -15,69 +15,69 @@ |
||
15 | 15 | { |
16 | 16 | |
17 | 17 | |
18 | - protected function _set_tips_array() |
|
19 | - { |
|
20 | - $this->_qtipsa = array( |
|
21 | - // 0 => array( |
|
22 | - // 'content_id' => 'transaction-status-' . EEM_Transaction::overpaid_status_code, |
|
23 | - // 'target' => '.txn-status-' . EEM_Transaction::overpaid_status_code, |
|
24 | - // 'content' => $this->_transaction_status_legend(EEM_Transaction::overpaid_status_code), |
|
25 | - // 'options' => array( |
|
26 | - // 'position' => array( |
|
27 | - // 'target' => 'mouse', |
|
28 | - // ), |
|
29 | - // ), |
|
30 | - // ), |
|
31 | - // 1 => array( |
|
32 | - // 'content_id' => 'transaction-status-' . EEM_Transaction::complete_status_code, |
|
33 | - // 'target' => '.txn-status-' . EEM_Transaction::complete_status_code, |
|
34 | - // 'content' => $this->_transaction_status_legend(EEM_Transaction::complete_status_code), |
|
35 | - // 'options' => array( |
|
36 | - // 'position' => array( |
|
37 | - // 'target' => 'mouse', |
|
38 | - // ), |
|
39 | - // ), |
|
40 | - // ), |
|
41 | - // 2 => array( |
|
42 | - // 'content_id' => 'transaction-status-' . EEM_Transaction::incomplete_status_code, |
|
43 | - // 'target' => '.txn-status-' . EEM_Transaction::incomplete_status_code, |
|
44 | - // 'content' => $this->_transaction_status_legend(EEM_Transaction::incomplete_status_code), |
|
45 | - // 'options' => array( |
|
46 | - // 'position' => array( |
|
47 | - // 'target' => 'mouse', |
|
48 | - // ), |
|
49 | - // ), |
|
50 | - // ), |
|
51 | - // 3 => array( |
|
52 | - // 'content_id' => 'transaction-status-' . EEM_Transaction::failed_status_code, |
|
53 | - // 'target' => '.txn-status-' . EEM_Transaction::failed_status_code, |
|
54 | - // 'content' => $this->_transaction_status_legend(EEM_Transaction::failed_status_code), |
|
55 | - // 'options' => array( |
|
56 | - // 'position' => array( |
|
57 | - // 'target' => 'mouse', |
|
58 | - // ), |
|
59 | - // ), |
|
60 | - // ) |
|
61 | - ); |
|
62 | - } |
|
18 | + protected function _set_tips_array() |
|
19 | + { |
|
20 | + $this->_qtipsa = array( |
|
21 | + // 0 => array( |
|
22 | + // 'content_id' => 'transaction-status-' . EEM_Transaction::overpaid_status_code, |
|
23 | + // 'target' => '.txn-status-' . EEM_Transaction::overpaid_status_code, |
|
24 | + // 'content' => $this->_transaction_status_legend(EEM_Transaction::overpaid_status_code), |
|
25 | + // 'options' => array( |
|
26 | + // 'position' => array( |
|
27 | + // 'target' => 'mouse', |
|
28 | + // ), |
|
29 | + // ), |
|
30 | + // ), |
|
31 | + // 1 => array( |
|
32 | + // 'content_id' => 'transaction-status-' . EEM_Transaction::complete_status_code, |
|
33 | + // 'target' => '.txn-status-' . EEM_Transaction::complete_status_code, |
|
34 | + // 'content' => $this->_transaction_status_legend(EEM_Transaction::complete_status_code), |
|
35 | + // 'options' => array( |
|
36 | + // 'position' => array( |
|
37 | + // 'target' => 'mouse', |
|
38 | + // ), |
|
39 | + // ), |
|
40 | + // ), |
|
41 | + // 2 => array( |
|
42 | + // 'content_id' => 'transaction-status-' . EEM_Transaction::incomplete_status_code, |
|
43 | + // 'target' => '.txn-status-' . EEM_Transaction::incomplete_status_code, |
|
44 | + // 'content' => $this->_transaction_status_legend(EEM_Transaction::incomplete_status_code), |
|
45 | + // 'options' => array( |
|
46 | + // 'position' => array( |
|
47 | + // 'target' => 'mouse', |
|
48 | + // ), |
|
49 | + // ), |
|
50 | + // ), |
|
51 | + // 3 => array( |
|
52 | + // 'content_id' => 'transaction-status-' . EEM_Transaction::failed_status_code, |
|
53 | + // 'target' => '.txn-status-' . EEM_Transaction::failed_status_code, |
|
54 | + // 'content' => $this->_transaction_status_legend(EEM_Transaction::failed_status_code), |
|
55 | + // 'options' => array( |
|
56 | + // 'position' => array( |
|
57 | + // 'target' => 'mouse', |
|
58 | + // ), |
|
59 | + // ), |
|
60 | + // ) |
|
61 | + ); |
|
62 | + } |
|
63 | 63 | |
64 | 64 | |
65 | - /** |
|
66 | - * output the relevant ee-status-legend with the designated status highlighted. |
|
67 | - * |
|
68 | - * @param EEM_Transaction constant $status What status is set (by class) |
|
69 | - * @return string The status legend with the related status highlighted |
|
70 | - */ |
|
71 | - private function _transaction_status_legend($status) |
|
72 | - { |
|
65 | + /** |
|
66 | + * output the relevant ee-status-legend with the designated status highlighted. |
|
67 | + * |
|
68 | + * @param EEM_Transaction constant $status What status is set (by class) |
|
69 | + * @return string The status legend with the related status highlighted |
|
70 | + */ |
|
71 | + private function _transaction_status_legend($status) |
|
72 | + { |
|
73 | 73 | |
74 | - $status_array = array( |
|
75 | - 'overpaid' => EEM_Transaction::overpaid_status_code, |
|
76 | - 'complete' => EEM_Transaction::complete_status_code, |
|
77 | - 'incomplete' => EEM_Transaction::incomplete_status_code, |
|
78 | - 'failed' => EEM_Transaction::failed_status_code, |
|
79 | - ); |
|
74 | + $status_array = array( |
|
75 | + 'overpaid' => EEM_Transaction::overpaid_status_code, |
|
76 | + 'complete' => EEM_Transaction::complete_status_code, |
|
77 | + 'incomplete' => EEM_Transaction::incomplete_status_code, |
|
78 | + 'failed' => EEM_Transaction::failed_status_code, |
|
79 | + ); |
|
80 | 80 | |
81 | - return EEH_Template::status_legend($status_array, $status); |
|
82 | - } |
|
81 | + return EEH_Template::status_legend($status_array, $status); |
|
82 | + } |
|
83 | 83 | } |
@@ -4,46 +4,46 @@ |
||
4 | 4 | <?php _e('There is no billing info for this transaction.', 'event_espresso'); ?><br/> |
5 | 5 | </div> |
6 | 6 | <?php else : |
7 | - function ee_show_billing_info_cleaned(EE_Form_Section_Proper $form_section, $found_cc_data = false) |
|
8 | - { |
|
9 | - foreach ($form_section->subsections() as $subsection) { |
|
10 | - if ($subsection instanceof EE_Form_Input_Base) { |
|
11 | - if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal |
|
12 | - || $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal |
|
13 | - || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy) { |
|
14 | - continue; |
|
15 | - } |
|
16 | - if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal) { |
|
17 | - $found_cc_data = true; |
|
18 | - } |
|
19 | - ?> |
|
7 | + function ee_show_billing_info_cleaned(EE_Form_Section_Proper $form_section, $found_cc_data = false) |
|
8 | + { |
|
9 | + foreach ($form_section->subsections() as $subsection) { |
|
10 | + if ($subsection instanceof EE_Form_Input_Base) { |
|
11 | + if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal |
|
12 | + || $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal |
|
13 | + || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy) { |
|
14 | + continue; |
|
15 | + } |
|
16 | + if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal) { |
|
17 | + $found_cc_data = true; |
|
18 | + } |
|
19 | + ?> |
|
20 | 20 | <div class="clearfix"> |
21 | 21 | <span class="admin-side-mbox-label-spn lt-grey-txt float-left"> |
22 | 22 | <?php echo $subsection->get_html_for_label(); ?> |
23 | 23 | </span><?php echo $subsection->pretty_value(); ?> |
24 | 24 | </div><?php |
25 | - } elseif ($subsection instanceof EE_Form_Section_Proper) { |
|
26 | - $found_cc_data = ee_show_billing_info_cleaned($subsection, $found_cc_data); |
|
27 | - } |
|
28 | - } |
|
29 | - return $found_cc_data; |
|
30 | - } |
|
25 | + } elseif ($subsection instanceof EE_Form_Section_Proper) { |
|
26 | + $found_cc_data = ee_show_billing_info_cleaned($subsection, $found_cc_data); |
|
27 | + } |
|
28 | + } |
|
29 | + return $found_cc_data; |
|
30 | + } |
|
31 | 31 | |
32 | - $found_cc_data = ee_show_billing_info_cleaned($billing_form); |
|
33 | - if (apply_filters( |
|
34 | - 'FHEE__txn_admin_details_side_meta_box_billing_info__show_default_note', |
|
35 | - $found_cc_data, |
|
36 | - $billing_form |
|
37 | - )) { ?> |
|
32 | + $found_cc_data = ee_show_billing_info_cleaned($billing_form); |
|
33 | + if (apply_filters( |
|
34 | + 'FHEE__txn_admin_details_side_meta_box_billing_info__show_default_note', |
|
35 | + $found_cc_data, |
|
36 | + $billing_form |
|
37 | + )) { ?> |
|
38 | 38 | <p class="help"> |
39 | 39 | <?php _e( |
40 | - 'Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', |
|
41 | - 'event_espresso' |
|
42 | - ); ?></p> |
|
40 | + 'Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', |
|
41 | + 'event_espresso' |
|
42 | + ); ?></p> |
|
43 | 43 | <?php |
44 | - } |
|
45 | - do_action('AHEE__txn_admin_details_side_meta_box_billing_info__billing_form_footer', $billing_form); |
|
46 | - endif; ?> |
|
44 | + } |
|
45 | + do_action('AHEE__txn_admin_details_side_meta_box_billing_info__billing_form_footer', $billing_form); |
|
46 | + endif; ?> |
|
47 | 47 | |
48 | 48 | </div> |
49 | 49 |
@@ -3,7 +3,8 @@ discard block |
||
3 | 3 | <div class="clearfix"> |
4 | 4 | <?php _e('There is no billing info for this transaction.', 'event_espresso'); ?><br/> |
5 | 5 | </div> |
6 | - <?php else : |
|
6 | + <?php else { |
|
7 | + : |
|
7 | 8 | function ee_show_billing_info_cleaned(EE_Form_Section_Proper $form_section, $found_cc_data = false) |
8 | 9 | { |
9 | 10 | foreach ($form_section->subsections() as $subsection) { |
@@ -12,6 +13,7 @@ discard block |
||
12 | 13 | || $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal |
13 | 14 | || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy) { |
14 | 15 | continue; |
16 | +} |
|
15 | 17 | } |
16 | 18 | if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal) { |
17 | 19 | $found_cc_data = true; |