@@ -274,26 +274,26 @@ discard block |
||
274 | 274 | if ( ! $this->validate_ipn( $update_info, $payment ) ) { |
275 | 275 | return $payment; |
276 | 276 | } |
277 | - // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction, |
|
278 | - // registrations, ticket counts, etc) |
|
279 | - if ( |
|
280 | - ( |
|
281 | - $update_info[ 'payment_status' ] === 'Refunded' |
|
282 | - || $update_info[ 'payment_status' ] === 'Partially_Refunded' |
|
283 | - ) |
|
284 | - && apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true ) |
|
285 | - ) { |
|
286 | - throw new EventEspresso\core\exceptions\IpnException( |
|
287 | - sprintf( |
|
288 | - esc_html__( 'Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'), |
|
289 | - $update_info['payment_status'] |
|
290 | - ), |
|
291 | - EventEspresso\core\exceptions\IpnException::UNSUPPORTED, |
|
292 | - null, |
|
293 | - $payment, |
|
294 | - $update_info |
|
295 | - ); |
|
296 | - } |
|
277 | + // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction, |
|
278 | + // registrations, ticket counts, etc) |
|
279 | + if ( |
|
280 | + ( |
|
281 | + $update_info[ 'payment_status' ] === 'Refunded' |
|
282 | + || $update_info[ 'payment_status' ] === 'Partially_Refunded' |
|
283 | + ) |
|
284 | + && apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true ) |
|
285 | + ) { |
|
286 | + throw new EventEspresso\core\exceptions\IpnException( |
|
287 | + sprintf( |
|
288 | + esc_html__( 'Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'), |
|
289 | + $update_info['payment_status'] |
|
290 | + ), |
|
291 | + EventEspresso\core\exceptions\IpnException::UNSUPPORTED, |
|
292 | + null, |
|
293 | + $payment, |
|
294 | + $update_info |
|
295 | + ); |
|
296 | + } |
|
297 | 297 | //ok, well let's process this payment then! |
298 | 298 | switch ( $update_info[ 'payment_status' ] ) { |
299 | 299 | |
@@ -541,17 +541,17 @@ discard block |
||
541 | 541 | |
542 | 542 | //might paypal have changed the taxes? |
543 | 543 | if( $this->_paypal_taxes && $payment_was_itemized ) { |
544 | - // note that we're doing this BEFORE adding shipping; |
|
544 | + // note that we're doing this BEFORE adding shipping; |
|
545 | 545 | // we actually want PayPal's shipping to remain non-taxable |
546 | - $this->_line_item->set_line_items_taxable( $transaction_total_line_item, true, 'paypal_shipping' ); |
|
547 | - $this->_line_item->set_total_tax_to( |
|
548 | - $transaction_total_line_item, |
|
549 | - (float)$update_info['tax'], |
|
550 | - esc_html__( 'Taxes', 'event_espresso' ), |
|
551 | - esc_html__( 'Calculated by Paypal', 'event_espresso' ), |
|
552 | - 'paypal_tax' |
|
553 | - ); |
|
554 | - $grand_total_needs_resaving = TRUE; |
|
546 | + $this->_line_item->set_line_items_taxable( $transaction_total_line_item, true, 'paypal_shipping' ); |
|
547 | + $this->_line_item->set_total_tax_to( |
|
548 | + $transaction_total_line_item, |
|
549 | + (float)$update_info['tax'], |
|
550 | + esc_html__( 'Taxes', 'event_espresso' ), |
|
551 | + esc_html__( 'Calculated by Paypal', 'event_espresso' ), |
|
552 | + 'paypal_tax' |
|
553 | + ); |
|
554 | + $grand_total_needs_resaving = TRUE; |
|
555 | 555 | } |
556 | 556 | |
557 | 557 | $shipping_amount = (float)$update_info[ 'mc_shipping' ]; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * @return EEG_Paypal_Standard |
71 | 71 | */ |
72 | 72 | public function __construct() { |
73 | - $this->set_uses_separate_IPN_request( true ) ; |
|
73 | + $this->set_uses_separate_IPN_request(true); |
|
74 | 74 | parent::__construct(); |
75 | 75 | } |
76 | 76 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * Also sets the gateway url class variable based on whether debug mode is enabled or not |
81 | 81 | * @param array $settings_array |
82 | 82 | */ |
83 | - public function set_settings($settings_array){ |
|
83 | + public function set_settings($settings_array) { |
|
84 | 84 | parent::set_settings($settings_array); |
85 | 85 | $this->_gateway_url = $this->_debug_mode |
86 | 86 | ? 'https://www.sandbox.paypal.com/cgi-bin/webscr' |
@@ -114,42 +114,42 @@ discard block |
||
114 | 114 | |
115 | 115 | $total_discounts_to_cart_total = $transaction->paid(); |
116 | 116 | //only itemize the order if we're paying for the rest of the order's amount |
117 | - if( EEH_Money::compare_floats( $payment->amount(), $transaction->total(), '==' ) ) { |
|
118 | - $payment->update_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, true ); |
|
117 | + if (EEH_Money::compare_floats($payment->amount(), $transaction->total(), '==')) { |
|
118 | + $payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true); |
|
119 | 119 | //this payment is for the remaining transaction amount, |
120 | 120 | //keep track of exactly how much the itemized order amount equals |
121 | 121 | $itemized_sum = 0; |
122 | 122 | $shipping_previously_added = 0; |
123 | 123 | //so let's show all the line items |
124 | - foreach($total_line_item->get_items() as $line_item){ |
|
125 | - if ( $line_item instanceof EE_Line_Item ) { |
|
124 | + foreach ($total_line_item->get_items() as $line_item) { |
|
125 | + if ($line_item instanceof EE_Line_Item) { |
|
126 | 126 | //it's some kind of discount |
127 | - if( $line_item->total() < 0 ) { |
|
128 | - $total_discounts_to_cart_total += abs( $line_item->total() ); |
|
127 | + if ($line_item->total() < 0) { |
|
128 | + $total_discounts_to_cart_total += abs($line_item->total()); |
|
129 | 129 | $itemized_sum += $line_item->total(); |
130 | 130 | continue; |
131 | 131 | } |
132 | 132 | //dont include shipping again. |
133 | - if( strpos( $line_item->code(), 'paypal_shipping_') === 0 ) { |
|
133 | + if (strpos($line_item->code(), 'paypal_shipping_') === 0) { |
|
134 | 134 | $shipping_previously_added = $line_item->total(); |
135 | 135 | continue; |
136 | 136 | } |
137 | - $redirect_args[ 'item_name_' . $item_num ] = substr( |
|
138 | - $this->_format_line_item_name( $line_item, $payment ), |
|
137 | + $redirect_args['item_name_'.$item_num] = substr( |
|
138 | + $this->_format_line_item_name($line_item, $payment), |
|
139 | 139 | 0, 127 |
140 | 140 | ); |
141 | - $redirect_args[ 'amount_' . $item_num ] = $line_item->unit_price(); |
|
142 | - $redirect_args[ 'quantity_' . $item_num ] = $line_item->quantity(); |
|
141 | + $redirect_args['amount_'.$item_num] = $line_item->unit_price(); |
|
142 | + $redirect_args['quantity_'.$item_num] = $line_item->quantity(); |
|
143 | 143 | //if we're not letting PayPal calculate shipping, tell them its 0 |
144 | - if ( ! $this->_paypal_shipping ) { |
|
145 | - $redirect_args[ 'shipping_' . $item_num ] = '0'; |
|
146 | - $redirect_args[ 'shipping2_' . $item_num ] = '0'; |
|
144 | + if ( ! $this->_paypal_shipping) { |
|
145 | + $redirect_args['shipping_'.$item_num] = '0'; |
|
146 | + $redirect_args['shipping2_'.$item_num] = '0'; |
|
147 | 147 | } |
148 | 148 | $item_num++; |
149 | 149 | $itemized_sum += $line_item->total(); |
150 | 150 | } |
151 | 151 | } |
152 | - $taxes_li = $this->_line_item->get_taxes_subtotal( $total_line_item ); |
|
152 | + $taxes_li = $this->_line_item->get_taxes_subtotal($total_line_item); |
|
153 | 153 | //ideally itemized sum equals the transaction total. but if not (which is weird) |
154 | 154 | //and the itemized sum is LESS than the transaction total |
155 | 155 | //add another line item |
@@ -159,47 +159,47 @@ discard block |
||
159 | 159 | $transaction->total() - $itemized_sum - $taxes_li->total() - $shipping_previously_added, |
160 | 160 | 2 |
161 | 161 | ); |
162 | - if( $itemized_sum_diff_from_txn_total < 0 ) { |
|
162 | + if ($itemized_sum_diff_from_txn_total < 0) { |
|
163 | 163 | //itemized sum is too big |
164 | - $total_discounts_to_cart_total += abs( $itemized_sum_diff_from_txn_total ); |
|
165 | - } elseif( $itemized_sum_diff_from_txn_total > 0 ) { |
|
166 | - $redirect_args[ 'item_name_' . $item_num ] = substr( |
|
167 | - __( 'Other charges', 'event_espresso' ), 0, 127 ); |
|
168 | - $redirect_args[ 'amount_' . $item_num ] = $this->format_currency( $itemized_sum_diff_from_txn_total ); |
|
169 | - $redirect_args[ 'quantity_' . $item_num ] = 1; |
|
164 | + $total_discounts_to_cart_total += abs($itemized_sum_diff_from_txn_total); |
|
165 | + } elseif ($itemized_sum_diff_from_txn_total > 0) { |
|
166 | + $redirect_args['item_name_'.$item_num] = substr( |
|
167 | + __('Other charges', 'event_espresso'), 0, 127 ); |
|
168 | + $redirect_args['amount_'.$item_num] = $this->format_currency($itemized_sum_diff_from_txn_total); |
|
169 | + $redirect_args['quantity_'.$item_num] = 1; |
|
170 | 170 | $item_num++; |
171 | 171 | } |
172 | - if( $total_discounts_to_cart_total > 0 ) { |
|
173 | - $redirect_args[ 'discount_amount_cart' ] = $this->format_currency( $total_discounts_to_cart_total ); |
|
172 | + if ($total_discounts_to_cart_total > 0) { |
|
173 | + $redirect_args['discount_amount_cart'] = $this->format_currency($total_discounts_to_cart_total); |
|
174 | 174 | } |
175 | 175 | //add our taxes to the order if we're NOT using PayPal's |
176 | - if( ! $this->_paypal_taxes ){ |
|
176 | + if ( ! $this->_paypal_taxes) { |
|
177 | 177 | $redirect_args['tax_cart'] = $total_line_item->get_total_tax(); |
178 | 178 | } |
179 | 179 | } else { |
180 | - $payment->update_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, false ); |
|
180 | + $payment->update_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, false); |
|
181 | 181 | //partial payment that's not for the remaining amount, so we can't send an itemized list |
182 | - $redirect_args['item_name_' . $item_num] = substr( |
|
183 | - $this->_format_partial_payment_line_item_name( $payment ), |
|
182 | + $redirect_args['item_name_'.$item_num] = substr( |
|
183 | + $this->_format_partial_payment_line_item_name($payment), |
|
184 | 184 | 0, 127 |
185 | 185 | ); |
186 | - $redirect_args['amount_' . $item_num] = $payment->amount(); |
|
187 | - $redirect_args['shipping_' . $item_num ] = '0'; |
|
188 | - $redirect_args['shipping2_' . $item_num ] = '0'; |
|
186 | + $redirect_args['amount_'.$item_num] = $payment->amount(); |
|
187 | + $redirect_args['shipping_'.$item_num] = '0'; |
|
188 | + $redirect_args['shipping2_'.$item_num] = '0'; |
|
189 | 189 | $redirect_args['tax_cart'] = '0'; |
190 | 190 | $item_num++; |
191 | 191 | } |
192 | 192 | |
193 | - if($this->_debug_mode){ |
|
194 | - $redirect_args['item_name_' . $item_num] = 'DEBUG INFO (this item only added in sandbox mode'; |
|
195 | - $redirect_args['amount_' . $item_num] = 0; |
|
193 | + if ($this->_debug_mode) { |
|
194 | + $redirect_args['item_name_'.$item_num] = 'DEBUG INFO (this item only added in sandbox mode'; |
|
195 | + $redirect_args['amount_'.$item_num] = 0; |
|
196 | 196 | $redirect_args['on0_'.$item_num] = 'NOTIFY URL'; |
197 | - $redirect_args['os0_' . $item_num] = $notify_url; |
|
197 | + $redirect_args['os0_'.$item_num] = $notify_url; |
|
198 | 198 | $redirect_args['on1_'.$item_num] = 'RETURN URL'; |
199 | - $redirect_args['os1_' . $item_num] = $return_url; |
|
199 | + $redirect_args['os1_'.$item_num] = $return_url; |
|
200 | 200 | // $redirect_args['option_index_' . $item_num] = 1; // <-- dunno if this is needed ? |
201 | - $redirect_args['shipping_' . $item_num ] = '0'; |
|
202 | - $redirect_args['shipping2_' . $item_num ] = '0'; |
|
201 | + $redirect_args['shipping_'.$item_num] = '0'; |
|
202 | + $redirect_args['shipping2_'.$item_num] = '0'; |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | $redirect_args['business'] = $this->_paypal_id; |
@@ -209,14 +209,14 @@ discard block |
||
209 | 209 | $redirect_args['cmd'] = '_cart'; |
210 | 210 | $redirect_args['upload'] = 1; |
211 | 211 | $redirect_args['currency_code'] = $payment->currency_code(); |
212 | - $redirect_args['rm'] = 2;//makes the user return with method=POST |
|
213 | - if($this->_image_url){ |
|
212 | + $redirect_args['rm'] = 2; //makes the user return with method=POST |
|
213 | + if ($this->_image_url) { |
|
214 | 214 | $redirect_args['image_url'] = $this->_image_url; |
215 | 215 | } |
216 | 216 | $redirect_args['no_shipping'] = $this->_shipping_details; |
217 | - $redirect_args['bn'] = 'EventEspresso_SP';//EE will blow up if you change this |
|
217 | + $redirect_args['bn'] = 'EventEspresso_SP'; //EE will blow up if you change this |
|
218 | 218 | |
219 | - $redirect_args = apply_filters( "FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this ); |
|
219 | + $redirect_args = apply_filters("FHEE__EEG_Paypal_Standard__set_redirection_info__arguments", $redirect_args, $this); |
|
220 | 220 | |
221 | 221 | $payment->set_redirect_url($this->_gateway_url); |
222 | 222 | $payment->set_redirect_args($redirect_args); |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | $this->log( |
225 | 225 | array( |
226 | 226 | 'message' => sprintf( |
227 | - __( 'PayPal payment request initiated.', 'event_espresso' ) |
|
227 | + __('PayPal payment request initiated.', 'event_espresso') |
|
228 | 228 | ), |
229 | 229 | 'transaction' => $transaction->model_field_array(), |
230 | 230 | ), |
@@ -244,14 +244,14 @@ discard block |
||
244 | 244 | * @return \EEI_Payment updated |
245 | 245 | * @throws \EE_Error, IpnException |
246 | 246 | */ |
247 | - public function handle_payment_update( $update_info, $transaction ){ |
|
247 | + public function handle_payment_update($update_info, $transaction) { |
|
248 | 248 | // verify there's payment data that's been sent |
249 | - if ( empty( $update_info[ 'payment_status' ] ) || empty( $update_info[ 'txn_id' ] ) ) { |
|
249 | + if (empty($update_info['payment_status']) || empty($update_info['txn_id'])) { |
|
250 | 250 | // log the results |
251 | 251 | $this->log( |
252 | 252 | array( |
253 | 253 | 'message' => sprintf( |
254 | - __( 'PayPal IPN response is missing critical payment data. This may indicate a PDT request and require your PayPal account settings to be corrected.', 'event_espresso' ) |
|
254 | + __('PayPal IPN response is missing critical payment data. This may indicate a PDT request and require your PayPal account settings to be corrected.', 'event_espresso') |
|
255 | 255 | ), |
256 | 256 | 'update_info' => $update_info, |
257 | 257 | ), |
@@ -259,33 +259,33 @@ discard block |
||
259 | 259 | ); |
260 | 260 | // waaaait... is this a PDT request? (see https://developer.paypal.com/docs/classic/products/payment-data-transfer/) |
261 | 261 | // indicated by the "tx" argument? If so, we don't need it. We'll just use the IPN data when it comes |
262 | - if ( isset( $update_info[ 'tx' ] ) ) { |
|
262 | + if (isset($update_info['tx'])) { |
|
263 | 263 | return $transaction->last_payment(); |
264 | 264 | } else { |
265 | 265 | return null; |
266 | 266 | } |
267 | 267 | } |
268 | - $payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr( $update_info[ 'txn_id' ] ); |
|
269 | - if ( ! $payment instanceof EEI_Payment ) { |
|
268 | + $payment = $this->_pay_model->get_payment_by_txn_id_chq_nmbr($update_info['txn_id']); |
|
269 | + if ( ! $payment instanceof EEI_Payment) { |
|
270 | 270 | $payment = $transaction->last_payment(); |
271 | 271 | } |
272 | 272 | // ok, then validate the IPN. Even if we've already processed this payment, |
273 | 273 | // let PayPal know we don't want to hear from them anymore! |
274 | - if ( ! $this->validate_ipn( $update_info, $payment ) ) { |
|
274 | + if ( ! $this->validate_ipn($update_info, $payment)) { |
|
275 | 275 | return $payment; |
276 | 276 | } |
277 | 277 | // kill request here if this is a refund, we don't support them yet (we'd need to adjust the transaction, |
278 | 278 | // registrations, ticket counts, etc) |
279 | 279 | if ( |
280 | 280 | ( |
281 | - $update_info[ 'payment_status' ] === 'Refunded' |
|
282 | - || $update_info[ 'payment_status' ] === 'Partially_Refunded' |
|
281 | + $update_info['payment_status'] === 'Refunded' |
|
282 | + || $update_info['payment_status'] === 'Partially_Refunded' |
|
283 | 283 | ) |
284 | - && apply_filters( 'FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true ) |
|
284 | + && apply_filters('FHEE__EEG_Paypal_Standard__handle_payment_update__kill_refund_request', true) |
|
285 | 285 | ) { |
286 | 286 | throw new EventEspresso\core\exceptions\IpnException( |
287 | 287 | sprintf( |
288 | - esc_html__( 'Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'), |
|
288 | + esc_html__('Event Espresso does not yet support %1$s IPNs from PayPal', 'event_espresso'), |
|
289 | 289 | $update_info['payment_status'] |
290 | 290 | ), |
291 | 291 | EventEspresso\core\exceptions\IpnException::UNSUPPORTED, |
@@ -295,34 +295,34 @@ discard block |
||
295 | 295 | ); |
296 | 296 | } |
297 | 297 | //ok, well let's process this payment then! |
298 | - switch ( $update_info[ 'payment_status' ] ) { |
|
298 | + switch ($update_info['payment_status']) { |
|
299 | 299 | |
300 | 300 | case 'Completed' : |
301 | 301 | $status = $this->_pay_model->approved_status(); |
302 | - $gateway_response = esc_html__( 'The payment is approved.', 'event_espresso' ); |
|
302 | + $gateway_response = esc_html__('The payment is approved.', 'event_espresso'); |
|
303 | 303 | break; |
304 | 304 | |
305 | 305 | case 'Pending' : |
306 | 306 | $status = $this->_pay_model->pending_status(); |
307 | - $gateway_response = esc_html__( 'The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso' ); |
|
307 | + $gateway_response = esc_html__('The payment is in progress. Another message will be sent when payment is approved.', 'event_espresso'); |
|
308 | 308 | break; |
309 | 309 | |
310 | 310 | case 'Denied' : |
311 | 311 | $status = $this->_pay_model->declined_status(); |
312 | - $gateway_response = esc_html__( 'The payment has been declined.', 'event_espresso' ); |
|
312 | + $gateway_response = esc_html__('The payment has been declined.', 'event_espresso'); |
|
313 | 313 | break; |
314 | 314 | |
315 | 315 | case 'Expired' : |
316 | 316 | case 'Failed' : |
317 | 317 | $status = $this->_pay_model->failed_status(); |
318 | - $gateway_response = esc_html__( 'The payment failed for technical reasons or expired.', 'event_espresso' ); |
|
318 | + $gateway_response = esc_html__('The payment failed for technical reasons or expired.', 'event_espresso'); |
|
319 | 319 | break; |
320 | 320 | |
321 | 321 | case 'Refunded' : |
322 | 322 | case 'Partially_Refunded' : |
323 | 323 | // even though it's a refund, we consider the payment as approved, it just has a negative value |
324 | 324 | $status = $this->_pay_model->approved_status(); |
325 | - $gateway_response = esc_html__( 'The payment has been refunded. Please update registrations accordingly.', 'event_espresso' ); |
|
325 | + $gateway_response = esc_html__('The payment has been refunded. Please update registrations accordingly.', 'event_espresso'); |
|
326 | 326 | break; |
327 | 327 | |
328 | 328 | case 'Voided' : |
@@ -330,19 +330,19 @@ discard block |
||
330 | 330 | case 'Canceled_Reversal' : |
331 | 331 | default : |
332 | 332 | $status = $this->_pay_model->cancelled_status(); |
333 | - $gateway_response = esc_html__( 'The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso' ); |
|
333 | + $gateway_response = esc_html__('The payment was cancelled, reversed, or voided. Please update registrations accordingly.', 'event_espresso'); |
|
334 | 334 | break; |
335 | 335 | |
336 | 336 | } |
337 | 337 | |
338 | 338 | //check if we've already processed this payment |
339 | - if ( $payment instanceof EEI_Payment ) { |
|
339 | + if ($payment instanceof EEI_Payment) { |
|
340 | 340 | //payment exists. if this has the exact same status and amount, don't bother updating. just return |
341 | - if ( $payment->status() === $status && (float)$payment->amount() === (float)$update_info[ 'mc_gross' ] ) { |
|
341 | + if ($payment->status() === $status && (float) $payment->amount() === (float) $update_info['mc_gross']) { |
|
342 | 342 | // DUPLICATED IPN! don't bother updating transaction |
343 | 343 | throw new IpnException( |
344 | 344 | sprintf( |
345 | - esc_html__( 'It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso' ), |
|
345 | + esc_html__('It appears we have received a duplicate IPN from PayPal for payment %d', 'event_espresso'), |
|
346 | 346 | $payment->ID() |
347 | 347 | ), |
348 | 348 | IpnException::DUPLICATE, |
@@ -352,14 +352,14 @@ discard block |
||
352 | 352 | ); |
353 | 353 | } else { |
354 | 354 | // new payment yippee !!! |
355 | - $payment->set_status( $status ); |
|
356 | - $payment->set_amount( (float)$update_info[ 'mc_gross' ] ); |
|
357 | - $payment->set_gateway_response( $gateway_response ); |
|
358 | - $payment->set_details( $update_info ); |
|
359 | - $payment->set_txn_id_chq_nmbr( $update_info[ 'txn_id' ] ); |
|
355 | + $payment->set_status($status); |
|
356 | + $payment->set_amount((float) $update_info['mc_gross']); |
|
357 | + $payment->set_gateway_response($gateway_response); |
|
358 | + $payment->set_details($update_info); |
|
359 | + $payment->set_txn_id_chq_nmbr($update_info['txn_id']); |
|
360 | 360 | $this->log( |
361 | 361 | array( |
362 | - 'message' => esc_html__( 'Updated payment either from IPN or as part of POST from PayPal', 'event_espresso' ), |
|
362 | + 'message' => esc_html__('Updated payment either from IPN or as part of POST from PayPal', 'event_espresso'), |
|
363 | 363 | 'url' => $this->_process_response_url(), |
364 | 364 | 'payment' => $payment->model_field_array(), |
365 | 365 | 'IPN_data' => $update_info |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | } |
370 | 370 | |
371 | 371 | } |
372 | - do_action( 'FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this ); |
|
372 | + do_action('FHEE__EEG_Paypal_Standard__handle_payment_update__payment_processed', $payment, $this); |
|
373 | 373 | return $payment; |
374 | 374 | } |
375 | 375 | |
@@ -384,9 +384,9 @@ discard block |
||
384 | 384 | * @return boolean |
385 | 385 | * @throws \EE_Error |
386 | 386 | */ |
387 | - public function validate_ipn( $update_info, $payment ) { |
|
387 | + public function validate_ipn($update_info, $payment) { |
|
388 | 388 | //allow us to skip validating IPNs with PayPal (useful for testing) |
389 | - if ( apply_filters( 'FHEE__EEG_Paypal_Standard__validate_ipn__skip', false ) ) { |
|
389 | + if (apply_filters('FHEE__EEG_Paypal_Standard__validate_ipn__skip', false)) { |
|
390 | 390 | return true; |
391 | 391 | } |
392 | 392 | //...otherwise, we actually don't care what the $update_info is, we need to look |
@@ -394,22 +394,22 @@ discard block |
||
394 | 394 | // Reading POSTed data directly from $_POST causes serialization issues with array data in the POST. |
395 | 395 | // Instead, read raw POST data from the input stream. |
396 | 396 | // @see https://gist.github.com/xcommerce-gists/3440401 |
397 | - $raw_post_data = file_get_contents( 'php://input' ); |
|
398 | - $raw_post_array = explode( '&', $raw_post_data ); |
|
397 | + $raw_post_data = file_get_contents('php://input'); |
|
398 | + $raw_post_array = explode('&', $raw_post_data); |
|
399 | 399 | $update_info = array(); |
400 | - foreach ( $raw_post_array as $keyval ) { |
|
401 | - $keyval = explode( '=', $keyval ); |
|
402 | - if ( count( $keyval ) === 2 ) { |
|
403 | - $update_info[ $keyval[ 0 ] ] = urldecode( $keyval[ 1 ] ); |
|
400 | + foreach ($raw_post_array as $keyval) { |
|
401 | + $keyval = explode('=', $keyval); |
|
402 | + if (count($keyval) === 2) { |
|
403 | + $update_info[$keyval[0]] = urldecode($keyval[1]); |
|
404 | 404 | } |
405 | 405 | } |
406 | 406 | // read the IPN message sent from PayPal and prepend 'cmd=_notify-validate' |
407 | 407 | $req = 'cmd=_notify-validate'; |
408 | - $uses_get_magic_quotes = function_exists( 'get_magic_quotes_gpc' ) && get_magic_quotes_gpc() === 1 |
|
408 | + $uses_get_magic_quotes = function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc() === 1 |
|
409 | 409 | ? true |
410 | 410 | : false; |
411 | - foreach ( $update_info as $key => $value ) { |
|
412 | - $value = $uses_get_magic_quotes ? urlencode( stripslashes( $value ) ) : urlencode( $value ); |
|
411 | + foreach ($update_info as $key => $value) { |
|
412 | + $value = $uses_get_magic_quotes ? urlencode(stripslashes($value)) : urlencode($value); |
|
413 | 413 | $req .= "&$key=$value"; |
414 | 414 | } |
415 | 415 | // HTTP POST the complete, unaltered IPN back to PayPal |
@@ -418,38 +418,38 @@ discard block |
||
418 | 418 | array( |
419 | 419 | 'body' => $req, |
420 | 420 | 'sslverify' => false, |
421 | - 'timeout' => 60 , |
|
421 | + 'timeout' => 60, |
|
422 | 422 | // make sure to set a site specific unique "user-agent" string since the WordPres default gets declined by PayPal |
423 | 423 | // plz see: https://github.com/websharks/s2member/issues/610 |
424 | - 'user-agent' => 'Event Espresso v' . EVENT_ESPRESSO_VERSION . '; ' . home_url(), |
|
424 | + 'user-agent' => 'Event Espresso v'.EVENT_ESPRESSO_VERSION.'; '.home_url(), |
|
425 | 425 | 'httpversion' => '1.1' |
426 | 426 | ) |
427 | 427 | ); |
428 | 428 | // then check the response |
429 | 429 | if ( |
430 | - array_key_exists( 'body', $response ) |
|
431 | - && ! is_wp_error( $response ) |
|
432 | - && strcmp( $response[ 'body' ], "VERIFIED" ) === 0 |
|
430 | + array_key_exists('body', $response) |
|
431 | + && ! is_wp_error($response) |
|
432 | + && strcmp($response['body'], "VERIFIED") === 0 |
|
433 | 433 | ) { |
434 | 434 | return true; |
435 | 435 | } |
436 | 436 | // huh, something's wack... the IPN didn't validate. We must have replied to the IPN incorrectly, |
437 | 437 | // or their API must have changed: http://www.paypalobjects.com/en_US/ebook/PP_OrderManagement_IntegrationGuide/ipn.html |
438 | - if( $response instanceof WP_Error ) { |
|
438 | + if ($response instanceof WP_Error) { |
|
439 | 439 | $error_msg = sprintf( |
440 | - esc_html__( 'WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso' ), |
|
440 | + esc_html__('WP Error. Code: "%1$s", Message: "%2$s", Data: "%3$s"', 'event_espresso'), |
|
441 | 441 | $response->get_error_code(), |
442 | 442 | $response->get_error_message(), |
443 | - print_r( $response->get_error_data(), true ) |
|
443 | + print_r($response->get_error_data(), true) |
|
444 | 444 | ); |
445 | - } elseif( is_array( $response ) && isset( $response[ 'body' ] ) ) { |
|
446 | - $error_msg = $response[ 'body' ]; |
|
445 | + } elseif (is_array($response) && isset($response['body'])) { |
|
446 | + $error_msg = $response['body']; |
|
447 | 447 | } else { |
448 | - $error_msg = print_r( $response, true ); |
|
448 | + $error_msg = print_r($response, true); |
|
449 | 449 | } |
450 | - $payment->set_gateway_response( sprintf( esc_html__( "IPN Validation failed! Paypal responded with '%s'", "event_espresso" ), $error_msg ) ); |
|
451 | - $payment->set_details( array( 'REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response ) ); |
|
452 | - $payment->set_status( EEM_Payment::status_id_failed ); |
|
450 | + $payment->set_gateway_response(sprintf(esc_html__("IPN Validation failed! Paypal responded with '%s'", "event_espresso"), $error_msg)); |
|
451 | + $payment->set_details(array('REQUEST' => $update_info, 'VALIDATION_RESPONSE' => $response)); |
|
452 | + $payment->set_status(EEM_Payment::status_id_failed); |
|
453 | 453 | // log the results |
454 | 454 | $this->log( |
455 | 455 | array( |
@@ -469,9 +469,9 @@ discard block |
||
469 | 469 | * @return string |
470 | 470 | */ |
471 | 471 | protected function _process_response_url() { |
472 | - if ( isset( $_SERVER[ 'HTTP_HOST' ], $_SERVER[ 'REQUEST_URI' ] ) ) { |
|
472 | + if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) { |
|
473 | 473 | $url = is_ssl() ? 'https://' : 'http://'; |
474 | - $url .= EEH_URL::filter_input_server_url( 'HTTP_HOST' ); |
|
474 | + $url .= EEH_URL::filter_input_server_url('HTTP_HOST'); |
|
475 | 475 | $url .= EEH_URL::filter_input_server_url(); |
476 | 476 | } else { |
477 | 477 | $url = 'unknown'; |
@@ -488,12 +488,12 @@ discard block |
||
488 | 488 | * @param EEI_Payment $payment |
489 | 489 | * @throws \EE_Error |
490 | 490 | */ |
491 | - public function update_txn_based_on_payment( $payment ) { |
|
491 | + public function update_txn_based_on_payment($payment) { |
|
492 | 492 | $update_info = $payment->details(); |
493 | 493 | /** @var EE_Transaction $transaction */ |
494 | 494 | $transaction = $payment->transaction(); |
495 | - $payment_was_itemized = $payment->get_extra_meta( EEG_Paypal_Standard::itemized_payment_option_name, true, false ); |
|
496 | - if( ! $transaction ){ |
|
495 | + $payment_was_itemized = $payment->get_extra_meta(EEG_Paypal_Standard::itemized_payment_option_name, true, false); |
|
496 | + if ( ! $transaction) { |
|
497 | 497 | $this->log( |
498 | 498 | esc_html__( |
499 | 499 | 'Payment with ID %d has no related transaction, and so update_txn_based_on_payment couldn\'t be executed properly', |
@@ -503,10 +503,10 @@ discard block |
||
503 | 503 | ); |
504 | 504 | return; |
505 | 505 | } |
506 | - if( |
|
507 | - ! is_array( $update_info ) |
|
508 | - || ! isset( $update_info[ 'mc_shipping' ] ) |
|
509 | - || ! isset( $update_info[ 'tax' ] ) |
|
506 | + if ( |
|
507 | + ! is_array($update_info) |
|
508 | + || ! isset($update_info['mc_shipping']) |
|
509 | + || ! isset($update_info['tax']) |
|
510 | 510 | ) { |
511 | 511 | $this->log( |
512 | 512 | array( |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | ); |
522 | 522 | return; |
523 | 523 | } |
524 | - if( $payment->status() !== $this->_pay_model->approved_status() ) { |
|
524 | + if ($payment->status() !== $this->_pay_model->approved_status()) { |
|
525 | 525 | $this->log( |
526 | 526 | array( |
527 | 527 | 'message' => esc_html__( |
@@ -540,44 +540,44 @@ discard block |
||
540 | 540 | $transaction_total_line_item = $transaction->total_line_item(); |
541 | 541 | |
542 | 542 | //might paypal have changed the taxes? |
543 | - if( $this->_paypal_taxes && $payment_was_itemized ) { |
|
543 | + if ($this->_paypal_taxes && $payment_was_itemized) { |
|
544 | 544 | // note that we're doing this BEFORE adding shipping; |
545 | 545 | // we actually want PayPal's shipping to remain non-taxable |
546 | - $this->_line_item->set_line_items_taxable( $transaction_total_line_item, true, 'paypal_shipping' ); |
|
546 | + $this->_line_item->set_line_items_taxable($transaction_total_line_item, true, 'paypal_shipping'); |
|
547 | 547 | $this->_line_item->set_total_tax_to( |
548 | 548 | $transaction_total_line_item, |
549 | - (float)$update_info['tax'], |
|
550 | - esc_html__( 'Taxes', 'event_espresso' ), |
|
551 | - esc_html__( 'Calculated by Paypal', 'event_espresso' ), |
|
549 | + (float) $update_info['tax'], |
|
550 | + esc_html__('Taxes', 'event_espresso'), |
|
551 | + esc_html__('Calculated by Paypal', 'event_espresso'), |
|
552 | 552 | 'paypal_tax' |
553 | 553 | ); |
554 | 554 | $grand_total_needs_resaving = TRUE; |
555 | 555 | } |
556 | 556 | |
557 | - $shipping_amount = (float)$update_info[ 'mc_shipping' ]; |
|
557 | + $shipping_amount = (float) $update_info['mc_shipping']; |
|
558 | 558 | //might paypal have added shipping? |
559 | - if( $this->_paypal_shipping && $shipping_amount && $payment_was_itemized ){ |
|
559 | + if ($this->_paypal_shipping && $shipping_amount && $payment_was_itemized) { |
|
560 | 560 | $this->_line_item->add_unrelated_item( |
561 | 561 | $transaction_total_line_item, |
562 | - sprintf( esc_html__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID() ), |
|
562 | + sprintf(esc_html__('Shipping for transaction %1$s', 'event_espresso'), $transaction->ID()), |
|
563 | 563 | $shipping_amount, |
564 | 564 | esc_html__('Shipping charges calculated by Paypal', 'event_espresso'), |
565 | 565 | 1, |
566 | 566 | false, |
567 | - 'paypal_shipping_' . $transaction->ID() |
|
567 | + 'paypal_shipping_'.$transaction->ID() |
|
568 | 568 | ); |
569 | 569 | $grand_total_needs_resaving = true; |
570 | 570 | } |
571 | 571 | |
572 | - if( $grand_total_needs_resaving ){ |
|
573 | - $transaction_total_line_item->save_this_and_descendants_to_txn( $transaction->ID() ); |
|
572 | + if ($grand_total_needs_resaving) { |
|
573 | + $transaction_total_line_item->save_this_and_descendants_to_txn($transaction->ID()); |
|
574 | 574 | /** @var EE_Registration_Processor $registration_processor */ |
575 | - $registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' ); |
|
576 | - $registration_processor->update_registration_final_prices( $transaction ); |
|
575 | + $registration_processor = EE_Registry::instance()->load_class('Registration_Processor'); |
|
576 | + $registration_processor->update_registration_final_prices($transaction); |
|
577 | 577 | } |
578 | 578 | $this->log( |
579 | 579 | array( |
580 | - 'message' => esc_html__( 'Updated transaction related to payment', 'event_espresso' ), |
|
580 | + 'message' => esc_html__('Updated transaction related to payment', 'event_espresso'), |
|
581 | 581 | 'url' => $this->_process_response_url(), |
582 | 582 | 'transaction (updated)' => $transaction->model_field_array(), |
583 | 583 | 'payment (updated)' => $payment->model_field_array(), |
@@ -13,9 +13,9 @@ discard block |
||
13 | 13 | */ |
14 | 14 | class EE_Payment_Processor extends EE_Processor_Base { |
15 | 15 | /** |
16 | - * @var EE_Payment_Processor $_instance |
|
16 | + * @var EE_Payment_Processor $_instance |
|
17 | 17 | * @access private |
18 | - */ |
|
18 | + */ |
|
19 | 19 | private static $_instance; |
20 | 20 | |
21 | 21 | |
@@ -50,7 +50,6 @@ discard block |
||
50 | 50 | /** |
51 | 51 | * Using the selected gateway, processes the payment for that transaction, and updates the transaction appropriately. |
52 | 52 | * Saves the payment that is generated |
53 | - |
|
54 | 53 | * |
55 | 54 | *@param EE_Payment_Method $payment_method |
56 | 55 | * @param EE_Transaction $transaction |
@@ -130,7 +129,6 @@ discard block |
||
130 | 129 | |
131 | 130 | |
132 | 131 | /** |
133 | - |
|
134 | 132 | * @param EE_Transaction|int $transaction |
135 | 133 | * @param EE_Payment_Method $payment_method |
136 | 134 | * @throws EE_Error |
@@ -221,22 +219,22 @@ discard block |
||
221 | 219 | /** @type EE_Payment_Method $payment_method */ |
222 | 220 | $payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method); |
223 | 221 | if ( $payment_method->type_obj() instanceof EE_PMT_Base ) { |
224 | - try { |
|
225 | - $payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction); |
|
226 | - $log->set_object($payment); |
|
227 | - } catch( EventEspresso\core\exceptions\IpnException $e ) { |
|
228 | - EEM_Change_Log::instance()->log( |
|
229 | - EEM_Change_Log::type_gateway, |
|
230 | - array( |
|
231 | - 'message' => 'IPN Exception: ' . $e->getMessage(), |
|
232 | - 'current_url' => EEH_URL::current_url(), |
|
233 | - 'payment' => $e->getPaymentProperties(), |
|
234 | - 'IPN_data' => $e->getIpnData() |
|
235 | - ), |
|
236 | - $obj_for_log |
|
237 | - ); |
|
238 | - return $e->getPayment(); |
|
239 | - } |
|
222 | + try { |
|
223 | + $payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction); |
|
224 | + $log->set_object($payment); |
|
225 | + } catch( EventEspresso\core\exceptions\IpnException $e ) { |
|
226 | + EEM_Change_Log::instance()->log( |
|
227 | + EEM_Change_Log::type_gateway, |
|
228 | + array( |
|
229 | + 'message' => 'IPN Exception: ' . $e->getMessage(), |
|
230 | + 'current_url' => EEH_URL::current_url(), |
|
231 | + 'payment' => $e->getPaymentProperties(), |
|
232 | + 'IPN_data' => $e->getIpnData() |
|
233 | + ), |
|
234 | + $obj_for_log |
|
235 | + ); |
|
236 | + return $e->getPayment(); |
|
237 | + } |
|
240 | 238 | } else { |
241 | 239 | // not a payment |
242 | 240 | EE_Error::add_error( |
@@ -262,18 +260,18 @@ discard block |
||
262 | 260 | ); |
263 | 261 | break; |
264 | 262 | } catch( EventEspresso\core\exceptions\IpnException $e ) { |
265 | - EEM_Change_Log::instance()->log( |
|
266 | - EEM_Change_Log::type_gateway, |
|
267 | - array( |
|
268 | - 'message' => 'IPN Exception: ' . $e->getMessage(), |
|
269 | - 'current_url' => EEH_URL::current_url(), |
|
270 | - 'payment' => $e->getPaymentProperties(), |
|
271 | - 'IPN_data' => $e->getIpnData() |
|
272 | - ), |
|
273 | - $obj_for_log |
|
274 | - ); |
|
275 | - return $e->getPayment(); |
|
276 | - } catch( EE_Error $e ) { |
|
263 | + EEM_Change_Log::instance()->log( |
|
264 | + EEM_Change_Log::type_gateway, |
|
265 | + array( |
|
266 | + 'message' => 'IPN Exception: ' . $e->getMessage(), |
|
267 | + 'current_url' => EEH_URL::current_url(), |
|
268 | + 'payment' => $e->getPaymentProperties(), |
|
269 | + 'IPN_data' => $e->getIpnData() |
|
270 | + ), |
|
271 | + $obj_for_log |
|
272 | + ); |
|
273 | + return $e->getPayment(); |
|
274 | + } catch( EE_Error $e ) { |
|
277 | 275 | //that's fine- it apparently couldn't handle the IPN |
278 | 276 | } |
279 | 277 | } |
@@ -709,12 +707,12 @@ discard block |
||
709 | 707 | } |
710 | 708 | |
711 | 709 | /** |
712 | - * Force posts to PayPal to use TLS v1.2. See: |
|
713 | - * https://core.trac.wordpress.org/ticket/36320 |
|
714 | - * https://core.trac.wordpress.org/ticket/34924#comment:15 |
|
715 | - * https://www.paypal-knowledge.com/infocenter/index?page=content&widgetview=true&id=FAQ1914&viewlocale=en_US |
|
710 | + * Force posts to PayPal to use TLS v1.2. See: |
|
711 | + * https://core.trac.wordpress.org/ticket/36320 |
|
712 | + * https://core.trac.wordpress.org/ticket/34924#comment:15 |
|
713 | + * https://www.paypal-knowledge.com/infocenter/index?page=content&widgetview=true&id=FAQ1914&viewlocale=en_US |
|
716 | 714 | * This will affect paypal standard, pro, express, and payflow. |
717 | - */ |
|
715 | + */ |
|
718 | 716 | public static function _curl_requests_to_paypal_use_tls( $handle, $r, $url ) { |
719 | 717 | if ( strstr( $url, 'https://' ) && strstr( $url, '.paypal.com' ) ) { |
720 | 718 | //Use the value of the constant CURL_SSLVERSION_TLSv1 = 1 |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); } |
2 | -EE_Registry::instance()->load_class( 'Processor_Base' ); |
|
2 | +EE_Registry::instance()->load_class('Processor_Base'); |
|
3 | 3 | /** |
4 | 4 | * |
5 | 5 | * EE_Payment_Processor |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | */ |
28 | 28 | public static function instance() { |
29 | 29 | // check if class object is instantiated |
30 | - if ( ! self::$_instance instanceof EE_Payment_Processor ) { |
|
30 | + if ( ! self::$_instance instanceof EE_Payment_Processor) { |
|
31 | 31 | self::$_instance = new self(); |
32 | 32 | } |
33 | 33 | return self::$_instance; |
@@ -41,8 +41,8 @@ discard block |
||
41 | 41 | *@access private |
42 | 42 | */ |
43 | 43 | private function __construct() { |
44 | - do_action( 'AHEE__EE_Payment_Processor__construct' ); |
|
45 | - add_action( 'http_api_curl', array( $this, '_curl_requests_to_paypal_use_tls' ), 10, 3 ); |
|
44 | + do_action('AHEE__EE_Payment_Processor__construct'); |
|
45 | + add_action('http_api_curl', array($this, '_curl_requests_to_paypal_use_tls'), 10, 3); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $update_txn = true, |
82 | 82 | $cancel_url = '' |
83 | 83 | ) { |
84 | - if( (float)$amount < 0 ) { |
|
84 | + if ((float) $amount < 0) { |
|
85 | 85 | throw new EE_Error( |
86 | 86 | sprintf( |
87 | 87 | __( |
@@ -94,33 +94,33 @@ discard block |
||
94 | 94 | ); |
95 | 95 | } |
96 | 96 | // verify payment method |
97 | - $payment_method = EEM_Payment_Method::instance()->ensure_is_obj( $payment_method, TRUE ); |
|
97 | + $payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, TRUE); |
|
98 | 98 | // verify transaction |
99 | - EEM_Transaction::instance()->ensure_is_obj( $transaction ); |
|
100 | - $transaction->set_payment_method_ID( $payment_method->ID() ); |
|
99 | + EEM_Transaction::instance()->ensure_is_obj($transaction); |
|
100 | + $transaction->set_payment_method_ID($payment_method->ID()); |
|
101 | 101 | // verify payment method type |
102 | - if ( $payment_method->type_obj() instanceof EE_PMT_Base ) { |
|
102 | + if ($payment_method->type_obj() instanceof EE_PMT_Base) { |
|
103 | 103 | $payment = $payment_method->type_obj()->process_payment( |
104 | 104 | $transaction, |
105 | - min( $amount, $transaction->remaining() ),//make sure we don't overcharge |
|
105 | + min($amount, $transaction->remaining()), //make sure we don't overcharge |
|
106 | 106 | $billing_form, |
107 | 107 | $return_url, |
108 | - add_query_arg( array( 'ee_cancel_payment' => true ), $cancel_url ), |
|
108 | + add_query_arg(array('ee_cancel_payment' => true), $cancel_url), |
|
109 | 109 | $method, |
110 | 110 | $by_admin |
111 | 111 | ); |
112 | 112 | // check if payment method uses an off-site gateway |
113 | - if ( $payment_method->type_obj()->payment_occurs() !== EE_PMT_Base::offsite ) { |
|
113 | + if ($payment_method->type_obj()->payment_occurs() !== EE_PMT_Base::offsite) { |
|
114 | 114 | // don't process payments for off-site gateways yet because no payment has occurred yet |
115 | - $this->update_txn_based_on_payment( $transaction, $payment, $update_txn ); |
|
115 | + $this->update_txn_based_on_payment($transaction, $payment, $update_txn); |
|
116 | 116 | } |
117 | 117 | return $payment; |
118 | 118 | } else { |
119 | 119 | EE_Error::add_error( |
120 | 120 | sprintf( |
121 | - __( 'A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ), |
|
121 | + __('A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'), |
|
122 | 122 | '<br/>', |
123 | - EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) |
|
123 | + EE_Registry::instance()->CFG->organization->get_pretty('email') |
|
124 | 124 | ), __FILE__, __FUNCTION__, __LINE__ |
125 | 125 | ); |
126 | 126 | return NULL; |
@@ -136,11 +136,11 @@ discard block |
||
136 | 136 | * @throws EE_Error |
137 | 137 | * @return string |
138 | 138 | */ |
139 | - public function get_ipn_url_for_payment_method( $transaction, $payment_method ){ |
|
139 | + public function get_ipn_url_for_payment_method($transaction, $payment_method) { |
|
140 | 140 | /** @type \EE_Transaction $transaction */ |
141 | - $transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction ); |
|
141 | + $transaction = EEM_Transaction::instance()->ensure_is_obj($transaction); |
|
142 | 142 | $primary_reg = $transaction->primary_registration(); |
143 | - if( ! $primary_reg instanceof EE_Registration ){ |
|
143 | + if ( ! $primary_reg instanceof EE_Registration) { |
|
144 | 144 | throw new EE_Error( |
145 | 145 | sprintf( |
146 | 146 | __( |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | ) |
152 | 152 | ); |
153 | 153 | } |
154 | - $payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method,true); |
|
154 | + $payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, true); |
|
155 | 155 | $url = add_query_arg( |
156 | 156 | array( |
157 | 157 | 'e_reg_url_link'=>$primary_reg->reg_url_link(), |
@@ -188,47 +188,47 @@ discard block |
||
188 | 188 | $update_txn = true, |
189 | 189 | $separate_IPN_request = true |
190 | 190 | ) { |
191 | - EE_Registry::instance()->load_model( 'Change_Log' ); |
|
192 | - $_req_data = $this->_remove_unusable_characters_from_array( (array)$_req_data ); |
|
193 | - EE_Processor_Base::set_IPN( $separate_IPN_request ); |
|
191 | + EE_Registry::instance()->load_model('Change_Log'); |
|
192 | + $_req_data = $this->_remove_unusable_characters_from_array((array) $_req_data); |
|
193 | + EE_Processor_Base::set_IPN($separate_IPN_request); |
|
194 | 194 | $obj_for_log = null; |
195 | - if( $transaction instanceof EE_Transaction ){ |
|
195 | + if ($transaction instanceof EE_Transaction) { |
|
196 | 196 | $obj_for_log = $transaction; |
197 | - if( $payment_method instanceof EE_Payment_Method ) { |
|
197 | + if ($payment_method instanceof EE_Payment_Method) { |
|
198 | 198 | $obj_for_log = EEM_Payment::instance()->get_one( |
199 | 199 | array( |
200 | - array( 'TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID() ), |
|
201 | - 'order_by' => array( 'PAY_timestamp' => 'desc' ) |
|
200 | + array('TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID()), |
|
201 | + 'order_by' => array('PAY_timestamp' => 'desc') |
|
202 | 202 | ) |
203 | 203 | ); |
204 | 204 | } |
205 | - } else if( $payment_method instanceof EE_Payment ) { |
|
205 | + } else if ($payment_method instanceof EE_Payment) { |
|
206 | 206 | $obj_for_log = $payment_method; |
207 | 207 | } |
208 | 208 | $log = EEM_Change_Log::instance()->log( |
209 | 209 | EEM_Change_Log::type_gateway, |
210 | - array( 'IPN data received' => $_req_data ), |
|
210 | + array('IPN data received' => $_req_data), |
|
211 | 211 | $obj_for_log |
212 | 212 | ); |
213 | - try{ |
|
213 | + try { |
|
214 | 214 | /** |
215 | 215 | * @var EE_Payment $payment |
216 | 216 | */ |
217 | 217 | $payment = NULL; |
218 | - if($transaction && $payment_method){ |
|
218 | + if ($transaction && $payment_method) { |
|
219 | 219 | /** @type EE_Transaction $transaction */ |
220 | 220 | $transaction = EEM_Transaction::instance()->ensure_is_obj($transaction); |
221 | 221 | /** @type EE_Payment_Method $payment_method */ |
222 | 222 | $payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method); |
223 | - if ( $payment_method->type_obj() instanceof EE_PMT_Base ) { |
|
223 | + if ($payment_method->type_obj() instanceof EE_PMT_Base) { |
|
224 | 224 | try { |
225 | 225 | $payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction); |
226 | 226 | $log->set_object($payment); |
227 | - } catch( EventEspresso\core\exceptions\IpnException $e ) { |
|
227 | + } catch (EventEspresso\core\exceptions\IpnException $e) { |
|
228 | 228 | EEM_Change_Log::instance()->log( |
229 | 229 | EEM_Change_Log::type_gateway, |
230 | 230 | array( |
231 | - 'message' => 'IPN Exception: ' . $e->getMessage(), |
|
231 | + 'message' => 'IPN Exception: '.$e->getMessage(), |
|
232 | 232 | 'current_url' => EEH_URL::current_url(), |
233 | 233 | 'payment' => $e->getPaymentProperties(), |
234 | 234 | 'IPN_data' => $e->getIpnData() |
@@ -241,31 +241,31 @@ discard block |
||
241 | 241 | // not a payment |
242 | 242 | EE_Error::add_error( |
243 | 243 | sprintf( |
244 | - __( 'A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso' ), |
|
244 | + __('A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso'), |
|
245 | 245 | '<br/>', |
246 | - EE_Registry::instance()->CFG->organization->get_pretty( 'email' ) |
|
246 | + EE_Registry::instance()->CFG->organization->get_pretty('email') |
|
247 | 247 | ), |
248 | 248 | __FILE__, __FUNCTION__, __LINE__ |
249 | 249 | ); |
250 | 250 | } |
251 | - }else{ |
|
251 | + } else { |
|
252 | 252 | //that's actually pretty ok. The IPN just wasn't able |
253 | 253 | //to identify which transaction or payment method this was for |
254 | 254 | // give all active payment methods a chance to claim it |
255 | 255 | $active_payment_methods = EEM_Payment_Method::instance()->get_all_active(); |
256 | - foreach( $active_payment_methods as $active_payment_method ){ |
|
257 | - try{ |
|
258 | - $payment = $active_payment_method->type_obj()->handle_unclaimed_ipn( $_req_data ); |
|
256 | + foreach ($active_payment_methods as $active_payment_method) { |
|
257 | + try { |
|
258 | + $payment = $active_payment_method->type_obj()->handle_unclaimed_ipn($_req_data); |
|
259 | 259 | $payment_method = $active_payment_method; |
260 | 260 | EEM_Change_Log::instance()->log( |
261 | 261 | EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment |
262 | 262 | ); |
263 | 263 | break; |
264 | - } catch( EventEspresso\core\exceptions\IpnException $e ) { |
|
264 | + } catch (EventEspresso\core\exceptions\IpnException $e) { |
|
265 | 265 | EEM_Change_Log::instance()->log( |
266 | 266 | EEM_Change_Log::type_gateway, |
267 | 267 | array( |
268 | - 'message' => 'IPN Exception: ' . $e->getMessage(), |
|
268 | + 'message' => 'IPN Exception: '.$e->getMessage(), |
|
269 | 269 | 'current_url' => EEH_URL::current_url(), |
270 | 270 | 'payment' => $e->getPaymentProperties(), |
271 | 271 | 'IPN_data' => $e->getIpnData() |
@@ -273,33 +273,33 @@ discard block |
||
273 | 273 | $obj_for_log |
274 | 274 | ); |
275 | 275 | return $e->getPayment(); |
276 | - } catch( EE_Error $e ) { |
|
276 | + } catch (EE_Error $e) { |
|
277 | 277 | //that's fine- it apparently couldn't handle the IPN |
278 | 278 | } |
279 | 279 | } |
280 | 280 | |
281 | 281 | } |
282 | 282 | // EEM_Payment_Log::instance()->log("got to 7",$transaction,$payment_method); |
283 | - if( $payment instanceof EE_Payment){ |
|
283 | + if ($payment instanceof EE_Payment) { |
|
284 | 284 | $payment->save(); |
285 | 285 | // update the TXN |
286 | - $this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request ); |
|
287 | - }else{ |
|
286 | + $this->update_txn_based_on_payment($transaction, $payment, $update_txn, $separate_IPN_request); |
|
287 | + } else { |
|
288 | 288 | //we couldn't find the payment for this IPN... let's try and log at least SOMETHING |
289 | - if($payment_method){ |
|
289 | + if ($payment_method) { |
|
290 | 290 | EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method); |
291 | - }elseif($transaction){ |
|
291 | + }elseif ($transaction) { |
|
292 | 292 | EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction); |
293 | 293 | } |
294 | 294 | } |
295 | 295 | return $payment; |
296 | 296 | |
297 | - } catch( EE_Error $e ) { |
|
297 | + } catch (EE_Error $e) { |
|
298 | 298 | do_action( |
299 | 299 | 'AHEE__log', __FILE__, __FUNCTION__, sprintf( |
300 | - __( 'Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso' ), |
|
301 | - print_r( $transaction, TRUE ), |
|
302 | - print_r( $_req_data, TRUE ), |
|
300 | + __('Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso'), |
|
301 | + print_r($transaction, TRUE), |
|
302 | + print_r($_req_data, TRUE), |
|
303 | 303 | $e->getMessage() |
304 | 304 | ) |
305 | 305 | ); |
@@ -314,10 +314,10 @@ discard block |
||
314 | 314 | * @param array $request_data |
315 | 315 | * @return array |
316 | 316 | */ |
317 | - protected function _remove_unusable_characters_from_array( array $request_data ) { |
|
317 | + protected function _remove_unusable_characters_from_array(array $request_data) { |
|
318 | 318 | $return_data = array(); |
319 | - foreach( $request_data as $key => $value ) { |
|
320 | - $return_data[ $this->_remove_unusable_characters( $key ) ] = $this->_remove_unusable_characters( $value ); |
|
319 | + foreach ($request_data as $key => $value) { |
|
320 | + $return_data[$this->_remove_unusable_characters($key)] = $this->_remove_unusable_characters($value); |
|
321 | 321 | } |
322 | 322 | return $return_data; |
323 | 323 | } |
@@ -329,8 +329,8 @@ discard block |
||
329 | 329 | * @param string $request_data |
330 | 330 | * @return string |
331 | 331 | */ |
332 | - protected function _remove_unusable_characters( $request_data ) { |
|
333 | - return preg_replace( '/[^[:print:]]/', '', $request_data ); |
|
332 | + protected function _remove_unusable_characters($request_data) { |
|
333 | + return preg_replace('/[^[:print:]]/', '', $request_data); |
|
334 | 334 | } |
335 | 335 | |
336 | 336 | |
@@ -352,13 +352,13 @@ discard block |
||
352 | 352 | * @deprecated 4.6.24 method is no longer used. Instead it is up to client code, like SPCO, |
353 | 353 | * to call handle_ipn() for offsite gateways that don't receive separate IPNs |
354 | 354 | */ |
355 | - public function finalize_payment_for( $transaction, $update_txn = TRUE ){ |
|
355 | + public function finalize_payment_for($transaction, $update_txn = TRUE) { |
|
356 | 356 | /** @var $transaction EE_Transaction */ |
357 | - $transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction ); |
|
357 | + $transaction = EEM_Transaction::instance()->ensure_is_obj($transaction); |
|
358 | 358 | $last_payment_method = $transaction->payment_method(); |
359 | - if ( $last_payment_method instanceof EE_Payment_Method ) { |
|
360 | - $payment = $last_payment_method->type_obj()->finalize_payment_for( $transaction ); |
|
361 | - $this->update_txn_based_on_payment( $transaction, $payment, $update_txn ); |
|
359 | + if ($last_payment_method instanceof EE_Payment_Method) { |
|
360 | + $payment = $last_payment_method->type_obj()->finalize_payment_for($transaction); |
|
361 | + $this->update_txn_based_on_payment($transaction, $payment, $update_txn); |
|
362 | 362 | return $payment; |
363 | 363 | } else { |
364 | 364 | return NULL; |
@@ -381,9 +381,9 @@ discard block |
||
381 | 381 | EE_Payment $payment_to_refund, |
382 | 382 | $refund_info = array() |
383 | 383 | ) { |
384 | - if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds() ) { |
|
385 | - $payment_method->type_obj()->process_refund( $payment_to_refund, $refund_info ); |
|
386 | - $this->update_txn_based_on_payment( $payment_to_refund->transaction(), $payment_to_refund ); |
|
384 | + if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds()) { |
|
385 | + $payment_method->type_obj()->process_refund($payment_to_refund, $refund_info); |
|
386 | + $this->update_txn_based_on_payment($payment_to_refund->transaction(), $payment_to_refund); |
|
387 | 387 | } |
388 | 388 | return $payment_to_refund; |
389 | 389 | } |
@@ -424,12 +424,12 @@ discard block |
||
424 | 424 | * TXN is locked before updating |
425 | 425 | * @throws \EE_Error |
426 | 426 | */ |
427 | - public function update_txn_based_on_payment( $transaction, $payment, $update_txn = true, $IPN = false ){ |
|
427 | + public function update_txn_based_on_payment($transaction, $payment, $update_txn = true, $IPN = false) { |
|
428 | 428 | $do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__not_successful'; |
429 | 429 | /** @type EE_Transaction $transaction */ |
430 | - $transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction ); |
|
430 | + $transaction = EEM_Transaction::instance()->ensure_is_obj($transaction); |
|
431 | 431 | // can we freely update the TXN at this moment? |
432 | - if ( $IPN && $transaction->is_locked() ) { |
|
432 | + if ($IPN && $transaction->is_locked()) { |
|
433 | 433 | // don't update the transaction at this exact moment |
434 | 434 | // because the TXN is active in another request |
435 | 435 | EE_Cron_Tasks::schedule_update_transaction_with_payment( |
@@ -439,38 +439,38 @@ discard block |
||
439 | 439 | ); |
440 | 440 | } else { |
441 | 441 | // verify payment and that it has been saved |
442 | - if ( $payment instanceof EE_Payment && $payment->ID() ) { |
|
443 | - if( |
|
442 | + if ($payment instanceof EE_Payment && $payment->ID()) { |
|
443 | + if ( |
|
444 | 444 | $payment->payment_method() instanceof EE_Payment_Method |
445 | 445 | && $payment->payment_method()->type_obj() instanceof EE_PMT_Base |
446 | - ){ |
|
447 | - $payment->payment_method()->type_obj()->update_txn_based_on_payment( $payment ); |
|
446 | + ) { |
|
447 | + $payment->payment_method()->type_obj()->update_txn_based_on_payment($payment); |
|
448 | 448 | // update TXN registrations with payment info |
449 | - $this->process_registration_payments( $transaction, $payment ); |
|
449 | + $this->process_registration_payments($transaction, $payment); |
|
450 | 450 | } |
451 | 451 | $do_action = $payment->just_approved() |
452 | 452 | ? 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__successful' |
453 | 453 | : $do_action; |
454 | 454 | } else { |
455 | 455 | // send out notifications |
456 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' ); |
|
456 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true'); |
|
457 | 457 | $do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__no_payment_made'; |
458 | 458 | } |
459 | - if ( $payment->status() !== EEM_Payment::status_id_failed ) { |
|
459 | + if ($payment->status() !== EEM_Payment::status_id_failed) { |
|
460 | 460 | /** @type EE_Transaction_Payments $transaction_payments */ |
461 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
461 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
462 | 462 | // set new value for total paid |
463 | - $transaction_payments->calculate_total_payments_and_update_status( $transaction ); |
|
463 | + $transaction_payments->calculate_total_payments_and_update_status($transaction); |
|
464 | 464 | // call EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment() ??? |
465 | - if ( $update_txn ) { |
|
466 | - $this->_post_payment_processing( $transaction, $payment, $IPN ); |
|
465 | + if ($update_txn) { |
|
466 | + $this->_post_payment_processing($transaction, $payment, $IPN); |
|
467 | 467 | } |
468 | 468 | } |
469 | 469 | // granular hook for others to use. |
470 | - do_action( $do_action, $transaction, $payment ); |
|
471 | - do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action' ); |
|
470 | + do_action($do_action, $transaction, $payment); |
|
471 | + do_action('AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action'); |
|
472 | 472 | //global hook for others to use. |
473 | - do_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment ); |
|
473 | + do_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment); |
|
474 | 474 | } |
475 | 475 | } |
476 | 476 | |
@@ -490,25 +490,25 @@ discard block |
||
490 | 490 | $registrations = array() |
491 | 491 | ) { |
492 | 492 | // only process if payment was successful |
493 | - if ( $payment->status() !== EEM_Payment::status_id_approved ) { |
|
493 | + if ($payment->status() !== EEM_Payment::status_id_approved) { |
|
494 | 494 | return; |
495 | 495 | } |
496 | 496 | //EEM_Registration::instance()->show_next_x_db_queries(); |
497 | - if ( empty( $registrations )) { |
|
497 | + if (empty($registrations)) { |
|
498 | 498 | // find registrations with monies owing that can receive a payment |
499 | 499 | $registrations = $transaction->registrations( |
500 | 500 | array( |
501 | 501 | array( |
502 | 502 | // only these reg statuses can receive payments |
503 | - 'STS_ID' => array( 'IN', EEM_Registration::reg_statuses_that_allow_payment() ), |
|
504 | - 'REG_final_price' => array( '!=', 0 ), |
|
505 | - 'REG_final_price*' => array( '!=', 'REG_paid', true ), |
|
503 | + 'STS_ID' => array('IN', EEM_Registration::reg_statuses_that_allow_payment()), |
|
504 | + 'REG_final_price' => array('!=', 0), |
|
505 | + 'REG_final_price*' => array('!=', 'REG_paid', true), |
|
506 | 506 | ) |
507 | 507 | ) |
508 | 508 | ); |
509 | 509 | } |
510 | 510 | // still nothing ??!?? |
511 | - if ( empty( $registrations )) { |
|
511 | + if (empty($registrations)) { |
|
512 | 512 | return; |
513 | 513 | } |
514 | 514 | // todo: break out the following logic into a separate strategy class |
@@ -520,28 +520,28 @@ discard block |
||
520 | 520 | |
521 | 521 | $refund = $payment->is_a_refund(); |
522 | 522 | // how much is available to apply to registrations? |
523 | - $available_payment_amount = abs( $payment->amount() ); |
|
524 | - foreach ( $registrations as $registration ) { |
|
525 | - if ( $registration instanceof EE_Registration ) { |
|
523 | + $available_payment_amount = abs($payment->amount()); |
|
524 | + foreach ($registrations as $registration) { |
|
525 | + if ($registration instanceof EE_Registration) { |
|
526 | 526 | // nothing left? |
527 | - if ( $available_payment_amount <= 0 ) { |
|
527 | + if ($available_payment_amount <= 0) { |
|
528 | 528 | break; |
529 | 529 | } |
530 | - if ( $refund ) { |
|
531 | - $available_payment_amount = $this->process_registration_refund( $registration, $payment, $available_payment_amount ); |
|
530 | + if ($refund) { |
|
531 | + $available_payment_amount = $this->process_registration_refund($registration, $payment, $available_payment_amount); |
|
532 | 532 | } else { |
533 | - $available_payment_amount = $this->process_registration_payment( $registration, $payment, $available_payment_amount ); |
|
533 | + $available_payment_amount = $this->process_registration_payment($registration, $payment, $available_payment_amount); |
|
534 | 534 | } |
535 | 535 | } |
536 | 536 | } |
537 | - if ( $available_payment_amount > 0 && apply_filters( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false ) ) { |
|
537 | + if ($available_payment_amount > 0 && apply_filters('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false)) { |
|
538 | 538 | EE_Error::add_attention( |
539 | 539 | sprintf( |
540 | - __( 'A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso' ), |
|
541 | - EEH_Template::format_currency( $available_payment_amount ), |
|
542 | - implode( ', ', array_keys( $registrations ) ), |
|
540 | + __('A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso'), |
|
541 | + EEH_Template::format_currency($available_payment_amount), |
|
542 | + implode(', ', array_keys($registrations)), |
|
543 | 543 | '<br/>', |
544 | - EEH_Template::format_currency( $payment->amount() ) |
|
544 | + EEH_Template::format_currency($payment->amount()) |
|
545 | 545 | ), |
546 | 546 | __FILE__, __FUNCTION__, __LINE__ |
547 | 547 | ); |
@@ -559,17 +559,17 @@ discard block |
||
559 | 559 | * @return float |
560 | 560 | * @throws \EE_Error |
561 | 561 | */ |
562 | - public function process_registration_payment( EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00 ) { |
|
562 | + public function process_registration_payment(EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00) { |
|
563 | 563 | $owing = $registration->final_price() - $registration->paid(); |
564 | - if ( $owing > 0 ) { |
|
564 | + if ($owing > 0) { |
|
565 | 565 | // don't allow payment amount to exceed the available payment amount, OR the amount owing |
566 | - $payment_amount = min( $available_payment_amount, $owing ); |
|
566 | + $payment_amount = min($available_payment_amount, $owing); |
|
567 | 567 | // update $available_payment_amount |
568 | 568 | $available_payment_amount -= $payment_amount; |
569 | 569 | //calculate and set new REG_paid |
570 | - $registration->set_paid( $registration->paid() + $payment_amount ); |
|
570 | + $registration->set_paid($registration->paid() + $payment_amount); |
|
571 | 571 | // now save it |
572 | - $this->_apply_registration_payment( $registration, $payment, $payment_amount ); |
|
572 | + $this->_apply_registration_payment($registration, $payment, $payment_amount); |
|
573 | 573 | } |
574 | 574 | return $available_payment_amount; |
575 | 575 | } |
@@ -585,19 +585,19 @@ discard block |
||
585 | 585 | * @return void |
586 | 586 | * @throws \EE_Error |
587 | 587 | */ |
588 | - protected function _apply_registration_payment( EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00 ) { |
|
588 | + protected function _apply_registration_payment(EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00) { |
|
589 | 589 | // find any existing reg payment records for this registration and payment |
590 | 590 | $existing_reg_payment = EEM_Registration_Payment::instance()->get_one( |
591 | - array( array( 'REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID() ) ) |
|
591 | + array(array('REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID())) |
|
592 | 592 | ); |
593 | 593 | // if existing registration payment exists |
594 | - if ( $existing_reg_payment instanceof EE_Registration_Payment ) { |
|
594 | + if ($existing_reg_payment instanceof EE_Registration_Payment) { |
|
595 | 595 | // then update that record |
596 | - $existing_reg_payment->set_amount( $payment_amount ); |
|
596 | + $existing_reg_payment->set_amount($payment_amount); |
|
597 | 597 | $existing_reg_payment->save(); |
598 | 598 | } else { |
599 | 599 | // or add new relation between registration and payment and set amount |
600 | - $registration->_add_relation_to( $payment, 'Payment', array( 'RPY_amount' => $payment_amount ) ); |
|
600 | + $registration->_add_relation_to($payment, 'Payment', array('RPY_amount' => $payment_amount)); |
|
601 | 601 | // make it stick |
602 | 602 | $registration->save(); |
603 | 603 | } |
@@ -614,21 +614,21 @@ discard block |
||
614 | 614 | * @return float |
615 | 615 | * @throws \EE_Error |
616 | 616 | */ |
617 | - public function process_registration_refund( EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00 ) { |
|
617 | + public function process_registration_refund(EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00) { |
|
618 | 618 | //EEH_Debug_Tools::printr( $payment->amount(), '$payment->amount()', __FILE__, __LINE__ ); |
619 | - if ( $registration->paid() > 0 ) { |
|
619 | + if ($registration->paid() > 0) { |
|
620 | 620 | // ensure $available_refund_amount is NOT negative |
621 | - $available_refund_amount = (float)abs( $available_refund_amount ); |
|
621 | + $available_refund_amount = (float) abs($available_refund_amount); |
|
622 | 622 | // don't allow refund amount to exceed the available payment amount, OR the amount paid |
623 | - $refund_amount = min( $available_refund_amount, (float)$registration->paid() ); |
|
623 | + $refund_amount = min($available_refund_amount, (float) $registration->paid()); |
|
624 | 624 | // update $available_payment_amount |
625 | 625 | $available_refund_amount -= $refund_amount; |
626 | 626 | //calculate and set new REG_paid |
627 | - $registration->set_paid( $registration->paid() - $refund_amount ); |
|
627 | + $registration->set_paid($registration->paid() - $refund_amount); |
|
628 | 628 | // convert payment amount back to a negative value for storage in the db |
629 | - $refund_amount = (float)abs( $refund_amount ) * -1; |
|
629 | + $refund_amount = (float) abs($refund_amount) * -1; |
|
630 | 630 | // now save it |
631 | - $this->_apply_registration_payment( $registration, $payment, $refund_amount ); |
|
631 | + $this->_apply_registration_payment($registration, $payment, $refund_amount); |
|
632 | 632 | } |
633 | 633 | return $available_refund_amount; |
634 | 634 | } |
@@ -647,53 +647,53 @@ discard block |
||
647 | 647 | * @param bool $IPN |
648 | 648 | * @throws \EE_Error |
649 | 649 | */ |
650 | - protected function _post_payment_processing( EE_Transaction $transaction, EE_Payment $payment, $IPN = false ) { |
|
650 | + protected function _post_payment_processing(EE_Transaction $transaction, EE_Payment $payment, $IPN = false) { |
|
651 | 651 | |
652 | 652 | /** @type EE_Transaction_Processor $transaction_processor */ |
653 | - $transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' ); |
|
653 | + $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor'); |
|
654 | 654 | // is the Payment Options Reg Step completed ? |
655 | - $payment_options_step_completed = $transaction->reg_step_completed( 'payment_options' ); |
|
655 | + $payment_options_step_completed = $transaction->reg_step_completed('payment_options'); |
|
656 | 656 | // if the Payment Options Reg Step is completed... |
657 | 657 | $revisit = $payment_options_step_completed === true ? true : false; |
658 | 658 | // then this is kinda sorta a revisit with regards to payments at least |
659 | - $transaction_processor->set_revisit( $revisit ); |
|
659 | + $transaction_processor->set_revisit($revisit); |
|
660 | 660 | // if this is an IPN, let's consider the Payment Options Reg Step completed if not already |
661 | 661 | if ( |
662 | 662 | $IPN && |
663 | 663 | $payment_options_step_completed !== true && |
664 | - ( $payment->is_approved() || $payment->is_pending() ) |
|
664 | + ($payment->is_approved() || $payment->is_pending()) |
|
665 | 665 | ) { |
666 | 666 | $payment_options_step_completed = $transaction->set_reg_step_completed( |
667 | 667 | 'payment_options' |
668 | 668 | ); |
669 | 669 | } |
670 | 670 | // maybe update status, but don't save transaction just yet |
671 | - $transaction->update_status_based_on_total_paid( false ); |
|
671 | + $transaction->update_status_based_on_total_paid(false); |
|
672 | 672 | // check if 'finalize_registration' step has been completed... |
673 | - $finalized = $transaction->reg_step_completed( 'finalize_registration' ); |
|
673 | + $finalized = $transaction->reg_step_completed('finalize_registration'); |
|
674 | 674 | // if this is an IPN and the final step has not been initiated |
675 | - if ( $IPN && $payment_options_step_completed && $finalized === false ) { |
|
675 | + if ($IPN && $payment_options_step_completed && $finalized === false) { |
|
676 | 676 | // and if it hasn't already been set as being started... |
677 | - $finalized = $transaction->set_reg_step_initiated( 'finalize_registration' ); |
|
677 | + $finalized = $transaction->set_reg_step_initiated('finalize_registration'); |
|
678 | 678 | } |
679 | 679 | $transaction->save(); |
680 | 680 | // because the above will return false if the final step was not fully completed, we need to check again... |
681 | - if ( $IPN && $finalized !== false ) { |
|
681 | + if ($IPN && $finalized !== false) { |
|
682 | 682 | // and if we are all good to go, then send out notifications |
683 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' ); |
|
683 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true'); |
|
684 | 684 | //ok, now process the transaction according to the payment |
685 | - $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $transaction, $payment ); |
|
685 | + $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($transaction, $payment); |
|
686 | 686 | } |
687 | 687 | // DEBUG LOG |
688 | 688 | $payment_method = $payment->payment_method(); |
689 | - if ( $payment_method instanceof EE_Payment_Method ) { |
|
689 | + if ($payment_method instanceof EE_Payment_Method) { |
|
690 | 690 | $payment_method_type_obj = $payment_method->type_obj(); |
691 | - if ( $payment_method_type_obj instanceof EE_PMT_Base ) { |
|
691 | + if ($payment_method_type_obj instanceof EE_PMT_Base) { |
|
692 | 692 | $gateway = $payment_method_type_obj->get_gateway(); |
693 | - if ( $gateway instanceof EE_Gateway ){ |
|
693 | + if ($gateway instanceof EE_Gateway) { |
|
694 | 694 | $gateway->log( |
695 | 695 | array( |
696 | - 'message' => __( 'Post Payment Transaction Details', 'event_espresso' ), |
|
696 | + 'message' => __('Post Payment Transaction Details', 'event_espresso'), |
|
697 | 697 | 'transaction' => $transaction->model_field_array(), |
698 | 698 | 'finalized' => $finalized, |
699 | 699 | 'IPN' => $IPN, |
@@ -715,11 +715,11 @@ discard block |
||
715 | 715 | * https://www.paypal-knowledge.com/infocenter/index?page=content&widgetview=true&id=FAQ1914&viewlocale=en_US |
716 | 716 | * This will affect paypal standard, pro, express, and payflow. |
717 | 717 | */ |
718 | - public static function _curl_requests_to_paypal_use_tls( $handle, $r, $url ) { |
|
719 | - if ( strstr( $url, 'https://' ) && strstr( $url, '.paypal.com' ) ) { |
|
718 | + public static function _curl_requests_to_paypal_use_tls($handle, $r, $url) { |
|
719 | + if (strstr($url, 'https://') && strstr($url, '.paypal.com')) { |
|
720 | 720 | //Use the value of the constant CURL_SSLVERSION_TLSv1 = 1 |
721 | 721 | //instead of the constant because it might not be defined |
722 | - curl_setopt( $handle, CURLOPT_SSLVERSION, 1 ); |
|
722 | + curl_setopt($handle, CURLOPT_SSLVERSION, 1); |
|
723 | 723 | } |
724 | 724 | } |
725 | 725 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | namespace EventEspresso\core\exceptions; |
3 | 3 | |
4 | 4 | if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
5 | - exit('No direct script access allowed'); |
|
5 | + exit('No direct script access allowed'); |
|
6 | 6 | } |
7 | 7 | |
8 | 8 | |
@@ -21,71 +21,71 @@ discard block |
||
21 | 21 | class IpnException extends \LogicException |
22 | 22 | { |
23 | 23 | |
24 | - const DUPLICATE = 1; |
|
24 | + const DUPLICATE = 1; |
|
25 | 25 | |
26 | - const UNABLE_TO_VALIDATE = 2; |
|
26 | + const UNABLE_TO_VALIDATE = 2; |
|
27 | 27 | |
28 | - const UNSUPPORTED = 3; |
|
28 | + const UNSUPPORTED = 3; |
|
29 | 29 | |
30 | - /** |
|
31 | - * @var \EE_Payment |
|
32 | - */ |
|
33 | - protected $payment; |
|
30 | + /** |
|
31 | + * @var \EE_Payment |
|
32 | + */ |
|
33 | + protected $payment; |
|
34 | 34 | |
35 | - /** |
|
36 | - * @var mixed IPN data, usually an array or object |
|
37 | - */ |
|
38 | - protected $ipn_data; |
|
35 | + /** |
|
36 | + * @var mixed IPN data, usually an array or object |
|
37 | + */ |
|
38 | + protected $ipn_data; |
|
39 | 39 | |
40 | 40 | |
41 | 41 | |
42 | - public function __construct( |
|
43 | - $message, |
|
44 | - $code = 0, |
|
45 | - \Exception $previous = null, |
|
46 | - \EE_Payment $payment = null, |
|
47 | - $ipn_data = array() |
|
48 | - ) { |
|
49 | - parent::__construct($message, $code, $previous); |
|
50 | - $this->payment = $payment; |
|
51 | - $this->ipn_data = $ipn_data; |
|
52 | - } |
|
42 | + public function __construct( |
|
43 | + $message, |
|
44 | + $code = 0, |
|
45 | + \Exception $previous = null, |
|
46 | + \EE_Payment $payment = null, |
|
47 | + $ipn_data = array() |
|
48 | + ) { |
|
49 | + parent::__construct($message, $code, $previous); |
|
50 | + $this->payment = $payment; |
|
51 | + $this->ipn_data = $ipn_data; |
|
52 | + } |
|
53 | 53 | |
54 | 54 | |
55 | 55 | |
56 | - /** |
|
57 | - * Gets the payment associated with this IPN, if known |
|
58 | - * |
|
59 | - * @return \EE_Payment |
|
60 | - */ |
|
61 | - public function getPayment() |
|
62 | - { |
|
63 | - return $this->payment; |
|
64 | - } |
|
56 | + /** |
|
57 | + * Gets the payment associated with this IPN, if known |
|
58 | + * |
|
59 | + * @return \EE_Payment |
|
60 | + */ |
|
61 | + public function getPayment() |
|
62 | + { |
|
63 | + return $this->payment; |
|
64 | + } |
|
65 | 65 | |
66 | 66 | |
67 | 67 | |
68 | - /** |
|
69 | - * Returns the payment's properties as an array (even if there is no payment, in which case it's an empty array) |
|
70 | - * |
|
71 | - * @return array |
|
72 | - * @throws \EE_Error |
|
73 | - */ |
|
74 | - public function getPaymentProperties() |
|
75 | - { |
|
76 | - return $this->getPayment() instanceof \EE_Payment ? $this->getPayment()->model_field_array() : array(); |
|
77 | - } |
|
68 | + /** |
|
69 | + * Returns the payment's properties as an array (even if there is no payment, in which case it's an empty array) |
|
70 | + * |
|
71 | + * @return array |
|
72 | + * @throws \EE_Error |
|
73 | + */ |
|
74 | + public function getPaymentProperties() |
|
75 | + { |
|
76 | + return $this->getPayment() instanceof \EE_Payment ? $this->getPayment()->model_field_array() : array(); |
|
77 | + } |
|
78 | 78 | |
79 | 79 | |
80 | 80 | |
81 | - /** |
|
82 | - * Returns an array, object, or string, however, the IPN data was received |
|
83 | - * |
|
84 | - * @return mixed |
|
85 | - */ |
|
86 | - public function getIpnData() |
|
87 | - { |
|
88 | - return $this->ipn_data; |
|
89 | - } |
|
81 | + /** |
|
82 | + * Returns an array, object, or string, however, the IPN data was received |
|
83 | + * |
|
84 | + * @return mixed |
|
85 | + */ |
|
86 | + public function getIpnData() |
|
87 | + { |
|
88 | + return $this->ipn_data; |
|
89 | + } |
|
90 | 90 | |
91 | 91 | } |
92 | 92 | \ No newline at end of file |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * |
10 | 10 | * ------------------------------------------------------------------------ |
11 | 11 | */ |
12 | -class EEH_URL{ |
|
12 | +class EEH_URL { |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * _add_query_arg |
@@ -21,30 +21,30 @@ discard block |
||
21 | 21 | * @param bool $exclude_nonce If true then the nonce will be excluded from the generated url. |
22 | 22 | * @return string |
23 | 23 | */ |
24 | - public static function add_query_args_and_nonce( $args = array(), $url = '', $exclude_nonce = false ) { |
|
25 | - if ( empty( $url ) ) { |
|
26 | - $user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso' ); |
|
27 | - $dev_msg = $user_msg . "\n" . sprintf( |
|
28 | - __('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso' ), |
|
24 | + public static function add_query_args_and_nonce($args = array(), $url = '', $exclude_nonce = false) { |
|
25 | + if (empty($url)) { |
|
26 | + $user_msg = __('An error occurred. A URL is a required parameter for the add_query_args_and_nonce method.', 'event_espresso'); |
|
27 | + $dev_msg = $user_msg."\n".sprintf( |
|
28 | + __('In order to dynamically generate nonces for your actions, you need to supply a valid URL as a second parameter for the %s::add_query_args_and_nonce method.', 'event_espresso'), |
|
29 | 29 | __CLASS__ |
30 | 30 | ); |
31 | - EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
31 | + EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__); |
|
32 | 32 | } |
33 | 33 | // check that an action exists and add nonce |
34 | - if ( ! $exclude_nonce ) { |
|
35 | - if ( isset( $args['action'] ) && ! empty( $args['action'] ) ) { |
|
36 | - $args = array_merge( $args, array( $args['action'] . '_nonce' => wp_create_nonce( $args['action'] . '_nonce' ) ) ); |
|
34 | + if ( ! $exclude_nonce) { |
|
35 | + if (isset($args['action']) && ! empty($args['action'])) { |
|
36 | + $args = array_merge($args, array($args['action'].'_nonce' => wp_create_nonce($args['action'].'_nonce'))); |
|
37 | 37 | } else { |
38 | - $args = array_merge( $args, array( 'action' => 'default', 'default_nonce' => wp_create_nonce( 'default_nonce' ) ) ); |
|
38 | + $args = array_merge($args, array('action' => 'default', 'default_nonce' => wp_create_nonce('default_nonce'))); |
|
39 | 39 | } |
40 | 40 | } |
41 | 41 | |
42 | 42 | //finally, let's always add a return address (if present) :) |
43 | - $args = ! empty( $_REQUEST['action'] ) && ! isset( $_REQUEST[ 'return' ] ) |
|
44 | - ? array_merge( $args, array( 'return' => $_REQUEST['action'] ) ) |
|
43 | + $args = ! empty($_REQUEST['action']) && ! isset($_REQUEST['return']) |
|
44 | + ? array_merge($args, array('return' => $_REQUEST['action'])) |
|
45 | 45 | : $args; |
46 | 46 | |
47 | - return add_query_arg( $args, $url ); |
|
47 | + return add_query_arg($args, $url); |
|
48 | 48 | |
49 | 49 | } |
50 | 50 | |
@@ -57,17 +57,17 @@ discard block |
||
57 | 57 | * @param boolean $sslverify whether we care if the SSL certificate for the requested site is setup properly |
58 | 58 | * @return boolean |
59 | 59 | */ |
60 | - public static function remote_file_exists( $url, $args = array() ){ |
|
61 | - $results = wp_remote_request($url,array_merge( array( |
|
60 | + public static function remote_file_exists($url, $args = array()) { |
|
61 | + $results = wp_remote_request($url, array_merge(array( |
|
62 | 62 | 'method'=>'GET', |
63 | 63 | 'redirection'=>1 |
64 | - ), $args ) ); |
|
65 | - if( ! $results instanceof WP_Error && |
|
64 | + ), $args)); |
|
65 | + if ( ! $results instanceof WP_Error && |
|
66 | 66 | isset($results['response']) && |
67 | 67 | isset($results['response']['code']) && |
68 | - $results['response']['code'] == '200'){ |
|
68 | + $results['response']['code'] == '200') { |
|
69 | 69 | return true; |
70 | - }else{ |
|
70 | + } else { |
|
71 | 71 | return false; |
72 | 72 | } |
73 | 73 | } |
@@ -83,29 +83,29 @@ discard block |
||
83 | 83 | * @param bool $base_url_only - TRUE will only return the scheme and host with no other parameters |
84 | 84 | * @return string |
85 | 85 | */ |
86 | - public static function refactor_url( $url = '', $remove_query = TRUE, $base_url_only = FALSE ) { |
|
86 | + public static function refactor_url($url = '', $remove_query = TRUE, $base_url_only = FALSE) { |
|
87 | 87 | // break apart incoming URL |
88 | - $url_bits = parse_url( $url ); |
|
88 | + $url_bits = parse_url($url); |
|
89 | 89 | // HTTP or HTTPS ? |
90 | - $scheme = isset( $url_bits[ 'scheme' ] ) ? $url_bits[ 'scheme' ] . '://' : 'http://'; |
|
90 | + $scheme = isset($url_bits['scheme']) ? $url_bits['scheme'].'://' : 'http://'; |
|
91 | 91 | // domain |
92 | - $host = isset( $url_bits[ 'host' ] ) ? $url_bits[ 'host' ] : ''; |
|
92 | + $host = isset($url_bits['host']) ? $url_bits['host'] : ''; |
|
93 | 93 | // if only the base URL is requested, then return that now |
94 | - if ( $base_url_only ) { |
|
95 | - return $scheme . $host; |
|
94 | + if ($base_url_only) { |
|
95 | + return $scheme.$host; |
|
96 | 96 | } |
97 | - $port = isset( $url_bits[ 'port' ] ) ? ':' . $url_bits[ 'port' ] : ''; |
|
98 | - $user = isset( $url_bits[ 'user' ] ) ? $url_bits[ 'user' ] : ''; |
|
99 | - $pass = isset( $url_bits[ 'pass' ] ) ? ':' . $url_bits[ 'pass' ] : ''; |
|
100 | - $pass = ( $user || $pass ) ? $pass . '@' : ''; |
|
101 | - $path = isset( $url_bits[ 'path' ] ) ? $url_bits[ 'path' ] : ''; |
|
97 | + $port = isset($url_bits['port']) ? ':'.$url_bits['port'] : ''; |
|
98 | + $user = isset($url_bits['user']) ? $url_bits['user'] : ''; |
|
99 | + $pass = isset($url_bits['pass']) ? ':'.$url_bits['pass'] : ''; |
|
100 | + $pass = ($user || $pass) ? $pass.'@' : ''; |
|
101 | + $path = isset($url_bits['path']) ? $url_bits['path'] : ''; |
|
102 | 102 | // if the query string is not required, then return what we have so far |
103 | - if ( $remove_query ) { |
|
104 | - return $scheme . $user . $pass . $host . $port . $path; |
|
103 | + if ($remove_query) { |
|
104 | + return $scheme.$user.$pass.$host.$port.$path; |
|
105 | 105 | } |
106 | - $query = isset( $url_bits[ 'query' ] ) ? '?' . $url_bits[ 'query' ] : ''; |
|
107 | - $fragment = isset( $url_bits[ 'fragment' ] ) ? '#' . $url_bits[ 'fragment' ] : ''; |
|
108 | - return $scheme . $user . $pass . $host . $port . $path . $query . $fragment; |
|
106 | + $query = isset($url_bits['query']) ? '?'.$url_bits['query'] : ''; |
|
107 | + $fragment = isset($url_bits['fragment']) ? '#'.$url_bits['fragment'] : ''; |
|
108 | + return $scheme.$user.$pass.$host.$port.$path.$query.$fragment; |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | |
@@ -118,29 +118,29 @@ discard block |
||
118 | 118 | * @param bool $as_array TRUE (default) will return query params as an array of key value pairs, FALSE will simply return the query string |
119 | 119 | * @return string|array |
120 | 120 | */ |
121 | - public static function get_query_string( $url = '', $as_array = TRUE ) { |
|
121 | + public static function get_query_string($url = '', $as_array = TRUE) { |
|
122 | 122 | // break apart incoming URL |
123 | - $url_bits = parse_url( $url ); |
|
123 | + $url_bits = parse_url($url); |
|
124 | 124 | // grab query string from URL |
125 | - $query = isset( $url_bits[ 'query' ] ) ? $url_bits[ 'query' ] : ''; |
|
125 | + $query = isset($url_bits['query']) ? $url_bits['query'] : ''; |
|
126 | 126 | // if we don't want the query string formatted into an array of key => value pairs, then just return it as is |
127 | - if ( ! $as_array ) { |
|
127 | + if ( ! $as_array) { |
|
128 | 128 | return $query; |
129 | 129 | } |
130 | 130 | // if no query string exists then just return an empty array now |
131 | - if ( empty( $query )) { |
|
131 | + if (empty($query)) { |
|
132 | 132 | return array(); |
133 | 133 | } |
134 | 134 | // empty array to hold results |
135 | 135 | $query_params = array(); |
136 | 136 | // now break apart the query string into separate params |
137 | - $query = explode( '&', $query ); |
|
137 | + $query = explode('&', $query); |
|
138 | 138 | // loop thru our query params |
139 | - foreach ( $query as $query_args ) { |
|
139 | + foreach ($query as $query_args) { |
|
140 | 140 | // break apart the key value pairs |
141 | - $query_args = explode( '=', $query_args ); |
|
141 | + $query_args = explode('=', $query_args); |
|
142 | 142 | // and add to our results array |
143 | - $query_params[ $query_args[0] ] = $query_args[1]; |
|
143 | + $query_params[$query_args[0]] = $query_args[1]; |
|
144 | 144 | } |
145 | 145 | return $query_params; |
146 | 146 | } |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | * prevent_prefetching |
152 | 152 | * @return void |
153 | 153 | */ |
154 | - public static function prevent_prefetching(){ |
|
154 | + public static function prevent_prefetching() { |
|
155 | 155 | // prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process |
156 | 156 | remove_action('wp_head', 'adjacent_posts_rel_link_wp_head'); |
157 | 157 | } |
@@ -166,9 +166,9 @@ discard block |
||
166 | 166 | * @param string $prefix Use this to prefix the string with something. |
167 | 167 | * @return string |
168 | 168 | */ |
169 | - public static function generate_unique_token( $prefix = '' ) { |
|
170 | - $token = md5( uniqid() . mt_rand() ); |
|
171 | - return $prefix ? $prefix . '_' . $token : $token; |
|
169 | + public static function generate_unique_token($prefix = '') { |
|
170 | + $token = md5(uniqid().mt_rand()); |
|
171 | + return $prefix ? $prefix.'_'.$token : $token; |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | * add_nocache_headers |
178 | 178 | * @return void |
179 | 179 | */ |
180 | - public static function add_nocache_headers(){ |
|
180 | + public static function add_nocache_headers() { |
|
181 | 181 | // add no cache headers |
182 | 182 | // add_action( 'wp_head' , array( 'EED_Single_Page_Checkout', 'nocache_headers' ), 10 ); |
183 | 183 | // plus a little extra for nginx |
@@ -194,19 +194,19 @@ discard block |
||
194 | 194 | * @param string $server_variable |
195 | 195 | * @return string |
196 | 196 | */ |
197 | - public static function filter_input_server_url( $server_variable = 'REQUEST_URI' ){ |
|
197 | + public static function filter_input_server_url($server_variable = 'REQUEST_URI') { |
|
198 | 198 | $URL = ''; |
199 | 199 | $server_variables = array( |
200 | 200 | 'REQUEST_URI' => 1, |
201 | 201 | 'HTTP_HOST' => 1, |
202 | 202 | 'PHP_SELF' => 1, |
203 | 203 | ); |
204 | - $server_variable = strtoupper( $server_variable ); |
|
204 | + $server_variable = strtoupper($server_variable); |
|
205 | 205 | // whitelist INPUT_SERVER var |
206 | - if ( isset( $server_variables[ $server_variable ] ) ) { |
|
207 | - $URL = filter_input( INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE ); |
|
208 | - if ( empty( $URL ) ) { |
|
209 | - $URL = esc_url( $_SERVER[ $server_variable ] ); |
|
206 | + if (isset($server_variables[$server_variable])) { |
|
207 | + $URL = filter_input(INPUT_SERVER, $server_variable, FILTER_SANITIZE_URL, FILTER_NULL_ON_FAILURE); |
|
208 | + if (empty($URL)) { |
|
209 | + $URL = esc_url($_SERVER[$server_variable]); |
|
210 | 210 | } |
211 | 211 | } |
212 | 212 | return $URL; |
@@ -219,10 +219,10 @@ discard block |
||
219 | 219 | * @return string |
220 | 220 | */ |
221 | 221 | public static function current_url() { |
222 | - if ( isset( $_SERVER[ 'HTTP_HOST' ], $_SERVER[ 'REQUEST_URI' ] ) ) { |
|
222 | + if (isset($_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'])) { |
|
223 | 223 | $url = is_ssl() ? 'https://' : 'http://'; |
224 | - $url .= \EEH_URL::filter_input_server_url( 'HTTP_HOST' ); |
|
225 | - $url .= \EEH_URL::filter_input_server_url( 'REQUEST_URI' ); |
|
224 | + $url .= \EEH_URL::filter_input_server_url('HTTP_HOST'); |
|
225 | + $url .= \EEH_URL::filter_input_server_url('REQUEST_URI'); |
|
226 | 226 | } else { |
227 | 227 | $url = 'unknown'; |
228 | 228 | } |
@@ -8,8 +8,8 @@ |
||
8 | 8 | foreach( $form_section->subsections() as $subsection ) { |
9 | 9 | if( $subsection instanceof EE_Form_Input_Base ) { |
10 | 10 | if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal |
11 | - || $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal |
|
12 | - || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy ){ |
|
11 | + || $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal |
|
12 | + || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy ){ |
|
13 | 13 | continue; |
14 | 14 | } |
15 | 15 | if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal ) { |
@@ -1,38 +1,38 @@ |
||
1 | 1 | <div id="admin-side-mbox-billing-info-dv" class="admin-side-mbox-dv"> |
2 | -<?php if ( empty($billing_form) ) : ?> |
|
2 | +<?php if (empty($billing_form)) : ?> |
|
3 | 3 | <div class="clearfix"> |
4 | - <?php _e( 'There is no billing info for this transaction.', 'event_espresso' );?><br/> |
|
4 | + <?php _e('There is no billing info for this transaction.', 'event_espresso'); ?><br/> |
|
5 | 5 | </div> |
6 | 6 | <?php else : |
7 | - function ee_show_billing_info_cleaned( EE_Form_Section_Proper $form_section, $found_cc_data = false ) { |
|
8 | - foreach( $form_section->subsections() as $subsection ) { |
|
9 | - if( $subsection instanceof EE_Form_Input_Base ) { |
|
10 | - if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal |
|
7 | + function ee_show_billing_info_cleaned(EE_Form_Section_Proper $form_section, $found_cc_data = false) { |
|
8 | + foreach ($form_section->subsections() as $subsection) { |
|
9 | + if ($subsection instanceof EE_Form_Input_Base) { |
|
10 | + if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal |
|
11 | 11 | || $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal |
12 | - || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy ){ |
|
12 | + || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy) { |
|
13 | 13 | continue; |
14 | 14 | } |
15 | - if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal ) { |
|
15 | + if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal) { |
|
16 | 16 | $found_cc_data = true; |
17 | 17 | } |
18 | 18 | ?> |
19 | 19 | <div class="clearfix"> |
20 | - <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php echo $subsection->get_html_for_label();?></span><?php echo $subsection->pretty_value();?> |
|
20 | + <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php echo $subsection->get_html_for_label(); ?></span><?php echo $subsection->pretty_value(); ?> |
|
21 | 21 | </div><?php |
22 | - } elseif( $subsection instanceof EE_Form_Section_Proper ) { |
|
23 | - $found_cc_data = ee_show_billing_info_cleaned( $subsection, $found_cc_data); |
|
22 | + } elseif ($subsection instanceof EE_Form_Section_Proper) { |
|
23 | + $found_cc_data = ee_show_billing_info_cleaned($subsection, $found_cc_data); |
|
24 | 24 | } |
25 | 25 | } |
26 | 26 | return $found_cc_data; |
27 | 27 | } |
28 | - $found_cc_data = ee_show_billing_info_cleaned( $billing_form ); |
|
29 | - if( apply_filters( |
|
28 | + $found_cc_data = ee_show_billing_info_cleaned($billing_form); |
|
29 | + if (apply_filters( |
|
30 | 30 | 'FHEE__txn_admin_details_side_meta_box_billing_info__show_default_note', |
31 | 31 | $found_cc_data, |
32 | - $billing_form ) ) {?> |
|
33 | - <p class="help"><?php _e( 'Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', 'event_espresso' );?></p> |
|
32 | + $billing_form )) {?> |
|
33 | + <p class="help"><?php _e('Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', 'event_espresso'); ?></p> |
|
34 | 34 | <?php } |
35 | - do_action( 'AHEE__txn_admin_details_side_meta_box_billing_info__billing_form_footer', $billing_form ); |
|
35 | + do_action('AHEE__txn_admin_details_side_meta_box_billing_info__billing_form_footer', $billing_form); |
|
36 | 36 | endif; ?> |
37 | 37 | |
38 | 38 | </div> |
@@ -1,9 +1,9 @@ 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 | -if ( ! class_exists( 'WP_List_Table' ) ) { |
|
6 | - require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' ); |
|
5 | +if ( ! class_exists('WP_List_Table')) { |
|
6 | + require_once(ABSPATH.'wp-admin/includes/class-wp-list-table.php'); |
|
7 | 7 | } |
8 | 8 | |
9 | 9 | |
@@ -206,16 +206,16 @@ discard block |
||
206 | 206 | /** |
207 | 207 | * @param \EE_Admin_Page $admin_page we use this for obtaining everything we need in the list table |
208 | 208 | */ |
209 | - public function __construct( EE_Admin_Page $admin_page ) { |
|
209 | + public function __construct(EE_Admin_Page $admin_page) { |
|
210 | 210 | $this->_admin_page = $admin_page; |
211 | 211 | $this->_req_data = $this->_admin_page->get_request_data(); |
212 | 212 | $this->_view = $this->_admin_page->get_view(); |
213 | - $this->_views = empty( $this->_views ) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views; |
|
213 | + $this->_views = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views; |
|
214 | 214 | $this->_current_page = $this->get_pagenum(); |
215 | - $this->_screen = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view(); |
|
216 | - $this->_yes_no = array( __('No', 'event_espresso'), __('Yes', 'event_espresso')); |
|
215 | + $this->_screen = $this->_admin_page->get_current_page().'_'.$this->_admin_page->get_current_view(); |
|
216 | + $this->_yes_no = array(__('No', 'event_espresso'), __('Yes', 'event_espresso')); |
|
217 | 217 | |
218 | - $this->_per_page = $this->get_items_per_page( $this->_screen . '_per_page', 10 ); |
|
218 | + $this->_per_page = $this->get_items_per_page($this->_screen.'_per_page', 10); |
|
219 | 219 | |
220 | 220 | $this->_setup_data(); |
221 | 221 | $this->_add_view_counts(); |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | $this->_set_properties(); |
226 | 226 | |
227 | 227 | //set primary column |
228 | - add_filter( 'list_table_primary_column', array( $this, 'set_primary_column' ) ); |
|
228 | + add_filter('list_table_primary_column', array($this, 'set_primary_column')); |
|
229 | 229 | |
230 | 230 | //set parent defaults |
231 | 231 | parent::__construct($this->_wp_list_args); |
@@ -301,17 +301,17 @@ discard block |
||
301 | 301 | * @return string |
302 | 302 | */ |
303 | 303 | protected function _get_hidden_fields() { |
304 | - $action = isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : ''; |
|
305 | - $action = empty( $action ) && isset( $this->_req_data['action'] ) ? $this->_req_data['action'] : $action; |
|
304 | + $action = isset($this->_req_data['route']) ? $this->_req_data['route'] : ''; |
|
305 | + $action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action; |
|
306 | 306 | //if action is STILL empty, then we set it to default |
307 | - $action = empty( $action ) ? 'default' : $action; |
|
308 | - $field = '<input type="hidden" name="page" value="' . $this->_req_data['page'] . '" />' . "\n"; |
|
309 | - $field .= '<input type="hidden" name="route" value="'. $action .'" />' . "\n";/**/ |
|
310 | - $field .= '<input type="hidden" name="perpage" value="' . $this->_per_page . '" />' . "\n"; |
|
307 | + $action = empty($action) ? 'default' : $action; |
|
308 | + $field = '<input type="hidden" name="page" value="'.$this->_req_data['page'].'" />'."\n"; |
|
309 | + $field .= '<input type="hidden" name="route" value="'.$action.'" />'."\n"; /**/ |
|
310 | + $field .= '<input type="hidden" name="perpage" value="'.$this->_per_page.'" />'."\n"; |
|
311 | 311 | |
312 | 312 | $bulk_actions = $this->_get_bulk_actions(); |
313 | - foreach ( $bulk_actions as $bulk_action => $label ) { |
|
314 | - $field .= '<input type="hidden" name="' . $bulk_action . '_nonce" value="' . wp_create_nonce ( $bulk_action . '_nonce' ) . '" />' . "\n"; |
|
313 | + foreach ($bulk_actions as $bulk_action => $label) { |
|
314 | + $field .= '<input type="hidden" name="'.$bulk_action.'_nonce" value="'.wp_create_nonce($bulk_action.'_nonce').'" />'."\n"; |
|
315 | 315 | } |
316 | 316 | |
317 | 317 | return $field; |
@@ -341,15 +341,15 @@ discard block |
||
341 | 341 | * |
342 | 342 | * @var array |
343 | 343 | */ |
344 | - $_sortable = apply_filters( "FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen ); |
|
344 | + $_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen); |
|
345 | 345 | |
346 | 346 | $sortable = array(); |
347 | - foreach ( $_sortable as $id => $data ) { |
|
348 | - if ( empty( $data ) ) { |
|
347 | + foreach ($_sortable as $id => $data) { |
|
348 | + if (empty($data)) { |
|
349 | 349 | continue; |
350 | 350 | } |
351 | 351 | //fix for offset errors with WP_List_Table default get_columninfo() |
352 | - if ( is_array($data) ) { |
|
352 | + if (is_array($data)) { |
|
353 | 353 | $_data[0] = key($data); |
354 | 354 | $_data[1] = isset($data[1]) ? $data[1] : false; |
355 | 355 | } else { |
@@ -358,14 +358,14 @@ discard block |
||
358 | 358 | |
359 | 359 | $data = (array) $data; |
360 | 360 | |
361 | - if ( !isset( $data[1] ) ) { |
|
361 | + if ( ! isset($data[1])) { |
|
362 | 362 | $_data[1] = false; |
363 | 363 | } |
364 | 364 | |
365 | 365 | $sortable[$id] = $_data; |
366 | 366 | } |
367 | 367 | $primary = $this->get_primary_column_name(); |
368 | - $this->_column_headers = array( $columns, $hidden, $sortable, $primary ); |
|
368 | + $this->_column_headers = array($columns, $hidden, $sortable, $primary); |
|
369 | 369 | } |
370 | 370 | |
371 | 371 | |
@@ -374,8 +374,8 @@ discard block |
||
374 | 374 | * @return string |
375 | 375 | */ |
376 | 376 | protected function get_primary_column_name() { |
377 | - foreach( class_parents( $this ) as $parent ) { |
|
378 | - if ( $parent === 'WP_List_Table' && method_exists( $parent, 'get_primary_column_name' ) ) { |
|
377 | + foreach (class_parents($this) as $parent) { |
|
378 | + if ($parent === 'WP_List_Table' && method_exists($parent, 'get_primary_column_name')) { |
|
379 | 379 | return parent::get_primary_column_name(); |
380 | 380 | } |
381 | 381 | } |
@@ -392,10 +392,10 @@ discard block |
||
392 | 392 | * @param string $primary |
393 | 393 | * @return string |
394 | 394 | */ |
395 | - protected function handle_row_actions( $item, $column_name, $primary ) { |
|
396 | - foreach( class_parents( $this ) as $parent ) { |
|
397 | - if ( $parent === 'WP_List_Table' && method_exists( $parent, 'handle_row_actions' ) ) { |
|
398 | - return parent::handle_row_actions( $item, $column_name, $primary ); |
|
395 | + protected function handle_row_actions($item, $column_name, $primary) { |
|
396 | + foreach (class_parents($this) as $parent) { |
|
397 | + if ($parent === 'WP_List_Table' && method_exists($parent, 'handle_row_actions')) { |
|
398 | + return parent::handle_row_actions($item, $column_name, $primary); |
|
399 | 399 | } |
400 | 400 | } |
401 | 401 | return ''; |
@@ -413,11 +413,11 @@ discard block |
||
413 | 413 | protected function _get_bulk_actions() { |
414 | 414 | $actions = array(); |
415 | 415 | //the _views property should have the bulk_actions, so let's go through and extract them into a properly formatted array for the wp_list_table(); |
416 | - foreach ( $this->_views as $view => $args) { |
|
417 | - if ( $this->_view === $view && isset( $args['bulk_action']) && is_array($args['bulk_action']) ) { |
|
416 | + foreach ($this->_views as $view => $args) { |
|
417 | + if ($this->_view === $view && isset($args['bulk_action']) && is_array($args['bulk_action'])) { |
|
418 | 418 | //each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user. |
419 | - foreach ( $args['bulk_action'] as $route =>$label ) { |
|
420 | - if ( $this->_admin_page->check_user_access( $route, true ) ) { |
|
419 | + foreach ($args['bulk_action'] as $route =>$label) { |
|
420 | + if ($this->_admin_page->check_user_access($route, true)) { |
|
421 | 421 | $actions[$route] = $label; |
422 | 422 | } |
423 | 423 | } |
@@ -436,18 +436,18 @@ discard block |
||
436 | 436 | */ |
437 | 437 | private function _filters() { |
438 | 438 | $classname = get_class($this); |
439 | - $filters = apply_filters( "FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen ); |
|
439 | + $filters = apply_filters("FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen); |
|
440 | 440 | |
441 | - if ( empty( $filters )) { |
|
441 | + if (empty($filters)) { |
|
442 | 442 | return; |
443 | 443 | } |
444 | - foreach ( $filters as $filter ) { |
|
444 | + foreach ($filters as $filter) { |
|
445 | 445 | echo $filter; |
446 | 446 | } |
447 | 447 | //add filter button at end |
448 | - echo '<input type="submit" class="button-secondary" value="' . __('Filter', 'event_espresso') . '" id="post-query-submit" />'; |
|
448 | + echo '<input type="submit" class="button-secondary" value="'.__('Filter', 'event_espresso').'" id="post-query-submit" />'; |
|
449 | 449 | //add reset filters button at end |
450 | - echo '<a class="button button-secondary" href="' . $this->_admin_page->get_current_page_view_url() . '" style="display:inline-block">' . __('Reset Filters', 'event_espresso') . '</a>'; |
|
450 | + echo '<a class="button button-secondary" href="'.$this->_admin_page->get_current_page_view_url().'" style="display:inline-block">'.__('Reset Filters', 'event_espresso').'</a>'; |
|
451 | 451 | } |
452 | 452 | |
453 | 453 | |
@@ -461,8 +461,8 @@ discard block |
||
461 | 461 | * @param string $column_name |
462 | 462 | * @return string |
463 | 463 | */ |
464 | - public function set_primary_column( $column_name ) { |
|
465 | - return ! empty( $this->_primary_column ) ? $this->_primary_column : $column_name; |
|
464 | + public function set_primary_column($column_name) { |
|
465 | + return ! empty($this->_primary_column) ? $this->_primary_column : $column_name; |
|
466 | 466 | } |
467 | 467 | |
468 | 468 | |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | array( |
483 | 483 | 'total_items' => $total_items, |
484 | 484 | 'per_page' => $this->_per_page, |
485 | - 'total_pages' => ceil($total_items / $this->_per_page ) |
|
485 | + 'total_pages' => ceil($total_items / $this->_per_page) |
|
486 | 486 | ) |
487 | 487 | ); |
488 | 488 | } |
@@ -496,7 +496,7 @@ discard block |
||
496 | 496 | * @param string $column_name The column being called. |
497 | 497 | * @return string html content for the column |
498 | 498 | */ |
499 | - public function column_default( $item, $column_name ) { |
|
499 | + public function column_default($item, $column_name) { |
|
500 | 500 | /** |
501 | 501 | * Dynamic hook allowing for adding additional column content in this list table. |
502 | 502 | * Note that $this->screen->id is in the format |
@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | * hook prefix ("event-espresso") will be different. |
507 | 507 | * |
508 | 508 | */ |
509 | - do_action( 'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id, $item, $this->_screen ); |
|
509 | + do_action('AHEE__EE_Admin_List_Table__column_'.$column_name.'__'.$this->screen->id, $item, $this->_screen); |
|
510 | 510 | } |
511 | 511 | |
512 | 512 | |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | * |
533 | 533 | * @var array |
534 | 534 | */ |
535 | - $columns = apply_filters( 'FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen ); |
|
535 | + $columns = apply_filters('FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen); |
|
536 | 536 | return $columns; |
537 | 537 | } |
538 | 538 | |
@@ -555,18 +555,18 @@ discard block |
||
555 | 555 | $views = $this->get_views(); |
556 | 556 | $assembled_views = ''; |
557 | 557 | |
558 | - if ( empty( $views )) { |
|
558 | + if (empty($views)) { |
|
559 | 559 | return; |
560 | 560 | } |
561 | 561 | echo "<ul class='subsubsub'>\n"; |
562 | - foreach ( $views as $view ) { |
|
563 | - $count = isset($view['count'] ) && !empty($view['count']) ? absint( $view['count'] ) : 0; |
|
564 | - if ( isset( $view['slug'], $view['class'], $view['url'], $view['label']) ) { |
|
565 | - $assembled_views[ $view['slug'] ] = "\t<li class='" . $view['class'] . "'>" . '<a href="' . $view['url'] . '">' . $view['label'] . '</a> <span class="count">(' . $count . ')</span>'; |
|
562 | + foreach ($views as $view) { |
|
563 | + $count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0; |
|
564 | + if (isset($view['slug'], $view['class'], $view['url'], $view['label'])) { |
|
565 | + $assembled_views[$view['slug']] = "\t<li class='".$view['class']."'>".'<a href="'.$view['url'].'">'.$view['label'].'</a> <span class="count">('.$count.')</span>'; |
|
566 | 566 | } |
567 | 567 | } |
568 | 568 | |
569 | - echo is_array( $assembled_views) && ! empty( $assembled_views ) ? implode( " |</li>\n", $assembled_views ) . "</li>\n" : ''; |
|
569 | + echo is_array($assembled_views) && ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views)."</li>\n" : ''; |
|
570 | 570 | echo "</ul>"; |
571 | 571 | } |
572 | 572 | |
@@ -578,10 +578,10 @@ discard block |
||
578 | 578 | * @access public |
579 | 579 | * @param EE_Base_Class $item The current item |
580 | 580 | */ |
581 | - public function single_row( $item ) { |
|
582 | - $row_class = $this->_get_row_class( $item ); |
|
583 | - echo '<tr class="' . esc_attr( $row_class ) . '">'; |
|
584 | - $this->single_row_columns( $item ); |
|
581 | + public function single_row($item) { |
|
582 | + $row_class = $this->_get_row_class($item); |
|
583 | + echo '<tr class="'.esc_attr($row_class).'">'; |
|
584 | + $this->single_row_columns($item); |
|
585 | 585 | echo '</tr>'; |
586 | 586 | } |
587 | 587 | |
@@ -593,13 +593,13 @@ discard block |
||
593 | 593 | * @param EE_Base_Class $item the current item |
594 | 594 | * @return string |
595 | 595 | */ |
596 | - protected function _get_row_class( $item ) { |
|
596 | + protected function _get_row_class($item) { |
|
597 | 597 | static $row_class = ''; |
598 | - $row_class = ( $row_class === '' ? 'alternate' : '' ); |
|
598 | + $row_class = ($row_class === '' ? 'alternate' : ''); |
|
599 | 599 | |
600 | 600 | $new_row_class = $row_class; |
601 | 601 | |
602 | - if ( !empty($this->_ajax_sorting_callback) ) { |
|
602 | + if ( ! empty($this->_ajax_sorting_callback)) { |
|
603 | 603 | $new_row_class .= ' rowsortable'; |
604 | 604 | } |
605 | 605 | |
@@ -631,13 +631,13 @@ discard block |
||
631 | 631 | */ |
632 | 632 | public function get_hidden_columns() { |
633 | 633 | $user_id = get_current_user_id(); |
634 | - $has_default = get_user_option('default'. $this->screen->id . 'columnshidden', $user_id); |
|
635 | - if ( empty( $has_default ) && !empty($this->_hidden_columns ) ) { |
|
636 | - update_user_option($user_id, 'default'.$this->screen->id . 'columnshidden', TRUE); |
|
637 | - update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, TRUE ); |
|
634 | + $has_default = get_user_option('default'.$this->screen->id.'columnshidden', $user_id); |
|
635 | + if (empty($has_default) && ! empty($this->_hidden_columns)) { |
|
636 | + update_user_option($user_id, 'default'.$this->screen->id.'columnshidden', TRUE); |
|
637 | + update_user_option($user_id, 'manage'.$this->screen->id.'columnshidden', $this->_hidden_columns, TRUE); |
|
638 | 638 | } |
639 | - $ref = 'manage' . $this->screen->id . 'columnshidden'; |
|
640 | - return (array) get_user_option( $ref, $user_id ); |
|
639 | + $ref = 'manage'.$this->screen->id.'columnshidden'; |
|
640 | + return (array) get_user_option($ref, $user_id); |
|
641 | 641 | } |
642 | 642 | |
643 | 643 | |
@@ -650,47 +650,47 @@ discard block |
||
650 | 650 | * @since 3.1.0 |
651 | 651 | * @param EE_Base_Class $item The current item |
652 | 652 | */ |
653 | - public function single_row_columns( $item ) { |
|
654 | - list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); |
|
653 | + public function single_row_columns($item) { |
|
654 | + list($columns, $hidden, $sortable, $primary) = $this->get_column_info(); |
|
655 | 655 | |
656 | 656 | global $wp_version; |
657 | - $use_hidden_class = version_compare( $wp_version, '4.3-RC', '>=' ); |
|
657 | + $use_hidden_class = version_compare($wp_version, '4.3-RC', '>='); |
|
658 | 658 | |
659 | - foreach ( $columns as $column_name => $column_display_name ) { |
|
659 | + foreach ($columns as $column_name => $column_display_name) { |
|
660 | 660 | |
661 | 661 | /** |
662 | 662 | * With WordPress version 4.3.RC+ WordPress started using the hidden css class to control whether columns are |
663 | 663 | * hidden or not instead of using "display:none;". This bit of code provides backward compat. |
664 | 664 | */ |
665 | - $hidden_class = $use_hidden_class && in_array( $column_name, $hidden ) ? ' hidden' : ''; |
|
666 | - $style = ! $use_hidden_class && in_array( $column_name, $hidden ) ? ' style="display:none;"' : ''; |
|
665 | + $hidden_class = $use_hidden_class && in_array($column_name, $hidden) ? ' hidden' : ''; |
|
666 | + $style = ! $use_hidden_class && in_array($column_name, $hidden) ? ' style="display:none;"' : ''; |
|
667 | 667 | |
668 | - $classes = $column_name . ' column-' . $column_name.$hidden_class; |
|
669 | - if ( $primary === $column_name ) { |
|
668 | + $classes = $column_name.' column-'.$column_name.$hidden_class; |
|
669 | + if ($primary === $column_name) { |
|
670 | 670 | $classes .= ' has-row-actions column-primary'; |
671 | 671 | } |
672 | 672 | |
673 | - $data = ' data-colname="' . wp_strip_all_tags( $column_display_name ) . '"'; |
|
673 | + $data = ' data-colname="'.wp_strip_all_tags($column_display_name).'"'; |
|
674 | 674 | |
675 | 675 | $class = "class='$classes'"; |
676 | 676 | |
677 | 677 | $attributes = "$class$style$data"; |
678 | 678 | |
679 | - if ( $column_name === 'cb' ) { |
|
679 | + if ($column_name === 'cb') { |
|
680 | 680 | echo '<th scope="row" class="check-column">'; |
681 | - echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this ); |
|
681 | + echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb($item), $item, $this); |
|
682 | 682 | echo '</th>'; |
683 | 683 | } |
684 | - elseif ( method_exists( $this, 'column_' . $column_name ) ) { |
|
684 | + elseif (method_exists($this, 'column_'.$column_name)) { |
|
685 | 685 | echo "<td $attributes>"; |
686 | - echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this ); |
|
687 | - echo $this->handle_row_actions( $item, $column_name, $primary ); |
|
686 | + echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_'.$column_name.'__column_content', call_user_func(array($this, 'column_'.$column_name), $item), $item, $this); |
|
687 | + echo $this->handle_row_actions($item, $column_name, $primary); |
|
688 | 688 | echo "</td>"; |
689 | 689 | } |
690 | 690 | else { |
691 | 691 | echo "<td $attributes>"; |
692 | - echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this ); |
|
693 | - echo $this->handle_row_actions( $item, $column_name, $primary ); |
|
692 | + echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default($item, $column_name), $item, $column_name, $this); |
|
693 | + echo $this->handle_row_actions($item, $column_name, $primary); |
|
694 | 694 | echo "</td>"; |
695 | 695 | } |
696 | 696 | } |
@@ -705,15 +705,15 @@ discard block |
||
705 | 705 | * @param string $which |
706 | 706 | * @throws \EE_Error |
707 | 707 | */ |
708 | - public function extra_tablenav( $which ) { |
|
709 | - if ( $which === 'top' ) { |
|
708 | + public function extra_tablenav($which) { |
|
709 | + if ($which === 'top') { |
|
710 | 710 | $this->_filters(); |
711 | 711 | echo $this->_get_hidden_fields(); |
712 | 712 | } else { |
713 | 713 | echo '<div class="list-table-bottom-buttons alignleft actions">'; |
714 | - foreach ( $this->_bottom_buttons as $type => $action ){ |
|
715 | - $route = isset( $action['route'] ) ? $action['route'] : ''; |
|
716 | - $extra_request = isset( $action['extra_request'] ) ? $action['extra_request'] : ''; |
|
714 | + foreach ($this->_bottom_buttons as $type => $action) { |
|
715 | + $route = isset($action['route']) ? $action['route'] : ''; |
|
716 | + $extra_request = isset($action['extra_request']) ? $action['extra_request'] : ''; |
|
717 | 717 | echo $this->_admin_page->get_action_link_or_button( |
718 | 718 | $route, |
719 | 719 | $type, |
@@ -723,7 +723,7 @@ discard block |
||
723 | 723 | false |
724 | 724 | ); |
725 | 725 | } |
726 | - do_action( 'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen ); |
|
726 | + do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen); |
|
727 | 727 | echo '</div>'; |
728 | 728 | } |
729 | 729 | //echo $this->_entries_per_page_dropdown; |
@@ -779,11 +779,11 @@ discard block |
||
779 | 779 | * the actions. |
780 | 780 | * @return string The assembled action elements container. |
781 | 781 | */ |
782 | - protected function _action_string( $action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '' ) { |
|
782 | + protected function _action_string($action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '') { |
|
783 | 783 | $content = ''; |
784 | - $action_class = ! empty( $action_class ) ? ' class="' . $action_class . '"' : ''; |
|
785 | - $action_id = ! empty( $action_id ) ? ' id="' . $action_id . '"' : ''; |
|
786 | - $content .= ! empty( $action_container ) ? '<' . $action_container . $action_class . $action_id . '>' : ''; |
|
784 | + $action_class = ! empty($action_class) ? ' class="'.$action_class.'"' : ''; |
|
785 | + $action_id = ! empty($action_id) ? ' id="'.$action_id.'"' : ''; |
|
786 | + $content .= ! empty($action_container) ? '<'.$action_container.$action_class.$action_id.'>' : ''; |
|
787 | 787 | try { |
788 | 788 | $content .= apply_filters( |
789 | 789 | 'FHEE__EE_Admin_List_Table___action_string__action_items', |
@@ -793,11 +793,11 @@ discard block |
||
793 | 793 | ); |
794 | 794 | } catch (\Exception $e) { |
795 | 795 | if (WP_DEBUG) { |
796 | - \EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ ); |
|
796 | + \EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__); |
|
797 | 797 | } |
798 | 798 | $content .= $action_items; |
799 | 799 | } |
800 | - $content .= ! empty( $action_container ) ? '</' . $action_container . '>' : ''; |
|
800 | + $content .= ! empty($action_container) ? '</'.$action_container.'>' : ''; |
|
801 | 801 | return $content; |
802 | 802 | } |
803 | 803 | } |
@@ -680,14 +680,12 @@ |
||
680 | 680 | echo '<th scope="row" class="check-column">'; |
681 | 681 | echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this ); |
682 | 682 | echo '</th>'; |
683 | - } |
|
684 | - elseif ( method_exists( $this, 'column_' . $column_name ) ) { |
|
683 | + } elseif ( method_exists( $this, 'column_' . $column_name ) ) { |
|
685 | 684 | echo "<td $attributes>"; |
686 | 685 | echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this ); |
687 | 686 | echo $this->handle_row_actions( $item, $column_name, $primary ); |
688 | 687 | echo "</td>"; |
689 | - } |
|
690 | - else { |
|
688 | + } else { |
|
691 | 689 | echo "<td $attributes>"; |
692 | 690 | echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this ); |
693 | 691 | echo $this->handle_row_actions( $item, $column_name, $primary ); |
@@ -22,32 +22,32 @@ discard block |
||
22 | 22 | * @param EE_Response $response |
23 | 23 | * @return EE_Response |
24 | 24 | */ |
25 | - public function handle_request( EE_Request $request, EE_Response $response ) { |
|
25 | + public function handle_request(EE_Request $request, EE_Response $response) { |
|
26 | 26 | $this->_request = $request; |
27 | 27 | $this->_response = $response; |
28 | 28 | //$this->_response->add_output( "\n\t IN >> " . __CLASS__ ); |
29 | 29 | //$this->_response->set_notice( 1, 'hey look at this' ); |
30 | 30 | // check required WP version |
31 | - if ( ! $this->_minimum_wp_version_required() ) { |
|
32 | - $this->_request->un_set( 'activate', true ); |
|
33 | - add_action( 'admin_notices', array( $this, 'minimum_wp_version_error' ), 1 ); |
|
31 | + if ( ! $this->_minimum_wp_version_required()) { |
|
32 | + $this->_request->un_set('activate', true); |
|
33 | + add_action('admin_notices', array($this, 'minimum_wp_version_error'), 1); |
|
34 | 34 | //$this->_response->add_output( "\n<br />" . 'minimum_wp_version_error' ); |
35 | 35 | $this->_response->terminate_request(); |
36 | 36 | $this->_response->deactivate_plugin(); |
37 | 37 | } |
38 | 38 | // check required PHP version |
39 | - if ( ! $this->_minimum_php_version_required() ) { |
|
40 | - $this->_request->un_set( 'activate', true ); |
|
41 | - add_action( 'admin_notices', array( $this, 'minimum_php_version_error' ), 1 ); |
|
39 | + if ( ! $this->_minimum_php_version_required()) { |
|
40 | + $this->_request->un_set('activate', true); |
|
41 | + add_action('admin_notices', array($this, 'minimum_php_version_error'), 1); |
|
42 | 42 | //$this->_response->add_output( "\n<br />" . 'minimum_php_version_error' ); |
43 | 43 | $this->_response->terminate_request(); |
44 | 44 | $this->_response->deactivate_plugin(); |
45 | 45 | } |
46 | 46 | // check recommended PHP version |
47 | - if ( ! $this->_minimum_php_version_recommended() ) { |
|
47 | + if ( ! $this->_minimum_php_version_recommended()) { |
|
48 | 48 | $this->_display_minimum_recommended_php_version_notice(); |
49 | 49 | } |
50 | - $this->_response = $this->process_request_stack( $this->_request, $this->_response ); |
|
50 | + $this->_response = $this->process_request_stack($this->_request, $this->_response); |
|
51 | 51 | //$this->_response->add_output( "\n\t OUT << " . __CLASS__ ); |
52 | 52 | return $this->_response; |
53 | 53 | } |
@@ -61,9 +61,9 @@ discard block |
||
61 | 61 | * @param string $min_version |
62 | 62 | * @return boolean |
63 | 63 | */ |
64 | - private function _check_wp_version( $min_version = EE_MIN_WP_VER_REQUIRED ) { |
|
64 | + private function _check_wp_version($min_version = EE_MIN_WP_VER_REQUIRED) { |
|
65 | 65 | global $wp_version; |
66 | - return version_compare( $wp_version, $min_version, '>=' ) ? true : false; |
|
66 | + return version_compare($wp_version, $min_version, '>=') ? true : false; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * @return boolean |
76 | 76 | */ |
77 | 77 | private function _minimum_wp_version_required() { |
78 | - return $this->_check_wp_version( EE_MIN_WP_VER_REQUIRED ); |
|
78 | + return $this->_check_wp_version(EE_MIN_WP_VER_REQUIRED); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | |
@@ -87,8 +87,8 @@ discard block |
||
87 | 87 | * @param string $min_version |
88 | 88 | * @return boolean |
89 | 89 | */ |
90 | - private function _check_php_version( $min_version = EE_MIN_PHP_VER_RECOMMENDED ) { |
|
91 | - return version_compare( PHP_VERSION, $min_version, '>=' ) ? true : false; |
|
90 | + private function _check_php_version($min_version = EE_MIN_PHP_VER_RECOMMENDED) { |
|
91 | + return version_compare(PHP_VERSION, $min_version, '>=') ? true : false; |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | * @return boolean |
101 | 101 | */ |
102 | 102 | private function _minimum_php_version_required() { |
103 | - return $this->_check_php_version( EE_MIN_PHP_VER_REQUIRED ); |
|
103 | + return $this->_check_php_version(EE_MIN_PHP_VER_REQUIRED); |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * @return boolean |
113 | 113 | */ |
114 | 114 | private function _minimum_php_version_recommended() { |
115 | - return $this->_check_php_version( EE_MIN_PHP_VER_RECOMMENDED ); |
|
115 | + return $this->_check_php_version(EE_MIN_PHP_VER_RECOMMENDED); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | <p> |
130 | 130 | <?php |
131 | 131 | printf( |
132 | - __( 'We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso' ), |
|
132 | + __('We\'re sorry, but Event Espresso requires WordPress version %1$s or greater in order to operate. You are currently running version %2$s.%3$sFor information on how to update your version of WordPress, please go to %4$s.', 'event_espresso'), |
|
133 | 133 | EE_MIN_WP_VER_REQUIRED, |
134 | 134 | $wp_version, |
135 | 135 | '<br/>', |
@@ -152,9 +152,9 @@ discard block |
||
152 | 152 | */ |
153 | 153 | private function _display_minimum_recommended_php_version_notice() { |
154 | 154 | EE_Error::add_persistent_admin_notice( |
155 | - 'php_version_' . str_replace( '.', '-', EE_MIN_PHP_VER_RECOMMENDED ) . '_recommended', |
|
155 | + 'php_version_'.str_replace('.', '-', EE_MIN_PHP_VER_RECOMMENDED).'_recommended', |
|
156 | 156 | sprintf( |
157 | - __( 'Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso' ), |
|
157 | + __('Event Espresso recommends PHP version %1$s or greater for optimal performance. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.', 'event_espresso'), |
|
158 | 158 | EE_MIN_PHP_VER_RECOMMENDED, |
159 | 159 | PHP_VERSION, |
160 | 160 | '<br/>', |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $this->_columns = array_merge( $columns, $this->_columns ); |
88 | 88 | $this->_primary_column = '_REG_att_checked_in'; |
89 | 89 | if ( ! empty( $evt_id ) |
90 | - && EE_Registry::instance()->CAP->current_user_can( |
|
90 | + && EE_Registry::instance()->CAP->current_user_can( |
|
91 | 91 | 'ee_read_registrations', |
92 | 92 | 'espresso_registrations_registrations_reports', |
93 | 93 | $evt_id |
@@ -189,8 +189,8 @@ discard block |
||
189 | 189 | if ( count( $this->_dtts_for_event ) > 1 ) { |
190 | 190 | $dtts[0] = __( 'To toggle check-in status, select a datetime.', 'event_espresso' ); |
191 | 191 | foreach ( $this->_dtts_for_event as $dtt ) { |
192 | - $datetime_string = $dtt->name(); |
|
193 | - $datetime_string = ! empty($datetime_string ) ? ' (' . $datetime_string . ')' : ''; |
|
192 | + $datetime_string = $dtt->name(); |
|
193 | + $datetime_string = ! empty($datetime_string ) ? ' (' . $datetime_string . ')' : ''; |
|
194 | 194 | $datetime_string = $dtt->start_date_and_time() . ' - ' . $dtt->end_date_and_time() . $datetime_string; |
195 | 195 | $dtts[ $dtt->ID() ] = $datetime_string; |
196 | 196 | } |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | $checkinstatus = $item->check_in_status_for_datetime( $this->_cur_dtt_id ); |
285 | 285 | $nonce = wp_create_nonce( 'checkin_nonce' ); |
286 | 286 | $toggle_active = ! empty ( $this->_cur_dtt_id ) |
287 | - && EE_Registry::instance()->CAP->current_user_can( |
|
287 | + && EE_Registry::instance()->CAP->current_user_can( |
|
288 | 288 | 'ee_edit_checkin', |
289 | 289 | 'espresso_registrations_toggle_checkin_status', |
290 | 290 | $item->ID() |
@@ -293,11 +293,11 @@ discard block |
||
293 | 293 | : ''; |
294 | 294 | $mobile_view_content = ' <span class="show-on-mobile-view-only">' . $attendee_name . '</span>'; |
295 | 295 | return '<span class="checkin-icons checkedin-status-' . $checkinstatus . $toggle_active . '"' |
296 | - . ' data-_regid="' . $item->ID() . '"' |
|
297 | - . ' data-dttid="' . $this->_cur_dtt_id . '"' |
|
298 | - . ' data-nonce="' . $nonce . '">' |
|
299 | - . '</span>' |
|
300 | - . $mobile_view_content; |
|
296 | + . ' data-_regid="' . $item->ID() . '"' |
|
297 | + . ' data-dttid="' . $this->_cur_dtt_id . '"' |
|
298 | + . ' data-nonce="' . $nonce . '">' |
|
299 | + . '</span>' |
|
300 | + . $mobile_view_content; |
|
301 | 301 | } |
302 | 302 | |
303 | 303 | |
@@ -322,8 +322,8 @@ discard block |
||
322 | 322 | 'espresso_registrations_edit_attendee' |
323 | 323 | ) |
324 | 324 | ? '<a href="' . $edit_lnk_url . '" title="' . esc_attr__( 'Edit Contact', 'event_espresso' ) . '">' |
325 | - . $item->attendee()->full_name() |
|
326 | - . '</a>' |
|
325 | + . $item->attendee()->full_name() |
|
326 | + . '</a>' |
|
327 | 327 | : $item->attendee()->full_name(); |
328 | 328 | $name_link .= $item->count() === 1 |
329 | 329 | ? ' <sup><div class="dashicons dashicons-star-filled lt-blue-icon ee-icon-size-8"></div></sup> ' |
@@ -358,7 +358,7 @@ discard block |
||
358 | 358 | ? $latest_related_datetime->ID() |
359 | 359 | : $DTT_ID; |
360 | 360 | if ( ! empty( $DTT_ID ) |
361 | - && EE_Registry::instance()->CAP->current_user_can( |
|
361 | + && EE_Registry::instance()->CAP->current_user_can( |
|
362 | 362 | 'ee_read_checkins', |
363 | 363 | 'espresso_registrations_registration_checkins' |
364 | 364 | ) |
@@ -458,15 +458,15 @@ discard block |
||
458 | 458 | ) ? ' |
459 | 459 | <span class="reg-pad-rght"> |
460 | 460 | <a class="status-' |
461 | - . $item->transaction()->status_ID() |
|
462 | - . '" href="' |
|
463 | - . $view_txn_lnk_url |
|
464 | - . '" title="' |
|
465 | - . esc_attr__( 'View Transaction', 'event_espresso' ) |
|
466 | - . '"> |
|
461 | + . $item->transaction()->status_ID() |
|
462 | + . '" href="' |
|
463 | + . $view_txn_lnk_url |
|
464 | + . '" title="' |
|
465 | + . esc_attr__( 'View Transaction', 'event_espresso' ) |
|
466 | + . '"> |
|
467 | 467 | ' |
468 | - . $item->transaction()->pretty_paid() |
|
469 | - . ' |
|
468 | + . $item->transaction()->pretty_paid() |
|
469 | + . ' |
|
470 | 470 | </a> |
471 | 471 | <span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_paid() . '</span>'; |
472 | 472 | } |
@@ -499,12 +499,12 @@ discard block |
||
499 | 499 | 'ee_read_transaction', |
500 | 500 | 'espresso_transactions_view_transaction' |
501 | 501 | ) ? '<a href="' |
502 | - . $view_txn_url |
|
503 | - . '" title="' |
|
504 | - . esc_attr__( 'View Transaction', 'event_espresso' ) |
|
505 | - . '"><span class="reg-pad-rght">' |
|
506 | - . $txn_total |
|
507 | - . '</span></a>' : '<span class="reg-pad-rght">' . $txn_total . '</span>'; |
|
502 | + . $view_txn_url |
|
503 | + . '" title="' |
|
504 | + . esc_attr__( 'View Transaction', 'event_espresso' ) |
|
505 | + . '"><span class="reg-pad-rght">' |
|
506 | + . $txn_total |
|
507 | + . '</span></a>' : '<span class="reg-pad-rght">' . $txn_total . '</span>'; |
|
508 | 508 | } else { |
509 | 509 | return '<span class="reg-pad-rght"></span>'; |
510 | 510 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | -<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
2 | - exit( 'No direct script access allowed' ); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | 3 | } |
4 | 4 | |
5 | 5 | |
@@ -42,51 +42,51 @@ discard block |
||
42 | 42 | * |
43 | 43 | * @param \Registrations_Admin_Page $admin_page |
44 | 44 | */ |
45 | - public function __construct( $admin_page ) { |
|
46 | - parent::__construct( $admin_page ); |
|
45 | + public function __construct($admin_page) { |
|
46 | + parent::__construct($admin_page); |
|
47 | 47 | $this->_status = $this->_admin_page->get_registration_status_array(); |
48 | 48 | } |
49 | 49 | |
50 | 50 | |
51 | 51 | |
52 | 52 | protected function _setup_data() { |
53 | - $this->_data = $this->_view !== 'trash' ? $this->_admin_page->get_event_attendees( $this->_per_page ) |
|
54 | - : $this->_admin_page->get_event_attendees( $this->_per_page, false, true ); |
|
53 | + $this->_data = $this->_view !== 'trash' ? $this->_admin_page->get_event_attendees($this->_per_page) |
|
54 | + : $this->_admin_page->get_event_attendees($this->_per_page, false, true); |
|
55 | 55 | $this->_all_data_count = $this->_view !== 'trash' ? $this->_admin_page->get_event_attendees( |
56 | 56 | $this->_per_page, |
57 | 57 | true |
58 | - ) : $this->_admin_page->get_event_attendees( $this->_per_page, true, true ); |
|
58 | + ) : $this->_admin_page->get_event_attendees($this->_per_page, true, true); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | |
62 | 62 | |
63 | 63 | protected function _set_properties() { |
64 | - $evt_id = isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : null; |
|
64 | + $evt_id = isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : null; |
|
65 | 65 | $this->_wp_list_args = array( |
66 | - 'singular' => __( 'registrant', 'event_espresso' ), |
|
67 | - 'plural' => __( 'registrants', 'event_espresso' ), |
|
66 | + 'singular' => __('registrant', 'event_espresso'), |
|
67 | + 'plural' => __('registrants', 'event_espresso'), |
|
68 | 68 | 'ajax' => true, |
69 | 69 | 'screen' => $this->_admin_page->get_current_screen()->id, |
70 | 70 | ); |
71 | 71 | $columns = array(); |
72 | 72 | //$columns['_Reg_Status'] = ''; |
73 | - if ( ! empty( $evt_id ) ) { |
|
73 | + if ( ! empty($evt_id)) { |
|
74 | 74 | $columns['cb'] = '<input type="checkbox" />'; //Render a checkbox instead of text |
75 | 75 | $this->_has_checkbox_column = true; |
76 | 76 | } |
77 | 77 | $this->_columns = array( |
78 | 78 | '_REG_att_checked_in' => '<span class="dashicons dashicons-yes ee-icon-size-18"></span>', |
79 | - 'ATT_name' => __( 'Registrant', 'event_espresso' ), |
|
80 | - 'ATT_email' => __( 'Email Address', 'event_espresso' ), |
|
81 | - 'Event' => __( 'Event', 'event_espresso' ), |
|
82 | - 'PRC_name' => __( 'TKT Option', 'event_espresso' ), |
|
83 | - '_REG_final_price' => __( 'Price', 'event_espresso' ), |
|
84 | - 'TXN_paid' => __( 'Paid', 'event_espresso' ), |
|
85 | - 'TXN_total' => __( 'Total', 'event_espresso' ), |
|
79 | + 'ATT_name' => __('Registrant', 'event_espresso'), |
|
80 | + 'ATT_email' => __('Email Address', 'event_espresso'), |
|
81 | + 'Event' => __('Event', 'event_espresso'), |
|
82 | + 'PRC_name' => __('TKT Option', 'event_espresso'), |
|
83 | + '_REG_final_price' => __('Price', 'event_espresso'), |
|
84 | + 'TXN_paid' => __('Paid', 'event_espresso'), |
|
85 | + 'TXN_total' => __('Total', 'event_espresso'), |
|
86 | 86 | ); |
87 | - $this->_columns = array_merge( $columns, $this->_columns ); |
|
87 | + $this->_columns = array_merge($columns, $this->_columns); |
|
88 | 88 | $this->_primary_column = '_REG_att_checked_in'; |
89 | - if ( ! empty( $evt_id ) |
|
89 | + if ( ! empty($evt_id) |
|
90 | 90 | && EE_Registry::instance()->CAP->current_user_can( |
91 | 91 | 'ee_read_registrations', |
92 | 92 | 'espresso_registrations_registrations_reports', |
@@ -99,18 +99,18 @@ discard block |
||
99 | 99 | 'extra_request' => |
100 | 100 | array( |
101 | 101 | 'EVT_ID' => $evt_id, |
102 | - 'return_url' => urlencode( "//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}" ), |
|
102 | + 'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"), |
|
103 | 103 | ), |
104 | 104 | ), |
105 | 105 | ); |
106 | 106 | } |
107 | 107 | $this->_sortable_columns = array( |
108 | 108 | //true means its already sorted |
109 | - 'ATT_name' => array( 'ATT_name' => true ), |
|
110 | - 'Event' => array( 'Event.EVT.Name' => false ), |
|
109 | + 'ATT_name' => array('ATT_name' => true), |
|
110 | + 'Event' => array('Event.EVT.Name' => false), |
|
111 | 111 | ); |
112 | 112 | $this->_hidden_columns = array(); |
113 | - $this->_evt = EEM_Event::instance()->get_one_by_ID( $evt_id ); |
|
113 | + $this->_evt = EEM_Event::instance()->get_one_by_ID($evt_id); |
|
114 | 114 | $this->_dtts_for_event = $this->_evt instanceof EE_Event ? $this->_evt->datetimes_ordered() : array(); |
115 | 115 | } |
116 | 116 | |
@@ -120,11 +120,11 @@ discard block |
||
120 | 120 | * @param \EE_Registration $item |
121 | 121 | * @return string |
122 | 122 | */ |
123 | - protected function _get_row_class( $item ) { |
|
124 | - $class = parent::_get_row_class( $item ); |
|
123 | + protected function _get_row_class($item) { |
|
124 | + $class = parent::_get_row_class($item); |
|
125 | 125 | //add status class |
126 | - $class .= ' ee-status-strip reg-status-' . $item->status_ID(); |
|
127 | - if ( $this->_has_checkbox_column ) { |
|
126 | + $class .= ' ee-status-strip reg-status-'.$item->status_ID(); |
|
127 | + if ($this->_has_checkbox_column) { |
|
128 | 128 | $class .= ' has-checkbox-column'; |
129 | 129 | } |
130 | 130 | return $class; |
@@ -138,61 +138,61 @@ discard block |
||
138 | 138 | */ |
139 | 139 | protected function _get_table_filters() { |
140 | 140 | $filters = $where = array(); |
141 | - $current_EVT_ID = isset( $this->_req_data['event_id'] ) ? (int) $this->_req_data['event_id'] : 0; |
|
142 | - if ( empty( $this->_dtts_for_event ) || count( $this->_dtts_for_event ) === 1 ) { |
|
141 | + $current_EVT_ID = isset($this->_req_data['event_id']) ? (int) $this->_req_data['event_id'] : 0; |
|
142 | + if (empty($this->_dtts_for_event) || count($this->_dtts_for_event) === 1) { |
|
143 | 143 | //this means we don't have an event so let's setup a filter dropdown for all the events to select |
144 | 144 | //note possible capability restrictions |
145 | - if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_events', 'get_events' ) ) { |
|
146 | - $where['status**'] = array( '!=', 'private' ); |
|
145 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_events', 'get_events')) { |
|
146 | + $where['status**'] = array('!=', 'private'); |
|
147 | 147 | } |
148 | - if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) { |
|
148 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) { |
|
149 | 149 | $where['EVT_wp_user'] = get_current_user_id(); |
150 | 150 | } |
151 | 151 | $events = EEM_Event::instance()->get_all( |
152 | 152 | array( |
153 | 153 | $where, |
154 | - 'order_by' => array( 'Datetime.DTT_EVT_start' => 'DESC' ), |
|
154 | + 'order_by' => array('Datetime.DTT_EVT_start' => 'DESC'), |
|
155 | 155 | ) |
156 | 156 | ); |
157 | 157 | $evts[] = array( |
158 | 158 | 'id' => 0, |
159 | - 'text' => __( 'To toggle Check-in status, select an event', 'event_espresso' ), |
|
159 | + 'text' => __('To toggle Check-in status, select an event', 'event_espresso'), |
|
160 | 160 | ); |
161 | 161 | $checked = 'checked'; |
162 | 162 | /** @var EE_Event $evt */ |
163 | - foreach ( $events as $evt ) { |
|
163 | + foreach ($events as $evt) { |
|
164 | 164 | //any registrations for this event? |
165 | - if ( ! $evt->get_count_of_all_registrations() ) { |
|
165 | + if ( ! $evt->get_count_of_all_registrations()) { |
|
166 | 166 | continue; |
167 | 167 | } |
168 | 168 | $evts[] = array( |
169 | 169 | 'id' => $evt->ID(), |
170 | - 'text' => $evt->get( 'EVT_name' ), |
|
170 | + 'text' => $evt->get('EVT_name'), |
|
171 | 171 | 'class' => $evt->is_expired() ? 'ee-expired-event' : '', |
172 | 172 | ); |
173 | - if ( $evt->ID() === $current_EVT_ID && $evt->is_expired() ) { |
|
173 | + if ($evt->ID() === $current_EVT_ID && $evt->is_expired()) { |
|
174 | 174 | $checked = ''; |
175 | 175 | } |
176 | 176 | } |
177 | 177 | $event_filter = '<div class="ee-event-filter">'; |
178 | - $event_filter .= EEH_Form_Fields::select_input( 'event_id', $evts, $current_EVT_ID ); |
|
178 | + $event_filter .= EEH_Form_Fields::select_input('event_id', $evts, $current_EVT_ID); |
|
179 | 179 | $event_filter .= '<span class="ee-event-filter-toggle">'; |
180 | - $event_filter .= '<input type="checkbox" id="js-ee-hide-expired-events" ' . $checked . '> '; |
|
181 | - $event_filter .= __( 'Hide Expired Events', 'event_espresso' ); |
|
180 | + $event_filter .= '<input type="checkbox" id="js-ee-hide-expired-events" '.$checked.'> '; |
|
181 | + $event_filter .= __('Hide Expired Events', 'event_espresso'); |
|
182 | 182 | $event_filter .= '</span>'; |
183 | 183 | $event_filter .= '</div>'; |
184 | 184 | $filters[] = $event_filter; |
185 | 185 | } |
186 | - if ( ! empty( $this->_dtts_for_event ) ) { |
|
186 | + if ( ! empty($this->_dtts_for_event)) { |
|
187 | 187 | //DTT datetimes filter |
188 | - $this->_cur_dtt_id = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0; |
|
189 | - if ( count( $this->_dtts_for_event ) > 1 ) { |
|
190 | - $dtts[0] = __( 'To toggle check-in status, select a datetime.', 'event_espresso' ); |
|
191 | - foreach ( $this->_dtts_for_event as $dtt ) { |
|
188 | + $this->_cur_dtt_id = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0; |
|
189 | + if (count($this->_dtts_for_event) > 1) { |
|
190 | + $dtts[0] = __('To toggle check-in status, select a datetime.', 'event_espresso'); |
|
191 | + foreach ($this->_dtts_for_event as $dtt) { |
|
192 | 192 | $datetime_string = $dtt->name(); |
193 | - $datetime_string = ! empty($datetime_string ) ? ' (' . $datetime_string . ')' : ''; |
|
194 | - $datetime_string = $dtt->start_date_and_time() . ' - ' . $dtt->end_date_and_time() . $datetime_string; |
|
195 | - $dtts[ $dtt->ID() ] = $datetime_string; |
|
193 | + $datetime_string = ! empty($datetime_string) ? ' ('.$datetime_string.')' : ''; |
|
194 | + $datetime_string = $dtt->start_date_and_time().' - '.$dtt->end_date_and_time().$datetime_string; |
|
195 | + $dtts[$dtt->ID()] = $datetime_string; |
|
196 | 196 | } |
197 | 197 | $input = new EE_Select_Input( |
198 | 198 | $dtts, |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | ) |
204 | 204 | ); |
205 | 205 | $filters[] = $input->get_html_for_input(); |
206 | - $filters[] = '<input type="hidden" name="event_id" value="' . $current_EVT_ID . '">'; |
|
206 | + $filters[] = '<input type="hidden" name="event_id" value="'.$current_EVT_ID.'">'; |
|
207 | 207 | } |
208 | 208 | } |
209 | 209 | return $filters; |
@@ -222,22 +222,22 @@ discard block |
||
222 | 222 | * @throws \EE_Error |
223 | 223 | */ |
224 | 224 | protected function _get_total_event_attendees() { |
225 | - $EVT_ID = isset( $this->_req_data['event_id'] ) ? absint( $this->_req_data['event_id'] ) : false; |
|
225 | + $EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : false; |
|
226 | 226 | $DTT_ID = $this->_cur_dtt_id; |
227 | 227 | $query_params = array(); |
228 | - if ( $EVT_ID ) { |
|
228 | + if ($EVT_ID) { |
|
229 | 229 | $query_params[0]['EVT_ID'] = $EVT_ID; |
230 | 230 | } |
231 | 231 | //if DTT is included we only show for that datetime. Otherwise we're showing for all datetimes (the event). |
232 | - if ( $DTT_ID ) { |
|
232 | + if ($DTT_ID) { |
|
233 | 233 | $query_params[0]['Ticket.Datetime.DTT_ID'] = $DTT_ID; |
234 | 234 | } |
235 | 235 | $status_ids_array = apply_filters( |
236 | 236 | 'FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', |
237 | - array( EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved ) |
|
237 | + array(EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved) |
|
238 | 238 | ); |
239 | - $query_params[0]['STS_ID'] = array( 'IN', $status_ids_array ); |
|
240 | - return EEM_Registration::instance()->count( $query_params ); |
|
239 | + $query_params[0]['STS_ID'] = array('IN', $status_ids_array); |
|
240 | + return EEM_Registration::instance()->count($query_params); |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | |
@@ -246,8 +246,8 @@ discard block |
||
246 | 246 | * @param \EE_Registration $item |
247 | 247 | * @return string |
248 | 248 | */ |
249 | - public function column__Reg_Status( EE_Registration $item ) { |
|
250 | - return '<span class="ee-status-strip ee-status-strip-td reg-status-' . $item->status_ID() . '"></span>'; |
|
249 | + public function column__Reg_Status(EE_Registration $item) { |
|
250 | + return '<span class="ee-status-strip ee-status-strip-td reg-status-'.$item->status_ID().'"></span>'; |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | |
@@ -257,8 +257,8 @@ discard block |
||
257 | 257 | * @return string |
258 | 258 | * @throws \EE_Error |
259 | 259 | */ |
260 | - public function column_cb( $item ) { |
|
261 | - return sprintf( '<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', $item->ID() ); |
|
260 | + public function column_cb($item) { |
|
261 | + return sprintf('<input type="checkbox" name="checkbox[%1$s]" value="%1$s" />', $item->ID()); |
|
262 | 262 | } |
263 | 263 | |
264 | 264 | |
@@ -270,20 +270,20 @@ discard block |
||
270 | 270 | * @return string |
271 | 271 | * @throws \EE_Error |
272 | 272 | */ |
273 | - public function column__REG_att_checked_in( EE_Registration $item ) { |
|
273 | + public function column__REG_att_checked_in(EE_Registration $item) { |
|
274 | 274 | $attendee = $item->attendee(); |
275 | 275 | $attendee_name = $attendee instanceof EE_Attendee ? $attendee->full_name() : ''; |
276 | 276 | |
277 | - if ( $this->_cur_dtt_id === 0 && count( $this->_dtts_for_event ) === 1 ) { |
|
277 | + if ($this->_cur_dtt_id === 0 && count($this->_dtts_for_event) === 1) { |
|
278 | 278 | $latest_related_datetime = $item->get_latest_related_datetime(); |
279 | - if ( $latest_related_datetime instanceof EE_Datetime ) { |
|
279 | + if ($latest_related_datetime instanceof EE_Datetime) { |
|
280 | 280 | $this->_cur_dtt_id = $latest_related_datetime->ID(); |
281 | 281 | } |
282 | 282 | } |
283 | 283 | |
284 | - $checkinstatus = $item->check_in_status_for_datetime( $this->_cur_dtt_id ); |
|
285 | - $nonce = wp_create_nonce( 'checkin_nonce' ); |
|
286 | - $toggle_active = ! empty ( $this->_cur_dtt_id ) |
|
284 | + $checkinstatus = $item->check_in_status_for_datetime($this->_cur_dtt_id); |
|
285 | + $nonce = wp_create_nonce('checkin_nonce'); |
|
286 | + $toggle_active = ! empty ($this->_cur_dtt_id) |
|
287 | 287 | && EE_Registry::instance()->CAP->current_user_can( |
288 | 288 | 'ee_edit_checkin', |
289 | 289 | 'espresso_registrations_toggle_checkin_status', |
@@ -291,11 +291,11 @@ discard block |
||
291 | 291 | ) |
292 | 292 | ? ' clickable trigger-checkin' |
293 | 293 | : ''; |
294 | - $mobile_view_content = ' <span class="show-on-mobile-view-only">' . $attendee_name . '</span>'; |
|
295 | - return '<span class="checkin-icons checkedin-status-' . $checkinstatus . $toggle_active . '"' |
|
296 | - . ' data-_regid="' . $item->ID() . '"' |
|
297 | - . ' data-dttid="' . $this->_cur_dtt_id . '"' |
|
298 | - . ' data-nonce="' . $nonce . '">' |
|
294 | + $mobile_view_content = ' <span class="show-on-mobile-view-only">'.$attendee_name.'</span>'; |
|
295 | + return '<span class="checkin-icons checkedin-status-'.$checkinstatus.$toggle_active.'"' |
|
296 | + . ' data-_regid="'.$item->ID().'"' |
|
297 | + . ' data-dttid="'.$this->_cur_dtt_id.'"' |
|
298 | + . ' data-nonce="'.$nonce.'">' |
|
299 | 299 | . '</span>' |
300 | 300 | . $mobile_view_content; |
301 | 301 | } |
@@ -307,21 +307,21 @@ discard block |
||
307 | 307 | * @return mixed|string|void |
308 | 308 | * @throws \EE_Error |
309 | 309 | */ |
310 | - public function column_ATT_name( EE_Registration $item ) { |
|
310 | + public function column_ATT_name(EE_Registration $item) { |
|
311 | 311 | $attendee = $item->attendee(); |
312 | - if ( ! $attendee instanceof EE_Attendee ) { |
|
313 | - return __( 'No contact record for this registration.', 'event_espresso' ); |
|
312 | + if ( ! $attendee instanceof EE_Attendee) { |
|
313 | + return __('No contact record for this registration.', 'event_espresso'); |
|
314 | 314 | } |
315 | 315 | // edit attendee link |
316 | 316 | $edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( |
317 | - array( 'action' => 'view_registration', '_REG_ID' => $item->ID() ), |
|
317 | + array('action' => 'view_registration', '_REG_ID' => $item->ID()), |
|
318 | 318 | REG_ADMIN_URL |
319 | 319 | ); |
320 | 320 | $name_link = EE_Registry::instance()->CAP->current_user_can( |
321 | 321 | 'ee_edit_contacts', |
322 | 322 | 'espresso_registrations_edit_attendee' |
323 | 323 | ) |
324 | - ? '<a href="' . $edit_lnk_url . '" title="' . esc_attr__( 'Edit Contact', 'event_espresso' ) . '">' |
|
324 | + ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Contact', 'event_espresso').'">' |
|
325 | 325 | . $item->attendee()->full_name() |
326 | 326 | . '</a>' |
327 | 327 | : $item->attendee()->full_name(); |
@@ -329,10 +329,10 @@ discard block |
||
329 | 329 | ? ' <sup><div class="dashicons dashicons-star-filled lt-blue-icon ee-icon-size-8"></div></sup> ' |
330 | 330 | : ''; |
331 | 331 | //add group details |
332 | - $name_link .= ' ' . sprintf( __( '(%s of %s)', 'event_espresso' ), $item->count(), $item->group_size() ); |
|
332 | + $name_link .= ' '.sprintf(__('(%s of %s)', 'event_espresso'), $item->count(), $item->group_size()); |
|
333 | 333 | //add regcode |
334 | 334 | $link = EE_Admin_Page::add_query_args_and_nonce( |
335 | - array( 'action' => 'view_registration', '_REG_ID' => $item->ID() ), |
|
335 | + array('action' => 'view_registration', '_REG_ID' => $item->ID()), |
|
336 | 336 | REG_ADMIN_URL |
337 | 337 | ); |
338 | 338 | $name_link .= '<br>'; |
@@ -341,37 +341,37 @@ discard block |
||
341 | 341 | 'view_registration', |
342 | 342 | $item->ID() |
343 | 343 | ) |
344 | - ? '<a href="' . $link . '" title="' . esc_attr__( 'View Registration Details', 'event_espresso' ) . '">' |
|
344 | + ? '<a href="'.$link.'" title="'.esc_attr__('View Registration Details', 'event_espresso').'">' |
|
345 | 345 | . $item->reg_code() |
346 | 346 | . '</a>' |
347 | 347 | : $item->reg_code(); |
348 | 348 | //status |
349 | 349 | $name_link .= '<br><span class="ee-status-text-small">'; |
350 | - $name_link .= EEH_Template::pretty_status( $item->status_ID(), false, 'sentence' ); |
|
350 | + $name_link .= EEH_Template::pretty_status($item->status_ID(), false, 'sentence'); |
|
351 | 351 | $name_link .= '</span>'; |
352 | 352 | $actions = array(); |
353 | 353 | $DTT_ID = $this->_cur_dtt_id; |
354 | - $latest_related_datetime = empty( $DTT_ID ) && ! empty( $this->_req_data['event_id'] ) && $item instanceof EE_Registration |
|
354 | + $latest_related_datetime = empty($DTT_ID) && ! empty($this->_req_data['event_id']) && $item instanceof EE_Registration |
|
355 | 355 | ? $item->get_latest_related_datetime() |
356 | 356 | : null; |
357 | 357 | $DTT_ID = $latest_related_datetime instanceof EE_Datetime |
358 | 358 | ? $latest_related_datetime->ID() |
359 | 359 | : $DTT_ID; |
360 | - if ( ! empty( $DTT_ID ) |
|
360 | + if ( ! empty($DTT_ID) |
|
361 | 361 | && EE_Registry::instance()->CAP->current_user_can( |
362 | 362 | 'ee_read_checkins', |
363 | 363 | 'espresso_registrations_registration_checkins' |
364 | 364 | ) |
365 | 365 | ) { |
366 | 366 | $checkin_list_url = EE_Admin_Page::add_query_args_and_nonce( |
367 | - array( 'action' => 'registration_checkins', '_REGID' => $item->ID(), 'DTT_ID' => $DTT_ID ) |
|
367 | + array('action' => 'registration_checkins', '_REGID' => $item->ID(), 'DTT_ID' => $DTT_ID) |
|
368 | 368 | ); |
369 | - $actions['checkin'] = '<a href="' . $checkin_list_url . '" title="' . esc_attr__( |
|
369 | + $actions['checkin'] = '<a href="'.$checkin_list_url.'" title="'.esc_attr__( |
|
370 | 370 | 'View all the check-ins/checkouts for this registrant', |
371 | 371 | 'event_espresso' |
372 | - ) . '">' . __( 'View', 'event_espresso' ) . '</a>'; |
|
372 | + ).'">'.__('View', 'event_espresso').'</a>'; |
|
373 | 373 | } |
374 | - return ! empty( $DTT_ID ) ? sprintf( '%1$s %2$s', $name_link, $this->row_actions( $actions ) ) : $name_link; |
|
374 | + return ! empty($DTT_ID) ? sprintf('%1$s %2$s', $name_link, $this->row_actions($actions)) : $name_link; |
|
375 | 375 | } |
376 | 376 | |
377 | 377 | |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | * @param \EE_Registration $item |
381 | 381 | * @return string |
382 | 382 | */ |
383 | - public function column_ATT_email( EE_Registration $item ) { |
|
383 | + public function column_ATT_email(EE_Registration $item) { |
|
384 | 384 | $attendee = $item->attendee(); |
385 | 385 | return $attendee instanceof EE_Attendee ? $attendee->email() : ''; |
386 | 386 | } |
@@ -392,22 +392,22 @@ discard block |
||
392 | 392 | * @return bool|string |
393 | 393 | * @throws \EE_Error |
394 | 394 | */ |
395 | - public function column_Event( EE_Registration $item ) { |
|
395 | + public function column_Event(EE_Registration $item) { |
|
396 | 396 | try { |
397 | 397 | $event = $this->_evt instanceof EE_Event ? $this->_evt : $item->event(); |
398 | 398 | $chkin_lnk_url = EE_Admin_Page::add_query_args_and_nonce( |
399 | - array( 'action' => 'event_registrations', 'event_id' => $event->ID() ), |
|
399 | + array('action' => 'event_registrations', 'event_id' => $event->ID()), |
|
400 | 400 | REG_ADMIN_URL |
401 | 401 | ); |
402 | 402 | $event_label = EE_Registry::instance()->CAP->current_user_can( |
403 | 403 | 'ee_read_checkins', |
404 | 404 | 'espresso_registrations_registration_checkins' |
405 | - ) ? '<a href="' . $chkin_lnk_url . '" title="' . esc_attr__( |
|
405 | + ) ? '<a href="'.$chkin_lnk_url.'" title="'.esc_attr__( |
|
406 | 406 | 'View Checkins for this Event', |
407 | 407 | 'event_espresso' |
408 | - ) . '">' . $event->name() . '</a>' : $event->name(); |
|
409 | - } catch ( \EventEspresso\core\exceptions\EntityNotFoundException $e ) { |
|
410 | - $event_label = esc_html__( 'Unknown', 'event_espresso' ); |
|
408 | + ).'">'.$event->name().'</a>' : $event->name(); |
|
409 | + } catch (\EventEspresso\core\exceptions\EntityNotFoundException $e) { |
|
410 | + $event_label = esc_html__('Unknown', 'event_espresso'); |
|
411 | 411 | } |
412 | 412 | return $event_label; |
413 | 413 | } |
@@ -418,8 +418,8 @@ discard block |
||
418 | 418 | * @param \EE_Registration $item |
419 | 419 | * @return mixed|string|void |
420 | 420 | */ |
421 | - public function column_PRC_name( EE_Registration $item ) { |
|
422 | - return $item->ticket() instanceof EE_Ticket ? $item->ticket()->name() : __( "Unknown", "event_espresso" ); |
|
421 | + public function column_PRC_name(EE_Registration $item) { |
|
422 | + return $item->ticket() instanceof EE_Ticket ? $item->ticket()->name() : __("Unknown", "event_espresso"); |
|
423 | 423 | } |
424 | 424 | |
425 | 425 | |
@@ -430,8 +430,8 @@ discard block |
||
430 | 430 | * @param \EE_Registration $item |
431 | 431 | * @return string |
432 | 432 | */ |
433 | - public function column__REG_final_price( EE_Registration $item ) { |
|
434 | - return '<span class="reg-pad-rght">' . ' ' . $item->pretty_final_price() . '</span>'; |
|
433 | + public function column__REG_final_price(EE_Registration $item) { |
|
434 | + return '<span class="reg-pad-rght">'.' '.$item->pretty_final_price().'</span>'; |
|
435 | 435 | } |
436 | 436 | |
437 | 437 | |
@@ -443,13 +443,13 @@ discard block |
||
443 | 443 | * @return string |
444 | 444 | * @throws \EE_Error |
445 | 445 | */ |
446 | - public function column_TXN_paid( EE_Registration $item ) { |
|
447 | - if ( $item->count() === 1 ) { |
|
448 | - if ( $item->transaction()->paid() >= $item->transaction()->total() ) { |
|
446 | + public function column_TXN_paid(EE_Registration $item) { |
|
447 | + if ($item->count() === 1) { |
|
448 | + if ($item->transaction()->paid() >= $item->transaction()->total()) { |
|
449 | 449 | return '<span class="reg-pad-rght"><div class="dashicons dashicons-yes green-icon"></div></span>'; |
450 | 450 | } else { |
451 | 451 | $view_txn_lnk_url = EE_Admin_Page::add_query_args_and_nonce( |
452 | - array( 'action' => 'view_transaction', 'TXN_ID' => $item->transaction_ID() ), |
|
452 | + array('action' => 'view_transaction', 'TXN_ID' => $item->transaction_ID()), |
|
453 | 453 | TXN_ADMIN_URL |
454 | 454 | ); |
455 | 455 | return EE_Registry::instance()->CAP->current_user_can( |
@@ -462,13 +462,13 @@ discard block |
||
462 | 462 | . '" href="' |
463 | 463 | . $view_txn_lnk_url |
464 | 464 | . '" title="' |
465 | - . esc_attr__( 'View Transaction', 'event_espresso' ) |
|
465 | + . esc_attr__('View Transaction', 'event_espresso') |
|
466 | 466 | . '"> |
467 | 467 | ' |
468 | 468 | . $item->transaction()->pretty_paid() |
469 | 469 | . ' |
470 | 470 | </a> |
471 | - <span>' : '<span class="reg-pad-rght">' . $item->transaction()->pretty_paid() . '</span>'; |
|
471 | + <span>' : '<span class="reg-pad-rght">'.$item->transaction()->pretty_paid().'</span>'; |
|
472 | 472 | } |
473 | 473 | } else { |
474 | 474 | return '<span class="reg-pad-rght"></span>'; |
@@ -484,13 +484,13 @@ discard block |
||
484 | 484 | * @return string |
485 | 485 | * @throws \EE_Error |
486 | 486 | */ |
487 | - public function column_TXN_total( EE_Registration $item ) { |
|
487 | + public function column_TXN_total(EE_Registration $item) { |
|
488 | 488 | $txn = $item->transaction(); |
489 | - $view_txn_url = add_query_arg( array( 'action' => 'view_transaction', 'TXN_ID' => $txn->ID() ), TXN_ADMIN_URL ); |
|
490 | - if ( $item->get( 'REG_count' ) === 1 ) { |
|
489 | + $view_txn_url = add_query_arg(array('action' => 'view_transaction', 'TXN_ID' => $txn->ID()), TXN_ADMIN_URL); |
|
490 | + if ($item->get('REG_count') === 1) { |
|
491 | 491 | $line_total_obj = $txn->total_line_item(); |
492 | 492 | $txn_total = $line_total_obj instanceof EE_Line_Item |
493 | - ? $line_total_obj->get_pretty( 'LIN_total' ) |
|
493 | + ? $line_total_obj->get_pretty('LIN_total') |
|
494 | 494 | : __( |
495 | 495 | 'View Transaction', |
496 | 496 | 'event_espresso' |
@@ -501,10 +501,10 @@ discard block |
||
501 | 501 | ) ? '<a href="' |
502 | 502 | . $view_txn_url |
503 | 503 | . '" title="' |
504 | - . esc_attr__( 'View Transaction', 'event_espresso' ) |
|
504 | + . esc_attr__('View Transaction', 'event_espresso') |
|
505 | 505 | . '"><span class="reg-pad-rght">' |
506 | 506 | . $txn_total |
507 | - . '</span></a>' : '<span class="reg-pad-rght">' . $txn_total . '</span>'; |
|
507 | + . '</span></a>' : '<span class="reg-pad-rght">'.$txn_total.'</span>'; |
|
508 | 508 | } else { |
509 | 509 | return '<span class="reg-pad-rght"></span>'; |
510 | 510 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | |
17 | 17 | |
18 | -if ( ! function_exists( 'espresso_get_template_part' )) { |
|
18 | +if ( ! function_exists('espresso_get_template_part')) { |
|
19 | 19 | /** |
20 | 20 | * espresso_get_template_part |
21 | 21 | * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files |
@@ -25,14 +25,14 @@ discard block |
||
25 | 25 | * @param string $name The name of the specialised template. |
26 | 26 | * @return string the html output for the formatted money value |
27 | 27 | */ |
28 | - function espresso_get_template_part( $slug = NULL, $name = NULL ) { |
|
29 | - EEH_Template::get_template_part( $slug, $name ); |
|
28 | + function espresso_get_template_part($slug = NULL, $name = NULL) { |
|
29 | + EEH_Template::get_template_part($slug, $name); |
|
30 | 30 | } |
31 | 31 | } |
32 | 32 | |
33 | 33 | |
34 | 34 | |
35 | -if ( ! function_exists( 'espresso_get_object_css_class' )) { |
|
35 | +if ( ! function_exists('espresso_get_object_css_class')) { |
|
36 | 36 | /** |
37 | 37 | * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed |
38 | 38 | * |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | * @param string $suffix added to the end of the generated class |
43 | 43 | * @return string |
44 | 44 | */ |
45 | - function espresso_get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) { |
|
46 | - return EEH_Template::get_object_css_class( $object, $prefix, $suffix ); |
|
45 | + function espresso_get_object_css_class($object = NULL, $prefix = '', $suffix = '') { |
|
46 | + return EEH_Template::get_object_css_class($object, $prefix, $suffix); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * @return boolean |
71 | 71 | */ |
72 | 72 | public static function is_espresso_theme() { |
73 | - return wp_get_theme()->get( 'TextDomain' ) == 'event_espresso' ? TRUE : FALSE; |
|
73 | + return wp_get_theme()->get('TextDomain') == 'event_espresso' ? TRUE : FALSE; |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -79,9 +79,9 @@ discard block |
||
79 | 79 | * @return void |
80 | 80 | */ |
81 | 81 | public static function load_espresso_theme_functions() { |
82 | - if ( ! defined( 'EE_THEME_FUNCTIONS_LOADED' )) { |
|
83 | - if ( is_readable( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' )) { |
|
84 | - require_once( EE_PUBLIC . EE_Config::get_current_theme() . DS . 'functions.php' ); |
|
82 | + if ( ! defined('EE_THEME_FUNCTIONS_LOADED')) { |
|
83 | + if (is_readable(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php')) { |
|
84 | + require_once(EE_PUBLIC.EE_Config::get_current_theme().DS.'functions.php'); |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | } |
@@ -93,17 +93,17 @@ discard block |
||
93 | 93 | * @return array |
94 | 94 | */ |
95 | 95 | public static function get_espresso_themes() { |
96 | - if ( empty( EEH_Template::$_espresso_themes )) { |
|
97 | - $espresso_themes = glob( EE_PUBLIC . '*', GLOB_ONLYDIR ); |
|
98 | - if ( empty( $espresso_themes ) ) { |
|
96 | + if (empty(EEH_Template::$_espresso_themes)) { |
|
97 | + $espresso_themes = glob(EE_PUBLIC.'*', GLOB_ONLYDIR); |
|
98 | + if (empty($espresso_themes)) { |
|
99 | 99 | return array(); |
100 | 100 | } |
101 | - if (( $key = array_search( 'global_assets', $espresso_themes )) !== FALSE ) { |
|
102 | - unset( $espresso_themes[ $key ] ); |
|
101 | + if (($key = array_search('global_assets', $espresso_themes)) !== FALSE) { |
|
102 | + unset($espresso_themes[$key]); |
|
103 | 103 | } |
104 | 104 | EEH_Template::$_espresso_themes = array(); |
105 | - foreach ( $espresso_themes as $espresso_theme ) { |
|
106 | - EEH_Template::$_espresso_themes[ basename( $espresso_theme ) ] = $espresso_theme; |
|
105 | + foreach ($espresso_themes as $espresso_theme) { |
|
106 | + EEH_Template::$_espresso_themes[basename($espresso_theme)] = $espresso_theme; |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 | return EEH_Template::$_espresso_themes; |
@@ -122,16 +122,16 @@ discard block |
||
122 | 122 | * @param bool $return_string |
123 | 123 | * @return string the html output for the formatted money value |
124 | 124 | */ |
125 | - public static function get_template_part( $slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE ) { |
|
126 | - do_action( "get_template_part_{$slug}-{$name}", $slug, $name ); |
|
125 | + public static function get_template_part($slug = NULL, $name = NULL, $template_args = array(), $return_string = FALSE) { |
|
126 | + do_action("get_template_part_{$slug}-{$name}", $slug, $name); |
|
127 | 127 | $templates = array(); |
128 | 128 | $name = (string) $name; |
129 | - if ( $name != '' ) { |
|
129 | + if ($name != '') { |
|
130 | 130 | $templates[] = "{$slug}-{$name}.php"; |
131 | 131 | } |
132 | 132 | // allow template parts to be turned off via something like: add_filter( 'FHEE__content_espresso_events_tickets_template__display_datetimes', '__return_false' ); |
133 | - if ( apply_filters( "FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE )) { |
|
134 | - EEH_Template::locate_template( $templates, $template_args, TRUE, $return_string ); |
|
133 | + if (apply_filters("FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", TRUE)) { |
|
134 | + EEH_Template::locate_template($templates, $template_args, TRUE, $return_string); |
|
135 | 135 | } |
136 | 136 | } |
137 | 137 | |
@@ -182,26 +182,26 @@ discard block |
||
182 | 182 | * Used in places where you don't actually load the template, you just want to know if there's a custom version of it. |
183 | 183 | * @return mixed |
184 | 184 | */ |
185 | - public static function locate_template( $templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE ) { |
|
185 | + public static function locate_template($templates = array(), $template_args = array(), $load = TRUE, $return_string = TRUE, $check_if_custom = FALSE) { |
|
186 | 186 | // first use WP locate_template to check for template in the current theme folder |
187 | - $template_path = locate_template( $templates ); |
|
187 | + $template_path = locate_template($templates); |
|
188 | 188 | |
189 | - if ( $check_if_custom && !empty( $template_path ) ) |
|
189 | + if ($check_if_custom && ! empty($template_path)) |
|
190 | 190 | return TRUE; |
191 | 191 | |
192 | 192 | // not in the theme |
193 | - if ( empty( $template_path )) { |
|
193 | + if (empty($template_path)) { |
|
194 | 194 | // not even a template to look for ? |
195 | - if ( empty( $templates )) { |
|
195 | + if (empty($templates)) { |
|
196 | 196 | // get post_type |
197 | - $post_type = EE_Registry::instance()->REQ->get( 'post_type' ); |
|
197 | + $post_type = EE_Registry::instance()->REQ->get('post_type'); |
|
198 | 198 | // get array of EE Custom Post Types |
199 | 199 | $EE_CPTs = EE_Register_CPTs::get_CPTs(); |
200 | 200 | // build template name based on request |
201 | - if ( isset( $EE_CPTs[ $post_type ] )) { |
|
202 | - $archive_or_single = is_archive() ? 'archive' : ''; |
|
203 | - $archive_or_single = is_single() ? 'single' : $archive_or_single; |
|
204 | - $templates = $archive_or_single . '-' . $post_type . '.php'; |
|
201 | + if (isset($EE_CPTs[$post_type])) { |
|
202 | + $archive_or_single = is_archive() ? 'archive' : ''; |
|
203 | + $archive_or_single = is_single() ? 'single' : $archive_or_single; |
|
204 | + $templates = $archive_or_single.'-'.$post_type.'.php'; |
|
205 | 205 | } |
206 | 206 | } |
207 | 207 | // currently active EE template theme |
@@ -210,81 +210,81 @@ discard block |
||
210 | 210 | // array of paths to folders that may contain templates |
211 | 211 | $template_folder_paths = array( |
212 | 212 | // first check the /wp-content/uploads/espresso/templates/(current EE theme)/ folder for an EE theme template file |
213 | - EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme, |
|
213 | + EVENT_ESPRESSO_TEMPLATE_DIR.$current_theme, |
|
214 | 214 | // then in the root of the /wp-content/uploads/espresso/templates/ folder |
215 | 215 | EVENT_ESPRESSO_TEMPLATE_DIR |
216 | 216 | ); |
217 | 217 | |
218 | 218 | //add core plugin folders for checking only if we're not $check_if_custom |
219 | - if ( ! $check_if_custom ) { |
|
219 | + if ( ! $check_if_custom) { |
|
220 | 220 | $core_paths = array( |
221 | 221 | // in the /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin |
222 | - EE_PUBLIC . $current_theme, |
|
222 | + EE_PUBLIC.$current_theme, |
|
223 | 223 | // in the /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin |
224 | - EE_TEMPLATES . $current_theme, |
|
224 | + EE_TEMPLATES.$current_theme, |
|
225 | 225 | // or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/ |
226 | 226 | EE_PLUGIN_DIR_PATH |
227 | 227 | ); |
228 | - $template_folder_paths = array_merge( $template_folder_paths, $core_paths ); |
|
228 | + $template_folder_paths = array_merge($template_folder_paths, $core_paths); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | // now filter that array |
232 | - $template_folder_paths = apply_filters( 'FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths ); |
|
233 | - $templates = is_array( $templates ) ? $templates : array( $templates ); |
|
234 | - $template_folder_paths = is_array( $template_folder_paths ) ? $template_folder_paths : array( $template_folder_paths ); |
|
232 | + $template_folder_paths = apply_filters('FHEE__EEH_Template__locate_template__template_folder_paths', $template_folder_paths); |
|
233 | + $templates = is_array($templates) ? $templates : array($templates); |
|
234 | + $template_folder_paths = is_array($template_folder_paths) ? $template_folder_paths : array($template_folder_paths); |
|
235 | 235 | // array to hold all possible template paths |
236 | 236 | $full_template_paths = array(); |
237 | 237 | |
238 | 238 | // loop through $templates |
239 | - foreach ( $templates as $template ) { |
|
239 | + foreach ($templates as $template) { |
|
240 | 240 | // normalize directory separators |
241 | - $template = EEH_File::standardise_directory_separators( $template ); |
|
242 | - $file_name = basename( $template ); |
|
243 | - $template_path_minus_file_name = substr( $template, 0, ( strlen( $file_name ) * -1 ) ); |
|
241 | + $template = EEH_File::standardise_directory_separators($template); |
|
242 | + $file_name = basename($template); |
|
243 | + $template_path_minus_file_name = substr($template, 0, (strlen($file_name) * -1)); |
|
244 | 244 | // while looping through all template folder paths |
245 | - foreach ( $template_folder_paths as $template_folder_path ) { |
|
245 | + foreach ($template_folder_paths as $template_folder_path) { |
|
246 | 246 | // normalize directory separators |
247 | - $template_folder_path = EEH_File::standardise_directory_separators( $template_folder_path ); |
|
247 | + $template_folder_path = EEH_File::standardise_directory_separators($template_folder_path); |
|
248 | 248 | // determine if any common base path exists between the two paths |
249 | 249 | $common_base_path = EEH_Template::_find_common_base_path( |
250 | - array( $template_folder_path, $template_path_minus_file_name ) |
|
250 | + array($template_folder_path, $template_path_minus_file_name) |
|
251 | 251 | ); |
252 | - if ( $common_base_path !== '' ) { |
|
252 | + if ($common_base_path !== '') { |
|
253 | 253 | // both paths have a common base, so just tack the filename onto our search path |
254 | - $resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $file_name; |
|
254 | + $resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$file_name; |
|
255 | 255 | } else { |
256 | 256 | // no common base path, so let's just concatenate |
257 | - $resolved_path = EEH_File::end_with_directory_separator( $template_folder_path ) . $template; |
|
257 | + $resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$template; |
|
258 | 258 | } |
259 | 259 | // build up our template locations array by adding our resolved paths |
260 | 260 | $full_template_paths[] = $resolved_path; |
261 | 261 | } |
262 | 262 | // if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first |
263 | - array_unshift( $full_template_paths, $template ); |
|
263 | + array_unshift($full_template_paths, $template); |
|
264 | 264 | // path to the directory of the current theme: /wp-content/themes/(current WP theme)/ |
265 | - array_unshift( $full_template_paths, get_stylesheet_directory() . DS . $file_name ); |
|
265 | + array_unshift($full_template_paths, get_stylesheet_directory().DS.$file_name); |
|
266 | 266 | } |
267 | 267 | // filter final array of full template paths |
268 | - $full_template_paths = apply_filters( 'FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name ); |
|
268 | + $full_template_paths = apply_filters('FHEE__EEH_Template__locate_template__full_template_paths', $full_template_paths, $file_name); |
|
269 | 269 | // now loop through our final array of template location paths and check each location |
270 | - foreach ( (array)$full_template_paths as $full_template_path ) { |
|
271 | - if ( is_readable( $full_template_path )) { |
|
272 | - $template_path = str_replace( array( '\\', '/' ), DIRECTORY_SEPARATOR, $full_template_path ); |
|
270 | + foreach ((array) $full_template_paths as $full_template_path) { |
|
271 | + if (is_readable($full_template_path)) { |
|
272 | + $template_path = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $full_template_path); |
|
273 | 273 | // hook that can be used to display the full template path that will be used |
274 | - do_action( 'AHEE__EEH_Template__locate_template__full_template_path', $template_path ); |
|
274 | + do_action('AHEE__EEH_Template__locate_template__full_template_path', $template_path); |
|
275 | 275 | break; |
276 | 276 | } |
277 | 277 | } |
278 | 278 | } |
279 | 279 | // if we got it and you want to see it... |
280 | - if ( $template_path && $load && ! $check_if_custom ) { |
|
281 | - if ( $return_string ) { |
|
282 | - return EEH_Template::display_template( $template_path, $template_args, TRUE ); |
|
280 | + if ($template_path && $load && ! $check_if_custom) { |
|
281 | + if ($return_string) { |
|
282 | + return EEH_Template::display_template($template_path, $template_args, TRUE); |
|
283 | 283 | } else { |
284 | - EEH_Template::display_template( $template_path, $template_args, FALSE ); |
|
284 | + EEH_Template::display_template($template_path, $template_args, FALSE); |
|
285 | 285 | } |
286 | 286 | } |
287 | - return $check_if_custom && ! empty( $template_path ) ? TRUE : $template_path; |
|
287 | + return $check_if_custom && ! empty($template_path) ? TRUE : $template_path; |
|
288 | 288 | } |
289 | 289 | |
290 | 290 | |
@@ -297,21 +297,21 @@ discard block |
||
297 | 297 | * @param array $paths |
298 | 298 | * @return string |
299 | 299 | */ |
300 | - protected static function _find_common_base_path( $paths ) { |
|
300 | + protected static function _find_common_base_path($paths) { |
|
301 | 301 | $last_offset = 0; |
302 | 302 | $common_base_path = ''; |
303 | - while ( ( $index = strpos( $paths[ 0 ], DS, $last_offset ) ) !== false ) { |
|
303 | + while (($index = strpos($paths[0], DS, $last_offset)) !== false) { |
|
304 | 304 | $dir_length = $index - $last_offset + 1; |
305 | - $directory = substr( $paths[ 0 ], $last_offset, $dir_length ); |
|
306 | - foreach ( $paths as $path ) { |
|
307 | - if ( substr( $path, $last_offset, $dir_length ) != $directory ) { |
|
305 | + $directory = substr($paths[0], $last_offset, $dir_length); |
|
306 | + foreach ($paths as $path) { |
|
307 | + if (substr($path, $last_offset, $dir_length) != $directory) { |
|
308 | 308 | return $common_base_path; |
309 | 309 | } |
310 | 310 | } |
311 | 311 | $common_base_path .= $directory; |
312 | 312 | $last_offset = $index + 1; |
313 | 313 | } |
314 | - return substr( $common_base_path, 0, -1 ); |
|
314 | + return substr($common_base_path, 0, -1); |
|
315 | 315 | } |
316 | 316 | |
317 | 317 | |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | * @param boolean $return_string whether to send output immediately to screen, or capture and return as a string |
324 | 324 | * @return mixed string |
325 | 325 | */ |
326 | - public static function display_template( $template_path = FALSE, $template_args = array(), $return_string = FALSE ) { |
|
326 | + public static function display_template($template_path = FALSE, $template_args = array(), $return_string = FALSE) { |
|
327 | 327 | |
328 | 328 | /** |
329 | 329 | * These two filters are intended for last minute changes to templates being loaded and/or template arg |
@@ -334,26 +334,26 @@ discard block |
||
334 | 334 | * |
335 | 335 | * @since 4.6.0 |
336 | 336 | */ |
337 | - $template_path = apply_filters( 'FHEE__EEH_Template__display_template__template_path', $template_path ); |
|
338 | - $template_args = apply_filters( 'FHEE__EEH_Template__display_template__template_args', $template_args ); |
|
337 | + $template_path = apply_filters('FHEE__EEH_Template__display_template__template_path', $template_path); |
|
338 | + $template_args = apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args); |
|
339 | 339 | |
340 | 340 | // you gimme nuttin - YOU GET NUTTIN !! |
341 | - if ( ! $template_path || ! is_readable( $template_path )) { |
|
341 | + if ( ! $template_path || ! is_readable($template_path)) { |
|
342 | 342 | return ''; |
343 | 343 | } |
344 | 344 | // if $template_args are not in an array, then make it so |
345 | - if ( ! is_array( $template_args ) && ! is_object( $template_args )) { |
|
346 | - $template_args = array( $template_args ); |
|
345 | + if ( ! is_array($template_args) && ! is_object($template_args)) { |
|
346 | + $template_args = array($template_args); |
|
347 | 347 | } |
348 | - extract( (array) $template_args); |
|
348 | + extract((array) $template_args); |
|
349 | 349 | |
350 | - if ( $return_string ) { |
|
350 | + if ($return_string) { |
|
351 | 351 | // because we want to return a string, we are going to capture the output |
352 | 352 | ob_start(); |
353 | - include( $template_path ); |
|
353 | + include($template_path); |
|
354 | 354 | return ob_get_clean(); |
355 | 355 | } else { |
356 | - include( $template_path ); |
|
356 | + include($template_path); |
|
357 | 357 | } |
358 | 358 | return ''; |
359 | 359 | } |
@@ -371,27 +371,27 @@ discard block |
||
371 | 371 | * @param string $suffix added to the end of the generated class |
372 | 372 | * @return string |
373 | 373 | */ |
374 | - public static function get_object_css_class( $object = NULL, $prefix = '', $suffix = '' ) { |
|
374 | + public static function get_object_css_class($object = NULL, $prefix = '', $suffix = '') { |
|
375 | 375 | // in the beginning... |
376 | - $prefix = ! empty( $prefix ) ? rtrim( $prefix, '-' ) . '-' : ''; |
|
376 | + $prefix = ! empty($prefix) ? rtrim($prefix, '-').'-' : ''; |
|
377 | 377 | // da muddle |
378 | 378 | $class = ''; |
379 | 379 | // the end |
380 | - $suffix = ! empty( $suffix ) ? '-' . ltrim( $suffix, '-' ) : ''; |
|
380 | + $suffix = ! empty($suffix) ? '-'.ltrim($suffix, '-') : ''; |
|
381 | 381 | // is the passed object an EE object ? |
382 | - if ( $object instanceof EE_Base_Class ) { |
|
382 | + if ($object instanceof EE_Base_Class) { |
|
383 | 383 | // grab the exact type of object |
384 | - $obj_class = get_class( $object ); |
|
384 | + $obj_class = get_class($object); |
|
385 | 385 | // depending on the type of object... |
386 | - switch ( $obj_class ) { |
|
386 | + switch ($obj_class) { |
|
387 | 387 | // no specifics just yet... |
388 | 388 | default : |
389 | - $class = strtolower( str_replace( '_', '-', $obj_class )); |
|
390 | - $class .= method_exists( $obj_class, 'name' ) ? '-' . sanitize_title( $object->name() ) : ''; |
|
389 | + $class = strtolower(str_replace('_', '-', $obj_class)); |
|
390 | + $class .= method_exists($obj_class, 'name') ? '-'.sanitize_title($object->name()) : ''; |
|
391 | 391 | |
392 | 392 | } |
393 | 393 | } |
394 | - return $prefix . $class . $suffix; |
|
394 | + return $prefix.$class.$suffix; |
|
395 | 395 | } |
396 | 396 | |
397 | 397 | |
@@ -407,54 +407,54 @@ discard block |
||
407 | 407 | * @param string $cur_code_span_class |
408 | 408 | * @return string the html output for the formatted money value |
409 | 409 | */ |
410 | - public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' ) { |
|
410 | + public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code') { |
|
411 | 411 | // ensure amount was received |
412 | - if ( is_null( $amount ) ) { |
|
413 | - $msg = __( 'In order to format currency, an amount needs to be passed.', 'event_espresso' ); |
|
414 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
412 | + if (is_null($amount)) { |
|
413 | + $msg = __('In order to format currency, an amount needs to be passed.', 'event_espresso'); |
|
414 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
415 | 415 | return ''; |
416 | 416 | } |
417 | 417 | //ensure amount is float |
418 | - $amount = apply_filters( 'FHEE__EEH_Template__format_currency__raw_amount', (float) $amount ); |
|
419 | - $CNT_ISO = apply_filters( 'FHEE__EEH_Template__format_currency__CNT_ISO', $CNT_ISO, $amount ); |
|
418 | + $amount = apply_filters('FHEE__EEH_Template__format_currency__raw_amount', (float) $amount); |
|
419 | + $CNT_ISO = apply_filters('FHEE__EEH_Template__format_currency__CNT_ISO', $CNT_ISO, $amount); |
|
420 | 420 | // filter raw amount (allows 0.00 to be changed to "free" for example) |
421 | - $amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount', $amount, $return_raw ); |
|
421 | + $amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw); |
|
422 | 422 | // still a number or was amount converted to a string like "free" ? |
423 | - if ( is_float( $amount_formatted )) { |
|
423 | + if (is_float($amount_formatted)) { |
|
424 | 424 | // was a country ISO code passed ? if so generate currency config object for that country |
425 | - $mny = $CNT_ISO !== '' ? new EE_Currency_Config( $CNT_ISO ) : NULL; |
|
425 | + $mny = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : NULL; |
|
426 | 426 | // verify results |
427 | - if ( ! $mny instanceof EE_Currency_Config ) { |
|
427 | + if ( ! $mny instanceof EE_Currency_Config) { |
|
428 | 428 | // set default config country currency settings |
429 | 429 | $mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config ? EE_Registry::instance()->CFG->currency : new EE_Currency_Config(); |
430 | 430 | } |
431 | 431 | // format float |
432 | - $amount_formatted = number_format( $amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds ); |
|
432 | + $amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds); |
|
433 | 433 | // add formatting ? |
434 | - if ( ! $return_raw ) { |
|
434 | + if ( ! $return_raw) { |
|
435 | 435 | // add currency sign |
436 | - if( $mny->sign_b4 ){ |
|
437 | - if( $amount >= 0 ){ |
|
438 | - $amount_formatted = $mny->sign . $amount_formatted; |
|
439 | - }else{ |
|
440 | - $amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted ); |
|
436 | + if ($mny->sign_b4) { |
|
437 | + if ($amount >= 0) { |
|
438 | + $amount_formatted = $mny->sign.$amount_formatted; |
|
439 | + } else { |
|
440 | + $amount_formatted = '-'.$mny->sign.str_replace('-', '', $amount_formatted); |
|
441 | 441 | } |
442 | 442 | |
443 | - }else{ |
|
444 | - $amount_formatted = $amount_formatted . $mny->sign; |
|
443 | + } else { |
|
444 | + $amount_formatted = $amount_formatted.$mny->sign; |
|
445 | 445 | } |
446 | 446 | |
447 | 447 | // filter to allow global setting of display_code |
448 | - $display_code = apply_filters( 'FHEE__EEH_Template__format_currency__display_code', $display_code ); |
|
448 | + $display_code = apply_filters('FHEE__EEH_Template__format_currency__display_code', $display_code); |
|
449 | 449 | |
450 | 450 | // add currency code ? |
451 | - $amount_formatted = $display_code ? $amount_formatted . ' <span class="' . $cur_code_span_class . '">(' . $mny->code . ')</span>' : $amount_formatted; |
|
451 | + $amount_formatted = $display_code ? $amount_formatted.' <span class="'.$cur_code_span_class.'">('.$mny->code.')</span>' : $amount_formatted; |
|
452 | 452 | } |
453 | 453 | // filter results |
454 | - $amount_formatted = apply_filters( 'FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw ); |
|
454 | + $amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount_formatted', $amount_formatted, $mny, $return_raw); |
|
455 | 455 | } |
456 | 456 | // clean up vars |
457 | - unset( $mny ); |
|
457 | + unset($mny); |
|
458 | 458 | // return formatted currency amount |
459 | 459 | return $amount_formatted; |
460 | 460 | } |
@@ -469,11 +469,11 @@ discard block |
||
469 | 469 | * @param string $schema 'UPPER', 'lower', or 'Sentence' |
470 | 470 | * @return string The localized label for the status id. |
471 | 471 | */ |
472 | - public static function pretty_status( $status_id, $plural = FALSE, $schema = 'upper' ) { |
|
472 | + public static function pretty_status($status_id, $plural = FALSE, $schema = 'upper') { |
|
473 | 473 | /** @type EEM_Status $EEM_Status */ |
474 | - $EEM_Status = EE_Registry::instance()->load_model( 'Status' ); |
|
475 | - $status = $EEM_Status->localized_status( array( $status_id => __( 'unknown', 'event_espresso' )), $plural, $schema ); |
|
476 | - return $status[ $status_id ]; |
|
474 | + $EEM_Status = EE_Registry::instance()->load_model('Status'); |
|
475 | + $status = $EEM_Status->localized_status(array($status_id => __('unknown', 'event_espresso')), $plural, $schema); |
|
476 | + return $status[$status_id]; |
|
477 | 477 | } |
478 | 478 | |
479 | 479 | |
@@ -488,21 +488,21 @@ discard block |
||
488 | 488 | * @param string $title |
489 | 489 | * @return string the html output for the button |
490 | 490 | */ |
491 | - public static function get_button_or_link( $url, $label, $class = 'button-primary', $icon = '', $title = '' ) { |
|
491 | + public static function get_button_or_link($url, $label, $class = 'button-primary', $icon = '', $title = '') { |
|
492 | 492 | $icon_html = ''; |
493 | - if ( ! empty( $icon ) ) { |
|
494 | - $dashicons = preg_split( "(ee-icon |dashicons )", $icon ); |
|
495 | - $dashicons = array_filter( $dashicons ); |
|
496 | - $count = count( $dashicons ); |
|
493 | + if ( ! empty($icon)) { |
|
494 | + $dashicons = preg_split("(ee-icon |dashicons )", $icon); |
|
495 | + $dashicons = array_filter($dashicons); |
|
496 | + $count = count($dashicons); |
|
497 | 497 | $icon_html .= $count > 1 ? '<span class="ee-composite-dashicon">' : ''; |
498 | - foreach ( $dashicons as $dashicon ) { |
|
499 | - $type = strpos( $dashicon, 'ee-icon' ) !== false ? 'ee-icon ' : 'dashicons '; |
|
500 | - $icon_html .= '<span class="' . $type . $dashicon . '"></span>'; |
|
498 | + foreach ($dashicons as $dashicon) { |
|
499 | + $type = strpos($dashicon, 'ee-icon') !== false ? 'ee-icon ' : 'dashicons '; |
|
500 | + $icon_html .= '<span class="'.$type.$dashicon.'"></span>'; |
|
501 | 501 | } |
502 | 502 | $icon_html .= $count > 1 ? '</span>' : ''; |
503 | 503 | } |
504 | - $label = ! empty( $icon ) ? $icon_html . $label : $label; |
|
505 | - $button = '<a id="' . sanitize_title_with_dashes($label) . '" href="' . $url . '" class="' . $class . '" title="' . $title . '">' . $label . '</a>'; |
|
504 | + $label = ! empty($icon) ? $icon_html.$label : $label; |
|
505 | + $button = '<a id="'.sanitize_title_with_dashes($label).'" href="'.$url.'" class="'.$class.'" title="'.$title.'">'.$label.'</a>'; |
|
506 | 506 | return $button; |
507 | 507 | } |
508 | 508 | |
@@ -519,21 +519,21 @@ discard block |
||
519 | 519 | * @param bool|string $help_text (optional) send help text you want to use for the link if default not to be used |
520 | 520 | * @return string generated link |
521 | 521 | */ |
522 | - public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) { |
|
522 | + public static function get_help_tab_link($help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE) { |
|
523 | 523 | |
524 | - if ( ! $page ) |
|
525 | - $page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page; |
|
524 | + if ( ! $page) |
|
525 | + $page = isset($_REQUEST['page']) && ! empty($_REQUEST['page']) ? sanitize_key($_REQUEST['page']) : $page; |
|
526 | 526 | |
527 | - if ( ! $action ) |
|
528 | - $action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action; |
|
527 | + if ( ! $action) |
|
528 | + $action = isset($_REQUEST['action']) && ! empty($_REQUEST['action']) ? sanitize_key($_REQUEST['action']) : $action; |
|
529 | 529 | |
530 | 530 | $action = empty($action) ? 'default' : $action; |
531 | 531 | |
532 | 532 | |
533 | - $help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id; |
|
534 | - $icon = !$icon_style ? ' dashicons-editor-help' : $icon_style; |
|
535 | - $help_text = !$help_text ? '' : $help_text; |
|
536 | - return '<a id="' . $help_tab_lnk . '" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22' . $icon . '" title="' . esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso') . '" > ' . $help_text . ' </a>'; |
|
533 | + $help_tab_lnk = $page.'-'.$action.'-'.$help_tab_id; |
|
534 | + $icon = ! $icon_style ? ' dashicons-editor-help' : $icon_style; |
|
535 | + $help_text = ! $help_text ? '' : $help_text; |
|
536 | + return '<a id="'.$help_tab_lnk.'" class="ee-clickable dashicons espresso-help-tab-lnk ee-icon-size-22'.$icon.'" title="'.esc_attr__('Click to open the \'Help\' tab for more information about this feature.', 'event_espresso').'" > '.$help_text.' </a>'; |
|
537 | 537 | } |
538 | 538 | |
539 | 539 | |
@@ -545,31 +545,31 @@ discard block |
||
545 | 545 | * @param EE_Help_Tour |
546 | 546 | * @return string html |
547 | 547 | */ |
548 | - public static function help_tour_stops_generator( EE_Help_Tour $tour ) { |
|
548 | + public static function help_tour_stops_generator(EE_Help_Tour $tour) { |
|
549 | 549 | $id = $tour->get_slug(); |
550 | 550 | $stops = $tour->get_stops(); |
551 | 551 | |
552 | - $content = '<ol style="display:none" id="' . $id . '">'; |
|
552 | + $content = '<ol style="display:none" id="'.$id.'">'; |
|
553 | 553 | |
554 | - foreach ( $stops as $stop ) { |
|
555 | - $data_id = !empty( $stop['id'] ) ? ' data-id="' . $stop['id'] . '"' : ''; |
|
556 | - $data_class = empty( $data_id ) && !empty( $stop['class'] ) ? ' data-class="' . $stop['class'] . '"' : ''; |
|
554 | + foreach ($stops as $stop) { |
|
555 | + $data_id = ! empty($stop['id']) ? ' data-id="'.$stop['id'].'"' : ''; |
|
556 | + $data_class = empty($data_id) && ! empty($stop['class']) ? ' data-class="'.$stop['class'].'"' : ''; |
|
557 | 557 | |
558 | 558 | //if container is set to modal then let's make sure we set the options accordingly |
559 | - if ( empty( $data_id ) && empty( $data_class ) ) { |
|
559 | + if (empty($data_id) && empty($data_class)) { |
|
560 | 560 | $stop['options']['modal'] = true; |
561 | 561 | $stop['options']['expose'] = true; |
562 | 562 | } |
563 | 563 | |
564 | - $custom_class = !empty( $stop['custom_class'] ) ? ' class="' . $stop['custom_class'] . '"' : ''; |
|
565 | - $button_text = !empty( $stop['button_text'] ) ? ' data-button="' . $stop['button_text'] . '"' : ''; |
|
564 | + $custom_class = ! empty($stop['custom_class']) ? ' class="'.$stop['custom_class'].'"' : ''; |
|
565 | + $button_text = ! empty($stop['button_text']) ? ' data-button="'.$stop['button_text'].'"' : ''; |
|
566 | 566 | $inner_content = isset($stop['content']) ? $stop['content'] : ''; |
567 | 567 | |
568 | 568 | //options |
569 | - if ( isset( $stop['options'] ) && is_array( $stop['options'] ) ) { |
|
569 | + if (isset($stop['options']) && is_array($stop['options'])) { |
|
570 | 570 | $options = ' data-options="'; |
571 | - foreach ( $stop['options'] as $option => $value ) { |
|
572 | - $options .= $option . ':' . $value . ';'; |
|
571 | + foreach ($stop['options'] as $option => $value) { |
|
572 | + $options .= $option.':'.$value.';'; |
|
573 | 573 | } |
574 | 574 | $options .= '"'; |
575 | 575 | } else { |
@@ -577,7 +577,7 @@ discard block |
||
577 | 577 | } |
578 | 578 | |
579 | 579 | //let's put all together |
580 | - $content .= '<li' . $data_id . $data_class . $custom_class . $button_text . $options . '>' . $inner_content . '</li>'; |
|
580 | + $content .= '<li'.$data_id.$data_class.$custom_class.$button_text.$options.'>'.$inner_content.'</li>'; |
|
581 | 581 | } |
582 | 582 | |
583 | 583 | $content .= '</ol>'; |
@@ -598,31 +598,31 @@ discard block |
||
598 | 598 | * @throws EE_Error |
599 | 599 | * @return string html structure for status. |
600 | 600 | */ |
601 | - public static function status_legend( $status_array, $active_status = '' ) { |
|
602 | - if ( !is_array( $status_array ) ) |
|
603 | - throw new EE_Error( esc_html__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') ); |
|
601 | + public static function status_legend($status_array, $active_status = '') { |
|
602 | + if ( ! is_array($status_array)) |
|
603 | + throw new EE_Error(esc_html__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso')); |
|
604 | 604 | |
605 | 605 | $setup_array = array(); |
606 | - foreach ( $status_array as $item => $status ) { |
|
606 | + foreach ($status_array as $item => $status) { |
|
607 | 607 | $setup_array[$item] = array( |
608 | - 'class' => 'ee-status-legend ee-status-legend-' . $status, |
|
609 | - 'desc' => EEH_Template::pretty_status( $status, FALSE, 'sentence' ), |
|
608 | + 'class' => 'ee-status-legend ee-status-legend-'.$status, |
|
609 | + 'desc' => EEH_Template::pretty_status($status, FALSE, 'sentence'), |
|
610 | 610 | 'status' => $status |
611 | 611 | ); |
612 | 612 | } |
613 | 613 | |
614 | - $content = '<div class="ee-list-table-legend-container">' . "\n"; |
|
615 | - $content .= '<h4 class="status-legend-title">' . esc_html__('Status Legend', 'event_espresso') . '</h4>' . "\n"; |
|
616 | - $content .= '<dl class="ee-list-table-legend">' . "\n\t"; |
|
617 | - foreach ( $setup_array as $item => $details ) { |
|
614 | + $content = '<div class="ee-list-table-legend-container">'."\n"; |
|
615 | + $content .= '<h4 class="status-legend-title">'.esc_html__('Status Legend', 'event_espresso').'</h4>'."\n"; |
|
616 | + $content .= '<dl class="ee-list-table-legend">'."\n\t"; |
|
617 | + foreach ($setup_array as $item => $details) { |
|
618 | 618 | $active_class = $active_status == $details['status'] ? ' class="ee-is-active-status"' : ''; |
619 | - $content .= '<dt id="ee-legend-item-tooltip-' . $item . '"' . $active_class . '>' . "\n\t\t"; |
|
620 | - $content .= '<span class="' . $details['class'] . '"></span>' . "\n\t\t"; |
|
621 | - $content .= '<span class="ee-legend-description">' . $details['desc'] . '</span>' . "\n\t"; |
|
622 | - $content .= '</dt>' . "\n"; |
|
619 | + $content .= '<dt id="ee-legend-item-tooltip-'.$item.'"'.$active_class.'>'."\n\t\t"; |
|
620 | + $content .= '<span class="'.$details['class'].'"></span>'."\n\t\t"; |
|
621 | + $content .= '<span class="ee-legend-description">'.$details['desc'].'</span>'."\n\t"; |
|
622 | + $content .= '</dt>'."\n"; |
|
623 | 623 | } |
624 | - $content .= '</dl>' . "\n"; |
|
625 | - $content .= '</div>' . "\n"; |
|
624 | + $content .= '</dl>'."\n"; |
|
625 | + $content .= '</div>'."\n"; |
|
626 | 626 | return $content; |
627 | 627 | } |
628 | 628 | |
@@ -635,8 +635,8 @@ discard block |
||
635 | 635 | * @return string |
636 | 636 | */ |
637 | 637 | public static function layout_array_as_table($data) { |
638 | - if (is_object($data) || $data instanceof __PHP_Incomplete_Class ) { |
|
639 | - $data = (array)$data; |
|
638 | + if (is_object($data) || $data instanceof __PHP_Incomplete_Class) { |
|
639 | + $data = (array) $data; |
|
640 | 640 | } |
641 | 641 | ob_start(); |
642 | 642 | if (is_array($data)) { |
@@ -649,10 +649,10 @@ discard block |
||
649 | 649 | ?> |
650 | 650 | <tr> |
651 | 651 | <td> |
652 | - <?php echo $data_key;?> |
|
652 | + <?php echo $data_key; ?> |
|
653 | 653 | </td> |
654 | 654 | <td> |
655 | - <?php echo self::layout_array_as_table($data_values);?> |
|
655 | + <?php echo self::layout_array_as_table($data_values); ?> |
|
656 | 656 | </td> |
657 | 657 | </tr> |
658 | 658 | <?php |
@@ -666,7 +666,7 @@ discard block |
||
666 | 666 | <ul> |
667 | 667 | <?php |
668 | 668 | foreach ($data as $datum) { |
669 | - echo "<li>"; echo self::layout_array_as_table($datum);echo "</li>"; |
|
669 | + echo "<li>"; echo self::layout_array_as_table($datum); echo "</li>"; |
|
670 | 670 | }?> |
671 | 671 | </ul> |
672 | 672 | <?php |
@@ -696,8 +696,8 @@ discard block |
||
696 | 696 | * |
697 | 697 | * @return string |
698 | 698 | */ |
699 | - public static function paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) { |
|
700 | - echo self::get_paging_html( $total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label ); |
|
699 | + public static function paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) { |
|
700 | + echo self::get_paging_html($total_items, $current, $per_page, $url, $show_num_field, $paged_arg_name, $items_label); |
|
701 | 701 | } |
702 | 702 | |
703 | 703 | |
@@ -721,13 +721,13 @@ discard block |
||
721 | 721 | * ) |
722 | 722 | * @return string |
723 | 723 | */ |
724 | - public static function get_paging_html( $total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array() ) { |
|
724 | + public static function get_paging_html($total_items, $current, $per_page, $url, $show_num_field = TRUE, $paged_arg_name = 'paged', $items_label = array()) { |
|
725 | 725 | $page_links = array(); |
726 | 726 | $disable_first = $disable_last = ''; |
727 | 727 | $total_items = (int) $total_items; |
728 | 728 | $per_page = (int) $per_page; |
729 | 729 | $current = (int) $current; |
730 | - $paged_arg_name = empty( $paged_arg_name ) ? 'paged' : sanitize_key( $paged_arg_name ); |
|
730 | + $paged_arg_name = empty($paged_arg_name) ? 'paged' : sanitize_key($paged_arg_name); |
|
731 | 731 | |
732 | 732 | //filter items_label |
733 | 733 | $items_label = apply_filters( |
@@ -735,68 +735,68 @@ discard block |
||
735 | 735 | $items_label |
736 | 736 | ); |
737 | 737 | |
738 | - if ( empty( $items_label ) |
|
739 | - || ! is_array( $items_label ) |
|
740 | - || ! isset( $items_label['single'] ) |
|
741 | - || ! isset( $items_label['plural'] ) ) { |
|
738 | + if (empty($items_label) |
|
739 | + || ! is_array($items_label) |
|
740 | + || ! isset($items_label['single']) |
|
741 | + || ! isset($items_label['plural'])) { |
|
742 | 742 | $items_label = array( |
743 | - 'single' => __( '1 item', 'event_espresso' ), |
|
744 | - 'plural' => __( '%s items', 'event_espresso' ) |
|
743 | + 'single' => __('1 item', 'event_espresso'), |
|
744 | + 'plural' => __('%s items', 'event_espresso') |
|
745 | 745 | ); |
746 | 746 | } else { |
747 | 747 | $items_label = array( |
748 | - 'single' => '1 ' . esc_html( $items_label['single'] ), |
|
749 | - 'plural' => '%s ' . esc_html( $items_label['plural'] ) |
|
748 | + 'single' => '1 '.esc_html($items_label['single']), |
|
749 | + 'plural' => '%s '.esc_html($items_label['plural']) |
|
750 | 750 | ); |
751 | 751 | } |
752 | 752 | |
753 | - $total_pages = ceil( $total_items / $per_page ); |
|
753 | + $total_pages = ceil($total_items / $per_page); |
|
754 | 754 | |
755 | - if ( $total_pages <= 1 ) |
|
755 | + if ($total_pages <= 1) |
|
756 | 756 | return ''; |
757 | 757 | |
758 | - $item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single']; |
|
758 | + $item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single']; |
|
759 | 759 | |
760 | - $output = '<span class="displaying-num">' . $item_label . '</span>'; |
|
760 | + $output = '<span class="displaying-num">'.$item_label.'</span>'; |
|
761 | 761 | |
762 | - if ( $current === 1 ) { |
|
762 | + if ($current === 1) { |
|
763 | 763 | $disable_first = ' disabled'; |
764 | 764 | } |
765 | - if ( $current == $total_pages ) { |
|
765 | + if ($current == $total_pages) { |
|
766 | 766 | $disable_last = ' disabled'; |
767 | 767 | } |
768 | 768 | |
769 | - $page_links[] = sprintf( "<a class='%s' title='%s' href='%s'>%s</a>", |
|
770 | - 'first-page' . $disable_first, |
|
771 | - esc_attr__( 'Go to the first page' ), |
|
772 | - esc_url( remove_query_arg( $paged_arg_name, $url ) ), |
|
769 | + $page_links[] = sprintf("<a class='%s' title='%s' href='%s'>%s</a>", |
|
770 | + 'first-page'.$disable_first, |
|
771 | + esc_attr__('Go to the first page'), |
|
772 | + esc_url(remove_query_arg($paged_arg_name, $url)), |
|
773 | 773 | '«' |
774 | 774 | ); |
775 | 775 | |
776 | 776 | $page_links[] = sprintf( |
777 | 777 | '<a class="%s" title="%s" href="%s">%s</a>', |
778 | - 'prev-page' . $disable_first, |
|
779 | - esc_attr__( 'Go to the previous page' ), |
|
780 | - esc_url( add_query_arg( $paged_arg_name, max( 1, $current-1 ), $url ) ), |
|
778 | + 'prev-page'.$disable_first, |
|
779 | + esc_attr__('Go to the previous page'), |
|
780 | + esc_url(add_query_arg($paged_arg_name, max(1, $current - 1), $url)), |
|
781 | 781 | '‹' |
782 | 782 | ); |
783 | 783 | |
784 | - if ( ! $show_num_field ) { |
|
784 | + if ( ! $show_num_field) { |
|
785 | 785 | $html_current_page = $current; |
786 | 786 | } else { |
787 | - $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />", |
|
788 | - esc_attr__( 'Current page' ), |
|
787 | + $html_current_page = sprintf("<input class='current-page' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />", |
|
788 | + esc_attr__('Current page'), |
|
789 | 789 | $current, |
790 | - strlen( $total_pages ) |
|
790 | + strlen($total_pages) |
|
791 | 791 | ); |
792 | 792 | } |
793 | 793 | |
794 | 794 | $html_total_pages = sprintf( |
795 | 795 | '<span class="total-pages">%s</span>', |
796 | - number_format_i18n( $total_pages ) |
|
796 | + number_format_i18n($total_pages) |
|
797 | 797 | ); |
798 | 798 | $page_links[] = sprintf( |
799 | - _x( '%3$s%1$s of %2$s%4$s', 'paging' ), |
|
799 | + _x('%3$s%1$s of %2$s%4$s', 'paging'), |
|
800 | 800 | $html_current_page, |
801 | 801 | $html_total_pages, |
802 | 802 | '<span class="paging-input">', |
@@ -805,29 +805,29 @@ discard block |
||
805 | 805 | |
806 | 806 | $page_links[] = sprintf( |
807 | 807 | '<a class="%s" title="%s" href="%s">%s</a>', |
808 | - 'next-page' . $disable_last, |
|
809 | - esc_attr__( 'Go to the next page' ), |
|
810 | - esc_url( add_query_arg( $paged_arg_name, min( $total_pages, $current+1 ), $url ) ), |
|
808 | + 'next-page'.$disable_last, |
|
809 | + esc_attr__('Go to the next page'), |
|
810 | + esc_url(add_query_arg($paged_arg_name, min($total_pages, $current + 1), $url)), |
|
811 | 811 | '›' |
812 | 812 | ); |
813 | 813 | |
814 | 814 | $page_links[] = sprintf( |
815 | 815 | '<a class="%s" title="%s" href="%s">%s</a>', |
816 | - 'last-page' . $disable_last, |
|
817 | - esc_attr__( 'Go to the last page' ), |
|
818 | - esc_url( add_query_arg( $paged_arg_name, $total_pages, $url ) ), |
|
816 | + 'last-page'.$disable_last, |
|
817 | + esc_attr__('Go to the last page'), |
|
818 | + esc_url(add_query_arg($paged_arg_name, $total_pages, $url)), |
|
819 | 819 | '»' |
820 | 820 | ); |
821 | 821 | |
822 | - $output .= "\n" . '<span class="pagination-links">' . join( "\n", $page_links ) . '</span>'; |
|
822 | + $output .= "\n".'<span class="pagination-links">'.join("\n", $page_links).'</span>'; |
|
823 | 823 | // set page class |
824 | - if ( $total_pages ) { |
|
824 | + if ($total_pages) { |
|
825 | 825 | $page_class = $total_pages < 2 ? ' one-page' : ''; |
826 | 826 | } else { |
827 | 827 | $page_class = ' no-pages'; |
828 | 828 | } |
829 | 829 | |
830 | - return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>'; |
|
830 | + return '<div class="tablenav"><div class="tablenav-pages'.$page_class.'">'.$output.'</div></div>'; |
|
831 | 831 | } |
832 | 832 | |
833 | 833 | |
@@ -837,8 +837,8 @@ discard block |
||
837 | 837 | * @param string $wrap_id |
838 | 838 | * @return string |
839 | 839 | */ |
840 | - public static function powered_by_event_espresso( $wrap_class = '', $wrap_id = '', array $query_args = array() ) { |
|
841 | - $admin = is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
840 | + public static function powered_by_event_espresso($wrap_class = '', $wrap_id = '', array $query_args = array()) { |
|
841 | + $admin = is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX); |
|
842 | 842 | if ( |
843 | 843 | ! $admin && |
844 | 844 | ! apply_filters( |
@@ -849,9 +849,9 @@ discard block |
||
849 | 849 | return ''; |
850 | 850 | } |
851 | 851 | $tag = $admin ? 'span' : 'div'; |
852 | - $attributes = ! empty( $wrap_id ) ? " id=\"{$wrap_id}\"" : ''; |
|
852 | + $attributes = ! empty($wrap_id) ? " id=\"{$wrap_id}\"" : ''; |
|
853 | 853 | $wrap_class = $admin ? "{$wrap_class} float-left" : $wrap_class; |
854 | - $attributes .= ! empty( $wrap_class ) |
|
854 | + $attributes .= ! empty($wrap_class) |
|
855 | 855 | ? " class=\"{$wrap_class} powered-by-event-espresso-credit\"" |
856 | 856 | : ' class="powered-by-event-espresso-credit"'; |
857 | 857 | $query_args = array_merge( |
@@ -863,9 +863,9 @@ discard block |
||
863 | 863 | ), |
864 | 864 | $query_args |
865 | 865 | ); |
866 | - $powered_by = apply_filters( 'FHEE__EEH_Template__powered_by_event_espresso_text', $admin ? 'Event Espresso - ' . EVENT_ESPRESSO_VERSION : 'Event Espresso' ); |
|
867 | - $url = add_query_arg( $query_args, 'https://eventespresso.com/' ); |
|
868 | - $url = apply_filters( 'FHEE__EEH_Template__powered_by_event_espresso__url', $url ); |
|
866 | + $powered_by = apply_filters('FHEE__EEH_Template__powered_by_event_espresso_text', $admin ? 'Event Espresso - '.EVENT_ESPRESSO_VERSION : 'Event Espresso'); |
|
867 | + $url = add_query_arg($query_args, 'https://eventespresso.com/'); |
|
868 | + $url = apply_filters('FHEE__EEH_Template__powered_by_event_espresso__url', $url); |
|
869 | 869 | return (string) apply_filters( |
870 | 870 | 'FHEE__EEH_Template__powered_by_event_espresso__html', |
871 | 871 | sprintf( |
@@ -897,7 +897,7 @@ discard block |
||
897 | 897 | //add_filter( 'FHEE__EEH_Template__format_currency__amount', 'convert_zero_to_free', 10, 2 ); |
898 | 898 | |
899 | 899 | |
900 | -if ( ! function_exists( 'espresso_pagination' ) ) { |
|
900 | +if ( ! function_exists('espresso_pagination')) { |
|
901 | 901 | /** |
902 | 902 | * espresso_pagination |
903 | 903 | * |
@@ -909,21 +909,21 @@ discard block |
||
909 | 909 | $big = 999999999; // need an unlikely integer |
910 | 910 | $pagination = paginate_links( |
911 | 911 | array( |
912 | - 'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ), |
|
912 | + 'base' => str_replace($big, '%#%', esc_url(get_pagenum_link($big))), |
|
913 | 913 | 'format' => '?paged=%#%', |
914 | - 'current' => max( 1, get_query_var( 'paged' ) ), |
|
914 | + 'current' => max(1, get_query_var('paged')), |
|
915 | 915 | 'total' => $wp_query->max_num_pages, |
916 | 916 | 'show_all' => true, |
917 | 917 | 'end_size' => 10, |
918 | 918 | 'mid_size' => 6, |
919 | 919 | 'prev_next' => true, |
920 | - 'prev_text' => __( '‹ PREV', 'event_espresso' ), |
|
921 | - 'next_text' => __( 'NEXT ›', 'event_espresso' ), |
|
920 | + 'prev_text' => __('‹ PREV', 'event_espresso'), |
|
921 | + 'next_text' => __('NEXT ›', 'event_espresso'), |
|
922 | 922 | 'type' => 'plain', |
923 | 923 | 'add_args' => false, |
924 | 924 | 'add_fragment' => '' |
925 | 925 | ) |
926 | 926 | ); |
927 | - echo ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : ''; |
|
927 | + echo ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : ''; |
|
928 | 928 | } |
929 | 929 | } |
930 | 930 | \ No newline at end of file |
@@ -186,8 +186,9 @@ discard block |
||
186 | 186 | // first use WP locate_template to check for template in the current theme folder |
187 | 187 | $template_path = locate_template( $templates ); |
188 | 188 | |
189 | - if ( $check_if_custom && !empty( $template_path ) ) |
|
190 | - return TRUE; |
|
189 | + if ( $check_if_custom && !empty( $template_path ) ) { |
|
190 | + return TRUE; |
|
191 | + } |
|
191 | 192 | |
192 | 193 | // not in the theme |
193 | 194 | if ( empty( $template_path )) { |
@@ -436,11 +437,11 @@ discard block |
||
436 | 437 | if( $mny->sign_b4 ){ |
437 | 438 | if( $amount >= 0 ){ |
438 | 439 | $amount_formatted = $mny->sign . $amount_formatted; |
439 | - }else{ |
|
440 | + } else{ |
|
440 | 441 | $amount_formatted = '-' . $mny->sign . str_replace( '-', '', $amount_formatted ); |
441 | 442 | } |
442 | 443 | |
443 | - }else{ |
|
444 | + } else{ |
|
444 | 445 | $amount_formatted = $amount_formatted . $mny->sign; |
445 | 446 | } |
446 | 447 | |
@@ -521,11 +522,13 @@ discard block |
||
521 | 522 | */ |
522 | 523 | public static function get_help_tab_link( $help_tab_id, $page = FALSE, $action = FALSE, $icon_style = FALSE, $help_text = FALSE ) { |
523 | 524 | |
524 | - if ( ! $page ) |
|
525 | - $page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page; |
|
525 | + if ( ! $page ) { |
|
526 | + $page = isset( $_REQUEST['page'] ) && ! empty( $_REQUEST['page'] ) ? sanitize_key( $_REQUEST['page'] ) : $page; |
|
527 | + } |
|
526 | 528 | |
527 | - if ( ! $action ) |
|
528 | - $action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action; |
|
529 | + if ( ! $action ) { |
|
530 | + $action = isset( $_REQUEST['action'] ) && ! empty( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : $action; |
|
531 | + } |
|
529 | 532 | |
530 | 533 | $action = empty($action) ? 'default' : $action; |
531 | 534 | |
@@ -599,8 +602,9 @@ discard block |
||
599 | 602 | * @return string html structure for status. |
600 | 603 | */ |
601 | 604 | public static function status_legend( $status_array, $active_status = '' ) { |
602 | - if ( !is_array( $status_array ) ) |
|
603 | - throw new EE_Error( esc_html__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') ); |
|
605 | + if ( !is_array( $status_array ) ) { |
|
606 | + throw new EE_Error( esc_html__('The EEH_Template::status_legend helper required the incoming status_array argument to be an array!', 'event_espresso') ); |
|
607 | + } |
|
604 | 608 | |
605 | 609 | $setup_array = array(); |
606 | 610 | foreach ( $status_array as $item => $status ) { |
@@ -660,8 +664,7 @@ discard block |
||
660 | 664 | </tbody> |
661 | 665 | </table> |
662 | 666 | <?php |
663 | - } |
|
664 | - else { |
|
667 | + } else { |
|
665 | 668 | ?> |
666 | 669 | <ul> |
667 | 670 | <?php |
@@ -671,8 +674,7 @@ discard block |
||
671 | 674 | </ul> |
672 | 675 | <?php |
673 | 676 | } |
674 | - } |
|
675 | - else { |
|
677 | + } else { |
|
676 | 678 | //simple value |
677 | 679 | echo $data; |
678 | 680 | } |
@@ -752,8 +754,9 @@ discard block |
||
752 | 754 | |
753 | 755 | $total_pages = ceil( $total_items / $per_page ); |
754 | 756 | |
755 | - if ( $total_pages <= 1 ) |
|
756 | - return ''; |
|
757 | + if ( $total_pages <= 1 ) { |
|
758 | + return ''; |
|
759 | + } |
|
757 | 760 | |
758 | 761 | $item_label = $total_items > 1 ? sprintf( $items_label['plural'], $total_items ) : $items_label['single']; |
759 | 762 |