Completed
Branch decaf-fixes/main (0c91cf)
by
unknown
07:32 queued 02:36
created
admin_pages/messages/templates/ee_msg_messages_help_tab.template.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <h2><?php esc_html_e('What is the Event Espresso Messages System?', 'event_espresso'); ?></h2>
2 2
 <p>
3 3
     <?php printf(
4
-        esc_html__(
5
-            'The Event Espresso Messages system is a powerful framework that Event Espresso uses to prepare %1$smessages%2$s for different types of use (message types) and delivered by different %1$smessengers%2$s.',
6
-            'event_espresso'
7
-        ),
8
-        '<strong>',
9
-        '</strong>'
10
-    ); ?></p>
4
+		esc_html__(
5
+			'The Event Espresso Messages system is a powerful framework that Event Espresso uses to prepare %1$smessages%2$s for different types of use (message types) and delivered by different %1$smessengers%2$s.',
6
+			'event_espresso'
7
+		),
8
+		'<strong>',
9
+		'</strong>'
10
+	); ?></p>
11 11
 <p>
12 12
     <?php esc_html_e(
13
-        'We\'ve intentionally created this framework so that we have as much flexibility as possible for future ideas that we think of (or customers think of) for the kinds of messages that get sent out related to your events.',
14
-        'event_espresso'
15
-    ); ?></p>
16 13
\ No newline at end of file
14
+		'We\'ve intentionally created this framework so that we have as much flexibility as possible for future ideas that we think of (or customers think of) for the kinds of messages that get sent out related to your events.',
15
+		'event_espresso'
16
+	); ?></p>
17 17
\ No newline at end of file
Please login to merge, or discard this patch.
messages/templates/ee_msg_details_main_edit_meta_box.template.php 3 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <div id="admin-primary-mbox-dv" class="admin-primary-mbox-dv">
2 2
 
3
-    <h3 class="admin-primary-mbox-h4"><?php echo isset($event_name) ? $event_name . ' Custom Template' : ''; ?></h3>
3
+    <h3 class="admin-primary-mbox-h4"><?php echo isset($event_name) ? $event_name.' Custom Template' : ''; ?></h3>
4 4
     <input type="hidden" id="ee-msg-current-context" name="MTP_context" value="<?php echo $context; ?>"/>
5 5
     <!-- if this is not a global template then let's show the name and description fields -->
6 6
     <?php
7
-    if (! $MTP->is_global()) : ?>
7
+    if ( ! $MTP->is_global()) : ?>
8 8
         <div class="non-global-mtp-fields">
9 9
             <p>
10 10
                 <?php _e(
Please login to merge, or discard this patch.
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -4,21 +4,21 @@  discard block
 block discarded – undo
4 4
     <input type="hidden" id="ee-msg-current-context" name="MTP_context" value="<?php echo $context; ?>"/>
5 5
     <!-- if this is not a global template then let's show the name and description fields -->
6 6
     <?php
7
-    if (! $MTP->is_global()) : ?>
7
+	if (! $MTP->is_global()) : ?>
8 8
         <div class="non-global-mtp-fields">
9 9
             <p>
10 10
                 <?php _e(
11
-                    'This is a custom template.  Custom Templates have an editable name and description to help you differentiate between templates.',
12
-                    'event_espresso'
13
-                ); ?>
11
+					'This is a custom template.  Custom Templates have an editable name and description to help you differentiate between templates.',
12
+					'event_espresso'
13
+				); ?>
14 14
             </p>
15 15
             <div id="titlediv">
16 16
                 <div id="titlewrap">
17 17
                     <label for="title" class="label-MTP_name" style="visibility:hidden">
18 18
                         <?php _e(
19
-                            'Message Template Name:',
20
-                            'event_espresso'
21
-                        ); ?></label>
19
+							'Message Template Name:',
20
+							'event_espresso'
21
+						); ?></label>
22 22
                     <input id="title" type="text" class="regular-text" name="ee_msg_non_global_fields[MTP_name]"
23 23
                            value="<?php echo $MTP->name(); ?>">
24 24
                 </div>
@@ -27,29 +27,29 @@  discard block
 block discarded – undo
27 27
                 <label for="ee-msg-non-global-fields-MTP_description" class="label-MTP_description"
28 28
                        style="visibility:hidden;">
29 29
                     <?php _e(
30
-                        'Message Template Description:',
31
-                        'event_espresso'
32
-                    ); ?></label>
30
+						'Message Template Description:',
31
+						'event_espresso'
32
+					); ?></label>
33 33
                 <textarea id="ee-msg-non-global-fields-MTP_description" class="large-text"
34 34
                           name="ee_msg_non_global_fields[MTP_description]"><?php echo $MTP->description(); ?></textarea>
35 35
             </p>
36 36
         </div>
37 37
         <?php
38
-    else :
39
-        ?>
38
+	else :
39
+		?>
40 40
         <input type="hidden" name="ee_msg_non_global_fields[MTP_name]" value="<?php echo $MTP->name(); ?>">
41 41
         <input type="hidden" name="ee_msg_non_global_fields[MTP_description]"
42 42
                value="<?php echo $MTP->description(); ?>">
43 43
     <?php endif; ?>
44 44
     <!-- we need to loop through the template_fields so we know our structure -->
45 45
     <?php
46
-    if (isset($template_fields) && ! empty($template_fields) && ! is_wp_error($template_fields)) {
47
-        echo $template_fields;
48
-    } else {
49
-        ?>
46
+	if (isset($template_fields) && ! empty($template_fields) && ! is_wp_error($template_fields)) {
47
+		echo $template_fields;
48
+	} else {
49
+		?>
50 50
         <p><?php _e('Something has gone wrong, there are no template fields to output.', 'event_espresso'); ?></p>
51 51
         <?php
52
-    }
52
+	}
53 53
 
54
-    ?>
54
+	?>
55 55
 </div> <!-- end #admin-primary-mbox-dv -->
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,9 +35,12 @@
 block discarded – undo
35 35
             </p>
36 36
         </div>
37 37
         <?php
38
-    else :
38
+    else {
39
+    	:
39 40
         ?>
40
-        <input type="hidden" name="ee_msg_non_global_fields[MTP_name]" value="<?php echo $MTP->name(); ?>">
41
+        <input type="hidden" name="ee_msg_non_global_fields[MTP_name]" value="<?php echo $MTP->name();
42
+    }
43
+    ?>">
41 44
         <input type="hidden" name="ee_msg_non_global_fields[MTP_description]"
42 45
                value="<?php echo $MTP->description(); ?>">
43 46
     <?php endif; ?>
Please login to merge, or discard this patch.
messages/templates/ee_msg_details_messenger_meta_box.template.php 3 patches
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,8 +6,11 @@
 block discarded – undo
6 6
                  'This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.',
7 7
                  'event_espresso'
8 8
              ) . '</p>';
9
-    else : ?>
10
-        <p class="inactive-on-message <?php echo $hide_on_message; ?>">
9
+    else {
10
+    	: ?>
11
+        <p class="inactive-on-message <?php echo $hide_on_message;
12
+    }
13
+    ?>">
11 14
             <?php _e(
12 15
                 'Below are message types that are currently inactive with this messenger.  Drag them over to the messenger box to activate them.',
13 16
                 'event_espresso'
Please login to merge, or discard this patch.
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,28 +1,28 @@
 block discarded – undo
1 1
 <div class="<?php echo $messenger; ?>-content">
2 2
     <?php
3
-    if (empty($inactive_message_types) && empty($active_message_types)) :
4
-        echo '<p>'
5
-             . esc_html__(
6
-                 'This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.',
7
-                 'event_espresso'
8
-             ) . '</p>';
9
-    else : ?>
3
+	if (empty($inactive_message_types) && empty($active_message_types)) :
4
+		echo '<p>'
5
+			 . esc_html__(
6
+				 'This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.',
7
+				 'event_espresso'
8
+			 ) . '</p>';
9
+	else : ?>
10 10
         <p class="inactive-on-message <?php echo $hide_on_message; ?>">
11 11
             <?php _e(
12
-                'Below are message types that are currently inactive with this messenger.  Drag them over to the messenger box to activate them.',
13
-                'event_espresso'
14
-            ); ?>
12
+				'Below are message types that are currently inactive with this messenger.  Drag them over to the messenger box to activate them.',
13
+				'event_espresso'
14
+			); ?>
15 15
         <p>
16 16
         <p class="inactive-off-message <?php echo $hide_off_message; ?>">
17 17
             <?php _e(
18
-                'This messenger is currently inactive.  Once the messenger is activated any inactive message types associated with the messenger will be shown here.',
19
-                'event_espresso'
20
-            ); ?>
18
+				'This messenger is currently inactive.  Once the messenger is activated any inactive message types associated with the messenger will be shown here.',
19
+				'event_espresso'
20
+			); ?>
21 21
         </p>
22 22
         <div<?php
23
-        if ($active) :
24
-            ?> id="inactive-message-types"<?php
25
-        endif; ?>
23
+		if ($active) :
24
+			?> id="inactive-message-types"<?php
25
+		endif; ?>
26 26
             class="inactive-message-types mt-tab-container ui-widget-content-ui-state-default <?php echo $hide_on_message; ?>">
27 27
             <ul class="messenger-activation">
28 28
                 <?php echo $inactive_message_types; ?>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
              . esc_html__(
6 6
                  'This messenger is not currently used with any message types for templates but merely adds to the shortcodes available for templates on other messenger and message types.',
7 7
                  'event_espresso'
8
-             ) . '</p>';
8
+             ).'</p>';
9 9
     else : ?>
10 10
         <p class="inactive-on-message <?php echo $hide_on_message; ?>">
11 11
             <?php _e(
Please login to merge, or discard this patch.
admin_pages/messages/templates/ee_msg_message_type_help_tab.template.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,31 +1,31 @@
 block discarded – undo
1 1
 <h2><?php esc_html_e('What are Message Types?', 'event_espresso'); ?></h2>
2 2
 <p>
3 3
     <?php printf(
4
-        esc_html__(
5
-            'Message Types are the %1$skinds%2$s of messages that get delivered.  Think of them as the "type" of package that is being delivered by the messenger.  For example, Event Espresso comes with two Message Types attached to the Email messenger:  Registration Confirmation (which is triggered by frontend event registrations), and Payment Confirmation (which is triggered by frontend payments).',
6
-            'event_espresso'
7
-        ),
8
-        '<em>',
9
-        '</em>'
10
-    ); ?></p>
4
+		esc_html__(
5
+			'Message Types are the %1$skinds%2$s of messages that get delivered.  Think of them as the "type" of package that is being delivered by the messenger.  For example, Event Espresso comes with two Message Types attached to the Email messenger:  Registration Confirmation (which is triggered by frontend event registrations), and Payment Confirmation (which is triggered by frontend payments).',
6
+			'event_espresso'
7
+		),
8
+		'<em>',
9
+		'</em>'
10
+	); ?></p>
11 11
 <p>
12 12
     <?php esc_html_e(
13
-        'Future iterations of Event Espresso 4.0 (premium versions), will include more and more different message types that can be attached to the various messengers that are available',
14
-        'event_espresso'
15
-    ); ?></p>
13
+		'Future iterations of Event Espresso 4.0 (premium versions), will include more and more different message types that can be attached to the various messengers that are available',
14
+		'event_espresso'
15
+	); ?></p>
16 16
 
17 17
 <h3><?php esc_html_e('Contexts', 'event_espresso'); ?></h3>
18 18
 <p>
19 19
     <?php printf(
20
-        esc_html__(
21
-            'Each message type (or %1$skind%1$s of message remember!) has different contexts for messages created for that message type. Contexts are dynamic but generally speaking they tend to represent recipients. So for example, Registration Confirmation message type has three types of recipients for every time a registration confirmation is triggered: Event Administrator, Primary Registrant, and Registrant (which may be multiple messages if there are more than one attendee per event). Whereas the Payment Message Type only has two recipients (Event Administrator, Primary Registrant [the one making the payment]).',
22
-            'event_espresso'
23
-        ),
24
-        '<em>',
25
-        '</em>'
26
-    ); ?></p>
20
+		esc_html__(
21
+			'Each message type (or %1$skind%1$s of message remember!) has different contexts for messages created for that message type. Contexts are dynamic but generally speaking they tend to represent recipients. So for example, Registration Confirmation message type has three types of recipients for every time a registration confirmation is triggered: Event Administrator, Primary Registrant, and Registrant (which may be multiple messages if there are more than one attendee per event). Whereas the Payment Message Type only has two recipients (Event Administrator, Primary Registrant [the one making the payment]).',
22
+			'event_espresso'
23
+		),
24
+		'<em>',
25
+		'</em>'
26
+	); ?></p>
27 27
 <p>
28 28
     <?php esc_html_e(
29
-        'You will most likely never see the word "context" in any of the Messages system labelling because they are dynamic per message type.  Usually, contexts will be labelled "Recipients" but there may be cases down the road where a message type might use contexts to represent something totally different',
30
-        'event_espresso'
31
-    ); ?></p>
32 29
\ No newline at end of file
30
+		'You will most likely never see the word "context" in any of the Messages system labelling because they are dynamic per message type.  Usually, contexts will be labelled "Recipients" but there may be cases down the road where a message type might use contexts to represent something totally different',
31
+		'event_espresso'
32
+	); ?></p>
33 33
\ No newline at end of file
Please login to merge, or discard this patch.
templates/attendee_details_after_title_form_fields.template.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,17 +8,17 @@
 block discarded – undo
8 8
         <div id="titlewrap">
9 9
             <label class="hidden" id="attendee-first-name-text" for="ATT_fname">
10 10
                 <?php _e(
11
-                    'First Name:',
12
-                    'event_espresso'
13
-                ); ?></label>
11
+					'First Name:',
12
+					'event_espresso'
13
+				); ?></label>
14 14
             <input type="text" class="smaller-text-field" name="ATT_fname"
15 15
                    value="<?php echo $attendee->get('ATT_fname'); ?>" id="ATT_fname"
16 16
                    placeholder="<?php _e('First Name', 'event_espresso'); ?>" required>
17 17
             <label class="hidden" id="attendee-first-name-text" for="ATT_lname">
18 18
                 <?php _e(
19
-                    'Last Name:',
20
-                    'event_espresso'
21
-                ); ?></label>
19
+					'Last Name:',
20
+					'event_espresso'
21
+				); ?></label>
22 22
             <input type="text" class="smaller-text-field" name="ATT_lname"
23 23
                    value="<?php echo $attendee->get('ATT_lname'); ?>" id="ATT_lname"
24 24
                    placeholder="<?php _e('Last Name', 'event_espresso'); ?>">
Please login to merge, or discard this patch.
templates/reg_admin_details_main_meta_box_reg_details.template.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -7,18 +7,18 @@  discard block
 block discarded – undo
7 7
 
8 8
     <h3 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span>
9 9
         <?php _e(
10
-            'Registration Items',
11
-            'event_espresso'
12
-        ); ?></h3>
10
+			'Registration Items',
11
+			'event_espresso'
12
+		); ?></h3>
13 13
 
14 14
     <?php echo $line_item_table; ?>
15 15
 
16 16
     <a id="display-additional-registration-session-info" class="display-the-hidden smaller-text"
17 17
        rel="additional-registration-session-info">
18 18
         <span class="dashicons dashicons-plus-alt"></span><?php _e(
19
-            'view additional registration session details',
20
-            'event_espresso'
21
-        ); ?>
19
+			'view additional registration session details',
20
+			'event_espresso'
21
+		); ?>
22 22
     </a>
23 23
 
24 24
     <div id="additional-registration-session-info-dv" class="hidden">
@@ -26,9 +26,9 @@  discard block
 block discarded – undo
26 26
         <a id="hide-additional-registration-session-info" class="hide-the-displayed hidden smaller-text"
27 27
            rel="additional-registration-session-info">
28 28
             <span class="dashicons dashicons-dismiss"></span><?php _e(
29
-                'hide additional registration session details',
30
-                'event_espresso'
31
-            ); ?>
29
+				'hide additional registration session details',
30
+				'event_espresso'
31
+			); ?>
32 32
         </a>
33 33
         <br class="clear"/>
34 34
 
Please login to merge, or discard this patch.
templates/reg_admin_details_main_meta_box_attendees.template.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
                 <tbody>
21 21
 
22 22
                 <?php
23
-                foreach ($attendees as $att_nmbr => $attendee) : ?>
23
+				foreach ($attendees as $att_nmbr => $attendee) : ?>
24 24
                     <tr class="ee-status-strip reg-status-<?php echo $attendee['STS_ID']; ?>"
25 25
                         style="display: table-row;">
26 26
                         <td class="jst-left"><?php echo $att_nmbr; ?></td>
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
                         </td>
34 34
                         <td class="jst-rght">
35 35
                             <?php echo $currency_sign . ' ' . number_format(
36
-                                $attendee['final_price'],
37
-                                2
38
-                            ); ?></td>
36
+								$attendee['final_price'],
37
+								2
38
+							); ?></td>
39 39
                         <td class="jst-left"><?php echo $attendee['email']; ?></td>
40 40
                         <td class="jst-left"><?php echo $attendee['address']; ?></td>
41 41
                         <!--<th class="jst-cntr">view</th>-->
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
     <br/>
4 4
     <?php // echo EEH_Debug_Tools::printr( $event_attendees, 'event_attendees' ); ?>
5 5
     <?php echo $attendee_notice; ?>
6
-    <?php if (! empty($attendees)) : ?>
6
+    <?php if ( ! empty($attendees)) : ?>
7 7
         <div class="admin-primary-mbox-tbl-wrap">
8 8
             <table id="reg-admin-transaction-attendees-table" class="admin-primary-mbox-tbl">
9 9
                 <thead>
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
28 28
                         <td class="jst-left">
29 29
                             <a href="<?php echo $attendee['att_link']; ?>"
30 30
                                title="<?php esc_attr_e('View details for this attendee', 'event_espresso'); ?>">
31
-                                <?php echo $attendee['fname'] . ' ' . $attendee['lname']; ?>
31
+                                <?php echo $attendee['fname'].' '.$attendee['lname']; ?>
32 32
                             </a>
33 33
                         </td>
34 34
                         <td class="jst-rght">
35
-                            <?php echo $currency_sign . ' ' . number_format(
35
+                            <?php echo $currency_sign.' '.number_format(
36 36
                                 $attendee['final_price'],
37 37
                                 2
38 38
                             ); ?></td>
Please login to merge, or discard this patch.
registrations/templates/attendee_details_main_meta_box.template.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -23,16 +23,16 @@  discard block
 block discarded – undo
23 23
             <td>
24 24
                 <div class="validation-notice-dv">
25 25
                     <?php _e(
26
-                        'The following is  a required field',
27
-                        'event_espresso'
28
-                    ); ?></div>
26
+						'The following is  a required field',
27
+						'event_espresso'
28
+					); ?></div>
29 29
                 <input class="regular-text required" type="text" id="ATT_fname" name="ATT_fname"
30 30
                        value="<?php echo $attendee->fname(); ?>"/><br/>
31 31
                 <p class="description">
32 32
                     <?php _e(
33
-                        'The registrant\'s given name. ( required value )',
34
-                        'event_espresso'
35
-                    ); ?></p>
33
+						'The registrant\'s given name. ( required value )',
34
+						'event_espresso'
35
+					); ?></p>
36 36
             </td>
37 37
         </tr>
38 38
 
@@ -44,16 +44,16 @@  discard block
 block discarded – undo
44 44
             <td>
45 45
                 <div class="validation-notice-dv">
46 46
                     <?php _e(
47
-                        'The following is  a required field',
48
-                        'event_espresso'
49
-                    ); ?></div>
47
+						'The following is  a required field',
48
+						'event_espresso'
49
+					); ?></div>
50 50
                 <input class="regular-text required" type="text" id="ATT_lname" name="ATT_lname"
51 51
                        value="<?php echo $attendee->lname(); ?>"/><br/>
52 52
                 <p class="description">
53 53
                     <?php _e(
54
-                        'The registrant\'s family name. ( required value )',
55
-                        'event_espresso'
56
-                    ); ?></p>
54
+						'The registrant\'s family name. ( required value )',
55
+						'event_espresso'
56
+					); ?></p>
57 57
             </td>
58 58
         </tr>
59 59
 
@@ -65,9 +65,9 @@  discard block
 block discarded – undo
65 65
             <td>
66 66
                 <div class="validation-notice-dv">
67 67
                     <?php _e(
68
-                        'The following is  a required field',
69
-                        'event_espresso'
70
-                    ); ?></div>
68
+						'The following is  a required field',
69
+						'event_espresso'
70
+					); ?></div>
71 71
                 <input class="regular-text required" type="text" id="ATT_email" name="ATT_email"
72 72
                        value="<?php $attendee->f('ATT_email'); ?>"/><br/>
73 73
                 <p class="description"><?php _e('( required value )', 'event_espresso'); ?></p>
Please login to merge, or discard this patch.
registrations/templates/reg_admin_register_new_attendee.template.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <h1><span class="small-text not-bold">
2 2
         <?php _e(
3
-            'Adding Registration For: ',
4
-            'event_espresso'
5
-        ); ?></span><?php echo $event_name; ?></h1>
3
+			'Adding Registration For: ',
4
+			'event_espresso'
5
+		); ?></span><?php echo $event_name; ?></h1>
6 6
 <?php echo $step_content;
Please login to merge, or discard this patch.