@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('NO direct script access allowed'); |
5 | 5 | |
6 | 6 | /** |
@@ -29,20 +29,20 @@ discard block |
||
29 | 29 | * @param EE_Registration|array $data |
30 | 30 | * @throws \EE_Error |
31 | 31 | */ |
32 | - public function __construct( $data ) { |
|
32 | + public function __construct($data) { |
|
33 | 33 | $filtered_reg_status = null; |
34 | 34 | |
35 | - if ( ! is_array( $data ) && $data instanceof EE_Registration ) { |
|
35 | + if ( ! is_array($data) && $data instanceof EE_Registration) { |
|
36 | 36 | $this->reg_obj = $data; |
37 | 37 | } else { |
38 | - $this->reg_obj = is_array( $data ) && isset( $data[0] ) && $data[0] instanceof EE_Registration ? $data[0] : null; |
|
39 | - $filtered_reg_status = is_array( $data ) && ! empty( $data[1] ) ? $data[1] : null; |
|
38 | + $this->reg_obj = is_array($data) && isset($data[0]) && $data[0] instanceof EE_Registration ? $data[0] : null; |
|
39 | + $filtered_reg_status = is_array($data) && ! empty($data[1]) ? $data[1] : null; |
|
40 | 40 | } |
41 | 41 | |
42 | - if ( ! $this->reg_obj instanceof EE_Registration ) { |
|
42 | + if ( ! $this->reg_obj instanceof EE_Registration) { |
|
43 | 43 | throw new EE_Error( |
44 | 44 | sprintf( |
45 | - __( '%1$s requires the incoming data argument to be an instance of %2$s or an array where the first value is an instance of %2$s', 'event_espresso'), |
|
45 | + __('%1$s requires the incoming data argument to be an instance of %2$s or an array where the first value is an instance of %2$s', 'event_espresso'), |
|
46 | 46 | 'EE_Messages_REG_incoming_data', |
47 | 47 | 'EE_Registration' |
48 | 48 | ) |
@@ -64,18 +64,18 @@ discard block |
||
64 | 64 | * |
65 | 65 | * @return array The prepped data for db |
66 | 66 | */ |
67 | - static public function convert_data_for_persistent_storage( $data ) { |
|
67 | + static public function convert_data_for_persistent_storage($data) { |
|
68 | 68 | $prepped_data = array(); |
69 | - if ( ! is_array( $data ) && $data instanceof EE_Registration ) { |
|
69 | + if ( ! is_array($data) && $data instanceof EE_Registration) { |
|
70 | 70 | $prepped_data['Registration'] = $data->ID(); |
71 | 71 | return $prepped_data; |
72 | - } elseif ( ! is_array( $data ) ) { |
|
72 | + } elseif ( ! is_array($data)) { |
|
73 | 73 | return array(); |
74 | 74 | } else { |
75 | - if ( $data[0] instanceof EE_Registration ) { |
|
75 | + if ($data[0] instanceof EE_Registration) { |
|
76 | 76 | $prepped_data['Registration'] = $data[0]; |
77 | 77 | } |
78 | - if ( ! empty( $data[1] ) ) { |
|
78 | + if ( ! empty($data[1])) { |
|
79 | 79 | $prepped_data['filter'] = $data[1]; |
80 | 80 | } |
81 | 81 | } |
@@ -91,17 +91,17 @@ discard block |
||
91 | 91 | * |
92 | 92 | * @return mixed |
93 | 93 | */ |
94 | - static public function convert_data_from_persistent_storage( $data ) { |
|
94 | + static public function convert_data_from_persistent_storage($data) { |
|
95 | 95 | $registration = null; |
96 | 96 | //$data['Registration'] could be either an ID (back compat) or a registration object (prepped using old system). |
97 | - if ( isset( $data[ 'Registration' ] ) ) { |
|
98 | - $registration = $data[ 'Registration' ] instanceof EE_Registration |
|
99 | - ? $data[ 'Registration' ] |
|
100 | - : EEM_Registration::instance()->get_one_by_ID( $data[ 'Registration' ] ); |
|
97 | + if (isset($data['Registration'])) { |
|
98 | + $registration = $data['Registration'] instanceof EE_Registration |
|
99 | + ? $data['Registration'] |
|
100 | + : EEM_Registration::instance()->get_one_by_ID($data['Registration']); |
|
101 | 101 | } |
102 | 102 | $prepped_data = array( |
103 | 103 | 0 => $registration, |
104 | - 1 => isset( $data['filter'] ) ? $data['filter'] : null |
|
104 | + 1 => isset($data['filter']) ? $data['filter'] : null |
|
105 | 105 | ); |
106 | 106 | return $prepped_data; |
107 | 107 | } |
@@ -119,18 +119,18 @@ discard block |
||
119 | 119 | $this->txn = $this->reg_obj->transaction(); |
120 | 120 | //possible session stuff? |
121 | 121 | $session = $this->txn->session_data(); |
122 | - $session_data = $session instanceof EE_Session ? $session->get_session_data() : array(); |
|
122 | + $session_data = $session instanceof EE_Session ? $session->get_session_data() : array(); |
|
123 | 123 | |
124 | 124 | //other data from the session (if possible) |
125 | - $this->user_id = isset( $session_data['user_id'] ) ? $session_data['user_id'] : ''; |
|
126 | - $this->ip_address = isset( $session_data['ip_address'] ) ? $session_data['ip_address'] : ''; |
|
127 | - $this->user_agent = isset( $session_data['user_agent'] ) ? $session_data['user_agent'] : ''; |
|
125 | + $this->user_id = isset($session_data['user_id']) ? $session_data['user_id'] : ''; |
|
126 | + $this->ip_address = isset($session_data['ip_address']) ? $session_data['ip_address'] : ''; |
|
127 | + $this->user_agent = isset($session_data['user_agent']) ? $session_data['user_agent'] : ''; |
|
128 | 128 | $this->init_access = $this->last_access = ''; |
129 | 129 | |
130 | 130 | $this->payment = $this->txn->get_first_related('Payment'); |
131 | 131 | // if there is no payments associated with the transaction |
132 | 132 | // then we just create a default payment object for potential parsing. |
133 | - $this->payment = empty( $this->payment ) |
|
133 | + $this->payment = empty($this->payment) |
|
134 | 134 | ? EE_Payment::new_instance( |
135 | 135 | array( |
136 | 136 | 'STS_ID' => EEM_Payment::status_id_pending, |
@@ -1,7 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
3 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { |
|
4 | 4 | exit('NO direct script access allowed'); |
5 | +} |
|
5 | 6 | |
6 | 7 | /** |
7 | 8 | * EE_Messages_REG_incoming_data |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
3 | - exit( 'NO direct script access allowed' ); |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
3 | + exit('NO direct script access allowed'); |
|
4 | 4 | } |
5 | 5 | |
6 | 6 | /** |
@@ -109,14 +109,14 @@ discard block |
||
109 | 109 | * about where to obtain the templates. |
110 | 110 | * |
111 | 111 | */ |
112 | - final private function _set_templates( $template_pack ) { |
|
112 | + final private function _set_templates($template_pack) { |
|
113 | 113 | |
114 | 114 | //get the corresponding template pack object (if present. If not then we just load the default and add a |
115 | 115 | //notice). The class name should be something like 'EE_Messages_Template_Pack_Default' where "default' would be |
116 | 116 | //the incoming template pack reference. |
117 | - $class_name = 'EE_Messages_Template_Pack_' . str_replace( ' ', '_', ucwords( str_replace( '_', ' ', $template_pack ) ) ); |
|
117 | + $class_name = 'EE_Messages_Template_Pack_'.str_replace(' ', '_', ucwords(str_replace('_', ' ', $template_pack))); |
|
118 | 118 | |
119 | - if ( ! class_exists( $class_name ) ) { |
|
119 | + if ( ! class_exists($class_name)) { |
|
120 | 120 | EE_Error::add_error( |
121 | 121 | sprintf( |
122 | 122 | __( |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | $template_pack = new $class_name; |
136 | 136 | |
137 | 137 | //get all the templates from the template pack. |
138 | - $this->_templates = $template_pack->get_templates( $this->_messenger, $this->_message_type ); |
|
138 | + $this->_templates = $template_pack->get_templates($this->_messenger, $this->_message_type); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | |
@@ -159,15 +159,15 @@ discard block |
||
159 | 159 | public function create_new_templates() { |
160 | 160 | $template_pack = 'default'; |
161 | 161 | //if we have the GRP_ID then let's use that to see if there is a set template pack and use that for the new templates. |
162 | - if ( ! empty( $this->_GRP_ID ) ) { |
|
163 | - $message_template_group = $this->_message_template_group_model->get_one_by_ID( $this->_GRP_ID ); |
|
162 | + if ( ! empty($this->_GRP_ID)) { |
|
163 | + $message_template_group = $this->_message_template_group_model->get_one_by_ID($this->_GRP_ID); |
|
164 | 164 | $template_pack = $message_template_group instanceof EE_Message_Template_Group |
165 | 165 | ? $message_template_group->get_template_pack_name() |
166 | 166 | : 'default'; |
167 | 167 | //we also need to reset the template variation to default |
168 | - $message_template_group->set_template_pack_variation( 'default' ); |
|
168 | + $message_template_group->set_template_pack_variation('default'); |
|
169 | 169 | } |
170 | - return $this->_create_new_templates( $template_pack ); |
|
170 | + return $this->_create_new_templates($template_pack); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | |
@@ -181,12 +181,12 @@ discard block |
||
181 | 181 | * which will contain information about where to obtain the templates. |
182 | 182 | * @return mixed (array|bool) success array or false. |
183 | 183 | */ |
184 | - protected function _create_new_templates( $template_pack ) { |
|
184 | + protected function _create_new_templates($template_pack) { |
|
185 | 185 | |
186 | - $this->_set_templates( $template_pack ); |
|
186 | + $this->_set_templates($template_pack); |
|
187 | 187 | |
188 | 188 | //necessary properties are set, let's save the default templates |
189 | - if ( empty( $this->_GRP_ID ) ) { |
|
189 | + if (empty($this->_GRP_ID)) { |
|
190 | 190 | $main_template_data = array( |
191 | 191 | 'MTP_messenger' => $this->_messenger->name, |
192 | 192 | 'MTP_message_type' => $this->_message_type->name, |
@@ -197,24 +197,24 @@ discard block |
||
197 | 197 | 'MTP_is_active' => 1, |
198 | 198 | ); |
199 | 199 | //let's insert the above and get our GRP_ID, then reset the template data array to just include the GRP_ID |
200 | - $grp_id = $this->_message_template_group_model->insert( $main_template_data ); |
|
201 | - if ( empty( $grp_id ) ) { |
|
200 | + $grp_id = $this->_message_template_group_model->insert($main_template_data); |
|
201 | + if (empty($grp_id)) { |
|
202 | 202 | return $grp_id; |
203 | 203 | } |
204 | 204 | $this->_GRP_ID = $grp_id; |
205 | 205 | } |
206 | 206 | |
207 | - $template_data = array( 'GRP_ID' => $this->_GRP_ID ); |
|
207 | + $template_data = array('GRP_ID' => $this->_GRP_ID); |
|
208 | 208 | |
209 | - foreach ( $this->_contexts as $context => $details ) { |
|
210 | - foreach ( $this->_fields as $field => $field_type ) { |
|
211 | - if ( $field != 'extra' ) { |
|
209 | + foreach ($this->_contexts as $context => $details) { |
|
210 | + foreach ($this->_fields as $field => $field_type) { |
|
211 | + if ($field != 'extra') { |
|
212 | 212 | $template_data['MTP_context'] = $context; |
213 | 213 | $template_data['MTP_template_field'] = $field; |
214 | - $template_data['MTP_content'] = $this->_templates[ $context ][ $field ]; |
|
214 | + $template_data['MTP_content'] = $this->_templates[$context][$field]; |
|
215 | 215 | |
216 | - $MTP = $this->_message_template_model->insert( $template_data ); |
|
217 | - if ( ! $MTP ) { |
|
216 | + $MTP = $this->_message_template_model->insert($template_data); |
|
217 | + if ( ! $MTP) { |
|
218 | 218 | EE_Error::add_error( |
219 | 219 | sprintf( |
220 | 220 | __( |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | |
239 | 239 | return array( |
240 | 240 | 'GRP_ID' => $this->_GRP_ID, |
241 | - 'MTP_context' => key( $this->_contexts ) |
|
241 | + 'MTP_context' => key($this->_contexts) |
|
242 | 242 | ); |
243 | 243 | } |
244 | 244 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('NO direct script access allowed'); |
5 | 5 | |
6 | 6 | /** |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | /** |
30 | 30 | * This sets up the email messenger for the EE_messages (notifications) subsystem in EE. |
31 | 31 | */ |
32 | -class EE_Email_messenger extends EE_messenger { |
|
32 | +class EE_Email_messenger extends EE_messenger { |
|
33 | 33 | |
34 | 34 | /** |
35 | 35 | * The following are the properties that email requires for the message going out. |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | protected function _set_valid_shortcodes() { |
78 | 78 | //remember by leaving the other fields not set, those fields will inherit the valid shortcodes from the message type. |
79 | 79 | $this->_valid_shortcodes = array( |
80 | - 'to' => array('email','event_author', 'primary_registration_details', 'recipient_details'), |
|
80 | + 'to' => array('email', 'event_author', 'primary_registration_details', 'recipient_details'), |
|
81 | 81 | 'from' => array('email', 'event_author', 'primary_registration_details', 'recipient_details') |
82 | 82 | ); |
83 | 83 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | 'shortcodes' => array('organization', 'primary_registration_details', 'event_author', 'primary_registration_details', 'recipient_details') |
112 | 112 | ), |
113 | 113 | 'content' => array( |
114 | - 'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger') |
|
114 | + 'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list', 'transaction', 'messenger') |
|
115 | 115 | ), |
116 | 116 | 'attendee_list' => array( |
117 | 117 | 'shortcodes' => array('attendee', 'event_list', 'ticket_list'), |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | 'required' => array('[EVENT_LIST]') |
123 | 123 | ), |
124 | 124 | 'ticket_list' => array( |
125 | - 'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'), |
|
125 | + 'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'), |
|
126 | 126 | 'required' => array('[TICKET_LIST]') |
127 | 127 | ), |
128 | 128 | 'datetime_list' => array( |
@@ -141,21 +141,21 @@ discard block |
||
141 | 141 | * |
142 | 142 | * @since 4.5.0 |
143 | 143 | */ |
144 | - public function do_secondary_messenger_hooks( $sending_messenger_name ) { |
|
145 | - if ( $sending_messenger_name = 'html' ) { |
|
146 | - add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 ); |
|
144 | + public function do_secondary_messenger_hooks($sending_messenger_name) { |
|
145 | + if ($sending_messenger_name = 'html') { |
|
146 | + add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8); |
|
147 | 147 | } |
148 | 148 | } |
149 | 149 | |
150 | 150 | |
151 | 151 | |
152 | 152 | |
153 | - public function add_email_css( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) { |
|
153 | + public function add_email_css($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) { |
|
154 | 154 | //prevent recursion on this callback. |
155 | - remove_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10 ); |
|
156 | - $variation = $this->get_variation( $template_pack, $message_type, $url, 'main', $variation, FALSE ); |
|
155 | + remove_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10); |
|
156 | + $variation = $this->get_variation($template_pack, $message_type, $url, 'main', $variation, FALSE); |
|
157 | 157 | |
158 | - add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', array( $this, 'add_email_css' ), 10, 8 ); |
|
158 | + add_filter('FHEE__EE_Messages_Template_Pack__get_variation', array($this, 'add_email_css'), 10, 8); |
|
159 | 159 | return $variation; |
160 | 160 | } |
161 | 161 | |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | 'required' => FALSE, |
188 | 188 | 'validation' => FALSE, |
189 | 189 | 'format' => '%s', |
190 | - 'value' => sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') ), |
|
190 | + 'value' => sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name')), |
|
191 | 191 | 'default'=> '', |
192 | 192 | 'css_class' => '' |
193 | 193 | ) |
@@ -349,16 +349,16 @@ discard block |
||
349 | 349 | * @return bool | WP_Error true if message delivered, false if it didn't deliver OR bubble up any error object if present. |
350 | 350 | */ |
351 | 351 | protected function _send_message() { |
352 | - $success = wp_mail( |
|
353 | - html_entity_decode( $this->_to, ENT_QUOTES, "UTF-8" ), |
|
354 | - stripslashes( html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8" )), |
|
352 | + $success = wp_mail( |
|
353 | + html_entity_decode($this->_to, ENT_QUOTES, "UTF-8"), |
|
354 | + stripslashes(html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8")), |
|
355 | 355 | $this->_body(), |
356 | 356 | $this->_headers() |
357 | 357 | ); |
358 | - if ( ! $success ) { |
|
358 | + if ( ! $success) { |
|
359 | 359 | EE_Error::add_error( |
360 | 360 | sprintf( |
361 | - __( 'The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'), |
|
361 | + __('The email did not send successfully.%3$sThe WordPress wp_mail function is used for sending mails but does not give any useful information when an email fails to send.%3$sIt is possible the "to" address (%1$s) or "from" address (%2$s) is invalid.%3$s', 'event_espresso'), |
|
362 | 362 | $this->_to, |
363 | 363 | $this->_from, |
364 | 364 | '<br />' |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | * @return string html body of the message content and the related css. |
378 | 378 | */ |
379 | 379 | protected function _preview() { |
380 | - return $this->_body( true ); |
|
380 | + return $this->_body(true); |
|
381 | 381 | } |
382 | 382 | |
383 | 383 | |
@@ -391,18 +391,18 @@ discard block |
||
391 | 391 | * @return string formatted header for email |
392 | 392 | */ |
393 | 393 | protected function _headers() { |
394 | - $from = stripslashes_deep( html_entity_decode($this->_from, ENT_QUOTES,"UTF-8" ) ); |
|
394 | + $from = stripslashes_deep(html_entity_decode($this->_from, ENT_QUOTES, "UTF-8")); |
|
395 | 395 | $headers = array( |
396 | 396 | 'MIME-Version: 1.0', |
397 | - 'From:' . $from, |
|
398 | - 'Reply-To:' . $from, |
|
397 | + 'From:'.$from, |
|
398 | + 'Reply-To:'.$from, |
|
399 | 399 | 'Content-Type:text/html; charset=utf-8' |
400 | 400 | ); |
401 | 401 | |
402 | 402 | //but wait! Header's for the from is NOT reliable because some plugins don't respect From: as set in the header. |
403 | - add_filter( 'wp_mail_from', array( $this, 'set_from_address' ), 100 ); |
|
404 | - add_filter( 'wp_mail_from_name', array( $this, 'set_from_name' ), 100 ); |
|
405 | - return apply_filters( 'FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this ); |
|
403 | + add_filter('wp_mail_from', array($this, 'set_from_address'), 100); |
|
404 | + add_filter('wp_mail_from_name', array($this, 'set_from_name'), 100); |
|
405 | + return apply_filters('FHEE__EE_Email_messenger___headers', $headers, $this->_incoming_message_type, $this); |
|
406 | 406 | } |
407 | 407 | |
408 | 408 | |
@@ -418,19 +418,19 @@ discard block |
||
418 | 418 | * @return array |
419 | 419 | */ |
420 | 420 | private function _parse_from() { |
421 | - if ( strpos( $this->_from, '<' ) !== false ) { |
|
422 | - $from_name = substr( $this->_from, 0, strpos( $this->_from, '<' ) - 1 ); |
|
423 | - $from_name = str_replace( '"', '', $from_name ); |
|
424 | - $from_name = trim( $from_name ); |
|
425 | - |
|
426 | - $from_email = substr( $this->_from, strpos( $this->_from, '<' ) + 1 ); |
|
427 | - $from_email = str_replace( '>', '', $from_email ); |
|
428 | - $from_email = trim( $from_email ); |
|
421 | + if (strpos($this->_from, '<') !== false) { |
|
422 | + $from_name = substr($this->_from, 0, strpos($this->_from, '<') - 1); |
|
423 | + $from_name = str_replace('"', '', $from_name); |
|
424 | + $from_name = trim($from_name); |
|
425 | + |
|
426 | + $from_email = substr($this->_from, strpos($this->_from, '<') + 1); |
|
427 | + $from_email = str_replace('>', '', $from_email); |
|
428 | + $from_email = trim($from_email); |
|
429 | 429 | } else { |
430 | 430 | $from_name = ''; |
431 | - $from_email = trim( $this->_from ); |
|
431 | + $from_email = trim($this->_from); |
|
432 | 432 | } |
433 | - return array( $from_name, $from_email ); |
|
433 | + return array($from_name, $from_email); |
|
434 | 434 | } |
435 | 435 | |
436 | 436 | |
@@ -443,7 +443,7 @@ discard block |
||
443 | 443 | * |
444 | 444 | * @param string $from_email What the original from_email is. |
445 | 445 | */ |
446 | - public function set_from_address( $from_email ) { |
|
446 | + public function set_from_address($from_email) { |
|
447 | 447 | $parsed_from = $this->_parse_from(); |
448 | 448 | return $parsed_from[1]; |
449 | 449 | } |
@@ -458,13 +458,13 @@ discard block |
||
458 | 458 | * |
459 | 459 | * @param string $from_name The original from_name. |
460 | 460 | */ |
461 | - public function set_from_name( $from_name ) { |
|
461 | + public function set_from_name($from_name) { |
|
462 | 462 | $parsed_from = $this->_parse_from(); |
463 | - if ( is_array( $parsed_from) && ! empty( $parsed_from[0] ) ) { |
|
464 | - $from_name = $parsed_from[0]; |
|
463 | + if (is_array($parsed_from) && ! empty($parsed_from[0])) { |
|
464 | + $from_name = $parsed_from[0]; |
|
465 | 465 | } |
466 | 466 | |
467 | - return stripslashes_deep( html_entity_decode($from_name, ENT_QUOTES,"UTF-8" ) ); |
|
467 | + return stripslashes_deep(html_entity_decode($from_name, ENT_QUOTES, "UTF-8")); |
|
468 | 468 | } |
469 | 469 | |
470 | 470 | |
@@ -475,14 +475,14 @@ discard block |
||
475 | 475 | * @param bool $preview will determine whether this is preview template or not. |
476 | 476 | * @return string formatted body for email. |
477 | 477 | */ |
478 | - protected function _body( $preview = false ) { |
|
478 | + protected function _body($preview = false) { |
|
479 | 479 | //setup template args! |
480 | 480 | $this->_template_args = array( |
481 | 481 | 'subject' => $this->_subject, |
482 | 482 | 'from' => $this->_from, |
483 | - 'main_body' => wpautop(stripslashes_deep( html_entity_decode($this->_content, ENT_QUOTES,"UTF-8" ) )) |
|
483 | + 'main_body' => wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8"))) |
|
484 | 484 | ); |
485 | - $body = $this->_get_main_template( $preview ); |
|
485 | + $body = $this->_get_main_template($preview); |
|
486 | 486 | |
487 | 487 | /** |
488 | 488 | * This filter allows one to bypass the CSSToInlineStyles tool and leave the body untouched. |
@@ -490,17 +490,17 @@ discard block |
||
490 | 490 | * @type bool $preview Indicates whether a preview is being generated or not. |
491 | 491 | * @return bool true indicates to use the inliner, false bypasses it. |
492 | 492 | */ |
493 | - if ( apply_filters( 'FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview ) ) { |
|
493 | + if (apply_filters('FHEE__EE_Email_messenger__apply_CSSInliner ', true, $preview)) { |
|
494 | 494 | |
495 | 495 | //require CssToInlineStyles library and its dependencies via composer autoloader |
496 | - require_once EE_THIRD_PARTY . 'cssinliner/vendor/autoload.php'; |
|
496 | + require_once EE_THIRD_PARTY.'cssinliner/vendor/autoload.php'; |
|
497 | 497 | |
498 | 498 | //now if this isn't a preview, let's setup the body so it has inline styles |
499 | - if ( ! $preview || ( $preview && defined( 'DOING_AJAX' ) ) ) { |
|
500 | - $style = file_get_contents( $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation ), TRUE ); |
|
501 | - $CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles( $body, $style ); |
|
502 | - $body = ltrim( $CSS->convert( true ), ">\n" ); //for some reason the library has a bracket and new line at the beginning. This takes care of that. |
|
503 | - $body = ltrim( $body, "<?" ); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609 |
|
499 | + if ( ! $preview || ($preview && defined('DOING_AJAX'))) { |
|
500 | + $style = file_get_contents($this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, FALSE, 'main', $this->_variation), TRUE); |
|
501 | + $CSS = new TijsVerkoyen\CssToInlineStyles\CssToInlineStyles($body, $style); |
|
502 | + $body = ltrim($CSS->convert(true), ">\n"); //for some reason the library has a bracket and new line at the beginning. This takes care of that. |
|
503 | + $body = ltrim($body, "<?"); //see https://events.codebasehq.com/projects/event-espresso/tickets/8609 |
|
504 | 504 | } |
505 | 505 | |
506 | 506 | } |
@@ -519,8 +519,8 @@ discard block |
||
519 | 519 | public function get_existing_test_settings() { |
520 | 520 | $settings = parent::get_existing_test_settings(); |
521 | 521 | //override subject if present because we always want it to be fresh. |
522 | - if ( is_array( $settings ) && ! empty( $settings['subject'] ) ) { |
|
523 | - $settings['subject'] = sprintf( __('Test email sent from %s', 'event_espresso'), get_bloginfo('name') ); |
|
522 | + if (is_array($settings) && ! empty($settings['subject'])) { |
|
523 | + $settings['subject'] = sprintf(__('Test email sent from %s', 'event_espresso'), get_bloginfo('name')); |
|
524 | 524 | } |
525 | 525 | return $settings; |
526 | 526 | } |
@@ -426,7 +426,7 @@ |
||
426 | 426 | * |
427 | 427 | * @since 4.3.1 |
428 | 428 | * |
429 | - * @return array |
|
429 | + * @return string[] |
|
430 | 430 | */ |
431 | 431 | private function _parse_from() { |
432 | 432 | if ( strpos( $this->_from, '<' ) !== false ) { |
@@ -1,6 +1,7 @@ |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | +} |
|
4 | 5 | |
5 | 6 | /** |
6 | 7 | * Event Espresso |
@@ -1,7 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
3 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { |
|
4 | 4 | exit('NO direct script access allowed'); |
5 | +} |
|
5 | 6 | |
6 | 7 | /** |
7 | 8 | * Event Espresso |
@@ -197,8 +198,10 @@ discard block |
||
197 | 198 | $sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode; |
198 | 199 | |
199 | 200 | //first we want to make sure this is a valid shortcode |
200 | - if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) ) |
|
201 | - return false; //get out, this parser doesn't handle the incoming shortcode. |
|
201 | + if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) ) { |
|
202 | + return false; |
|
203 | + } |
|
204 | + //get out, this parser doesn't handle the incoming shortcode. |
|
202 | 205 | $this->_data = $data; |
203 | 206 | $this->_extra_data = $extra_data; |
204 | 207 | $this->_set_messages_properties(); |
@@ -276,8 +279,9 @@ discard block |
||
276 | 279 | } |
277 | 280 | |
278 | 281 | //next test to make sure we've got got a data index in the incoming data array |
279 | - if ( !isset( $this->_data['data'] ) ) |
|
280 | - throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') ); |
|
282 | + if ( !isset( $this->_data['data'] ) ) { |
|
283 | + throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') ); |
|
284 | + } |
|
281 | 285 | |
282 | 286 | //all is well let's make sure _extra_data always has the values needed. |
283 | 287 | //let's make sure that extra_data includes all templates (for later parsing if necessary) |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('NO direct script access allowed'); |
5 | 5 | |
6 | 6 | /** |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | |
172 | 172 | |
173 | 173 | public function get_shortcode_helper() { |
174 | - if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes ) { |
|
174 | + if ( ! $this->_shortcode_helper instanceof EEH_Parse_Shortcodes) { |
|
175 | 175 | $this->_set_shortcode_helper(); |
176 | 176 | } |
177 | 177 | return $this->_shortcode_helper; |
@@ -185,25 +185,25 @@ discard block |
||
185 | 185 | * @param mixed (object|array) $extra_data extra incoming data (usually EE_Messages_Addressee) |
186 | 186 | * @return string parsed shortcode. |
187 | 187 | */ |
188 | - public function parser($shortcode, $data, $extra_data = array() ) { |
|
188 | + public function parser($shortcode, $data, $extra_data = array()) { |
|
189 | 189 | |
190 | 190 | //filter setup shortcodes |
191 | 191 | $this->_shortcodes = $this->get_shortcodes(); |
192 | 192 | |
193 | 193 | //we need to setup any dynamic shortcodes so that they work with the array_key_exists |
194 | - $sc = preg_match_all( '/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches ); |
|
195 | - $sc_to_verify = !empty($matches[0] ) ? $matches[0][0] . ']' : $shortcode; |
|
194 | + $sc = preg_match_all('/(\[[A-Za-z0-9\_]+_\*)/', $shortcode, $matches); |
|
195 | + $sc_to_verify = ! empty($matches[0]) ? $matches[0][0].']' : $shortcode; |
|
196 | 196 | |
197 | 197 | //first we want to make sure this is a valid shortcode |
198 | - if ( !array_key_exists($sc_to_verify, $this->_shortcodes ) ) |
|
198 | + if ( ! array_key_exists($sc_to_verify, $this->_shortcodes)) |
|
199 | 199 | return false; //get out, this parser doesn't handle the incoming shortcode. |
200 | 200 | $this->_data = $data; |
201 | 201 | $this->_extra_data = $extra_data; |
202 | 202 | $this->_set_messages_properties(); |
203 | - $parsed = apply_filters( 'FHEE__' . get_class($this) . '__parser_after', $this->_parser($shortcode), $shortcode, $data, $extra_data, $this ); |
|
203 | + $parsed = apply_filters('FHEE__'.get_class($this).'__parser_after', $this->_parser($shortcode), $shortcode, $data, $extra_data, $this); |
|
204 | 204 | |
205 | 205 | //note the below filter applies to ALL shortcode parsers... be careful! |
206 | - $parsed = apply_filters( 'FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this ); |
|
206 | + $parsed = apply_filters('FHEE__EE_Shortcodes__parser_after', $parsed, $shortcode, $data, $extra_data, $this); |
|
207 | 207 | return $parsed; |
208 | 208 | } |
209 | 209 | |
@@ -219,10 +219,10 @@ discard block |
||
219 | 219 | * @return array array of shortcodes => description pairs |
220 | 220 | */ |
221 | 221 | public function get_shortcodes() { |
222 | - $this->_shortcodes = apply_filters( 'FHEE__' . get_class($this) . '__shortcodes', $this->_shortcodes, $this ); |
|
222 | + $this->_shortcodes = apply_filters('FHEE__'.get_class($this).'__shortcodes', $this->_shortcodes, $this); |
|
223 | 223 | |
224 | 224 | //note the below filter applies to ALL shortcode parsers... be careful! |
225 | - $this->_shortcodes = apply_filters( 'FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this ); |
|
225 | + $this->_shortcodes = apply_filters('FHEE__EE_Shortcodes__shortcodes', $this->_shortcodes, $this); |
|
226 | 226 | |
227 | 227 | return $this->_shortcodes; |
228 | 228 | } |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | * @param mixed (object|array) $data incoming data for the parser. The data could be either an object or array because there are some shortcodes that might be replaced by prepared data that has multiple items in a list (i.e. list of attendees in an event and we're showing fname/lname for each attendee). In this case data will be in an array. Otherwise the data shoudl be in a properly formatted object. The EEH_Parse_Shortcodes.helper.php describes the data object we're expecting. |
253 | 253 | * @return string parsed shortcode |
254 | 254 | */ |
255 | - abstract protected function _parser( $shortcode ); |
|
255 | + abstract protected function _parser($shortcode); |
|
256 | 256 | |
257 | 257 | |
258 | 258 | |
@@ -264,22 +264,22 @@ discard block |
||
264 | 264 | protected function _validate_list_requirements() { |
265 | 265 | |
266 | 266 | //first test to make sure we've got an array! |
267 | - if ( !is_array($this->_data) ) { |
|
268 | - throw new EE_Error( sprintf( __('Expecting an array for the data sent to %s. Instead it was %s', 'event_espresso'), get_class($this), gettype( $this->_data ) ) ); |
|
267 | + if ( ! is_array($this->_data)) { |
|
268 | + throw new EE_Error(sprintf(__('Expecting an array for the data sent to %s. Instead it was %s', 'event_espresso'), get_class($this), gettype($this->_data))); |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | //next test to make sure we've got the required template in the index! |
272 | - if ( !isset( $this->_data['template'] ) ) { |
|
273 | - throw new EE_Error( sprintf( __('The incoming data does not have the required template index in its array', 'event_espresso') ) ); |
|
272 | + if ( ! isset($this->_data['template'])) { |
|
273 | + throw new EE_Error(sprintf(__('The incoming data does not have the required template index in its array', 'event_espresso'))); |
|
274 | 274 | } |
275 | 275 | |
276 | 276 | //next test to make sure we've got got a data index in the incoming data array |
277 | - if ( !isset( $this->_data['data'] ) ) |
|
278 | - throw new EE_Error( __('The incoming data does not have the required data index in its array', 'event_espresso') ); |
|
277 | + if ( ! isset($this->_data['data'])) |
|
278 | + throw new EE_Error(__('The incoming data does not have the required data index in its array', 'event_espresso')); |
|
279 | 279 | |
280 | 280 | //all is well let's make sure _extra_data always has the values needed. |
281 | 281 | //let's make sure that extra_data includes all templates (for later parsing if necessary) |
282 | - if ( empty( $this->_extra_data ) || ( empty( $this->_extra_data['data'] ) && empty( $this->_extra_data['template'] ) ) ) { |
|
282 | + if (empty($this->_extra_data) || (empty($this->_extra_data['data']) && empty($this->_extra_data['template']))) { |
|
283 | 283 | $this->_extra_data['data'] = $this->_data['data']; |
284 | 284 | $this->_extra_data['template'] = $this->_data['template']; |
285 | 285 | } |
@@ -296,16 +296,16 @@ discard block |
||
296 | 296 | * |
297 | 297 | * @return array An array with the attributes |
298 | 298 | */ |
299 | - protected function _get_shortcode_attrs( $shortcode ) { |
|
299 | + protected function _get_shortcode_attrs($shortcode) { |
|
300 | 300 | //make sure the required wp helper function is present |
301 | 301 | //require the shortcode file if necessary |
302 | - if ( ! function_exists( 'shortcode_parse_atts' ) ) { |
|
303 | - require_once( ABSPATH . WPINC . '/shortcodes.php'); |
|
302 | + if ( ! function_exists('shortcode_parse_atts')) { |
|
303 | + require_once(ABSPATH.WPINC.'/shortcodes.php'); |
|
304 | 304 | } |
305 | 305 | |
306 | 306 | //let's get any attributes that may be present and set the defaults. |
307 | - $shortcode_to_parse = str_replace( '[', '', str_replace( ']', '', $shortcode ) ); |
|
308 | - return shortcode_parse_atts( $shortcode_to_parse ); |
|
307 | + $shortcode_to_parse = str_replace('[', '', str_replace(']', '', $shortcode)); |
|
308 | + return shortcode_parse_atts($shortcode_to_parse); |
|
309 | 309 | } |
310 | 310 | |
311 | 311 | |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | */ |
321 | 321 | protected function _set_messages_properties() { |
322 | 322 | //should be in _extra_data |
323 | - if ( isset( $this->_extra_data['messenger'] ) ) { |
|
323 | + if (isset($this->_extra_data['messenger'])) { |
|
324 | 324 | $this->_messenger = $this->_extra_data['messenger']; |
325 | 325 | $this->_message_type = $this->_extra_data['message_type']; |
326 | 326 | $this->_context = $this->_extra_data['message'] instanceof EE_Message ? $this->_extra_data['message']->context() : ''; |
@@ -22,7 +22,6 @@ |
||
22 | 22 | /** |
23 | 23 | * Removes the checkin and checkout endpoints from the index for requests |
24 | 24 | * to api versions lowers than 4.8.33 |
25 | - * @param array $routes_on_this_version |
|
26 | 25 | * @param EventEspresso\core\libraries\rest_api\controllers\Base $controller |
27 | 26 | * @return array like $routes_on_this_version |
28 | 27 | */ |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | //is for lower than 4.8.33 |
14 | 14 | add_filter( |
15 | 15 | 'FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers', |
16 | - array( $this, 'remove_response_headers' ), |
|
16 | + array($this, 'remove_response_headers'), |
|
17 | 17 | 10, |
18 | 18 | 3 |
19 | 19 | ); |
@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | * @param EventEspresso\core\libraries\rest_api\controllers\Base $controller |
27 | 27 | * @return array like $routes_on_this_version |
28 | 28 | */ |
29 | - public function remove_response_headers( $response_headers, $controller, $requested_version ) { |
|
30 | - if( $controller instanceof Base |
|
31 | - && $this->applies_to_version( $requested_version ) ) { |
|
29 | + public function remove_response_headers($response_headers, $controller, $requested_version) { |
|
30 | + if ($controller instanceof Base |
|
31 | + && $this->applies_to_version($requested_version)) { |
|
32 | 32 | return array(); |
33 | 33 | } |
34 | 34 | return $response_headers; |
@@ -6,22 +6,22 @@ |
||
6 | 6 | * @subpackage |
7 | 7 | * @author Mike Nelson |
8 | 8 | */ |
9 | -class EE_Email_Input extends EE_Form_Input_Base{ |
|
9 | +class EE_Email_Input extends EE_Form_Input_Base { |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * @param array $input_settings |
13 | 13 | */ |
14 | - function __construct( $input_settings = array() ){ |
|
15 | - $this->_set_display_strategy( new EE_Text_Input_Display_Strategy('email') ); |
|
16 | - $this->_set_normalization_strategy( new EE_Text_Normalization() ); |
|
14 | + function __construct($input_settings = array()) { |
|
15 | + $this->_set_display_strategy(new EE_Text_Input_Display_Strategy('email')); |
|
16 | + $this->_set_normalization_strategy(new EE_Text_Normalization()); |
|
17 | 17 | $this->_add_validation_strategy( |
18 | 18 | new EE_Email_Validation_Strategy( |
19 | - isset( $input_settings[ 'validation_error_message' ] ) |
|
20 | - ? $input_settings[ 'validation_error_message' ] |
|
19 | + isset($input_settings['validation_error_message']) |
|
20 | + ? $input_settings['validation_error_message'] |
|
21 | 21 | : NULL |
22 | 22 | ) |
23 | 23 | ); |
24 | - parent::__construct( $input_settings ); |
|
25 | - $this->set_html_class( $this->html_class() . ' email' ); |
|
24 | + parent::__construct($input_settings); |
|
25 | + $this->set_html_class($this->html_class().' email'); |
|
26 | 26 | } |
27 | 27 | } |
28 | 28 | \ No newline at end of file |
@@ -32,73 +32,73 @@ |
||
32 | 32 | */ |
33 | 33 | class Socket |
34 | 34 | { |
35 | - private $handle = null; |
|
35 | + private $handle = null; |
|
36 | 36 | |
37 | - /** |
|
38 | - * fsockopen |
|
39 | - * |
|
40 | - * @see http://php.net/fsockopen |
|
41 | - * @param string $hostname |
|
42 | - * @param int $port |
|
43 | - * @param int $errno |
|
44 | - * @param string $errstr |
|
45 | - * @param float $timeout |
|
46 | - * @return resource |
|
47 | - */ |
|
48 | - public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null) |
|
49 | - { |
|
50 | - $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout)); |
|
37 | + /** |
|
38 | + * fsockopen |
|
39 | + * |
|
40 | + * @see http://php.net/fsockopen |
|
41 | + * @param string $hostname |
|
42 | + * @param int $port |
|
43 | + * @param int $errno |
|
44 | + * @param string $errstr |
|
45 | + * @param float $timeout |
|
46 | + * @return resource |
|
47 | + */ |
|
48 | + public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null) |
|
49 | + { |
|
50 | + $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout)); |
|
51 | 51 | |
52 | - if ($this->handle != false && $errno === 0 && $errstr === '') { |
|
53 | - return $this->handle; |
|
54 | - } else { |
|
55 | - return false; |
|
56 | - } |
|
57 | - } |
|
52 | + if ($this->handle != false && $errno === 0 && $errstr === '') { |
|
53 | + return $this->handle; |
|
54 | + } else { |
|
55 | + return false; |
|
56 | + } |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * fwrite |
|
61 | - * |
|
62 | - * @see http://php.net/fwrite |
|
63 | - * @param string $string |
|
64 | - * @param int $length |
|
65 | - * @return int | bool |
|
66 | - */ |
|
67 | - public function fwrite($string, $length = null) |
|
68 | - { |
|
69 | - return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length)); |
|
70 | - } |
|
59 | + /** |
|
60 | + * fwrite |
|
61 | + * |
|
62 | + * @see http://php.net/fwrite |
|
63 | + * @param string $string |
|
64 | + * @param int $length |
|
65 | + * @return int | bool |
|
66 | + */ |
|
67 | + public function fwrite($string, $length = null) |
|
68 | + { |
|
69 | + return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length)); |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * fgets |
|
74 | - * |
|
75 | - * @see http://php.net/fgets |
|
76 | - * @param int $length |
|
77 | - */ |
|
78 | - public function fgets($length = null) |
|
79 | - { |
|
80 | - return fgets($this->handle, $length); |
|
81 | - } |
|
72 | + /** |
|
73 | + * fgets |
|
74 | + * |
|
75 | + * @see http://php.net/fgets |
|
76 | + * @param int $length |
|
77 | + */ |
|
78 | + public function fgets($length = null) |
|
79 | + { |
|
80 | + return fgets($this->handle, $length); |
|
81 | + } |
|
82 | 82 | |
83 | - /** |
|
84 | - * feof |
|
85 | - * |
|
86 | - * @see http://php.net/feof |
|
87 | - * @return bool |
|
88 | - */ |
|
89 | - public function feof() |
|
90 | - { |
|
91 | - return feof($this->handle); |
|
92 | - } |
|
83 | + /** |
|
84 | + * feof |
|
85 | + * |
|
86 | + * @see http://php.net/feof |
|
87 | + * @return bool |
|
88 | + */ |
|
89 | + public function feof() |
|
90 | + { |
|
91 | + return feof($this->handle); |
|
92 | + } |
|
93 | 93 | |
94 | - /** |
|
95 | - * fclose |
|
96 | - * |
|
97 | - * @see http://php.net/fclose |
|
98 | - * @return bool |
|
99 | - */ |
|
100 | - public function fclose() |
|
101 | - { |
|
102 | - return fclose($this->handle); |
|
103 | - } |
|
94 | + /** |
|
95 | + * fclose |
|
96 | + * |
|
97 | + * @see http://php.net/fclose |
|
98 | + * @return bool |
|
99 | + */ |
|
100 | + public function fclose() |
|
101 | + { |
|
102 | + return fclose($this->handle); |
|
103 | + } |
|
104 | 104 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) exit( 'No direct script access allowed' ); |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
3 | 3 | |
4 | 4 | /** |
5 | 5 | * This prepares data for message types that send messages for multiple registrations (that could span multiple transactions) |
@@ -20,13 +20,13 @@ discard block |
||
20 | 20 | * @throws EE_Error |
21 | 21 | * @access protected |
22 | 22 | */ |
23 | - public function __construct( $data = array() ) { |
|
23 | + public function __construct($data = array()) { |
|
24 | 24 | |
25 | 25 | //validate that the first element in the array is an EE_Registration object. |
26 | - if ( ! reset( $data ) instanceof EE_Registration ) { |
|
27 | - throw new EE_Error( __( 'The EE_Message_Registrations_incoming_data class expects an array of EE_Registration objects.', 'event_espresso' ) ); |
|
26 | + if ( ! reset($data) instanceof EE_Registration) { |
|
27 | + throw new EE_Error(__('The EE_Message_Registrations_incoming_data class expects an array of EE_Registration objects.', 'event_espresso')); |
|
28 | 28 | } |
29 | - parent::__construct( $data ); |
|
29 | + parent::__construct($data); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 |
@@ -1,5 +1,7 @@ |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) exit( 'No direct script access allowed' ); |
|
2 | +if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
3 | + exit( 'No direct script access allowed' ); |
|
4 | +} |
|
3 | 5 | |
4 | 6 | /** |
5 | 7 | * This prepares data for message types that send messages for multiple registrations (that could span multiple transactions) |
@@ -347,7 +347,7 @@ |
||
347 | 347 | $total_ticket_count++; |
348 | 348 | $tickets[ $ticket->ID() ]['ticket'] = $ticket; |
349 | 349 | $tickets[ $ticket->ID() ]['count'] = is_array( $tickets[ $ticket->ID() ] ) |
350 | - && isset( $tickets[ $ticket->ID() ]['count'] ) |
|
350 | + && isset( $tickets[ $ticket->ID() ]['count'] ) |
|
351 | 351 | ? $tickets[ $ticket->ID() ]['count'] + 1 |
352 | 352 | : 1; |
353 | 353 | $tickets[ $ticket->ID() ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee(); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('NO direct script access allowed'); |
5 | 5 | |
6 | 6 | /** |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | * @param mixed $data incoming data object|array. Suggested that child classes use type hinting for expected |
267 | 267 | * data object. But here parent will be generic because we don't know what's coming in. |
268 | 268 | */ |
269 | - public function __construct( $data ) { |
|
269 | + public function __construct($data) { |
|
270 | 270 | $this->_data = $data; |
271 | 271 | $this->_setup_data(); |
272 | 272 | } |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | * |
289 | 289 | * @return mixed The prepped data for db |
290 | 290 | */ |
291 | - static public function convert_data_for_persistent_storage( $data ) { |
|
291 | + static public function convert_data_for_persistent_storage($data) { |
|
292 | 292 | return $data; |
293 | 293 | } |
294 | 294 | |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | * |
305 | 305 | * @return mixed |
306 | 306 | */ |
307 | - static public function convert_data_from_persistent_storage( $data ) { |
|
307 | + static public function convert_data_from_persistent_storage($data) { |
|
308 | 308 | return $data; |
309 | 309 | } |
310 | 310 | |
@@ -331,8 +331,8 @@ discard block |
||
331 | 331 | protected function _assemble_data() { |
332 | 332 | //verify that reg_objs is set |
333 | 333 | if ( |
334 | - ! is_array( $this->reg_objs ) |
|
335 | - && ! reset( $this->reg_objs ) instanceof EE_Registration |
|
334 | + ! is_array($this->reg_objs) |
|
335 | + && ! reset($this->reg_objs) instanceof EE_Registration |
|
336 | 336 | ) { |
337 | 337 | throw new EE_Error( |
338 | 338 | __( |
@@ -347,82 +347,82 @@ discard block |
||
347 | 347 | $answers = $questions = $attendees = $line_items = $registrations = array(); |
348 | 348 | $total_ticket_count = 0; |
349 | 349 | |
350 | - if ( ! empty( $this->reg_objs ) ) { |
|
350 | + if ( ! empty($this->reg_objs)) { |
|
351 | 351 | $event_attendee_count = array(); |
352 | - foreach ( $this->reg_objs as $reg ) { |
|
352 | + foreach ($this->reg_objs as $reg) { |
|
353 | 353 | //account for filtered registrations by status. |
354 | - if ( ! empty( $this->filtered_reg_status ) && $this->filtered_reg_status !== $reg->status_ID() ) { |
|
354 | + if ( ! empty($this->filtered_reg_status) && $this->filtered_reg_status !== $reg->status_ID()) { |
|
355 | 355 | continue; |
356 | 356 | } |
357 | 357 | |
358 | 358 | $evt_id = $reg->event_ID(); |
359 | 359 | /** @type EE_Ticket $ticket */ |
360 | - $ticket = $reg->get_first_related( 'Ticket' ); |
|
360 | + $ticket = $reg->get_first_related('Ticket'); |
|
361 | 361 | $relateddatetime = $ticket->datetimes(); |
362 | 362 | $total_ticket_count++; |
363 | - $tickets[ $ticket->ID() ]['ticket'] = $ticket; |
|
364 | - $tickets[ $ticket->ID() ]['count'] = is_array( $tickets[ $ticket->ID() ] ) |
|
365 | - && isset( $tickets[ $ticket->ID() ]['count'] ) |
|
366 | - ? $tickets[ $ticket->ID() ]['count'] + 1 |
|
363 | + $tickets[$ticket->ID()]['ticket'] = $ticket; |
|
364 | + $tickets[$ticket->ID()]['count'] = is_array($tickets[$ticket->ID()]) |
|
365 | + && isset($tickets[$ticket->ID()]['count']) |
|
366 | + ? $tickets[$ticket->ID()]['count'] + 1 |
|
367 | 367 | : 1; |
368 | - $tickets[ $ticket->ID() ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee(); |
|
369 | - $tickets[ $ticket->ID() ]['dtt_objs'] = $relateddatetime; |
|
370 | - $tickets[ $ticket->ID() ]['reg_objs'][ $reg->ID() ] = $reg; |
|
368 | + $tickets[$ticket->ID()]['att_objs'][$reg->attendee_ID()] = $reg->attendee(); |
|
369 | + $tickets[$ticket->ID()]['dtt_objs'] = $relateddatetime; |
|
370 | + $tickets[$ticket->ID()]['reg_objs'][$reg->ID()] = $reg; |
|
371 | 371 | $event = $reg->event(); |
372 | - $tickets[ $ticket->ID() ]['EE_Event'] = $event; |
|
373 | - $evtcache[ $evt_id ] = $event; |
|
374 | - $eventsetup[ $evt_id ]['reg_objs'][ $reg->ID() ] = $reg; |
|
375 | - $eventsetup[ $evt_id ]['tkt_objs'][ $ticket->ID() ] = $ticket; |
|
376 | - $eventsetup[ $evt_id ]['att_objs'][ $reg->attendee_ID() ] = $reg->attendee(); |
|
377 | - $event_attendee_count[ $evt_id ] = isset( $event_attendee_count[ $evt_id ] ) |
|
378 | - ? $event_attendee_count[ $evt_id ] + 1 |
|
372 | + $tickets[$ticket->ID()]['EE_Event'] = $event; |
|
373 | + $evtcache[$evt_id] = $event; |
|
374 | + $eventsetup[$evt_id]['reg_objs'][$reg->ID()] = $reg; |
|
375 | + $eventsetup[$evt_id]['tkt_objs'][$ticket->ID()] = $ticket; |
|
376 | + $eventsetup[$evt_id]['att_objs'][$reg->attendee_ID()] = $reg->attendee(); |
|
377 | + $event_attendee_count[$evt_id] = isset($event_attendee_count[$evt_id]) |
|
378 | + ? $event_attendee_count[$evt_id] + 1 |
|
379 | 379 | : 0; |
380 | - $attendees[ $reg->attendee_ID() ]['line_ref'][] = $evt_id; |
|
381 | - $attendees[ $reg->attendee_ID() ]['att_obj'] = $reg->attendee(); |
|
382 | - $attendees[ $reg->attendee_ID() ]['reg_objs'][ $reg->ID() ] = $reg; |
|
380 | + $attendees[$reg->attendee_ID()]['line_ref'][] = $evt_id; |
|
381 | + $attendees[$reg->attendee_ID()]['att_obj'] = $reg->attendee(); |
|
382 | + $attendees[$reg->attendee_ID()]['reg_objs'][$reg->ID()] = $reg; |
|
383 | 383 | //$attendees[ $reg->attendee_ID() ]['registration_id'] = $reg->ID(); |
384 | - $attendees[ $reg->attendee_ID() ]['attendee_email'] = $reg->attendee() instanceof EE_Attendee |
|
384 | + $attendees[$reg->attendee_ID()]['attendee_email'] = $reg->attendee() instanceof EE_Attendee |
|
385 | 385 | ? $reg->attendee()->email() |
386 | 386 | : ''; |
387 | - $attendees[ $reg->attendee_ID() ]['tkt_objs'][ $ticket->ID() ] = $ticket; |
|
388 | - $attendees[ $reg->attendee_ID() ]['evt_objs'][ $evt_id ] = $event; |
|
387 | + $attendees[$reg->attendee_ID()]['tkt_objs'][$ticket->ID()] = $ticket; |
|
388 | + $attendees[$reg->attendee_ID()]['evt_objs'][$evt_id] = $event; |
|
389 | 389 | |
390 | 390 | //registrations |
391 | - $registrations[ $reg->ID() ]['tkt_obj'] = $ticket; |
|
392 | - $registrations[ $reg->ID() ]['evt_obj'] = $event; |
|
393 | - $registrations[ $reg->ID() ]['reg_obj'] = $reg; |
|
394 | - $registrations[ $reg->ID() ]['att_obj'] = $reg->attendee(); |
|
391 | + $registrations[$reg->ID()]['tkt_obj'] = $ticket; |
|
392 | + $registrations[$reg->ID()]['evt_obj'] = $event; |
|
393 | + $registrations[$reg->ID()]['reg_obj'] = $reg; |
|
394 | + $registrations[$reg->ID()]['att_obj'] = $reg->attendee(); |
|
395 | 395 | |
396 | 396 | //set up answer objects |
397 | - $rel_ans = $reg->get_many_related( 'Answer' ); |
|
398 | - foreach ( $rel_ans as $ansid => $answer ) { |
|
399 | - if ( ! isset( $questions[ $ansid ] ) ) { |
|
400 | - $questions[ $ansid ] = $answer->get_first_related( 'Question' ); |
|
397 | + $rel_ans = $reg->get_many_related('Answer'); |
|
398 | + foreach ($rel_ans as $ansid => $answer) { |
|
399 | + if ( ! isset($questions[$ansid])) { |
|
400 | + $questions[$ansid] = $answer->get_first_related('Question'); |
|
401 | 401 | } |
402 | - $answers[ $ansid ] = $answer; |
|
403 | - $registrations[ $reg->ID() ]['ans_objs'][ $ansid ] = $answer; |
|
402 | + $answers[$ansid] = $answer; |
|
403 | + $registrations[$reg->ID()]['ans_objs'][$ansid] = $answer; |
|
404 | 404 | } |
405 | 405 | |
406 | - foreach ( $relateddatetime as $dtt_id => $datetime ) { |
|
407 | - $eventsetup[ $evt_id ]['dtt_objs'][ $dtt_id ] = $datetime; |
|
408 | - $registrations[ $reg->ID() ]['dtt_objs'][ $dtt_id ] = $datetime; |
|
406 | + foreach ($relateddatetime as $dtt_id => $datetime) { |
|
407 | + $eventsetup[$evt_id]['dtt_objs'][$dtt_id] = $datetime; |
|
408 | + $registrations[$reg->ID()]['dtt_objs'][$dtt_id] = $datetime; |
|
409 | 409 | |
410 | - if ( isset( $datetimes[ $dtt_id ] ) ) { |
|
410 | + if (isset($datetimes[$dtt_id])) { |
|
411 | 411 | continue; //already have this info in the datetimes array. |
412 | 412 | } |
413 | 413 | |
414 | - $datetimes[ $dtt_id ]['tkt_objs'][] = $ticket; |
|
415 | - $datetimes[ $dtt_id ]['datetime'] = $datetime; |
|
416 | - $datetimes[ $dtt_id ]['evt_objs'][ $evt_id ] = $event; |
|
417 | - $datetimes[ $dtt_id ]['reg_objs'][ $reg->ID() ] = $reg; |
|
414 | + $datetimes[$dtt_id]['tkt_objs'][] = $ticket; |
|
415 | + $datetimes[$dtt_id]['datetime'] = $datetime; |
|
416 | + $datetimes[$dtt_id]['evt_objs'][$evt_id] = $event; |
|
417 | + $datetimes[$dtt_id]['reg_objs'][$reg->ID()] = $reg; |
|
418 | 418 | } |
419 | 419 | } |
420 | 420 | |
421 | 421 | //let's loop through the unique event=>reg items and setup data on them |
422 | 422 | |
423 | - if ( ! empty( $eventsetup ) ) { |
|
424 | - foreach ( $eventsetup as $evt_id => $items ) { |
|
425 | - if ( $this->txn instanceof EE_Transaction ) { |
|
423 | + if ( ! empty($eventsetup)) { |
|
424 | + foreach ($eventsetup as $evt_id => $items) { |
|
425 | + if ($this->txn instanceof EE_Transaction) { |
|
426 | 426 | $ticket_line_items_for_event = EEM_Line_Item::instance()->get_all( |
427 | 427 | array( |
428 | 428 | array( |
@@ -435,25 +435,25 @@ discard block |
||
435 | 435 | } else { |
436 | 436 | $ticket_line_items_for_event = array(); |
437 | 437 | } |
438 | - $events[ $evt_id ] = array( |
|
438 | + $events[$evt_id] = array( |
|
439 | 439 | 'ID' => $evt_id, |
440 | - 'event' => $evtcache[ $evt_id ], |
|
441 | - 'name' => $evtcache[ $evt_id ] instanceof EE_Event ? $evtcache[ $evt_id ]->name() : '', |
|
442 | - 'total_attendees' => $event_attendee_count[ $evt_id ], |
|
440 | + 'event' => $evtcache[$evt_id], |
|
441 | + 'name' => $evtcache[$evt_id] instanceof EE_Event ? $evtcache[$evt_id]->name() : '', |
|
442 | + 'total_attendees' => $event_attendee_count[$evt_id], |
|
443 | 443 | 'reg_objs' => $items['reg_objs'], |
444 | 444 | 'tkt_objs' => $items['tkt_objs'], |
445 | 445 | 'att_objs' => $items['att_objs'], |
446 | - 'dtt_objs' => isset( $items['dtt_objs'] ) ? $items['dtt_objs'] : array(), |
|
446 | + 'dtt_objs' => isset($items['dtt_objs']) ? $items['dtt_objs'] : array(), |
|
447 | 447 | 'line_items' => $ticket_line_items_for_event, |
448 | 448 | ); |
449 | 449 | |
450 | 450 | //make sure the tickets have the line items setup for them. |
451 | - foreach ( $ticket_line_items_for_event as $line_id => $line_item ) { |
|
452 | - if ( $line_item instanceof EE_Line_Item ) { |
|
453 | - $tickets[ $line_item->ticket()->ID() ]['line_item'] = $line_item; |
|
454 | - $tickets[ $line_item->ticket()->ID() ]['sub_line_items'] = $line_item->children(); |
|
455 | - $line_items[ $line_item->ID() ]['children'] = $line_item->children(); |
|
456 | - $line_items[ $line_item->ID() ]['EE_Ticket'] = $line_item->ticket(); |
|
451 | + foreach ($ticket_line_items_for_event as $line_id => $line_item) { |
|
452 | + if ($line_item instanceof EE_Line_Item) { |
|
453 | + $tickets[$line_item->ticket()->ID()]['line_item'] = $line_item; |
|
454 | + $tickets[$line_item->ticket()->ID()]['sub_line_items'] = $line_item->children(); |
|
455 | + $line_items[$line_item->ID()]['children'] = $line_item->children(); |
|
456 | + $line_items[$line_item->ID()]['EE_Ticket'] = $line_item->ticket(); |
|
457 | 457 | } |
458 | 458 | } |
459 | 459 | } |
@@ -475,7 +475,7 @@ discard block |
||
475 | 475 | $this->total_ticket_count = $total_ticket_count; |
476 | 476 | $this->registrations = $registrations; |
477 | 477 | |
478 | - if ( $this->txn instanceof EE_Transaction ) { |
|
478 | + if ($this->txn instanceof EE_Transaction) { |
|
479 | 479 | $this->tax_line_items = $this->txn->tax_items(); |
480 | 480 | $this->additional_line_items = $this->txn->non_ticket_line_items(); |
481 | 481 | $this->payments = $this->txn->payments(); |
@@ -485,10 +485,10 @@ discard block |
||
485 | 485 | //let's get just the primary_attendee_data! First we get the primary registration object. |
486 | 486 | $primary_reg = $this->txn->primary_registration(); |
487 | 487 | // verify |
488 | - if ( $primary_reg instanceof EE_Registration ) { |
|
488 | + if ($primary_reg instanceof EE_Registration) { |
|
489 | 489 | |
490 | 490 | // get attendee object |
491 | - if ( $primary_reg->attendee() instanceof EE_Attendee ) { |
|
491 | + if ($primary_reg->attendee() instanceof EE_Attendee) { |
|
492 | 492 | |
493 | 493 | //now we can setup the primary_attendee_data array |
494 | 494 | $this->primary_attendee_data = array( |
@@ -1,6 +1,7 @@ |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | +} |
|
4 | 5 | |
5 | 6 | /** |
6 | 7 | * Event Espresso |