Completed
Branch models-cleanup/model-relations (db5ca7)
by
unknown
13:03 queued 08:35
created
help_tabs/registrations_overview_table_column_headings.help_tab.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -6,11 +6,11 @@  discard block
 block discarded – undo
6 6
 <li>
7 7
 <strong><?php esc_html_e('ID', 'event_espresso'); ?></strong><br />
8 8
 <?php printf(
9
-    esc_html__(
10
-        'The is the numerical ID of an registration. This value is used internally for %s.',
11
-        'event_espresso'
12
-    ),
13
-    Domain::brandName()
9
+	esc_html__(
10
+		'The is the numerical ID of an registration. This value is used internally for %s.',
11
+		'event_espresso'
12
+	),
13
+	Domain::brandName()
14 14
 ); ?>
15 15
 </li>
16 16
 <li>
@@ -40,14 +40,14 @@  discard block
 block discarded – undo
40 40
 <li>
41 41
 <strong><?php esc_html_e('Actions', 'event_espresso'); ?></strong><br />
42 42
 <?php printf(
43
-    esc_html__(
44
-        'Using the action buttons you can View Registration Details %1$s, Edit Contact Details %2$s, Resend Registration Details %3$s, and View Transaction Details %4$s.',
45
-        'event_espresso'
46
-    ),
47
-    '<span class="dashicons dashicons-search"></span>',
48
-    '<span class="dashicons dashicons-businessman"></span>',
49
-    '<span class="ee-icon ee-icon-email-send"></span>',
50
-    '<span class="ee-icon ee-icon-cash"></span>'
43
+	esc_html__(
44
+		'Using the action buttons you can View Registration Details %1$s, Edit Contact Details %2$s, Resend Registration Details %3$s, and View Transaction Details %4$s.',
45
+		'event_espresso'
46
+	),
47
+	'<span class="dashicons dashicons-search"></span>',
48
+	'<span class="dashicons dashicons-businessman"></span>',
49
+	'<span class="ee-icon ee-icon-email-send"></span>',
50
+	'<span class="ee-icon ee-icon-cash"></span>'
51 51
 ); ?>
52 52
 </li>
53 53
 </ul>
54 54
\ No newline at end of file
Please login to merge, or discard this patch.
admin_pages/events/help_tabs/event_editor_save_new_event.help_tab.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -4,12 +4,12 @@
 block discarded – undo
4 4
 </p>
5 5
 <p class="ee-attention">
6 6
 <?php printf(
7
-    esc_html__(
8
-        'Notice: Due to a %1$scurrent bug in the WordPress core%2$s, your event should always have at least a title or description or excerpt. Saving an event without at least one of these fields filled out with information will result in your event not saving correctly. You will then need to recreate your event by clicking on the Add Event button.',
9
-        'event_espresso'
10
-    ),
11
-    '<a href="https://core.trac.wordpress.org/ticket/17115#comment:15">',
12
-    '</a>'
7
+	esc_html__(
8
+		'Notice: Due to a %1$scurrent bug in the WordPress core%2$s, your event should always have at least a title or description or excerpt. Saving an event without at least one of these fields filled out with information will result in your event not saving correctly. You will then need to recreate your event by clicking on the Add Event button.',
9
+		'event_espresso'
10
+	),
11
+	'<a href="https://core.trac.wordpress.org/ticket/17115#comment:15">',
12
+	'</a>'
13 13
 ); ?>
14 14
 </p>
15 15
 <ul>
Please login to merge, or discard this patch.
strategies/validation/EE_Credit_Card_Validation_Strategy.strategy.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -13,19 +13,19 @@
 block discarded – undo
13 13
 class EE_Credit_Card_Validation_Strategy extends EE_Text_Validation_Strategy
14 14
 {
15 15
 
16
-    /**
17
-     * @param null $validation_error_message
18
-     */
19
-    public function __construct($validation_error_message = null)
20
-    {
21
-        if (! $validation_error_message) {
22
-            $validation_error_message = __("Please enter a valid credit card number", "event_espresso");
23
-        }
24
-        parent::__construct(
25
-            $validation_error_message,
26
-            // @codingStandardsIgnoreStart
27
-            '~^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|2[2-7][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$~'
28
-            // @codingStandardsIgnoreEnd
29
-        );
30
-    }
16
+	/**
17
+	 * @param null $validation_error_message
18
+	 */
19
+	public function __construct($validation_error_message = null)
20
+	{
21
+		if (! $validation_error_message) {
22
+			$validation_error_message = __("Please enter a valid credit card number", "event_espresso");
23
+		}
24
+		parent::__construct(
25
+			$validation_error_message,
26
+			// @codingStandardsIgnoreStart
27
+			'~^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|2[2-7][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$~'
28
+			// @codingStandardsIgnoreEnd
29
+		);
30
+	}
31 31
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
      */
19 19
     public function __construct($validation_error_message = null)
20 20
     {
21
-        if (! $validation_error_message) {
21
+        if ( ! $validation_error_message) {
22 22
             $validation_error_message = __("Please enter a valid credit card number", "event_espresso");
23 23
         }
24 24
         parent::__construct(
Please login to merge, or discard this patch.
caffeinated/admin/extend/about/templates/ee4-overview.template.php 1 patch
Indentation   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -1,56 +1,56 @@  discard block
 block discarded – undo
1 1
 <div class="headline-feature">
2 2
     <h2 class="about-headline-callout"><?php esc_html_e('Welcome to Event Espresso 4!', 'event_espresso'); ?></h2>
3 3
     <p><?php
4
-        echo sprintf(
5
-            esc_html__(
6
-                'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Caffeinated/Regular version of Event Espresso, but we also have a hosted version called %sEvent Smart%s for customers that want to cut back on their hosting and security expenses.',
7
-                'event_espresso'
8
-            ),
9
-            '<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Caffeinated">',
10
-            '</a>'
11
-        ); ?></p>
4
+		echo sprintf(
5
+			esc_html__(
6
+				'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Caffeinated/Regular version of Event Espresso, but we also have a hosted version called %sEvent Smart%s for customers that want to cut back on their hosting and security expenses.',
7
+				'event_espresso'
8
+			),
9
+			'<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Caffeinated">',
10
+			'</a>'
11
+		); ?></p>
12 12
     <h2><?php
13
-        esc_html_e(
14
-            'Powering 40,000+ event websites; $100 million in ticket sales per year!',
15
-            'event_espresso'
16
-        ); ?></h2>
13
+		esc_html_e(
14
+			'Powering 40,000+ event websites; $100 million in ticket sales per year!',
15
+			'event_espresso'
16
+		); ?></h2>
17 17
     <p><?php
18
-        echo sprintf(
19
-            esc_html__(
20
-                'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The lite version of the plugin provides everything that you need to manage your event using WordPress.',
21
-                'event_espresso'
22
-            ),
23
-            '<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf" rel="nofollow">',
24
-            '</a>'
25
-        ); ?></p>
18
+		echo sprintf(
19
+			esc_html__(
20
+				'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The lite version of the plugin provides everything that you need to manage your event using WordPress.',
21
+				'event_espresso'
22
+			),
23
+			'<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf" rel="nofollow">',
24
+			'</a>'
25
+		); ?></p>
26 26
 </div>
27 27
     <div class="feature-section has-3-columns is-fullwidth three-col">
28 28
         <div class="column col">
29 29
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/publish_meta_box.jpg">
30 30
             <h3><?php esc_html_e('Optimized aesthetic', 'event_espresso'); ?></h3>
31 31
             <p><?php
32
-                esc_html_e(
33
-                    'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
34
-                    'event_espresso'
35
-                ); ?></p>
32
+				esc_html_e(
33
+					'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
34
+					'event_espresso'
35
+				); ?></p>
36 36
         </div>
37 37
         <div class="column col">
38 38
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/registrations-overview.jpg">
39 39
             <h3><?php esc_html_e('Integrated management', 'event_espresso'); ?></h3>
40 40
             <p><?php
41
-                esc_html_e(
42
-                    'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
43
-                    'event_espresso'
44
-                ); ?></p>
41
+				esc_html_e(
42
+					'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
43
+					'event_espresso'
44
+				); ?></p>
45 45
         </div>
46 46
         <div class="column col last-feature">
47 47
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/refined-bookkeeping.jpg">
48 48
             <h3><?php esc_html_e('Easy bookkeeping', 'event_espresso'); ?></h3>
49 49
             <p><?php
50
-                esc_html_e(
51
-                    'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
52
-                    'event_espresso'
53
-                ); ?></p>
50
+				esc_html_e(
51
+					'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
52
+					'event_espresso'
53
+				); ?></p>
54 54
         </div>
55 55
     </div>
56 56
 
@@ -62,16 +62,16 @@  discard block
 block discarded – undo
62 62
         <div class="column col">
63 63
             <h3><?php esc_html_e('Higher customer retention', 'event_espresso'); ?></h3>
64 64
             <p><?php
65
-                esc_html_e(
66
-                    'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
67
-                    'event_espresso'
68
-                ); ?></p>
65
+				esc_html_e(
66
+					'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
67
+					'event_espresso'
68
+				); ?></p>
69 69
             <h4><?php esc_html_e('Ticket selection boxes on any post page or post', 'event_espresso'); ?></h4>
70 70
             <p><?php
71
-                esc_html_e(
72
-                    'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
73
-                    'event_espresso'
74
-                ); ?></p>
71
+				esc_html_e(
72
+					'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
73
+					'event_espresso'
74
+				); ?></p>
75 75
         </div>
76 76
         <div class="column col last-feature about-colors-img">
77 77
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/registrtation-page-large.jpg">
@@ -85,21 +85,21 @@  discard block
 block discarded – undo
85 85
         <div class="column col">
86 86
             <h3><?php esc_html_e('Refined event management', 'event_espresso'); ?></h3>
87 87
             <p><?php
88
-                esc_html_e(
89
-                    'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
90
-                    'event_espresso'
91
-                ); ?></p>
88
+				esc_html_e(
89
+					'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
90
+					'event_espresso'
91
+				); ?></p>
92 92
             <h4><?php esc_html_e('Smoother price types, taxes, and price modifiers', 'event_espresso'); ?></h4>
93 93
             <p><?php
94
-                esc_html_e(
95
-                    'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
96
-                    'event_espresso'
97
-                ); ?>.</p>
94
+				esc_html_e(
95
+					'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
96
+					'event_espresso'
97
+				); ?>.</p>
98 98
             <p><?php
99
-                esc_html_e(
100
-                    'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
101
-                    'event_espresso'
102
-                ); ?></p>
99
+				esc_html_e(
100
+					'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
101
+					'event_espresso'
102
+				); ?></p>
103 103
         </div>
104 104
         <div class="column col last-feature about-themes-img">
105 105
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/event-management.jpg">
@@ -109,68 +109,68 @@  discard block
 block discarded – undo
109 109
 <hr>
110 110
 
111 111
     <h2 class="about-headline-callout"><?php
112
-        esc_html_e(
113
-            'People Like You Manage Event Registration with WordPress',
114
-            'event_espresso'
115
-        ); ?></h2>
112
+		esc_html_e(
113
+			'People Like You Manage Event Registration with WordPress',
114
+			'event_espresso'
115
+		); ?></h2>
116 116
     <div class="feature-section has-2-columns is-fullwidth two-col">
117 117
         <div class="column col">
118 118
             <p><?php
119
-                echo sprintf(
120
-                    esc_html__(
121
-                        'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
122
-                        'event_espresso'
123
-                    ),
124
-                    '<strong>',
125
-                    '</strong>'
126
-                ); ?></p>
127
-            <p><?php
128
-                esc_html_e(
129
-                    'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
130
-                    'event_espresso'
131
-                ); ?></p>
119
+				echo sprintf(
120
+					esc_html__(
121
+						'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
122
+						'event_espresso'
123
+					),
124
+					'<strong>',
125
+					'</strong>'
126
+				); ?></p>
127
+            <p><?php
128
+				esc_html_e(
129
+					'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
130
+					'event_espresso'
131
+				); ?></p>
132 132
         </div>
133 133
         <div class="column col">
134 134
             <p><?php
135
-                echo sprintf(
136
-                    esc_html__(
137
-                        'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
138
-                        'event_espresso'
139
-                    ),
140
-                    '<strong>',
141
-                    '</strong>'
142
-                ); ?></p>
143
-            <p><?php
144
-                esc_html_e(
145
-                    'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
146
-                    'event_espresso'
147
-                ); ?></p>
135
+				echo sprintf(
136
+					esc_html__(
137
+						'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
138
+						'event_espresso'
139
+					),
140
+					'<strong>',
141
+					'</strong>'
142
+				); ?></p>
143
+            <p><?php
144
+				esc_html_e(
145
+					'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
146
+					'event_espresso'
147
+				); ?></p>
148 148
         </div>
149 149
     </div>
150 150
 
151 151
     <div class="feature-section has-2-columns is-fullwidth two-col">
152 152
         <div class="column col">
153 153
             <h3><?php
154
-                esc_html_e(
155
-                    'Turn your blog into a complete event registration and management system',
156
-                    'event_espresso'
157
-                ); ?></h3>
158
-            <p><?php
159
-                esc_html_e(
160
-                    'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
161
-                    'event_espresso'
162
-                ); ?></p>
163
-            <p><?php
164
-                esc_html_e(
165
-                    'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
166
-                    'event_espresso'
167
-                ); ?></p>
168
-            <p><?php
169
-                echo sprintf(
170
-                    esc_html__('%sLearn more >>%s', 'event_espresso'),
171
-                    '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
172
-                    '</a>'
173
-                ); ?></p>
154
+				esc_html_e(
155
+					'Turn your blog into a complete event registration and management system',
156
+					'event_espresso'
157
+				); ?></h3>
158
+            <p><?php
159
+				esc_html_e(
160
+					'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
161
+					'event_espresso'
162
+				); ?></p>
163
+            <p><?php
164
+				esc_html_e(
165
+					'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
166
+					'event_espresso'
167
+				); ?></p>
168
+            <p><?php
169
+				echo sprintf(
170
+					esc_html__('%sLearn more >>%s', 'event_espresso'),
171
+					'<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
172
+					'</a>'
173
+				); ?></p>
174 174
         </div>
175 175
         <div class="column col"><img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg"></div>
176 176
     </div>
@@ -183,10 +183,10 @@  discard block
 block discarded – undo
183 183
     <div class="feature-section has-1-column is-fullwidth is-wide one-col">
184 184
         <div class="column col">
185 185
             <p><?php
186
-            esc_html_e(
187
-                'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
188
-                'event_espresso'
189
-            ); ?></p>
186
+			esc_html_e(
187
+				'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
188
+				'event_espresso'
189
+			); ?></p>
190 190
             <p><img class="about-overview-img" src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/multiple-themes.jpg"/></p>
191 191
         </div>
192 192
     </div>
Please login to merge, or discard this patch.
admin_pages/about/templates/ee4-overview.template.php 1 patch
Indentation   +124 added lines, -124 removed lines patch added patch discarded remove patch
@@ -1,24 +1,24 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 // maintenance mode on?
3 3
 if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
4
-    ?>
4
+	?>
5 5
     <div class="ee-attention">
6 6
         <h2 class="ee-maintenance-mode-callout">
7 7
             <?php esc_html_e(
8
-                'Event Espresso is in full maintenance mode.',
9
-                'event_espresso'
10
-            ); ?></h2>
8
+				'Event Espresso is in full maintenance mode.',
9
+				'event_espresso'
10
+			); ?></h2>
11 11
         <p>
12 12
             <?php
13
-            printf(
14
-                esc_html__(
15
-                    'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %sEvent Espresso Maintenance%s page.',
16
-                    'event_espresso'
17
-                ),
18
-                '<a href="admin.php?page=espresso_maintenance_settings">',
19
-                '</a>'
20
-            );
21
-            ?>
13
+			printf(
14
+				esc_html__(
15
+					'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %sEvent Espresso Maintenance%s page.',
16
+					'event_espresso'
17
+				),
18
+				'<a href="admin.php?page=espresso_maintenance_settings">',
19
+				'</a>'
20
+			);
21
+			?>
22 22
         </p>
23 23
     </div>
24 24
     <?php
@@ -27,62 +27,62 @@  discard block
 block discarded – undo
27 27
 <div class="headline-feature">
28 28
     <h2 class="about-headline-callout">
29 29
         <?php esc_html_e(
30
-            'Welcome to the Decaf (free) Version of Event Espresso 4!',
31
-            'event_espresso'
32
-        ); ?></h2>
30
+			'Welcome to the Decaf (free) Version of Event Espresso 4!',
31
+			'event_espresso'
32
+		); ?></h2>
33 33
     <p><?php
34
-        echo sprintf(
35
-            esc_html__(
36
-                'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Decaf version of Event Espresso, but we also have a premium version called %sEvent Espreso 4 Regular%s and a hosted version called %sEvent Smart%s (SaaS).',
37
-                'event_espresso'
38
-            ),
39
-            '<a href="?page=espresso_about&action=decafvpro">',
40
-            '</a>',
41
-            '<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf">',
42
-            '</a>'
43
-        ); ?></p>
34
+		echo sprintf(
35
+			esc_html__(
36
+				'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Decaf version of Event Espresso, but we also have a premium version called %sEvent Espreso 4 Regular%s and a hosted version called %sEvent Smart%s (SaaS).',
37
+				'event_espresso'
38
+			),
39
+			'<a href="?page=espresso_about&action=decafvpro">',
40
+			'</a>',
41
+			'<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf">',
42
+			'</a>'
43
+		); ?></p>
44 44
     <h2>
45 45
         <?php esc_html_e(
46
-            'Powering 40,000+ event websites; $100 million in ticket sales per year!',
47
-            'event_espresso'
48
-        ); ?></h2>
46
+			'Powering 40,000+ event websites; $100 million in ticket sales per year!',
47
+			'event_espresso'
48
+		); ?></h2>
49 49
     <p><?php
50
-        echo sprintf(
51
-            esc_html__(
52
-                'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The Decaf (free) version of the plugin provides everything that you need to manage your event using WordPress.',
53
-                'event_espresso'
54
-            ),
55
-            '<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=plugin_description_tab&amp;utm_content=EE4+Decaf">',
56
-            '</a>'
57
-        ); ?></p>
50
+		echo sprintf(
51
+			esc_html__(
52
+				'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The Decaf (free) version of the plugin provides everything that you need to manage your event using WordPress.',
53
+				'event_espresso'
54
+			),
55
+			'<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=plugin_description_tab&amp;utm_content=EE4+Decaf">',
56
+			'</a>'
57
+		); ?></p>
58 58
 </div>
59 59
     <div class="feature-section has-3-columns is-fullwidth three-col">
60 60
         <div class="column col">
61 61
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/publish_meta_box.jpg">
62 62
             <h3><?php esc_html_e('Optimized aesthetic', 'event_espresso'); ?></h3>
63 63
             <p><?php
64
-                esc_html_e(
65
-                    'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
66
-                    'event_espresso'
67
-                ); ?></p>
64
+				esc_html_e(
65
+					'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
66
+					'event_espresso'
67
+				); ?></p>
68 68
         </div>
69 69
         <div class="column col">
70 70
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/registrations-overview.jpg">
71 71
             <h3><?php esc_html_e('Integrated management', 'event_espresso'); ?></h3>
72 72
             <p><?php
73
-                esc_html_e(
74
-                    'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
75
-                    'event_espresso'
76
-                ); ?></p>
73
+				esc_html_e(
74
+					'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
75
+					'event_espresso'
76
+				); ?></p>
77 77
         </div>
78 78
         <div class="column col last-feature">
79 79
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/refined-bookkeeping.jpg">
80 80
             <h3><?php esc_html_e('Easy bookkeeping', 'event_espresso'); ?></h3>
81 81
             <p><?php
82
-                esc_html_e(
83
-                    'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
84
-                    'event_espresso'
85
-                ); ?></p>
82
+				esc_html_e(
83
+					'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
84
+					'event_espresso'
85
+				); ?></p>
86 86
         </div>
87 87
     </div>
88 88
 
@@ -92,16 +92,16 @@  discard block
 block discarded – undo
92 92
         <div class="column col">
93 93
             <h3><?php esc_html_e('Higher customer retention', 'event_espresso'); ?></h3>
94 94
             <p><?php
95
-                esc_html_e(
96
-                    'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
97
-                    'event_espresso'
98
-                ); ?></p>
95
+				esc_html_e(
96
+					'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
97
+					'event_espresso'
98
+				); ?></p>
99 99
             <h4><?php esc_html_e('Ticket selection boxes on any post page or post', 'event_espresso'); ?></h4>
100 100
             <p><?php
101
-                esc_html_e(
102
-                    'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
103
-                    'event_espresso'
104
-                ); ?></p>
101
+				esc_html_e(
102
+					'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
103
+					'event_espresso'
104
+				); ?></p>
105 105
         </div>
106 106
         <div class="column col last-feature about-colors-img">
107 107
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/registrtation-page-large.jpg">
@@ -112,22 +112,22 @@  discard block
 block discarded – undo
112 112
         <div class="column col">
113 113
             <h3><?php esc_html_e('Refined event management', 'event_espresso'); ?></h3>
114 114
             <p><?php
115
-                esc_html_e(
116
-                    'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
117
-                    'event_espresso'
118
-                ); ?></p>
115
+				esc_html_e(
116
+					'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
117
+					'event_espresso'
118
+				); ?></p>
119 119
             <h4><?php
120
-                esc_html_e('Smoother price types, taxes, and price modifiers', 'event_espresso'); ?></h4>
120
+				esc_html_e('Smoother price types, taxes, and price modifiers', 'event_espresso'); ?></h4>
121 121
             <p><?php
122
-                esc_html_e(
123
-                    'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
124
-                    'event_espresso'
125
-                ); ?>.</p>
122
+				esc_html_e(
123
+					'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
124
+					'event_espresso'
125
+				); ?>.</p>
126 126
             <p><?php
127
-                esc_html_e(
128
-                    'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
129
-                    'event_espresso'
130
-                ); ?></p>
127
+				esc_html_e(
128
+					'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
129
+					'event_espresso'
130
+				); ?></p>
131 131
         </div>
132 132
         <div class="column col last-feature about-themes-img">
133 133
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/event-management.jpg">
@@ -137,68 +137,68 @@  discard block
 block discarded – undo
137 137
 <hr>
138 138
 
139 139
     <h2 class="about-headline-callout"><?php
140
-        esc_html_e(
141
-            'People Like You Manage Event Registration with WordPress',
142
-            'event_espresso'
143
-        ); ?></h2>
140
+		esc_html_e(
141
+			'People Like You Manage Event Registration with WordPress',
142
+			'event_espresso'
143
+		); ?></h2>
144 144
     <div class="feature-section has-2-columns is-fullwidth two-col">
145 145
         <div class="column col">
146 146
             <p><?php
147
-                echo sprintf(
148
-                    esc_html__(
149
-                        'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
150
-                        'event_espresso'
151
-                    ),
152
-                    '<strong>',
153
-                    '</strong>'
154
-                ); ?></p>
155
-            <p><?php
156
-                esc_html_e(
157
-                    'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
158
-                    'event_espresso'
159
-                ); ?></p>
147
+				echo sprintf(
148
+					esc_html__(
149
+						'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
150
+						'event_espresso'
151
+					),
152
+					'<strong>',
153
+					'</strong>'
154
+				); ?></p>
155
+            <p><?php
156
+				esc_html_e(
157
+					'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
158
+					'event_espresso'
159
+				); ?></p>
160 160
         </div>
161 161
         <div class="column col">
162 162
             <p><?php
163
-                echo sprintf(
164
-                    esc_html__(
165
-                        'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
166
-                        'event_espresso'
167
-                    ),
168
-                    '<strong>',
169
-                    '</strong>'
170
-                ); ?></p>
171
-            <p><?php
172
-                esc_html_e(
173
-                    'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
174
-                    'event_espresso'
175
-                ); ?></p>
163
+				echo sprintf(
164
+					esc_html__(
165
+						'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
166
+						'event_espresso'
167
+					),
168
+					'<strong>',
169
+					'</strong>'
170
+				); ?></p>
171
+            <p><?php
172
+				esc_html_e(
173
+					'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
174
+					'event_espresso'
175
+				); ?></p>
176 176
         </div>
177 177
     </div>
178 178
 
179 179
     <div class="feature-section has-2-columns is-fullwidth two-col">
180 180
         <div class="column col">
181 181
             <h3><?php
182
-                esc_html_e(
183
-                    'Turn your blog into a complete event registration and management system',
184
-                    'event_espresso'
185
-                ); ?></h3>
186
-            <p><?php
187
-                esc_html_e(
188
-                    'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
189
-                    'event_espresso'
190
-                ); ?></p>
191
-            <p><?php
192
-                esc_html_e(
193
-                    'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
194
-                    'event_espresso'
195
-                ); ?></p>
196
-            <p><?php
197
-                echo sprintf(
198
-                    esc_html__('%sLearn more >>%s', 'event_espresso'),
199
-                    '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
200
-                    '</a>'
201
-                ); ?></p>
182
+				esc_html_e(
183
+					'Turn your blog into a complete event registration and management system',
184
+					'event_espresso'
185
+				); ?></h3>
186
+            <p><?php
187
+				esc_html_e(
188
+					'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
189
+					'event_espresso'
190
+				); ?></p>
191
+            <p><?php
192
+				esc_html_e(
193
+					'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
194
+					'event_espresso'
195
+				); ?></p>
196
+            <p><?php
197
+				echo sprintf(
198
+					esc_html__('%sLearn more >>%s', 'event_espresso'),
199
+					'<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
200
+					'</a>'
201
+				); ?></p>
202 202
         </div>
203 203
         <div class="column col"><img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg"></div>
204 204
     </div>
@@ -209,10 +209,10 @@  discard block
 block discarded – undo
209 209
     <div class="feature-section has-1-column is-fullwidth is-wide one-col">
210 210
         <div class="column col">
211 211
             <p><?php
212
-            esc_html_e(
213
-                'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
214
-                'event_espresso'
215
-            ); ?></p>
212
+			esc_html_e(
213
+				'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
214
+				'event_espresso'
215
+			); ?></p>
216 216
             <p><img class="about-overview-img" src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/multiple-themes.jpg"/></p>
217 217
         </div>
218 218
     </div>
Please login to merge, or discard this patch.
caffeinated/admin/extend/about/templates/whats_new.template.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
         ?>
23 23
         <?php printf(
24 24
             esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
25
-            '<a href="http://eventespresso.com/wiki/ee4-changelog/#' . $ver . '" target="_blank" rel="noopener noreferrer">',
25
+            '<a href="http://eventespresso.com/wiki/ee4-changelog/#'.$ver.'" target="_blank" rel="noopener noreferrer">',
26 26
             '</a>'
27 27
         ); ?>
28 28
     </p>
Please login to merge, or discard this patch.
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -1,58 +1,58 @@
 block discarded – undo
1 1
 <div class="changelog point-releases">
2 2
     <!-- <h3><?php echo esc_html(
3
-        _n('Minor Release Information', 'Minor Releases', 1, 'event_espresso')
4
-    ); ?></h3> -->
3
+		_n('Minor Release Information', 'Minor Releases', 1, 'event_espresso')
4
+	); ?></h3> -->
5 5
     <h3><?php echo esc_html(
6
-        _n('Major Release Information', 'Major Releases', 1, 'event_espresso')
7
-    ); ?></h3>
6
+		_n('Major Release Information', 'Major Releases', 1, 'event_espresso')
7
+	); ?></h3>
8 8
     <?php // $type = 'minor'; ?>
9 9
     <?php $type = 'major'; ?>
10 10
     <p><?php
11
-        printf(
12
-            esc_html__('%1$sVersion %2$s%3$s is a %4$s release.', 'event_espresso'),
13
-            '<strong>',
14
-            EVENT_ESPRESSO_VERSION,
15
-            '</strong>',
16
-            $type
17
-        ); ?>
11
+		printf(
12
+			esc_html__('%1$sVersion %2$s%3$s is a %4$s release.', 'event_espresso'),
13
+			'<strong>',
14
+			EVENT_ESPRESSO_VERSION,
15
+			'</strong>',
16
+			$type
17
+		); ?>
18 18
         <?php
19
-        $ver = explode('.', EVENT_ESPRESSO_VERSION);
20
-        array_pop($ver);
21
-        $ver = implode('.', $ver);
22
-        ?>
19
+		$ver = explode('.', EVENT_ESPRESSO_VERSION);
20
+		array_pop($ver);
21
+		$ver = implode('.', $ver);
22
+		?>
23 23
         <?php printf(
24
-            esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
25
-            '<a href="http://eventespresso.com/wiki/ee4-changelog/#' . $ver . '" target="_blank" rel="noopener noreferrer">',
26
-            '</a>'
27
-        ); ?>
24
+			esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
25
+			'<a href="http://eventespresso.com/wiki/ee4-changelog/#' . $ver . '" target="_blank" rel="noopener noreferrer">',
26
+			'</a>'
27
+		); ?>
28 28
     </p>
29 29
 </div><!-- end .changelog .point-releases -->
30 30
 
31 31
 <div class="changelog">
32 32
     <?php
33
-    // maintenance mode on?
34
-    if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
35
-        ?>
33
+	// maintenance mode on?
34
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
35
+		?>
36 36
         <div class="ee-attention">
37 37
             <h2 class="ee-maintenance-mode-callout"><?php
38
-                esc_html_e('Event Espresso is in full maintenance mode.', 'event_espresso');
39
-            ?></h2>
38
+				esc_html_e('Event Espresso is in full maintenance mode.', 'event_espresso');
39
+			?></h2>
40 40
             <p>
41 41
                 <?php
42
-                printf(
43
-                    esc_html__(
44
-                        'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %1$sEvent Espresso Maintenance%2$s page.',
45
-                        'event_espresso'
46
-                    ),
47
-                    '<a href="admin.php?page=espresso_maintenance_settings">',
48
-                    '</a>'
49
-                );
50
-                ?>
42
+				printf(
43
+					esc_html__(
44
+						'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %1$sEvent Espresso Maintenance%2$s page.',
45
+						'event_espresso'
46
+					),
47
+					'<a href="admin.php?page=espresso_maintenance_settings">',
48
+					'</a>'
49
+				);
50
+				?>
51 51
             </p>
52 52
         </div>
53 53
         <?php
54
-    }
55
-    ?>
54
+	}
55
+	?>
56 56
 
57 57
     <h2 class="about-headline-callout">Updates &amp; Fixes in EE 4.11</h2>
58 58
     <p>This release introduces an improved event editor, support for recurring events, and improvements to existing core features. Here are the most interesting updates:</p>
Please login to merge, or discard this patch.
core/domain/services/admin/ajax/ThankYouPageIpnMonitor.php 2 patches
Indentation   +219 added lines, -219 removed lines patch added patch discarded remove patch
@@ -22,239 +22,239 @@
 block discarded – undo
22 22
 class ThankYouPageIpnMonitor
23 23
 {
24 24
 
25
-    /**
26
-     * @var string $heartbeat
27
-     */
28
-    private $heartbeat;
25
+	/**
26
+	 * @var string $heartbeat
27
+	 */
28
+	private $heartbeat;
29 29
 
30
-    /**
31
-     * @var EED_Thank_You_Page $thank_you_page
32
-     */
33
-    private $thank_you_page;
30
+	/**
31
+	 * @var EED_Thank_You_Page $thank_you_page
32
+	 */
33
+	private $thank_you_page;
34 34
 
35
-    /**
36
-     * @var EE_Transaction $transaction
37
-     */
38
-    private $transaction;
35
+	/**
36
+	 * @var EE_Transaction $transaction
37
+	 */
38
+	private $transaction;
39 39
 
40 40
 
41
-    /**
42
-     * EventEditorHeartbeat constructor.
43
-     */
44
-    public function __construct()
45
-    {
46
-        $this->heartbeat = WordpressHeartbeat::RESPONSE_KEY_THANK_YOU_PAGE;
47
-        add_filter('heartbeat_received', array($this, 'heartbeatResponse'), 10, 3);
48
-        add_filter('heartbeat_nopriv_received', array($this, 'heartbeatResponse'), 10, 3);
49
-    }
41
+	/**
42
+	 * EventEditorHeartbeat constructor.
43
+	 */
44
+	public function __construct()
45
+	{
46
+		$this->heartbeat = WordpressHeartbeat::RESPONSE_KEY_THANK_YOU_PAGE;
47
+		add_filter('heartbeat_received', array($this, 'heartbeatResponse'), 10, 3);
48
+		add_filter('heartbeat_nopriv_received', array($this, 'heartbeatResponse'), 10, 3);
49
+	}
50 50
 
51 51
 
52
-    /**
53
-     * thank_you_page_IPN_monitor
54
-     * this basically just pulls the TXN based on the reg_url_link sent from the server,
55
-     * then checks that the TXN status is not failed, and that no other errors have been generated.
56
-     * it also calculates the IPN wait time since the Thank You page was first loaded
57
-     *
58
-     * @param array $response
59
-     * @param array $data
60
-     * @return array
61
-     * @throws EE_Error
62
-     * @throws InvalidArgumentException
63
-     * @throws InvalidDataTypeException
64
-     * @throws InvalidInterfaceException
65
-     * @throws ReflectionException
66
-     */
67
-    public function heartbeatResponse($response = array(), $data = array())
68
-    {
69
-        // does this heartbeat contain our data ?
70
-        if (! isset($data[ $this->heartbeat ])) {
71
-            return $response;
72
-        }
73
-        // check for reg_url_link in the incoming heartbeat data
74
-        if (! isset($data[ $this->heartbeat ]['e_reg_url_link'])) {
75
-            $response[ $this->heartbeat ] = array(
76
-                'errors' => ! empty($notices['errors'])
77
-                    ? $notices['errors']
78
-                    : __(
79
-                        'No transaction information could be retrieved because the registration URL link is missing or invalid.',
80
-                        'event_espresso'
81
-                    ),
82
-            );
83
-            return $response;
84
-        }
85
-        // kk heartbeat has our data
86
-        $response = $this->initializeThankYouPageAndTransaction($response, $data);
87
-        // if something went wrong...
88
-        if (isset($response[ $this->heartbeat ]['errors'])) {
89
-            return $response;
90
-        }
91
-        // grab transient of Transaction's status
92
-        $txn_status = isset($data[ $this->heartbeat ]['txn_status'])
93
-            ? $data[ $this->heartbeat ]['txn_status']
94
-            : null;
95
-        $response = $this->getTransactionDetails($txn_status, $response, $data);
96
-        // no payment data yet?
97
-        if (isset($response[ $this->heartbeat ]['still_waiting'])) {
98
-            return $response;
99
-        }
100
-        // TXN is happening so let's get the payments now
101
-        // if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
102
-        $since = isset($data[ $this->heartbeat ]['get_payments_since'])
103
-            ? $data[ $this->heartbeat ]['get_payments_since']
104
-            : 0;
105
-        return $this->paymentDetails($response, $since);
106
-    }
52
+	/**
53
+	 * thank_you_page_IPN_monitor
54
+	 * this basically just pulls the TXN based on the reg_url_link sent from the server,
55
+	 * then checks that the TXN status is not failed, and that no other errors have been generated.
56
+	 * it also calculates the IPN wait time since the Thank You page was first loaded
57
+	 *
58
+	 * @param array $response
59
+	 * @param array $data
60
+	 * @return array
61
+	 * @throws EE_Error
62
+	 * @throws InvalidArgumentException
63
+	 * @throws InvalidDataTypeException
64
+	 * @throws InvalidInterfaceException
65
+	 * @throws ReflectionException
66
+	 */
67
+	public function heartbeatResponse($response = array(), $data = array())
68
+	{
69
+		// does this heartbeat contain our data ?
70
+		if (! isset($data[ $this->heartbeat ])) {
71
+			return $response;
72
+		}
73
+		// check for reg_url_link in the incoming heartbeat data
74
+		if (! isset($data[ $this->heartbeat ]['e_reg_url_link'])) {
75
+			$response[ $this->heartbeat ] = array(
76
+				'errors' => ! empty($notices['errors'])
77
+					? $notices['errors']
78
+					: __(
79
+						'No transaction information could be retrieved because the registration URL link is missing or invalid.',
80
+						'event_espresso'
81
+					),
82
+			);
83
+			return $response;
84
+		}
85
+		// kk heartbeat has our data
86
+		$response = $this->initializeThankYouPageAndTransaction($response, $data);
87
+		// if something went wrong...
88
+		if (isset($response[ $this->heartbeat ]['errors'])) {
89
+			return $response;
90
+		}
91
+		// grab transient of Transaction's status
92
+		$txn_status = isset($data[ $this->heartbeat ]['txn_status'])
93
+			? $data[ $this->heartbeat ]['txn_status']
94
+			: null;
95
+		$response = $this->getTransactionDetails($txn_status, $response, $data);
96
+		// no payment data yet?
97
+		if (isset($response[ $this->heartbeat ]['still_waiting'])) {
98
+			return $response;
99
+		}
100
+		// TXN is happening so let's get the payments now
101
+		// if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
102
+		$since = isset($data[ $this->heartbeat ]['get_payments_since'])
103
+			? $data[ $this->heartbeat ]['get_payments_since']
104
+			: 0;
105
+		return $this->paymentDetails($response, $since);
106
+	}
107 107
 
108 108
 
109
-    /**
110
-     * @param array $response
111
-     * @param array $data
112
-     * @return array
113
-     * @throws EE_Error
114
-     * @throws InvalidArgumentException
115
-     * @throws InvalidDataTypeException
116
-     * @throws InvalidInterfaceException
117
-     */
118
-    private function initializeThankYouPageAndTransaction($response, $data)
119
-    {
120
-        require_once EE_MODULES . 'thank_you_page/EED_Thank_You_Page.module.php';
121
-        // set_definitions, instantiate the thank you page class, and get the ball rolling
122
-        EED_Thank_You_Page::set_definitions();
123
-        $this->thank_you_page = EED_Thank_You_Page::instance();
124
-        $this->thank_you_page->set_reg_url_link($data[ $this->heartbeat ]['e_reg_url_link']);
125
-        $this->thank_you_page->init();
126
-        // get TXN
127
-        $transaction = $this->thank_you_page->get_txn();
128
-        // no TXN? then get out
129
-        if (! $transaction instanceof EE_Transaction) {
130
-            $notices = EE_Error::get_notices();
131
-            $response[ $this->heartbeat ] = array(
132
-                'errors' => ! empty($notices['errors'])
133
-                    ? $notices['errors']
134
-                    : sprintf(
135
-                        __(
136
-                            'The information for your transaction could not be retrieved from the server or the transaction data received was invalid because of a technical reason. (%s)',
137
-                            'event_espresso'
138
-                        ),
139
-                        __LINE__
140
-                    ),
141
-            );
142
-            return $response;
143
-        }
144
-        $this->transaction = $transaction;
145
-        return $response;
146
-    }
109
+	/**
110
+	 * @param array $response
111
+	 * @param array $data
112
+	 * @return array
113
+	 * @throws EE_Error
114
+	 * @throws InvalidArgumentException
115
+	 * @throws InvalidDataTypeException
116
+	 * @throws InvalidInterfaceException
117
+	 */
118
+	private function initializeThankYouPageAndTransaction($response, $data)
119
+	{
120
+		require_once EE_MODULES . 'thank_you_page/EED_Thank_You_Page.module.php';
121
+		// set_definitions, instantiate the thank you page class, and get the ball rolling
122
+		EED_Thank_You_Page::set_definitions();
123
+		$this->thank_you_page = EED_Thank_You_Page::instance();
124
+		$this->thank_you_page->set_reg_url_link($data[ $this->heartbeat ]['e_reg_url_link']);
125
+		$this->thank_you_page->init();
126
+		// get TXN
127
+		$transaction = $this->thank_you_page->get_txn();
128
+		// no TXN? then get out
129
+		if (! $transaction instanceof EE_Transaction) {
130
+			$notices = EE_Error::get_notices();
131
+			$response[ $this->heartbeat ] = array(
132
+				'errors' => ! empty($notices['errors'])
133
+					? $notices['errors']
134
+					: sprintf(
135
+						__(
136
+							'The information for your transaction could not be retrieved from the server or the transaction data received was invalid because of a technical reason. (%s)',
137
+							'event_espresso'
138
+						),
139
+						__LINE__
140
+					),
141
+			);
142
+			return $response;
143
+		}
144
+		$this->transaction = $transaction;
145
+		return $response;
146
+	}
147 147
 
148 148
 
149
-    /**
150
-     * @param string $txn_status
151
-     * @param array  $response
152
-     * @param array  $data
153
-     * @return array
154
-     * @throws EE_Error
155
-     * @throws InvalidArgumentException
156
-     * @throws InvalidDataTypeException
157
-     * @throws InvalidInterfaceException
158
-     * @throws ReflectionException
159
-     */
160
-    private function getTransactionDetails($txn_status, $response, $data)
161
-    {
162
-        // has the TXN status changed since we last checked (or empty because this is the first time running through this code)?
163
-        if ($txn_status !== $this->transaction->status_ID()) {
164
-            // switch between two possible basic outcomes
165
-            switch ($this->transaction->status_ID()) {
166
-                // TXN has been updated in some way
167
-                case EEM_Transaction::overpaid_status_code:
168
-                case EEM_Transaction::complete_status_code:
169
-                case EEM_Transaction::incomplete_status_code:
170
-                    // send updated TXN results back to client,
171
-                    return $this->setTransactionDetails($response);
172
-                // or we have a bad TXN, or really slow IPN, so calculate the wait time and send that back...
173
-                case EEM_Transaction::failed_status_code:
174
-                default:
175
-                    // keep on waiting...
176
-                    return $this->updateServerWaitTime($data[ $this->heartbeat ]);
177
-            }
178
-            // or is the TXN still failed (never been updated) ???
179
-        } elseif ($this->transaction->failed()) {
180
-            // keep on waiting...
181
-            return $this->updateServerWaitTime($data[ $this->heartbeat ]);
182
-        }
183
-        return $response;
184
-    }
149
+	/**
150
+	 * @param string $txn_status
151
+	 * @param array  $response
152
+	 * @param array  $data
153
+	 * @return array
154
+	 * @throws EE_Error
155
+	 * @throws InvalidArgumentException
156
+	 * @throws InvalidDataTypeException
157
+	 * @throws InvalidInterfaceException
158
+	 * @throws ReflectionException
159
+	 */
160
+	private function getTransactionDetails($txn_status, $response, $data)
161
+	{
162
+		// has the TXN status changed since we last checked (or empty because this is the first time running through this code)?
163
+		if ($txn_status !== $this->transaction->status_ID()) {
164
+			// switch between two possible basic outcomes
165
+			switch ($this->transaction->status_ID()) {
166
+				// TXN has been updated in some way
167
+				case EEM_Transaction::overpaid_status_code:
168
+				case EEM_Transaction::complete_status_code:
169
+				case EEM_Transaction::incomplete_status_code:
170
+					// send updated TXN results back to client,
171
+					return $this->setTransactionDetails($response);
172
+				// or we have a bad TXN, or really slow IPN, so calculate the wait time and send that back...
173
+				case EEM_Transaction::failed_status_code:
174
+				default:
175
+					// keep on waiting...
176
+					return $this->updateServerWaitTime($data[ $this->heartbeat ]);
177
+			}
178
+			// or is the TXN still failed (never been updated) ???
179
+		} elseif ($this->transaction->failed()) {
180
+			// keep on waiting...
181
+			return $this->updateServerWaitTime($data[ $this->heartbeat ]);
182
+		}
183
+		return $response;
184
+	}
185 185
 
186 186
 
187
-    /**
188
-     * @param array $response
189
-     * @param boolean $status_only
190
-     * @return array
191
-     * @throws EE_Error
192
-     * @throws InvalidArgumentException
193
-     * @throws InvalidDataTypeException
194
-     * @throws InvalidInterfaceException
195
-     * @throws ReflectionException
196
-     */
197
-    private function setTransactionDetails($response, $status_only = false)
198
-    {
199
-        if (! $status_only && ! isset($response[ $this->heartbeat ]['transaction_details'])) {
200
-            $response[ $this->heartbeat ]['transaction_details'] = $this->thank_you_page->get_transaction_details();
201
-        }
202
-        if (! isset($response[ $this->heartbeat ]['txn_status'])) {
203
-            $response[ $this->heartbeat ]['txn_status'] = $this->transaction->status_ID();
204
-        }
205
-        return $response;
206
-    }
187
+	/**
188
+	 * @param array $response
189
+	 * @param boolean $status_only
190
+	 * @return array
191
+	 * @throws EE_Error
192
+	 * @throws InvalidArgumentException
193
+	 * @throws InvalidDataTypeException
194
+	 * @throws InvalidInterfaceException
195
+	 * @throws ReflectionException
196
+	 */
197
+	private function setTransactionDetails($response, $status_only = false)
198
+	{
199
+		if (! $status_only && ! isset($response[ $this->heartbeat ]['transaction_details'])) {
200
+			$response[ $this->heartbeat ]['transaction_details'] = $this->thank_you_page->get_transaction_details();
201
+		}
202
+		if (! isset($response[ $this->heartbeat ]['txn_status'])) {
203
+			$response[ $this->heartbeat ]['txn_status'] = $this->transaction->status_ID();
204
+		}
205
+		return $response;
206
+	}
207 207
 
208 208
 
209
-    /**
210
-     * @param array $response
211
-     * @param int $since
212
-     * @return array
213
-     * @throws EE_Error
214
-     * @throws InvalidArgumentException
215
-     * @throws InvalidDataTypeException
216
-     * @throws InvalidInterfaceException
217
-     * @throws ReflectionException
218
-     */
219
-    private function paymentDetails($response, $since)
220
-    {
221
-        // then check for payments
222
-        $payments = $this->thank_you_page->get_txn_payments($since);
223
-        // has a payment been processed ?
224
-        if (! empty($payments) || $this->thank_you_page->isOfflinePaymentMethod()) {
225
-            if ($since) {
226
-                $response[ $this->heartbeat ]['new_payments'] = $this->thank_you_page->get_new_payments($payments);
227
-                $response = $this->setTransactionDetails($response);
228
-            } else {
229
-                $response[ $this->heartbeat ]['payment_details'] = $this->thank_you_page->get_payment_details(
230
-                    $payments
231
-                );
232
-            }
233
-            // reset time to check for payments
234
-            $response[ $this->heartbeat ]['get_payments_since'] = time();
235
-        } else {
236
-            $response[ $this->heartbeat ]['get_payments_since'] = $since;
237
-        }
238
-        return $response;
239
-    }
209
+	/**
210
+	 * @param array $response
211
+	 * @param int $since
212
+	 * @return array
213
+	 * @throws EE_Error
214
+	 * @throws InvalidArgumentException
215
+	 * @throws InvalidDataTypeException
216
+	 * @throws InvalidInterfaceException
217
+	 * @throws ReflectionException
218
+	 */
219
+	private function paymentDetails($response, $since)
220
+	{
221
+		// then check for payments
222
+		$payments = $this->thank_you_page->get_txn_payments($since);
223
+		// has a payment been processed ?
224
+		if (! empty($payments) || $this->thank_you_page->isOfflinePaymentMethod()) {
225
+			if ($since) {
226
+				$response[ $this->heartbeat ]['new_payments'] = $this->thank_you_page->get_new_payments($payments);
227
+				$response = $this->setTransactionDetails($response);
228
+			} else {
229
+				$response[ $this->heartbeat ]['payment_details'] = $this->thank_you_page->get_payment_details(
230
+					$payments
231
+				);
232
+			}
233
+			// reset time to check for payments
234
+			$response[ $this->heartbeat ]['get_payments_since'] = time();
235
+		} else {
236
+			$response[ $this->heartbeat ]['get_payments_since'] = $since;
237
+		}
238
+		return $response;
239
+	}
240 240
 
241 241
 
242
-    /**
243
-     * @param array $thank_you_page_data    thank you page portion of the incoming JSON array
244
-     *                                      from the WP heartbeat data
245
-     * @return array
246
-     * @throws EE_Error
247
-     * @throws InvalidArgumentException
248
-     * @throws InvalidDataTypeException
249
-     * @throws InvalidInterfaceException
250
-     * @throws ReflectionException
251
-     */
252
-    private function updateServerWaitTime($thank_you_page_data)
253
-    {
254
-        $response[ $this->heartbeat ]['still_waiting'] = isset($thank_you_page_data['initial_access'])
255
-            ? time() - $thank_you_page_data['initial_access']
256
-            : 0;
257
-        $response = $this->setTransactionDetails($response, true);
258
-        return $response;
259
-    }
242
+	/**
243
+	 * @param array $thank_you_page_data    thank you page portion of the incoming JSON array
244
+	 *                                      from the WP heartbeat data
245
+	 * @return array
246
+	 * @throws EE_Error
247
+	 * @throws InvalidArgumentException
248
+	 * @throws InvalidDataTypeException
249
+	 * @throws InvalidInterfaceException
250
+	 * @throws ReflectionException
251
+	 */
252
+	private function updateServerWaitTime($thank_you_page_data)
253
+	{
254
+		$response[ $this->heartbeat ]['still_waiting'] = isset($thank_you_page_data['initial_access'])
255
+			? time() - $thank_you_page_data['initial_access']
256
+			: 0;
257
+		$response = $this->setTransactionDetails($response, true);
258
+		return $response;
259
+	}
260 260
 }
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -67,12 +67,12 @@  discard block
 block discarded – undo
67 67
     public function heartbeatResponse($response = array(), $data = array())
68 68
     {
69 69
         // does this heartbeat contain our data ?
70
-        if (! isset($data[ $this->heartbeat ])) {
70
+        if ( ! isset($data[$this->heartbeat])) {
71 71
             return $response;
72 72
         }
73 73
         // check for reg_url_link in the incoming heartbeat data
74
-        if (! isset($data[ $this->heartbeat ]['e_reg_url_link'])) {
75
-            $response[ $this->heartbeat ] = array(
74
+        if ( ! isset($data[$this->heartbeat]['e_reg_url_link'])) {
75
+            $response[$this->heartbeat] = array(
76 76
                 'errors' => ! empty($notices['errors'])
77 77
                     ? $notices['errors']
78 78
                     : __(
@@ -85,22 +85,22 @@  discard block
 block discarded – undo
85 85
         // kk heartbeat has our data
86 86
         $response = $this->initializeThankYouPageAndTransaction($response, $data);
87 87
         // if something went wrong...
88
-        if (isset($response[ $this->heartbeat ]['errors'])) {
88
+        if (isset($response[$this->heartbeat]['errors'])) {
89 89
             return $response;
90 90
         }
91 91
         // grab transient of Transaction's status
92
-        $txn_status = isset($data[ $this->heartbeat ]['txn_status'])
93
-            ? $data[ $this->heartbeat ]['txn_status']
92
+        $txn_status = isset($data[$this->heartbeat]['txn_status'])
93
+            ? $data[$this->heartbeat]['txn_status']
94 94
             : null;
95 95
         $response = $this->getTransactionDetails($txn_status, $response, $data);
96 96
         // no payment data yet?
97
-        if (isset($response[ $this->heartbeat ]['still_waiting'])) {
97
+        if (isset($response[$this->heartbeat]['still_waiting'])) {
98 98
             return $response;
99 99
         }
100 100
         // TXN is happening so let's get the payments now
101 101
         // if we've already gotten payments then the heartbeat data will contain the timestamp of the last time we checked
102
-        $since = isset($data[ $this->heartbeat ]['get_payments_since'])
103
-            ? $data[ $this->heartbeat ]['get_payments_since']
102
+        $since = isset($data[$this->heartbeat]['get_payments_since'])
103
+            ? $data[$this->heartbeat]['get_payments_since']
104 104
             : 0;
105 105
         return $this->paymentDetails($response, $since);
106 106
     }
@@ -117,18 +117,18 @@  discard block
 block discarded – undo
117 117
      */
118 118
     private function initializeThankYouPageAndTransaction($response, $data)
119 119
     {
120
-        require_once EE_MODULES . 'thank_you_page/EED_Thank_You_Page.module.php';
120
+        require_once EE_MODULES.'thank_you_page/EED_Thank_You_Page.module.php';
121 121
         // set_definitions, instantiate the thank you page class, and get the ball rolling
122 122
         EED_Thank_You_Page::set_definitions();
123 123
         $this->thank_you_page = EED_Thank_You_Page::instance();
124
-        $this->thank_you_page->set_reg_url_link($data[ $this->heartbeat ]['e_reg_url_link']);
124
+        $this->thank_you_page->set_reg_url_link($data[$this->heartbeat]['e_reg_url_link']);
125 125
         $this->thank_you_page->init();
126 126
         // get TXN
127 127
         $transaction = $this->thank_you_page->get_txn();
128 128
         // no TXN? then get out
129
-        if (! $transaction instanceof EE_Transaction) {
129
+        if ( ! $transaction instanceof EE_Transaction) {
130 130
             $notices = EE_Error::get_notices();
131
-            $response[ $this->heartbeat ] = array(
131
+            $response[$this->heartbeat] = array(
132 132
                 'errors' => ! empty($notices['errors'])
133 133
                     ? $notices['errors']
134 134
                     : sprintf(
@@ -173,12 +173,12 @@  discard block
 block discarded – undo
173 173
                 case EEM_Transaction::failed_status_code:
174 174
                 default:
175 175
                     // keep on waiting...
176
-                    return $this->updateServerWaitTime($data[ $this->heartbeat ]);
176
+                    return $this->updateServerWaitTime($data[$this->heartbeat]);
177 177
             }
178 178
             // or is the TXN still failed (never been updated) ???
179 179
         } elseif ($this->transaction->failed()) {
180 180
             // keep on waiting...
181
-            return $this->updateServerWaitTime($data[ $this->heartbeat ]);
181
+            return $this->updateServerWaitTime($data[$this->heartbeat]);
182 182
         }
183 183
         return $response;
184 184
     }
@@ -196,11 +196,11 @@  discard block
 block discarded – undo
196 196
      */
197 197
     private function setTransactionDetails($response, $status_only = false)
198 198
     {
199
-        if (! $status_only && ! isset($response[ $this->heartbeat ]['transaction_details'])) {
200
-            $response[ $this->heartbeat ]['transaction_details'] = $this->thank_you_page->get_transaction_details();
199
+        if ( ! $status_only && ! isset($response[$this->heartbeat]['transaction_details'])) {
200
+            $response[$this->heartbeat]['transaction_details'] = $this->thank_you_page->get_transaction_details();
201 201
         }
202
-        if (! isset($response[ $this->heartbeat ]['txn_status'])) {
203
-            $response[ $this->heartbeat ]['txn_status'] = $this->transaction->status_ID();
202
+        if ( ! isset($response[$this->heartbeat]['txn_status'])) {
203
+            $response[$this->heartbeat]['txn_status'] = $this->transaction->status_ID();
204 204
         }
205 205
         return $response;
206 206
     }
@@ -221,19 +221,19 @@  discard block
 block discarded – undo
221 221
         // then check for payments
222 222
         $payments = $this->thank_you_page->get_txn_payments($since);
223 223
         // has a payment been processed ?
224
-        if (! empty($payments) || $this->thank_you_page->isOfflinePaymentMethod()) {
224
+        if ( ! empty($payments) || $this->thank_you_page->isOfflinePaymentMethod()) {
225 225
             if ($since) {
226
-                $response[ $this->heartbeat ]['new_payments'] = $this->thank_you_page->get_new_payments($payments);
226
+                $response[$this->heartbeat]['new_payments'] = $this->thank_you_page->get_new_payments($payments);
227 227
                 $response = $this->setTransactionDetails($response);
228 228
             } else {
229
-                $response[ $this->heartbeat ]['payment_details'] = $this->thank_you_page->get_payment_details(
229
+                $response[$this->heartbeat]['payment_details'] = $this->thank_you_page->get_payment_details(
230 230
                     $payments
231 231
                 );
232 232
             }
233 233
             // reset time to check for payments
234
-            $response[ $this->heartbeat ]['get_payments_since'] = time();
234
+            $response[$this->heartbeat]['get_payments_since'] = time();
235 235
         } else {
236
-            $response[ $this->heartbeat ]['get_payments_since'] = $since;
236
+            $response[$this->heartbeat]['get_payments_since'] = $since;
237 237
         }
238 238
         return $response;
239 239
     }
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
      */
252 252
     private function updateServerWaitTime($thank_you_page_data)
253 253
     {
254
-        $response[ $this->heartbeat ]['still_waiting'] = isset($thank_you_page_data['initial_access'])
254
+        $response[$this->heartbeat]['still_waiting'] = isset($thank_you_page_data['initial_access'])
255 255
             ? time() - $thank_you_page_data['initial_access']
256 256
             : 0;
257 257
         $response = $this->setTransactionDetails($response, true);
Please login to merge, or discard this patch.
core/domain/services/admin/ajax/WordpressHeartbeat.php 2 patches
Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -17,52 +17,52 @@
 block discarded – undo
17 17
 class WordpressHeartbeat
18 18
 {
19 19
 
20
-    const RESPONSE_KEY_THANK_YOU_PAGE = 'espresso_thank_you_page';
20
+	const RESPONSE_KEY_THANK_YOU_PAGE = 'espresso_thank_you_page';
21 21
 
22
-    /**
23
-     * @var LoaderInterface $loader
24
-     */
25
-    protected $loader;
22
+	/**
23
+	 * @var LoaderInterface $loader
24
+	 */
25
+	protected $loader;
26 26
 
27
-    /**
28
-     * @var RequestInterface $request
29
-     */
30
-    protected $request;
27
+	/**
28
+	 * @var RequestInterface $request
29
+	 */
30
+	protected $request;
31 31
 
32 32
 
33
-    /**
34
-     * WordpressHeartbeat constructor.
35
-     *
36
-     * @param LoaderInterface  $loader
37
-     * @param RequestInterface $request
38
-     */
39
-    public function __construct(
40
-        LoaderInterface $loader,
41
-        RequestInterface $request
42
-    ) {
43
-        $this->loader = $loader;
44
-        $this->request = $request;
45
-        do_action('AHEE__EventEspresso_core_domain_services_admin_ajax_WordpressHeartbeat__constructor', $this);
46
-        add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'resolveRoutes'));
47
-    }
33
+	/**
34
+	 * WordpressHeartbeat constructor.
35
+	 *
36
+	 * @param LoaderInterface  $loader
37
+	 * @param RequestInterface $request
38
+	 */
39
+	public function __construct(
40
+		LoaderInterface $loader,
41
+		RequestInterface $request
42
+	) {
43
+		$this->loader = $loader;
44
+		$this->request = $request;
45
+		do_action('AHEE__EventEspresso_core_domain_services_admin_ajax_WordpressHeartbeat__constructor', $this);
46
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'resolveRoutes'));
47
+	}
48 48
 
49 49
 
50
-    /**
51
-     * @since 4.9.76.p
52
-     * @throws InvalidClassException
53
-     */
54
-    public function resolveRoutes()
55
-    {
56
-        $screenID = $this->request->getRequestParam('screen_id');
57
-        $heartbeat_data = $this->request->getRequestParam('data', []);
58
-        if ($screenID === 'espresso_events') {
59
-            $this->loader->getShared(
60
-                'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat'
61
-            );
62
-        } elseif ($screenID === 'front' && ! empty($heartbeat_data[ self::RESPONSE_KEY_THANK_YOU_PAGE ])) {
63
-            $this->loader->getShared(
64
-                'EventEspresso\core\domain\services\admin\ajax\ThankYouPageIpnMonitor'
65
-            );
66
-        }
67
-    }
50
+	/**
51
+	 * @since 4.9.76.p
52
+	 * @throws InvalidClassException
53
+	 */
54
+	public function resolveRoutes()
55
+	{
56
+		$screenID = $this->request->getRequestParam('screen_id');
57
+		$heartbeat_data = $this->request->getRequestParam('data', []);
58
+		if ($screenID === 'espresso_events') {
59
+			$this->loader->getShared(
60
+				'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat'
61
+			);
62
+		} elseif ($screenID === 'front' && ! empty($heartbeat_data[ self::RESPONSE_KEY_THANK_YOU_PAGE ])) {
63
+			$this->loader->getShared(
64
+				'EventEspresso\core\domain\services\admin\ajax\ThankYouPageIpnMonitor'
65
+			);
66
+		}
67
+	}
68 68
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
             $this->loader->getShared(
60 60
                 'EventEspresso\core\domain\services\admin\ajax\EventEditorHeartbeat'
61 61
             );
62
-        } elseif ($screenID === 'front' && ! empty($heartbeat_data[ self::RESPONSE_KEY_THANK_YOU_PAGE ])) {
62
+        } elseif ($screenID === 'front' && ! empty($heartbeat_data[self::RESPONSE_KEY_THANK_YOU_PAGE])) {
63 63
             $this->loader->getShared(
64 64
                 'EventEspresso\core\domain\services\admin\ajax\ThankYouPageIpnMonitor'
65 65
             );
Please login to merge, or discard this patch.
core/third-party-compatibility.php 2 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -7,24 +7,24 @@
 block discarded – undo
7 7
  * ACF compatibility
8 8
  */
9 9
 add_action(
10
-    'plugins_loaded',
11
-    function () {
12
-        if (function_exists('acf_include')) {
13
-            add_filter(
14
-                'acf/get_post_types',
15
-                function ($post_types, $args) {
16
-                    if (! empty($args['show_ui'])) {
17
-                        $ee_post_types = get_post_types(array('show_ee_ui' => 1));
18
-                        $ee_post_types = array_keys($ee_post_types);
19
-                        $post_types = array_merge($post_types, $ee_post_types);
20
-                        $post_types = array_unique($post_types);
21
-                    }
22
-                    return $post_types;
23
-                },
24
-                10,
25
-                2
26
-            );
27
-        }
28
-    },
29
-    100
10
+	'plugins_loaded',
11
+	function () {
12
+		if (function_exists('acf_include')) {
13
+			add_filter(
14
+				'acf/get_post_types',
15
+				function ($post_types, $args) {
16
+					if (! empty($args['show_ui'])) {
17
+						$ee_post_types = get_post_types(array('show_ee_ui' => 1));
18
+						$ee_post_types = array_keys($ee_post_types);
19
+						$post_types = array_merge($post_types, $ee_post_types);
20
+						$post_types = array_unique($post_types);
21
+					}
22
+					return $post_types;
23
+				},
24
+				10,
25
+				2
26
+			);
27
+		}
28
+	},
29
+	100
30 30
 );
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,12 +8,12 @@
 block discarded – undo
8 8
  */
9 9
 add_action(
10 10
     'plugins_loaded',
11
-    function () {
11
+    function() {
12 12
         if (function_exists('acf_include')) {
13 13
             add_filter(
14 14
                 'acf/get_post_types',
15
-                function ($post_types, $args) {
16
-                    if (! empty($args['show_ui'])) {
15
+                function($post_types, $args) {
16
+                    if ( ! empty($args['show_ui'])) {
17 17
                         $ee_post_types = get_post_types(array('show_ee_ui' => 1));
18 18
                         $ee_post_types = array_keys($ee_post_types);
19 19
                         $post_types = array_merge($post_types, $ee_post_types);
Please login to merge, or discard this patch.