Completed
Branch fix/escaping-2 (862633)
by
unknown
16:22 queued 14:36
created
registration_form/templates/questions_main_meta_box.template.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         EEH_HTML::h4(
32 32
             '<span class="dashicons dashicons-info"></span>'
33 33
             . esc_html__('Did you know...', 'event_espresso')
34
-        ) .
34
+        ).
35 35
         EEH_HTML::p(
36 36
             esc_html__(
37 37
                 'If you add a State/Province Select input immediately after this Country Select input when building your registration form, then the State/Province Select input options will change to correspond with the choice made in this input. So for example, choosing "United States" in this Country Select input will populate the State/Province Select input with just the state options for the United States.',
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
                                type="hidden"
93 93
                                value="<?php echo esc_attr($question->get('QST_order')); ?>"
94 94
                         />
95
-                        <?php if (! empty($QST_system)) { ?>
95
+                        <?php if ( ! empty($QST_system)) { ?>
96 96
                             <input id='QST_admin_label'
97 97
                                    name="QST_admin_label"
98 98
                                    type="hidden"
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
                         <?php } ?>
102 102
                         <br />
103 103
                         <p class="description">
104
-                            <?php if (! empty($QST_system)) { ?>
104
+                            <?php if ( ! empty($QST_system)) { ?>
105 105
                                 <span class="description" style="color:#D54E21;">
106 106
                                 <?php esc_html_e('System question! This field cannot be changed.', 'event_espresso') ?>
107 107
                         </span>
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
                         <br />
139 139
                         <p class="description">
140 140
                             <?php
141
-                            if (! empty($QST_system)) { ?>
141
+                            if ( ! empty($QST_system)) { ?>
142 142
                                 <span class="description" style="color:#D54E21;">
143 143
                                     <?php esc_html_e(
144 144
                                         'System question! This field cannot be changed.',
@@ -170,14 +170,14 @@  discard block
 block discarded – undo
170 170
 
171 171
                         // Only display Confirm email for
172 172
                         if (empty($QST_system) || $QST_system !== EEM_Attendee::system_question_email_confirm) {
173
-                            unset($question_types[ EEM_Question::QST_type_email_confirm ]);
173
+                            unset($question_types[EEM_Question::QST_type_email_confirm]);
174 174
                         }
175 175
 
176 176
                         echo EEH_Form_Fields::select_input(
177
-                            'QST_type' . $id,
177
+                            'QST_type'.$id,
178 178
                             $question_types,
179 179
                             $question->type(),
180
-                            'id="QST_type' . $id . '"' . $disabled_attr
180
+                            'id="QST_type'.$id.'"'.$disabled_attr
181 181
                         ); // already escaped
182 182
                         if ($disabled) { ?>
183 183
                             <input id='QST_type'
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
                     </th>
217 217
                     <td>
218 218
                         <input id="QST_max"
219
-                            <?php echo $max_max === EE_INF ? '' : 'max="' . esc_attr($max_max) . '"'; ?>
219
+                            <?php echo $max_max === EE_INF ? '' : 'max="'.esc_attr($max_max).'"'; ?>
220 220
                                min="1"
221 221
                                name="QST_max"
222 222
                                type="number"
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
                                 <?php
301 301
                                 $count            = 0;
302 302
                                 $question_options = $question->options();
303
-                                if (! empty($question_options)) {
303
+                                if ( ! empty($question_options)) {
304 304
                                     foreach ($question_options as $option_id => $option) {
305 305
                                         $disabled_attr = $has_answers || $option->get('QSO_system')
306 306
                                             ? ' disabled="disabled"'
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
                                                 />
335 335
                                             </td>
336 336
                                             <td>
337
-                                                <?php if (! $option->system()) { ?>
337
+                                                <?php if ( ! $option->system()) { ?>
338 338
                                                     <span class="dashicons clickable dashicons-post-trash ee-icon-size-18 remove-option remove-item">
339 339
                                         </span>
340 340
                                                 <?php } ?>
@@ -437,10 +437,10 @@  discard block
 block discarded – undo
437 437
                             ['text' => esc_html__('Required', 'event_espresso'), 'id' => 1],
438 438
                         ];
439 439
                         echo EEH_Form_Fields::select_input(
440
-                            'QST_required' . $id,
440
+                            'QST_required'.$id,
441 441
                             $requiredOptions,
442 442
                             $question->required(),
443
-                            'id="QST_required' . $id . '"' . $disabled_attr
443
+                            'id="QST_required'.$id.'"'.$disabled_attr
444 444
                         ); // already escaped
445 445
                         ?>
446 446
                         <p>
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
                                 ) ?>
462 462
                             </span>
463 463
                         </p>
464
-                        <?php if (! empty($disabled_attr) && in_array($QST_system, $system_required)) { ?>
464
+                        <?php if ( ! empty($disabled_attr) && in_array($QST_system, $system_required)) { ?>
465 465
                             <input type="hidden" id="QST_required" name="QST_required" value="1" />
466 466
                             <p>
467 467
                             <span class="description" style="color:#D54E21;">
Please login to merge, or discard this patch.
Indentation   +127 added lines, -127 removed lines patch added patch discarded remove patch
@@ -26,21 +26,21 @@  discard block
 block discarded – undo
26 26
 $has_answers = $question->has_answers();
27 27
 
28 28
 if ($QST_system === 'country') {
29
-    // already escaped
30
-    echo EEH_HTML::div(
31
-        EEH_HTML::h4(
32
-            '<span class="dashicons dashicons-info"></span>'
33
-            . esc_html__('Did you know...', 'event_espresso')
34
-        ) .
35
-        EEH_HTML::p(
36
-            esc_html__(
37
-                'If you add a State/Province Select input immediately after this Country Select input when building your registration form, then the State/Province Select input options will change to correspond with the choice made in this input. So for example, choosing "United States" in this Country Select input will populate the State/Province Select input with just the state options for the United States.',
38
-                'event_espresso'
39
-            )
40
-        ),
41
-        '',
42
-        'ee-info-box'
43
-    );
29
+	// already escaped
30
+	echo EEH_HTML::div(
31
+		EEH_HTML::h4(
32
+			'<span class="dashicons dashicons-info"></span>'
33
+			. esc_html__('Did you know...', 'event_espresso')
34
+		) .
35
+		EEH_HTML::p(
36
+			esc_html__(
37
+				'If you add a State/Province Select input immediately after this Country Select input when building your registration form, then the State/Province Select input options will change to correspond with the choice made in this input. So for example, choosing "United States" in this Country Select input will populate the State/Province Select input with just the state options for the United States.',
38
+				'event_espresso'
39
+			)
40
+		),
41
+		'',
42
+		'ee-info-box'
43
+	);
44 44
 }
45 45
 ?>
46 46
 
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
                     </th>
77 77
                     <td>
78 78
                         <?php
79
-                        $id            = ! empty($QST_system) ? '_disabled' : '';
80
-                        $disabled_attr = ! empty($QST_system) ? ' disabled="disabled"' : '';
81
-                        ?>
79
+						$id            = ! empty($QST_system) ? '_disabled' : '';
80
+						$disabled_attr = ! empty($QST_system) ? ' disabled="disabled"' : '';
81
+						?>
82 82
                         <input class='regular-text'
83 83
                                id="QST_admin_label<?php echo esc_attr($id); ?>"
84 84
                                name="QST_admin_label<?php echo esc_attr($id); ?>"
@@ -120,30 +120,30 @@  discard block
 block discarded – undo
120 120
                     </th>
121 121
                     <td>
122 122
                         <?php
123
-                        $id            = ! empty($QST_system) ? '_disabled' : '';
124
-                        $disabled_attr = ! empty($QST_system) ? ' disabled="disabled"' : '';
125
-                        $admin_only    = $question->get('QST_admin_only');
126
-                        $checked       = ! empty($admin_only) ? ' checked="checked"' : '';
127
-                        ?>
123
+						$id            = ! empty($QST_system) ? '_disabled' : '';
124
+						$disabled_attr = ! empty($QST_system) ? ' disabled="disabled"' : '';
125
+						$admin_only    = $question->get('QST_admin_only');
126
+						$checked       = ! empty($admin_only) ? ' checked="checked"' : '';
127
+						?>
128 128
                         <input class="QST_admin_only"
129 129
                                id="QST_admin_only<?php echo esc_attr($id); ?>"
130 130
                                name="QST_admin_only<?php echo esc_attr($id); ?>"
131 131
                                type="checkbox"
132 132
                                value="1"
133 133
                             <?php
134
-                            echo $disabled_attr; // escape not needed
135
-                            echo $checked; // escape not needed
136
-                            ?>
134
+							echo $disabled_attr; // escape not needed
135
+							echo $checked; // escape not needed
136
+							?>
137 137
                         />
138 138
                         <br />
139 139
                         <p class="description">
140 140
                             <?php
141
-                            if (! empty($QST_system)) { ?>
141
+							if (! empty($QST_system)) { ?>
142 142
                                 <span class="description" style="color:#D54E21;">
143 143
                                     <?php esc_html_e(
144
-                                        'System question! This field cannot be changed.',
145
-                                        'event_espresso'
146
-                                    ); ?>
144
+										'System question! This field cannot be changed.',
145
+										'event_espresso'
146
+									); ?>
147 147
                                 </span>
148 148
                             <?php } ?>
149 149
                         </p>
@@ -159,44 +159,44 @@  discard block
 block discarded – undo
159 159
                     </th>
160 160
                     <td>
161 161
                         <?php
162
-                        $disabled = ! empty($QST_system) && $QST_system !== EEM_Attendee::system_question_phone;
163
-                        if ($disabled) {
164
-                            $disabled_attr = 'disabled="disabled"';
165
-                            $id            = '_disabled';
166
-                        } else {
167
-                            $disabled_attr = '';
168
-                            $id            = '';
169
-                        }
162
+						$disabled = ! empty($QST_system) && $QST_system !== EEM_Attendee::system_question_phone;
163
+						if ($disabled) {
164
+							$disabled_attr = 'disabled="disabled"';
165
+							$id            = '_disabled';
166
+						} else {
167
+							$disabled_attr = '';
168
+							$id            = '';
169
+						}
170 170
 
171
-                        // Only display Confirm email for
172
-                        if (empty($QST_system) || $QST_system !== EEM_Attendee::system_question_email_confirm) {
173
-                            unset($question_types[ EEM_Question::QST_type_email_confirm ]);
174
-                        }
171
+						// Only display Confirm email for
172
+						if (empty($QST_system) || $QST_system !== EEM_Attendee::system_question_email_confirm) {
173
+							unset($question_types[ EEM_Question::QST_type_email_confirm ]);
174
+						}
175 175
 
176
-                        echo EEH_Form_Fields::select_input(
177
-                            'QST_type' . $id,
178
-                            $question_types,
179
-                            $question->type(),
180
-                            'id="QST_type' . $id . '"' . $disabled_attr
181
-                        ); // already escaped
182
-                        if ($disabled) { ?>
176
+						echo EEH_Form_Fields::select_input(
177
+							'QST_type' . $id,
178
+							$question_types,
179
+							$question->type(),
180
+							'id="QST_type' . $id . '"' . $disabled_attr
181
+						); // already escaped
182
+						if ($disabled) { ?>
183 183
                             <input id='QST_type'
184 184
                                    name="QST_type"
185 185
                                    type="hidden"
186 186
                                    value="<?php echo esc_attr($question->type()); ?>"
187 187
                             />
188 188
                             <?php
189
-                            $explanatory_text = esc_html__(
190
-                                'System question! This field cannot be changed.',
191
-                                'event_espresso'
192
-                            );
193
-                        } else {
194
-                            $explanatory_text = esc_html__(
195
-                                'Because there are currently answers for this question in the database, your options to change the question type have been limited to similar question-types.',
196
-                                'event_espresso'
197
-                            );
198
-                        }
199
-                        if ($disabled || $has_answers) { ?>
189
+							$explanatory_text = esc_html__(
190
+								'System question! This field cannot be changed.',
191
+								'event_espresso'
192
+							);
193
+						} else {
194
+							$explanatory_text = esc_html__(
195
+								'Because there are currently answers for this question in the database, your options to change the question type have been limited to similar question-types.',
196
+								'event_espresso'
197
+							);
198
+						}
199
+						if ($disabled || $has_answers) { ?>
200 200
                             <p>
201 201
                                 <span class="description" style="color:#D54E21;">
202 202
                                     <?php echo esc_html($explanatory_text); ?>
@@ -225,21 +225,21 @@  discard block
 block discarded – undo
225 225
                         <p>
226 226
                             <span class="description">
227 227
                                 <?php esc_html_e(
228
-                                    'Maximum number of characters allowed when answering this question',
229
-                                    'event_espresso'
230
-                                ); ?>
228
+									'Maximum number of characters allowed when answering this question',
229
+									'event_espresso'
230
+								); ?>
231 231
                             </span>
232 232
                         </p>
233 233
                         <?php if ($QST_system) { ?>
234 234
                         <p>
235 235
                             <span class="description" style="color:#D54E21;">
236 236
                                 <?php printf(
237
-                                    esc_html__(
238
-                                        'System question! The maximum number of characters that can be used for this question is %1$s',
239
-                                        'event_espresso'
240
-                                    ),
241
-                                    $max_max
242
-                                ); ?>
237
+									esc_html__(
238
+										'System question! The maximum number of characters that can be used for this question is %1$s',
239
+										'event_espresso'
240
+									),
241
+									$max_max
242
+								); ?>
243 243
                             </span>
244 244
                         </p>
245 245
                         <?php } ?>
@@ -261,9 +261,9 @@  discard block
 block discarded – undo
261 261
                                     </th>
262 262
                                     <th class="option-desc-header">
263 263
                                         <?php esc_html_e(
264
-                                            'Description (optional, only shown on registration form)',
265
-                                            'event_espresso'
266
-                                        ) ?>
264
+											'Description (optional, only shown on registration form)',
265
+											'event_espresso'
266
+										) ?>
267 267
                                     </th>
268 268
                                     <th>
269 269
                                     </th>
@@ -298,14 +298,14 @@  discard block
 block discarded – undo
298 298
                                 </tr>
299 299
 
300 300
                                 <?php
301
-                                $count            = 0;
302
-                                $question_options = $question->options();
303
-                                if (! empty($question_options)) {
304
-                                    foreach ($question_options as $option_id => $option) {
305
-                                        $disabled_attr = $has_answers || $option->get('QSO_system')
306
-                                            ? ' disabled="disabled"'
307
-                                            : '';
308
-                                        ?>
301
+								$count            = 0;
302
+								$question_options = $question->options();
303
+								if (! empty($question_options)) {
304
+									foreach ($question_options as $option_id => $option) {
305
+										$disabled_attr = $has_answers || $option->get('QSO_system')
306
+											? ' disabled="disabled"'
307
+											: '';
308
+										?>
309 309
                                         <tr class="question-option ee-options-sortable">
310 310
                                             <td class="option-value-cell">
311 311
                                                 <input type="hidden"
@@ -342,21 +342,21 @@  discard block
 block discarded – undo
342 342
                                     </span>
343 343
                                             </td>
344 344
                                             <?php
345
-                                            echo EEH_Form_Fields::hidden_input(
346
-                                                "question_options[{$count}][QST_ID])",
347
-                                                $option->question_ID()
348
-                                            ); // already escaped
349
-                                            echo EEH_Form_Fields::hidden_input(
350
-                                                "question_options[{$count}][QSO_ID])",
351
-                                                $option->ID()
352
-                                            ); // already escaped
353
-                                            $count++;
354
-                                            ?>
345
+											echo EEH_Form_Fields::hidden_input(
346
+												"question_options[{$count}][QST_ID])",
347
+												$option->question_ID()
348
+											); // already escaped
349
+											echo EEH_Form_Fields::hidden_input(
350
+												"question_options[{$count}][QSO_ID])",
351
+												$option->ID()
352
+											); // already escaped
353
+											$count++;
354
+											?>
355 355
                                         </tr>
356 356
                                         <?php
357
-                                    }
358
-                                } else {
359
-                                    ?>
357
+									}
358
+								} else {
359
+									?>
360 360
                                     <tr class="question-option ee-options-sortable">
361 361
                                         <td class="option-value-cell">
362 362
                                             <input type="hidden"
@@ -380,8 +380,8 @@  discard block
 block discarded – undo
380 380
                                         </td>
381 381
                                     </tr>
382 382
                                     <?php
383
-                                }
384
-                                ?>
383
+								}
384
+								?>
385 385
                                 <tr style="display:none">
386 386
                                     <td colspan="3">
387 387
                                         <?php echo EEH_Form_Fields::hidden_input("question_options_count", $count); // already escaped ?>
@@ -400,16 +400,16 @@  discard block
 block discarded – undo
400 400
 
401 401
                         <p class="description">
402 402
                             <?php esc_html_e(
403
-                                'Answer Options are the choices that you give people to select from for RADIO_BTN, CHECKBOX or DROPDOWN questions. The Value is a simple key that will be saved to the database and the description is optional. Note that values CANNOT contain any HTML, but descriptions can.',
404
-                                'event_espresso'
405
-                            ) ?>
403
+								'Answer Options are the choices that you give people to select from for RADIO_BTN, CHECKBOX or DROPDOWN questions. The Value is a simple key that will be saved to the database and the description is optional. Note that values CANNOT contain any HTML, but descriptions can.',
404
+								'event_espresso'
405
+							) ?>
406 406
                         </p>
407 407
                         <?php if ($has_answers) : ?>
408 408
                             <p class="description" style="color:#D54E21;">
409 409
                                 <?php esc_html_e(
410
-                                    'Answer values that are uneditable are this way because there are registrations in the database that have answers for this question.  If you need to correct a mistake, or edit an existing option value, then trash the existing one and create a new option with the changes.  This will ensure that the existing registrations that chose the original answer will preserve that answer.',
411
-                                    'event_espresso'
412
-                                ); ?>
410
+									'Answer values that are uneditable are this way because there are registrations in the database that have answers for this question.  If you need to correct a mistake, or edit an existing option value, then trash the existing one and create a new option with the changes.  This will ensure that the existing registrations that chose the original answer will preserve that answer.',
411
+									'event_espresso'
412
+								); ?>
413 413
                             </p>
414 414
 
415 415
                         <?php endif; ?>
@@ -425,40 +425,40 @@  discard block
 block discarded – undo
425 425
                     </th>
426 426
                     <td>
427 427
                         <?php
428
-                        $system_required   = ['fname', 'email'];
429
-                        $disabled_attr     = in_array($QST_system, $system_required) ? ' disabled="disabled"' : '';
430
-                        $required_on       = $question->get('QST_admin_only');
431
-                        $show_required_msg = $required_on ? '' : ' display:none;';
432
-                        $disabled_attr     = $required_on || ! empty($disabled_attr) ? ' disabled="disabled"' : '';
433
-                        $id                =
434
-                            ! empty($disabled_attr) && in_array($QST_system, $system_required) ? '_disabled' : '';
435
-                        $requiredOptions   = [
436
-                            ['text' => esc_html__('Optional', 'event_espresso'), 'id' => 0],
437
-                            ['text' => esc_html__('Required', 'event_espresso'), 'id' => 1],
438
-                        ];
439
-                        echo EEH_Form_Fields::select_input(
440
-                            'QST_required' . $id,
441
-                            $requiredOptions,
442
-                            $question->required(),
443
-                            'id="QST_required' . $id . '"' . $disabled_attr
444
-                        ); // already escaped
445
-                        ?>
428
+						$system_required   = ['fname', 'email'];
429
+						$disabled_attr     = in_array($QST_system, $system_required) ? ' disabled="disabled"' : '';
430
+						$required_on       = $question->get('QST_admin_only');
431
+						$show_required_msg = $required_on ? '' : ' display:none;';
432
+						$disabled_attr     = $required_on || ! empty($disabled_attr) ? ' disabled="disabled"' : '';
433
+						$id                =
434
+							! empty($disabled_attr) && in_array($QST_system, $system_required) ? '_disabled' : '';
435
+						$requiredOptions   = [
436
+							['text' => esc_html__('Optional', 'event_espresso'), 'id' => 0],
437
+							['text' => esc_html__('Required', 'event_espresso'), 'id' => 1],
438
+						];
439
+						echo EEH_Form_Fields::select_input(
440
+							'QST_required' . $id,
441
+							$requiredOptions,
442
+							$question->required(),
443
+							'id="QST_required' . $id . '"' . $disabled_attr
444
+						); // already escaped
445
+						?>
446 446
                         <p>
447 447
                             <span id="required_toggled_on" class="description"
448 448
                                   style="color:#D54E21;<?php echo esc_attr($show_required_msg); ?>"
449 449
                             >
450 450
                                 <?php esc_html_e(
451
-                                    'Required is set to optional, and this field is disabled, because the question is Admin-Only.',
452
-                                    'event_espresso'
453
-                                ) ?>
451
+									'Required is set to optional, and this field is disabled, because the question is Admin-Only.',
452
+									'event_espresso'
453
+								) ?>
454 454
                             </span
455 455
                         </p>
456 456
                         <p>
457 457
                             <span id="required_toggled_off" class="description" style="color:#D54E21; display: none;">
458 458
                                 <?php esc_html_e(
459
-                                    'Required option field is no longer disabled because the question is not Admin-Only',
460
-                                    'event_espresso'
461
-                                ) ?>
459
+									'Required option field is no longer disabled because the question is not Admin-Only',
460
+									'event_espresso'
461
+								) ?>
462 462
                             </span>
463 463
                         </p>
464 464
                         <?php if (! empty($disabled_attr) && in_array($QST_system, $system_required)) { ?>
@@ -491,8 +491,8 @@  discard block
 block discarded – undo
491 491
                     </td>
492 492
                 </tr>
493 493
                 <?php
494
-                do_action('AHEE__questions_main_meta_box__template__after_table_form_table', $question);
495
-                ?>
494
+				do_action('AHEE__questions_main_meta_box__template__after_table_form_table', $question);
495
+				?>
496 496
             </tbody>
497 497
         </table>
498 498
 
Please login to merge, or discard this patch.
admin_pages/general_settings/templates/state_details_settings.template.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -12,27 +12,27 @@  discard block
 block discarded – undo
12 12
         <th colspan="2">
13 13
             <span class="small-text">
14 14
                 <?php printf(
15
-                    esc_html__('State Appears in%1$sDropdown Select Lists ', 'event_espresso'),
16
-                    '<br />'
17
-                ); ?>
15
+					esc_html__('State Appears in%1$sDropdown Select Lists ', 'event_espresso'),
16
+					'<br />'
17
+				); ?>
18 18
             </span>
19 19
         </th>
20 20
     </tr>
21 21
     </thead>
22 22
     <tbody>
23 23
     <?php
24
-    if ($states) {
25
-        foreach ($states as $STA_ID => $state) {
26
-            $STA_ID = absint($STA_ID);
27
-            ?>
24
+	if ($states) {
25
+		foreach ($states as $STA_ID => $state) {
26
+			$STA_ID = absint($STA_ID);
27
+			?>
28 28
         <tr id="state-<?php echo esc_attr($STA_ID); ?>-tr" class="country-state-columns">
29 29
             <?php
30
-            foreach ($state['inputs'] as $ID => $input) {
31
-                if ($ID != 'STA_ID' && $ID != 'CNT_ISO') {
32
-                    echo EEH_Form_Fields::generate_form_input($input); // already escaped
33
-                }
34
-            }
35
-            ?>
30
+			foreach ($state['inputs'] as $ID => $input) {
31
+				if ($ID != 'STA_ID' && $ID != 'CNT_ISO') {
32
+					echo EEH_Form_Fields::generate_form_input($input); // already escaped
33
+				}
34
+			}
35
+			?>
36 36
             <td class="delete-state-td">
37 37
                 <a class="dashicons dashicons-post-trash ee-icon-size-20 delete-state-lnk"
38 38
                    id="delete-state-<?php echo esc_attr($STA_ID); ?>-lnk"
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
             </td>
45 45
         </tr>
46 46
             <?php
47
-        }
48
-        ?>
47
+		}
48
+		?>
49 49
     </tbody>
50 50
 </table>
51 51
 <br/>
@@ -57,8 +57,8 @@  discard block
 block discarded – undo
57 57
 />
58 58
 <br/>
59 59
         <?php
60
-    }
61
-    ?>
60
+	}
61
+	?>
62 62
 <table class="form-table add-new-state-tbl">
63 63
     <tbody>
64 64
     <tr>
Please login to merge, or discard this patch.
admin_pages/maintenance/templates/ee_system_stati_page.template.php 1 patch
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -18,38 +18,38 @@  discard block
 block discarded – undo
18 18
  */
19 19
 function ee_recurse_into_array_for_display($data, $depth = 0, $td = true)
20 20
 {
21
-    if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
22
-        // is_object($incomplete_class) actually returns false, hence why we check for it
23
-        $data = json_decode(json_encode($data), true);
24
-    }
25
-    if (empty($data)) {
26
-        return;
27
-    }
28
-    if (is_array($data)) {
29
-        $depth++;
30
-        ksort($data, SORT_NATURAL | SORT_FLAG_CASE);
31
-        if (EEH_Array::is_associative_array($data)) { ?>
21
+	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
22
+		// is_object($incomplete_class) actually returns false, hence why we check for it
23
+		$data = json_decode(json_encode($data), true);
24
+	}
25
+	if (empty($data)) {
26
+		return;
27
+	}
28
+	if (is_array($data)) {
29
+		$depth++;
30
+		ksort($data, SORT_NATURAL | SORT_FLAG_CASE);
31
+		if (EEH_Array::is_associative_array($data)) { ?>
32 32
             <table class='ee-system-stati ee-system-stati-<?php echo sanitize_html_class($depth); ?>'>
33 33
                 <tbody>
34 34
                     <?php foreach ($data as $data_key => $data_value) {
35
-                        // if the value is a single element array with no key,
36
-                        // and the value is a primitive (not an array, object, etc.)
37
-                        if (
38
-                            is_array($data_value)
39
-                            && count($data_value) === 1
40
-                            && empty(key($data_value))
41
-                            && is_scalar(reset($data_value))
42
-                        ) {
43
-                            ?>
35
+						// if the value is a single element array with no key,
36
+						// and the value is a primitive (not an array, object, etc.)
37
+						if (
38
+							is_array($data_value)
39
+							&& count($data_value) === 1
40
+							&& empty(key($data_value))
41
+							&& is_scalar(reset($data_value))
42
+						) {
43
+							?>
44 44
                             <tr>
45 45
                                 <td class="ee-system-stati-value" colspan="2">
46 46
                                     <?php echo esc_html(reset($data_value)); ?>
47 47
                                 </td>
48 48
                             </tr>
49 49
                             <?php
50
-                            continue;
51
-                        }
52
-                        ?>
50
+							continue;
51
+						}
52
+						?>
53 53
                         <tr>
54 54
                             <td class='ee-system-stati-key'>
55 55
                                 <span class="ee-system-stati-label">
@@ -64,31 +64,31 @@  discard block
 block discarded – undo
64 64
                             <?php if (is_scalar($data_value)) { ?>
65 65
                                 <?php ee_recurse_into_array_for_display($data_value, $depth); ?>
66 66
                             <?php } else {
67
-                                if (is_array($data_value) && count($data_value) === 1) {
68
-                                    // verify that values have been set
69
-                                    $keys_only = empty(
70
-                                        array_filter(
71
-                                            array_values($data_value),
72
-                                            function ($v) {
73
-                                                return $v !== null && (is_array($v) || trim($v) !== '');
74
-                                            }
75
-                                        )
76
-                                    );
77
-                                    // if the array only consists of keys (no values)
78
-                                    if ($keys_only) {
79
-                                        // then use keys for values
80
-                                        $data_value = array_keys($data_value);
81
-                                        // but if there is only one value now
82
-                                        if (count($data_value) === 1) {
83
-                                            // then pass that single value back into this function
84
-                                            // this prevents extra empty layers of nothing being added to the output
85
-                                            ee_recurse_into_array_for_display(reset($data_value), $depth);
86
-                                            // need to finish the row off though
87
-                                            echo '</tr>';
88
-                                            continue;
89
-                                        }
90
-                                    }
91
-                                } ?>
67
+								if (is_array($data_value) && count($data_value) === 1) {
68
+									// verify that values have been set
69
+									$keys_only = empty(
70
+										array_filter(
71
+											array_values($data_value),
72
+											function ($v) {
73
+												return $v !== null && (is_array($v) || trim($v) !== '');
74
+											}
75
+										)
76
+									);
77
+									// if the array only consists of keys (no values)
78
+									if ($keys_only) {
79
+										// then use keys for values
80
+										$data_value = array_keys($data_value);
81
+										// but if there is only one value now
82
+										if (count($data_value) === 1) {
83
+											// then pass that single value back into this function
84
+											// this prevents extra empty layers of nothing being added to the output
85
+											ee_recurse_into_array_for_display(reset($data_value), $depth);
86
+											// need to finish the row off though
87
+											echo '</tr>';
88
+											continue;
89
+										}
90
+									}
91
+								} ?>
92 92
                                 <td class="ee-system-stati-sub-values">
93 93
                                     <?php ee_recurse_into_array_for_display($data_value, $depth); ?>
94 94
                                 </td>
@@ -106,19 +106,19 @@  discard block
 block discarded – undo
106 106
                 <?php } ?>
107 107
             </ul>
108 108
         <?php } else {
109
-            // there's no key (label) and there's only one value,
110
-            // so let's just pass that value back into this function,
111
-            // but reset the depth back to where it was.
112
-            // this prevents extra empty layers of nothing being added to the output
113
-            $depth--;
114
-            ee_recurse_into_array_for_display(reset($data), $depth, false);
115
-        }
116
-    } else {
117
-        echo $td ? '<td class="ee-system-stati-value">' : '';
118
-        // simple value
119
-        echo $data;
120
-        echo $td ? '</td>' : '';
121
-    }
109
+			// there's no key (label) and there's only one value,
110
+			// so let's just pass that value back into this function,
111
+			// but reset the depth back to where it was.
112
+			// this prevents extra empty layers of nothing being added to the output
113
+			$depth--;
114
+			ee_recurse_into_array_for_display(reset($data), $depth, false);
115
+		}
116
+	} else {
117
+		echo $td ? '<td class="ee-system-stati-value">' : '';
118
+		// simple value
119
+		echo $data;
120
+		echo $td ? '</td>' : '';
121
+	}
122 122
 }
123 123
 
124 124
 ?>
Please login to merge, or discard this patch.
templates/txn_admin_details_main_meta_box_txn_details.template.php 1 patch
Indentation   +173 added lines, -173 removed lines patch added patch discarded remove patch
@@ -80,25 +80,25 @@  discard block
 block discarded – undo
80 80
     </div>
81 81
     <br class="clear" />
82 82
     <?php
83
-    $no_payments = $grand_raw_total > 0
84
-                   || $TXN_status !== EEM_Transaction::complete_status_code
85
-                   || ! empty($payments);
86
-    ?>
83
+	$no_payments = $grand_raw_total > 0
84
+				   || $TXN_status !== EEM_Transaction::complete_status_code
85
+				   || ! empty($payments);
86
+	?>
87 87
     <?php if ($attendee instanceof EE_Attendee && $no_payments) : ?>
88 88
         <?php $no_payment_text = $can_edit_payments
89
-            ? esc_html__(
90
-                'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.',
91
-                'event_espresso'
92
-            )
93
-            : esc_html__(
94
-                'No payments have been applied to this transaction yet.',
95
-                'event_espresso'
96
-            );
97
-        ?>
89
+			? esc_html__(
90
+				'No payments have been applied to this transaction yet. Click "Apply Payment" below to make a payment.',
91
+				'event_espresso'
92
+			)
93
+			: esc_html__(
94
+				'No payments have been applied to this transaction yet.',
95
+				'event_espresso'
96
+			);
97
+		?>
98 98
 
99 99
         <h3 class="admin-primary-mbox-h4 hdr-has-icon">
100 100
             <span class="ee-icon ee-icon-cash"></span><?php
101
-            esc_html_e('Payment Details', 'event_espresso'); ?>
101
+			esc_html_e('Payment Details', 'event_espresso'); ?>
102 102
         </h3>
103 103
 
104 104
         <div class="admin-primary-mbox-tbl-wrap">
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
                         <th class="jst-left"><?php esc_html_e('TXN&nbsp;ID / CHQ&nbsp;#', 'event_espresso'); ?></th>
115 115
                         <th class="jst-left"><?php esc_html_e('P.O. / S.O.&nbsp;#', 'event_espresso'); ?></th>
116 116
                         <th class="jst-left"><?php esc_html_e(
117
-                            'Notes / Extra&nbsp;Accounting',
118
-                            'event_espresso'
119
-                        ); ?></th>
117
+							'Notes / Extra&nbsp;Accounting',
118
+							'event_espresso'
119
+						); ?></th>
120 120
                         <!--<th class="jst-left"><?php esc_html_e('Details', 'event_espresso'); ?></th>-->
121 121
                         <th class="jst-cntr"><?php esc_html_e('Amount', 'event_espresso'); ?></th>
122 122
                     </tr>
@@ -125,15 +125,15 @@  discard block
 block discarded – undo
125 125
                     <?php if ($payments) : ?>
126 126
                         <?php $payment_total = 0; ?>
127 127
                         <?php foreach ($payments as $PAY_ID => $payment) :
128
-                            if (! $payment instanceof EE_Payment) {
129
-                                continue;
130
-                            }
131
-                            $PAY_ID = absint($PAY_ID);
132
-                            $existing_reg_payment_json = isset($existing_reg_payments[ $PAY_ID ])
133
-                                ? wp_json_encode($existing_reg_payments[ $PAY_ID ])
134
-                                : '{}';
135
-                            $escaped_pay_id = esc_attr($PAY_ID);
136
-                            ?>
128
+							if (! $payment instanceof EE_Payment) {
129
+								continue;
130
+							}
131
+							$PAY_ID = absint($PAY_ID);
132
+							$existing_reg_payment_json = isset($existing_reg_payments[ $PAY_ID ])
133
+								? wp_json_encode($existing_reg_payments[ $PAY_ID ])
134
+								: '{}';
135
+							$escaped_pay_id = esc_attr($PAY_ID);
136
+							?>
137 137
                             <tr id="txn-admin-payment-tr-<?php echo esc_attr($escaped_pay_id); ?>">
138 138
                                 <td>
139 139
                 <span id="payment-status-<?php echo esc_attr($escaped_pay_id); ?>"
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
                                 <td class=" jst-rght">
175 175
                                     <div id="payment-id-<?php echo esc_attr($escaped_pay_id); ?>">
176 176
                                         <?php echo $PAY_ID; // sanitized
177
-                                        ?>
177
+										?>
178 178
                                     </div>
179 179
                                 </td>
180 180
                                 <td class=" jst-left">
@@ -188,15 +188,15 @@  discard block
 block discarded – undo
188 188
                                     </div>
189 189
                                     <div id="payment-gateway-<?php echo esc_attr($escaped_pay_id); ?>">
190 190
                                         <?php echo $payment->payment_method() instanceof EE_Payment_Method
191
-                                            ? esc_html($payment->payment_method()->admin_name())
192
-                                            : esc_html__("Unknown", 'event_espresso'); ?>
191
+											? esc_html($payment->payment_method()->admin_name())
192
+											: esc_html__("Unknown", 'event_espresso'); ?>
193 193
                                     </div>
194 194
                                     <div id="payment-gateway-id-<?php echo esc_attr($escaped_pay_id); ?>"
195 195
                                          class="hidden"
196 196
                                     >
197 197
                                         <?php echo $payment->payment_method() instanceof EE_Payment_Method
198
-                                            ? esc_html($payment->payment_method()->ID())
199
-                                            : 0; ?>
198
+											? esc_html($payment->payment_method()->ID())
199
+											: 0; ?>
200 200
                                     </div>
201 201
                                 </td>
202 202
                                 <td class=" jst-left">
@@ -221,18 +221,18 @@  discard block
 block discarded – undo
221 221
                                 </td>
222 222
                                 <td class=" jst-rght">
223 223
                                     <?php
224
-                                    $payment_class = $payment->amount() > 0
225
-                                        ? 'txn-admin-payment-status-' . $payment->STS_ID()
226
-                                        : 'txn-admin-payment-status-PDC';
227
-                                    ?>
224
+									$payment_class = $payment->amount() > 0
225
+										? 'txn-admin-payment-status-' . $payment->STS_ID()
226
+										: 'txn-admin-payment-status-PDC';
227
+									?>
228 228
                                     <span class="<?php echo esc_attr($payment_class); ?>">
229 229
                                         <span id="payment-amount-<?php echo esc_attr($escaped_pay_id); ?>" style="display:inline;">
230 230
                                         <?php echo EEH_Template::format_currency(
231
-                                            $payment->amount(),
232
-                                            false,
233
-                                            false
234
-                                        ); // already escaped
235
-                                        ?>
231
+											$payment->amount(),
232
+											false,
233
+											false
234
+										); // already escaped
235
+										?>
236 236
                                         </span>
237 237
                                     </span>
238 238
                                 </td>
@@ -240,9 +240,9 @@  discard block
 block discarded – undo
240 240
                             <?php $payment_total += $payment->STS_ID() == 'PAP' ? $payment->amount() : 0; ?>
241 241
                         <?php endforeach; ?>
242 242
                         <?php $pay_totals_class = $payment_total > $grand_raw_total
243
-                            ? ' important-notice'
244
-                            : '';
245
-                        ?>
243
+							? ' important-notice'
244
+							: '';
245
+						?>
246 246
                         <tr id="txn-admin-no-payments-tr" class="admin-primary-mbox-total-tr hidden">
247 247
                             <td class=" jst-rght" colspan="10">
248 248
                                 <span class="important-notice"><?php echo $no_payment_text; // already escaped ?></span>
@@ -254,28 +254,28 @@  discard block
 block discarded – undo
254 254
                             <th class=" jst-rght" colspan="9">
255 255
                         <span id="payments-total-spn">
256 256
                         <?php
257
-                        $overpaid = $payment_total > $grand_raw_total
258
-                            ? '<span id="overpaid">'
259
-                              . __('This transaction has been overpaid ! ', 'event_espresso')
260
-                              . '</span>'
261
-                            : '';
262
-                        echo esc_html(
263
-                            $overpaid
264
-                            . sprintf(
265
-                                __('Payments Total %s', 'event_espresso'),
266
-                                '(' . EE_Registry::instance()->CFG->currency->code . ')'
267
-                            )
268
-                        ); ?>
257
+						$overpaid = $payment_total > $grand_raw_total
258
+							? '<span id="overpaid">'
259
+							  . __('This transaction has been overpaid ! ', 'event_espresso')
260
+							  . '</span>'
261
+							: '';
262
+						echo esc_html(
263
+							$overpaid
264
+							. sprintf(
265
+								__('Payments Total %s', 'event_espresso'),
266
+								'(' . EE_Registry::instance()->CFG->currency->code . ')'
267
+							)
268
+						); ?>
269 269
                         </span>
270 270
                             </th>
271 271
                             <th class=" jst-rght">
272 272
                         <span id="txn-admin-payment-total">
273 273
                         <?php
274
-                        echo EEH_Template::format_currency(
275
-                            $payment_total,
276
-                            false,
277
-                            false
278
-                        ); // already escaped ?>
274
+						echo EEH_Template::format_currency(
275
+							$payment_total,
276
+							false,
277
+							false
278
+						); // already escaped ?>
279 279
                         </span>
280 280
                             </th>
281 281
                         </tr>
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 
359 359
         <ul id="txn-admin-payment-options-ul">
360 360
             <?php if ($can_edit_payments) :
361
-                ?>
361
+				?>
362 362
                 <li>
363 363
                     <a id="display-txn-admin-apply-payment"
364 364
                        class="button-primary no-icon no-hide"
@@ -383,12 +383,12 @@  discard block
 block discarded – undo
383 383
                 </li>
384 384
             <?php endif; ?>
385 385
             <?php
386
-            // Allows extend the fields at actions area.
387
-            do_action(
388
-                'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
389
-                $can_edit_payments
390
-            );
391
-            ?>
386
+			// Allows extend the fields at actions area.
387
+			do_action(
388
+				'AHEE__txn_admin_details_main_meta_box_txn_details__after_actions_buttons',
389
+				$can_edit_payments
390
+			);
391
+			?>
392 392
         </ul>
393 393
         <br class="clear" />
394 394
 
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
             >
400 400
                 <div class="ee-icon ee-icon-cash-add float-left"></div>
401 401
                 <?php
402
-                echo esc_html__('Apply a Payment to Transaction #', 'event_espresso') . esc_html($txn_nmbr['value']); ?>
402
+				echo esc_html__('Apply a Payment to Transaction #', 'event_espresso') . esc_html($txn_nmbr['value']); ?>
403 403
             </h2>
404 404
 
405 405
             <h2 id="admin-modal-dialog-edit-payment-h2" class="admin-modal-dialog-h2 hdr-has-icon"
@@ -407,23 +407,23 @@  discard block
 block discarded – undo
407 407
             >
408 408
                 <div class="ee-icon ee-icon-cash-edit float-left"></div>
409 409
                 <?php
410
-                printf(
411
-                    esc_html__('Edit Payment #%s for Transaction #%s', 'event_espresso'),
412
-                    '<span></span>',
413
-                    $txn_nmbr['value']
414
-                );
415
-                ?>
410
+				printf(
411
+					esc_html__('Edit Payment #%s for Transaction #%s', 'event_espresso'),
412
+					'<span></span>',
413
+					$txn_nmbr['value']
414
+				);
415
+				?>
416 416
             </h2>
417 417
 
418 418
             <h2 id="admin-modal-dialog-edit-refund-h2" class="admin-modal-dialog-h2 hdr-has-icon" style="display:none;">
419 419
                 <div class="ee-icon ee-icon-cash-edit float-left"></div>
420 420
                 <?php
421
-                printf(
422
-                    esc_html__('Edit Refund #%s for Transaction #%s', 'event_espresso'),
423
-                    '<span></span>',
424
-                    $txn_nmbr['value']
425
-                );
426
-                ?>
421
+				printf(
422
+					esc_html__('Edit Refund #%s for Transaction #%s', 'event_espresso'),
423
+					'<span></span>',
424
+					$txn_nmbr['value']
425
+				);
426
+				?>
427 427
             </h2>
428 428
 
429 429
             <h2 id="admin-modal-dialog-apply-refund-h2" class="admin-modal-dialog-h2 hdr-has-icon"
@@ -431,9 +431,9 @@  discard block
 block discarded – undo
431 431
             >
432 432
                 <div class="ee-icon ee-icon-cash-remove float-left"></div>
433 433
                 <?php
434
-                echo esc_html__('Apply a Refund to Transaction #', 'event_espresso');
435
-                echo esc_html($txn_nmbr['value']);
436
-                ?>
434
+				echo esc_html__('Apply a Refund to Transaction #', 'event_espresso');
435
+				echo esc_html($txn_nmbr['value']);
436
+				?>
437 437
             </h2>
438 438
 
439 439
             <form name="txn-admin-apply-payment-frm"
@@ -532,29 +532,29 @@  discard block
 block discarded – undo
532 532
                             >
533 533
                                 <?php foreach ($payment_methods as $method) : ?>
534 534
                                     <?php
535
-                                    $selected = $method->slug() == 'cash'
536
-                                        ? ' selected="selected"'
537
-                                        : '';
538
-                                    ?>
535
+									$selected = $method->slug() == 'cash'
536
+										? ' selected="selected"'
537
+										: '';
538
+									?>
539 539
                                     <option id="payment-method-opt-<?php echo esc_attr($method->slug()); ?>"
540 540
                                             value="<?php echo esc_attr($method->ID()); ?>"
541 541
                                         <?php echo $selected; ?>
542 542
                                     >
543 543
                                         <?php
544
-                                        echo esc_html(
545
-                                            sanitize_key($method->admin_desc())
546
-                                                ? substr($method->admin_desc(), 0, 128)
547
-                                                : $method->admin_name()
548
-                                        );
549
-                                        ?>&nbsp;&nbsp;
544
+										echo esc_html(
545
+											sanitize_key($method->admin_desc())
546
+												? substr($method->admin_desc(), 0, 128)
547
+												: $method->admin_name()
548
+										);
549
+										?>&nbsp;&nbsp;
550 550
                                     </option>
551 551
                                 <?php endforeach; ?>
552 552
                             </select>
553 553
                             <p class="description">
554 554
                                 <?php esc_html_e(
555
-                                    'Whether the payment was made via PayPal, Credit Card, Cheque, or Cash',
556
-                                    'event_espresso'
557
-                                ); ?>
555
+									'Whether the payment was made via PayPal, Credit Card, Cheque, or Cash',
556
+									'event_espresso'
557
+								); ?>
558 558
                             </p>
559 559
                         </div>
560 560
 
@@ -562,9 +562,9 @@  discard block
 block discarded – undo
562 562
                             <div class="txn-admin-apply-payment-gw-txn-id-dv admin-modal-dialog-row">
563 563
                                 <label for="txn-admin-payment-txn-id-chq-nmbr-inp" class="">
564 564
                                     <?php esc_html_e(
565
-                                        'TXN ID / CHQ #',
566
-                                        'event_espresso'
567
-                                    ); ?>
565
+										'TXN ID / CHQ #',
566
+										'event_espresso'
567
+									); ?>
568 568
                                 </label>
569 569
                                 <input name="txn_admin_payment[txn_id_chq_nmbr]"
570 570
                                        id="txn-admin-payment-txn-id-chq-nmbr-inp"
@@ -573,9 +573,9 @@  discard block
 block discarded – undo
573 573
                                 />
574 574
                                 <p class="description">
575 575
                                     <?php esc_html_e(
576
-                                        'The Transaction ID sent back from the payment gateway, or the Cheque #',
577
-                                        'event_espresso'
578
-                                    ); ?>
576
+										'The Transaction ID sent back from the payment gateway, or the Cheque #',
577
+										'event_espresso'
578
+									); ?>
579 579
                                 </p>
580 580
                             </div>
581 581
                         </div>
@@ -592,9 +592,9 @@  discard block
 block discarded – undo
592 592
                                 />
593 593
                                 <p class="description">
594 594
                                     <?php esc_html_e(
595
-                                        'The gateway response string (optional)',
596
-                                        'event_espresso'
597
-                                    ); ?>
595
+										'The gateway response string (optional)',
596
+										'event_espresso'
597
+									); ?>
598 598
                                 </p>
599 599
                             </div>
600 600
                         </div>
@@ -603,9 +603,9 @@  discard block
 block discarded – undo
603 603
                             <div class="txn-admin-apply-payment-status-dv admin-modal-dialog-row">
604 604
                                 <label for="txn-admin-payment-status-slct" class="">
605 605
                                     <?php esc_html_e(
606
-                                        'Payment Status',
607
-                                        'event_espresso'
608
-                                    ); ?>
606
+										'Payment Status',
607
+										'event_espresso'
608
+									); ?>
609 609
                                 </label>
610 610
                                 <select name="txn_admin_payment[status]"
611 611
                                         id="txn-admin-payment-status-slct"
@@ -614,10 +614,10 @@  discard block
 block discarded – undo
614 614
                                 >
615 615
                                     <?php foreach ($payment_status as $STS_ID => $STS_code) : ?>
616 616
                                         <?php
617
-                                        $selected = $STS_ID == 'PAP'
618
-                                            ? ' selected="selected"'
619
-                                            : '';
620
-                                        ?>
617
+										$selected = $STS_ID == 'PAP'
618
+											? ' selected="selected"'
619
+											: '';
620
+										?>
621 621
                                         <option id="payment-status-opt-<?php echo esc_attr($STS_ID); ?>"
622 622
                                                 value="<?php echo esc_attr($STS_ID); ?>"
623 623
                                             <?php echo $selected; ?>
@@ -628,10 +628,10 @@  discard block
 block discarded – undo
628 628
                                 </select>
629 629
                                 <p class="description">
630 630
                                     <?php
631
-                                    esc_html_e(
632
-                                        'Whether the payment was approved, cancelled, declined or failed after submission to the gateway',
633
-                                        'event_espresso'
634
-                                    ); ?>
631
+									esc_html_e(
632
+										'Whether the payment was approved, cancelled, declined or failed after submission to the gateway',
633
+										'event_espresso'
634
+									); ?>
635 635
                                 </p>
636 636
                             </div>
637 637
                         </div>
@@ -648,9 +648,9 @@  discard block
 block discarded – undo
648 648
                             />
649 649
                             <p class="description">
650 650
                                 <?php esc_html_e(
651
-                                    'The Purchase or Sales Order Number if any (optional)',
652
-                                    'event_espresso'
653
-                                ); ?>
651
+									'The Purchase or Sales Order Number if any (optional)',
652
+									'event_espresso'
653
+								); ?>
654 654
                             </p>
655 655
                         </div>
656 656
 
@@ -671,9 +671,9 @@  discard block
 block discarded – undo
671 671
                             />
672 672
                             <p class="description">
673 673
                                 <?php esc_html_e(
674
-                                    'An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.',
675
-                                    'event_espresso'
676
-                                ); ?>
674
+									'An extra field you may use for accounting purposes or simple notes. Defaults to the primary registrant\'s registration code.',
675
+									'event_espresso'
676
+								); ?>
677 677
                             </p>
678 678
                         </div>
679 679
 
@@ -706,12 +706,12 @@  discard block
 block discarded – undo
706 706
                                 <?php esc_html_e('Change Registration Status?', 'event_espresso'); ?>
707 707
                             </label>
708 708
                             <?php
709
-                            echo $status_change_select; // already escaped ?>
709
+							echo $status_change_select; // already escaped ?>
710 710
                             <p class="description">
711 711
                                 <?php esc_html_e(
712
-                                    'If you wish to change the status for the registrations selected above, then select which status from this dropdown.',
713
-                                    'event_espresso'
714
-                                ); ?>
712
+									'If you wish to change the status for the registrations selected above, then select which status from this dropdown.',
713
+									'event_espresso'
714
+								); ?>
715 715
                             </p>
716 716
                             <br />
717 717
                         </div>
@@ -742,14 +742,14 @@  discard block
 block discarded – undo
742 742
                             <br class="clear-float" />
743 743
                             <p class="description">
744 744
                                 <?php printf(
745
-                                    esc_html__(
746
-                                        'By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.',
747
-                                        'event_espresso'
748
-                                    ),
749
-                                    '<strong>',
750
-                                    '</strong>',
751
-                                    '<br />'
752
-                                ); ?>
745
+									esc_html__(
746
+										'By default %1$sa payment message is sent to the primary registrant%2$s after submitting this form.%3$sHowever, if you check the "Registration Messages" box, the system will also send any related messages matching the status of the registrations to %1$seach registration for this transaction%2$s.',
747
+										'event_espresso'
748
+									),
749
+									'<strong>',
750
+									'</strong>',
751
+									'<br />'
752
+								); ?>
753 753
                             </p>
754 754
                         </div>
755 755
                         <div class="clear"></div>
@@ -814,10 +814,10 @@  discard block
 block discarded – undo
814 814
             >
815 815
                 <span class="ee-icon ee-icon-cash-add"></span>
816 816
                 <?php printf(
817
-                    esc_html__('Delete Payment/Refund for Transaction #', 'event_espresso'),
818
-                    $txn_nmbr['value']
819
-                );
820
-                ?>
817
+					esc_html__('Delete Payment/Refund for Transaction #', 'event_espresso'),
818
+					$txn_nmbr['value']
819
+				);
820
+				?>
821 821
             </h2>
822 822
 
823 823
             <form name="txn-admin-delete-payment-frm"
@@ -853,13 +853,13 @@  discard block
 block discarded – undo
853 853
                             <?php echo $delete_status_change_select; // already escaped ?>
854 854
                             <p class="description">
855 855
                                 <?php printf(
856
-                                    esc_html__(
857
-                                        'If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s',
858
-                                        'event_espresso'
859
-                                    ),
860
-                                    '<strong>',
861
-                                    '</strong>'
862
-                                ); ?>
856
+									esc_html__(
857
+										'If you wish to change the status of all the registrations associated with this transaction after deleting this payment/refund, then select which status from this dropdown. %sNote: ALL registrations associated with this transaction will be updated to this new status.%s',
858
+										'event_espresso'
859
+									),
860
+									'<strong>',
861
+									'</strong>'
862
+								); ?>
863 863
                             </p>
864 864
                         </div>
865 865
 
@@ -874,10 +874,10 @@  discard block
 block discarded – undo
874 874
                             />
875 875
                             <p class="description">
876 876
                                 <?php
877
-                                esc_html_e(
878
-                                    'If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.',
879
-                                    'event_espresso'
880
-                                ); ?>
877
+								esc_html_e(
878
+									'If you check this box, the system will send any related registration messages matching the status of the registrations to each registration for this transaction. No Payment notifications are sent when deleting a payment.',
879
+									'event_espresso'
880
+								); ?>
881 881
                             </p>
882 882
                         </div>
883 883
                         <div class="clear"></div>
@@ -910,8 +910,8 @@  discard block
 block discarded – undo
910 910
     <?php endif; // $grand_raw_total > 0?>
911 911
 
912 912
     <?php if (WP_DEBUG) {
913
-        $delivered_messages = get_option('EED_Messages__payment', []);
914
-        if (isset($delivered_messages[ $TXN_ID ])) { ?>
913
+		$delivered_messages = get_option('EED_Messages__payment', []);
914
+		if (isset($delivered_messages[ $TXN_ID ])) { ?>
915 915
             <h4 class="admin-primary-mbox-h4 hdr-has-icon">
916 916
                 <span class="dashicons dashicons-email-alt"></span>
917 917
                 <?php esc_html_e('Messages Sent to Primary Registrant', 'event_espresso'); ?>
@@ -923,39 +923,39 @@  discard block
 block discarded – undo
923 923
                             <th class="jst-left"><?php esc_html_e('Date & Time', 'event_espresso'); ?></th>
924 924
                             <th class="jst-left"><?php esc_html_e('Message Type', 'event_espresso'); ?></th>
925 925
                             <th class="jst-left"><?php esc_html_e(
926
-                                'Payment Status Upon Sending',
927
-                                'event_espresso'
928
-                            ); ?></th>
926
+								'Payment Status Upon Sending',
927
+								'event_espresso'
928
+							); ?></th>
929 929
                             <th class="jst-left"><?php esc_html_e('TXN Status Upon Sending', 'event_espresso'); ?></th>
930 930
                         </tr>
931 931
                     </thead>
932 932
                     <tbody>
933 933
                         <?php
934
-                        foreach ($delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message) :
935
-                            ?>
934
+						foreach ($delivered_messages[ $TXN_ID ] as $timestamp => $delivered_message) :
935
+							?>
936 936
                             <tr>
937 937
                                 <td class="jst-left">
938 938
                                     <?php echo esc_html(
939
-                                        date(
940
-                                            get_option('date_format') . ' ' . get_option('time_format'),
941
-                                            ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))
942
-                                        )
943
-                                    ); ?>
939
+										date(
940
+											get_option('date_format') . ' ' . get_option('time_format'),
941
+											($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))
942
+										)
943
+									); ?>
944 944
                                 </td>
945 945
                                 <td class="jst-left"><?php
946
-                                    echo isset($delivered_message['message_type'])
947
-                                        ? esc_html($delivered_message['message_type'])
948
-                                        : ''; ?>
946
+									echo isset($delivered_message['message_type'])
947
+										? esc_html($delivered_message['message_type'])
948
+										: ''; ?>
949 949
                                 </td>
950 950
                                 <td class="jst-left"><?php
951
-                                    echo isset($delivered_message['pay_status'])
952
-                                        ? esc_html($delivered_message['pay_status'])
953
-                                        : ''; ?>
951
+									echo isset($delivered_message['pay_status'])
952
+										? esc_html($delivered_message['pay_status'])
953
+										: ''; ?>
954 954
                                 </td>
955 955
                                 <td class="jst-left"><?php
956
-                                    echo isset($delivered_message['txn_status'])
957
-                                        ? esc_html($delivered_message['txn_status'])
958
-                                        : ''; ?>
956
+									echo isset($delivered_message['txn_status'])
957
+										? esc_html($delivered_message['txn_status'])
958
+										: ''; ?>
959 959
                                 </td>
960 960
                             </tr>
961 961
                         <?php endforeach; // $delivered_messages?>
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
                 </table>
964 964
             </div>
965 965
             <?php
966
-        }
967
-    }
968
-    ?>
966
+		}
967
+	}
968
+	?>
969 969
 </div>
Please login to merge, or discard this patch.
venues/templates/event_venues_metabox_content_from_manager.template.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -14,20 +14,20 @@
 block discarded – undo
14 14
                 <?php esc_html_e('Select from Venue Manager List', 'event_espresso'); ?>
15 15
             </label>
16 16
             <?php
17
-            echo $venue_selector; // already escaped
18
-            echo $new_venue_link; // already escaped
19
-            foreach ($venues as $venue) :
20
-                if (! $venue instanceof EE_Venue) {
21
-                    continue;
22
-                }
23
-                $selected     = $evt_venue_id === $venue->ID() ? 'ee-venue-selected' : 'ee-venue-not-selected';
24
-                $edit_url     = EE_Admin_Page::add_query_args_and_nonce(
25
-                    ['action' => 'edit', 'post' => $venue->ID()],
26
-                    EE_VENUES_ADMIN_URL
27
-                );
28
-                $state_name   = is_object($venue->state_obj()) ? $venue->state_obj()->name() : null;
29
-                $country_name = is_object($venue->country_obj()) ? $venue->country_obj()->name() : null;
30
-                ?>
17
+			echo $venue_selector; // already escaped
18
+			echo $new_venue_link; // already escaped
19
+			foreach ($venues as $venue) :
20
+				if (! $venue instanceof EE_Venue) {
21
+					continue;
22
+				}
23
+				$selected     = $evt_venue_id === $venue->ID() ? 'ee-venue-selected' : 'ee-venue-not-selected';
24
+				$edit_url     = EE_Admin_Page::add_query_args_and_nonce(
25
+					['action' => 'edit', 'post' => $venue->ID()],
26
+					EE_VENUES_ADMIN_URL
27
+				);
28
+				$state_name   = is_object($venue->state_obj()) ? $venue->state_obj()->name() : null;
29
+				$country_name = is_object($venue->country_obj()) ? $venue->country_obj()->name() : null;
30
+				?>
31 31
                 <div class='eebox <?php echo sanitize_html_class($selected); ?>' id="eebox_<?php echo esc_attr($venue->ID()); ?>">
32 32
                     <p class='address-view'>
33 33
                         <span><?php esc_html_e('Address:', 'event_espresso'); ?>&nbsp;</span>
Please login to merge, or discard this patch.
admin_pages/events/templates/event_tickets_metabox_ticket_row.template.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -84,12 +84,15 @@  discard block
 block discarded – undo
84 84
                    name="edit_prices[<?php echo esc_attr($ticketrow); ?>][1][PRC_amount]"
85 85
                    value="<?php echo esc_attr($PRC_amount); ?>"
86 86
             />
87
-        <?php else : ?>
87
+        <?php else {
88
+	: ?>
88 89
             <input type="text"
89 90
                    size="1"
90 91
                    class="edit-price-PRC_amount ee-small-text-inp ee-inp-right"
91 92
                    name="disabled_price_amount"
92
-                   value="<?php echo esc_attr($PRC_amount); ?>"
93
+                   value="<?php echo esc_attr($PRC_amount);
94
+}
95
+?>"
93 96
                 <?php echo esc_attr($disabled); ?>
94 97
             />
95 98
             <input type="hidden"
@@ -123,11 +126,14 @@  discard block
 block discarded – undo
123 126
                    name="<?php echo esc_attr("{$edit_ticketrow_name}[{$ticketrow}][TKT_qty]"); ?>"
124 127
                    value="<?php echo esc_attr($TKT_qty); ?>"
125 128
             />
126
-        <?php else : ?>
129
+        <?php else {
130
+	: ?>
127 131
             <input type="text"
128 132
                    class="edit-ticket-TKT_qty ee-small-text-inp ee-inp-right"
129 133
                    name="disabled_tkt_qty"
130
-                   value="<?php echo esc_attr($TKT_qty); ?>"
134
+                   value="<?php echo esc_attr($TKT_qty);
135
+}
136
+?>"
131 137
                 <?php echo esc_attr($disabled); ?>
132 138
             />
133 139
             <input type="hidden"
Please login to merge, or discard this patch.
admin_pages/about/templates/decafvpro.template.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -1,46 +1,46 @@  discard block
 block discarded – undo
1 1
 <p>
2 2
     <?php printf(
3
-        esc_html__(
4
-            'We offer a free version of Event Espresso 4 called Decaf which is a good fit for basic events. Need more features like custom registration forms and advanced email notifications? %sUpgrade to Event Espresso 4 (Regular)%s.',
5
-            'event_espresso'
6
-        ),
7
-        '<a href="https://eventespresso.com/pricing/?ee_ver=ee4&utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">',
8
-        '</a>'
9
-    ); ?>
3
+		esc_html__(
4
+			'We offer a free version of Event Espresso 4 called Decaf which is a good fit for basic events. Need more features like custom registration forms and advanced email notifications? %sUpgrade to Event Espresso 4 (Regular)%s.',
5
+			'event_espresso'
6
+		),
7
+		'<a href="https://eventespresso.com/pricing/?ee_ver=ee4&utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=decaf_about_page&amp;utm_content=Decaf+vs+Regular">',
8
+		'</a>'
9
+	); ?>
10 10
     <br>
11 11
 
12 12
     <?php
13
-    $features = array(
14
-        'pricing-options'        => array(
15
-            'label'   => __('Handle multiple dates and pricing options', 'event_espresso'),
16
-            'class'   => 'alternate',
17
-        ),
18
-        'custom-registration'    => array(
19
-            'label'   => __('Create custom registration forms', 'event_espresso'),
20
-            'class'   => 'none',
21
-        ),
22
-        'advanced-notifications' => array(
23
-            'label'   => __('Customize advanced email notifications', 'event_espresso'),
24
-            'class'   => 'alternate',
25
-        ),
26
-        'manage-taxes'           => array(
27
-            'label'   => __('Manage taxes', 'event_espresso'),
28
-            'class'   => 'none',
29
-        ),
30
-        'typography'             => array(
31
-            'label'   => __('Additional payment methods available', 'event_espresso'),
32
-            'class'   => 'alternate',
33
-        ),
34
-        'add-on-compatibility'   => array(
35
-            'label'   => __('Compatibility with add-ons', 'event_espresso'),
36
-            'class'   => 'none',
37
-        ),
38
-        'best-support'           => array(
39
-            'label'   => __('Best in class support', 'event_espresso'),
40
-            'class'   => 'alternate',
41
-        ),
42
-    );
43
-    ?>
13
+	$features = array(
14
+		'pricing-options'        => array(
15
+			'label'   => __('Handle multiple dates and pricing options', 'event_espresso'),
16
+			'class'   => 'alternate',
17
+		),
18
+		'custom-registration'    => array(
19
+			'label'   => __('Create custom registration forms', 'event_espresso'),
20
+			'class'   => 'none',
21
+		),
22
+		'advanced-notifications' => array(
23
+			'label'   => __('Customize advanced email notifications', 'event_espresso'),
24
+			'class'   => 'alternate',
25
+		),
26
+		'manage-taxes'           => array(
27
+			'label'   => __('Manage taxes', 'event_espresso'),
28
+			'class'   => 'none',
29
+		),
30
+		'typography'             => array(
31
+			'label'   => __('Additional payment methods available', 'event_espresso'),
32
+			'class'   => 'alternate',
33
+		),
34
+		'add-on-compatibility'   => array(
35
+			'label'   => __('Compatibility with add-ons', 'event_espresso'),
36
+			'class'   => 'none',
37
+		),
38
+		'best-support'           => array(
39
+			'label'   => __('Best in class support', 'event_espresso'),
40
+			'class'   => 'alternate',
41
+		),
42
+	);
43
+	?>
44 44
 <div class="featured-section features">
45 45
     <table class="decaf-regular-table">
46 46
         <thead>
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
         </thead>
53 53
         <tbody>
54 54
         <?php
55
-        foreach ($features as $feature) : ?>
55
+		foreach ($features as $feature) : ?>
56 56
             <tr class="<?php echo esc_attr($feature['class']); ?>">
57 57
                 <td class="feature">
58 58
                     <h3>
Please login to merge, or discard this patch.
core/admin/templates/admin_details_wrapper_no_sidebar.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 <div id="<?php echo esc_attr($admin_page_wrapper_div_id); ?>">
10 10
     <div id="post-body" class="metabox-holder columns-1">
11 11
 
12
-        <?php if (! empty($admin_page_header)) : ?>
12
+        <?php if ( ! empty($admin_page_header)) : ?>
13 13
             <div id="admin-page-header">
14 14
                 <?php echo $admin_page_header; // already escaped ?>
15 15
             </div>
Please login to merge, or discard this patch.
core/admin/templates/admin_details_metabox_column_wrapper.template.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -19,11 +19,11 @@
 block discarded – undo
19 19
         </div> <!-- post-body-content -->
20 20
 
21 21
         <?php
22
-        // let's loop through the columns
23
-        for ($i = 1; $i <= $num_columns; $i++) {
24
-            $context = ($i === 1) ? 'normal' : 'side';
25
-            $context = ($i > 2) ? 'column' . $i : $context;
26
-            ?>
22
+		// let's loop through the columns
23
+		for ($i = 1; $i <= $num_columns; $i++) {
24
+			$context = ($i === 1) ? 'normal' : 'side';
25
+			$context = ($i > 2) ? 'column' . $i : $context;
26
+			?>
27 27
         <div id='postbox-container-<?php echo esc_attr($i); ?>' class='postbox-container'>
28 28
             <?php do_meta_boxes($current_page, $context, null); ?>
29 29
         </div>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
         // let's loop through the columns
23 23
         for ($i = 1; $i <= $num_columns; $i++) {
24 24
             $context = ($i === 1) ? 'normal' : 'side';
25
-            $context = ($i > 2) ? 'column' . $i : $context;
25
+            $context = ($i > 2) ? 'column'.$i : $context;
26 26
             ?>
27 27
         <div id='postbox-container-<?php echo esc_attr($i); ?>' class='postbox-container'>
28 28
             <?php do_meta_boxes($current_page, $context, null); ?>
Please login to merge, or discard this patch.