@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
3 | - exit( 'No direct script access allowed' ); |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
3 | + exit('No direct script access allowed'); |
|
4 | 4 | } |
5 | 5 | |
6 | 6 | /** |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * @author Mike Nelson |
15 | 15 | * |
16 | 16 | */ |
17 | -class EE_Restriction_Generator_Meta extends EE_Restriction_Generator_Base{ |
|
17 | +class EE_Restriction_Generator_Meta extends EE_Restriction_Generator_Base { |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @param string $key_field_name |
34 | 34 | * @param string $value_field_name |
35 | 35 | */ |
36 | - public function __construct( $key_field_name, $value_field_name ) { |
|
36 | + public function __construct($key_field_name, $value_field_name) { |
|
37 | 37 | $this->_key_field_name = $key_field_name; |
38 | 38 | $this->_value_field_name = $value_field_name; |
39 | 39 | } |
@@ -45,21 +45,21 @@ discard block |
||
45 | 45 | * @throws EE_Error |
46 | 46 | */ |
47 | 47 | protected function _generate_restrictions() { |
48 | - $whitelisted_meta_keys = apply_filters( 'FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array() ); |
|
49 | - $blacklisted_meta_keys = apply_filters( 'FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array() ); |
|
48 | + $whitelisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__whitelisted_meta_keys', array()); |
|
49 | + $blacklisted_meta_keys = apply_filters('FHEE__EE_Restriction_Generator_Meta___generate_restrictions__blacklisted_meta_keys', array()); |
|
50 | 50 | $conditions = array( |
51 | - $this->_key_field_name => array( 'NOT_LIKE', "\\\\_%" ),//each slash is escaped because we are using double quotes, and |
|
51 | + $this->_key_field_name => array('NOT_LIKE', "\\\\_%"), //each slash is escaped because we are using double quotes, and |
|
52 | 52 | //stripslashes will be called on this because the models assume this is from user input |
53 | - $this->_value_field_name => array( 'NOT_REGEXP', '^[aOs]:[\d]:.*$') |
|
53 | + $this->_value_field_name => array('NOT_REGEXP', '^[aOs]:[\d]:.*$') |
|
54 | 54 | ); |
55 | - if( ! empty( $blacklisted_meta_keys ) ) { |
|
56 | - $conditions[ $this->_key_field_name . '*blacklisted' ] = array( 'NOT_IN', $blacklisted_meta_keys ); |
|
55 | + if ( ! empty($blacklisted_meta_keys)) { |
|
56 | + $conditions[$this->_key_field_name.'*blacklisted'] = array('NOT_IN', $blacklisted_meta_keys); |
|
57 | 57 | } |
58 | - if( ! empty( $whitelisted_meta_keys ) ) { |
|
58 | + if ( ! empty($whitelisted_meta_keys)) { |
|
59 | 59 | $conditions = array( |
60 | 60 | 'OR*whitelisted-or-normal' => array( |
61 | 61 | 'AND' => $conditions, |
62 | - $this->_key_field_name . '*whitelisted' => array( 'IN', $whitelisted_meta_keys ) |
|
62 | + $this->_key_field_name.'*whitelisted' => array('IN', $whitelisted_meta_keys) |
|
63 | 63 | ) |
64 | 64 | ); |
65 | 65 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | //only allow access to non-protected metas if they're an admin |
68 | 68 | EE_Restriction_Generator_Base::get_default_restrictions_cap() => new EE_Return_None_Where_Conditions(), |
69 | 69 | //don't allow access to protected metas to anyone. If they want that, don't apply caps to the query |
70 | - 'apply-to-all-queries-using-caps' => new EE_Default_Where_Conditions( $conditions ), |
|
70 | + 'apply-to-all-queries-using-caps' => new EE_Default_Where_Conditions($conditions), |
|
71 | 71 | ); |
72 | 72 | } |
73 | 73 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
3 | - exit( 'No direct script access allowed' ); |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
3 | + exit('No direct script access allowed'); |
|
4 | 4 | } |
5 | 5 | /** |
6 | 6 | * Class EE_Line_Item_Filter_Collection |
@@ -7,6 +7,10 @@ discard block |
||
7 | 7 | |
8 | 8 | protected $_post_type; |
9 | 9 | protected $_meta_field; |
10 | + |
|
11 | + /** |
|
12 | + * @param string $post_type |
|
13 | + */ |
|
10 | 14 | function __construct($post_type, $meta_field_to_chk = ''){ |
11 | 15 | $this->_post_type = $post_type; |
12 | 16 | $this->_meta_field = $meta_field_to_chk; |
@@ -27,7 +31,6 @@ discard block |
||
27 | 31 | } |
28 | 32 | /** |
29 | 33 | * Gets the where default where conditions for a custom post type model |
30 | - * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment" |
|
31 | 34 | * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions) |
32 | 35 | */ |
33 | 36 | protected function _get_default_where_conditions() { |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
3 | - exit( 'No direct script access allowed' ); |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
3 | + exit('No direct script access allowed'); |
|
4 | 4 | } |
5 | 5 | /** |
6 | 6 | * |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | * @since 4.8.29.rc.010 |
16 | 16 | * |
17 | 17 | */ |
18 | -class EE_CPT_Minimum_Where_Conditions extends EE_Default_Where_Conditions{ |
|
18 | +class EE_CPT_Minimum_Where_Conditions extends EE_Default_Where_Conditions { |
|
19 | 19 | |
20 | 20 | protected $_post_type; |
21 | 21 | protected $_meta_field; |
22 | - function __construct($post_type, $meta_field_to_chk = ''){ |
|
22 | + function __construct($post_type, $meta_field_to_chk = '') { |
|
23 | 23 | $this->_post_type = $post_type; |
24 | 24 | $this->_meta_field = $meta_field_to_chk; |
25 | 25 | } |
@@ -29,10 +29,10 @@ discard block |
||
29 | 29 | * @param string $column column name |
30 | 30 | * @return EE_Model_Field_Base |
31 | 31 | */ |
32 | - protected function _get_field_on_column($column){ |
|
32 | + protected function _get_field_on_column($column) { |
|
33 | 33 | $all_fields = $this->_model->field_settings(true); |
34 | - foreach($all_fields as $field_name => $field_obj){ |
|
35 | - if($column == $field_obj->get_table_column()){ |
|
34 | + foreach ($all_fields as $field_name => $field_obj) { |
|
35 | + if ($column == $field_obj->get_table_column()) { |
|
36 | 36 | return $field_obj; |
37 | 37 | } |
38 | 38 | } |
@@ -5,7 +5,7 @@ |
||
5 | 5 | /** |
6 | 6 | * |
7 | 7 | * Class EE_CPT_Minimum_Where_Conditions |
8 | - * |
|
8 | + * |
|
9 | 9 | * Strategy specifically for adding where conditions specific to CPT models. |
10 | 10 | * But only sets the minimum, so any row of the right type will get used |
11 | 11 | * |
@@ -17,7 +17,6 @@ |
||
17 | 17 | class EE_CPT_Where_Conditions extends EE_CPT_Minimum_Where_Conditions{ |
18 | 18 | /** |
19 | 19 | * Gets the where default where conditions for a custom post type model |
20 | - * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment" |
|
21 | 20 | * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions) |
22 | 21 | */ |
23 | 22 | protected function _get_default_where_conditions() { |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
3 | - exit( 'No direct script access allowed' ); |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
3 | + exit('No direct script access allowed'); |
|
4 | 4 | } |
5 | 5 | /** |
6 | 6 | * |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * * @since 4.6.0 |
15 | 15 | * |
16 | 16 | */ |
17 | -class EE_CPT_Where_Conditions extends EE_CPT_Minimum_Where_Conditions{ |
|
17 | +class EE_CPT_Where_Conditions extends EE_CPT_Minimum_Where_Conditions { |
|
18 | 18 | /** |
19 | 19 | * Gets the where default where conditions for a custom post type model |
20 | 20 | * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment" |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | return array_merge( |
26 | 26 | parent::_get_default_where_conditions(), |
27 | 27 | array( |
28 | - $status_field->get_name() => array('NOT IN',array('auto-draft','trash') ) |
|
28 | + $status_field->get_name() => array('NOT IN', array('auto-draft', 'trash')) |
|
29 | 29 | ) |
30 | 30 | ); |
31 | 31 | } |
@@ -5,7 +5,7 @@ |
||
5 | 5 | /** |
6 | 6 | * |
7 | 7 | * Class EE_CPT_Minimum_Where_Conditions |
8 | - * |
|
8 | + * |
|
9 | 9 | * Strategy specifically for adding where conditions specific to CPT models. |
10 | 10 | * But only sets the minimum, so any row of the right type will get used |
11 | 11 | * |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | * @access protected |
239 | 239 | * @param \EE_Ticket $ticket |
240 | 240 | * @param int $quantity |
241 | - * @return bool |
|
241 | + * @return integer |
|
242 | 242 | * @throws \EE_Error |
243 | 243 | */ |
244 | 244 | protected function _reserve_ticket( EE_Ticket $ticket, $quantity = 1 ) { |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | * @access protected |
258 | 258 | * @param EE_Ticket $ticket |
259 | 259 | * @param int $quantity |
260 | - * @return bool |
|
260 | + * @return integer |
|
261 | 261 | * @throws \EE_Error |
262 | 262 | */ |
263 | 263 | protected function _release_reserved_ticket( EE_Ticket $ticket, $quantity = 1 ) { |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | * |
281 | 281 | * @access protected |
282 | 282 | * @param \EE_Ticket $ticket |
283 | - * @return bool |
|
283 | + * @return boolean|null |
|
284 | 284 | * @throws \EE_Error |
285 | 285 | */ |
286 | 286 | protected function _ticket_sold_out( EE_Ticket $ticket ) { |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | * |
300 | 300 | * @access protected |
301 | 301 | * @param \EE_Ticket $ticket |
302 | - * @return bool |
|
302 | + * @return boolean|null |
|
303 | 303 | */ |
304 | 304 | protected function _ticket_quantity_decremented( EE_Ticket $ticket ) { |
305 | 305 | if ( self::debug ) { |
@@ -399,13 +399,13 @@ discard block |
||
399 | 399 | if ( self::debug ) { |
400 | 400 | echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "() "; |
401 | 401 | } |
402 | - $refresh_msg = ''; |
|
403 | - $none_added_msg = ''; |
|
402 | + $refresh_msg = ''; |
|
403 | + $none_added_msg = ''; |
|
404 | 404 | if (defined('DOING_AJAX') && DOING_AJAX) { |
405 | - $refresh_msg = __('Please refresh the page to view updated ticket quantities.', |
|
406 | - 'event_espresso'); |
|
407 | - $none_added_msg = __('No tickets were added for the event.', 'event_espresso'); |
|
408 | - } |
|
405 | + $refresh_msg = __('Please refresh the page to view updated ticket quantities.', |
|
406 | + 'event_espresso'); |
|
407 | + $none_added_msg = __('No tickets were added for the event.', 'event_espresso'); |
|
408 | + } |
|
409 | 409 | if ( ! empty( $this->sold_out_tickets ) ) { |
410 | 410 | EE_Error::add_attention( |
411 | 411 | sprintf( |
@@ -415,16 +415,16 @@ discard block |
||
415 | 415 | ), |
416 | 416 | '<br />', |
417 | 417 | implode( '<br />', $this->sold_out_tickets ), |
418 | - $none_added_msg, |
|
419 | - $refresh_msg |
|
418 | + $none_added_msg, |
|
419 | + $refresh_msg |
|
420 | 420 | ) |
421 | 421 | ); |
422 | 422 | // alter code flow in the Ticket Selector for better UX |
423 | 423 | add_filter( 'FHEE__EED_Ticket_Selector__process_ticket_selections__tckts_slctd', '__return_true' ); |
424 | 424 | add_filter( 'FHEE__EED_Ticket_Selector__process_ticket_selections__success', '__return_false' ); |
425 | 425 | $this->sold_out_tickets = array(); |
426 | - // and reset the cart |
|
427 | - EED_Ticket_Sales_Monitor::session_cart_reset(EE_Registry::instance()->SSN); |
|
426 | + // and reset the cart |
|
427 | + EED_Ticket_Sales_Monitor::session_cart_reset(EE_Registry::instance()->SSN); |
|
428 | 428 | } |
429 | 429 | if ( ! empty( $this->decremented_tickets ) ) { |
430 | 430 | EE_Error::add_attention( |
@@ -435,8 +435,8 @@ discard block |
||
435 | 435 | ), |
436 | 436 | '<br />', |
437 | 437 | implode( '<br />', $this->decremented_tickets ), |
438 | - $none_added_msg, |
|
439 | - $refresh_msg |
|
438 | + $none_added_msg, |
|
439 | + $refresh_msg |
|
440 | 440 | ) |
441 | 441 | ); |
442 | 442 | $this->decremented_tickets = array(); |
@@ -607,11 +607,11 @@ discard block |
||
607 | 607 | } |
608 | 608 | } |
609 | 609 | } |
610 | - if (self::debug) { |
|
611 | - echo "<br /><br /> RESET COMPLETED "; |
|
612 | - } |
|
610 | + if (self::debug) { |
|
611 | + echo "<br /><br /> RESET COMPLETED "; |
|
612 | + } |
|
613 | 613 | |
614 | - } |
|
614 | + } |
|
615 | 615 | |
616 | 616 | |
617 | 617 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
3 | - exit( 'No direct script access allowed' ); |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
3 | + exit('No direct script access allowed'); |
|
4 | 4 | } |
5 | 5 | /** |
6 | 6 | * Class EED_Ticket_Sales_Monitor |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | */ |
18 | 18 | class EED_Ticket_Sales_Monitor extends EED_Module { |
19 | 19 | |
20 | - const debug = false; // true false |
|
20 | + const debug = false; // true false |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * an array of raw ticket data from EED_Ticket_Selector |
@@ -59,13 +59,13 @@ discard block |
||
59 | 59 | */ |
60 | 60 | public static function set_hooks() { |
61 | 61 | // check ticket reserves AFTER MER does it's check (hence priority 20) |
62 | - add_filter( 'FHEE__EE_Ticket_Selector___add_ticket_to_cart__ticket_qty', |
|
63 | - array( 'EED_Ticket_Sales_Monitor', 'validate_ticket_sale' ), |
|
62 | + add_filter('FHEE__EE_Ticket_Selector___add_ticket_to_cart__ticket_qty', |
|
63 | + array('EED_Ticket_Sales_Monitor', 'validate_ticket_sale'), |
|
64 | 64 | 20, 3 |
65 | 65 | ); |
66 | 66 | // add notices for sold out tickets |
67 | - add_action( 'AHEE__EE_Ticket_Selector__process_ticket_selections__after_tickets_added_to_cart', |
|
68 | - array( 'EED_Ticket_Sales_Monitor', 'post_notices' ), |
|
67 | + add_action('AHEE__EE_Ticket_Selector__process_ticket_selections__after_tickets_added_to_cart', |
|
68 | + array('EED_Ticket_Sales_Monitor', 'post_notices'), |
|
69 | 69 | 10 |
70 | 70 | ); |
71 | 71 | // handle ticket quantities adjusted in cart |
@@ -77,40 +77,40 @@ discard block |
||
77 | 77 | // handle tickets deleted from cart |
78 | 78 | add_action( |
79 | 79 | 'FHEE__EED_Multi_Event_Registration__delete_ticket__ticket_removed_from_cart', |
80 | - array( 'EED_Ticket_Sales_Monitor', 'ticket_removed_from_cart' ), |
|
80 | + array('EED_Ticket_Sales_Monitor', 'ticket_removed_from_cart'), |
|
81 | 81 | 10, 2 |
82 | 82 | ); |
83 | 83 | // handle emptied carts |
84 | 84 | add_action( |
85 | 85 | 'AHEE__EE_Session__reset_cart__before_reset', |
86 | - array( 'EED_Ticket_Sales_Monitor', 'session_cart_reset' ), |
|
86 | + array('EED_Ticket_Sales_Monitor', 'session_cart_reset'), |
|
87 | 87 | 10, 1 |
88 | 88 | ); |
89 | 89 | add_action( |
90 | 90 | 'AHEE__EED_Multi_Event_Registration__empty_event_cart__before_delete_cart', |
91 | - array( 'EED_Ticket_Sales_Monitor', 'session_cart_reset' ), |
|
91 | + array('EED_Ticket_Sales_Monitor', 'session_cart_reset'), |
|
92 | 92 | 10, 1 |
93 | 93 | ); |
94 | 94 | // handle cancelled registrations |
95 | 95 | add_action( |
96 | 96 | 'AHEE__EE_Session__reset_checkout__before_reset', |
97 | - array( 'EED_Ticket_Sales_Monitor', 'session_checkout_reset' ), |
|
97 | + array('EED_Ticket_Sales_Monitor', 'session_checkout_reset'), |
|
98 | 98 | 10, 1 |
99 | 99 | ); |
100 | 100 | // cron tasks |
101 | 101 | add_action( |
102 | 102 | 'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions__abandoned_transaction', |
103 | - array( 'EED_Ticket_Sales_Monitor', 'process_abandoned_transactions' ), |
|
103 | + array('EED_Ticket_Sales_Monitor', 'process_abandoned_transactions'), |
|
104 | 104 | 10, 1 |
105 | 105 | ); |
106 | 106 | add_action( |
107 | 107 | 'AHEE__EE_Cron_Tasks__process_expired_transactions__incomplete_transaction', |
108 | - array( 'EED_Ticket_Sales_Monitor', 'process_abandoned_transactions' ), |
|
108 | + array('EED_Ticket_Sales_Monitor', 'process_abandoned_transactions'), |
|
109 | 109 | 10, 1 |
110 | 110 | ); |
111 | 111 | add_action( |
112 | 112 | 'AHEE__EE_Cron_Tasks__process_expired_transactions__failed_transaction', |
113 | - array( 'EED_Ticket_Sales_Monitor', 'process_failed_transactions' ), |
|
113 | + array('EED_Ticket_Sales_Monitor', 'process_failed_transactions'), |
|
114 | 114 | 10, 1 |
115 | 115 | ); |
116 | 116 | |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | * @return EED_Ticket_Sales_Monitor |
135 | 135 | */ |
136 | 136 | public static function instance() { |
137 | - return parent::get_instance( __CLASS__ ); |
|
137 | + return parent::get_instance(__CLASS__); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | * @param WP_Query $WP_Query |
147 | 147 | * @return void |
148 | 148 | */ |
149 | - public function run( $WP_Query ) { |
|
149 | + public function run($WP_Query) { |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | |
@@ -164,14 +164,14 @@ discard block |
||
164 | 164 | * @param \EE_Ticket $ticket |
165 | 165 | * @return bool |
166 | 166 | */ |
167 | - public static function validate_ticket_sale( $qty = 1, EE_Ticket $ticket ) { |
|
168 | - $qty = absint( $qty ); |
|
169 | - if ( $qty > 0 ) { |
|
170 | - $qty = EED_Ticket_Sales_Monitor::instance()->_validate_ticket_sale( $ticket, $qty ); |
|
167 | + public static function validate_ticket_sale($qty = 1, EE_Ticket $ticket) { |
|
168 | + $qty = absint($qty); |
|
169 | + if ($qty > 0) { |
|
170 | + $qty = EED_Ticket_Sales_Monitor::instance()->_validate_ticket_sale($ticket, $qty); |
|
171 | 171 | } |
172 | - if ( self::debug ) { |
|
173 | - echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "()"; |
|
174 | - echo "<br /><br /><b> RETURNED QTY: " . $qty . '</b>'; |
|
172 | + if (self::debug) { |
|
173 | + echo "<br /><br /> ".__LINE__.") ".__METHOD__."()"; |
|
174 | + echo "<br /><br /><b> RETURNED QTY: ".$qty.'</b>'; |
|
175 | 175 | } |
176 | 176 | return $qty; |
177 | 177 | } |
@@ -187,42 +187,42 @@ discard block |
||
187 | 187 | * @param int $qty |
188 | 188 | * @return int |
189 | 189 | */ |
190 | - protected function _validate_ticket_sale( EE_Ticket $ticket, $qty = 1 ) { |
|
191 | - if ( self::debug ) { |
|
192 | - echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "() "; |
|
190 | + protected function _validate_ticket_sale(EE_Ticket $ticket, $qty = 1) { |
|
191 | + if (self::debug) { |
|
192 | + echo "<br /><br /> ".__LINE__.") ".__METHOD__."() "; |
|
193 | 193 | } |
194 | - if ( ! $ticket instanceof EE_Ticket ) { |
|
194 | + if ( ! $ticket instanceof EE_Ticket) { |
|
195 | 195 | return 0; |
196 | 196 | } |
197 | - if ( self::debug ) { |
|
198 | - echo "<br /><b> . ticket->ID: " . $ticket->ID() . '</b>'; |
|
199 | - echo "<br /> . original ticket->reserved: " . $ticket->reserved(); |
|
197 | + if (self::debug) { |
|
198 | + echo "<br /><b> . ticket->ID: ".$ticket->ID().'</b>'; |
|
199 | + echo "<br /> . original ticket->reserved: ".$ticket->reserved(); |
|
200 | 200 | } |
201 | 201 | $ticket->refresh_from_db(); |
202 | 202 | // first let's determine the ticket availability based on sales |
203 | - $available = $ticket->qty( 'saleable' ); |
|
204 | - if ( self::debug ) { |
|
205 | - echo "<br /> . . . ticket->qty: " . $ticket->qty(); |
|
206 | - echo "<br /> . . . ticket->sold: " . $ticket->sold(); |
|
207 | - echo "<br /> . . . ticket->reserved: " . $ticket->reserved(); |
|
208 | - echo "<br /> . . . ticket->qty(saleable): " . $ticket->qty( 'saleable' ); |
|
209 | - echo "<br /> . . . available: " . $available; |
|
210 | - } |
|
211 | - if ( $available < 1 ) { |
|
212 | - $this->_ticket_sold_out( $ticket ); |
|
203 | + $available = $ticket->qty('saleable'); |
|
204 | + if (self::debug) { |
|
205 | + echo "<br /> . . . ticket->qty: ".$ticket->qty(); |
|
206 | + echo "<br /> . . . ticket->sold: ".$ticket->sold(); |
|
207 | + echo "<br /> . . . ticket->reserved: ".$ticket->reserved(); |
|
208 | + echo "<br /> . . . ticket->qty(saleable): ".$ticket->qty('saleable'); |
|
209 | + echo "<br /> . . . available: ".$available; |
|
210 | + } |
|
211 | + if ($available < 1) { |
|
212 | + $this->_ticket_sold_out($ticket); |
|
213 | 213 | return 0; |
214 | 214 | } |
215 | - if ( self::debug ) { |
|
216 | - echo "<br /> . . . qty: " . $qty; |
|
215 | + if (self::debug) { |
|
216 | + echo "<br /> . . . qty: ".$qty; |
|
217 | 217 | } |
218 | - if ( $available < $qty ) { |
|
218 | + if ($available < $qty) { |
|
219 | 219 | $qty = $available; |
220 | - if ( self::debug ) { |
|
221 | - echo "<br /> . . . QTY ADJUSTED: " . $qty; |
|
220 | + if (self::debug) { |
|
221 | + echo "<br /> . . . QTY ADJUSTED: ".$qty; |
|
222 | 222 | } |
223 | - $this->_ticket_quantity_decremented( $ticket ); |
|
223 | + $this->_ticket_quantity_decremented($ticket); |
|
224 | 224 | } |
225 | - $this->_reserve_ticket( $ticket, $qty ); |
|
225 | + $this->_reserve_ticket($ticket, $qty); |
|
226 | 226 | return $qty; |
227 | 227 | } |
228 | 228 | |
@@ -238,11 +238,11 @@ discard block |
||
238 | 238 | * @return bool |
239 | 239 | * @throws \EE_Error |
240 | 240 | */ |
241 | - protected function _reserve_ticket( EE_Ticket $ticket, $quantity = 1 ) { |
|
242 | - if ( self::debug ) { |
|
243 | - echo "<br /><br /> . . . INCREASE RESERVED: " . $quantity; |
|
241 | + protected function _reserve_ticket(EE_Ticket $ticket, $quantity = 1) { |
|
242 | + if (self::debug) { |
|
243 | + echo "<br /><br /> . . . INCREASE RESERVED: ".$quantity; |
|
244 | 244 | } |
245 | - $ticket->increase_reserved( $quantity ); |
|
245 | + $ticket->increase_reserved($quantity); |
|
246 | 246 | return $ticket->save(); |
247 | 247 | } |
248 | 248 | |
@@ -257,14 +257,14 @@ discard block |
||
257 | 257 | * @return bool |
258 | 258 | * @throws \EE_Error |
259 | 259 | */ |
260 | - protected function _release_reserved_ticket( EE_Ticket $ticket, $quantity = 1 ) { |
|
261 | - if ( self::debug ) { |
|
262 | - echo "<br /> . . . ticket->ID: " . $ticket->ID(); |
|
263 | - echo "<br /> . . . ticket->reserved: " . $ticket->reserved(); |
|
260 | + protected function _release_reserved_ticket(EE_Ticket $ticket, $quantity = 1) { |
|
261 | + if (self::debug) { |
|
262 | + echo "<br /> . . . ticket->ID: ".$ticket->ID(); |
|
263 | + echo "<br /> . . . ticket->reserved: ".$ticket->reserved(); |
|
264 | 264 | } |
265 | - $ticket->decrease_reserved( $quantity ); |
|
266 | - if ( self::debug ) { |
|
267 | - echo "<br /> . . . ticket->reserved: " . $ticket->reserved(); |
|
265 | + $ticket->decrease_reserved($quantity); |
|
266 | + if (self::debug) { |
|
267 | + echo "<br /> . . . ticket->reserved: ".$ticket->reserved(); |
|
268 | 268 | } |
269 | 269 | return $ticket->save() ? 1 : 0; |
270 | 270 | } |
@@ -280,12 +280,12 @@ discard block |
||
280 | 280 | * @return bool |
281 | 281 | * @throws \EE_Error |
282 | 282 | */ |
283 | - protected function _ticket_sold_out( EE_Ticket $ticket ) { |
|
284 | - if ( self::debug ) { |
|
285 | - echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "() "; |
|
286 | - echo "<br /> . . ticket->name: " . $this->_get_ticket_and_event_name( $ticket ); |
|
283 | + protected function _ticket_sold_out(EE_Ticket $ticket) { |
|
284 | + if (self::debug) { |
|
285 | + echo "<br /><br /> ".__LINE__.") ".__METHOD__."() "; |
|
286 | + echo "<br /> . . ticket->name: ".$this->_get_ticket_and_event_name($ticket); |
|
287 | 287 | } |
288 | - $this->sold_out_tickets[] = $this->_get_ticket_and_event_name( $ticket ); |
|
288 | + $this->sold_out_tickets[] = $this->_get_ticket_and_event_name($ticket); |
|
289 | 289 | } |
290 | 290 | |
291 | 291 | |
@@ -298,12 +298,12 @@ discard block |
||
298 | 298 | * @param \EE_Ticket $ticket |
299 | 299 | * @return bool |
300 | 300 | */ |
301 | - protected function _ticket_quantity_decremented( EE_Ticket $ticket ) { |
|
302 | - if ( self::debug ) { |
|
303 | - echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "() "; |
|
304 | - echo "<br /> . . ticket->name: " . $this->_get_ticket_and_event_name( $ticket ); |
|
301 | + protected function _ticket_quantity_decremented(EE_Ticket $ticket) { |
|
302 | + if (self::debug) { |
|
303 | + echo "<br /><br /> ".__LINE__.") ".__METHOD__."() "; |
|
304 | + echo "<br /> . . ticket->name: ".$this->_get_ticket_and_event_name($ticket); |
|
305 | 305 | } |
306 | - $this->decremented_tickets[] = $this->_get_ticket_and_event_name( $ticket ); |
|
306 | + $this->decremented_tickets[] = $this->_get_ticket_and_event_name($ticket); |
|
307 | 307 | } |
308 | 308 | |
309 | 309 | |
@@ -316,11 +316,11 @@ discard block |
||
316 | 316 | * @param \EE_Ticket $ticket |
317 | 317 | * @return string |
318 | 318 | */ |
319 | - protected function _get_ticket_and_event_name( EE_Ticket $ticket ) { |
|
319 | + protected function _get_ticket_and_event_name(EE_Ticket $ticket) { |
|
320 | 320 | $event = $ticket->get_related_event(); |
321 | - if ( $event instanceof EE_Event ) { |
|
321 | + if ($event instanceof EE_Event) { |
|
322 | 322 | $ticket_name = sprintf( |
323 | - _x( '%1$s for %2$s', 'ticket name for event name', 'event_espresso' ), |
|
323 | + _x('%1$s for %2$s', 'ticket name for event name', 'event_espresso'), |
|
324 | 324 | $ticket->name(), |
325 | 325 | $event->name() |
326 | 326 | ); |
@@ -345,13 +345,13 @@ discard block |
||
345 | 345 | * @param int $quantity |
346 | 346 | * @return void |
347 | 347 | */ |
348 | - public static function ticket_quantity_updated( EE_Line_Item $line_item, $quantity = 1 ) { |
|
349 | - $ticket = EEM_Ticket::instance()->get_one_by_ID( absint( $line_item->OBJ_ID() ) ); |
|
350 | - if ( $ticket instanceof EE_Ticket ) { |
|
351 | - if ( $quantity > 0 ) { |
|
352 | - EED_Ticket_Sales_Monitor::instance()->_reserve_ticket( $ticket, $quantity ); |
|
348 | + public static function ticket_quantity_updated(EE_Line_Item $line_item, $quantity = 1) { |
|
349 | + $ticket = EEM_Ticket::instance()->get_one_by_ID(absint($line_item->OBJ_ID())); |
|
350 | + if ($ticket instanceof EE_Ticket) { |
|
351 | + if ($quantity > 0) { |
|
352 | + EED_Ticket_Sales_Monitor::instance()->_reserve_ticket($ticket, $quantity); |
|
353 | 353 | } else { |
354 | - EED_Ticket_Sales_Monitor::instance()->_release_reserved_ticket( $ticket, $quantity ); |
|
354 | + EED_Ticket_Sales_Monitor::instance()->_release_reserved_ticket($ticket, $quantity); |
|
355 | 355 | } |
356 | 356 | } |
357 | 357 | } |
@@ -367,8 +367,8 @@ discard block |
||
367 | 367 | * @param int $quantity |
368 | 368 | * @return void |
369 | 369 | */ |
370 | - public static function ticket_removed_from_cart( EE_Ticket $ticket, $quantity = 1 ) { |
|
371 | - EED_Ticket_Sales_Monitor::instance()->_release_reserved_ticket( $ticket, $quantity ); |
|
370 | + public static function ticket_removed_from_cart(EE_Ticket $ticket, $quantity = 1) { |
|
371 | + EED_Ticket_Sales_Monitor::instance()->_release_reserved_ticket($ticket, $quantity); |
|
372 | 372 | } |
373 | 373 | |
374 | 374 | |
@@ -396,8 +396,8 @@ discard block |
||
396 | 396 | * @return void |
397 | 397 | */ |
398 | 398 | protected function _post_notices() { |
399 | - if ( self::debug ) { |
|
400 | - echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "() "; |
|
399 | + if (self::debug) { |
|
400 | + echo "<br /><br /> ".__LINE__.") ".__METHOD__."() "; |
|
401 | 401 | } |
402 | 402 | $refresh_msg = ''; |
403 | 403 | $none_added_msg = ''; |
@@ -406,35 +406,35 @@ discard block |
||
406 | 406 | 'event_espresso'); |
407 | 407 | $none_added_msg = __('No tickets were added for the event.', 'event_espresso'); |
408 | 408 | } |
409 | - if ( ! empty( $this->sold_out_tickets ) ) { |
|
409 | + if ( ! empty($this->sold_out_tickets)) { |
|
410 | 410 | EE_Error::add_attention( |
411 | 411 | sprintf( |
412 | 412 | apply_filters( |
413 | 413 | 'FHEE__EED_Ticket_Sales_Monitor___post_notices__sold_out_tickets_notice', |
414 | - __( 'We\'re sorry...%1$sThe following items have sold out since you first viewed this page, and can no longer be registered for:%1$s%1$s%2$s%1$s%1$sPlease note that availability can change at any time due to cancellations, so please check back again later if registration for this event(s) is important to you.%1$s%1$s%3$s%1$s%4$s%1$s', 'event_espresso' ) |
|
414 | + __('We\'re sorry...%1$sThe following items have sold out since you first viewed this page, and can no longer be registered for:%1$s%1$s%2$s%1$s%1$sPlease note that availability can change at any time due to cancellations, so please check back again later if registration for this event(s) is important to you.%1$s%1$s%3$s%1$s%4$s%1$s', 'event_espresso') |
|
415 | 415 | ), |
416 | 416 | '<br />', |
417 | - implode( '<br />', $this->sold_out_tickets ), |
|
417 | + implode('<br />', $this->sold_out_tickets), |
|
418 | 418 | $none_added_msg, |
419 | 419 | $refresh_msg |
420 | 420 | ) |
421 | 421 | ); |
422 | 422 | // alter code flow in the Ticket Selector for better UX |
423 | - add_filter( 'FHEE__EED_Ticket_Selector__process_ticket_selections__tckts_slctd', '__return_true' ); |
|
424 | - add_filter( 'FHEE__EED_Ticket_Selector__process_ticket_selections__success', '__return_false' ); |
|
423 | + add_filter('FHEE__EED_Ticket_Selector__process_ticket_selections__tckts_slctd', '__return_true'); |
|
424 | + add_filter('FHEE__EED_Ticket_Selector__process_ticket_selections__success', '__return_false'); |
|
425 | 425 | $this->sold_out_tickets = array(); |
426 | 426 | // and reset the cart |
427 | 427 | EED_Ticket_Sales_Monitor::session_cart_reset(EE_Registry::instance()->SSN); |
428 | 428 | } |
429 | - if ( ! empty( $this->decremented_tickets ) ) { |
|
429 | + if ( ! empty($this->decremented_tickets)) { |
|
430 | 430 | EE_Error::add_attention( |
431 | 431 | sprintf( |
432 | 432 | apply_filters( |
433 | 433 | 'FHEE__EED_Ticket_Sales_Monitor___ticket_quantity_decremented__notice', |
434 | - __( 'We\'re sorry...%1$sDue to sales that have occurred since you first viewed the last page, the following items have had their quantities adjusted to match the current available amount:%1$s%1$s%2$s%1$s%1$sPlease note that availability can change at any time due to cancellations, so please check back again later if registration for this event(s) is important to you.%1$s%1$s%3$s%1$s%4$s%1$s', 'event_espresso' ) |
|
434 | + __('We\'re sorry...%1$sDue to sales that have occurred since you first viewed the last page, the following items have had their quantities adjusted to match the current available amount:%1$s%1$s%2$s%1$s%1$sPlease note that availability can change at any time due to cancellations, so please check back again later if registration for this event(s) is important to you.%1$s%1$s%3$s%1$s%4$s%1$s', 'event_espresso') |
|
435 | 435 | ), |
436 | 436 | '<br />', |
437 | - implode( '<br />', $this->decremented_tickets ), |
|
437 | + implode('<br />', $this->decremented_tickets), |
|
438 | 438 | $none_added_msg, |
439 | 439 | $refresh_msg |
440 | 440 | ) |
@@ -458,27 +458,27 @@ discard block |
||
458 | 458 | * @param EE_Transaction $transaction |
459 | 459 | * @return int |
460 | 460 | */ |
461 | - protected function _release_all_reserved_tickets_for_transaction( EE_Transaction $transaction ) { |
|
462 | - if ( self::debug ) { |
|
463 | - echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "() "; |
|
464 | - echo "<br /> . transaction->ID: " . $transaction->ID(); |
|
461 | + protected function _release_all_reserved_tickets_for_transaction(EE_Transaction $transaction) { |
|
462 | + if (self::debug) { |
|
463 | + echo "<br /><br /> ".__LINE__.") ".__METHOD__."() "; |
|
464 | + echo "<br /> . transaction->ID: ".$transaction->ID(); |
|
465 | 465 | } |
466 | 466 | /** @type EE_Transaction_Processor $transaction_processor */ |
467 | - $transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' ); |
|
467 | + $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor'); |
|
468 | 468 | // check if 'finalize_registration' step has been completed... |
469 | - $finalized = $transaction_processor->reg_step_completed( $transaction, 'finalize_registration' ); |
|
470 | - if ( self::debug ) { |
|
469 | + $finalized = $transaction_processor->reg_step_completed($transaction, 'finalize_registration'); |
|
470 | + if (self::debug) { |
|
471 | 471 | // DEBUG LOG |
472 | 472 | EEH_Debug_Tools::log( |
473 | 473 | __CLASS__, __FUNCTION__, __LINE__, |
474 | - array( 'finalized' => $finalized ), |
|
475 | - false, 'EE_Transaction: ' . $transaction->ID() |
|
474 | + array('finalized' => $finalized), |
|
475 | + false, 'EE_Transaction: '.$transaction->ID() |
|
476 | 476 | ); |
477 | 477 | } |
478 | 478 | // how many tickets were released |
479 | 479 | $count = 0; |
480 | - if ( self::debug ) { |
|
481 | - echo "<br /> . . . finalized: " . $finalized; |
|
480 | + if (self::debug) { |
|
481 | + echo "<br /> . . . finalized: ".$finalized; |
|
482 | 482 | } |
483 | 483 | $release_tickets_with_TXN_status = array( |
484 | 484 | EEM_Transaction::failed_status_code, |
@@ -486,13 +486,13 @@ discard block |
||
486 | 486 | EEM_Transaction::incomplete_status_code, |
487 | 487 | ); |
488 | 488 | // if the session is getting cleared BEFORE the TXN has been finalized |
489 | - if ( ! $finalized || in_array( $transaction->status_ID(), $release_tickets_with_TXN_status ) ) { |
|
489 | + if ( ! $finalized || in_array($transaction->status_ID(), $release_tickets_with_TXN_status)) { |
|
490 | 490 | // let's cancel any reserved tickets |
491 | 491 | $registrations = $transaction->registrations(); |
492 | - if ( ! empty( $registrations ) ) { |
|
493 | - foreach ( $registrations as $registration ) { |
|
494 | - if ( $registration instanceof EE_Registration ) { |
|
495 | - $count += $this->_release_reserved_ticket_for_registration( $registration, $transaction ); |
|
492 | + if ( ! empty($registrations)) { |
|
493 | + foreach ($registrations as $registration) { |
|
494 | + if ($registration instanceof EE_Registration) { |
|
495 | + $count += $this->_release_reserved_ticket_for_registration($registration, $transaction); |
|
496 | 496 | } |
497 | 497 | } |
498 | 498 | } |
@@ -513,12 +513,12 @@ discard block |
||
513 | 513 | * @return int |
514 | 514 | * @throws \EE_Error |
515 | 515 | */ |
516 | - protected function _release_reserved_ticket_for_registration( EE_Registration $registration, EE_Transaction $transaction ) { |
|
517 | - if ( self::debug ) { |
|
518 | - echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "() "; |
|
519 | - echo "<br /> . . registration->ID: " . $registration->ID(); |
|
520 | - echo "<br /> . . registration->status_ID: " . $registration->status_ID(); |
|
521 | - echo "<br /> . . transaction->status_ID(): " . $transaction->status_ID(); |
|
516 | + protected function _release_reserved_ticket_for_registration(EE_Registration $registration, EE_Transaction $transaction) { |
|
517 | + if (self::debug) { |
|
518 | + echo "<br /><br /> ".__LINE__.") ".__METHOD__."() "; |
|
519 | + echo "<br /> . . registration->ID: ".$registration->ID(); |
|
520 | + echo "<br /> . . registration->status_ID: ".$registration->status_ID(); |
|
521 | + echo "<br /> . . transaction->status_ID(): ".$transaction->status_ID(); |
|
522 | 522 | } |
523 | 523 | if ( |
524 | 524 | // release Tickets for Failed Transactions and Abandoned Transactions |
@@ -531,8 +531,8 @@ discard block |
||
531 | 531 | ) |
532 | 532 | ) { |
533 | 533 | $ticket = $registration->ticket(); |
534 | - if ( $ticket instanceof EE_Ticket ) { |
|
535 | - return $this->_release_reserved_ticket( $ticket ); |
|
534 | + if ($ticket instanceof EE_Ticket) { |
|
535 | + return $this->_release_reserved_ticket($ticket); |
|
536 | 536 | } |
537 | 537 | } |
538 | 538 | return 0; |
@@ -552,20 +552,20 @@ discard block |
||
552 | 552 | * @param EE_Session $session |
553 | 553 | * @return void |
554 | 554 | */ |
555 | - public static function session_cart_reset( EE_Session $session ) { |
|
556 | - if ( self::debug ) { |
|
557 | - echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "() "; |
|
555 | + public static function session_cart_reset(EE_Session $session) { |
|
556 | + if (self::debug) { |
|
557 | + echo "<br /><br /> ".__LINE__.") ".__METHOD__."() "; |
|
558 | 558 | } |
559 | 559 | $cart = $session->cart(); |
560 | - if ( $cart instanceof EE_Cart ) { |
|
561 | - if ( self::debug ) { |
|
560 | + if ($cart instanceof EE_Cart) { |
|
561 | + if (self::debug) { |
|
562 | 562 | echo "<br /><br /> cart instanceof EE_Cart: "; |
563 | 563 | } |
564 | - EED_Ticket_Sales_Monitor::instance()->_session_cart_reset( $cart ); |
|
564 | + EED_Ticket_Sales_Monitor::instance()->_session_cart_reset($cart); |
|
565 | 565 | } else { |
566 | - if ( self::debug ) { |
|
566 | + if (self::debug) { |
|
567 | 567 | echo "<br /><br /> invalid EE_Cart: "; |
568 | - var_dump( $cart ); |
|
568 | + var_dump($cart); |
|
569 | 569 | } |
570 | 570 | } |
571 | 571 | } |
@@ -580,30 +580,30 @@ discard block |
||
580 | 580 | * @param EE_Cart $cart |
581 | 581 | * @return void |
582 | 582 | */ |
583 | - protected function _session_cart_reset( EE_Cart $cart ) { |
|
584 | - if ( self::debug ) { |
|
585 | - echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "() "; |
|
583 | + protected function _session_cart_reset(EE_Cart $cart) { |
|
584 | + if (self::debug) { |
|
585 | + echo "<br /><br /> ".__LINE__.") ".__METHOD__."() "; |
|
586 | 586 | } |
587 | - EE_Registry::instance()->load_helper( 'Line_Item' ); |
|
587 | + EE_Registry::instance()->load_helper('Line_Item'); |
|
588 | 588 | $ticket_line_items = $cart->get_tickets(); |
589 | - if ( empty( $ticket_line_items ) ) { |
|
589 | + if (empty($ticket_line_items)) { |
|
590 | 590 | return; |
591 | 591 | } |
592 | - foreach ( $ticket_line_items as $ticket_line_item ) { |
|
593 | - if ( self::debug ) { |
|
594 | - echo "<br /> . ticket_line_item->ID(): " . $ticket_line_item->ID(); |
|
592 | + foreach ($ticket_line_items as $ticket_line_item) { |
|
593 | + if (self::debug) { |
|
594 | + echo "<br /> . ticket_line_item->ID(): ".$ticket_line_item->ID(); |
|
595 | 595 | } |
596 | - if ( $ticket_line_item instanceof EE_Line_Item && $ticket_line_item->OBJ_type() == 'Ticket' ) { |
|
597 | - if ( self::debug ) { |
|
598 | - echo "<br /> . . ticket_line_item->OBJ_ID(): " . $ticket_line_item->OBJ_ID(); |
|
596 | + if ($ticket_line_item instanceof EE_Line_Item && $ticket_line_item->OBJ_type() == 'Ticket') { |
|
597 | + if (self::debug) { |
|
598 | + echo "<br /> . . ticket_line_item->OBJ_ID(): ".$ticket_line_item->OBJ_ID(); |
|
599 | 599 | } |
600 | - $ticket = EEM_Ticket::instance()->get_one_by_ID( $ticket_line_item->OBJ_ID() ); |
|
601 | - if ( $ticket instanceof EE_Ticket ) { |
|
602 | - if ( self::debug ) { |
|
603 | - echo "<br /> . . ticket->ID(): " . $ticket->ID(); |
|
604 | - echo "<br /> . . ticket_line_item->quantity(): " . $ticket_line_item->quantity(); |
|
600 | + $ticket = EEM_Ticket::instance()->get_one_by_ID($ticket_line_item->OBJ_ID()); |
|
601 | + if ($ticket instanceof EE_Ticket) { |
|
602 | + if (self::debug) { |
|
603 | + echo "<br /> . . ticket->ID(): ".$ticket->ID(); |
|
604 | + echo "<br /> . . ticket_line_item->quantity(): ".$ticket_line_item->quantity(); |
|
605 | 605 | } |
606 | - $this->_release_reserved_ticket( $ticket, $ticket_line_item->quantity() ); |
|
606 | + $this->_release_reserved_ticket($ticket, $ticket_line_item->quantity()); |
|
607 | 607 | } |
608 | 608 | } |
609 | 609 | } |
@@ -627,10 +627,10 @@ discard block |
||
627 | 627 | * @param EE_Session $session |
628 | 628 | * @return void |
629 | 629 | */ |
630 | - public static function session_checkout_reset( EE_Session $session ) { |
|
630 | + public static function session_checkout_reset(EE_Session $session) { |
|
631 | 631 | $checkout = $session->checkout(); |
632 | - if ( $checkout instanceof EE_Checkout ) { |
|
633 | - EED_Ticket_Sales_Monitor::instance()->_session_checkout_reset( $checkout ); |
|
632 | + if ($checkout instanceof EE_Checkout) { |
|
633 | + EED_Ticket_Sales_Monitor::instance()->_session_checkout_reset($checkout); |
|
634 | 634 | } |
635 | 635 | } |
636 | 636 | |
@@ -644,15 +644,15 @@ discard block |
||
644 | 644 | * @param EE_Checkout $checkout |
645 | 645 | * @return void |
646 | 646 | */ |
647 | - protected function _session_checkout_reset( EE_Checkout $checkout ) { |
|
648 | - if ( self::debug ) { |
|
649 | - echo "<br /><br /> " . __LINE__ . ") " . __METHOD__ . "() "; |
|
647 | + protected function _session_checkout_reset(EE_Checkout $checkout) { |
|
648 | + if (self::debug) { |
|
649 | + echo "<br /><br /> ".__LINE__.") ".__METHOD__."() "; |
|
650 | 650 | } |
651 | 651 | // we want to release the each registration's reserved tickets if the session was cleared, but not if this is a revisit |
652 | - if ( $checkout->revisit || ! $checkout->transaction instanceof EE_Transaction ) { |
|
652 | + if ($checkout->revisit || ! $checkout->transaction instanceof EE_Transaction) { |
|
653 | 653 | return; |
654 | 654 | } |
655 | - $this->_release_all_reserved_tickets_for_transaction( $checkout->transaction ); |
|
655 | + $this->_release_all_reserved_tickets_for_transaction($checkout->transaction); |
|
656 | 656 | } |
657 | 657 | |
658 | 658 | |
@@ -668,7 +668,7 @@ discard block |
||
668 | 668 | * @param EE_Session $session |
669 | 669 | * @return void |
670 | 670 | */ |
671 | - public static function session_expired_reset( EE_Session $session ) { |
|
671 | + public static function session_expired_reset(EE_Session $session) { |
|
672 | 672 | |
673 | 673 | } |
674 | 674 | |
@@ -687,30 +687,30 @@ discard block |
||
687 | 687 | * @param EE_Transaction $transaction |
688 | 688 | * @return void |
689 | 689 | */ |
690 | - public static function process_abandoned_transactions( EE_Transaction $transaction ) { |
|
690 | + public static function process_abandoned_transactions(EE_Transaction $transaction) { |
|
691 | 691 | // is this TXN free or has any money been paid towards this TXN? If so, then leave it alone |
692 | - if ( $transaction->is_free() || $transaction->paid() > 0 ) { |
|
693 | - if ( self::debug ) { |
|
692 | + if ($transaction->is_free() || $transaction->paid() > 0) { |
|
693 | + if (self::debug) { |
|
694 | 694 | // DEBUG LOG |
695 | 695 | EEH_Debug_Tools::log( |
696 | 696 | __CLASS__, __FUNCTION__, __LINE__, |
697 | - array( $transaction ), |
|
698 | - false, 'EE_Transaction: ' . $transaction->ID() |
|
697 | + array($transaction), |
|
698 | + false, 'EE_Transaction: '.$transaction->ID() |
|
699 | 699 | ); |
700 | 700 | } |
701 | 701 | return; |
702 | 702 | } |
703 | 703 | // have their been any successful payments made ? |
704 | 704 | $payments = $transaction->payments(); |
705 | - foreach ( $payments as $payment ) { |
|
706 | - if ( $payment instanceof EE_Payment ) { |
|
707 | - if ( $payment->status() === EEM_Payment::status_id_approved ) { |
|
708 | - if ( self::debug ) { |
|
705 | + foreach ($payments as $payment) { |
|
706 | + if ($payment instanceof EE_Payment) { |
|
707 | + if ($payment->status() === EEM_Payment::status_id_approved) { |
|
708 | + if (self::debug) { |
|
709 | 709 | // DEBUG LOG |
710 | 710 | EEH_Debug_Tools::log( |
711 | 711 | __CLASS__, __FUNCTION__, __LINE__, |
712 | - array( $payment ), |
|
713 | - false, 'EE_Transaction: ' . $transaction->ID() |
|
712 | + array($payment), |
|
713 | + false, 'EE_Transaction: '.$transaction->ID() |
|
714 | 714 | ); |
715 | 715 | } |
716 | 716 | return; |
@@ -718,7 +718,7 @@ discard block |
||
718 | 718 | } |
719 | 719 | } |
720 | 720 | // since you haven't even attempted to pay for your ticket... |
721 | - EED_Ticket_Sales_Monitor::instance()->_release_all_reserved_tickets_for_transaction( $transaction ); |
|
721 | + EED_Ticket_Sales_Monitor::instance()->_release_all_reserved_tickets_for_transaction($transaction); |
|
722 | 722 | } |
723 | 723 | |
724 | 724 | |
@@ -735,9 +735,9 @@ discard block |
||
735 | 735 | * @param EE_Transaction $transaction |
736 | 736 | * @return void |
737 | 737 | */ |
738 | - public static function process_failed_transactions( EE_Transaction $transaction ) { |
|
738 | + public static function process_failed_transactions(EE_Transaction $transaction) { |
|
739 | 739 | // since you haven't even attempted to pay for your ticket... |
740 | - EED_Ticket_Sales_Monitor::instance()->_release_all_reserved_tickets_for_transaction( $transaction ); |
|
740 | + EED_Ticket_Sales_Monitor::instance()->_release_all_reserved_tickets_for_transaction($transaction); |
|
741 | 741 | } |
742 | 742 | |
743 | 743 |
@@ -32,11 +32,11 @@ |
||
32 | 32 | interface RequestMethod |
33 | 33 | { |
34 | 34 | |
35 | - /** |
|
36 | - * Submit the request with the specified parameters. |
|
37 | - * |
|
38 | - * @param RequestParameters $params Request parameters |
|
39 | - * @return string Body of the reCAPTCHA response |
|
40 | - */ |
|
41 | - public function submit(RequestParameters $params); |
|
35 | + /** |
|
36 | + * Submit the request with the specified parameters. |
|
37 | + * |
|
38 | + * @param RequestParameters $params Request parameters |
|
39 | + * @return string Body of the reCAPTCHA response |
|
40 | + */ |
|
41 | + public function submit(RequestParameters $params); |
|
42 | 42 | } |
@@ -5,7 +5,9 @@ |
||
5 | 5 | * @subpackage plugin api, messages |
6 | 6 | * @since 4.5.0 |
7 | 7 | */ |
8 | -if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
8 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
9 | + exit('No direct script access allowed'); |
|
10 | +} |
|
9 | 11 | |
10 | 12 | /** |
11 | 13 | * Use this to register or deregister a new message template pack variation for the EE messages system. |
@@ -50,79 +50,79 @@ discard block |
||
50 | 50 | * @throws \EE_Error |
51 | 51 | * } |
52 | 52 | */ |
53 | - public static function register( $mt_name = NULL, $setup_args = array() ) { |
|
53 | + public static function register($mt_name = NULL, $setup_args = array()) { |
|
54 | 54 | //required fields MUST be present, so let's make sure they are. |
55 | 55 | if ( |
56 | - ! isset( $mt_name ) |
|
57 | - || ! is_array( $setup_args ) |
|
58 | - || empty( $setup_args['mtfilename'] ) || empty( $setup_args['autoloadpaths'] ) |
|
59 | - ){ |
|
56 | + ! isset($mt_name) |
|
57 | + || ! is_array($setup_args) |
|
58 | + || empty($setup_args['mtfilename']) || empty($setup_args['autoloadpaths']) |
|
59 | + ) { |
|
60 | 60 | throw new EE_Error( |
61 | - __( 'In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso' ) |
|
61 | + __('In order to register a message type with EE_Register_Message_Type::register, you must include a unique name for the message type, plus an array containing the following keys: "mtfilename", "autoloadpaths"', 'event_espresso') |
|
62 | 62 | ); |
63 | 63 | } |
64 | 64 | |
65 | 65 | //make sure we don't register twice |
66 | - if( isset( self::$_ee_message_type_registry[ $mt_name ] ) ){ |
|
66 | + if (isset(self::$_ee_message_type_registry[$mt_name])) { |
|
67 | 67 | return; |
68 | 68 | } |
69 | 69 | |
70 | 70 | //make sure this was called in the right place! |
71 | 71 | if ( |
72 | - ! did_action( 'EE_Brewing_Regular___messages_caf' ) |
|
73 | - || did_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' ) |
|
72 | + ! did_action('EE_Brewing_Regular___messages_caf') |
|
73 | + || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations') |
|
74 | 74 | ) { |
75 | 75 | EE_Error::doing_it_wrong( |
76 | 76 | __METHOD__, |
77 | 77 | sprintf( |
78 | - __('A message type named "%s" has been attempted to be registered with the EE Messages System. It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.','event_espresso'), |
|
78 | + __('A message type named "%s" has been attempted to be registered with the EE Messages System. It may or may not work because it should be only called on the "EE_Brewing_Regular___messages_caf" hook.', 'event_espresso'), |
|
79 | 79 | $mt_name |
80 | 80 | ), |
81 | 81 | '4.3.0' |
82 | 82 | ); |
83 | 83 | } |
84 | 84 | //setup $__ee_message_type_registry array from incoming values. |
85 | - self::$_ee_message_type_registry[ $mt_name ] = array( |
|
85 | + self::$_ee_message_type_registry[$mt_name] = array( |
|
86 | 86 | 'mtfilename' => (string) $setup_args['mtfilename'], |
87 | 87 | 'autoloadpaths' => (array) $setup_args['autoloadpaths'], |
88 | - 'messengers_to_activate_with' => ! empty( $setup_args['messengers_to_activate_with'] ) |
|
88 | + 'messengers_to_activate_with' => ! empty($setup_args['messengers_to_activate_with']) |
|
89 | 89 | ? (array) $setup_args['messengers_to_activate_with'] |
90 | 90 | : array(), |
91 | - 'messengers_to_validate_with' => ! empty( $setup_args['messengers_to_validate_with'] ) |
|
91 | + 'messengers_to_validate_with' => ! empty($setup_args['messengers_to_validate_with']) |
|
92 | 92 | ? (array) $setup_args['messengers_to_validate_with'] |
93 | 93 | : array(), |
94 | - 'force_activation' => ! empty( $setup_args['force_activation'] ) |
|
94 | + 'force_activation' => ! empty($setup_args['force_activation']) |
|
95 | 95 | ? (bool) $setup_args['force_activation'] |
96 | 96 | : array() |
97 | 97 | ); |
98 | 98 | //add filters |
99 | 99 | add_filter( |
100 | 100 | 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', |
101 | - array( 'EE_Register_Message_Type', 'register_msgs_autoload_paths' ), |
|
101 | + array('EE_Register_Message_Type', 'register_msgs_autoload_paths'), |
|
102 | 102 | 10 |
103 | 103 | ); |
104 | 104 | add_filter( |
105 | 105 | 'FHEE__EE_messages__get_installed__messagetype_files', |
106 | - array( 'EE_Register_Message_Type', 'register_messagetype_files' ), |
|
106 | + array('EE_Register_Message_Type', 'register_messagetype_files'), |
|
107 | 107 | 10, |
108 | 108 | 1 |
109 | 109 | ); |
110 | 110 | add_filter( |
111 | 111 | 'FHEE__EE_messenger__get_default_message_types__default_types', |
112 | - array( 'EE_Register_Message_Type', 'register_messengers_to_activate_mt_with' ), |
|
112 | + array('EE_Register_Message_Type', 'register_messengers_to_activate_mt_with'), |
|
113 | 113 | 10, |
114 | 114 | 2 |
115 | 115 | ); |
116 | 116 | add_filter( |
117 | 117 | 'FHEE__EE_messenger__get_valid_message_types__valid_types', |
118 | - array( 'EE_Register_Message_Type', 'register_messengers_to_validate_mt_with' ), |
|
118 | + array('EE_Register_Message_Type', 'register_messengers_to_validate_mt_with'), |
|
119 | 119 | 10, |
120 | 120 | 2 |
121 | 121 | ); |
122 | 122 | //actions |
123 | 123 | add_action( |
124 | 124 | 'AHEE__EE_Addon__initialize_default_data__begin', |
125 | - array( 'EE_Register_Message_Type', 'set_defaults' ) |
|
125 | + array('EE_Register_Message_Type', 'set_defaults') |
|
126 | 126 | ); |
127 | 127 | } |
128 | 128 | |
@@ -133,15 +133,15 @@ discard block |
||
133 | 133 | */ |
134 | 134 | public static function set_defaults() { |
135 | 135 | /** @type EE_Message_Resource_Manager $message_resource_manager */ |
136 | - $message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' ); |
|
136 | + $message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager'); |
|
137 | 137 | |
138 | 138 | //for any message types with force activation, let's ensure they are activated |
139 | - foreach ( self::$_ee_message_type_registry as $message_type_name => $settings ) { |
|
140 | - if ( $settings['force_activation'] ) { |
|
141 | - foreach ( $settings['messengers_to_activate_with'] as $messenger ) { |
|
139 | + foreach (self::$_ee_message_type_registry as $message_type_name => $settings) { |
|
140 | + if ($settings['force_activation']) { |
|
141 | + foreach ($settings['messengers_to_activate_with'] as $messenger) { |
|
142 | 142 | //DO not force activation if this message type has already been activated in the system |
143 | - if ( ! $message_resource_manager->has_message_type_been_activated_for_messenger( $message_type_name, $messenger ) ) { |
|
144 | - $message_resource_manager->ensure_message_type_is_active( $message_type_name, $messenger ); |
|
143 | + if ( ! $message_resource_manager->has_message_type_been_activated_for_messenger($message_type_name, $messenger)) { |
|
144 | + $message_resource_manager->ensure_message_type_is_active($message_type_name, $messenger); |
|
145 | 145 | } |
146 | 146 | } |
147 | 147 | } |
@@ -158,13 +158,13 @@ discard block |
||
158 | 158 | * @param string $message_type_name the name for the message type that was previously registered |
159 | 159 | * @return void |
160 | 160 | */ |
161 | - public static function deregister( $message_type_name = null ) { |
|
162 | - if ( ! empty( self::$_ee_message_type_registry[ $message_type_name ] ) ) { |
|
161 | + public static function deregister($message_type_name = null) { |
|
162 | + if ( ! empty(self::$_ee_message_type_registry[$message_type_name])) { |
|
163 | 163 | //let's make sure that we remove any place this message type was made active |
164 | 164 | /** @var EE_Message_Resource_Manager $Message_Resource_Manager */ |
165 | - $Message_Resource_Manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' ); |
|
166 | - $Message_Resource_Manager->deactivate_message_type( $message_type_name ); |
|
167 | - unset( self::$_ee_message_type_registry[ $message_type_name ] ); |
|
165 | + $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager'); |
|
166 | + $Message_Resource_Manager->deactivate_message_type($message_type_name); |
|
167 | + unset(self::$_ee_message_type_registry[$message_type_name]); |
|
168 | 168 | } |
169 | 169 | } |
170 | 170 | |
@@ -178,12 +178,12 @@ discard block |
||
178 | 178 | * @param array $messagetype_files The current array of message type file names |
179 | 179 | * @return array Array of message type file names |
180 | 180 | */ |
181 | - public static function register_messagetype_files( $messagetype_files ) { |
|
182 | - if ( empty( self::$_ee_message_type_registry ) ) { |
|
181 | + public static function register_messagetype_files($messagetype_files) { |
|
182 | + if (empty(self::$_ee_message_type_registry)) { |
|
183 | 183 | return $messagetype_files; |
184 | 184 | } |
185 | - foreach ( self::$_ee_message_type_registry as $mt_reg ) { |
|
186 | - if ( empty( $mt_reg['mtfilename' ] ) ) { |
|
185 | + foreach (self::$_ee_message_type_registry as $mt_reg) { |
|
186 | + if (empty($mt_reg['mtfilename'])) { |
|
187 | 187 | continue; |
188 | 188 | } |
189 | 189 | $messagetype_files[] = $mt_reg['mtfilename']; |
@@ -203,13 +203,13 @@ discard block |
||
203 | 203 | * @param array $paths array of paths to be checked by EE_messages autoloader. |
204 | 204 | * @return array |
205 | 205 | */ |
206 | - public static function register_msgs_autoload_paths( $paths ) { |
|
207 | - if ( ! empty( self::$_ee_message_type_registry ) ) { |
|
208 | - foreach ( self::$_ee_message_type_registry as $mt_reg ) { |
|
209 | - if ( empty( $mt_reg['autoloadpaths'] ) ) { |
|
206 | + public static function register_msgs_autoload_paths($paths) { |
|
207 | + if ( ! empty(self::$_ee_message_type_registry)) { |
|
208 | + foreach (self::$_ee_message_type_registry as $mt_reg) { |
|
209 | + if (empty($mt_reg['autoloadpaths'])) { |
|
210 | 210 | continue; |
211 | 211 | } |
212 | - $paths = array_merge( $paths, $mt_reg['autoloadpaths'] ); |
|
212 | + $paths = array_merge($paths, $mt_reg['autoloadpaths']); |
|
213 | 213 | } |
214 | 214 | } |
215 | 215 | return $paths; |
@@ -228,18 +228,18 @@ discard block |
||
228 | 228 | * @param EE_messenger $messenger The EE_messenger the filter is called from. |
229 | 229 | * @return array |
230 | 230 | */ |
231 | - public static function register_messengers_to_activate_mt_with( $default_types, EE_messenger $messenger ) { |
|
232 | - if ( empty( self::$_ee_message_type_registry ) ) { |
|
231 | + public static function register_messengers_to_activate_mt_with($default_types, EE_messenger $messenger) { |
|
232 | + if (empty(self::$_ee_message_type_registry)) { |
|
233 | 233 | return $default_types; |
234 | 234 | } |
235 | - foreach ( self::$_ee_message_type_registry as $message_type_name => $mt_reg ) { |
|
236 | - if ( empty( $mt_reg['messengers_to_activate_with'] ) || empty( $mt_reg['mtfilename'] ) ) { |
|
235 | + foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) { |
|
236 | + if (empty($mt_reg['messengers_to_activate_with']) || empty($mt_reg['mtfilename'])) { |
|
237 | 237 | continue; |
238 | 238 | } |
239 | 239 | // loop through each of the messengers and if it matches the loaded class |
240 | 240 | // then we add this message type to the |
241 | - foreach ( $mt_reg['messengers_to_activate_with'] as $msgr ) { |
|
242 | - if ( $messenger->name == $msgr ) { |
|
241 | + foreach ($mt_reg['messengers_to_activate_with'] as $msgr) { |
|
242 | + if ($messenger->name == $msgr) { |
|
243 | 243 | $default_types[] = $message_type_name; |
244 | 244 | } |
245 | 245 | } |
@@ -259,18 +259,18 @@ discard block |
||
259 | 259 | * @param EE_messenger $messenger The EE_messenger the filter is called from. |
260 | 260 | * @return array |
261 | 261 | */ |
262 | - public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) { |
|
263 | - if ( empty( self::$_ee_message_type_registry ) ) { |
|
262 | + public static function register_messengers_to_validate_mt_with($valid_types, EE_messenger $messenger) { |
|
263 | + if (empty(self::$_ee_message_type_registry)) { |
|
264 | 264 | return $valid_types; |
265 | 265 | } |
266 | - foreach ( self::$_ee_message_type_registry as $message_type_name => $mt_reg ) { |
|
267 | - if ( empty( $mt_reg['messengers_to_validate_with'] ) || empty( $mt_reg['mtfilename'] ) ) { |
|
266 | + foreach (self::$_ee_message_type_registry as $message_type_name => $mt_reg) { |
|
267 | + if (empty($mt_reg['messengers_to_validate_with']) || empty($mt_reg['mtfilename'])) { |
|
268 | 268 | continue; |
269 | 269 | } |
270 | 270 | // loop through each of the messengers and if it matches the loaded class |
271 | 271 | // then we add this message type to the |
272 | - foreach ( $mt_reg['messengers_to_validate_with'] as $msgr ) { |
|
273 | - if ( $messenger->name == $msgr ) { |
|
272 | + foreach ($mt_reg['messengers_to_validate_with'] as $msgr) { |
|
273 | + if ($messenger->name == $msgr) { |
|
274 | 274 | $valid_types[] = $message_type_name; |
275 | 275 | } |
276 | 276 | } |
@@ -251,14 +251,14 @@ |
||
251 | 251 | |
252 | 252 | |
253 | 253 | /** |
254 | - * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter. |
|
255 | - * |
|
256 | - * @since 4.3.0 |
|
257 | - * @param array $valid_types array of message types valid with messenger ( |
|
258 | - * corresponds to the $name property of message type) |
|
259 | - * @param EE_messenger $messenger The EE_messenger the filter is called from. |
|
260 | - * @return array |
|
261 | - */ |
|
254 | + * callback for FHEE__EE_messenger__get_valid_message_types__default_types filter. |
|
255 | + * |
|
256 | + * @since 4.3.0 |
|
257 | + * @param array $valid_types array of message types valid with messenger ( |
|
258 | + * corresponds to the $name property of message type) |
|
259 | + * @param EE_messenger $messenger The EE_messenger the filter is called from. |
|
260 | + * @return array |
|
261 | + */ |
|
262 | 262 | public static function register_messengers_to_validate_mt_with( $valid_types, EE_messenger $messenger ) { |
263 | 263 | if ( empty( self::$_ee_message_type_registry ) ) { |
264 | 264 | return $valid_types; |
@@ -1,5 +1,5 @@ discard block |
||
1 | -<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
2 | - exit( 'No direct script access allowed' ); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | 3 | } |
4 | 4 | /** |
5 | 5 | * Event Espresso |
@@ -43,23 +43,23 @@ discard block |
||
43 | 43 | * @param bool $delete true=>delete, false=>restore |
44 | 44 | * @return bool|int |
45 | 45 | */ |
46 | - public function delete_or_restore( $delete = true ) { |
|
46 | + public function delete_or_restore($delete = true) { |
|
47 | 47 | /** |
48 | 48 | * Called just before trashing (soft delete) or restoring a trashed item. |
49 | 49 | * |
50 | 50 | * @param EE_Base_Class $model_object about to be trashed or restored |
51 | 51 | * @param bool $delete true the item is being trashed, false the item is being restored. |
52 | 52 | */ |
53 | - do_action( 'AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__before', $this, $delete ); |
|
53 | + do_action('AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__before', $this, $delete); |
|
54 | 54 | $model = $this->get_model(); |
55 | - $result = $model->delete_or_restore_by_ID( $delete, $this->ID() ); |
|
55 | + $result = $model->delete_or_restore_by_ID($delete, $this->ID()); |
|
56 | 56 | /** |
57 | 57 | * Called just after trashing (soft delete) or restoring a trashed item. |
58 | 58 | * @param EE_Base_Class $model_object that was just trashed or restored. |
59 | 59 | * @param bool $delete true the item is being trashed, false the item is being restored. |
60 | 60 | * @param bool|int $result |
61 | 61 | */ |
62 | - do_action( 'AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__after', $this, $delete, $result ); |
|
62 | + do_action('AHEE__EE_Soft_Delete_Base_Class__delete_or_restore__after', $this, $delete, $result); |
|
63 | 63 | return $result; |
64 | 64 | } |
65 | 65 | |
@@ -70,6 +70,6 @@ discard block |
||
70 | 70 | * @return bool|int |
71 | 71 | */ |
72 | 72 | public function restore() { |
73 | - return $this->delete_or_restore( false ); |
|
73 | + return $this->delete_or_restore(false); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | \ No newline at end of file |
@@ -128,7 +128,7 @@ |
||
128 | 128 | if( $subsection->form_data_present_in( $req_data ) ) { |
129 | 129 | try{ |
130 | 130 | $subsection->_normalize($req_data); |
131 | - }catch( EE_Validation_Error $e ){ |
|
131 | + } catch( EE_Validation_Error $e ){ |
|
132 | 132 | $subsection->add_validation_error( $e ); |
133 | 133 | } |
134 | 134 | } |
@@ -13,11 +13,11 @@ discard block |
||
13 | 13 | * @since 4.8.30.rc.009 |
14 | 14 | * |
15 | 15 | */ |
16 | -if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
17 | - exit( 'No direct script access allowed' ); |
|
16 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
17 | + exit('No direct script access allowed'); |
|
18 | 18 | } |
19 | 19 | |
20 | -class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper{ |
|
20 | +class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper { |
|
21 | 21 | /** |
22 | 22 | * |
23 | 23 | * @var EE_Registration |
@@ -29,16 +29,16 @@ discard block |
||
29 | 29 | * @param EE_Registration $reg |
30 | 30 | * @param array $options |
31 | 31 | */ |
32 | - public function __construct( EE_Registration $reg, $options = array() ) { |
|
32 | + public function __construct(EE_Registration $reg, $options = array()) { |
|
33 | 33 | $this->_registration = $reg; |
34 | - if( ! isset( $options[ 'layout_strategy' ] ) ) { |
|
35 | - $options[ 'layout_strategy' ] = new EE_Admin_Two_Column_Layout(); |
|
34 | + if ( ! isset($options['layout_strategy'])) { |
|
35 | + $options['layout_strategy'] = new EE_Admin_Two_Column_Layout(); |
|
36 | 36 | } |
37 | - if( ! isset( $options[ 'html_id' ] ) ) { |
|
38 | - $options[ 'html_id' ] = 'reg-admin-attendee-questions-frm'; |
|
37 | + if ( ! isset($options['html_id'])) { |
|
38 | + $options['html_id'] = 'reg-admin-attendee-questions-frm'; |
|
39 | 39 | } |
40 | 40 | $this->build_form_from_registration(); |
41 | - parent::__construct( $options ); |
|
41 | + parent::__construct($options); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | |
53 | 53 | public function build_form_from_registration() { |
54 | 54 | $reg = $this->get_registration(); |
55 | - if( ! $reg instanceof EE_Registration ) { |
|
56 | - throw new EE_Error( __( 'We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso') ); |
|
55 | + if ( ! $reg instanceof EE_Registration) { |
|
56 | + throw new EE_Error(__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso')); |
|
57 | 57 | } |
58 | 58 | //we want to get all their question groups |
59 | 59 | $question_groups = EEM_Question_Group::instance()->get_all( |
@@ -63,16 +63,16 @@ discard block |
||
63 | 63 | 'Event_Question_Group.EQG_primary' => $reg->count() == 1 ? TRUE : FALSE, |
64 | 64 | 'OR' => array( |
65 | 65 | 'Question.QST_system*blank' => '', |
66 | - 'Question.QST_system*null' => array( 'IS_NULL' ) |
|
66 | + 'Question.QST_system*null' => array('IS_NULL') |
|
67 | 67 | ) |
68 | 68 | ), |
69 | - 'order_by' => array( 'QSG_order' => 'ASC' ) |
|
69 | + 'order_by' => array('QSG_order' => 'ASC') |
|
70 | 70 | ) |
71 | 71 | ); |
72 | 72 | //get each question groups questions |
73 | - foreach( $question_groups as $question_group ) { |
|
74 | - if ( $question_group instanceof EE_Question_Group ) { |
|
75 | - $this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group( |
|
73 | + foreach ($question_groups as $question_group) { |
|
74 | + if ($question_group instanceof EE_Question_Group) { |
|
75 | + $this->_subsections[$question_group->ID()] = $this->build_subform_from_question_group( |
|
76 | 76 | $question_group, |
77 | 77 | $reg |
78 | 78 | ); |
@@ -89,16 +89,16 @@ discard block |
||
89 | 89 | * @return \EE_Form_Section_Proper |
90 | 90 | * @throws \EE_Error |
91 | 91 | */ |
92 | - public function build_subform_from_question_group( $question_group, $registration ) { |
|
93 | - if( ! $question_group instanceof EE_Question_Group || |
|
92 | + public function build_subform_from_question_group($question_group, $registration) { |
|
93 | + if ( ! $question_group instanceof EE_Question_Group || |
|
94 | 94 | ! $registration instanceof EE_Registration) { |
95 | - throw new EE_Error( __( 'A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso' ) ); |
|
95 | + throw new EE_Error(__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso')); |
|
96 | 96 | } |
97 | 97 | $parts_of_subsection = array( |
98 | 98 | 'title' => new EE_Form_Section_HTML( |
99 | - EEH_HTML::h5( $question_group->name(), |
|
99 | + EEH_HTML::h5($question_group->name(), |
|
100 | 100 | $question_group->identifier(), |
101 | - 'espresso-question-group-title-h5 section-title' ) |
|
101 | + 'espresso-question-group-title-h5 section-title') |
|
102 | 102 | ) |
103 | 103 | ); |
104 | 104 | $questions = $question_group->questions( |
@@ -106,17 +106,17 @@ discard block |
||
106 | 106 | array( |
107 | 107 | 'OR' => array( |
108 | 108 | 'QST_system*blank' => '', |
109 | - 'QST_system*null' => array( 'IS_NULL' ) |
|
109 | + 'QST_system*null' => array('IS_NULL') |
|
110 | 110 | ) |
111 | 111 | ) |
112 | 112 | ) |
113 | 113 | ); |
114 | - foreach( $questions as $question ) { |
|
115 | - $parts_of_subsection[ $question->ID() ] = $question->generate_form_input( $registration ); |
|
114 | + foreach ($questions as $question) { |
|
115 | + $parts_of_subsection[$question->ID()] = $question->generate_form_input($registration); |
|
116 | 116 | } |
117 | - $parts_of_subsection[ 'edit_link' ] = new EE_Form_Section_HTML( |
|
118 | - '<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '"> |
|
119 | - <span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span> |
|
117 | + $parts_of_subsection['edit_link'] = new EE_Form_Section_HTML( |
|
118 | + '<tr><th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" title="'.esc_attr__('click to edit question', 'event_espresso').'"> |
|
119 | + <span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span> |
|
120 | 120 | <div class="dashicons dashicons-edit"></div> |
121 | 121 | </a></td></tr>' |
122 | 122 | ); |
@@ -136,12 +136,12 @@ discard block |
||
136 | 136 | protected function _normalize($req_data) { |
137 | 137 | $this->_received_submission = TRUE; |
138 | 138 | $this->_validation_errors = array(); |
139 | - foreach($this->get_validatable_subsections() as $subsection){ |
|
140 | - if( $subsection->form_data_present_in( $req_data ) ) { |
|
141 | - try{ |
|
139 | + foreach ($this->get_validatable_subsections() as $subsection) { |
|
140 | + if ($subsection->form_data_present_in($req_data)) { |
|
141 | + try { |
|
142 | 142 | $subsection->_normalize($req_data); |
143 | - }catch( EE_Validation_Error $e ){ |
|
144 | - $subsection->add_validation_error( $e ); |
|
143 | + } catch (EE_Validation_Error $e) { |
|
144 | + $subsection->add_validation_error($e); |
|
145 | 145 | } |
146 | 146 | } |
147 | 147 | } |
@@ -156,13 +156,13 @@ discard block |
||
156 | 156 | * calling parent::_validate() first. |
157 | 157 | */ |
158 | 158 | protected function _validate() { |
159 | - foreach($this->get_validatable_subsections() as $subsection_name => $subsection){ |
|
160 | - if( $subsection->form_data_present_in( array_merge( $_GET, $_POST ) ) ) { |
|
161 | - if(method_exists($this,'_validate_'.$subsection_name)){ |
|
162 | - call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection)); |
|
159 | + foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) { |
|
160 | + if ($subsection->form_data_present_in(array_merge($_GET, $_POST))) { |
|
161 | + if (method_exists($this, '_validate_'.$subsection_name)) { |
|
162 | + call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection)); |
|
163 | 163 | } |
164 | 164 | $subsection->_validate(); |
165 | - } elseif( $subsection instanceof EE_Form_Section_Proper ) { |
|
165 | + } elseif ($subsection instanceof EE_Form_Section_Proper) { |
|
166 | 166 | $subsection->_received_submission = true; |
167 | 167 | } |
168 | 168 | } |