@@ -16,71 +16,71 @@ |
||
16 | 16 | class EspressoThankYou extends EspressoShortcode |
17 | 17 | { |
18 | 18 | |
19 | - /** |
|
20 | - * @var boolean $is_thank_you_page |
|
21 | - */ |
|
22 | - private $is_thank_you_page = false; |
|
19 | + /** |
|
20 | + * @var boolean $is_thank_you_page |
|
21 | + */ |
|
22 | + private $is_thank_you_page = false; |
|
23 | 23 | |
24 | - /** |
|
25 | - * the actual shortcode tag that gets registered with WordPress |
|
26 | - * |
|
27 | - * @return string |
|
28 | - */ |
|
29 | - public function getTag() |
|
30 | - { |
|
31 | - return 'ESPRESSO_THANK_YOU'; |
|
32 | - } |
|
24 | + /** |
|
25 | + * the actual shortcode tag that gets registered with WordPress |
|
26 | + * |
|
27 | + * @return string |
|
28 | + */ |
|
29 | + public function getTag() |
|
30 | + { |
|
31 | + return 'ESPRESSO_THANK_YOU'; |
|
32 | + } |
|
33 | 33 | |
34 | 34 | |
35 | - /** |
|
36 | - * the time in seconds to cache the results of the processShortcode() method |
|
37 | - * 0 means the processShortcode() results will NOT be cached at all |
|
38 | - * |
|
39 | - * @return int |
|
40 | - */ |
|
41 | - public function cacheExpiration() |
|
42 | - { |
|
43 | - return 0; |
|
44 | - } |
|
35 | + /** |
|
36 | + * the time in seconds to cache the results of the processShortcode() method |
|
37 | + * 0 means the processShortcode() results will NOT be cached at all |
|
38 | + * |
|
39 | + * @return int |
|
40 | + */ |
|
41 | + public function cacheExpiration() |
|
42 | + { |
|
43 | + return 0; |
|
44 | + } |
|
45 | 45 | |
46 | 46 | |
47 | - /** |
|
48 | - * a place for adding any initialization code that needs to run prior to wp_header(). |
|
49 | - * this may be required for shortcodes that utilize a corresponding module, |
|
50 | - * and need to enqueue assets for that module |
|
51 | - * |
|
52 | - * @return void |
|
53 | - * @throws \EE_Error |
|
54 | - */ |
|
55 | - public function initializeShortcode() |
|
56 | - { |
|
57 | - global $wp_query; |
|
58 | - if (empty($wp_query->posts) || count($wp_query->posts) > 1) { |
|
59 | - return; |
|
60 | - } |
|
61 | - $post = reset($wp_query->posts); |
|
62 | - if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) { |
|
63 | - return; |
|
64 | - } |
|
65 | - $this->is_thank_you_page = true; |
|
66 | - \EED_Thank_You_Page::instance()->load_resources(); |
|
67 | - $this->shortcodeHasBeenInitialized(); |
|
68 | - } |
|
47 | + /** |
|
48 | + * a place for adding any initialization code that needs to run prior to wp_header(). |
|
49 | + * this may be required for shortcodes that utilize a corresponding module, |
|
50 | + * and need to enqueue assets for that module |
|
51 | + * |
|
52 | + * @return void |
|
53 | + * @throws \EE_Error |
|
54 | + */ |
|
55 | + public function initializeShortcode() |
|
56 | + { |
|
57 | + global $wp_query; |
|
58 | + if (empty($wp_query->posts) || count($wp_query->posts) > 1) { |
|
59 | + return; |
|
60 | + } |
|
61 | + $post = reset($wp_query->posts); |
|
62 | + if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) { |
|
63 | + return; |
|
64 | + } |
|
65 | + $this->is_thank_you_page = true; |
|
66 | + \EED_Thank_You_Page::instance()->load_resources(); |
|
67 | + $this->shortcodeHasBeenInitialized(); |
|
68 | + } |
|
69 | 69 | |
70 | 70 | |
71 | - /** |
|
72 | - * callback that runs when the shortcode is encountered in post content. |
|
73 | - * IMPORTANT !!! |
|
74 | - * remember that shortcode content should be RETURNED and NOT echoed out |
|
75 | - * |
|
76 | - * @param array $attributes |
|
77 | - * @return string |
|
78 | - * @throws \EE_Error |
|
79 | - */ |
|
80 | - public function processShortcode($attributes = array()) |
|
81 | - { |
|
82 | - return $this->is_thank_you_page |
|
83 | - ? \EED_Thank_You_Page::instance()->thank_you_page_results() |
|
84 | - : ''; |
|
85 | - } |
|
71 | + /** |
|
72 | + * callback that runs when the shortcode is encountered in post content. |
|
73 | + * IMPORTANT !!! |
|
74 | + * remember that shortcode content should be RETURNED and NOT echoed out |
|
75 | + * |
|
76 | + * @param array $attributes |
|
77 | + * @return string |
|
78 | + * @throws \EE_Error |
|
79 | + */ |
|
80 | + public function processShortcode($attributes = array()) |
|
81 | + { |
|
82 | + return $this->is_thank_you_page |
|
83 | + ? \EED_Thank_You_Page::instance()->thank_you_page_results() |
|
84 | + : ''; |
|
85 | + } |
|
86 | 86 | } |
@@ -59,7 +59,7 @@ |
||
59 | 59 | return; |
60 | 60 | } |
61 | 61 | $post = reset($wp_query->posts); |
62 | - if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) { |
|
62 | + if ( ! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) { |
|
63 | 63 | return; |
64 | 64 | } |
65 | 65 | $this->is_thank_you_page = true; |
@@ -14,62 +14,62 @@ |
||
14 | 14 | class Context implements ContextInterface |
15 | 15 | { |
16 | 16 | |
17 | - /** |
|
18 | - * @var string $slug |
|
19 | - */ |
|
20 | - private $slug; |
|
17 | + /** |
|
18 | + * @var string $slug |
|
19 | + */ |
|
20 | + private $slug; |
|
21 | 21 | |
22 | - /** |
|
23 | - * @var string $description |
|
24 | - */ |
|
25 | - private $description; |
|
22 | + /** |
|
23 | + * @var string $description |
|
24 | + */ |
|
25 | + private $description; |
|
26 | 26 | |
27 | 27 | |
28 | - /** |
|
29 | - * Context constructor. |
|
30 | - * |
|
31 | - * @param string $slug |
|
32 | - * @param string $description |
|
33 | - */ |
|
34 | - public function __construct($slug, $description) |
|
35 | - { |
|
36 | - $this->setSlug($slug); |
|
37 | - $this->setDescription($description); |
|
38 | - } |
|
28 | + /** |
|
29 | + * Context constructor. |
|
30 | + * |
|
31 | + * @param string $slug |
|
32 | + * @param string $description |
|
33 | + */ |
|
34 | + public function __construct($slug, $description) |
|
35 | + { |
|
36 | + $this->setSlug($slug); |
|
37 | + $this->setDescription($description); |
|
38 | + } |
|
39 | 39 | |
40 | 40 | |
41 | - /** |
|
42 | - * @return string |
|
43 | - */ |
|
44 | - public function slug() |
|
45 | - { |
|
46 | - return $this->slug; |
|
47 | - } |
|
41 | + /** |
|
42 | + * @return string |
|
43 | + */ |
|
44 | + public function slug() |
|
45 | + { |
|
46 | + return $this->slug; |
|
47 | + } |
|
48 | 48 | |
49 | 49 | |
50 | - /** |
|
51 | - * @param string $slug |
|
52 | - */ |
|
53 | - private function setSlug($slug) |
|
54 | - { |
|
55 | - $this->slug = sanitize_key($slug); |
|
56 | - } |
|
50 | + /** |
|
51 | + * @param string $slug |
|
52 | + */ |
|
53 | + private function setSlug($slug) |
|
54 | + { |
|
55 | + $this->slug = sanitize_key($slug); |
|
56 | + } |
|
57 | 57 | |
58 | 58 | |
59 | - /** |
|
60 | - * @return string |
|
61 | - */ |
|
62 | - public function description() |
|
63 | - { |
|
64 | - return $this->description; |
|
65 | - } |
|
59 | + /** |
|
60 | + * @return string |
|
61 | + */ |
|
62 | + public function description() |
|
63 | + { |
|
64 | + return $this->description; |
|
65 | + } |
|
66 | 66 | |
67 | 67 | |
68 | - /** |
|
69 | - * @param string $description |
|
70 | - */ |
|
71 | - private function setDescription($description) |
|
72 | - { |
|
73 | - $this->description = sanitize_text_field($description); |
|
74 | - } |
|
68 | + /** |
|
69 | + * @param string $description |
|
70 | + */ |
|
71 | + private function setDescription($description) |
|
72 | + { |
|
73 | + $this->description = sanitize_text_field($description); |
|
74 | + } |
|
75 | 75 | } |
@@ -12,171 +12,171 @@ |
||
12 | 12 | class DatetimeSelector |
13 | 13 | { |
14 | 14 | |
15 | - /** |
|
16 | - * @var \EE_Event $event |
|
17 | - */ |
|
18 | - protected $event; |
|
19 | - |
|
20 | - /** |
|
21 | - * @var \EE_Ticket[] $tickets |
|
22 | - */ |
|
23 | - protected $tickets; |
|
24 | - |
|
25 | - /** |
|
26 | - * @var \EE_Datetime[] $datetimes |
|
27 | - */ |
|
28 | - protected $datetimes; |
|
29 | - |
|
30 | - /** |
|
31 | - * @var \EE_Datetime[] $unique_dates |
|
32 | - */ |
|
33 | - protected $unique_dates; |
|
34 | - |
|
35 | - /** |
|
36 | - * @var \EE_Ticket_Selector_Config $template_settings |
|
37 | - */ |
|
38 | - protected $template_settings; |
|
39 | - |
|
40 | - /** |
|
41 | - * @var boolean $active |
|
42 | - */ |
|
43 | - protected $active = false; |
|
44 | - |
|
45 | - |
|
46 | - /** |
|
47 | - * DatetimeSelector constructor. |
|
48 | - * |
|
49 | - * @param \EE_Event $event |
|
50 | - * @param \EE_Ticket[] $tickets |
|
51 | - * @param \EE_Ticket_Selector_Config $template_settings |
|
52 | - * @param string $date_format |
|
53 | - * @param string $time_format |
|
54 | - * @throws \EE_Error |
|
55 | - */ |
|
56 | - public function __construct( |
|
57 | - \EE_Event $event, |
|
58 | - array $tickets, |
|
59 | - \EE_Ticket_Selector_Config $template_settings, |
|
60 | - $date_format = 'Y-m-d', |
|
61 | - $time_format = 'g:i a' |
|
62 | - ) { |
|
63 | - $this->event = $event; |
|
64 | - $this->tickets = $tickets; |
|
65 | - $this->template_settings = $template_settings; |
|
66 | - $this->datetimes = $this->getAllDatetimesForAllTicket($tickets); |
|
67 | - $this->unique_dates = $this->getUniqueDatetimeOptions($date_format, $time_format); |
|
68 | - $this->active = $this->template_settings->showDatetimeSelector($this->unique_dates); |
|
69 | - } |
|
70 | - |
|
71 | - |
|
72 | - /** |
|
73 | - * @param \EE_Ticket[] $tickets |
|
74 | - * @return array |
|
75 | - * @throws \EE_Error |
|
76 | - */ |
|
77 | - protected function getAllDatetimesForAllTicket($tickets = array()) |
|
78 | - { |
|
79 | - $datetimes = array(); |
|
80 | - foreach ($tickets as $ticket) { |
|
81 | - $datetimes = $this->getTicketDatetimes($ticket, $datetimes); |
|
82 | - } |
|
83 | - return $datetimes; |
|
84 | - } |
|
85 | - |
|
86 | - |
|
87 | - /** |
|
88 | - * @param \EE_Ticket $ticket |
|
89 | - * @param \EE_Datetime[] $datetimes |
|
90 | - * @return \EE_Datetime[] |
|
91 | - * @throws \EE_Error |
|
92 | - */ |
|
93 | - protected function getTicketDatetimes(\EE_Ticket $ticket, $datetimes = array()) |
|
94 | - { |
|
95 | - $ticket_datetimes = $ticket->datetimes( |
|
96 | - array( |
|
97 | - 'order_by' => array( |
|
98 | - 'DTT_order' => 'ASC', |
|
99 | - 'DTT_EVT_start' => 'ASC', |
|
100 | - ), |
|
101 | - 'default_where_conditions' => 'none', |
|
102 | - ) |
|
103 | - ); |
|
104 | - foreach ($ticket_datetimes as $ticket_datetime) { |
|
105 | - if (! $ticket_datetime instanceof \EE_Datetime) { |
|
106 | - continue; |
|
107 | - } |
|
108 | - $datetimes[ $ticket_datetime->ID() ] = $ticket_datetime; |
|
109 | - } |
|
110 | - return $datetimes; |
|
111 | - } |
|
112 | - |
|
113 | - |
|
114 | - /** |
|
115 | - * @param \EE_Ticket $ticket |
|
116 | - * @return string |
|
117 | - * @throws \EE_Error |
|
118 | - */ |
|
119 | - public function getTicketDatetimeClasses(\EE_Ticket $ticket) |
|
120 | - { |
|
121 | - if (! $this->active) { |
|
122 | - return ''; |
|
123 | - } |
|
124 | - $ticket_datetimes = $this->getTicketDatetimes($ticket); |
|
125 | - $classes = ''; |
|
126 | - foreach ($this->datetimes as $datetime) { |
|
127 | - if (! $datetime instanceof \EE_Datetime || ! in_array($datetime, $ticket_datetimes, true)) { |
|
128 | - continue; |
|
129 | - } |
|
130 | - $classes .= ' ee-ticket-datetimes-' . $datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_'); |
|
131 | - } |
|
132 | - return $classes; |
|
133 | - } |
|
134 | - |
|
135 | - |
|
136 | - /** |
|
137 | - * @param string $date_format |
|
138 | - * @param string $time_format |
|
139 | - * @return array |
|
140 | - * @throws \EE_Error |
|
141 | - */ |
|
142 | - public function getUniqueDatetimeOptions($date_format = 'Y-m-d', $time_format = 'g:i a') |
|
143 | - { |
|
144 | - $datetime_options = array(); |
|
145 | - foreach ($this->datetimes as $datetime) { |
|
146 | - if (! $datetime instanceof \EE_Datetime) { |
|
147 | - continue; |
|
148 | - } |
|
149 | - $datetime_options[ $datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_') ] = |
|
150 | - $datetime->date_and_time_range($date_format, $time_format, ' - '); |
|
151 | - } |
|
152 | - return $datetime_options; |
|
153 | - } |
|
154 | - |
|
155 | - |
|
156 | - /** |
|
157 | - * @return string |
|
158 | - * @throws \EE_Error |
|
159 | - */ |
|
160 | - public function getDatetimeSelector() |
|
161 | - { |
|
162 | - if (! $this->active) { |
|
163 | - return ''; |
|
164 | - } |
|
165 | - $dropdown_selector = new \EE_Checkbox_Dropdown_Selector_Input( |
|
166 | - $this->unique_dates, |
|
167 | - array( |
|
168 | - 'html_id' => 'datetime-selector-' . $this->event->ID(), |
|
169 | - 'html_name' => 'datetime_selector_' . $this->event->ID(), |
|
170 | - 'html_class' => 'datetime-selector', |
|
171 | - 'select_button_text' => '<span class="dashicons dashicons-calendar-alt"></span> ' |
|
172 | - . esc_html__('Filter by Date', 'event_espresso'), |
|
173 | - 'other_html_attributes' => ' data-tkt_slctr_evt="' . $this->event->ID() . '"', |
|
174 | - ) |
|
175 | - ); |
|
176 | - return \EEH_HTML::div( |
|
177 | - $dropdown_selector->get_html_for_input(), |
|
178 | - '', |
|
179 | - 'datetime_selector-dv' |
|
180 | - ); |
|
181 | - } |
|
15 | + /** |
|
16 | + * @var \EE_Event $event |
|
17 | + */ |
|
18 | + protected $event; |
|
19 | + |
|
20 | + /** |
|
21 | + * @var \EE_Ticket[] $tickets |
|
22 | + */ |
|
23 | + protected $tickets; |
|
24 | + |
|
25 | + /** |
|
26 | + * @var \EE_Datetime[] $datetimes |
|
27 | + */ |
|
28 | + protected $datetimes; |
|
29 | + |
|
30 | + /** |
|
31 | + * @var \EE_Datetime[] $unique_dates |
|
32 | + */ |
|
33 | + protected $unique_dates; |
|
34 | + |
|
35 | + /** |
|
36 | + * @var \EE_Ticket_Selector_Config $template_settings |
|
37 | + */ |
|
38 | + protected $template_settings; |
|
39 | + |
|
40 | + /** |
|
41 | + * @var boolean $active |
|
42 | + */ |
|
43 | + protected $active = false; |
|
44 | + |
|
45 | + |
|
46 | + /** |
|
47 | + * DatetimeSelector constructor. |
|
48 | + * |
|
49 | + * @param \EE_Event $event |
|
50 | + * @param \EE_Ticket[] $tickets |
|
51 | + * @param \EE_Ticket_Selector_Config $template_settings |
|
52 | + * @param string $date_format |
|
53 | + * @param string $time_format |
|
54 | + * @throws \EE_Error |
|
55 | + */ |
|
56 | + public function __construct( |
|
57 | + \EE_Event $event, |
|
58 | + array $tickets, |
|
59 | + \EE_Ticket_Selector_Config $template_settings, |
|
60 | + $date_format = 'Y-m-d', |
|
61 | + $time_format = 'g:i a' |
|
62 | + ) { |
|
63 | + $this->event = $event; |
|
64 | + $this->tickets = $tickets; |
|
65 | + $this->template_settings = $template_settings; |
|
66 | + $this->datetimes = $this->getAllDatetimesForAllTicket($tickets); |
|
67 | + $this->unique_dates = $this->getUniqueDatetimeOptions($date_format, $time_format); |
|
68 | + $this->active = $this->template_settings->showDatetimeSelector($this->unique_dates); |
|
69 | + } |
|
70 | + |
|
71 | + |
|
72 | + /** |
|
73 | + * @param \EE_Ticket[] $tickets |
|
74 | + * @return array |
|
75 | + * @throws \EE_Error |
|
76 | + */ |
|
77 | + protected function getAllDatetimesForAllTicket($tickets = array()) |
|
78 | + { |
|
79 | + $datetimes = array(); |
|
80 | + foreach ($tickets as $ticket) { |
|
81 | + $datetimes = $this->getTicketDatetimes($ticket, $datetimes); |
|
82 | + } |
|
83 | + return $datetimes; |
|
84 | + } |
|
85 | + |
|
86 | + |
|
87 | + /** |
|
88 | + * @param \EE_Ticket $ticket |
|
89 | + * @param \EE_Datetime[] $datetimes |
|
90 | + * @return \EE_Datetime[] |
|
91 | + * @throws \EE_Error |
|
92 | + */ |
|
93 | + protected function getTicketDatetimes(\EE_Ticket $ticket, $datetimes = array()) |
|
94 | + { |
|
95 | + $ticket_datetimes = $ticket->datetimes( |
|
96 | + array( |
|
97 | + 'order_by' => array( |
|
98 | + 'DTT_order' => 'ASC', |
|
99 | + 'DTT_EVT_start' => 'ASC', |
|
100 | + ), |
|
101 | + 'default_where_conditions' => 'none', |
|
102 | + ) |
|
103 | + ); |
|
104 | + foreach ($ticket_datetimes as $ticket_datetime) { |
|
105 | + if (! $ticket_datetime instanceof \EE_Datetime) { |
|
106 | + continue; |
|
107 | + } |
|
108 | + $datetimes[ $ticket_datetime->ID() ] = $ticket_datetime; |
|
109 | + } |
|
110 | + return $datetimes; |
|
111 | + } |
|
112 | + |
|
113 | + |
|
114 | + /** |
|
115 | + * @param \EE_Ticket $ticket |
|
116 | + * @return string |
|
117 | + * @throws \EE_Error |
|
118 | + */ |
|
119 | + public function getTicketDatetimeClasses(\EE_Ticket $ticket) |
|
120 | + { |
|
121 | + if (! $this->active) { |
|
122 | + return ''; |
|
123 | + } |
|
124 | + $ticket_datetimes = $this->getTicketDatetimes($ticket); |
|
125 | + $classes = ''; |
|
126 | + foreach ($this->datetimes as $datetime) { |
|
127 | + if (! $datetime instanceof \EE_Datetime || ! in_array($datetime, $ticket_datetimes, true)) { |
|
128 | + continue; |
|
129 | + } |
|
130 | + $classes .= ' ee-ticket-datetimes-' . $datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_'); |
|
131 | + } |
|
132 | + return $classes; |
|
133 | + } |
|
134 | + |
|
135 | + |
|
136 | + /** |
|
137 | + * @param string $date_format |
|
138 | + * @param string $time_format |
|
139 | + * @return array |
|
140 | + * @throws \EE_Error |
|
141 | + */ |
|
142 | + public function getUniqueDatetimeOptions($date_format = 'Y-m-d', $time_format = 'g:i a') |
|
143 | + { |
|
144 | + $datetime_options = array(); |
|
145 | + foreach ($this->datetimes as $datetime) { |
|
146 | + if (! $datetime instanceof \EE_Datetime) { |
|
147 | + continue; |
|
148 | + } |
|
149 | + $datetime_options[ $datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_') ] = |
|
150 | + $datetime->date_and_time_range($date_format, $time_format, ' - '); |
|
151 | + } |
|
152 | + return $datetime_options; |
|
153 | + } |
|
154 | + |
|
155 | + |
|
156 | + /** |
|
157 | + * @return string |
|
158 | + * @throws \EE_Error |
|
159 | + */ |
|
160 | + public function getDatetimeSelector() |
|
161 | + { |
|
162 | + if (! $this->active) { |
|
163 | + return ''; |
|
164 | + } |
|
165 | + $dropdown_selector = new \EE_Checkbox_Dropdown_Selector_Input( |
|
166 | + $this->unique_dates, |
|
167 | + array( |
|
168 | + 'html_id' => 'datetime-selector-' . $this->event->ID(), |
|
169 | + 'html_name' => 'datetime_selector_' . $this->event->ID(), |
|
170 | + 'html_class' => 'datetime-selector', |
|
171 | + 'select_button_text' => '<span class="dashicons dashicons-calendar-alt"></span> ' |
|
172 | + . esc_html__('Filter by Date', 'event_espresso'), |
|
173 | + 'other_html_attributes' => ' data-tkt_slctr_evt="' . $this->event->ID() . '"', |
|
174 | + ) |
|
175 | + ); |
|
176 | + return \EEH_HTML::div( |
|
177 | + $dropdown_selector->get_html_for_input(), |
|
178 | + '', |
|
179 | + 'datetime_selector-dv' |
|
180 | + ); |
|
181 | + } |
|
182 | 182 | } |
@@ -102,10 +102,10 @@ discard block |
||
102 | 102 | ) |
103 | 103 | ); |
104 | 104 | foreach ($ticket_datetimes as $ticket_datetime) { |
105 | - if (! $ticket_datetime instanceof \EE_Datetime) { |
|
105 | + if ( ! $ticket_datetime instanceof \EE_Datetime) { |
|
106 | 106 | continue; |
107 | 107 | } |
108 | - $datetimes[ $ticket_datetime->ID() ] = $ticket_datetime; |
|
108 | + $datetimes[$ticket_datetime->ID()] = $ticket_datetime; |
|
109 | 109 | } |
110 | 110 | return $datetimes; |
111 | 111 | } |
@@ -118,16 +118,16 @@ discard block |
||
118 | 118 | */ |
119 | 119 | public function getTicketDatetimeClasses(\EE_Ticket $ticket) |
120 | 120 | { |
121 | - if (! $this->active) { |
|
121 | + if ( ! $this->active) { |
|
122 | 122 | return ''; |
123 | 123 | } |
124 | 124 | $ticket_datetimes = $this->getTicketDatetimes($ticket); |
125 | 125 | $classes = ''; |
126 | 126 | foreach ($this->datetimes as $datetime) { |
127 | - if (! $datetime instanceof \EE_Datetime || ! in_array($datetime, $ticket_datetimes, true)) { |
|
127 | + if ( ! $datetime instanceof \EE_Datetime || ! in_array($datetime, $ticket_datetimes, true)) { |
|
128 | 128 | continue; |
129 | 129 | } |
130 | - $classes .= ' ee-ticket-datetimes-' . $datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_'); |
|
130 | + $classes .= ' ee-ticket-datetimes-'.$datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_'); |
|
131 | 131 | } |
132 | 132 | return $classes; |
133 | 133 | } |
@@ -143,10 +143,10 @@ discard block |
||
143 | 143 | { |
144 | 144 | $datetime_options = array(); |
145 | 145 | foreach ($this->datetimes as $datetime) { |
146 | - if (! $datetime instanceof \EE_Datetime) { |
|
146 | + if ( ! $datetime instanceof \EE_Datetime) { |
|
147 | 147 | continue; |
148 | 148 | } |
149 | - $datetime_options[ $datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_') ] = |
|
149 | + $datetime_options[$datetime->date_and_time_range('Y_m_d', 'H_i', '-', '_')] = |
|
150 | 150 | $datetime->date_and_time_range($date_format, $time_format, ' - '); |
151 | 151 | } |
152 | 152 | return $datetime_options; |
@@ -159,18 +159,18 @@ discard block |
||
159 | 159 | */ |
160 | 160 | public function getDatetimeSelector() |
161 | 161 | { |
162 | - if (! $this->active) { |
|
162 | + if ( ! $this->active) { |
|
163 | 163 | return ''; |
164 | 164 | } |
165 | 165 | $dropdown_selector = new \EE_Checkbox_Dropdown_Selector_Input( |
166 | 166 | $this->unique_dates, |
167 | 167 | array( |
168 | - 'html_id' => 'datetime-selector-' . $this->event->ID(), |
|
169 | - 'html_name' => 'datetime_selector_' . $this->event->ID(), |
|
168 | + 'html_id' => 'datetime-selector-'.$this->event->ID(), |
|
169 | + 'html_name' => 'datetime_selector_'.$this->event->ID(), |
|
170 | 170 | 'html_class' => 'datetime-selector', |
171 | 171 | 'select_button_text' => '<span class="dashicons dashicons-calendar-alt"></span> ' |
172 | 172 | . esc_html__('Filter by Date', 'event_espresso'), |
173 | - 'other_html_attributes' => ' data-tkt_slctr_evt="' . $this->event->ID() . '"', |
|
173 | + 'other_html_attributes' => ' data-tkt_slctr_evt="'.$this->event->ID().'"', |
|
174 | 174 | ) |
175 | 175 | ); |
176 | 176 | return \EEH_HTML::div( |
@@ -28,74 +28,74 @@ |
||
28 | 28 | */ |
29 | 29 | class Response |
30 | 30 | { |
31 | - /** |
|
32 | - * Succes or failure. |
|
33 | - * |
|
34 | - * @var boolean |
|
35 | - */ |
|
36 | - private $success = false; |
|
31 | + /** |
|
32 | + * Succes or failure. |
|
33 | + * |
|
34 | + * @var boolean |
|
35 | + */ |
|
36 | + private $success = false; |
|
37 | 37 | |
38 | - /** |
|
39 | - * Error code strings. |
|
40 | - * |
|
41 | - * @var array |
|
42 | - */ |
|
43 | - private $errorCodes = array(); |
|
38 | + /** |
|
39 | + * Error code strings. |
|
40 | + * |
|
41 | + * @var array |
|
42 | + */ |
|
43 | + private $errorCodes = array(); |
|
44 | 44 | |
45 | - /** |
|
46 | - * Build the response from the expected JSON returned by the service. |
|
47 | - * |
|
48 | - * @param string $json |
|
49 | - * @return \ReCaptcha\Response |
|
50 | - */ |
|
51 | - public static function fromJson($json) |
|
52 | - { |
|
53 | - $responseData = json_decode($json, true); |
|
45 | + /** |
|
46 | + * Build the response from the expected JSON returned by the service. |
|
47 | + * |
|
48 | + * @param string $json |
|
49 | + * @return \ReCaptcha\Response |
|
50 | + */ |
|
51 | + public static function fromJson($json) |
|
52 | + { |
|
53 | + $responseData = json_decode($json, true); |
|
54 | 54 | |
55 | - if (! $responseData) { |
|
56 | - return new Response(false, array('invalid-json')); |
|
57 | - } |
|
55 | + if (! $responseData) { |
|
56 | + return new Response(false, array('invalid-json')); |
|
57 | + } |
|
58 | 58 | |
59 | - if (isset($responseData['success']) && $responseData['success'] == true) { |
|
60 | - return new Response(true); |
|
61 | - } |
|
59 | + if (isset($responseData['success']) && $responseData['success'] == true) { |
|
60 | + return new Response(true); |
|
61 | + } |
|
62 | 62 | |
63 | - if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) { |
|
64 | - return new Response(false, $responseData['error-codes']); |
|
65 | - } |
|
63 | + if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) { |
|
64 | + return new Response(false, $responseData['error-codes']); |
|
65 | + } |
|
66 | 66 | |
67 | - return new Response(false); |
|
68 | - } |
|
67 | + return new Response(false); |
|
68 | + } |
|
69 | 69 | |
70 | - /** |
|
71 | - * Constructor. |
|
72 | - * |
|
73 | - * @param boolean $success |
|
74 | - * @param array $errorCodes |
|
75 | - */ |
|
76 | - public function __construct($success, array $errorCodes = array()) |
|
77 | - { |
|
78 | - $this->success = $success; |
|
79 | - $this->errorCodes = $errorCodes; |
|
80 | - } |
|
70 | + /** |
|
71 | + * Constructor. |
|
72 | + * |
|
73 | + * @param boolean $success |
|
74 | + * @param array $errorCodes |
|
75 | + */ |
|
76 | + public function __construct($success, array $errorCodes = array()) |
|
77 | + { |
|
78 | + $this->success = $success; |
|
79 | + $this->errorCodes = $errorCodes; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * Is success? |
|
84 | - * |
|
85 | - * @return boolean |
|
86 | - */ |
|
87 | - public function isSuccess() |
|
88 | - { |
|
89 | - return $this->success; |
|
90 | - } |
|
82 | + /** |
|
83 | + * Is success? |
|
84 | + * |
|
85 | + * @return boolean |
|
86 | + */ |
|
87 | + public function isSuccess() |
|
88 | + { |
|
89 | + return $this->success; |
|
90 | + } |
|
91 | 91 | |
92 | - /** |
|
93 | - * Get error codes. |
|
94 | - * |
|
95 | - * @return array |
|
96 | - */ |
|
97 | - public function getErrorCodes() |
|
98 | - { |
|
99 | - return $this->errorCodes; |
|
100 | - } |
|
92 | + /** |
|
93 | + * Get error codes. |
|
94 | + * |
|
95 | + * @return array |
|
96 | + */ |
|
97 | + public function getErrorCodes() |
|
98 | + { |
|
99 | + return $this->errorCodes; |
|
100 | + } |
|
101 | 101 | } |
@@ -52,7 +52,7 @@ |
||
52 | 52 | { |
53 | 53 | $responseData = json_decode($json, true); |
54 | 54 | |
55 | - if (! $responseData) { |
|
55 | + if ( ! $responseData) { |
|
56 | 56 | return new Response(false, array('invalid-json')); |
57 | 57 | } |
58 | 58 |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function prefixes($prefix = '') |
69 | 69 | { |
70 | - if (! empty($prefix)) { |
|
70 | + if ( ! empty($prefix)) { |
|
71 | 71 | // are there any base directories for this namespace prefix? |
72 | - return isset($this->prefixes[ $prefix ]) ? $this->prefixes[ $prefix ] : array(); |
|
72 | + return isset($this->prefixes[$prefix]) ? $this->prefixes[$prefix] : array(); |
|
73 | 73 | } |
74 | 74 | return $this->prefixes; |
75 | 75 | } |
@@ -100,18 +100,18 @@ discard block |
||
100 | 100 | public function addNamespace($prefix, $base_dir, $prepend = false) |
101 | 101 | { |
102 | 102 | // normalize namespace prefix |
103 | - $prefix = trim($prefix, Psr4Autoloader::NS) . Psr4Autoloader::NS; |
|
103 | + $prefix = trim($prefix, Psr4Autoloader::NS).Psr4Autoloader::NS; |
|
104 | 104 | // normalize the base directory with a trailing separator |
105 | 105 | $base_dir = \EEH_File::standardise_and_end_with_directory_separator($base_dir); |
106 | 106 | // initialize the namespace prefix array |
107 | - if (isset($this->prefixes[ $prefix ]) === false) { |
|
108 | - $this->prefixes[ $prefix ] = array(); |
|
107 | + if (isset($this->prefixes[$prefix]) === false) { |
|
108 | + $this->prefixes[$prefix] = array(); |
|
109 | 109 | } |
110 | 110 | // retain the base directory for the namespace prefix |
111 | 111 | if ($prepend) { |
112 | - array_unshift($this->prefixes[ $prefix ], $base_dir); |
|
112 | + array_unshift($this->prefixes[$prefix], $base_dir); |
|
113 | 113 | } else { |
114 | - $this->prefixes[ $prefix ][] = $base_dir; |
|
114 | + $this->prefixes[$prefix][] = $base_dir; |
|
115 | 115 | } |
116 | 116 | } |
117 | 117 |
@@ -45,150 +45,150 @@ |
||
45 | 45 | class Psr4Autoloader |
46 | 46 | { |
47 | 47 | |
48 | - /** |
|
49 | - * namespace separator |
|
50 | - */ |
|
51 | - const NS = '\\'; |
|
52 | - |
|
53 | - /** |
|
54 | - * An associative array where the key is a namespace prefix and the value |
|
55 | - * is an array of base directories for classes in that namespace. |
|
56 | - * |
|
57 | - * @var array |
|
58 | - */ |
|
59 | - protected $prefixes = array(); |
|
60 | - |
|
61 | - |
|
62 | - /** |
|
63 | - * returns an array of registered namespace prefixes |
|
64 | - * |
|
65 | - * @param string $prefix |
|
66 | - * @return array |
|
67 | - */ |
|
68 | - public function prefixes($prefix = '') |
|
69 | - { |
|
70 | - if (! empty($prefix)) { |
|
71 | - // are there any base directories for this namespace prefix? |
|
72 | - return isset($this->prefixes[ $prefix ]) ? $this->prefixes[ $prefix ] : array(); |
|
73 | - } |
|
74 | - return $this->prefixes; |
|
75 | - } |
|
76 | - |
|
77 | - |
|
78 | - /** |
|
79 | - * Register loader with SPL autoloader stack. |
|
80 | - * |
|
81 | - * @return void |
|
82 | - */ |
|
83 | - public function register() |
|
84 | - { |
|
85 | - spl_autoload_register(array($this, 'loadClass')); |
|
86 | - } |
|
87 | - |
|
88 | - |
|
89 | - /** |
|
90 | - * Adds a base directory for a namespace prefix. |
|
91 | - * |
|
92 | - * @param string $prefix The namespace prefix. |
|
93 | - * @param string $base_dir A base directory for class files in the |
|
94 | - * namespace. |
|
95 | - * @param bool $prepend If true, prepend the base directory to the stack |
|
96 | - * instead of appending it; this causes it to be searched first rather |
|
97 | - * than last. |
|
98 | - * @return void |
|
99 | - */ |
|
100 | - public function addNamespace($prefix, $base_dir, $prepend = false) |
|
101 | - { |
|
102 | - // normalize namespace prefix |
|
103 | - $prefix = trim($prefix, Psr4Autoloader::NS) . Psr4Autoloader::NS; |
|
104 | - // normalize the base directory with a trailing separator |
|
105 | - $base_dir = \EEH_File::standardise_and_end_with_directory_separator($base_dir); |
|
106 | - // initialize the namespace prefix array |
|
107 | - if (isset($this->prefixes[ $prefix ]) === false) { |
|
108 | - $this->prefixes[ $prefix ] = array(); |
|
109 | - } |
|
110 | - // retain the base directory for the namespace prefix |
|
111 | - if ($prepend) { |
|
112 | - array_unshift($this->prefixes[ $prefix ], $base_dir); |
|
113 | - } else { |
|
114 | - $this->prefixes[ $prefix ][] = $base_dir; |
|
115 | - } |
|
116 | - } |
|
117 | - |
|
118 | - |
|
119 | - /** |
|
120 | - * Loads the class file for a given class name. |
|
121 | - * |
|
122 | - * @param string $class The fully-qualified class name. |
|
123 | - * @return mixed The mapped file name on success, or boolean false on |
|
124 | - * failure. |
|
125 | - */ |
|
126 | - public function loadClass($class) |
|
127 | - { |
|
128 | - // the current namespace prefix |
|
129 | - $prefix = $class; |
|
130 | - // work backwards through the namespace names of the fully-qualified |
|
131 | - // class name to find a mapped file name |
|
132 | - while (false !== $pos = strrpos($prefix, Psr4Autoloader::NS)) { |
|
133 | - // retain the trailing namespace separator in the prefix |
|
134 | - $prefix = substr($class, 0, $pos + 1); |
|
135 | - // the rest is the relative class name |
|
136 | - $relative_class = substr($class, $pos + 1); |
|
137 | - // try to load a mapped file for the prefix and relative class |
|
138 | - $mapped_file = $this->loadMappedFile($prefix, $relative_class); |
|
139 | - if ($mapped_file) { |
|
140 | - return $mapped_file; |
|
141 | - } |
|
142 | - // remove the trailing namespace separator for the next iteration |
|
143 | - // of strrpos() |
|
144 | - $prefix = rtrim($prefix, Psr4Autoloader::NS); |
|
145 | - } |
|
146 | - // never found a mapped file |
|
147 | - return false; |
|
148 | - } |
|
149 | - |
|
150 | - |
|
151 | - /** |
|
152 | - * Load the mapped file for a namespace prefix and relative class. |
|
153 | - * |
|
154 | - * @param string $prefix The namespace prefix. |
|
155 | - * @param string $relative_class The relative class name. |
|
156 | - * @return mixed Boolean false if no mapped file can be loaded, or the |
|
157 | - * name of the mapped file that was loaded. |
|
158 | - */ |
|
159 | - protected function loadMappedFile($prefix, $relative_class) |
|
160 | - { |
|
161 | - // look through base directories for this namespace prefix |
|
162 | - foreach ($this->prefixes($prefix) as $base_dir) { |
|
163 | - // replace the namespace prefix with the base directory, |
|
164 | - // replace namespace separators with directory separators |
|
165 | - // in the relative class name, append with .php |
|
166 | - $file = $base_dir |
|
167 | - . str_replace(Psr4Autoloader::NS, '/', $relative_class) |
|
168 | - . '.php'; |
|
169 | - // if the mapped file exists, require it |
|
170 | - if ($this->requireFile($file)) { |
|
171 | - // yes, we're done |
|
172 | - return $file; |
|
173 | - } |
|
174 | - } |
|
175 | - // never found it |
|
176 | - return false; |
|
177 | - } |
|
178 | - |
|
179 | - |
|
180 | - /** |
|
181 | - * If a file exists, require it from the file system. |
|
182 | - * |
|
183 | - * @param string $file The file to require. |
|
184 | - * @return bool True if the file exists, false if not. |
|
185 | - */ |
|
186 | - protected function requireFile($file) |
|
187 | - { |
|
188 | - if (file_exists($file)) { |
|
189 | - require $file; |
|
190 | - return true; |
|
191 | - } |
|
192 | - return false; |
|
193 | - } |
|
48 | + /** |
|
49 | + * namespace separator |
|
50 | + */ |
|
51 | + const NS = '\\'; |
|
52 | + |
|
53 | + /** |
|
54 | + * An associative array where the key is a namespace prefix and the value |
|
55 | + * is an array of base directories for classes in that namespace. |
|
56 | + * |
|
57 | + * @var array |
|
58 | + */ |
|
59 | + protected $prefixes = array(); |
|
60 | + |
|
61 | + |
|
62 | + /** |
|
63 | + * returns an array of registered namespace prefixes |
|
64 | + * |
|
65 | + * @param string $prefix |
|
66 | + * @return array |
|
67 | + */ |
|
68 | + public function prefixes($prefix = '') |
|
69 | + { |
|
70 | + if (! empty($prefix)) { |
|
71 | + // are there any base directories for this namespace prefix? |
|
72 | + return isset($this->prefixes[ $prefix ]) ? $this->prefixes[ $prefix ] : array(); |
|
73 | + } |
|
74 | + return $this->prefixes; |
|
75 | + } |
|
76 | + |
|
77 | + |
|
78 | + /** |
|
79 | + * Register loader with SPL autoloader stack. |
|
80 | + * |
|
81 | + * @return void |
|
82 | + */ |
|
83 | + public function register() |
|
84 | + { |
|
85 | + spl_autoload_register(array($this, 'loadClass')); |
|
86 | + } |
|
87 | + |
|
88 | + |
|
89 | + /** |
|
90 | + * Adds a base directory for a namespace prefix. |
|
91 | + * |
|
92 | + * @param string $prefix The namespace prefix. |
|
93 | + * @param string $base_dir A base directory for class files in the |
|
94 | + * namespace. |
|
95 | + * @param bool $prepend If true, prepend the base directory to the stack |
|
96 | + * instead of appending it; this causes it to be searched first rather |
|
97 | + * than last. |
|
98 | + * @return void |
|
99 | + */ |
|
100 | + public function addNamespace($prefix, $base_dir, $prepend = false) |
|
101 | + { |
|
102 | + // normalize namespace prefix |
|
103 | + $prefix = trim($prefix, Psr4Autoloader::NS) . Psr4Autoloader::NS; |
|
104 | + // normalize the base directory with a trailing separator |
|
105 | + $base_dir = \EEH_File::standardise_and_end_with_directory_separator($base_dir); |
|
106 | + // initialize the namespace prefix array |
|
107 | + if (isset($this->prefixes[ $prefix ]) === false) { |
|
108 | + $this->prefixes[ $prefix ] = array(); |
|
109 | + } |
|
110 | + // retain the base directory for the namespace prefix |
|
111 | + if ($prepend) { |
|
112 | + array_unshift($this->prefixes[ $prefix ], $base_dir); |
|
113 | + } else { |
|
114 | + $this->prefixes[ $prefix ][] = $base_dir; |
|
115 | + } |
|
116 | + } |
|
117 | + |
|
118 | + |
|
119 | + /** |
|
120 | + * Loads the class file for a given class name. |
|
121 | + * |
|
122 | + * @param string $class The fully-qualified class name. |
|
123 | + * @return mixed The mapped file name on success, or boolean false on |
|
124 | + * failure. |
|
125 | + */ |
|
126 | + public function loadClass($class) |
|
127 | + { |
|
128 | + // the current namespace prefix |
|
129 | + $prefix = $class; |
|
130 | + // work backwards through the namespace names of the fully-qualified |
|
131 | + // class name to find a mapped file name |
|
132 | + while (false !== $pos = strrpos($prefix, Psr4Autoloader::NS)) { |
|
133 | + // retain the trailing namespace separator in the prefix |
|
134 | + $prefix = substr($class, 0, $pos + 1); |
|
135 | + // the rest is the relative class name |
|
136 | + $relative_class = substr($class, $pos + 1); |
|
137 | + // try to load a mapped file for the prefix and relative class |
|
138 | + $mapped_file = $this->loadMappedFile($prefix, $relative_class); |
|
139 | + if ($mapped_file) { |
|
140 | + return $mapped_file; |
|
141 | + } |
|
142 | + // remove the trailing namespace separator for the next iteration |
|
143 | + // of strrpos() |
|
144 | + $prefix = rtrim($prefix, Psr4Autoloader::NS); |
|
145 | + } |
|
146 | + // never found a mapped file |
|
147 | + return false; |
|
148 | + } |
|
149 | + |
|
150 | + |
|
151 | + /** |
|
152 | + * Load the mapped file for a namespace prefix and relative class. |
|
153 | + * |
|
154 | + * @param string $prefix The namespace prefix. |
|
155 | + * @param string $relative_class The relative class name. |
|
156 | + * @return mixed Boolean false if no mapped file can be loaded, or the |
|
157 | + * name of the mapped file that was loaded. |
|
158 | + */ |
|
159 | + protected function loadMappedFile($prefix, $relative_class) |
|
160 | + { |
|
161 | + // look through base directories for this namespace prefix |
|
162 | + foreach ($this->prefixes($prefix) as $base_dir) { |
|
163 | + // replace the namespace prefix with the base directory, |
|
164 | + // replace namespace separators with directory separators |
|
165 | + // in the relative class name, append with .php |
|
166 | + $file = $base_dir |
|
167 | + . str_replace(Psr4Autoloader::NS, '/', $relative_class) |
|
168 | + . '.php'; |
|
169 | + // if the mapped file exists, require it |
|
170 | + if ($this->requireFile($file)) { |
|
171 | + // yes, we're done |
|
172 | + return $file; |
|
173 | + } |
|
174 | + } |
|
175 | + // never found it |
|
176 | + return false; |
|
177 | + } |
|
178 | + |
|
179 | + |
|
180 | + /** |
|
181 | + * If a file exists, require it from the file system. |
|
182 | + * |
|
183 | + * @param string $file The file to require. |
|
184 | + * @return bool True if the file exists, false if not. |
|
185 | + */ |
|
186 | + protected function requireFile($file) |
|
187 | + { |
|
188 | + if (file_exists($file)) { |
|
189 | + require $file; |
|
190 | + return true; |
|
191 | + } |
|
192 | + return false; |
|
193 | + } |
|
194 | 194 | } |
@@ -13,121 +13,121 @@ |
||
13 | 13 | class PostRelatedCacheManager extends BasicCacheManager |
14 | 14 | { |
15 | 15 | |
16 | - /** |
|
17 | - * @type string |
|
18 | - */ |
|
19 | - const POST_CACHE_PREFIX = 'ee_cache_post_'; |
|
20 | - |
|
21 | - /** |
|
22 | - * wp-option option_name for tracking post related cache |
|
23 | - * |
|
24 | - * @type string |
|
25 | - */ |
|
26 | - const POST_CACHE_OPTIONS_KEY = 'ee_post_cache'; |
|
27 | - |
|
28 | - |
|
29 | - /** |
|
30 | - * PostRelatedCacheManager constructor. |
|
31 | - * |
|
32 | - * @param CacheStorageInterface $cache_storage |
|
33 | - */ |
|
34 | - public function __construct(CacheStorageInterface $cache_storage) |
|
35 | - { |
|
36 | - parent::__construct($cache_storage); |
|
37 | - add_action('save_post', array($this, 'clearPostRelatedCache')); |
|
38 | - } |
|
39 | - |
|
40 | - |
|
41 | - /** |
|
42 | - * returns a string that will be prepended to all cache identifiers |
|
43 | - * |
|
44 | - * @return string |
|
45 | - */ |
|
46 | - public function cachePrefix() |
|
47 | - { |
|
48 | - return PostRelatedCacheManager::POST_CACHE_PREFIX; |
|
49 | - } |
|
50 | - |
|
51 | - |
|
52 | - /** |
|
53 | - * @return array |
|
54 | - */ |
|
55 | - protected function getPostRelatedCache() |
|
56 | - { |
|
57 | - $post_related_cache = get_option(PostRelatedCacheManager::POST_CACHE_OPTIONS_KEY, array()); |
|
58 | - // verify that cached data was not truncated or corrupted and no longer an array |
|
59 | - if (! is_array($post_related_cache)) { |
|
60 | - // uh-oh... let's get rid of any transients using our cache prefix |
|
61 | - $this->clear(PostRelatedCacheManager::CACHE_PREFIX); |
|
62 | - // then update the post related cache tracking option |
|
63 | - $post_related_cache = array(); |
|
64 | - $this->updatePostRelatedCache($post_related_cache); |
|
65 | - } |
|
66 | - return $post_related_cache; |
|
67 | - } |
|
68 | - |
|
69 | - |
|
70 | - /** |
|
71 | - * @param array $post_related_cache |
|
72 | - */ |
|
73 | - protected function updatePostRelatedCache(array $post_related_cache = array()) |
|
74 | - { |
|
75 | - update_option(PostRelatedCacheManager::POST_CACHE_OPTIONS_KEY, $post_related_cache); |
|
76 | - } |
|
77 | - |
|
78 | - |
|
79 | - /** |
|
80 | - * If you are caching content that pertains to a Post of any type, |
|
81 | - * then it is recommended to pass the post id and cache id prefix to this method |
|
82 | - * so that it can be added to the post related cache tracking. |
|
83 | - * Then, whenever that post is updated, the cache will automatically be deleted, |
|
84 | - * which helps to ensure that outdated cache content will not be served |
|
85 | - * |
|
86 | - * @param int $post_ID [required] |
|
87 | - * @param string $id_prefix [required] Appended to all cache IDs. Can be helpful in finding specific cache types. |
|
88 | - * May also be helpful to include an additional specific identifier, |
|
89 | - * such as a post ID as part of the $id_prefix so that individual caches |
|
90 | - * can be found and/or cleared. ex: "venue-28", or "shortcode-156". |
|
91 | - * BasicCacheManager::CACHE_PREFIX will also be prepended to the cache id. |
|
92 | - */ |
|
93 | - public function clearPostRelatedCacheOnUpdate($post_ID, $id_prefix) |
|
94 | - { |
|
95 | - $post_related_cache = $this->getPostRelatedCache(); |
|
96 | - // if post is not already being tracked |
|
97 | - if (! isset($post_related_cache[ $post_ID ])) { |
|
98 | - // add array to add cache ids to |
|
99 | - $post_related_cache[ $post_ID ] = array(); |
|
100 | - } |
|
101 | - if (! in_array($id_prefix, $post_related_cache[ $post_ID ], true)) { |
|
102 | - // add cache id to be tracked |
|
103 | - $post_related_cache[ $post_ID ][] = $id_prefix; |
|
104 | - $this->updatePostRelatedCache($post_related_cache); |
|
105 | - } |
|
106 | - } |
|
107 | - |
|
108 | - |
|
109 | - /** |
|
110 | - * callback hooked into the WordPress "save_post" action |
|
111 | - * deletes any cache content associated with the post |
|
112 | - * |
|
113 | - * @param int $post_ID [required] |
|
114 | - */ |
|
115 | - public function clearPostRelatedCache($post_ID) |
|
116 | - { |
|
117 | - $post_related_cache = $this->getPostRelatedCache(); |
|
118 | - // if post is not being tracked |
|
119 | - if (! isset($post_related_cache[ $post_ID ])) { |
|
120 | - // let's clean up some of the duplicate IDs that were getting added |
|
121 | - foreach ($post_related_cache as $other_post_ID => $cache_IDs) { |
|
122 | - // remove duplicates |
|
123 | - $post_related_cache[ $other_post_ID ] = array_unique($post_related_cache[ $other_post_ID ]); |
|
124 | - } |
|
125 | - $this->updatePostRelatedCache($post_related_cache); |
|
126 | - return; |
|
127 | - } |
|
128 | - // get cache id prefixes for post, and delete their corresponding transients |
|
129 | - $this->clear($post_related_cache[ $post_ID ]); |
|
130 | - unset($post_related_cache[ $post_ID ]); |
|
131 | - $this->updatePostRelatedCache($post_related_cache); |
|
132 | - } |
|
16 | + /** |
|
17 | + * @type string |
|
18 | + */ |
|
19 | + const POST_CACHE_PREFIX = 'ee_cache_post_'; |
|
20 | + |
|
21 | + /** |
|
22 | + * wp-option option_name for tracking post related cache |
|
23 | + * |
|
24 | + * @type string |
|
25 | + */ |
|
26 | + const POST_CACHE_OPTIONS_KEY = 'ee_post_cache'; |
|
27 | + |
|
28 | + |
|
29 | + /** |
|
30 | + * PostRelatedCacheManager constructor. |
|
31 | + * |
|
32 | + * @param CacheStorageInterface $cache_storage |
|
33 | + */ |
|
34 | + public function __construct(CacheStorageInterface $cache_storage) |
|
35 | + { |
|
36 | + parent::__construct($cache_storage); |
|
37 | + add_action('save_post', array($this, 'clearPostRelatedCache')); |
|
38 | + } |
|
39 | + |
|
40 | + |
|
41 | + /** |
|
42 | + * returns a string that will be prepended to all cache identifiers |
|
43 | + * |
|
44 | + * @return string |
|
45 | + */ |
|
46 | + public function cachePrefix() |
|
47 | + { |
|
48 | + return PostRelatedCacheManager::POST_CACHE_PREFIX; |
|
49 | + } |
|
50 | + |
|
51 | + |
|
52 | + /** |
|
53 | + * @return array |
|
54 | + */ |
|
55 | + protected function getPostRelatedCache() |
|
56 | + { |
|
57 | + $post_related_cache = get_option(PostRelatedCacheManager::POST_CACHE_OPTIONS_KEY, array()); |
|
58 | + // verify that cached data was not truncated or corrupted and no longer an array |
|
59 | + if (! is_array($post_related_cache)) { |
|
60 | + // uh-oh... let's get rid of any transients using our cache prefix |
|
61 | + $this->clear(PostRelatedCacheManager::CACHE_PREFIX); |
|
62 | + // then update the post related cache tracking option |
|
63 | + $post_related_cache = array(); |
|
64 | + $this->updatePostRelatedCache($post_related_cache); |
|
65 | + } |
|
66 | + return $post_related_cache; |
|
67 | + } |
|
68 | + |
|
69 | + |
|
70 | + /** |
|
71 | + * @param array $post_related_cache |
|
72 | + */ |
|
73 | + protected function updatePostRelatedCache(array $post_related_cache = array()) |
|
74 | + { |
|
75 | + update_option(PostRelatedCacheManager::POST_CACHE_OPTIONS_KEY, $post_related_cache); |
|
76 | + } |
|
77 | + |
|
78 | + |
|
79 | + /** |
|
80 | + * If you are caching content that pertains to a Post of any type, |
|
81 | + * then it is recommended to pass the post id and cache id prefix to this method |
|
82 | + * so that it can be added to the post related cache tracking. |
|
83 | + * Then, whenever that post is updated, the cache will automatically be deleted, |
|
84 | + * which helps to ensure that outdated cache content will not be served |
|
85 | + * |
|
86 | + * @param int $post_ID [required] |
|
87 | + * @param string $id_prefix [required] Appended to all cache IDs. Can be helpful in finding specific cache types. |
|
88 | + * May also be helpful to include an additional specific identifier, |
|
89 | + * such as a post ID as part of the $id_prefix so that individual caches |
|
90 | + * can be found and/or cleared. ex: "venue-28", or "shortcode-156". |
|
91 | + * BasicCacheManager::CACHE_PREFIX will also be prepended to the cache id. |
|
92 | + */ |
|
93 | + public function clearPostRelatedCacheOnUpdate($post_ID, $id_prefix) |
|
94 | + { |
|
95 | + $post_related_cache = $this->getPostRelatedCache(); |
|
96 | + // if post is not already being tracked |
|
97 | + if (! isset($post_related_cache[ $post_ID ])) { |
|
98 | + // add array to add cache ids to |
|
99 | + $post_related_cache[ $post_ID ] = array(); |
|
100 | + } |
|
101 | + if (! in_array($id_prefix, $post_related_cache[ $post_ID ], true)) { |
|
102 | + // add cache id to be tracked |
|
103 | + $post_related_cache[ $post_ID ][] = $id_prefix; |
|
104 | + $this->updatePostRelatedCache($post_related_cache); |
|
105 | + } |
|
106 | + } |
|
107 | + |
|
108 | + |
|
109 | + /** |
|
110 | + * callback hooked into the WordPress "save_post" action |
|
111 | + * deletes any cache content associated with the post |
|
112 | + * |
|
113 | + * @param int $post_ID [required] |
|
114 | + */ |
|
115 | + public function clearPostRelatedCache($post_ID) |
|
116 | + { |
|
117 | + $post_related_cache = $this->getPostRelatedCache(); |
|
118 | + // if post is not being tracked |
|
119 | + if (! isset($post_related_cache[ $post_ID ])) { |
|
120 | + // let's clean up some of the duplicate IDs that were getting added |
|
121 | + foreach ($post_related_cache as $other_post_ID => $cache_IDs) { |
|
122 | + // remove duplicates |
|
123 | + $post_related_cache[ $other_post_ID ] = array_unique($post_related_cache[ $other_post_ID ]); |
|
124 | + } |
|
125 | + $this->updatePostRelatedCache($post_related_cache); |
|
126 | + return; |
|
127 | + } |
|
128 | + // get cache id prefixes for post, and delete their corresponding transients |
|
129 | + $this->clear($post_related_cache[ $post_ID ]); |
|
130 | + unset($post_related_cache[ $post_ID ]); |
|
131 | + $this->updatePostRelatedCache($post_related_cache); |
|
132 | + } |
|
133 | 133 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | { |
57 | 57 | $post_related_cache = get_option(PostRelatedCacheManager::POST_CACHE_OPTIONS_KEY, array()); |
58 | 58 | // verify that cached data was not truncated or corrupted and no longer an array |
59 | - if (! is_array($post_related_cache)) { |
|
59 | + if ( ! is_array($post_related_cache)) { |
|
60 | 60 | // uh-oh... let's get rid of any transients using our cache prefix |
61 | 61 | $this->clear(PostRelatedCacheManager::CACHE_PREFIX); |
62 | 62 | // then update the post related cache tracking option |
@@ -94,13 +94,13 @@ discard block |
||
94 | 94 | { |
95 | 95 | $post_related_cache = $this->getPostRelatedCache(); |
96 | 96 | // if post is not already being tracked |
97 | - if (! isset($post_related_cache[ $post_ID ])) { |
|
97 | + if ( ! isset($post_related_cache[$post_ID])) { |
|
98 | 98 | // add array to add cache ids to |
99 | - $post_related_cache[ $post_ID ] = array(); |
|
99 | + $post_related_cache[$post_ID] = array(); |
|
100 | 100 | } |
101 | - if (! in_array($id_prefix, $post_related_cache[ $post_ID ], true)) { |
|
101 | + if ( ! in_array($id_prefix, $post_related_cache[$post_ID], true)) { |
|
102 | 102 | // add cache id to be tracked |
103 | - $post_related_cache[ $post_ID ][] = $id_prefix; |
|
103 | + $post_related_cache[$post_ID][] = $id_prefix; |
|
104 | 104 | $this->updatePostRelatedCache($post_related_cache); |
105 | 105 | } |
106 | 106 | } |
@@ -116,18 +116,18 @@ discard block |
||
116 | 116 | { |
117 | 117 | $post_related_cache = $this->getPostRelatedCache(); |
118 | 118 | // if post is not being tracked |
119 | - if (! isset($post_related_cache[ $post_ID ])) { |
|
119 | + if ( ! isset($post_related_cache[$post_ID])) { |
|
120 | 120 | // let's clean up some of the duplicate IDs that were getting added |
121 | 121 | foreach ($post_related_cache as $other_post_ID => $cache_IDs) { |
122 | 122 | // remove duplicates |
123 | - $post_related_cache[ $other_post_ID ] = array_unique($post_related_cache[ $other_post_ID ]); |
|
123 | + $post_related_cache[$other_post_ID] = array_unique($post_related_cache[$other_post_ID]); |
|
124 | 124 | } |
125 | 125 | $this->updatePostRelatedCache($post_related_cache); |
126 | 126 | return; |
127 | 127 | } |
128 | 128 | // get cache id prefixes for post, and delete their corresponding transients |
129 | - $this->clear($post_related_cache[ $post_ID ]); |
|
130 | - unset($post_related_cache[ $post_ID ]); |
|
129 | + $this->clear($post_related_cache[$post_ID]); |
|
130 | + unset($post_related_cache[$post_ID]); |
|
131 | 131 | $this->updatePostRelatedCache($post_related_cache); |
132 | 132 | } |
133 | 133 | } |
@@ -15,58 +15,58 @@ |
||
15 | 15 | class AsciiOnly extends FormatterBase |
16 | 16 | { |
17 | 17 | |
18 | - /** |
|
19 | - * Removes all non Ascii characters from string |
|
20 | - * |
|
21 | - * @param string|int|float $input anything easily cast into a string |
|
22 | - * @return string |
|
23 | - */ |
|
24 | - public function format($input) |
|
25 | - { |
|
26 | - // in case an int or float etc was passed in |
|
27 | - $input = (string) $input; |
|
28 | - $input = $this->convertAscii($input); |
|
29 | - return $input; |
|
30 | - } |
|
18 | + /** |
|
19 | + * Removes all non Ascii characters from string |
|
20 | + * |
|
21 | + * @param string|int|float $input anything easily cast into a string |
|
22 | + * @return string |
|
23 | + */ |
|
24 | + public function format($input) |
|
25 | + { |
|
26 | + // in case an int or float etc was passed in |
|
27 | + $input = (string) $input; |
|
28 | + $input = $this->convertAscii($input); |
|
29 | + return $input; |
|
30 | + } |
|
31 | 31 | |
32 | 32 | |
33 | - /** |
|
34 | - * Taken from https://gist.github.com/jaywilliams/119517 |
|
35 | - * |
|
36 | - * @param $string |
|
37 | - * @return string |
|
38 | - */ |
|
39 | - protected function convertAscii($string) |
|
40 | - { |
|
41 | - // Replace Single Curly Quotes |
|
42 | - $search[] = chr(226) . chr(128) . chr(152); |
|
43 | - $replace[] = "'"; |
|
44 | - $search[] = chr(226) . chr(128) . chr(153); |
|
45 | - $replace[] = "'"; |
|
46 | - // Replace Smart Double Curly Quotes |
|
47 | - $search[] = chr(226) . chr(128) . chr(156); |
|
48 | - $replace[] = '"'; |
|
49 | - $search[] = chr(226) . chr(128) . chr(157); |
|
50 | - $replace[] = '"'; |
|
51 | - // Replace En Dash |
|
52 | - $search[] = chr(226) . chr(128) . chr(147); |
|
53 | - $replace[] = '--'; |
|
54 | - // Replace Em Dash |
|
55 | - $search[] = chr(226) . chr(128) . chr(148); |
|
56 | - $replace[] = '---'; |
|
57 | - // Replace Bullet |
|
58 | - $search[] = chr(226) . chr(128) . chr(162); |
|
59 | - $replace[] = '*'; |
|
60 | - // Replace Middle Dot |
|
61 | - $search[] = chr(194) . chr(183); |
|
62 | - $replace[] = '*'; |
|
63 | - // Replace Ellipsis with three consecutive dots |
|
64 | - $search[] = chr(226) . chr(128) . chr(166); |
|
65 | - $replace[] = '...'; |
|
66 | - // Apply Replacements |
|
67 | - $string = str_replace($search, $replace, $string); |
|
68 | - // Remove any non-ASCII Characters |
|
69 | - $string = preg_replace("/[^\x01-\x7F]/", "", $string); |
|
70 | - return $string; |
|
71 | - } |
|
33 | + /** |
|
34 | + * Taken from https://gist.github.com/jaywilliams/119517 |
|
35 | + * |
|
36 | + * @param $string |
|
37 | + * @return string |
|
38 | + */ |
|
39 | + protected function convertAscii($string) |
|
40 | + { |
|
41 | + // Replace Single Curly Quotes |
|
42 | + $search[] = chr(226) . chr(128) . chr(152); |
|
43 | + $replace[] = "'"; |
|
44 | + $search[] = chr(226) . chr(128) . chr(153); |
|
45 | + $replace[] = "'"; |
|
46 | + // Replace Smart Double Curly Quotes |
|
47 | + $search[] = chr(226) . chr(128) . chr(156); |
|
48 | + $replace[] = '"'; |
|
49 | + $search[] = chr(226) . chr(128) . chr(157); |
|
50 | + $replace[] = '"'; |
|
51 | + // Replace En Dash |
|
52 | + $search[] = chr(226) . chr(128) . chr(147); |
|
53 | + $replace[] = '--'; |
|
54 | + // Replace Em Dash |
|
55 | + $search[] = chr(226) . chr(128) . chr(148); |
|
56 | + $replace[] = '---'; |
|
57 | + // Replace Bullet |
|
58 | + $search[] = chr(226) . chr(128) . chr(162); |
|
59 | + $replace[] = '*'; |
|
60 | + // Replace Middle Dot |
|
61 | + $search[] = chr(194) . chr(183); |
|
62 | + $replace[] = '*'; |
|
63 | + // Replace Ellipsis with three consecutive dots |
|
64 | + $search[] = chr(226) . chr(128) . chr(166); |
|
65 | + $replace[] = '...'; |
|
66 | + // Apply Replacements |
|
67 | + $string = str_replace($search, $replace, $string); |
|
68 | + // Remove any non-ASCII Characters |
|
69 | + $string = preg_replace("/[^\x01-\x7F]/", "", $string); |
|
70 | + return $string; |
|
71 | + } |
|
72 | 72 | } |
@@ -39,29 +39,29 @@ |
||
39 | 39 | protected function convertAscii($string) |
40 | 40 | { |
41 | 41 | // Replace Single Curly Quotes |
42 | - $search[] = chr(226) . chr(128) . chr(152); |
|
42 | + $search[] = chr(226).chr(128).chr(152); |
|
43 | 43 | $replace[] = "'"; |
44 | - $search[] = chr(226) . chr(128) . chr(153); |
|
44 | + $search[] = chr(226).chr(128).chr(153); |
|
45 | 45 | $replace[] = "'"; |
46 | 46 | // Replace Smart Double Curly Quotes |
47 | - $search[] = chr(226) . chr(128) . chr(156); |
|
47 | + $search[] = chr(226).chr(128).chr(156); |
|
48 | 48 | $replace[] = '"'; |
49 | - $search[] = chr(226) . chr(128) . chr(157); |
|
49 | + $search[] = chr(226).chr(128).chr(157); |
|
50 | 50 | $replace[] = '"'; |
51 | 51 | // Replace En Dash |
52 | - $search[] = chr(226) . chr(128) . chr(147); |
|
52 | + $search[] = chr(226).chr(128).chr(147); |
|
53 | 53 | $replace[] = '--'; |
54 | 54 | // Replace Em Dash |
55 | - $search[] = chr(226) . chr(128) . chr(148); |
|
55 | + $search[] = chr(226).chr(128).chr(148); |
|
56 | 56 | $replace[] = '---'; |
57 | 57 | // Replace Bullet |
58 | - $search[] = chr(226) . chr(128) . chr(162); |
|
58 | + $search[] = chr(226).chr(128).chr(162); |
|
59 | 59 | $replace[] = '*'; |
60 | 60 | // Replace Middle Dot |
61 | - $search[] = chr(194) . chr(183); |
|
61 | + $search[] = chr(194).chr(183); |
|
62 | 62 | $replace[] = '*'; |
63 | 63 | // Replace Ellipsis with three consecutive dots |
64 | - $search[] = chr(226) . chr(128) . chr(166); |
|
64 | + $search[] = chr(226).chr(128).chr(166); |
|
65 | 65 | $replace[] = '...'; |
66 | 66 | // Apply Replacements |
67 | 67 | $string = str_replace($search, $replace, $string); |
@@ -17,34 +17,34 @@ |
||
17 | 17 | class Windows1252 extends FormatterBase |
18 | 18 | { |
19 | 19 | |
20 | - /** |
|
21 | - * Converts the string to windows-1252 encoding. |
|
22 | - * |
|
23 | - * @param string|int|float $input anything easily cast into a string |
|
24 | - * @return string |
|
25 | - */ |
|
26 | - public function format($input) |
|
27 | - { |
|
28 | - // in case an int or float etc was passed in |
|
29 | - $input = (string) $input; |
|
30 | - if (function_exists('iconv')) { |
|
31 | - $input = iconv('utf-8', 'cp1252//TRANSLIT', $input); |
|
32 | - } elseif (WP_DEBUG) { |
|
33 | - trigger_error( |
|
34 | - sprintf( |
|
35 | - // @codingStandardsIgnoreStart |
|
36 | - esc_html__( |
|
37 | - '%1$s could not format the string "%2$s" because the function "%3$s" does not exist. Please verify PHP is installed with this function, see %4$s', |
|
38 | - 'event_espresso' |
|
39 | - ), |
|
40 | - // @codingStandardsIgnoreEnd |
|
41 | - get_class($this), |
|
42 | - $input, |
|
43 | - 'iconv', |
|
44 | - '<a href="http://php.net/manual/en/iconv.installation.php">http://php.net/manual/en/iconv.installation.php</a>' |
|
45 | - ) |
|
46 | - ); |
|
47 | - } |
|
48 | - return $input; |
|
49 | - } |
|
20 | + /** |
|
21 | + * Converts the string to windows-1252 encoding. |
|
22 | + * |
|
23 | + * @param string|int|float $input anything easily cast into a string |
|
24 | + * @return string |
|
25 | + */ |
|
26 | + public function format($input) |
|
27 | + { |
|
28 | + // in case an int or float etc was passed in |
|
29 | + $input = (string) $input; |
|
30 | + if (function_exists('iconv')) { |
|
31 | + $input = iconv('utf-8', 'cp1252//TRANSLIT', $input); |
|
32 | + } elseif (WP_DEBUG) { |
|
33 | + trigger_error( |
|
34 | + sprintf( |
|
35 | + // @codingStandardsIgnoreStart |
|
36 | + esc_html__( |
|
37 | + '%1$s could not format the string "%2$s" because the function "%3$s" does not exist. Please verify PHP is installed with this function, see %4$s', |
|
38 | + 'event_espresso' |
|
39 | + ), |
|
40 | + // @codingStandardsIgnoreEnd |
|
41 | + get_class($this), |
|
42 | + $input, |
|
43 | + 'iconv', |
|
44 | + '<a href="http://php.net/manual/en/iconv.installation.php">http://php.net/manual/en/iconv.installation.php</a>' |
|
45 | + ) |
|
46 | + ); |
|
47 | + } |
|
48 | + return $input; |
|
49 | + } |
|
50 | 50 | } |
@@ -15,39 +15,39 @@ |
||
15 | 15 | { |
16 | 16 | |
17 | 17 | |
18 | - /** |
|
19 | - * @param string $address |
|
20 | - * @param string $address2 |
|
21 | - * @param string $city |
|
22 | - * @param string $state |
|
23 | - * @param string $zip |
|
24 | - * @param string $country |
|
25 | - * @param string $CNT_ISO |
|
26 | - * @return string |
|
27 | - */ |
|
28 | - public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO) |
|
29 | - { |
|
30 | - $address_formats = apply_filters( |
|
31 | - 'FHEE__EE_MultiLine_Address_Formatter__address_formats', |
|
32 | - array( |
|
33 | - 'CA' => "{address}%{address2}%{city}%{state}%{country}%{zip}", |
|
34 | - 'GB' => "{address}%{address2}%{city}%{state}%{zip}%{country}", |
|
35 | - 'US' => "{address}%{address2}%{city}%{state}%{zip}%{country}", |
|
36 | - 'ZZ' => "{address}%{address2}%{city}%{state}%{zip}%{country}", |
|
37 | - ) |
|
38 | - ); |
|
39 | - // if the incoming country has a set format, use that, else use the default |
|
40 | - $formatted_address = isset($address_formats[ $CNT_ISO ]) ? $address_formats[ $CNT_ISO ] |
|
41 | - : $address_formats['ZZ']; |
|
42 | - return $this->parse_formatted_address( |
|
43 | - $address, |
|
44 | - $address2, |
|
45 | - $city, |
|
46 | - $state, |
|
47 | - $zip, |
|
48 | - $country, |
|
49 | - $formatted_address, |
|
50 | - '<br />' |
|
51 | - ); |
|
52 | - } |
|
18 | + /** |
|
19 | + * @param string $address |
|
20 | + * @param string $address2 |
|
21 | + * @param string $city |
|
22 | + * @param string $state |
|
23 | + * @param string $zip |
|
24 | + * @param string $country |
|
25 | + * @param string $CNT_ISO |
|
26 | + * @return string |
|
27 | + */ |
|
28 | + public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO) |
|
29 | + { |
|
30 | + $address_formats = apply_filters( |
|
31 | + 'FHEE__EE_MultiLine_Address_Formatter__address_formats', |
|
32 | + array( |
|
33 | + 'CA' => "{address}%{address2}%{city}%{state}%{country}%{zip}", |
|
34 | + 'GB' => "{address}%{address2}%{city}%{state}%{zip}%{country}", |
|
35 | + 'US' => "{address}%{address2}%{city}%{state}%{zip}%{country}", |
|
36 | + 'ZZ' => "{address}%{address2}%{city}%{state}%{zip}%{country}", |
|
37 | + ) |
|
38 | + ); |
|
39 | + // if the incoming country has a set format, use that, else use the default |
|
40 | + $formatted_address = isset($address_formats[ $CNT_ISO ]) ? $address_formats[ $CNT_ISO ] |
|
41 | + : $address_formats['ZZ']; |
|
42 | + return $this->parse_formatted_address( |
|
43 | + $address, |
|
44 | + $address2, |
|
45 | + $city, |
|
46 | + $state, |
|
47 | + $zip, |
|
48 | + $country, |
|
49 | + $formatted_address, |
|
50 | + '<br />' |
|
51 | + ); |
|
52 | + } |
|
53 | 53 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | ) |
38 | 38 | ); |
39 | 39 | // if the incoming country has a set format, use that, else use the default |
40 | - $formatted_address = isset($address_formats[ $CNT_ISO ]) ? $address_formats[ $CNT_ISO ] |
|
40 | + $formatted_address = isset($address_formats[$CNT_ISO]) ? $address_formats[$CNT_ISO] |
|
41 | 41 | : $address_formats['ZZ']; |
42 | 42 | return $this->parse_formatted_address( |
43 | 43 | $address, |