@@ -12,9 +12,9 @@ |
||
12 | 12 | */ |
13 | 13 | interface CaffeinatedInterface |
14 | 14 | { |
15 | - /** |
|
16 | - * Used to indicate when functionality is caffeinated or not. |
|
17 | - * @return bool |
|
18 | - */ |
|
19 | - public function isCaffeinated(); |
|
15 | + /** |
|
16 | + * Used to indicate when functionality is caffeinated or not. |
|
17 | + * @return bool |
|
18 | + */ |
|
19 | + public function isCaffeinated(); |
|
20 | 20 | } |
@@ -5,8 +5,8 @@ |
||
5 | 5 | interface SessionIdentifierInterface |
6 | 6 | { |
7 | 7 | |
8 | - /** |
|
9 | - * @return string |
|
10 | - */ |
|
11 | - public function id(); |
|
8 | + /** |
|
9 | + * @return string |
|
10 | + */ |
|
11 | + public function id(); |
|
12 | 12 | } |
@@ -16,45 +16,45 @@ |
||
16 | 16 | class CancelRegistrationService |
17 | 17 | { |
18 | 18 | |
19 | - /** |
|
20 | - * @var CancelTicketLineItemService $cancel_ticket_line_item_service |
|
21 | - */ |
|
22 | - private $cancel_ticket_line_item_service; |
|
23 | - |
|
24 | - |
|
25 | - /** |
|
26 | - * Command constructor |
|
27 | - * |
|
28 | - * @param CancelTicketLineItemService $cancel_ticket_line_item_service |
|
29 | - */ |
|
30 | - public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service) |
|
31 | - { |
|
32 | - $this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service; |
|
33 | - } |
|
34 | - |
|
35 | - |
|
36 | - /** |
|
37 | - * @param \EE_Registration $registration |
|
38 | - * @param bool $cancel_ticket_line_item |
|
39 | - */ |
|
40 | - public function cancelRegistrationAndTicketLineItem(\EE_Registration $registration, $cancel_ticket_line_item = true) |
|
41 | - { |
|
42 | - // first cancel the original line item for the registration's ticket |
|
43 | - if ($cancel_ticket_line_item) { |
|
44 | - $this->cancel_ticket_line_item_service->forRegistration($registration); |
|
45 | - } |
|
46 | - $this->cancelRegistrationOnly($registration); |
|
47 | - } |
|
48 | - |
|
49 | - |
|
50 | - /** |
|
51 | - * @param \EE_Registration $registration |
|
52 | - * @throws \EE_Error |
|
53 | - */ |
|
54 | - public function cancelRegistrationOnly(\EE_Registration $registration) |
|
55 | - { |
|
56 | - // now cancel the registration itself |
|
57 | - $registration->set_status(\EEM_Registration::status_id_cancelled); |
|
58 | - $registration->save(); |
|
59 | - } |
|
19 | + /** |
|
20 | + * @var CancelTicketLineItemService $cancel_ticket_line_item_service |
|
21 | + */ |
|
22 | + private $cancel_ticket_line_item_service; |
|
23 | + |
|
24 | + |
|
25 | + /** |
|
26 | + * Command constructor |
|
27 | + * |
|
28 | + * @param CancelTicketLineItemService $cancel_ticket_line_item_service |
|
29 | + */ |
|
30 | + public function __construct(CancelTicketLineItemService $cancel_ticket_line_item_service) |
|
31 | + { |
|
32 | + $this->cancel_ticket_line_item_service = $cancel_ticket_line_item_service; |
|
33 | + } |
|
34 | + |
|
35 | + |
|
36 | + /** |
|
37 | + * @param \EE_Registration $registration |
|
38 | + * @param bool $cancel_ticket_line_item |
|
39 | + */ |
|
40 | + public function cancelRegistrationAndTicketLineItem(\EE_Registration $registration, $cancel_ticket_line_item = true) |
|
41 | + { |
|
42 | + // first cancel the original line item for the registration's ticket |
|
43 | + if ($cancel_ticket_line_item) { |
|
44 | + $this->cancel_ticket_line_item_service->forRegistration($registration); |
|
45 | + } |
|
46 | + $this->cancelRegistrationOnly($registration); |
|
47 | + } |
|
48 | + |
|
49 | + |
|
50 | + /** |
|
51 | + * @param \EE_Registration $registration |
|
52 | + * @throws \EE_Error |
|
53 | + */ |
|
54 | + public function cancelRegistrationOnly(\EE_Registration $registration) |
|
55 | + { |
|
56 | + // now cancel the registration itself |
|
57 | + $registration->set_status(\EEM_Registration::status_id_cancelled); |
|
58 | + $registration->save(); |
|
59 | + } |
|
60 | 60 | } |
@@ -15,23 +15,23 @@ |
||
15 | 15 | class UpdateRegistrationService extends DomainService |
16 | 16 | { |
17 | 17 | |
18 | - /** |
|
19 | - * @param \EE_Registration $registration |
|
20 | - * @return bool |
|
21 | - */ |
|
22 | - public function updateRegistrationAndTransaction(\EE_Registration $registration) |
|
23 | - { |
|
24 | - $transaction = $registration->transaction(); |
|
25 | - // reset transaction status back to incomplete |
|
26 | - $transaction->set_status(\EEM_Transaction::incomplete_status_code); |
|
27 | - // update transaction and all line item totals and subtotals |
|
28 | - $transaction->total_line_item()->recalculate_total_including_taxes(); |
|
29 | - // maybe update status, but don't save transaction just yet |
|
30 | - $transaction->update_status_based_on_total_paid(); |
|
31 | - /** @type \EE_Registration_Processor $registration_processor */ |
|
32 | - $registration_processor = \EE_Registry::instance()->load_class('Registration_Processor'); |
|
33 | - $registration_processor->update_registration_final_prices($transaction); |
|
34 | - $registration_processor->update_registration_status_and_trigger_notifications($registration); |
|
35 | - return true; |
|
36 | - } |
|
18 | + /** |
|
19 | + * @param \EE_Registration $registration |
|
20 | + * @return bool |
|
21 | + */ |
|
22 | + public function updateRegistrationAndTransaction(\EE_Registration $registration) |
|
23 | + { |
|
24 | + $transaction = $registration->transaction(); |
|
25 | + // reset transaction status back to incomplete |
|
26 | + $transaction->set_status(\EEM_Transaction::incomplete_status_code); |
|
27 | + // update transaction and all line item totals and subtotals |
|
28 | + $transaction->total_line_item()->recalculate_total_including_taxes(); |
|
29 | + // maybe update status, but don't save transaction just yet |
|
30 | + $transaction->update_status_based_on_total_paid(); |
|
31 | + /** @type \EE_Registration_Processor $registration_processor */ |
|
32 | + $registration_processor = \EE_Registry::instance()->load_class('Registration_Processor'); |
|
33 | + $registration_processor->update_registration_final_prices($transaction); |
|
34 | + $registration_processor->update_registration_status_and_trigger_notifications($registration); |
|
35 | + return true; |
|
36 | + } |
|
37 | 37 | } |
@@ -15,19 +15,19 @@ |
||
15 | 15 | class WordPress extends Basic |
16 | 16 | { |
17 | 17 | |
18 | - /** |
|
19 | - * @param string $email_address |
|
20 | - * @return boolean |
|
21 | - * @throws EmailValidationException |
|
22 | - */ |
|
23 | - public function validate($email_address) |
|
24 | - { |
|
25 | - parent::validate($email_address); |
|
26 | - if (! is_email($email_address)) { |
|
27 | - throw new EmailValidationException( |
|
28 | - esc_html__('The email address provided is not valid.', 'event_espresso') |
|
29 | - ); |
|
30 | - } |
|
31 | - return true; |
|
32 | - } |
|
18 | + /** |
|
19 | + * @param string $email_address |
|
20 | + * @return boolean |
|
21 | + * @throws EmailValidationException |
|
22 | + */ |
|
23 | + public function validate($email_address) |
|
24 | + { |
|
25 | + parent::validate($email_address); |
|
26 | + if (! is_email($email_address)) { |
|
27 | + throw new EmailValidationException( |
|
28 | + esc_html__('The email address provided is not valid.', 'event_espresso') |
|
29 | + ); |
|
30 | + } |
|
31 | + return true; |
|
32 | + } |
|
33 | 33 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | public function validate($email_address) |
24 | 24 | { |
25 | 25 | parent::validate($email_address); |
26 | - if (! is_email($email_address)) { |
|
26 | + if ( ! is_email($email_address)) { |
|
27 | 27 | throw new EmailValidationException( |
28 | 28 | esc_html__('The email address provided is not valid.', 'event_espresso') |
29 | 29 | ); |
@@ -15,26 +15,26 @@ |
||
15 | 15 | class International extends Basic |
16 | 16 | { |
17 | 17 | |
18 | - /** |
|
19 | - * @param string $email_address |
|
20 | - * @return bool |
|
21 | - * @throws \EventEspresso\core\domain\services\validation\email\EmailValidationException |
|
22 | - */ |
|
23 | - public function validate($email_address) |
|
24 | - { |
|
25 | - parent::validate($email_address); |
|
26 | - if (// plz see http://stackoverflow.com/a/24817336 re: the following regex |
|
27 | - ! preg_match( |
|
28 | - // @codingStandardsIgnoreStart |
|
29 | - '/^(?!\.)((?!.*\.{2})[a-zA-Z0-9\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}\.!#$%&\'*+-\/=?^_`{|}~\-\d]+)@(?!\.)([a-zA-Z0-9\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}\-\.\d]+)((\.([a-zA-Z\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}]){2,63})+)$/u', |
|
30 | - // @codingStandardsIgnoreEnd |
|
31 | - $email_address |
|
32 | - ) |
|
33 | - ) { |
|
34 | - throw new EmailValidationException( |
|
35 | - esc_html__('Email address is invalid.', 'event_espresso') |
|
36 | - ); |
|
37 | - } |
|
38 | - return true; |
|
39 | - } |
|
18 | + /** |
|
19 | + * @param string $email_address |
|
20 | + * @return bool |
|
21 | + * @throws \EventEspresso\core\domain\services\validation\email\EmailValidationException |
|
22 | + */ |
|
23 | + public function validate($email_address) |
|
24 | + { |
|
25 | + parent::validate($email_address); |
|
26 | + if (// plz see http://stackoverflow.com/a/24817336 re: the following regex |
|
27 | + ! preg_match( |
|
28 | + // @codingStandardsIgnoreStart |
|
29 | + '/^(?!\.)((?!.*\.{2})[a-zA-Z0-9\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}\.!#$%&\'*+-\/=?^_`{|}~\-\d]+)@(?!\.)([a-zA-Z0-9\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}\-\.\d]+)((\.([a-zA-Z\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}]){2,63})+)$/u', |
|
30 | + // @codingStandardsIgnoreEnd |
|
31 | + $email_address |
|
32 | + ) |
|
33 | + ) { |
|
34 | + throw new EmailValidationException( |
|
35 | + esc_html__('Email address is invalid.', 'event_espresso') |
|
36 | + ); |
|
37 | + } |
|
38 | + return true; |
|
39 | + } |
|
40 | 40 | } |
@@ -16,65 +16,65 @@ |
||
16 | 16 | class EmailValidationService implements EmailValidatorInterface |
17 | 17 | { |
18 | 18 | |
19 | - /** |
|
20 | - * @var EE_Registration_Config $registration_config |
|
21 | - */ |
|
22 | - protected $registration_config; |
|
19 | + /** |
|
20 | + * @var EE_Registration_Config $registration_config |
|
21 | + */ |
|
22 | + protected $registration_config; |
|
23 | 23 | |
24 | - /** |
|
25 | - * @var Loader $loader |
|
26 | - */ |
|
27 | - protected $loader; |
|
24 | + /** |
|
25 | + * @var Loader $loader |
|
26 | + */ |
|
27 | + protected $loader; |
|
28 | 28 | |
29 | 29 | |
30 | - /** |
|
31 | - * EmailValidationService constructor. |
|
32 | - * Accepts an \EE_Config as an argument. |
|
33 | - * |
|
34 | - * @param EE_Registration_Config $config |
|
35 | - * @param Loader $loader |
|
36 | - */ |
|
37 | - public function __construct(EE_Registration_Config $config, Loader $loader) |
|
38 | - { |
|
39 | - $this->registration_config = $config; |
|
40 | - $this->loader = $loader; |
|
41 | - } |
|
30 | + /** |
|
31 | + * EmailValidationService constructor. |
|
32 | + * Accepts an \EE_Config as an argument. |
|
33 | + * |
|
34 | + * @param EE_Registration_Config $config |
|
35 | + * @param Loader $loader |
|
36 | + */ |
|
37 | + public function __construct(EE_Registration_Config $config, Loader $loader) |
|
38 | + { |
|
39 | + $this->registration_config = $config; |
|
40 | + $this->loader = $loader; |
|
41 | + } |
|
42 | 42 | |
43 | 43 | |
44 | - /** |
|
45 | - * Validates the email address. If it's invalid, an EmailValidationException |
|
46 | - * is thrown that describes why its invalid. |
|
47 | - * |
|
48 | - * @param string $email_address |
|
49 | - * @return boolean |
|
50 | - * @throws EmailValidationException |
|
51 | - */ |
|
52 | - public function validate($email_address) |
|
53 | - { |
|
54 | - // pick the correct validator according to the config |
|
55 | - switch ($this->registration_config->email_validation_level) { |
|
56 | - case 'basic': |
|
57 | - $validator = $this->loader->getShared( |
|
58 | - 'EventEspresso\core\domain\services\validation\email\strategies\Basic' |
|
59 | - ); |
|
60 | - break; |
|
61 | - case 'i18n': |
|
62 | - $validator = $this->loader->getShared( |
|
63 | - 'EventEspresso\core\domain\services\validation\email\strategies\International' |
|
64 | - ); |
|
65 | - break; |
|
66 | - case 'i18n_dns': |
|
67 | - $validator = $this->loader->getShared( |
|
68 | - 'EventEspresso\core\domain\services\validation\email\strategies\InternationalDNS' |
|
69 | - ); |
|
70 | - break; |
|
71 | - case 'wp_default': |
|
72 | - default: |
|
73 | - $validator = $this->loader->getShared( |
|
74 | - 'EventEspresso\core\domain\services\validation\email\strategies\WordPress' |
|
75 | - ); |
|
76 | - break; |
|
77 | - } |
|
78 | - return $validator->validate($email_address); |
|
79 | - } |
|
44 | + /** |
|
45 | + * Validates the email address. If it's invalid, an EmailValidationException |
|
46 | + * is thrown that describes why its invalid. |
|
47 | + * |
|
48 | + * @param string $email_address |
|
49 | + * @return boolean |
|
50 | + * @throws EmailValidationException |
|
51 | + */ |
|
52 | + public function validate($email_address) |
|
53 | + { |
|
54 | + // pick the correct validator according to the config |
|
55 | + switch ($this->registration_config->email_validation_level) { |
|
56 | + case 'basic': |
|
57 | + $validator = $this->loader->getShared( |
|
58 | + 'EventEspresso\core\domain\services\validation\email\strategies\Basic' |
|
59 | + ); |
|
60 | + break; |
|
61 | + case 'i18n': |
|
62 | + $validator = $this->loader->getShared( |
|
63 | + 'EventEspresso\core\domain\services\validation\email\strategies\International' |
|
64 | + ); |
|
65 | + break; |
|
66 | + case 'i18n_dns': |
|
67 | + $validator = $this->loader->getShared( |
|
68 | + 'EventEspresso\core\domain\services\validation\email\strategies\InternationalDNS' |
|
69 | + ); |
|
70 | + break; |
|
71 | + case 'wp_default': |
|
72 | + default: |
|
73 | + $validator = $this->loader->getShared( |
|
74 | + 'EventEspresso\core\domain\services\validation\email\strategies\WordPress' |
|
75 | + ); |
|
76 | + break; |
|
77 | + } |
|
78 | + return $validator->validate($email_address); |
|
79 | + } |
|
80 | 80 | } |
@@ -16,184 +16,184 @@ |
||
16 | 16 | class RequestTypeContextChecker extends ContextChecker implements RequestTypeContextCheckerInterface |
17 | 17 | { |
18 | 18 | |
19 | - /** |
|
20 | - * @var RequestTypeContext $request_type |
|
21 | - */ |
|
22 | - private $request_type; |
|
23 | - |
|
24 | - |
|
25 | - /** |
|
26 | - * RequestTypeContextChecker constructor. |
|
27 | - * |
|
28 | - * @param RequestTypeContext $request_type |
|
29 | - */ |
|
30 | - public function __construct(RequestTypeContext $request_type) |
|
31 | - { |
|
32 | - $this->request_type = $request_type; |
|
33 | - parent::__construct( |
|
34 | - 'RequestTypeContextChecker', |
|
35 | - $this->request_type->validRequestTypes() |
|
36 | - ); |
|
37 | - } |
|
38 | - |
|
39 | - |
|
40 | - /** |
|
41 | - * true if the current request involves some form of activation |
|
42 | - * |
|
43 | - * @return bool |
|
44 | - */ |
|
45 | - public function isActivation() |
|
46 | - { |
|
47 | - return $this->request_type->isActivation(); |
|
48 | - } |
|
49 | - |
|
50 | - |
|
51 | - /** |
|
52 | - * @param $is_activation |
|
53 | - * @return bool |
|
54 | - */ |
|
55 | - public function setIsActivation($is_activation) |
|
56 | - { |
|
57 | - return $this->request_type->setIsActivation($is_activation); |
|
58 | - } |
|
59 | - |
|
60 | - |
|
61 | - /** |
|
62 | - * true if the current request is for the admin and is not being made via AJAX |
|
63 | - * |
|
64 | - * @return bool |
|
65 | - */ |
|
66 | - public function isAdmin() |
|
67 | - { |
|
68 | - return $this->request_type->slug() === RequestTypeContext::ADMIN; |
|
69 | - } |
|
70 | - |
|
71 | - |
|
72 | - /** |
|
73 | - * true if the current request is for the admin AND is being made via AJAX |
|
74 | - * |
|
75 | - * @return bool |
|
76 | - */ |
|
77 | - public function isAdminAjax() |
|
78 | - { |
|
79 | - return $this->request_type->slug() === RequestTypeContext::AJAX_ADMIN; |
|
80 | - } |
|
81 | - |
|
82 | - |
|
83 | - /** |
|
84 | - * true if the current request is being made via AJAX... any AJAX |
|
85 | - * |
|
86 | - * @return bool |
|
87 | - */ |
|
88 | - public function isAjax() |
|
89 | - { |
|
90 | - return $this->isEeAjax() || $this->isOtherAjax(); |
|
91 | - } |
|
92 | - |
|
93 | - |
|
94 | - /** |
|
95 | - * true if the current request is for either the EE admin or EE frontend AND is being made via AJAX |
|
96 | - * |
|
97 | - * @return bool |
|
98 | - */ |
|
99 | - public function isEeAjax() |
|
100 | - { |
|
101 | - return $this->isAdminAjax() || $this->isFrontAjax(); |
|
102 | - } |
|
103 | - |
|
104 | - |
|
105 | - /** |
|
106 | - * true if the current request is being made via AJAX but is NOT for EE related logic |
|
107 | - * |
|
108 | - * @return bool |
|
109 | - */ |
|
110 | - public function isOtherAjax() |
|
111 | - { |
|
112 | - return $this->request_type->slug() === RequestTypeContext::AJAX_OTHER; |
|
113 | - } |
|
114 | - |
|
115 | - /** |
|
116 | - * true if the current request is for the EE REST API |
|
117 | - * |
|
118 | - * @return bool |
|
119 | - */ |
|
120 | - public function isApi() |
|
121 | - { |
|
122 | - return $this->request_type->slug() === RequestTypeContext::API; |
|
123 | - } |
|
124 | - |
|
125 | - |
|
126 | - /** |
|
127 | - * true if the current request is from the command line |
|
128 | - * |
|
129 | - * @return bool |
|
130 | - */ |
|
131 | - public function isCli() |
|
132 | - { |
|
133 | - return $this->request_type->slug() === RequestTypeContext::CLI; |
|
134 | - } |
|
135 | - |
|
136 | - |
|
137 | - /** |
|
138 | - * true if the current request is for a WP_Cron |
|
139 | - * |
|
140 | - * @return bool |
|
141 | - */ |
|
142 | - public function isCron() |
|
143 | - { |
|
144 | - return $this->request_type->slug() === RequestTypeContext::CRON; |
|
145 | - } |
|
146 | - |
|
147 | - |
|
148 | - /** |
|
149 | - * true if the current request is for a feed (ie: RSS) |
|
150 | - * |
|
151 | - * @return bool |
|
152 | - */ |
|
153 | - public function isFeed() |
|
154 | - { |
|
155 | - return $this->request_type->slug() === RequestTypeContext::FEED; |
|
156 | - } |
|
157 | - |
|
158 | - |
|
159 | - /** |
|
160 | - * true if the current request is for the frontend and is not being made via AJAX |
|
161 | - * |
|
162 | - * @return bool |
|
163 | - */ |
|
164 | - public function isFrontend() |
|
165 | - { |
|
166 | - return $this->request_type->slug() === RequestTypeContext::FRONTEND; |
|
167 | - } |
|
168 | - |
|
169 | - |
|
170 | - /** |
|
171 | - * true if the current request is for the frontend AND is being made via AJAX |
|
172 | - * |
|
173 | - * @return bool |
|
174 | - */ |
|
175 | - public function isFrontAjax() |
|
176 | - { |
|
177 | - return $this->request_type->slug() === RequestTypeContext::AJAX_FRONT; |
|
178 | - } |
|
179 | - |
|
180 | - |
|
181 | - /** |
|
182 | - * true if the current request is for content that is to be displayed within an iframe |
|
183 | - * |
|
184 | - * @return bool |
|
185 | - */ |
|
186 | - public function isIframe() |
|
187 | - { |
|
188 | - return $this->request_type->slug() === RequestTypeContext::IFRAME; |
|
189 | - } |
|
190 | - |
|
191 | - |
|
192 | - /** |
|
193 | - * @return string |
|
194 | - */ |
|
195 | - public function slug() |
|
196 | - { |
|
197 | - return $this->request_type->slug(); |
|
198 | - } |
|
19 | + /** |
|
20 | + * @var RequestTypeContext $request_type |
|
21 | + */ |
|
22 | + private $request_type; |
|
23 | + |
|
24 | + |
|
25 | + /** |
|
26 | + * RequestTypeContextChecker constructor. |
|
27 | + * |
|
28 | + * @param RequestTypeContext $request_type |
|
29 | + */ |
|
30 | + public function __construct(RequestTypeContext $request_type) |
|
31 | + { |
|
32 | + $this->request_type = $request_type; |
|
33 | + parent::__construct( |
|
34 | + 'RequestTypeContextChecker', |
|
35 | + $this->request_type->validRequestTypes() |
|
36 | + ); |
|
37 | + } |
|
38 | + |
|
39 | + |
|
40 | + /** |
|
41 | + * true if the current request involves some form of activation |
|
42 | + * |
|
43 | + * @return bool |
|
44 | + */ |
|
45 | + public function isActivation() |
|
46 | + { |
|
47 | + return $this->request_type->isActivation(); |
|
48 | + } |
|
49 | + |
|
50 | + |
|
51 | + /** |
|
52 | + * @param $is_activation |
|
53 | + * @return bool |
|
54 | + */ |
|
55 | + public function setIsActivation($is_activation) |
|
56 | + { |
|
57 | + return $this->request_type->setIsActivation($is_activation); |
|
58 | + } |
|
59 | + |
|
60 | + |
|
61 | + /** |
|
62 | + * true if the current request is for the admin and is not being made via AJAX |
|
63 | + * |
|
64 | + * @return bool |
|
65 | + */ |
|
66 | + public function isAdmin() |
|
67 | + { |
|
68 | + return $this->request_type->slug() === RequestTypeContext::ADMIN; |
|
69 | + } |
|
70 | + |
|
71 | + |
|
72 | + /** |
|
73 | + * true if the current request is for the admin AND is being made via AJAX |
|
74 | + * |
|
75 | + * @return bool |
|
76 | + */ |
|
77 | + public function isAdminAjax() |
|
78 | + { |
|
79 | + return $this->request_type->slug() === RequestTypeContext::AJAX_ADMIN; |
|
80 | + } |
|
81 | + |
|
82 | + |
|
83 | + /** |
|
84 | + * true if the current request is being made via AJAX... any AJAX |
|
85 | + * |
|
86 | + * @return bool |
|
87 | + */ |
|
88 | + public function isAjax() |
|
89 | + { |
|
90 | + return $this->isEeAjax() || $this->isOtherAjax(); |
|
91 | + } |
|
92 | + |
|
93 | + |
|
94 | + /** |
|
95 | + * true if the current request is for either the EE admin or EE frontend AND is being made via AJAX |
|
96 | + * |
|
97 | + * @return bool |
|
98 | + */ |
|
99 | + public function isEeAjax() |
|
100 | + { |
|
101 | + return $this->isAdminAjax() || $this->isFrontAjax(); |
|
102 | + } |
|
103 | + |
|
104 | + |
|
105 | + /** |
|
106 | + * true if the current request is being made via AJAX but is NOT for EE related logic |
|
107 | + * |
|
108 | + * @return bool |
|
109 | + */ |
|
110 | + public function isOtherAjax() |
|
111 | + { |
|
112 | + return $this->request_type->slug() === RequestTypeContext::AJAX_OTHER; |
|
113 | + } |
|
114 | + |
|
115 | + /** |
|
116 | + * true if the current request is for the EE REST API |
|
117 | + * |
|
118 | + * @return bool |
|
119 | + */ |
|
120 | + public function isApi() |
|
121 | + { |
|
122 | + return $this->request_type->slug() === RequestTypeContext::API; |
|
123 | + } |
|
124 | + |
|
125 | + |
|
126 | + /** |
|
127 | + * true if the current request is from the command line |
|
128 | + * |
|
129 | + * @return bool |
|
130 | + */ |
|
131 | + public function isCli() |
|
132 | + { |
|
133 | + return $this->request_type->slug() === RequestTypeContext::CLI; |
|
134 | + } |
|
135 | + |
|
136 | + |
|
137 | + /** |
|
138 | + * true if the current request is for a WP_Cron |
|
139 | + * |
|
140 | + * @return bool |
|
141 | + */ |
|
142 | + public function isCron() |
|
143 | + { |
|
144 | + return $this->request_type->slug() === RequestTypeContext::CRON; |
|
145 | + } |
|
146 | + |
|
147 | + |
|
148 | + /** |
|
149 | + * true if the current request is for a feed (ie: RSS) |
|
150 | + * |
|
151 | + * @return bool |
|
152 | + */ |
|
153 | + public function isFeed() |
|
154 | + { |
|
155 | + return $this->request_type->slug() === RequestTypeContext::FEED; |
|
156 | + } |
|
157 | + |
|
158 | + |
|
159 | + /** |
|
160 | + * true if the current request is for the frontend and is not being made via AJAX |
|
161 | + * |
|
162 | + * @return bool |
|
163 | + */ |
|
164 | + public function isFrontend() |
|
165 | + { |
|
166 | + return $this->request_type->slug() === RequestTypeContext::FRONTEND; |
|
167 | + } |
|
168 | + |
|
169 | + |
|
170 | + /** |
|
171 | + * true if the current request is for the frontend AND is being made via AJAX |
|
172 | + * |
|
173 | + * @return bool |
|
174 | + */ |
|
175 | + public function isFrontAjax() |
|
176 | + { |
|
177 | + return $this->request_type->slug() === RequestTypeContext::AJAX_FRONT; |
|
178 | + } |
|
179 | + |
|
180 | + |
|
181 | + /** |
|
182 | + * true if the current request is for content that is to be displayed within an iframe |
|
183 | + * |
|
184 | + * @return bool |
|
185 | + */ |
|
186 | + public function isIframe() |
|
187 | + { |
|
188 | + return $this->request_type->slug() === RequestTypeContext::IFRAME; |
|
189 | + } |
|
190 | + |
|
191 | + |
|
192 | + /** |
|
193 | + * @return string |
|
194 | + */ |
|
195 | + public function slug() |
|
196 | + { |
|
197 | + return $this->request_type->slug(); |
|
198 | + } |
|
199 | 199 | } |
@@ -19,131 +19,131 @@ |
||
19 | 19 | class RequestTypeContextDetector |
20 | 20 | { |
21 | 21 | |
22 | - /** |
|
23 | - * @var RequestTypeContextFactory $factory |
|
24 | - */ |
|
25 | - private $factory; |
|
26 | - |
|
27 | - /** |
|
28 | - * @var RequestInterface $request |
|
29 | - */ |
|
30 | - private $request; |
|
31 | - |
|
32 | - |
|
33 | - /** |
|
34 | - * RequestTypeContextDetector constructor. |
|
35 | - * |
|
36 | - * @param RequestInterface $request |
|
37 | - * @param RequestTypeContextFactory $factory |
|
38 | - */ |
|
39 | - public function __construct(RequestInterface $request, RequestTypeContextFactory $factory) |
|
40 | - { |
|
41 | - $this->request = $request; |
|
42 | - $this->factory = $factory; |
|
43 | - } |
|
44 | - |
|
45 | - |
|
46 | - /** |
|
47 | - * @return RequestTypeContext |
|
48 | - * @throws InvalidArgumentException |
|
49 | - */ |
|
50 | - public function detectRequestTypeContext() |
|
51 | - { |
|
52 | - // Detect EE REST API |
|
53 | - if ($this->isEspressoRestApiRequest()) { |
|
54 | - return $this->factory->create(RequestTypeContext::API); |
|
55 | - } |
|
56 | - // Detect AJAX |
|
57 | - if (defined('DOING_AJAX') && DOING_AJAX) { |
|
58 | - if (filter_var($this->request->getRequestParam('ee_front_ajax'), FILTER_VALIDATE_BOOLEAN)) { |
|
59 | - return $this->factory->create(RequestTypeContext::AJAX_FRONT); |
|
60 | - } |
|
61 | - if (filter_var($this->request->getRequestParam('ee_admin_ajax'), FILTER_VALIDATE_BOOLEAN)) { |
|
62 | - return $this->factory->create(RequestTypeContext::AJAX_ADMIN); |
|
63 | - } |
|
64 | - return $this->factory->create(RequestTypeContext::AJAX_OTHER); |
|
65 | - } |
|
66 | - // Detect WP_Cron |
|
67 | - if ($this->isCronRequest()) { |
|
68 | - return $this->factory->create(RequestTypeContext::CRON); |
|
69 | - } |
|
70 | - // Detect command line requests |
|
71 | - if (defined('WP_CLI') && WP_CLI) { |
|
72 | - return $this->factory->create(RequestTypeContext::CLI); |
|
73 | - } |
|
74 | - // detect WordPress admin (ie: "Dashboard") |
|
75 | - if (is_admin()) { |
|
76 | - return $this->factory->create(RequestTypeContext::ADMIN); |
|
77 | - } |
|
78 | - // Detect iFrames |
|
79 | - if ($this->isIframeRoute()) { |
|
80 | - return $this->factory->create(RequestTypeContext::IFRAME); |
|
81 | - } |
|
82 | - // Detect Feeds |
|
83 | - if ($this->isFeedRequest()) { |
|
84 | - return $this->factory->create(RequestTypeContext::FEED); |
|
85 | - } |
|
86 | - // and by process of elimination... |
|
87 | - return $this->factory->create(RequestTypeContext::FRONTEND); |
|
88 | - } |
|
89 | - |
|
90 | - |
|
91 | - /** |
|
92 | - * @return bool |
|
93 | - */ |
|
94 | - private function isEspressoRestApiRequest() |
|
95 | - { |
|
96 | - $ee_rest_url_prefix = RecommendedVersions::compareWordPressVersion('4.4.0') |
|
97 | - ? trim(rest_get_url_prefix(), '/') |
|
98 | - : 'wp-json'; |
|
99 | - $ee_rest_url_prefix .= '/' . Domain::API_NAMESPACE; |
|
100 | - return $this->uriPathMatches($ee_rest_url_prefix); |
|
101 | - } |
|
102 | - |
|
103 | - |
|
104 | - /** |
|
105 | - * @return bool |
|
106 | - */ |
|
107 | - private function isCronRequest() |
|
108 | - { |
|
109 | - return $this->uriPathMatches('wp-cron.php'); |
|
110 | - } |
|
111 | - |
|
112 | - |
|
113 | - /** |
|
114 | - * @return bool |
|
115 | - */ |
|
116 | - private function isFeedRequest() |
|
117 | - { |
|
118 | - return $this->uriPathMatches('feed'); |
|
119 | - } |
|
120 | - |
|
121 | - |
|
122 | - /** |
|
123 | - * @param string $component |
|
124 | - * @return bool |
|
125 | - */ |
|
126 | - private function uriPathMatches($component) |
|
127 | - { |
|
128 | - $request_uri = $this->request->requestUri(); |
|
129 | - $parts = explode('?', $request_uri); |
|
130 | - $path = trim(reset($parts), '/'); |
|
131 | - return strpos($path, $component) === 0; |
|
132 | - } |
|
133 | - |
|
134 | - |
|
135 | - /** |
|
136 | - * @return bool |
|
137 | - */ |
|
138 | - private function isIframeRoute() |
|
139 | - { |
|
140 | - $is_iframe_route = apply_filters( |
|
141 | - 'FHEE__EventEspresso_core_domain_services_contexts_RequestTypeContextDetector__isIframeRoute', |
|
142 | - $this->request->getRequestParam('event_list', '') === 'iframe' |
|
143 | - || $this->request->getRequestParam('ticket_selector', '') === 'iframe' |
|
144 | - || $this->request->getRequestParam('calendar', '') === 'iframe', |
|
145 | - $this |
|
146 | - ); |
|
147 | - return filter_var($is_iframe_route, FILTER_VALIDATE_BOOLEAN); |
|
148 | - } |
|
22 | + /** |
|
23 | + * @var RequestTypeContextFactory $factory |
|
24 | + */ |
|
25 | + private $factory; |
|
26 | + |
|
27 | + /** |
|
28 | + * @var RequestInterface $request |
|
29 | + */ |
|
30 | + private $request; |
|
31 | + |
|
32 | + |
|
33 | + /** |
|
34 | + * RequestTypeContextDetector constructor. |
|
35 | + * |
|
36 | + * @param RequestInterface $request |
|
37 | + * @param RequestTypeContextFactory $factory |
|
38 | + */ |
|
39 | + public function __construct(RequestInterface $request, RequestTypeContextFactory $factory) |
|
40 | + { |
|
41 | + $this->request = $request; |
|
42 | + $this->factory = $factory; |
|
43 | + } |
|
44 | + |
|
45 | + |
|
46 | + /** |
|
47 | + * @return RequestTypeContext |
|
48 | + * @throws InvalidArgumentException |
|
49 | + */ |
|
50 | + public function detectRequestTypeContext() |
|
51 | + { |
|
52 | + // Detect EE REST API |
|
53 | + if ($this->isEspressoRestApiRequest()) { |
|
54 | + return $this->factory->create(RequestTypeContext::API); |
|
55 | + } |
|
56 | + // Detect AJAX |
|
57 | + if (defined('DOING_AJAX') && DOING_AJAX) { |
|
58 | + if (filter_var($this->request->getRequestParam('ee_front_ajax'), FILTER_VALIDATE_BOOLEAN)) { |
|
59 | + return $this->factory->create(RequestTypeContext::AJAX_FRONT); |
|
60 | + } |
|
61 | + if (filter_var($this->request->getRequestParam('ee_admin_ajax'), FILTER_VALIDATE_BOOLEAN)) { |
|
62 | + return $this->factory->create(RequestTypeContext::AJAX_ADMIN); |
|
63 | + } |
|
64 | + return $this->factory->create(RequestTypeContext::AJAX_OTHER); |
|
65 | + } |
|
66 | + // Detect WP_Cron |
|
67 | + if ($this->isCronRequest()) { |
|
68 | + return $this->factory->create(RequestTypeContext::CRON); |
|
69 | + } |
|
70 | + // Detect command line requests |
|
71 | + if (defined('WP_CLI') && WP_CLI) { |
|
72 | + return $this->factory->create(RequestTypeContext::CLI); |
|
73 | + } |
|
74 | + // detect WordPress admin (ie: "Dashboard") |
|
75 | + if (is_admin()) { |
|
76 | + return $this->factory->create(RequestTypeContext::ADMIN); |
|
77 | + } |
|
78 | + // Detect iFrames |
|
79 | + if ($this->isIframeRoute()) { |
|
80 | + return $this->factory->create(RequestTypeContext::IFRAME); |
|
81 | + } |
|
82 | + // Detect Feeds |
|
83 | + if ($this->isFeedRequest()) { |
|
84 | + return $this->factory->create(RequestTypeContext::FEED); |
|
85 | + } |
|
86 | + // and by process of elimination... |
|
87 | + return $this->factory->create(RequestTypeContext::FRONTEND); |
|
88 | + } |
|
89 | + |
|
90 | + |
|
91 | + /** |
|
92 | + * @return bool |
|
93 | + */ |
|
94 | + private function isEspressoRestApiRequest() |
|
95 | + { |
|
96 | + $ee_rest_url_prefix = RecommendedVersions::compareWordPressVersion('4.4.0') |
|
97 | + ? trim(rest_get_url_prefix(), '/') |
|
98 | + : 'wp-json'; |
|
99 | + $ee_rest_url_prefix .= '/' . Domain::API_NAMESPACE; |
|
100 | + return $this->uriPathMatches($ee_rest_url_prefix); |
|
101 | + } |
|
102 | + |
|
103 | + |
|
104 | + /** |
|
105 | + * @return bool |
|
106 | + */ |
|
107 | + private function isCronRequest() |
|
108 | + { |
|
109 | + return $this->uriPathMatches('wp-cron.php'); |
|
110 | + } |
|
111 | + |
|
112 | + |
|
113 | + /** |
|
114 | + * @return bool |
|
115 | + */ |
|
116 | + private function isFeedRequest() |
|
117 | + { |
|
118 | + return $this->uriPathMatches('feed'); |
|
119 | + } |
|
120 | + |
|
121 | + |
|
122 | + /** |
|
123 | + * @param string $component |
|
124 | + * @return bool |
|
125 | + */ |
|
126 | + private function uriPathMatches($component) |
|
127 | + { |
|
128 | + $request_uri = $this->request->requestUri(); |
|
129 | + $parts = explode('?', $request_uri); |
|
130 | + $path = trim(reset($parts), '/'); |
|
131 | + return strpos($path, $component) === 0; |
|
132 | + } |
|
133 | + |
|
134 | + |
|
135 | + /** |
|
136 | + * @return bool |
|
137 | + */ |
|
138 | + private function isIframeRoute() |
|
139 | + { |
|
140 | + $is_iframe_route = apply_filters( |
|
141 | + 'FHEE__EventEspresso_core_domain_services_contexts_RequestTypeContextDetector__isIframeRoute', |
|
142 | + $this->request->getRequestParam('event_list', '') === 'iframe' |
|
143 | + || $this->request->getRequestParam('ticket_selector', '') === 'iframe' |
|
144 | + || $this->request->getRequestParam('calendar', '') === 'iframe', |
|
145 | + $this |
|
146 | + ); |
|
147 | + return filter_var($is_iframe_route, FILTER_VALIDATE_BOOLEAN); |
|
148 | + } |
|
149 | 149 | } |
@@ -96,7 +96,7 @@ |
||
96 | 96 | $ee_rest_url_prefix = RecommendedVersions::compareWordPressVersion('4.4.0') |
97 | 97 | ? trim(rest_get_url_prefix(), '/') |
98 | 98 | : 'wp-json'; |
99 | - $ee_rest_url_prefix .= '/' . Domain::API_NAMESPACE; |
|
99 | + $ee_rest_url_prefix .= '/'.Domain::API_NAMESPACE; |
|
100 | 100 | return $this->uriPathMatches($ee_rest_url_prefix); |
101 | 101 | } |
102 | 102 |