@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | /** |
202 | 202 | * Overrides parent ot also check by the slug |
203 | 203 | * @see EEM_Base::ensure_is_obj() |
204 | - * @param string|int|EE_Payment_Method $base_class_obj_or_id |
|
204 | + * @param EE_Payment_Method $base_class_obj_or_id |
|
205 | 205 | * @param boolean $ensure_is_in_db |
206 | 206 | * @return EE_Payment_Method |
207 | 207 | * @throws EE_Error |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | /** |
230 | 230 | * Gets the ID of this object, or if its a string finds the object's id |
231 | 231 | * associated with that slug |
232 | - * @param mixed $base_obj_or_id_or_slug |
|
232 | + * @param EE_Payment_Method $base_obj_or_id_or_slug |
|
233 | 233 | * @return int |
234 | 234 | */ |
235 | 235 | function ensure_is_ID( $base_obj_or_id_or_slug ) { |
@@ -2,19 +2,19 @@ |
||
2 | 2 | exit( 'No direct script access allowed' ); |
3 | 3 | } |
4 | 4 | /** |
5 | - * |
|
6 | - * Payment Method Model |
|
7 | - * |
|
8 | - * For storing all payment methods (things that interact between EE and gateways). |
|
9 | - * As of 4.3, payment methods are NOT singletons so there can be multiple instances of payment methods |
|
10 | - * of the same type, with different details. Eg, multiple paypal standard gateways so different |
|
11 | - * events can have their proceeds going to different paypal accounts |
|
12 | - * |
|
13 | - * @package Event Espresso |
|
14 | - * @subpackage includes/models/EEM_Checkin.model.php |
|
15 | - * @author Mike Nelson |
|
16 | - * |
|
17 | - */ |
|
5 | + * |
|
6 | + * Payment Method Model |
|
7 | + * |
|
8 | + * For storing all payment methods (things that interact between EE and gateways). |
|
9 | + * As of 4.3, payment methods are NOT singletons so there can be multiple instances of payment methods |
|
10 | + * of the same type, with different details. Eg, multiple paypal standard gateways so different |
|
11 | + * events can have their proceeds going to different paypal accounts |
|
12 | + * |
|
13 | + * @package Event Espresso |
|
14 | + * @subpackage includes/models/EEM_Checkin.model.php |
|
15 | + * @author Mike Nelson |
|
16 | + * |
|
17 | + */ |
|
18 | 18 | class EEM_Payment_Method extends EEM_Base { |
19 | 19 | |
20 | 20 | const scope_cart = 'CART'; |
@@ -217,8 +217,7 @@ discard block |
||
217 | 217 | //ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID) |
218 | 218 | try { |
219 | 219 | return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db ); |
220 | - } |
|
221 | - catch ( EE_Error $e ) { |
|
220 | + } catch ( EE_Error $e ) { |
|
222 | 221 | //handle it outside the catch |
223 | 222 | } |
224 | 223 | throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) ); |
@@ -283,8 +282,7 @@ discard block |
||
283 | 282 | break; |
284 | 283 | } |
285 | 284 | } |
286 | - } |
|
287 | - catch ( EE_Error $e ) { |
|
285 | + } catch ( EE_Error $e ) { |
|
288 | 286 | $payment_method->set_active( FALSE ); |
289 | 287 | } |
290 | 288 | } |
@@ -307,8 +305,7 @@ discard block |
||
307 | 305 | try { |
308 | 306 | $payment_method->type_obj(); |
309 | 307 | $usable_payment_methods[ $key ] = $payment_method; |
310 | - } |
|
311 | - catch ( EE_Error $e ) { |
|
308 | + } catch ( EE_Error $e ) { |
|
312 | 309 | //if it threw an exception, its because the payment type object |
313 | 310 | //isn't defined (probably because somehow the DB got borked, |
314 | 311 | //or an addon which defined it got deactivated |
@@ -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 | * |
@@ -37,33 +37,33 @@ discard block |
||
37 | 37 | * @access protected |
38 | 38 | * @return EEM_Payment_Method |
39 | 39 | */ |
40 | - protected function __construct( $timezone = NULL ) { |
|
41 | - $this->singlular_item = __( 'Payment Method', 'event_espresso' ); |
|
42 | - $this->plural_item = __( 'Payment Methods', 'event_espresso' ); |
|
43 | - $this->_tables = array( 'Payment_Method' => new EE_Primary_Table( 'esp_payment_method', 'PMD_ID' ) ); |
|
40 | + protected function __construct($timezone = NULL) { |
|
41 | + $this->singlular_item = __('Payment Method', 'event_espresso'); |
|
42 | + $this->plural_item = __('Payment Methods', 'event_espresso'); |
|
43 | + $this->_tables = array('Payment_Method' => new EE_Primary_Table('esp_payment_method', 'PMD_ID')); |
|
44 | 44 | $this->_fields = array( |
45 | 45 | 'Payment_Method' => array( |
46 | - 'PMD_ID' => new EE_Primary_Key_Int_Field( 'PMD_ID', __( "ID", 'event_espresso' ) ), |
|
47 | - 'PMD_type' => new EE_Plain_Text_Field( 'PMD_type', __( "Payment Method Type", 'event_espresso' ), FALSE, 'Admin_Only' ), |
|
48 | - 'PMD_name' => new EE_Plain_Text_Field( 'PMD_name', __( "Name", 'event_espresso' ), FALSE ), |
|
49 | - 'PMD_desc' => new EE_Post_Content_Field( 'PMD_desc', __( "Description", 'event_espresso' ), FALSE, '' ), |
|
50 | - 'PMD_admin_name' => new EE_Plain_Text_Field( 'PMD_admin_name', __( "Admin-Only Name", 'event_espresso' ), TRUE ), |
|
51 | - 'PMD_admin_desc' => new EE_Post_Content_Field( 'PMD_admin_desc', __( "Admin-Only Description", 'event_espresso' ), TRUE ), |
|
52 | - 'PMD_slug' => new EE_Slug_Field( 'PMD_slug', __( "Slug", 'event_espresso' ), FALSE ), |
|
53 | - 'PMD_order' => new EE_Integer_Field( 'PMD_order', __( "Order", 'event_espresso' ), FALSE, 0 ), |
|
54 | - 'PMD_debug_mode' => new EE_Boolean_Field( 'PMD_debug_mode', __( "Debug Mode On?", 'event_espresso' ), FALSE, FALSE ), |
|
55 | - 'PMD_wp_user' => new EE_WP_User_Field( 'PMD_wp_user', __( "Payment Method Creator ID", 'event_espresso' ), FALSE ), |
|
56 | - 'PMD_open_by_default' => new EE_Boolean_Field( 'PMD_open_by_default', __( "Open by Default?", 'event_espresso' ), FALSE, FALSE ), 'PMD_button_url' => new EE_Plain_Text_Field( 'PMD_button_url', __( "Button URL", 'event_espresso' ), TRUE, '' ), |
|
57 | - 'PMD_scope' => new EE_Serialized_Text_Field( 'PMD_scope', __( "Usable From?", 'event_espresso' ), FALSE, array() ), //possible values currently are 'CART','ADMIN','API' |
|
46 | + 'PMD_ID' => new EE_Primary_Key_Int_Field('PMD_ID', __("ID", 'event_espresso')), |
|
47 | + 'PMD_type' => new EE_Plain_Text_Field('PMD_type', __("Payment Method Type", 'event_espresso'), FALSE, 'Admin_Only'), |
|
48 | + 'PMD_name' => new EE_Plain_Text_Field('PMD_name', __("Name", 'event_espresso'), FALSE), |
|
49 | + 'PMD_desc' => new EE_Post_Content_Field('PMD_desc', __("Description", 'event_espresso'), FALSE, ''), |
|
50 | + 'PMD_admin_name' => new EE_Plain_Text_Field('PMD_admin_name', __("Admin-Only Name", 'event_espresso'), TRUE), |
|
51 | + 'PMD_admin_desc' => new EE_Post_Content_Field('PMD_admin_desc', __("Admin-Only Description", 'event_espresso'), TRUE), |
|
52 | + 'PMD_slug' => new EE_Slug_Field('PMD_slug', __("Slug", 'event_espresso'), FALSE), |
|
53 | + 'PMD_order' => new EE_Integer_Field('PMD_order', __("Order", 'event_espresso'), FALSE, 0), |
|
54 | + 'PMD_debug_mode' => new EE_Boolean_Field('PMD_debug_mode', __("Debug Mode On?", 'event_espresso'), FALSE, FALSE), |
|
55 | + 'PMD_wp_user' => new EE_WP_User_Field('PMD_wp_user', __("Payment Method Creator ID", 'event_espresso'), FALSE), |
|
56 | + 'PMD_open_by_default' => new EE_Boolean_Field('PMD_open_by_default', __("Open by Default?", 'event_espresso'), FALSE, FALSE), 'PMD_button_url' => new EE_Plain_Text_Field('PMD_button_url', __("Button URL", 'event_espresso'), TRUE, ''), |
|
57 | + 'PMD_scope' => new EE_Serialized_Text_Field('PMD_scope', __("Usable From?", 'event_espresso'), FALSE, array()), //possible values currently are 'CART','ADMIN','API' |
|
58 | 58 | ) ); |
59 | 59 | $this->_model_relations = array( |
60 | 60 | // 'Event'=>new EE_HABTM_Relation('Event_Payment_Method'), |
61 | 61 | 'Payment' => new EE_Has_Many_Relation(), |
62 | - 'Currency' => new EE_HABTM_Relation( 'Currency_Payment_Method' ), |
|
62 | + 'Currency' => new EE_HABTM_Relation('Currency_Payment_Method'), |
|
63 | 63 | 'Transaction' => new EE_Has_Many_Relation(), |
64 | 64 | 'WP_User' => new EE_Belongs_To_Relation(), |
65 | 65 | ); |
66 | - parent::__construct( $timezone ); |
|
66 | + parent::__construct($timezone); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | |
@@ -73,8 +73,8 @@ discard block |
||
73 | 73 | * @param string $slug |
74 | 74 | * @return EE_Payment_Method |
75 | 75 | */ |
76 | - public function get_one_by_slug( $slug ) { |
|
77 | - return $this->get_one( array( array( 'PMD_slug' => $slug ) ) ); |
|
76 | + public function get_one_by_slug($slug) { |
|
77 | + return $this->get_one(array(array('PMD_slug' => $slug))); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | return apply_filters( |
89 | 89 | 'FHEE__EEM_Payment_Method__scopes', |
90 | 90 | array( |
91 | - self::scope_cart => __( "Front-end Registration Page", 'event_espresso' ), |
|
92 | - self::scope_admin => __( "Admin Registration Page (no online processing)", 'event_espresso' ) |
|
91 | + self::scope_cart => __("Front-end Registration Page", 'event_espresso'), |
|
92 | + self::scope_admin => __("Admin Registration Page (no online processing)", 'event_espresso') |
|
93 | 93 | ) |
94 | 94 | ); |
95 | 95 | } |
@@ -101,9 +101,9 @@ discard block |
||
101 | 101 | * @param string $scope like one of EEM_Payment_Method::instance()->scopes() |
102 | 102 | * @return boolean |
103 | 103 | */ |
104 | - public function is_valid_scope( $scope ) { |
|
104 | + public function is_valid_scope($scope) { |
|
105 | 105 | $scopes = $this->scopes(); |
106 | - if ( isset( $scopes[ $scope ] ) ) { |
|
106 | + if (isset($scopes[$scope])) { |
|
107 | 107 | return TRUE; |
108 | 108 | } else { |
109 | 109 | return FALSE; |
@@ -119,11 +119,11 @@ discard block |
||
119 | 119 | * @throws EE_Error |
120 | 120 | * @return EE_Payment_Method[] |
121 | 121 | */ |
122 | - public function get_all_active( $scope = NULL, $query_params = array() ) { |
|
123 | - if( ! isset( $query_params[ 'order_by' ] ) && ! isset( $query_params[ 'order' ] ) ) { |
|
124 | - $query_params = array( 'order_by' => array( 'PMD_order' => 'ASC', 'PMD_ID' => 'ASC' ) ); |
|
122 | + public function get_all_active($scope = NULL, $query_params = array()) { |
|
123 | + if ( ! isset($query_params['order_by']) && ! isset($query_params['order'])) { |
|
124 | + $query_params = array('order_by' => array('PMD_order' => 'ASC', 'PMD_ID' => 'ASC')); |
|
125 | 125 | } |
126 | - return $this->get_all( $this->_get_query_params_for_all_active( $scope, $query_params ) ); |
|
126 | + return $this->get_all($this->_get_query_params_for_all_active($scope, $query_params)); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -132,8 +132,8 @@ discard block |
||
132 | 132 | * @param array $query_params |
133 | 133 | * @return int |
134 | 134 | */ |
135 | - public function count_active( $scope = NULL, $query_params = array() ){ |
|
136 | - return $this->count( $this->_get_query_params_for_all_active( $scope, $query_params ) ); |
|
135 | + public function count_active($scope = NULL, $query_params = array()) { |
|
136 | + return $this->count($this->_get_query_params_for_all_active($scope, $query_params)); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
@@ -144,21 +144,21 @@ discard block |
||
144 | 144 | * @return array like param of EEM_Base::get_all() |
145 | 145 | * @throws EE_Error |
146 | 146 | */ |
147 | - protected function _get_query_params_for_all_active( $scope = NULL, $query_params = array() ){ |
|
148 | - if ( $scope ) { |
|
149 | - if ( $this->is_valid_scope( $scope ) ) { |
|
150 | - return array_replace_recursive( array( array( 'PMD_scope' => array( 'LIKE', "%$scope%" ) ) ), $query_params ); |
|
147 | + protected function _get_query_params_for_all_active($scope = NULL, $query_params = array()) { |
|
148 | + if ($scope) { |
|
149 | + if ($this->is_valid_scope($scope)) { |
|
150 | + return array_replace_recursive(array(array('PMD_scope' => array('LIKE', "%$scope%"))), $query_params); |
|
151 | 151 | } else { |
152 | - throw new EE_Error( sprintf( __( "'%s' is not a valid scope for a payment method", "event_espresso" ), $scope ) ); |
|
152 | + throw new EE_Error(sprintf(__("'%s' is not a valid scope for a payment method", "event_espresso"), $scope)); |
|
153 | 153 | } |
154 | 154 | } else { |
155 | 155 | $acceptable_scopes = array(); |
156 | 156 | $count = 0; |
157 | - foreach ( $this->scopes() as $scope_name => $desc ) { |
|
157 | + foreach ($this->scopes() as $scope_name => $desc) { |
|
158 | 158 | $count++; |
159 | - $acceptable_scopes[ 'PMD_scope*' . $count ] = array( 'LIKE', '%' . $scope_name . '%' ); |
|
159 | + $acceptable_scopes['PMD_scope*'.$count] = array('LIKE', '%'.$scope_name.'%'); |
|
160 | 160 | } |
161 | - return array_replace_recursive( array( array( 'OR*active_scope' => $acceptable_scopes ) ), $query_params ); |
|
161 | + return array_replace_recursive(array(array('OR*active_scope' => $acceptable_scopes)), $query_params); |
|
162 | 162 | } |
163 | 163 | } |
164 | 164 | |
@@ -170,8 +170,8 @@ discard block |
||
170 | 170 | * @return array like param of EEM_Base::get_all() |
171 | 171 | * @throws EE_Error |
172 | 172 | */ |
173 | - public function get_query_params_for_all_active( $scope = NULL, $query_params = array() ) { |
|
174 | - return $this->_get_query_params_for_all_active( $scope, $query_params ); |
|
173 | + public function get_query_params_for_all_active($scope = NULL, $query_params = array()) { |
|
174 | + return $this->_get_query_params_for_all_active($scope, $query_params); |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | |
@@ -181,8 +181,8 @@ discard block |
||
181 | 181 | * @param array $query_params |
182 | 182 | * @return EE_Payment_Method |
183 | 183 | */ |
184 | - public function get_one_active( $scope = NULL, $query_params = array() ) { |
|
185 | - return $this->get_one( $this->_get_query_params_for_all_active( $scope, $query_params ) ); |
|
184 | + public function get_one_active($scope = NULL, $query_params = array()) { |
|
185 | + return $this->get_one($this->_get_query_params_for_all_active($scope, $query_params)); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | |
@@ -192,8 +192,8 @@ discard block |
||
192 | 192 | * @param string $type |
193 | 193 | * @return EE_Payment_Method |
194 | 194 | */ |
195 | - public function get_one_of_type( $type ) { |
|
196 | - return $this->get_one( array( array( 'PMD_type' => $type ) ) ); |
|
195 | + public function get_one_of_type($type) { |
|
196 | + return $this->get_one(array(array('PMD_type' => $type))); |
|
197 | 197 | } |
198 | 198 | |
199 | 199 | |
@@ -206,22 +206,22 @@ discard block |
||
206 | 206 | * @return EE_Payment_Method |
207 | 207 | * @throws EE_Error |
208 | 208 | */ |
209 | - public function ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db = FALSE ) { |
|
209 | + public function ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db = FALSE) { |
|
210 | 210 | //first: check if it's a slug |
211 | - if( is_string( $base_class_obj_or_id ) ) { |
|
212 | - $obj = $this->get_one_by_slug( $base_class_obj_or_id ); |
|
213 | - if( $obj ) { |
|
211 | + if (is_string($base_class_obj_or_id)) { |
|
212 | + $obj = $this->get_one_by_slug($base_class_obj_or_id); |
|
213 | + if ($obj) { |
|
214 | 214 | return $obj; |
215 | 215 | } |
216 | 216 | } |
217 | 217 | //ok so it wasn't a slug we were passed. try the usual then (ie, it's an object or an ID) |
218 | 218 | try { |
219 | - return parent::ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db ); |
|
219 | + return parent::ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db); |
|
220 | 220 | } |
221 | - catch ( EE_Error $e ) { |
|
221 | + catch (EE_Error $e) { |
|
222 | 222 | //handle it outside the catch |
223 | 223 | } |
224 | - throw new EE_Error( sprintf( __( "'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso" ), $base_class_obj_or_id ) ); |
|
224 | + throw new EE_Error(sprintf(__("'%s' is neither a Payment Method ID, slug, nor object.", "event_espresso"), $base_class_obj_or_id)); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | |
@@ -232,12 +232,12 @@ discard block |
||
232 | 232 | * @param mixed $base_obj_or_id_or_slug |
233 | 233 | * @return int |
234 | 234 | */ |
235 | - function ensure_is_ID( $base_obj_or_id_or_slug ) { |
|
236 | - if ( is_string( $base_obj_or_id_or_slug ) ) { |
|
235 | + function ensure_is_ID($base_obj_or_id_or_slug) { |
|
236 | + if (is_string($base_obj_or_id_or_slug)) { |
|
237 | 237 | //assume it's a slug |
238 | - $base_obj_or_id_or_slug = $this->get_one_by_slug( $base_obj_or_id_or_slug ); |
|
238 | + $base_obj_or_id_or_slug = $this->get_one_by_slug($base_obj_or_id_or_slug); |
|
239 | 239 | } |
240 | - return parent::ensure_is_ID( $base_obj_or_id_or_slug ); |
|
240 | + return parent::ensure_is_ID($base_obj_or_id_or_slug); |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | |
@@ -246,24 +246,24 @@ discard block |
||
246 | 246 | * Verifies the button urls on all the passed payment methods have a valid button url. If not, resets them to their default. |
247 | 247 | * @param EE_Payment_Method[] $payment_methods. If NULL is provided defaults to all payment methods active in the cart |
248 | 248 | */ |
249 | - function verify_button_urls( $payment_methods = NULL ) { |
|
250 | - EE_Registry::instance()->load_helper( 'URL' ); |
|
251 | - $payment_methods = is_array( $payment_methods ) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart); |
|
252 | - foreach ( $payment_methods as $payment_method ) { |
|
249 | + function verify_button_urls($payment_methods = NULL) { |
|
250 | + EE_Registry::instance()->load_helper('URL'); |
|
251 | + $payment_methods = is_array($payment_methods) ? $payment_methods : $this->get_all_active(EEM_Payment_Method::scope_cart); |
|
252 | + foreach ($payment_methods as $payment_method) { |
|
253 | 253 | try { |
254 | 254 | $current_button_url = $payment_method->button_url(); |
255 | - $buttons_urls_to_try = apply_filters( 'FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array( |
|
256 | - 'current_ssl' => str_replace( "http://", "https://", $current_button_url ), |
|
257 | - 'current' => str_replace( "https://", "http://", $current_button_url ), |
|
258 | - 'default_ssl' => str_replace( "http://", "https://", $payment_method->type_obj()->default_button_url() ), |
|
259 | - 'default' => str_replace( "https://", "http://", $payment_method->type_obj()->default_button_url() ), |
|
260 | - ) ); |
|
261 | - foreach( $buttons_urls_to_try as $button_url_to_try ) { |
|
262 | - if( $button_url_to_try && |
|
263 | - EEH_URL::remote_file_exists( $button_url_to_try ) ) { |
|
264 | - if( $current_button_url != $button_url_to_try ){ |
|
265 | - $payment_method->save( array( 'PMD_button_url' => $button_url_to_try ) ); |
|
266 | - EE_Error::add_attention( sprintf( __( "Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso" ), $payment_method->name(), $button_url_to_try ) ); |
|
255 | + $buttons_urls_to_try = apply_filters('FHEE__EEM_Payment_Method__verify_button_urls__button_urls_to_try', array( |
|
256 | + 'current_ssl' => str_replace("http://", "https://", $current_button_url), |
|
257 | + 'current' => str_replace("https://", "http://", $current_button_url), |
|
258 | + 'default_ssl' => str_replace("http://", "https://", $payment_method->type_obj()->default_button_url()), |
|
259 | + 'default' => str_replace("https://", "http://", $payment_method->type_obj()->default_button_url()), |
|
260 | + )); |
|
261 | + foreach ($buttons_urls_to_try as $button_url_to_try) { |
|
262 | + if ($button_url_to_try && |
|
263 | + EEH_URL::remote_file_exists($button_url_to_try)) { |
|
264 | + if ($current_button_url != $button_url_to_try) { |
|
265 | + $payment_method->save(array('PMD_button_url' => $button_url_to_try)); |
|
266 | + EE_Error::add_attention(sprintf(__("Payment Method %s's button url was set to %s, because the old image either didnt exist or SSL was recently enabled.", "event_espresso"), $payment_method->name(), $button_url_to_try)); |
|
267 | 267 | } |
268 | 268 | //this image exists. So if wasn't set before, now it is; |
269 | 269 | //or if it was already set, we have nothing to do |
@@ -271,8 +271,8 @@ discard block |
||
271 | 271 | } |
272 | 272 | } |
273 | 273 | } |
274 | - catch ( EE_Error $e ) { |
|
275 | - $payment_method->set_active( FALSE ); |
|
274 | + catch (EE_Error $e) { |
|
275 | + $payment_method->set_active(FALSE); |
|
276 | 276 | } |
277 | 277 | } |
278 | 278 | } |
@@ -286,23 +286,23 @@ discard block |
||
286 | 286 | * @param array $rows |
287 | 287 | * @return EE_Payment_Method[] |
288 | 288 | */ |
289 | - protected function _create_objects( $rows = array() ) { |
|
290 | - $payment_methods = parent::_create_objects( $rows ); |
|
289 | + protected function _create_objects($rows = array()) { |
|
290 | + $payment_methods = parent::_create_objects($rows); |
|
291 | 291 | /* @var $payment_methods EE_Payment_Method[] */ |
292 | 292 | $usable_payment_methods = array(); |
293 | - foreach ( $payment_methods as $key => $payment_method ) { |
|
293 | + foreach ($payment_methods as $key => $payment_method) { |
|
294 | 294 | try { |
295 | 295 | $payment_method->type_obj(); |
296 | - $usable_payment_methods[ $key ] = $payment_method; |
|
296 | + $usable_payment_methods[$key] = $payment_method; |
|
297 | 297 | } |
298 | - catch ( EE_Error $e ) { |
|
298 | + catch (EE_Error $e) { |
|
299 | 299 | //if it threw an exception, its because the payment type object |
300 | 300 | //isn't defined (probably because somehow the DB got borked, |
301 | 301 | //or an addon which defined it got deactivated |
302 | 302 | //so deactivate it and move on |
303 | 303 | $payment_method->deactivate(); |
304 | 304 | $payment_method->save(); |
305 | - EE_Error::add_attention( sprintf( __( "There is no payment method type '%s', so the payment method '%s' was deactivated", "event_espresso" ), $payment_method->type(), $payment_method->name() ), __FILE__, __FUNCTION__, __LINE__ ); |
|
305 | + EE_Error::add_attention(sprintf(__("There is no payment method type '%s', so the payment method '%s' was deactivated", "event_espresso"), $payment_method->type(), $payment_method->name()), __FILE__, __FUNCTION__, __LINE__); |
|
306 | 306 | } |
307 | 307 | } |
308 | 308 | return $usable_payment_methods; |
@@ -318,16 +318,16 @@ discard block |
||
318 | 318 | * @param string $scope @see EEM_Payment_Method::get_all_for_events |
319 | 319 | * @return EE_Payment_Method[] |
320 | 320 | */ |
321 | - public function get_all_for_transaction( $transaction, $scope ) { |
|
321 | + public function get_all_for_transaction($transaction, $scope) { |
|
322 | 322 | //@todo take relations between events and payment methods into account, once that relation exists |
323 | - if ( $transaction instanceof EE_Transaction ) { |
|
323 | + if ($transaction instanceof EE_Transaction) { |
|
324 | 324 | //@todo take the relation between transaction and currencies into account |
325 | 325 | } |
326 | - $currencies_for_events = array( EE_Config::instance()->currency->code ); |
|
326 | + $currencies_for_events = array(EE_Config::instance()->currency->code); |
|
327 | 327 | //give addons a chance to override what payment methods are chosen based on the transaction |
328 | 328 | return apply_filters( |
329 | 329 | 'FHEE__EEM_Payment_Method__get_all_for_transaction__payment_methods', |
330 | - $this->get_all_active( $scope, array( array( 'Currency.CUR_code' => array( 'IN', $currencies_for_events ) ) ) ), |
|
330 | + $this->get_all_active($scope, array(array('Currency.CUR_code' => array('IN', $currencies_for_events)))), |
|
331 | 331 | $transaction, |
332 | 332 | $scope |
333 | 333 | ); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | /** |
44 | 44 | * return an array of Base types. Keys are INTs which are used in the database, |
45 | 45 | * values are text-representations of the base type. |
46 | - * @return array |
|
46 | + * @return integer |
|
47 | 47 | */ |
48 | 48 | public function get_base_types(){ |
49 | 49 | return $this->base_types; |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | * instantiate a new price type object with blank/empty properties |
122 | 122 | * |
123 | 123 | * @access public |
124 | - * @return mixed array on success, FALSE on fail |
|
124 | + * @return EE_Price_Type array on success, FALSE on fail |
|
125 | 125 | */ |
126 | 126 | public function get_new_price_type() { |
127 | 127 | return EE_Price_Type::new_instance(); |
@@ -33,11 +33,11 @@ discard block |
||
33 | 33 | public $type = NULL; |
34 | 34 | |
35 | 35 | /** |
36 | - * Price Base types |
|
37 | - * |
|
38 | - * @access private |
|
39 | - * @var int |
|
40 | - */ |
|
36 | + * Price Base types |
|
37 | + * |
|
38 | + * @access private |
|
39 | + * @var int |
|
40 | + */ |
|
41 | 41 | public $base_types = null; |
42 | 42 | |
43 | 43 | /** |
@@ -144,8 +144,8 @@ discard block |
||
144 | 144 | * |
145 | 145 | * @param type $query_params |
146 | 146 | * @param boolean $allow_blocking if TRUE, matched objects will only be deleted if there is no related model info |
147 | - * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects |
|
148 | - * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB |
|
147 | + * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects |
|
148 | + * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB |
|
149 | 149 | * @return boolean |
150 | 150 | */ |
151 | 151 | public function delete_permanently($query_params = array(), $allow_blocking = true) { |
@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | * |
22 | 22 | * ------------------------------------------------------------------------ |
23 | 23 | */ |
24 | -require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' ); |
|
25 | -require_once ( EE_CLASSES . 'EE_Price_Type.class.php' ); |
|
24 | +require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php'); |
|
25 | +require_once (EE_CLASSES.'EE_Price_Type.class.php'); |
|
26 | 26 | |
27 | 27 | |
28 | 28 | class EEM_Price_Type extends EEM_Soft_Delete_Base { |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * values are text-representations of the base type. |
46 | 46 | * @return array |
47 | 47 | */ |
48 | - public function get_base_types(){ |
|
48 | + public function get_base_types() { |
|
49 | 49 | return $this->base_types; |
50 | 50 | } |
51 | 51 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @param type $base_type_int |
55 | 55 | * @return type |
56 | 56 | */ |
57 | - public function get_base_type_name($base_type_int){ |
|
57 | + public function get_base_type_name($base_type_int) { |
|
58 | 58 | return $this->base_types[$base_type_int]; |
59 | 59 | } |
60 | 60 | |
@@ -79,27 +79,27 @@ discard block |
||
79 | 79 | * @access protected |
80 | 80 | * @return void |
81 | 81 | */ |
82 | - protected function __construct( $timezone = NULL ) { |
|
82 | + protected function __construct($timezone = NULL) { |
|
83 | 83 | $this->base_types = array( |
84 | - EEM_Price_Type::base_type_base_price => __('Price','event_espresso'), |
|
85 | - EEM_Price_Type::base_type_discount => __('Discount','event_espresso'), |
|
86 | - EEM_Price_Type::base_type_surcharge => __('Surcharge','event_espresso'), |
|
87 | - EEM_Price_Type::base_type_tax => __('Tax','event_espresso') ); |
|
88 | - $this->singular_item = __('Price Type','event_espresso'); |
|
89 | - $this->plural_item = __('Price Types','event_espresso'); |
|
84 | + EEM_Price_Type::base_type_base_price => __('Price', 'event_espresso'), |
|
85 | + EEM_Price_Type::base_type_discount => __('Discount', 'event_espresso'), |
|
86 | + EEM_Price_Type::base_type_surcharge => __('Surcharge', 'event_espresso'), |
|
87 | + EEM_Price_Type::base_type_tax => __('Tax', 'event_espresso') ); |
|
88 | + $this->singular_item = __('Price Type', 'event_espresso'); |
|
89 | + $this->plural_item = __('Price Types', 'event_espresso'); |
|
90 | 90 | |
91 | 91 | $this->_tables = array( |
92 | - 'Price_Type'=>new EE_Primary_Table('esp_price_type','PRT_ID') |
|
92 | + 'Price_Type'=>new EE_Primary_Table('esp_price_type', 'PRT_ID') |
|
93 | 93 | ); |
94 | 94 | $this->_fields = array( |
95 | 95 | 'Price_Type'=>array( |
96 | - 'PRT_ID'=>new EE_Primary_Key_Int_Field('PRT_ID', __('Price Type ID','event_espresso')), |
|
97 | - 'PRT_name'=>new EE_Plain_Text_Field('PRT_name', __('Price Type Name','event_espresso'), false, ''), |
|
98 | - 'PBT_ID'=>new EE_Enum_Integer_Field('PBT_ID', __('Price Base type ID, 1 = Price , 2 = Discount , 3 = Surcharge , 4 = Tax','event_espresso'), false, EEM_Price_Type::base_type_base_price, $this->base_types), |
|
99 | - 'PRT_is_percent'=>new EE_Boolean_Field('PRT_is_percent', __('Flag indicating price is a percentage','event_espresso'), false, false), |
|
100 | - 'PRT_order'=>new EE_Integer_Field('PRT_order', __('Order in which price should be applied. ','event_espresso'), false, 0), |
|
101 | - 'PRT_deleted'=>new EE_Trashed_Flag_Field('PRT_deleted', __('Flag indicating price type has been trashed','event_espresso'), false, false), |
|
102 | - 'PRT_wp_user' => new EE_WP_User_Field('PRT_wp_user', __('Price Type Creator ID', 'event_espresso'), FALSE ), |
|
96 | + 'PRT_ID'=>new EE_Primary_Key_Int_Field('PRT_ID', __('Price Type ID', 'event_espresso')), |
|
97 | + 'PRT_name'=>new EE_Plain_Text_Field('PRT_name', __('Price Type Name', 'event_espresso'), false, ''), |
|
98 | + 'PBT_ID'=>new EE_Enum_Integer_Field('PBT_ID', __('Price Base type ID, 1 = Price , 2 = Discount , 3 = Surcharge , 4 = Tax', 'event_espresso'), false, EEM_Price_Type::base_type_base_price, $this->base_types), |
|
99 | + 'PRT_is_percent'=>new EE_Boolean_Field('PRT_is_percent', __('Flag indicating price is a percentage', 'event_espresso'), false, false), |
|
100 | + 'PRT_order'=>new EE_Integer_Field('PRT_order', __('Order in which price should be applied. ', 'event_espresso'), false, 0), |
|
101 | + 'PRT_deleted'=>new EE_Trashed_Flag_Field('PRT_deleted', __('Flag indicating price type has been trashed', 'event_espresso'), false, false), |
|
102 | + 'PRT_wp_user' => new EE_WP_User_Field('PRT_wp_user', __('Price Type Creator ID', 'event_espresso'), FALSE), |
|
103 | 103 | ) |
104 | 104 | ); |
105 | 105 | $this->_model_relations = array( |
@@ -107,10 +107,10 @@ discard block |
||
107 | 107 | 'WP_User' => new EE_Belongs_To_Relation(), |
108 | 108 | ); |
109 | 109 | //this model is generally available for reading |
110 | - $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public(); |
|
110 | + $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public(); |
|
111 | 111 | //all price types are "default" in terms of capability names |
112 | 112 | $this->_caps_slug = 'default_price_types'; |
113 | - parent::__construct( $timezone ); |
|
113 | + parent::__construct($timezone); |
|
114 | 114 | |
115 | 115 | } |
116 | 116 | |
@@ -156,15 +156,15 @@ discard block |
||
156 | 156 | $ID = $query_params[0][$this->get_primary_key_field()->get_name()]; |
157 | 157 | |
158 | 158 | //check if any prices use this price type |
159 | - $prc_query_params = array(array('PRT_ID'=>array('IN',$would_be_deleted_price_type_ids))); |
|
160 | - if ( $prices = $this->get_all_related($ID,'Price',$prc_query_params)) { |
|
159 | + $prc_query_params = array(array('PRT_ID'=>array('IN', $would_be_deleted_price_type_ids))); |
|
160 | + if ($prices = $this->get_all_related($ID, 'Price', $prc_query_params)) { |
|
161 | 161 | $prices_names_and_ids = array(); |
162 | - foreach($prices as $price){ |
|
162 | + foreach ($prices as $price) { |
|
163 | 163 | /* @var $price EE_Price */ |
164 | 164 | $prices_names_and_ids[] = $price->name()."(".$price->ID().")"; |
165 | 165 | } |
166 | - $msg = sprintf(__('The Price Type(s) could not be deleted because there are existing Prices that currently use this Price Type. If you still wish to delete this Price Type, then either delete those Prices or change them to use other Price Types.The prices are: %s', 'event_espresso'),implode(",",$prices_names_and_ids)); |
|
167 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
166 | + $msg = sprintf(__('The Price Type(s) could not be deleted because there are existing Prices that currently use this Price Type. If you still wish to delete this Price Type, then either delete those Prices or change them to use other Price Types.The prices are: %s', 'event_espresso'), implode(",", $prices_names_and_ids)); |
|
167 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
168 | 168 | return FALSE; |
169 | 169 | } |
170 | 170 |
@@ -1,4 +1,6 @@ |
||
1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | +} |
|
2 | 4 | /** |
3 | 5 | * Event Espresso |
4 | 6 | * |
@@ -165,7 +165,7 @@ |
||
165 | 165 | * |
166 | 166 | * @access public |
167 | 167 | * @param $STA_ID |
168 | - * @return mixed array on success, FALSE on fail |
|
168 | + * @return boolean array on success, FALSE on fail |
|
169 | 169 | */ |
170 | 170 | public function delete_by_ID( $STA_ID = FALSE ) { |
171 | 171 |
@@ -64,11 +64,11 @@ discard block |
||
64 | 64 | |
65 | 65 | |
66 | 66 | /** |
67 | - * reset_cached_states |
|
68 | - * |
|
69 | - * @access private |
|
70 | - * @return void |
|
71 | - */ |
|
67 | + * reset_cached_states |
|
68 | + * |
|
69 | + * @access private |
|
70 | + * @return void |
|
71 | + */ |
|
72 | 72 | public function reset_cached_states() { |
73 | 73 | EEM_State::$_active_states = array(); |
74 | 74 | EEM_State::$_all_states = array(); |
@@ -78,11 +78,11 @@ discard block |
||
78 | 78 | |
79 | 79 | |
80 | 80 | /** |
81 | - * _get_states |
|
82 | - * |
|
83 | - * @access private |
|
84 | - * @return array |
|
85 | - */ |
|
81 | + * _get_states |
|
82 | + * |
|
83 | + * @access private |
|
84 | + * @return array |
|
85 | + */ |
|
86 | 86 | public function get_all_states() { |
87 | 87 | if ( ! self::$_all_states ) { |
88 | 88 | self::$_all_states = $this->get_all( array( 'order_by'=>array( 'STA_name'=>'ASC' ), 'limit'=> array( 0, 99999 ))); |
@@ -161,12 +161,12 @@ discard block |
||
161 | 161 | |
162 | 162 | |
163 | 163 | /** |
164 | - * delete a single state from db via their ID |
|
165 | - * |
|
166 | - * @access public |
|
167 | - * @param $STA_ID |
|
168 | - * @return mixed array on success, FALSE on fail |
|
169 | - */ |
|
164 | + * delete a single state from db via their ID |
|
165 | + * |
|
166 | + * @access public |
|
167 | + * @param $STA_ID |
|
168 | + * @return mixed array on success, FALSE on fail |
|
169 | + */ |
|
170 | 170 | public function delete_by_ID( $STA_ID = FALSE ) { |
171 | 171 | |
172 | 172 | if ( ! $STA_ID ) { |
@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | * |
22 | 22 | * ------------------------------------------------------------------------ |
23 | 23 | */ |
24 | -require_once ( EE_MODELS . 'EEM_Base.model.php' ); |
|
25 | -require_once ( EE_CLASSES . 'EE_State.class.php' ); |
|
24 | +require_once (EE_MODELS.'EEM_Base.model.php'); |
|
25 | +require_once (EE_CLASSES.'EE_State.class.php'); |
|
26 | 26 | |
27 | 27 | class EEM_State extends EEM_Base { |
28 | 28 | |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | // array of all active states |
34 | 34 | private static $_active_states = FALSE; |
35 | 35 | |
36 | - protected function __construct( $timezone = NULL ) { |
|
37 | - $this->singular_item = __('State/Province','event_espresso'); |
|
38 | - $this->plural_item = __('States/Provinces','event_espresso'); |
|
36 | + protected function __construct($timezone = NULL) { |
|
37 | + $this->singular_item = __('State/Province', 'event_espresso'); |
|
38 | + $this->plural_item = __('States/Provinces', 'event_espresso'); |
|
39 | 39 | |
40 | 40 | $this->_tables = array( |
41 | 41 | 'State'=> new EE_Primary_Table('esp_state', 'STA_ID') |
@@ -43,10 +43,10 @@ discard block |
||
43 | 43 | |
44 | 44 | $this->_fields = array( |
45 | 45 | 'State'=>array( |
46 | - 'STA_ID'=> new EE_Primary_Key_Int_Field('STA_ID', __('State ID','event_espresso')), |
|
47 | - 'CNT_ISO'=> new EE_Foreign_Key_String_Field('CNT_ISO', __('Country ISO Code','event_espresso'), false, NULL, 'Country'), |
|
48 | - 'STA_abbrev' => new EE_Plain_Text_Field('STA_abbrev', __('State Abbreviation','event_espresso'), false, ''), |
|
49 | - 'STA_name' => new EE_Plain_Text_Field('STA_name', __('State Name','event_espresso'), false, ''), |
|
46 | + 'STA_ID'=> new EE_Primary_Key_Int_Field('STA_ID', __('State ID', 'event_espresso')), |
|
47 | + 'CNT_ISO'=> new EE_Foreign_Key_String_Field('CNT_ISO', __('Country ISO Code', 'event_espresso'), false, NULL, 'Country'), |
|
48 | + 'STA_abbrev' => new EE_Plain_Text_Field('STA_abbrev', __('State Abbreviation', 'event_espresso'), false, ''), |
|
49 | + 'STA_name' => new EE_Plain_Text_Field('STA_name', __('State Name', 'event_espresso'), false, ''), |
|
50 | 50 | 'STA_active'=> new EE_Boolean_Field('STA_active', __('State Active Flag', 'event_espresso'), false, false) |
51 | 51 | )); |
52 | 52 | $this->_model_relations = array( |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | 'Venue'=>new EE_Has_Many_Relation(), |
56 | 56 | ); |
57 | 57 | //this model is generally available for reading |
58 | - $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public(); |
|
58 | + $this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public(); |
|
59 | 59 | //@todo: only show STA_active |
60 | - parent::__construct( $timezone ); |
|
60 | + parent::__construct($timezone); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -84,8 +84,8 @@ discard block |
||
84 | 84 | * @return array |
85 | 85 | */ |
86 | 86 | public function get_all_states() { |
87 | - if ( ! self::$_all_states ) { |
|
88 | - self::$_all_states = $this->get_all( array( 'order_by'=>array( 'STA_name'=>'ASC' ), 'limit'=> array( 0, 99999 ))); |
|
87 | + if ( ! self::$_all_states) { |
|
88 | + self::$_all_states = $this->get_all(array('order_by'=>array('STA_name'=>'ASC'), 'limit'=> array(0, 99999))); |
|
89 | 89 | } |
90 | 90 | return self::$_all_states; |
91 | 91 | } |
@@ -100,14 +100,14 @@ discard block |
||
100 | 100 | * @param bool $flush_cache |
101 | 101 | * @return array |
102 | 102 | */ |
103 | - public function get_all_active_states( $countries = array(), $flush_cache = FALSE ) { |
|
104 | - if ( ! self::$_active_states || $flush_cache ) { |
|
105 | - $countries = is_array( $countries ) && ! empty( $countries ) ? $countries : EEM_Country::instance()->get_all_active_countries(); |
|
106 | - self::$_active_states = $this->get_all( array( |
|
107 | - array( 'STA_active' => TRUE, 'CNT_ISO' => array( 'IN', array_keys( $countries ))), |
|
108 | - 'order_by' => array( 'STA_name'=>'ASC' ), |
|
109 | - 'limit' => array( 0, 99999 ), |
|
110 | - 'force_join' => array( 'Country' ) |
|
103 | + public function get_all_active_states($countries = array(), $flush_cache = FALSE) { |
|
104 | + if ( ! self::$_active_states || $flush_cache) { |
|
105 | + $countries = is_array($countries) && ! empty($countries) ? $countries : EEM_Country::instance()->get_all_active_countries(); |
|
106 | + self::$_active_states = $this->get_all(array( |
|
107 | + array('STA_active' => TRUE, 'CNT_ISO' => array('IN', array_keys($countries))), |
|
108 | + 'order_by' => array('STA_name'=>'ASC'), |
|
109 | + 'limit' => array(0, 99999), |
|
110 | + 'force_join' => array('Country') |
|
111 | 111 | )); |
112 | 112 | } |
113 | 113 | return self::$_active_states; |
@@ -119,8 +119,8 @@ discard block |
||
119 | 119 | * get_all_states_of_active_countries |
120 | 120 | * @return array |
121 | 121 | */ |
122 | - public function get_all_states_of_active_countries(){ |
|
123 | - if ( $states = $this->get_all( array( array( 'Country.CNT_active' => TRUE, 'STA_active' => TRUE ), 'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) { |
|
122 | + public function get_all_states_of_active_countries() { |
|
123 | + if ($states = $this->get_all(array(array('Country.CNT_active' => TRUE, 'STA_active' => TRUE), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) { |
|
124 | 124 | return $states; |
125 | 125 | } |
126 | 126 | return FALSE; |
@@ -132,11 +132,11 @@ discard block |
||
132 | 132 | * get_all_states_of_active_countries |
133 | 133 | * @return array |
134 | 134 | */ |
135 | - public function get_all_active_states_for_these_countries( $countries ){ |
|
136 | - if ( ! $countries ) { |
|
135 | + public function get_all_active_states_for_these_countries($countries) { |
|
136 | + if ( ! $countries) { |
|
137 | 137 | return FALSE; |
138 | 138 | } |
139 | - if ( $states = $this->get_all( array( array( 'Country.CNT_ISO' => array( 'IN', array_keys( $countries )), 'STA_active' => TRUE ), 'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) { |
|
139 | + if ($states = $this->get_all(array(array('Country.CNT_ISO' => array('IN', array_keys($countries)), 'STA_active' => TRUE), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) { |
|
140 | 140 | return $states; |
141 | 141 | } |
142 | 142 | return FALSE; |
@@ -148,11 +148,11 @@ discard block |
||
148 | 148 | * get_all_states_of_active_countries |
149 | 149 | * @return array |
150 | 150 | */ |
151 | - public function get_all_states_for_these_countries( $countries ){ |
|
152 | - if ( ! $countries ) { |
|
151 | + public function get_all_states_for_these_countries($countries) { |
|
152 | + if ( ! $countries) { |
|
153 | 153 | return FALSE; |
154 | 154 | } |
155 | - if ( $states = $this->get_all( array( array( 'Country.CNT_ISO' => array( 'IN', array_keys( $countries ))), 'order_by' => array( 'Country.CNT_name' => 'ASC', 'STA_name' => 'ASC' )))) { |
|
155 | + if ($states = $this->get_all(array(array('Country.CNT_ISO' => array('IN', array_keys($countries))), 'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')))) { |
|
156 | 156 | return $states; |
157 | 157 | } |
158 | 158 | return FALSE; |
@@ -167,15 +167,15 @@ discard block |
||
167 | 167 | * @param $STA_ID |
168 | 168 | * @return mixed array on success, FALSE on fail |
169 | 169 | */ |
170 | - public function delete_by_ID( $STA_ID = FALSE ) { |
|
170 | + public function delete_by_ID($STA_ID = FALSE) { |
|
171 | 171 | |
172 | - if ( ! $STA_ID ) { |
|
172 | + if ( ! $STA_ID) { |
|
173 | 173 | return FALSE; |
174 | 174 | } |
175 | 175 | |
176 | 176 | // retrieve a particular transaction |
177 | - $where_cols_n_values = array( array( 'STA_ID' => $STA_ID )); |
|
178 | - if ( $answer = $this->delete ( $where_cols_n_values )) { |
|
177 | + $where_cols_n_values = array(array('STA_ID' => $STA_ID)); |
|
178 | + if ($answer = $this->delete($where_cols_n_values)) { |
|
179 | 179 | return TRUE; |
180 | 180 | } else { |
181 | 181 | return FALSE; |
@@ -188,15 +188,15 @@ discard block |
||
188 | 188 | * @param string $state_ID |
189 | 189 | * @return string |
190 | 190 | */ |
191 | - public function get_state_name_by_ID( $state_ID ){ |
|
192 | - if( isset( self::$_all_states[ $state_ID ] ) && |
|
193 | - self::$_all_states[ $state_ID ] instanceof EE_State ){ |
|
194 | - return self::$_all_states[ $state_ID ]->name(); |
|
191 | + public function get_state_name_by_ID($state_ID) { |
|
192 | + if (isset(self::$_all_states[$state_ID]) && |
|
193 | + self::$_all_states[$state_ID] instanceof EE_State) { |
|
194 | + return self::$_all_states[$state_ID]->name(); |
|
195 | 195 | } |
196 | - $names = $this->get_col( array( array( 'STA_ID' => $state_ID ), 'limit' => 1), 'STA_name' ); |
|
197 | - if( is_array( $names ) && ! empty( $names ) ){ |
|
198 | - return reset( $names ); |
|
199 | - }else{ |
|
196 | + $names = $this->get_col(array(array('STA_ID' => $state_ID), 'limit' => 1), 'STA_name'); |
|
197 | + if (is_array($names) && ! empty($names)) { |
|
198 | + return reset($names); |
|
199 | + } else { |
|
200 | 200 | return ''; |
201 | 201 | } |
202 | 202 | } |
@@ -1,4 +1,6 @@ discard block |
||
1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | +} |
|
2 | 4 | /** |
3 | 5 | * EEH_URL helper |
4 | 6 | * Helper class for URL-related PHP functions |
@@ -62,7 +64,7 @@ discard block |
||
62 | 64 | isset($results['response']['code']) && |
63 | 65 | $results['response']['code'] == '200'){ |
64 | 66 | return true; |
65 | - }else{ |
|
67 | + } else{ |
|
66 | 68 | return false; |
67 | 69 | } |
68 | 70 | } |
@@ -14,8 +14,6 @@ discard block |
||
14 | 14 | * This function is a singleton method used to instantiate the EEM_Attendee object |
15 | 15 | * |
16 | 16 | * @access public |
17 | - * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved). Note this just sends the timezone info to the date time model field objects. Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option) |
|
18 | - * @return EEM_System_Status |
|
19 | 17 | */ |
20 | 18 | public static function instance() { |
21 | 19 | |
@@ -147,7 +145,7 @@ discard block |
||
147 | 145 | |
148 | 146 | /** |
149 | 147 | * |
150 | - * @return array like EE_Config class |
|
148 | + * @return EE_Config like EE_Config class |
|
151 | 149 | */ |
152 | 150 | function get_ee_config(){ |
153 | 151 | return EE_Config::instance(); |
@@ -197,7 +195,7 @@ discard block |
||
197 | 195 | |
198 | 196 | /** |
199 | 197 | * Checks if site responds ot HTTPS |
200 | - * @return boolean |
|
198 | + * @return string |
|
201 | 199 | */ |
202 | 200 | function get_https_enabled(){ |
203 | 201 | $home = str_replace("http://", "https://", home_url()); |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | /** |
4 | 4 | * Model for retrieving Information about the Event Espresso status. |
5 | 5 | */ |
6 | -class EEM_System_Status{ |
|
6 | +class EEM_System_Status { |
|
7 | 7 | |
8 | 8 | // private instance of the EEM_System_Status object |
9 | 9 | protected static $_instance = NULL; |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | } |
27 | 27 | return self::$_instance; |
28 | 28 | } |
29 | - private function __construct(){ |
|
29 | + private function __construct() { |
|
30 | 30 | |
31 | 31 | } |
32 | 32 | /** |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | * @return array where each key is a function name on this class, and each value is SOMETHING-- |
35 | 35 | * it might be a value, an array, or an object |
36 | 36 | */ |
37 | - function get_system_stati(){ |
|
37 | + function get_system_stati() { |
|
38 | 38 | return array( |
39 | 39 | 'ee_version'=>$this->get_ee_version(), |
40 | 40 | 'ee_activation_history'=>$this->get_ee_activation_history(), |
@@ -55,14 +55,14 @@ discard block |
||
55 | 55 | * |
56 | 56 | * @return string |
57 | 57 | */ |
58 | - function get_ee_version(){ |
|
58 | + function get_ee_version() { |
|
59 | 59 | return espresso_version(); |
60 | 60 | } |
61 | 61 | /** |
62 | 62 | * |
63 | 63 | * @return string |
64 | 64 | */ |
65 | - function php_version(){ |
|
65 | + function php_version() { |
|
66 | 66 | return phpversion(); |
67 | 67 | } |
68 | 68 | /** |
@@ -79,16 +79,16 @@ discard block |
||
79 | 79 | 'DomainPath' => 'Domain Path', |
80 | 80 | 'Network' => 'Network', |
81 | 81 | */ |
82 | - function get_active_plugins(){ |
|
83 | - $active_plugins = (array) get_option( 'active_plugins', array() ); |
|
84 | - if ( is_multisite() ) |
|
85 | - $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) ); |
|
86 | - $active_plugins = array_map( 'strtolower', $active_plugins ); |
|
82 | + function get_active_plugins() { |
|
83 | + $active_plugins = (array) get_option('active_plugins', array()); |
|
84 | + if (is_multisite()) |
|
85 | + $active_plugins = array_merge($active_plugins, get_site_option('active_sitewide_plugins', array())); |
|
86 | + $active_plugins = array_map('strtolower', $active_plugins); |
|
87 | 87 | $plugin_info = array(); |
88 | - foreach ( $active_plugins as $plugin ) { |
|
89 | - $plugin_data = @get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ); |
|
88 | + foreach ($active_plugins as $plugin) { |
|
89 | + $plugin_data = @get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin); |
|
90 | 90 | |
91 | - $plugin_info[ $plugin ] = $plugin_data; |
|
91 | + $plugin_info[$plugin] = $plugin_data; |
|
92 | 92 | } |
93 | 93 | return $plugin_info; |
94 | 94 | } |
@@ -97,17 +97,17 @@ discard block |
||
97 | 97 | * |
98 | 98 | * @return array with keys 'home_url' and 'site_url' |
99 | 99 | */ |
100 | - function get_wp_settings(){ |
|
101 | - $wp_memory_int = $this->let_to_num( WP_MEMORY_LIMIT ); |
|
102 | - if ( $wp_memory_int < 67108864 ) { |
|
103 | - $wp_memory_to_display = '<mark class="error">' . sprintf( __('%s - We recommend setting memory to at least 64MB. See: %s Increasing memory allocated to PHP %s', 'event_espresso'), WP_MEMORY_LIMIT, '<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP">', '</a>"' ) . '</mark>'; |
|
100 | + function get_wp_settings() { |
|
101 | + $wp_memory_int = $this->let_to_num(WP_MEMORY_LIMIT); |
|
102 | + if ($wp_memory_int < 67108864) { |
|
103 | + $wp_memory_to_display = '<mark class="error">'.sprintf(__('%s - We recommend setting memory to at least 64MB. See: %s Increasing memory allocated to PHP %s', 'event_espresso'), WP_MEMORY_LIMIT, '<a href="http://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP">', '</a>"').'</mark>'; |
|
104 | 104 | } else { |
105 | - $wp_memory_to_display = '<mark class="yes">' . size_format( $wp_memory_int ) . '</mark>'; |
|
105 | + $wp_memory_to_display = '<mark class="yes">'.size_format($wp_memory_int).'</mark>'; |
|
106 | 106 | } |
107 | 107 | return array( |
108 | - 'name'=>get_bloginfo('name','display'), |
|
108 | + 'name'=>get_bloginfo('name', 'display'), |
|
109 | 109 | 'is_multisite'=>is_multisite(), |
110 | - 'version'=> get_bloginfo( 'version', 'display' ), |
|
110 | + 'version'=> get_bloginfo('version', 'display'), |
|
111 | 111 | 'home_url'=>home_url(), |
112 | 112 | 'site_url'=>site_url(), |
113 | 113 | 'WP_DEBUG'=>WP_DEBUG, |
@@ -116,8 +116,8 @@ discard block |
||
116 | 116 | 'gmt_offset'=>get_option('gmt_offset'), |
117 | 117 | 'timezone_string'=>get_option('timezone_string'), |
118 | 118 | 'admin_email'=> get_bloginfo('admin_email', 'display'), |
119 | - 'language'=>get_bloginfo('language','display'), |
|
120 | - 'wp_max_upload_size' => size_format( wp_max_upload_size() ), |
|
119 | + 'language'=>get_bloginfo('language', 'display'), |
|
120 | + 'wp_max_upload_size' => size_format(wp_max_upload_size()), |
|
121 | 121 | 'wp_memory' => $wp_memory_to_display |
122 | 122 | ); |
123 | 123 | } |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * Gets an array of information about the history of ee versions installed |
127 | 127 | * @return array |
128 | 128 | */ |
129 | - function get_ee_activation_history(){ |
|
129 | + function get_ee_activation_history() { |
|
130 | 130 | return get_option('espresso_db_update'); |
131 | 131 | } |
132 | 132 | |
@@ -135,11 +135,11 @@ discard block |
||
135 | 135 | * Gets an array where keys are ee versions, and their values are arrays indicating all the different times that version was installed |
136 | 136 | * @return EE_Data_Migration_Script_Base[] |
137 | 137 | */ |
138 | - function get_ee_migration_history(){ |
|
138 | + function get_ee_migration_history() { |
|
139 | 139 | $options = EE_Data_Migration_Manager::instance()->get_all_migration_script_options(); |
140 | 140 | $presentable_migration_scripts = array(); |
141 | - foreach($options as $option_array){ |
|
142 | - $presentable_migration_scripts[str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix,"",$option_array['option_name'])] = maybe_unserialize($option_array['option_value']); |
|
141 | + foreach ($options as $option_array) { |
|
142 | + $presentable_migration_scripts[str_replace(EE_Data_Migration_Manager::data_migration_script_option_prefix, "", $option_array['option_name'])] = maybe_unserialize($option_array['option_value']); |
|
143 | 143 | } |
144 | 144 | return $presentable_migration_scripts; |
145 | 145 | // return get_option(EE_Data_Migration_Manager::data_migrations_option_name);//EE_Data_Migration_Manager::instance()->get_data_migrations_ran(); |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * |
150 | 150 | * @return array like EE_Config class |
151 | 151 | */ |
152 | - function get_ee_config(){ |
|
152 | + function get_ee_config() { |
|
153 | 153 | return EE_Config::instance(); |
154 | 154 | } |
155 | 155 | |
@@ -157,24 +157,24 @@ discard block |
||
157 | 157 | * Gets an array of php setup info, pilfered from http://www.php.net/manual/en/function.phpinfo.php#87463 |
158 | 158 | * @return array like the output of phpinfo(), but in an array |
159 | 159 | */ |
160 | - function get_php_info(){ |
|
160 | + function get_php_info() { |
|
161 | 161 | ob_start(); |
162 | 162 | phpinfo(-1); |
163 | 163 | |
164 | 164 | $pi = preg_replace( |
165 | 165 | array('#^.*<body>(.*)</body>.*$#ms', '#<h2>PHP License</h2>.*$#ms', |
166 | - '#<h1>Configuration</h1>#', "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#', |
|
166 | + '#<h1>Configuration</h1>#', "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#', |
|
167 | 167 | "#[ \t]+#", '# #', '# +#', '# class=".*?"#', '%'%', |
168 | 168 | '#<tr>(?:.*?)" src="(?:.*?)=(.*?)" alt="PHP Logo" /></a>' |
169 | 169 | .'<h1>PHP Version (.*?)</h1>(?:\n+?)</td></tr>#', |
170 | 170 | '#<h1><a href="(?:.*?)\?=(.*?)">PHP Credits</a></h1>#', |
171 | 171 | '#<tr>(?:.*?)" src="(?:.*?)=(.*?)"(?:.*?)Zend Engine (.*?),(?:.*?)</tr>#', |
172 | 172 | "# +#", '#<tr>#', '#</tr>#'), |
173 | - array('$1', '', '', '', '</$1>' . "\n", '<', ' ', ' ', ' ', '', ' ', |
|
173 | + array('$1', '', '', '', '</$1>'."\n", '<', ' ', ' ', ' ', '', ' ', |
|
174 | 174 | '<h2>PHP Configuration</h2>'."\n".'<tr><td>PHP Version</td><td>$2</td></tr>'. |
175 | 175 | "\n".'<tr><td>PHP Egg</td><td>$1</td></tr>', |
176 | 176 | '<tr><td>PHP Credits Egg</td><td>$1</td></tr>', |
177 | - '<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" . |
|
177 | + '<tr><td>Zend Engine</td><td>$2</td></tr>'."\n". |
|
178 | 178 | '<tr><td>Zend Egg</td><td>$1</td></tr>', ' ', '%S%', '%E%'), |
179 | 179 | ob_get_clean()); |
180 | 180 | |
@@ -182,14 +182,14 @@ discard block |
||
182 | 182 | unset($sections[0]); |
183 | 183 | |
184 | 184 | $pi = array(); |
185 | - foreach($sections as $section){ |
|
185 | + foreach ($sections as $section) { |
|
186 | 186 | $n = substr($section, 0, strpos($section, '</h2>')); |
187 | 187 | preg_match_all( |
188 | 188 | '#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#', |
189 | 189 | $section, $askapache, PREG_SET_ORDER); |
190 | - foreach($askapache as $m) |
|
190 | + foreach ($askapache as $m) |
|
191 | 191 | $m2 = isset($m[2]) ? $m[2] : null; |
192 | - $pi[$n][$m[1]]=(!isset($m[3])||$m2==$m[3]) ? $m2 : array_slice($m,2); |
|
192 | + $pi[$n][$m[1]] = ( ! isset($m[3]) || $m2 == $m[3]) ? $m2 : array_slice($m, 2); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | return $pi; |
@@ -199,13 +199,13 @@ discard block |
||
199 | 199 | * Checks if site responds ot HTTPS |
200 | 200 | * @return boolean |
201 | 201 | */ |
202 | - function get_https_enabled(){ |
|
202 | + function get_https_enabled() { |
|
203 | 203 | $home = str_replace("http://", "https://", home_url()); |
204 | 204 | $response = wp_remote_get($home); |
205 | - if($response instanceof WP_Error){ |
|
205 | + if ($response instanceof WP_Error) { |
|
206 | 206 | $error_string = ''; |
207 | - foreach($response->errors as $short_name => $description_array){ |
|
208 | - $error_string .= "<b>$short_name</b>: ".implode(", ",$description_array); |
|
207 | + foreach ($response->errors as $short_name => $description_array) { |
|
208 | + $error_string .= "<b>$short_name</b>: ".implode(", ", $description_array); |
|
209 | 209 | } |
210 | 210 | return $error_string; |
211 | 211 | } |
@@ -215,25 +215,25 @@ discard block |
||
215 | 215 | * Whether or not logging is enabled |
216 | 216 | * @return string descripting logging's status |
217 | 217 | */ |
218 | - function get_logging_enabled(){ |
|
219 | - $opened = @fopen( EVENT_ESPRESSO_UPLOAD_DIR . '/logs/espresso_log.txt', 'a' ); |
|
220 | - return $opened ? __('Log Directory is writable', 'event_espresso') : sprintf( __('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"','</mark>' ) ; |
|
218 | + function get_logging_enabled() { |
|
219 | + $opened = @fopen(EVENT_ESPRESSO_UPLOAD_DIR.'/logs/espresso_log.txt', 'a'); |
|
220 | + return $opened ? __('Log Directory is writable', 'event_espresso') : sprintf(__('%sLog directory is NOT writable%s', 'event_espresso'), '<mark class="error"', '</mark>'); |
|
221 | 221 | } |
222 | 222 | /** |
223 | 223 | * Whether curl ro fsock works |
224 | 224 | * @return string describing posting's status |
225 | 225 | */ |
226 | - function get_remote_posting(){ |
|
227 | - $fsock_works = function_exists( 'fsockopen' ); |
|
228 | - $curl_works = function_exists( 'curl_init' ); |
|
229 | - if ( $fsock_works && $curl_works ) { |
|
226 | + function get_remote_posting() { |
|
227 | + $fsock_works = function_exists('fsockopen'); |
|
228 | + $curl_works = function_exists('curl_init'); |
|
229 | + if ($fsock_works && $curl_works) { |
|
230 | 230 | $status = __('Your server has fsockopen and cURL enabled.', 'event_espresso'); |
231 | - } elseif ( $fsock_works ) { |
|
231 | + } elseif ($fsock_works) { |
|
232 | 232 | $status = __('Your server has fsockopen enabled, cURL is disabled.', 'event_espresso'); |
233 | - } elseif( $curl_works ) { |
|
233 | + } elseif ($curl_works) { |
|
234 | 234 | $status = __('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso'); |
235 | - }else{ |
|
236 | - $status = __('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso'). '</mark>'; |
|
235 | + } else { |
|
236 | + $status = __('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso').'</mark>'; |
|
237 | 237 | } |
238 | 238 | return $status; |
239 | 239 | |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | * Gets all the php.ini settings |
243 | 243 | * @return array |
244 | 244 | */ |
245 | - function get_php_ini_all(){ |
|
245 | + function get_php_ini_all() { |
|
246 | 246 | return ini_get_all(); |
247 | 247 | } |
248 | 248 | /** |
@@ -251,10 +251,10 @@ discard block |
||
251 | 251 | * @param type $size |
252 | 252 | * @return int |
253 | 253 | */ |
254 | - function let_to_num( $size ) { |
|
255 | - $l = substr( $size, -1 ); |
|
256 | - $ret = substr( $size, 0, -1 ); |
|
257 | - switch( strtoupper( $l ) ) { |
|
254 | + function let_to_num($size) { |
|
255 | + $l = substr($size, -1); |
|
256 | + $ret = substr($size, 0, -1); |
|
257 | + switch (strtoupper($l)) { |
|
258 | 258 | case 'P': |
259 | 259 | $ret *= 1024; |
260 | 260 | case 'T': |
@@ -81,8 +81,9 @@ discard block |
||
81 | 81 | */ |
82 | 82 | function get_active_plugins(){ |
83 | 83 | $active_plugins = (array) get_option( 'active_plugins', array() ); |
84 | - if ( is_multisite() ) |
|
85 | - $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) ); |
|
84 | + if ( is_multisite() ) { |
|
85 | + $active_plugins = array_merge( $active_plugins, get_site_option( 'active_sitewide_plugins', array() ) ); |
|
86 | + } |
|
86 | 87 | $active_plugins = array_map( 'strtolower', $active_plugins ); |
87 | 88 | $plugin_info = array(); |
88 | 89 | foreach ( $active_plugins as $plugin ) { |
@@ -187,8 +188,9 @@ discard block |
||
187 | 188 | preg_match_all( |
188 | 189 | '#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#', |
189 | 190 | $section, $askapache, PREG_SET_ORDER); |
190 | - foreach($askapache as $m) |
|
191 | - $m2 = isset($m[2]) ? $m[2] : null; |
|
191 | + foreach($askapache as $m) { |
|
192 | + $m2 = isset($m[2]) ? $m[2] : null; |
|
193 | + } |
|
192 | 194 | $pi[$n][$m[1]]=(!isset($m[3])||$m2==$m[3]) ? $m2 : array_slice($m,2); |
193 | 195 | } |
194 | 196 | |
@@ -232,7 +234,7 @@ discard block |
||
232 | 234 | $status = __('Your server has fsockopen enabled, cURL is disabled.', 'event_espresso'); |
233 | 235 | } elseif( $curl_works ) { |
234 | 236 | $status = __('Your server has cURL enabled, fsockopen is disabled.', 'event_espresso'); |
235 | - }else{ |
|
237 | + } else{ |
|
236 | 238 | $status = __('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'event_espresso'). '</mark>'; |
237 | 239 | } |
238 | 240 | return $status; |
@@ -27,7 +27,7 @@ |
||
27 | 27 | /** |
28 | 28 | * Returns the name of the model(s) pointed to |
29 | 29 | * @deprecated since version 4.6.7 |
30 | - * @return mixed string or array of strings |
|
30 | + * @return string string or array of strings |
|
31 | 31 | */ |
32 | 32 | function get_model_name_pointed_to(){ |
33 | 33 | EE_Error::doing_it_wrong( 'get_model_name_pointed_to', __( 'This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array', 'event_espresso' ), '4.6.7' ); |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Parent field class for any fields which accept a parameter of a model name. |
|
3 | + * Parent field class for any fields which accept a parameter of a model name. |
|
4 | 4 | Originally this was just foreign keys, but EE_Any_Foreign_Model_name_Field (which works |
5 | - * with the EE_Foreign_Key_Field to create a relation between any two models) |
|
6 | - * also required basically the exact same functionality, except NOT be a foreign key. |
|
7 | - */ |
|
5 | + * with the EE_Foreign_Key_Field to create a relation between any two models) |
|
6 | + * also required basically the exact same functionality, except NOT be a foreign key. |
|
7 | + */ |
|
8 | 8 | abstract class EE_Field_With_Model_Name extends EE_Model_Field_Base{ |
9 | 9 | /** |
10 | 10 | * Usually the name of a single model. However, as in the case for custom post types, |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | * with the EE_Foreign_Key_Field to create a relation between any two models) |
6 | 6 | * also required basically the exact same functionality, except NOT be a foreign key. |
7 | 7 | */ |
8 | -abstract class EE_Field_With_Model_Name extends EE_Model_Field_Base{ |
|
8 | +abstract class EE_Field_With_Model_Name extends EE_Model_Field_Base { |
|
9 | 9 | /** |
10 | 10 | * Usually the name of a single model. However, as in the case for custom post types, |
11 | 11 | * it can actually be an array of models |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | * @param mixed $default_value if this is a integer field, it shoudl be an int. if it's a string field, it shoul dbe a string |
21 | 21 | * @param string $model_name eg 'Event','Answer','Term', etc. Basically its the model class's name without the "EEM_" |
22 | 22 | */ |
23 | - function __construct($table_column, $nicename, $nullable, $default_value,$model_name){ |
|
23 | + function __construct($table_column, $nicename, $nullable, $default_value, $model_name) { |
|
24 | 24 | $this->_model_name_pointed_to = $model_name; |
25 | 25 | parent::__construct($table_column, $nicename, $nullable, $default_value); |
26 | 26 | } |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | * @deprecated since version 4.6.7 |
30 | 30 | * @return mixed string or array of strings |
31 | 31 | */ |
32 | - function get_model_name_pointed_to(){ |
|
33 | - EE_Error::doing_it_wrong( 'get_model_name_pointed_to', __( 'This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array', 'event_espresso' ), '4.6.7' ); |
|
32 | + function get_model_name_pointed_to() { |
|
33 | + EE_Error::doing_it_wrong('get_model_name_pointed_to', __('This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array', 'event_espresso'), '4.6.7'); |
|
34 | 34 | return $this->_model_name_pointed_to; |
35 | 35 | } |
36 | 36 | /** |
@@ -39,31 +39,31 @@ discard block |
||
39 | 39 | * @return array of model names pointed to by this field |
40 | 40 | */ |
41 | 41 | function get_model_names_pointed_to() { |
42 | - if( is_array( $this->_model_name_pointed_to ) ) { |
|
42 | + if (is_array($this->_model_name_pointed_to)) { |
|
43 | 43 | return $this->_model_name_pointed_to; |
44 | - }else{ |
|
45 | - return array( $this->_model_name_pointed_to ); |
|
44 | + } else { |
|
45 | + return array($this->_model_name_pointed_to); |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | /** |
49 | 49 | * Returns the model's classname (eg EE_Event instead of just Event) |
50 | 50 | * @return array |
51 | 51 | */ |
52 | - function get_model_class_names_pointed_to(){ |
|
52 | + function get_model_class_names_pointed_to() { |
|
53 | 53 | $model_names = array(); |
54 | - if(is_array($this->_model_name_pointed_to)){ |
|
55 | - foreach($this->_model_name_pointed_to as $model_name){ |
|
54 | + if (is_array($this->_model_name_pointed_to)) { |
|
55 | + foreach ($this->_model_name_pointed_to as $model_name) { |
|
56 | 56 | $model_names[] = "EE_".$model_name; |
57 | 57 | } |
58 | - }else{ |
|
58 | + } else { |
|
59 | 59 | $model_names = array("EE_".$this->_model_name_pointed_to); |
60 | 60 | } |
61 | 61 | return $model_names; |
62 | 62 | } |
63 | 63 | |
64 | - function is_model_obj_of_type_pointed_to($model_obj_or_ID){ |
|
65 | - foreach($this->get_model_class_names_pointed_to() as $model_obj_classname){ |
|
66 | - if($model_obj_or_ID instanceof $model_obj_classname){ |
|
64 | + function is_model_obj_of_type_pointed_to($model_obj_or_ID) { |
|
65 | + foreach ($this->get_model_class_names_pointed_to() as $model_obj_classname) { |
|
66 | + if ($model_obj_or_ID instanceof $model_obj_classname) { |
|
67 | 67 | return true; |
68 | 68 | } |
69 | 69 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $validation_error_message = $default_validation_strategy->get_validation_error_message(); |
43 | 43 | } |
44 | 44 | throw new EE_Validation_Error( $validation_error_message, 'float_only' ); |
45 | - }else{ |
|
45 | + } else{ |
|
46 | 46 | return floatval($normalized_value); |
47 | 47 | } |
48 | 48 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | public function unnormalize($normalized_value) { |
56 | 56 | if( empty( $normalized_value ) ){ |
57 | 57 | return '0.00'; |
58 | - }else{ |
|
58 | + } else{ |
|
59 | 59 | return "$normalized_value"; |
60 | 60 | } |
61 | 61 | } |
@@ -4,6 +4,7 @@ |
||
4 | 4 | * Overrides parent so it doesn't need to provide so many non-applicable fields |
5 | 5 | * @param string $table_column |
6 | 6 | * @param string $nicename |
7 | + * @param integer|null $default |
|
7 | 8 | */ |
8 | 9 | public function __construct($table_column, $nicename,$default) { |
9 | 10 | parent::__construct($table_column, $nicename, false, $default, null); |
@@ -1,18 +1,18 @@ |
||
1 | 1 | <?php |
2 | -abstract class EE_Primary_Key_Field_Base extends EE_Field_With_Model_Name{ |
|
2 | +abstract class EE_Primary_Key_Field_Base extends EE_Field_With_Model_Name { |
|
3 | 3 | /** |
4 | 4 | * Overrides parent so it doesn't need to provide so many non-applicable fields |
5 | 5 | * @param string $table_column |
6 | 6 | * @param string $nicename |
7 | 7 | */ |
8 | - public function __construct($table_column, $nicename,$default) { |
|
8 | + public function __construct($table_column, $nicename, $default) { |
|
9 | 9 | parent::__construct($table_column, $nicename, false, $default, null); |
10 | 10 | } |
11 | 11 | /** |
12 | 12 | * @param $table_alias |
13 | 13 | * @param $name |
14 | 14 | */ |
15 | - function _construct_finalize($table_alias, $name, $model_name){ |
|
15 | + function _construct_finalize($table_alias, $name, $model_name) { |
|
16 | 16 | $this->_model_name_pointed_to = $model_name; |
17 | 17 | parent::_construct_finalize($table_alias, $name, $model_name); |
18 | 18 | } |
@@ -4,6 +4,10 @@ |
||
4 | 4 | function get_wpdb_data_type(){ |
5 | 5 | return '%s'; |
6 | 6 | } |
7 | + |
|
8 | + /** |
|
9 | + * @param string $table_column |
|
10 | + */ |
|
7 | 11 | public function __construct($table_column, $nicename) { |
8 | 12 | parent::__construct($table_column, $nicename, NULL); |
9 | 13 | } |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | require_once('EE_Primary_Key_Field_Base.php'); |
3 | -class EE_Primary_Key_String_Field extends EE_Primary_Key_Field_Base{ |
|
4 | - function get_wpdb_data_type(){ |
|
3 | +class EE_Primary_Key_String_Field extends EE_Primary_Key_Field_Base { |
|
4 | + function get_wpdb_data_type() { |
|
5 | 5 | return '%s'; |
6 | 6 | } |
7 | 7 | public function __construct($table_column, $nicename) { |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | * @return string |
14 | 14 | */ |
15 | 15 | function prepare_for_set($value_inputted_for_field_on_model_object) { |
16 | - if($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)){ |
|
16 | + if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) { |
|
17 | 17 | $value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID(); |
18 | 18 | } |
19 | 19 | return wp_strip_all_tags($value_inputted_for_field_on_model_object); |
@@ -26,7 +26,6 @@ |
||
26 | 26 | * ) |
27 | 27 | * ) |
28 | 28 | * @link http://codex.wordpress.org/Function_Reference/register_post_status for more info |
29 | - * @param boolean $store_in_db_as_int By default, enums are stored as STRINGS in the DB. However, if this var is set to true, it will be stored as an INT |
|
30 | 29 | */ |
31 | 30 | function __construct($table_column, $nicename, $nullable, $default_value, $new_stati = array()){ |
32 | 31 | $this->_register_new_stati( $new_stati ); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once( EE_MODELS . 'fields/EE_Enum_Text_Field.php' ); |
|
3 | -class EE_WP_Post_Status_Field extends EE_Enum_Text_Field{ |
|
2 | +require_once(EE_MODELS.'fields/EE_Enum_Text_Field.php'); |
|
3 | +class EE_WP_Post_Status_Field extends EE_Enum_Text_Field { |
|
4 | 4 | |
5 | 5 | protected $_wp_post_stati; |
6 | 6 | |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | * @link http://codex.wordpress.org/Function_Reference/register_post_status for more info |
29 | 29 | * @param boolean $store_in_db_as_int By default, enums are stored as STRINGS in the DB. However, if this var is set to true, it will be stored as an INT |
30 | 30 | */ |
31 | - function __construct($table_column, $nicename, $nullable, $default_value, $new_stati = array()){ |
|
32 | - $this->_register_new_stati( $new_stati ); |
|
31 | + function __construct($table_column, $nicename, $nullable, $default_value, $new_stati = array()) { |
|
32 | + $this->_register_new_stati($new_stati); |
|
33 | 33 | $this->_set_allowed_enum_values(); |
34 | 34 | parent::__construct($table_column, $nicename, $nullable, $default_value, $this->_allowed_enum_values); |
35 | 35 | } |
@@ -46,18 +46,18 @@ discard block |
||
46 | 46 | * @param array $new_stati statuses |
47 | 47 | * @return void |
48 | 48 | */ |
49 | - protected function _register_new_stati( $new_stati ) { |
|
49 | + protected function _register_new_stati($new_stati) { |
|
50 | 50 | |
51 | - foreach ( (array) $new_stati as $status_key => $status_args ) { |
|
51 | + foreach ((array) $new_stati as $status_key => $status_args) { |
|
52 | 52 | $args = array( |
53 | - 'label' => isset( $status_args['label'] ) ? $status_args['label'] : $status_key, |
|
54 | - 'public' => isset( $status_args['public'] ) && is_bool( $status_args['public'] ) ? $status_args['public'] : TRUE, |
|
55 | - 'exclude_from_search' => isset( $status_args['exclude_from_search'] ) && is_bool($status_args['exclude_from_search'] ) ? $status_args['exclude_from_search'] : FALSE, |
|
56 | - 'show_in_admin_all_list' => isset( $status_args['show_in_admin_all_list'] ) && is_bool( $status_args['show_in_admin_all_list'] ) ? $status_args['show_in_admin_all_list'] : FALSE, |
|
57 | - 'show_in_admin_status_list' => isset( $status_args['show_in_admin_status_list'] ) && is_bool( $status_args['show_in_admin_status_list'] ) ? $status_args['show_in_admin_status_list'] : TRUE, |
|
58 | - 'label_count' => isset( $status_args['label_count'] ) ? $status_args['label_count'] : '' |
|
53 | + 'label' => isset($status_args['label']) ? $status_args['label'] : $status_key, |
|
54 | + 'public' => isset($status_args['public']) && is_bool($status_args['public']) ? $status_args['public'] : TRUE, |
|
55 | + 'exclude_from_search' => isset($status_args['exclude_from_search']) && is_bool($status_args['exclude_from_search']) ? $status_args['exclude_from_search'] : FALSE, |
|
56 | + 'show_in_admin_all_list' => isset($status_args['show_in_admin_all_list']) && is_bool($status_args['show_in_admin_all_list']) ? $status_args['show_in_admin_all_list'] : FALSE, |
|
57 | + 'show_in_admin_status_list' => isset($status_args['show_in_admin_status_list']) && is_bool($status_args['show_in_admin_status_list']) ? $status_args['show_in_admin_status_list'] : TRUE, |
|
58 | + 'label_count' => isset($status_args['label_count']) ? $status_args['label_count'] : '' |
|
59 | 59 | ); |
60 | - register_post_status( $status_key, $status_args ); |
|
60 | + register_post_status($status_key, $status_args); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | global $wp_post_statuses; |
79 | 79 | $this->_wp_post_stati = $wp_post_statuses; |
80 | 80 | |
81 | - foreach( $this->_wp_post_stati as $post_status => $args_object ) { |
|
81 | + foreach ($this->_wp_post_stati as $post_status => $args_object) { |
|
82 | 82 | $this->_allowed_enum_values[$post_status] = $args_object->label; |
83 | 83 | } |
84 | 84 | |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * @param string $status What status object you want |
109 | 109 | * @return std_object the status object or FALSE if it doesn't exist. |
110 | 110 | */ |
111 | - public function get_status_object( $status ) { |
|
112 | - return isset( $this->_wp_post_stati[$status] ) ? $this->_wp_post_stati[$status] : FALSE; |
|
111 | + public function get_status_object($status) { |
|
112 | + return isset($this->_wp_post_stati[$status]) ? $this->_wp_post_stati[$status] : FALSE; |
|
113 | 113 | } |
114 | 114 | } |
115 | 115 | \ No newline at end of file |
@@ -43,16 +43,30 @@ discard block |
||
43 | 43 | |
44 | 44 | private $_group_by_sql; |
45 | 45 | |
46 | + /** |
|
47 | + * @param string $limit_sql |
|
48 | + */ |
|
46 | 49 | function set_limit_sql($limit_sql){ |
47 | 50 | $this->_limit_sql = $limit_sql; |
48 | 51 | } |
49 | 52 | |
53 | + /** |
|
54 | + * @param string $order_by_sql |
|
55 | + */ |
|
50 | 56 | function set_order_by_sql($order_by_sql){ |
51 | 57 | $this->_order_by_sql = $order_by_sql; |
52 | 58 | } |
59 | + |
|
60 | + /** |
|
61 | + * @param string $group_by_sql |
|
62 | + */ |
|
53 | 63 | function set_group_by_sql($group_by_sql){ |
54 | 64 | $this->_group_by_sql = $group_by_sql; |
55 | 65 | } |
66 | + |
|
67 | + /** |
|
68 | + * @param string $having_sql |
|
69 | + */ |
|
56 | 70 | function set_having_sql($having_sql){ |
57 | 71 | $this->_having_sql = $having_sql; |
58 | 72 | } |
@@ -72,7 +86,6 @@ discard block |
||
72 | 86 | * |
73 | 87 | * @param type $model_included_name |
74 | 88 | * @param type $join_sql |
75 | - * @param type $data_types |
|
76 | 89 | */ |
77 | 90 | public function __construct($model_included_name= array(), $join_sql = ''){ |
78 | 91 | $this->_models_included = $model_included_name; |
@@ -11,8 +11,8 @@ discard block |
||
11 | 11 | */ |
12 | 12 | class EE_Model_Query_Info_Carrier extends EE_Base{ |
13 | 13 | /** |
14 | - * @var string SQL for performing joins (Eg, "INNER JOIN blah ON blah=blah INNER JOIN FOO ON foo=foo...") |
|
15 | - */ |
|
14 | + * @var string SQL for performing joins (Eg, "INNER JOIN blah ON blah=blah INNER JOIN FOO ON foo=foo...") |
|
15 | + */ |
|
16 | 16 | private $_join_sql; |
17 | 17 | /** |
18 | 18 | * |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * @return string |
133 | 133 | */ |
134 | 134 | public function get_main_model_join_sql() { |
135 | - return $this->_main_join_sql; |
|
135 | + return $this->_main_join_sql; |
|
136 | 136 | } |
137 | 137 | |
138 | 138 |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * We could have returned an array |
10 | 10 | * with two keys 'join_sql' and 'data_types', but this better-defines the data being passed around |
11 | 11 | */ |
12 | -class EE_Model_Query_Info_Carrier extends EE_Base{ |
|
12 | +class EE_Model_Query_Info_Carrier extends EE_Base { |
|
13 | 13 | /** |
14 | 14 | * @var string SQL for performing joins (Eg, "INNER JOIN blah ON blah=blah INNER JOIN FOO ON foo=foo...") |
15 | 15 | */ |
@@ -43,29 +43,29 @@ discard block |
||
43 | 43 | |
44 | 44 | private $_group_by_sql; |
45 | 45 | |
46 | - function set_limit_sql($limit_sql){ |
|
46 | + function set_limit_sql($limit_sql) { |
|
47 | 47 | $this->_limit_sql = $limit_sql; |
48 | 48 | } |
49 | 49 | |
50 | - function set_order_by_sql($order_by_sql){ |
|
50 | + function set_order_by_sql($order_by_sql) { |
|
51 | 51 | $this->_order_by_sql = $order_by_sql; |
52 | 52 | } |
53 | - function set_group_by_sql($group_by_sql){ |
|
53 | + function set_group_by_sql($group_by_sql) { |
|
54 | 54 | $this->_group_by_sql = $group_by_sql; |
55 | 55 | } |
56 | - function set_having_sql($having_sql){ |
|
56 | + function set_having_sql($having_sql) { |
|
57 | 57 | $this->_having_sql = $having_sql; |
58 | 58 | } |
59 | - function get_limit_sql(){ |
|
59 | + function get_limit_sql() { |
|
60 | 60 | return $this->_limit_sql; |
61 | 61 | } |
62 | - function get_order_by_sql(){ |
|
62 | + function get_order_by_sql() { |
|
63 | 63 | return $this->_order_by_sql; |
64 | 64 | } |
65 | - function get_group_by_sql(){ |
|
65 | + function get_group_by_sql() { |
|
66 | 66 | return $this->_group_by_sql; |
67 | 67 | } |
68 | - function get_having_sql(){ |
|
68 | + function get_having_sql() { |
|
69 | 69 | return $this->_having_sql; |
70 | 70 | } |
71 | 71 | /** |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | * @param type $join_sql |
75 | 75 | * @param type $data_types |
76 | 76 | */ |
77 | - public function __construct($model_included_name= array(), $join_sql = ''){ |
|
77 | + public function __construct($model_included_name = array(), $join_sql = '') { |
|
78 | 78 | $this->_models_included = $model_included_name; |
79 | 79 | $this->_join_sql = $join_sql; |
80 | 80 | } |
@@ -83,10 +83,10 @@ discard block |
||
83 | 83 | * Merges info from the other EEM_Related_Model_Info_Carrier into this one. |
84 | 84 | * @param EE_Model_Query_Info_Carrier $other_model_query_info_carrier |
85 | 85 | */ |
86 | - public function merge( $other_model_query_info_carrier ){ |
|
87 | - if( $other_model_query_info_carrier && ! $this->_have_already_included_one_of_these_models($other_model_query_info_carrier->get_model_names_included())){ |
|
88 | - $model_included_on_other_join_sql_and_data_types_carrier = $other_model_query_info_carrier->get_model_names_included(); |
|
89 | - $this->_models_included = array_merge( $this->_models_included, $model_included_on_other_join_sql_and_data_types_carrier ); |
|
86 | + public function merge($other_model_query_info_carrier) { |
|
87 | + if ($other_model_query_info_carrier && ! $this->_have_already_included_one_of_these_models($other_model_query_info_carrier->get_model_names_included())) { |
|
88 | + $model_included_on_other_join_sql_and_data_types_carrier = $other_model_query_info_carrier->get_model_names_included(); |
|
89 | + $this->_models_included = array_merge($this->_models_included, $model_included_on_other_join_sql_and_data_types_carrier); |
|
90 | 90 | $this->_join_sql .= $other_model_query_info_carrier->_join_sql; |
91 | 91 | } |
92 | 92 | //otherwise don't merge our data. |
@@ -100,9 +100,9 @@ discard block |
||
100 | 100 | * @param array $model_names just like EE_MOdel_QUery_Info_Carrier::_models_included: keys are model chain paths, values are the model names only |
101 | 101 | * @return boolean |
102 | 102 | */ |
103 | - protected function _have_already_included_one_of_these_models($model_names){ |
|
104 | - foreach($this->_models_included as $model_relation_path=>$model_included){ |
|
105 | - if(array_key_exists($model_relation_path, $model_names)){ |
|
103 | + protected function _have_already_included_one_of_these_models($model_names) { |
|
104 | + foreach ($this->_models_included as $model_relation_path=>$model_included) { |
|
105 | + if (array_key_exists($model_relation_path, $model_names)) { |
|
106 | 106 | return true; |
107 | 107 | } |
108 | 108 | } |
@@ -112,17 +112,17 @@ discard block |
||
112 | 112 | * Array keys are model names, values are "model relation paths". See EE_Model_Query_Info_Carrier::_models_included for details |
113 | 113 | * @return array like EE_Model_Query_Info_Carrier::_models_included |
114 | 114 | */ |
115 | - public function get_model_names_included(){ |
|
115 | + public function get_model_names_included() { |
|
116 | 116 | return $this->_models_included; |
117 | 117 | } |
118 | 118 | /** |
119 | 119 | * sets the $where_sql for later use from client code |
120 | 120 | * @param string $where_sql |
121 | 121 | */ |
122 | - public function set_where_sql($where_sql){ |
|
122 | + public function set_where_sql($where_sql) { |
|
123 | 123 | $this->_where_sql = $where_sql; |
124 | 124 | } |
125 | - public function get_where_sql(){ |
|
125 | + public function get_where_sql() { |
|
126 | 126 | return $this->_where_sql; |
127 | 127 | } |
128 | 128 | |
@@ -143,10 +143,10 @@ discard block |
||
143 | 143 | * after the FROM and before the WHERE.) |
144 | 144 | * @param string $join_sql |
145 | 145 | */ |
146 | - public function set_main_model_join_sql($join_sql){ |
|
146 | + public function set_main_model_join_sql($join_sql) { |
|
147 | 147 | $this->_main_join_sql = $join_sql; |
148 | 148 | } |
149 | - public function get_full_join_sql(){ |
|
150 | - return $this->_main_join_sql . $this->_join_sql; |
|
149 | + public function get_full_join_sql() { |
|
150 | + return $this->_main_join_sql.$this->_join_sql; |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | \ No newline at end of file |