@@ -219,11 +219,11 @@ discard block |
||
219 | 219 | |
220 | 220 | |
221 | 221 | /** |
222 | - * retrieve ALL registrations for a particular Attendee from db |
|
223 | - * @access public |
|
224 | - * @param int $ATT_ID |
|
225 | - * @return EE_Registration[] |
|
226 | - */ |
|
222 | + * retrieve ALL registrations for a particular Attendee from db |
|
223 | + * @access public |
|
224 | + * @param int $ATT_ID |
|
225 | + * @return EE_Registration[] |
|
226 | + */ |
|
227 | 227 | public function get_all_registrations_for_attendee( $ATT_ID = 0 ) { |
228 | 228 | if ( ! $ATT_ID ) { |
229 | 229 | return FALSE; |
@@ -250,14 +250,14 @@ discard block |
||
250 | 250 | |
251 | 251 | |
252 | 252 | /** |
253 | - * retrieve registration for a specific transaction attendee from db |
|
254 | - * |
|
255 | - * @access public |
|
256 | - * @param int $TXN_ID |
|
257 | - * @param int $ATT_ID |
|
258 | - * @param int $att_nmbr in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required |
|
259 | - * @return mixed array on success, FALSE on fail |
|
260 | - */ |
|
253 | + * retrieve registration for a specific transaction attendee from db |
|
254 | + * |
|
255 | + * @access public |
|
256 | + * @param int $TXN_ID |
|
257 | + * @param int $ATT_ID |
|
258 | + * @param int $att_nmbr in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required |
|
259 | + * @return mixed array on success, FALSE on fail |
|
260 | + */ |
|
261 | 261 | public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) { |
262 | 262 | return $this->get_one(array( |
263 | 263 | array( |
@@ -270,12 +270,12 @@ discard block |
||
270 | 270 | |
271 | 271 | |
272 | 272 | /** |
273 | - * get the number of registrations per day for the Registration Admin page Reports Tab. |
|
273 | + * get the number of registrations per day for the Registration Admin page Reports Tab. |
|
274 | 274 | * (doesn't utilize models because it's a fairly specialized query) |
275 | - * @access public |
|
275 | + * @access public |
|
276 | 276 | * @param $period string which can be passed to php's strtotime function (eg "-1 month") |
277 | 277 | * @return stdClass[] with properties regDate and total |
278 | - */ |
|
278 | + */ |
|
279 | 279 | public function get_registrations_per_day_report( $period = '-1 month' ) { |
280 | 280 | |
281 | 281 | $sql_date = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' ); |
@@ -304,11 +304,11 @@ discard block |
||
304 | 304 | |
305 | 305 | |
306 | 306 | /** |
307 | - * get the number of registrations per event for the Registration Admin page Reports Tab |
|
308 | - * @access public |
|
307 | + * get the number of registrations per event for the Registration Admin page Reports Tab |
|
308 | + * @access public |
|
309 | 309 | * @param $period string which can be passed to php's strtotime function (eg "-1 month") |
310 | 310 | * @return stdClass[] each with properties event_name, reg_limit, and total |
311 | - */ |
|
311 | + */ |
|
312 | 312 | public function get_registrations_per_event_report( $period = '-1 month' ) { |
313 | 313 | |
314 | 314 | $date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' ); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
2 | -require_once ( EE_MODELS . 'EEM_Soft_Delete_Base.model.php' ); |
|
3 | -require_once ( EE_CLASSES . 'EE_Registration.class.php' ); |
|
2 | +require_once (EE_MODELS.'EEM_Soft_Delete_Base.model.php'); |
|
3 | +require_once (EE_CLASSES.'EE_Registration.class.php'); |
|
4 | 4 | /** |
5 | 5 | * |
6 | 6 | * Registration Model |
@@ -92,31 +92,31 @@ discard block |
||
92 | 92 | * 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) |
93 | 93 | * @return \EEM_Registration |
94 | 94 | */ |
95 | - protected function __construct( $timezone ) { |
|
96 | - $this->singular_item = __('Registration','event_espresso'); |
|
97 | - $this->plural_item = __('Registrations','event_espresso'); |
|
95 | + protected function __construct($timezone) { |
|
96 | + $this->singular_item = __('Registration', 'event_espresso'); |
|
97 | + $this->plural_item = __('Registrations', 'event_espresso'); |
|
98 | 98 | |
99 | 99 | $this->_tables = array( |
100 | - 'Registration'=>new EE_Primary_Table('esp_registration','REG_ID') |
|
100 | + 'Registration'=>new EE_Primary_Table('esp_registration', 'REG_ID') |
|
101 | 101 | ); |
102 | 102 | $this->_fields = array( |
103 | 103 | 'Registration'=>array( |
104 | - 'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID','event_espresso')), |
|
105 | - 'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID','event_espresso'), false, 0, 'Event'), |
|
106 | - 'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID','event_espresso'), false, 0, 'Attendee'), |
|
107 | - 'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID','event_espresso'), false, 0, 'Transaction'), |
|
108 | - 'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID','event_espresso'), false, 0, 'Ticket'), |
|
109 | - 'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID','event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'), |
|
110 | - 'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred','event_espresso'), false, time(), $timezone ), |
|
111 | - 'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total','event_espresso'), false, 0), |
|
112 | - 'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration','event_espresso'), false, 0), |
|
113 | - 'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration','event_espresso'), false, ''), |
|
114 | - 'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration','event_espresso'), false, ''), |
|
115 | - 'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration','event_espresso'), false, ''), |
|
116 | - 'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ','event_espresso'), true, 1), |
|
117 | - 'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group','event_espresso'), false, 1), |
|
118 | - 'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending','event_espresso'), false, false), |
|
119 | - 'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false ) |
|
104 | + 'REG_ID'=>new EE_Primary_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso')), |
|
105 | + 'EVT_ID'=>new EE_Foreign_Key_Int_Field('EVT_ID', __('Event ID', 'event_espresso'), false, 0, 'Event'), |
|
106 | + 'ATT_ID'=>new EE_Foreign_Key_Int_Field('ATT_ID', __('Attendee ID', 'event_espresso'), false, 0, 'Attendee'), |
|
107 | + 'TXN_ID'=>new EE_Foreign_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso'), false, 0, 'Transaction'), |
|
108 | + 'TKT_ID'=>new EE_Foreign_Key_Int_Field('TKT_ID', __('Ticket ID', 'event_espresso'), false, 0, 'Ticket'), |
|
109 | + 'STS_ID'=>new EE_Foreign_Key_String_Field('STS_ID', __('Status ID', 'event_espresso'), false, EEM_Registration::status_id_incomplete, 'Status'), |
|
110 | + 'REG_date'=>new EE_Datetime_Field('REG_date', __('Time registration occurred', 'event_espresso'), false, time(), $timezone), |
|
111 | + 'REG_final_price'=>new EE_Money_Field('REG_final_price', __('Registration\'s share of the transaction total', 'event_espresso'), false, 0), |
|
112 | + 'REG_paid'=>new EE_Money_Field('REG_paid', __('Amount paid to date towards registration', 'event_espresso'), false, 0), |
|
113 | + 'REG_session'=>new EE_Plain_Text_Field('REG_session', __('Session ID of registration', 'event_espresso'), false, ''), |
|
114 | + 'REG_code'=>new EE_Plain_Text_Field('REG_code', __('Unique Code for this registration', 'event_espresso'), false, ''), |
|
115 | + 'REG_url_link'=>new EE_Plain_Text_Field('REG_url_link', __('String to be used in URL for identifying registration', 'event_espresso'), false, ''), |
|
116 | + 'REG_count'=>new EE_Integer_Field('REG_count', __('Count of this registration in the group registration ', 'event_espresso'), true, 1), |
|
117 | + 'REG_group_size'=>new EE_Integer_Field('REG_group_size', __('Number of registrations on this group', 'event_espresso'), false, 1), |
|
118 | + 'REG_att_is_going'=>new EE_Boolean_Field('REG_att_is_going', __('Flag indicating the registrant plans on attending', 'event_espresso'), false, false), |
|
119 | + 'REG_deleted' => new EE_Trashed_Flag_Field('REG_deleted', __('Flag indicating if registration has been archived or not.', 'event_espresso'), false, false) |
|
120 | 120 | ) |
121 | 121 | ); |
122 | 122 | $this->_model_relations = array( |
@@ -128,11 +128,11 @@ discard block |
||
128 | 128 | 'Answer'=>new EE_Has_Many_Relation(), |
129 | 129 | 'Checkin'=>new EE_Has_Many_Relation(), |
130 | 130 | 'Registration_Payment' => new EE_Has_Many_Relation(), |
131 | - 'Payment'=>new EE_HABTM_Relation( 'Registration_Payment' ), |
|
131 | + 'Payment'=>new EE_HABTM_Relation('Registration_Payment'), |
|
132 | 132 | ); |
133 | 133 | $this->_model_chain_to_wp_user = 'Event'; |
134 | 134 | |
135 | - parent::__construct( $timezone ); |
|
135 | + parent::__construct($timezone); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | |
@@ -165,9 +165,9 @@ discard block |
||
165 | 165 | * @param bool $translated If true will return the values as singular localized strings |
166 | 166 | * @return array |
167 | 167 | */ |
168 | - public static function reg_status_array( $exclude = array(), $translated = FALSE ) { |
|
169 | - EEM_Registration::instance()->_get_registration_status_array( $exclude ); |
|
170 | - return $translated ? EEM_Status::instance()->localized_status( self::$_reg_status, FALSE, 'sentence') : self::$_reg_status; |
|
168 | + public static function reg_status_array($exclude = array(), $translated = FALSE) { |
|
169 | + EEM_Registration::instance()->_get_registration_status_array($exclude); |
|
170 | + return $translated ? EEM_Status::instance()->localized_status(self::$_reg_status, FALSE, 'sentence') : self::$_reg_status; |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | |
@@ -178,19 +178,19 @@ discard block |
||
178 | 178 | * @param array $exclude |
179 | 179 | * @return array |
180 | 180 | */ |
181 | - private function _get_registration_status_array( $exclude = array() ) { |
|
181 | + private function _get_registration_status_array($exclude = array()) { |
|
182 | 182 | //in the very rare circumstance that we are deleting a model's table's data |
183 | 183 | //and the table hasn't actually been created, this could have an error |
184 | 184 | /** @type WPDB $wpdb */ |
185 | 185 | global $wpdb; |
186 | - EE_Registry::instance()->load_helper( 'Activation' ); |
|
187 | - if( EEH_Activation::table_exists( $wpdb->prefix . 'esp_status' ) ){ |
|
188 | - $SQL = 'SELECT STS_ID, STS_code FROM '. $wpdb->prefix . 'esp_status WHERE STS_type = "registration"'; |
|
189 | - $results = $wpdb->get_results( $SQL ); |
|
186 | + EE_Registry::instance()->load_helper('Activation'); |
|
187 | + if (EEH_Activation::table_exists($wpdb->prefix.'esp_status')) { |
|
188 | + $SQL = 'SELECT STS_ID, STS_code FROM '.$wpdb->prefix.'esp_status WHERE STS_type = "registration"'; |
|
189 | + $results = $wpdb->get_results($SQL); |
|
190 | 190 | self::$_reg_status = array(); |
191 | - foreach ( $results as $status ) { |
|
192 | - if ( ! in_array( $status->STS_ID, $exclude )) { |
|
193 | - self::$_reg_status[ $status->STS_ID ] = $status->STS_code; |
|
191 | + foreach ($results as $status) { |
|
192 | + if ( ! in_array($status->STS_ID, $exclude)) { |
|
193 | + self::$_reg_status[$status->STS_ID] = $status->STS_code; |
|
194 | 194 | } |
195 | 195 | } |
196 | 196 | } |
@@ -205,15 +205,15 @@ discard block |
||
205 | 205 | * @param array $where_params Array of query_params as described in the comments for EEM_Base::get_all() |
206 | 206 | * @return wpdb results array |
207 | 207 | */ |
208 | - public function get_reg_months_and_years( $where_params ) { |
|
208 | + public function get_reg_months_and_years($where_params) { |
|
209 | 209 | $query_params[0] = $where_params; |
210 | 210 | $query_params['group_by'] = array('reg_year', 'reg_month'); |
211 | - $query_params['order_by'] = array( 'REG_date' => 'DESC' ); |
|
211 | + $query_params['order_by'] = array('REG_date' => 'DESC'); |
|
212 | 212 | $columns_to_select = array( |
213 | 213 | 'reg_year' => array('YEAR(REG_date)', '%s'), |
214 | 214 | 'reg_month' => array('MONTHNAME(REG_date)', '%s') |
215 | 215 | ); |
216 | - return $this->_get_all_wpdb_results( $query_params, OBJECT, $columns_to_select ); |
|
216 | + return $this->_get_all_wpdb_results($query_params, OBJECT, $columns_to_select); |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | |
@@ -225,11 +225,11 @@ discard block |
||
225 | 225 | * @param int $ATT_ID |
226 | 226 | * @return EE_Registration[] |
227 | 227 | */ |
228 | - public function get_all_registrations_for_attendee( $ATT_ID = 0 ) { |
|
229 | - if ( ! $ATT_ID ) { |
|
228 | + public function get_all_registrations_for_attendee($ATT_ID = 0) { |
|
229 | + if ( ! $ATT_ID) { |
|
230 | 230 | return FALSE; |
231 | 231 | } |
232 | - return $this->get_all( array( array( 'ATT_ID' => $ATT_ID ))); |
|
232 | + return $this->get_all(array(array('ATT_ID' => $ATT_ID))); |
|
233 | 233 | } |
234 | 234 | |
235 | 235 | |
@@ -240,8 +240,8 @@ discard block |
||
240 | 240 | * @param string $REG_url_link |
241 | 241 | * @return EE_Registration |
242 | 242 | */ |
243 | - public function get_registration_for_reg_url_link($REG_url_link){ |
|
244 | - if(!$REG_url_link){ |
|
243 | + public function get_registration_for_reg_url_link($REG_url_link) { |
|
244 | + if ( ! $REG_url_link) { |
|
245 | 245 | return false; |
246 | 246 | } |
247 | 247 | return $this->get_one(array(array('REG_url_link'=>$REG_url_link))); |
@@ -259,13 +259,13 @@ discard block |
||
259 | 259 | * @param int $att_nmbr in case the ATT_ID is the same for multiple registrations (same details used) then the attendee number is required |
260 | 260 | * @return mixed array on success, FALSE on fail |
261 | 261 | */ |
262 | - public function get_registration_for_transaction_attendee( $TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0 ) { |
|
262 | + public function get_registration_for_transaction_attendee($TXN_ID = 0, $ATT_ID = 0, $att_nmbr = 0) { |
|
263 | 263 | return $this->get_one(array( |
264 | 264 | array( |
265 | 265 | 'TXN_ID'=>$TXN_ID, |
266 | 266 | 'ATT_ID'=>$ATT_ID |
267 | 267 | ), |
268 | - 'limit'=>array( min( ( $att_nmbr-1 ), 0 ), 1 ) |
|
268 | + 'limit'=>array(min(($att_nmbr - 1), 0), 1) |
|
269 | 269 | )); |
270 | 270 | } |
271 | 271 | |
@@ -277,17 +277,17 @@ discard block |
||
277 | 277 | * @param $period string which can be passed to php's strtotime function (eg "-1 month") |
278 | 278 | * @return stdClass[] with properties regDate and total |
279 | 279 | */ |
280 | - public function get_registrations_per_day_report( $period = '-1 month' ) { |
|
280 | + public function get_registrations_per_day_report($period = '-1 month') { |
|
281 | 281 | |
282 | - $sql_date = $this->convert_datetime_for_query( 'REG_date', date("Y-m-d H:i:s", strtotime($period) ), 'Y-m-d H:i:s', 'UTC' ); |
|
283 | - $where = array( 'REG_date' => array( '>=', $sql_date ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) ); |
|
282 | + $sql_date = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC'); |
|
283 | + $where = array('REG_date' => array('>=', $sql_date), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete)); |
|
284 | 284 | |
285 | - if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_day_report' ) ) { |
|
285 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_day_report')) { |
|
286 | 286 | $where['Event.EVT_wp_user'] = get_current_user_id(); |
287 | 287 | } |
288 | 288 | |
289 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
290 | - $query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'REG_date' ); |
|
289 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
290 | + $query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'REG_date'); |
|
291 | 291 | |
292 | 292 | $results = $this->_get_all_wpdb_results( |
293 | 293 | array( |
@@ -297,8 +297,8 @@ discard block |
||
297 | 297 | ), |
298 | 298 | OBJECT, |
299 | 299 | array( |
300 | - 'regDate'=>array( 'DATE(' . $query_interval . ')','%s'), |
|
301 | - 'total'=>array('count(REG_ID)','%d') |
|
300 | + 'regDate'=>array('DATE('.$query_interval.')', '%s'), |
|
301 | + 'total'=>array('count(REG_ID)', '%d') |
|
302 | 302 | )); |
303 | 303 | return $results; |
304 | 304 | } |
@@ -313,23 +313,23 @@ discard block |
||
313 | 313 | * @return stdClass[] with properties Registration_REG_date and a column for each registration status as the STS_ID |
314 | 314 | * (i.e. RAP) |
315 | 315 | */ |
316 | - public function get_registrations_per_day_and_per_status_report( $period = '-1 month' ) { |
|
316 | + public function get_registrations_per_day_and_per_status_report($period = '-1 month') { |
|
317 | 317 | global $wpdb; |
318 | - $registration_table = $wpdb->prefix . 'esp_registration'; |
|
318 | + $registration_table = $wpdb->prefix.'esp_registration'; |
|
319 | 319 | $event_table = $wpdb->posts; |
320 | - $sql_date = date("Y-m-d H:i:s", strtotime($period) ); |
|
320 | + $sql_date = date("Y-m-d H:i:s", strtotime($period)); |
|
321 | 321 | |
322 | 322 | //prepare the query interval for displaying offset |
323 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
324 | - $query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset( $this->get_timezone(), 'dates.REG_date' ); |
|
323 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
324 | + $query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'dates.REG_date'); |
|
325 | 325 | |
326 | 326 | //inner date query |
327 | 327 | $inner_date_query = "SELECT DISTINCT REG_date from $registration_table "; |
328 | 328 | $inner_where = " WHERE"; |
329 | 329 | //exclude events not authored by user if permissions in effect |
330 | - if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) { |
|
330 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) { |
|
331 | 331 | $inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID"; |
332 | - $inner_where .= " post_author = " . get_current_user_id() . " AND"; |
|
332 | + $inner_where .= " post_author = ".get_current_user_id()." AND"; |
|
333 | 333 | } |
334 | 334 | $inner_where .= " REG_date >= '$sql_date'"; |
335 | 335 | $inner_date_query .= $inner_where; |
@@ -341,8 +341,8 @@ discard block |
||
341 | 341 | $select_parts = array(); |
342 | 342 | |
343 | 343 | //loop through registration stati to do parts for each status. |
344 | - foreach ( EEM_Registration::reg_status_array() as $STS_ID => $STS_code ) { |
|
345 | - if ( $STS_ID === EEM_Registration::status_id_incomplete ) { |
|
344 | + foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) { |
|
345 | + if ($STS_ID === EEM_Registration::status_id_incomplete) { |
|
346 | 346 | continue; |
347 | 347 | } |
348 | 348 | $select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID"; |
@@ -350,14 +350,14 @@ discard block |
||
350 | 350 | } |
351 | 351 | |
352 | 352 | //setup the selects |
353 | - $select .= implode(', ', $select_parts ); |
|
353 | + $select .= implode(', ', $select_parts); |
|
354 | 354 | $select .= " FROM ($inner_date_query) AS dates LEFT JOIN "; |
355 | 355 | |
356 | 356 | //setup the joins |
357 | - $join .= implode( " LEFT JOIN ", $join_parts ); |
|
357 | + $join .= implode(" LEFT JOIN ", $join_parts); |
|
358 | 358 | |
359 | 359 | //now let's put it all together |
360 | - $query = $select . $join . ' GROUP BY Registration_REG_date'; |
|
360 | + $query = $select.$join.' GROUP BY Registration_REG_date'; |
|
361 | 361 | |
362 | 362 | //and execute it |
363 | 363 | $results = $wpdb->get_results( |
@@ -378,23 +378,23 @@ discard block |
||
378 | 378 | * @param $period string which can be passed to php's strtotime function (eg "-1 month") |
379 | 379 | * @return stdClass[] each with properties event_name, reg_limit, and total |
380 | 380 | */ |
381 | - public function get_registrations_per_event_report( $period = '-1 month' ) { |
|
381 | + public function get_registrations_per_event_report($period = '-1 month') { |
|
382 | 382 | |
383 | - $date_sql = $this->convert_datetime_for_query( 'REG_date', date( "Y-m-d H:i:s", strtotime( $period )), 'Y-m-d H:i:s', 'UTC' ); |
|
384 | - $where = array( 'REG_date' => array( '>=', $date_sql ), 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) ); |
|
383 | + $date_sql = $this->convert_datetime_for_query('REG_date', date("Y-m-d H:i:s", strtotime($period)), 'Y-m-d H:i:s', 'UTC'); |
|
384 | + $where = array('REG_date' => array('>=', $date_sql), 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete)); |
|
385 | 385 | |
386 | - if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) { |
|
386 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) { |
|
387 | 387 | $where['Event.EVT_wp_user'] = get_current_user_id(); |
388 | 388 | } |
389 | 389 | $results = $this->_get_all_wpdb_results(array( |
390 | 390 | $where, |
391 | 391 | 'group_by'=>'Event.EVT_name', |
392 | 392 | 'order_by'=>'Event.EVT_name', |
393 | - 'limit'=>array(0,24)), |
|
393 | + 'limit'=>array(0, 24)), |
|
394 | 394 | OBJECT, |
395 | 395 | array( |
396 | - 'event_name'=>array('Event_CPT.post_title','%s'), |
|
397 | - 'total'=>array('COUNT(REG_ID)','%s') |
|
396 | + 'event_name'=>array('Event_CPT.post_title', '%s'), |
|
397 | + 'total'=>array('COUNT(REG_ID)', '%s') |
|
398 | 398 | ) |
399 | 399 | ); |
400 | 400 | |
@@ -412,19 +412,19 @@ discard block |
||
412 | 412 | * @return stdClass[] with properties `Registration_Event` and a column for each registration status as the STS_ID |
413 | 413 | * (i.e. RAP) |
414 | 414 | */ |
415 | - public function get_registrations_per_event_and_per_status_report( $period = '-1 month' ) { |
|
415 | + public function get_registrations_per_event_and_per_status_report($period = '-1 month') { |
|
416 | 416 | global $wpdb; |
417 | - $registration_table = $wpdb->prefix . 'esp_registration'; |
|
417 | + $registration_table = $wpdb->prefix.'esp_registration'; |
|
418 | 418 | $event_table = $wpdb->posts; |
419 | - $sql_date = date("Y-m-d H:i:s", strtotime($period) ); |
|
419 | + $sql_date = date("Y-m-d H:i:s", strtotime($period)); |
|
420 | 420 | |
421 | 421 | //inner date query |
422 | 422 | $inner_date_query = "SELECT DISTINCT EVT_ID, REG_date from $registration_table "; |
423 | 423 | $inner_where = " WHERE"; |
424 | 424 | //exclude events not authored by user if permissions in effect |
425 | - if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_registrations', 'reg_per_event_report' ) ) { |
|
425 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) { |
|
426 | 426 | $inner_date_query .= "LEFT JOIN $event_table ON ID = EVT_ID"; |
427 | - $inner_where .= " post_author = " . get_current_user_id() . " AND"; |
|
427 | + $inner_where .= " post_author = ".get_current_user_id()." AND"; |
|
428 | 428 | } |
429 | 429 | $inner_where .= " REG_date >= '$sql_date'"; |
430 | 430 | $inner_date_query .= $inner_where; |
@@ -436,8 +436,8 @@ discard block |
||
436 | 436 | $select_parts = array(); |
437 | 437 | |
438 | 438 | //loop through registration stati to do parts for each status. |
439 | - foreach ( EEM_Registration::reg_status_array() as $STS_ID => $STS_code ) { |
|
440 | - if ( $STS_ID === EEM_Registration::status_id_incomplete ) { |
|
439 | + foreach (EEM_Registration::reg_status_array() as $STS_ID => $STS_code) { |
|
440 | + if ($STS_ID === EEM_Registration::status_id_incomplete) { |
|
441 | 441 | continue; |
442 | 442 | } |
443 | 443 | $select_parts[] = "COUNT($STS_code.REG_ID) as $STS_ID"; |
@@ -445,14 +445,14 @@ discard block |
||
445 | 445 | } |
446 | 446 | |
447 | 447 | //setup the selects |
448 | - $select .= implode( ', ', $select_parts ); |
|
448 | + $select .= implode(', ', $select_parts); |
|
449 | 449 | $select .= " FROM ($inner_date_query) AS dates LEFT JOIN $event_table as Event ON Event.ID = dates.EVT_ID LEFT JOIN "; |
450 | 450 | |
451 | 451 | //setup remaining joins |
452 | - $join .= implode( " LEFT JOIN ", $join_parts ); |
|
452 | + $join .= implode(" LEFT JOIN ", $join_parts); |
|
453 | 453 | |
454 | 454 | //now put it all together |
455 | - $query = $select . $join . ' GROUP BY Registration_Event'; |
|
455 | + $query = $select.$join.' GROUP BY Registration_Event'; |
|
456 | 456 | |
457 | 457 | //and execute |
458 | 458 | $results = $wpdb->get_results( |
@@ -468,11 +468,11 @@ discard block |
||
468 | 468 | * @param int $TXN_ID |
469 | 469 | * @return EE_Registration |
470 | 470 | */ |
471 | - public function get_primary_registration_for_transaction_ID( $TXN_ID = 0){ |
|
472 | - if( ! $TXN_ID ){ |
|
471 | + public function get_primary_registration_for_transaction_ID($TXN_ID = 0) { |
|
472 | + if ( ! $TXN_ID) { |
|
473 | 473 | return false; |
474 | 474 | } |
475 | - return $this->get_one(array(array('TXN_ID'=>$TXN_ID,'REG_count'=> EEM_Registration::PRIMARY_REGISTRANT_COUNT))); |
|
475 | + return $this->get_one(array(array('TXN_ID'=>$TXN_ID, 'REG_count'=> EEM_Registration::PRIMARY_REGISTRANT_COUNT))); |
|
476 | 476 | } |
477 | 477 | |
478 | 478 | |
@@ -484,11 +484,11 @@ discard block |
||
484 | 484 | * @param boolean $for_incomplete_payments |
485 | 485 | * @return int |
486 | 486 | */ |
487 | - public function get_event_registration_count ( $EVT_ID, $for_incomplete_payments = FALSE ) { |
|
487 | + public function get_event_registration_count($EVT_ID, $for_incomplete_payments = FALSE) { |
|
488 | 488 | // we only count approved registrations towards registration limits |
489 | - $query_params = array( array( 'EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved ) ); |
|
490 | - if( $for_incomplete_payments ){ |
|
491 | - $query_params[0]['Transaction.STS_ID']=array('!=', EEM_Transaction::complete_status_code); |
|
489 | + $query_params = array(array('EVT_ID' => $EVT_ID, 'STS_ID' => self::status_id_approved)); |
|
490 | + if ($for_incomplete_payments) { |
|
491 | + $query_params[0]['Transaction.STS_ID'] = array('!=', EEM_Transaction::complete_status_code); |
|
492 | 492 | } |
493 | 493 | |
494 | 494 | return $this->count($query_params); |
@@ -504,7 +504,7 @@ discard block |
||
504 | 504 | /** @type WPDB $wpdb */ |
505 | 505 | global $wpdb; |
506 | 506 | return $wpdb->query( |
507 | - 'DELETE r FROM ' . $this->table() . ' r LEFT JOIN ' . EEM_Transaction::instance()->table() . ' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' ); |
|
507 | + 'DELETE r FROM '.$this->table().' r LEFT JOIN '.EEM_Transaction::instance()->table().' t ON r.TXN_ID = t.TXN_ID WHERE t.TXN_ID IS NULL' ); |
|
508 | 508 | } |
509 | 509 | |
510 | 510 | /** |
@@ -514,7 +514,7 @@ discard block |
||
514 | 514 | * @param boolean $checked_in whether to count registrations checked IN or OUT |
515 | 515 | * @return int |
516 | 516 | */ |
517 | - public function count_registrations_checked_into_datetime( $DTT_ID, $checked_in = true) { |
|
517 | + public function count_registrations_checked_into_datetime($DTT_ID, $checked_in = true) { |
|
518 | 518 | return $this->count( |
519 | 519 | array( |
520 | 520 | array( |
@@ -532,7 +532,7 @@ discard block |
||
532 | 532 | * @param boolean $checked_in whether to count registrations checked IN or OUT |
533 | 533 | * @return int |
534 | 534 | */ |
535 | - public function count_registrations_checked_into_event( $EVT_ID, $checked_in = true ) { |
|
535 | + public function count_registrations_checked_into_event($EVT_ID, $checked_in = true) { |
|
536 | 536 | return $this->count( |
537 | 537 | array( |
538 | 538 | array( |
@@ -1,13 +1,13 @@ |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); } |
2 | 2 | /** |
3 | - * EE_Form_Input_Base |
|
4 | - * For representing a single form input. Extends EE_Form_Section_Base because |
|
5 | - * it is a part of a form and shares a surprisingly large amount of functionality |
|
6 | - * |
|
7 | - * @package Event Espresso |
|
8 | - * @subpackage |
|
9 | - * @author Mike Nelson |
|
10 | - */ |
|
3 | + * EE_Form_Input_Base |
|
4 | + * For representing a single form input. Extends EE_Form_Section_Base because |
|
5 | + * it is a part of a form and shares a surprisingly large amount of functionality |
|
6 | + * |
|
7 | + * @package Event Espresso |
|
8 | + * @subpackage |
|
9 | + * @author Mike Nelson |
|
10 | + */ |
|
11 | 11 | abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{ |
12 | 12 | |
13 | 13 | /** |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | * @subpackage |
9 | 9 | * @author Mike Nelson |
10 | 10 | */ |
11 | -abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable{ |
|
11 | +abstract class EE_Form_Input_Base extends EE_Form_Section_Validatable { |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * the input's name attribute |
@@ -141,66 +141,66 @@ discard block |
||
141 | 141 | * @type EE_Validation_Strategy_Base[] $validation_strategies |
142 | 142 | * } |
143 | 143 | */ |
144 | - public function __construct( $input_args = array() ){ |
|
145 | - $input_args = apply_filters( 'FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this ); |
|
144 | + public function __construct($input_args = array()) { |
|
145 | + $input_args = apply_filters('FHEE__EE_Form_Input_Base___construct__input_args', $input_args, $this); |
|
146 | 146 | // the following properties must be cast as arrays |
147 | 147 | $set_as_array = array( |
148 | 148 | 'validation_strategies' => true |
149 | 149 | ); |
150 | 150 | // loop thru incoming options |
151 | - foreach( $input_args as $key => $value ) { |
|
151 | + foreach ($input_args as $key => $value) { |
|
152 | 152 | // add underscore to $key to match property names |
153 | - $_key = '_' . $key; |
|
154 | - if ( property_exists( $this, $_key )) { |
|
153 | + $_key = '_'.$key; |
|
154 | + if (property_exists($this, $_key)) { |
|
155 | 155 | // first check if this property needs to be set as an array |
156 | - if ( isset( $set_as_array[ $key ] )) { |
|
156 | + if (isset($set_as_array[$key])) { |
|
157 | 157 | // ensure value is an array |
158 | - $value = is_array( $value ) ? $value : array( get_class( $value ), $value ); |
|
158 | + $value = is_array($value) ? $value : array(get_class($value), $value); |
|
159 | 159 | // and merge with existing values |
160 | - $this->{$_key} = array_merge( $this->{$_key}, $value ); |
|
160 | + $this->{$_key} = array_merge($this->{$_key}, $value); |
|
161 | 161 | } else { |
162 | 162 | $this->{$_key} = $value; |
163 | 163 | } |
164 | 164 | } |
165 | 165 | } |
166 | 166 | // ensure that "required" is set correctly |
167 | - $this->set_required( $this->_required, isset( $input_args[ 'required_validation_error_message' ] ) ? $input_args[ 'required_validation_error_message' ] : NULL ); |
|
167 | + $this->set_required($this->_required, isset($input_args['required_validation_error_message']) ? $input_args['required_validation_error_message'] : NULL); |
|
168 | 168 | |
169 | 169 | //$this->_html_name_specified = isset( $input_args['html_name'] ) ? TRUE : FALSE; |
170 | 170 | |
171 | 171 | $this->_display_strategy->_construct_finalize($this); |
172 | - if ( $this->_validation_strategies ){ |
|
173 | - foreach( $this->_validation_strategies as $validation_strategy ){ |
|
172 | + if ($this->_validation_strategies) { |
|
173 | + foreach ($this->_validation_strategies as $validation_strategy) { |
|
174 | 174 | $validation_strategy->_construct_finalize($this); |
175 | 175 | } |
176 | 176 | } |
177 | 177 | |
178 | - if( ! $this->_normalization_strategy){ |
|
178 | + if ( ! $this->_normalization_strategy) { |
|
179 | 179 | $this->_normalization_strategy = new EE_Text_Normalization(); |
180 | 180 | } |
181 | 181 | $this->_normalization_strategy->_construct_finalize($this); |
182 | 182 | |
183 | 183 | //at least we can use the normalization strategy to populate the default |
184 | - if( isset( $input_args[ 'default' ] ) ) { |
|
185 | - $this->set_default( $input_args[ 'default' ] ); |
|
184 | + if (isset($input_args['default'])) { |
|
185 | + $this->set_default($input_args['default']); |
|
186 | 186 | } |
187 | 187 | |
188 | - if( ! $this->_sensitive_data_removal_strategy){ |
|
188 | + if ( ! $this->_sensitive_data_removal_strategy) { |
|
189 | 189 | $this->_sensitive_data_removal_strategy = new EE_No_Sensitive_Data_Removal(); |
190 | 190 | } |
191 | 191 | $this->_sensitive_data_removal_strategy->_construct_finalize($this); |
192 | - parent::__construct( $input_args ); |
|
192 | + parent::__construct($input_args); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | /** |
196 | 196 | * Sets the html_name to its default value, if none was specified in teh constructor. |
197 | 197 | * Calculation involves using the name and the parent's html_name |
198 | 198 | */ |
199 | - protected function _set_default_html_name_if_empty(){ |
|
200 | - if( ! $this->_html_name){ |
|
201 | - if( $this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper){ |
|
202 | - $this->_html_name = $this->_parent_section->html_name_prefix() . "[{$this->name()}]"; |
|
203 | - }else{ |
|
199 | + protected function _set_default_html_name_if_empty() { |
|
200 | + if ( ! $this->_html_name) { |
|
201 | + if ($this->_parent_section && $this->_parent_section instanceof EE_Form_Section_Proper) { |
|
202 | + $this->_html_name = $this->_parent_section->html_name_prefix()."[{$this->name()}]"; |
|
203 | + } else { |
|
204 | 204 | $this->_html_name = $this->name(); |
205 | 205 | } |
206 | 206 | } |
@@ -215,12 +215,12 @@ discard block |
||
215 | 215 | function _construct_finalize($parent_form_section, $name) { |
216 | 216 | parent::_construct_finalize($parent_form_section, $name); |
217 | 217 | $this->_set_default_html_name_if_empty(); |
218 | - if( ! $this->_html_label ){ |
|
219 | - if( ! $this->_html_label_text){ |
|
220 | - $this->_html_label_text = ucwords( str_replace("_"," ",$name)); |
|
218 | + if ( ! $this->_html_label) { |
|
219 | + if ( ! $this->_html_label_text) { |
|
220 | + $this->_html_label_text = ucwords(str_replace("_", " ", $name)); |
|
221 | 221 | } |
222 | 222 | } |
223 | - do_action( 'AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name ); |
|
223 | + do_action('AHEE__EE_Form_Input_Base___construct_finalize__end', $this, $parent_form_section, $name); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
@@ -228,10 +228,10 @@ discard block |
||
228 | 228 | * @return EE_Display_Strategy_Base |
229 | 229 | * @throws EE_Error |
230 | 230 | */ |
231 | - protected function _get_display_strategy(){ |
|
232 | - if( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base){ |
|
233 | - throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"),$this->html_name(),$this->html_id())); |
|
234 | - }else{ |
|
231 | + protected function _get_display_strategy() { |
|
232 | + if ( ! $this->_display_strategy || ! $this->_display_strategy instanceof EE_Display_Strategy_Base) { |
|
233 | + throw new EE_Error(sprintf(__("Cannot get display strategy for form input with name %s and id %s, because it has not been set in the constructor", "event_espresso"), $this->html_name(), $this->html_id())); |
|
234 | + } else { |
|
235 | 235 | return $this->_display_strategy; |
236 | 236 | } |
237 | 237 | } |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | * Sets the display strategy. |
240 | 240 | * @param EE_Display_Strategy_Base $strategy |
241 | 241 | */ |
242 | - protected function _set_display_strategy(EE_Display_Strategy_Base $strategy){ |
|
242 | + protected function _set_display_strategy(EE_Display_Strategy_Base $strategy) { |
|
243 | 243 | $this->_display_strategy = $strategy; |
244 | 244 | } |
245 | 245 | |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | * Sets the sanitization strategy |
248 | 248 | * @param EE_Normalization_Strategy_Base $strategy |
249 | 249 | */ |
250 | - protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy){ |
|
250 | + protected function _set_normalization_strategy(EE_Normalization_Strategy_Base $strategy) { |
|
251 | 251 | $this->_normalization_strategy = $strategy; |
252 | 252 | } |
253 | 253 | |
@@ -273,14 +273,14 @@ discard block |
||
273 | 273 | * Gets the display strategy for this input |
274 | 274 | * @return EE_Display_Strategy_Base |
275 | 275 | */ |
276 | - public function get_display_strategy(){ |
|
276 | + public function get_display_strategy() { |
|
277 | 277 | return $this->_display_strategy; |
278 | 278 | } |
279 | 279 | /** |
280 | 280 | * Overwrites the display strategy |
281 | 281 | * @param EE_Display_Strategy_Base $display_strategy |
282 | 282 | */ |
283 | - public function set_display_strategy($display_strategy){ |
|
283 | + public function set_display_strategy($display_strategy) { |
|
284 | 284 | $this->_display_strategy = $display_strategy; |
285 | 285 | $this->_display_strategy->_construct_finalize($this); |
286 | 286 | } |
@@ -288,14 +288,14 @@ discard block |
||
288 | 288 | * Gets the normalization strategy set on this input |
289 | 289 | * @return EE_Normalization_Strategy_Base |
290 | 290 | */ |
291 | - public function get_normalization_strategy(){ |
|
291 | + public function get_normalization_strategy() { |
|
292 | 292 | return $this->_normalization_strategy; |
293 | 293 | } |
294 | 294 | /** |
295 | 295 | * Overwrites the normalization strategy |
296 | 296 | * @param EE_Normalization_Strategy_Base $normalization_strategy |
297 | 297 | */ |
298 | - public function set_normalization_strategy($normalization_strategy){ |
|
298 | + public function set_normalization_strategy($normalization_strategy) { |
|
299 | 299 | $this->_normalization_strategy = $normalization_strategy; |
300 | 300 | $this->_normalization_strategy->_construct_finalize($this); |
301 | 301 | } |
@@ -304,10 +304,10 @@ discard block |
||
304 | 304 | * Returns all teh validation strategies which apply to this field, numerically indexed |
305 | 305 | * @return EE_Validation_Strategy_Base[] |
306 | 306 | */ |
307 | - public function get_validation_strategies(){ |
|
308 | - if(is_array($this->_validation_strategies)){ |
|
307 | + public function get_validation_strategies() { |
|
308 | + if (is_array($this->_validation_strategies)) { |
|
309 | 309 | return $this->_validation_strategies; |
310 | - }else{ |
|
310 | + } else { |
|
311 | 311 | return array(); |
312 | 312 | } |
313 | 313 | |
@@ -317,9 +317,9 @@ discard block |
||
317 | 317 | * @param EE_Validation_Strategy_Base $validation_strategy |
318 | 318 | * @return void |
319 | 319 | */ |
320 | - protected function _add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ){ |
|
321 | - $validation_strategy->_construct_finalize( $this ); |
|
322 | - $this->_validation_strategies[ get_class($validation_strategy) ] = $validation_strategy; |
|
320 | + protected function _add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) { |
|
321 | + $validation_strategy->_construct_finalize($this); |
|
322 | + $this->_validation_strategies[get_class($validation_strategy)] = $validation_strategy; |
|
323 | 323 | } |
324 | 324 | |
325 | 325 | /** |
@@ -327,18 +327,18 @@ discard block |
||
327 | 327 | * @param EE_Validation_Strategy_Base $validation_strategy |
328 | 328 | * @return void |
329 | 329 | */ |
330 | - public function add_validation_strategy( EE_Validation_Strategy_Base $validation_strategy ) { |
|
331 | - $this->_add_validation_strategy( $validation_strategy ); |
|
330 | + public function add_validation_strategy(EE_Validation_Strategy_Base $validation_strategy) { |
|
331 | + $this->_add_validation_strategy($validation_strategy); |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | /** |
335 | 335 | * The classname of the validation strategy to remove |
336 | 336 | * @param string $validation_strategy_classname |
337 | 337 | */ |
338 | - public function remove_validation_strategy( $validation_strategy_classname ) { |
|
339 | - foreach( $this->_validation_strategies as $key => $validation_strategy ){ |
|
340 | - if( is_subclass_of( $validation_strategy, $validation_strategy_classname ) ){ |
|
341 | - unset( $this->_validation_strategies[ $key ] ); |
|
338 | + public function remove_validation_strategy($validation_strategy_classname) { |
|
339 | + foreach ($this->_validation_strategies as $key => $validation_strategy) { |
|
340 | + if (is_subclass_of($validation_strategy, $validation_strategy_classname)) { |
|
341 | + unset($this->_validation_strategies[$key]); |
|
342 | 342 | } |
343 | 343 | } |
344 | 344 | } |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | * to the parent form's layout strategy |
348 | 348 | * @return string |
349 | 349 | */ |
350 | - public function get_html_and_js(){ |
|
350 | + public function get_html_and_js() { |
|
351 | 351 | return $this->_parent_section->get_html_for_input($this); |
352 | 352 | } |
353 | 353 | /** |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | * Makes sure the JS and CSS are enqueued for it |
357 | 357 | * @return string |
358 | 358 | */ |
359 | - public function get_html_for_input(){ |
|
359 | + public function get_html_for_input() { |
|
360 | 360 | return $this->_get_display_strategy()->display(); |
361 | 361 | } |
362 | 362 | |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | * @return string |
367 | 367 | */ |
368 | 368 | public function html_other_attributes() { |
369 | - return ! empty( $this->_html_other_attributes ) ? ' ' . $this->_html_other_attributes : ''; |
|
369 | + return ! empty($this->_html_other_attributes) ? ' '.$this->_html_other_attributes : ''; |
|
370 | 370 | } |
371 | 371 | |
372 | 372 | |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | /** |
375 | 375 | * @param string $html_other_attributes |
376 | 376 | */ |
377 | - public function set_html_other_attributes( $html_other_attributes ) { |
|
377 | + public function set_html_other_attributes($html_other_attributes) { |
|
378 | 378 | $this->_html_other_attributes = $html_other_attributes; |
379 | 379 | } |
380 | 380 | |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | * according to the form section's layout strategy |
384 | 384 | * @return string |
385 | 385 | */ |
386 | - public function get_html_for_label(){ |
|
386 | + public function get_html_for_label() { |
|
387 | 387 | return $this->_parent_section->get_layout_strategy()->display_label($this); |
388 | 388 | } |
389 | 389 | /** |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | * according to the form section's layout strategy |
392 | 392 | * @return string |
393 | 393 | */ |
394 | - public function get_html_for_errors(){ |
|
394 | + public function get_html_for_errors() { |
|
395 | 395 | return $this->_parent_section->get_layout_strategy()->display_errors($this); |
396 | 396 | } |
397 | 397 | /** |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | * according to the form section's layout strategy |
400 | 400 | * @return string |
401 | 401 | */ |
402 | - public function get_html_for_help(){ |
|
402 | + public function get_html_for_help() { |
|
403 | 403 | return $this->_parent_section->get_layout_strategy()->display_help_text($this); |
404 | 404 | } |
405 | 405 | /** |
@@ -408,20 +408,20 @@ discard block |
||
408 | 408 | * @return boolean |
409 | 409 | */ |
410 | 410 | protected function _validate() { |
411 | - if(is_array($this->_validation_strategies)){ |
|
412 | - foreach($this->_validation_strategies as $validation_strategy){ |
|
413 | - if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) { |
|
414 | - try{ |
|
411 | + if (is_array($this->_validation_strategies)) { |
|
412 | + foreach ($this->_validation_strategies as $validation_strategy) { |
|
413 | + if ($validation_strategy instanceof EE_Validation_Strategy_Base) { |
|
414 | + try { |
|
415 | 415 | $validation_strategy->validate($this->normalized_value()); |
416 | - }catch(EE_Validation_Error $e){ |
|
416 | + } catch (EE_Validation_Error $e) { |
|
417 | 417 | $this->add_validation_error($e); |
418 | 418 | } |
419 | 419 | } |
420 | 420 | } |
421 | 421 | } |
422 | - if( $this->get_validation_errors()){ |
|
422 | + if ($this->get_validation_errors()) { |
|
423 | 423 | return false; |
424 | - }else{ |
|
424 | + } else { |
|
425 | 425 | return true; |
426 | 426 | } |
427 | 427 | } |
@@ -434,8 +434,8 @@ discard block |
||
434 | 434 | * @param string $value |
435 | 435 | * @return null|string |
436 | 436 | */ |
437 | - private function _sanitize($value){ |
|
438 | - return $value !== NULL ?stripslashes(html_entity_decode($value)) : NULL;//don't sanitize_text_field |
|
437 | + private function _sanitize($value) { |
|
438 | + return $value !== NULL ? stripslashes(html_entity_decode($value)) : NULL; //don't sanitize_text_field |
|
439 | 439 | } |
440 | 440 | |
441 | 441 | |
@@ -447,24 +447,24 @@ discard block |
||
447 | 447 | * @param array $req_data like $_POST |
448 | 448 | * @return boolean whether or not there was an error |
449 | 449 | */ |
450 | - protected function _normalize( $req_data ) { |
|
450 | + protected function _normalize($req_data) { |
|
451 | 451 | //any existing validation errors don't apply so clear them |
452 | 452 | $this->_validation_errors = array(); |
453 | 453 | try { |
454 | - $raw_input = $this->find_form_data_for_this_section( $req_data ); |
|
454 | + $raw_input = $this->find_form_data_for_this_section($req_data); |
|
455 | 455 | //super simple sanitization for now |
456 | - if ( is_array( $raw_input )) { |
|
456 | + if (is_array($raw_input)) { |
|
457 | 457 | $this->_raw_value = array(); |
458 | - foreach( $raw_input as $key => $value ) { |
|
459 | - $this->_raw_value[ $key ] = $this->_sanitize( $value ); |
|
458 | + foreach ($raw_input as $key => $value) { |
|
459 | + $this->_raw_value[$key] = $this->_sanitize($value); |
|
460 | 460 | } |
461 | 461 | } else { |
462 | - $this->_raw_value = $this->_sanitize( $raw_input ); |
|
462 | + $this->_raw_value = $this->_sanitize($raw_input); |
|
463 | 463 | } |
464 | 464 | //we want ot mostly leave the input alone in case we need to re-display it to the user |
465 | - $this->_normalized_value = $this->_normalization_strategy->normalize( $this->raw_value() ); |
|
466 | - } catch ( EE_Validation_Error $e ) { |
|
467 | - $this->add_validation_error( $e ); |
|
465 | + $this->_normalized_value = $this->_normalization_strategy->normalize($this->raw_value()); |
|
466 | + } catch (EE_Validation_Error $e) { |
|
467 | + $this->add_validation_error($e); |
|
468 | 468 | } |
469 | 469 | } |
470 | 470 | |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | /** |
474 | 474 | * @return string |
475 | 475 | */ |
476 | - public function html_name(){ |
|
476 | + public function html_name() { |
|
477 | 477 | return $this->_html_name; |
478 | 478 | } |
479 | 479 | |
@@ -482,8 +482,8 @@ discard block |
||
482 | 482 | /** |
483 | 483 | * @return string |
484 | 484 | */ |
485 | - function html_label_id(){ |
|
486 | - return ! empty( $this->_html_label_id ) ? $this->_html_label_id : $this->_html_id . '-lbl'; |
|
485 | + function html_label_id() { |
|
486 | + return ! empty($this->_html_label_id) ? $this->_html_label_id : $this->_html_id.'-lbl'; |
|
487 | 487 | } |
488 | 488 | |
489 | 489 | |
@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | /** |
492 | 492 | * @return string |
493 | 493 | */ |
494 | - function html_label_class(){ |
|
494 | + function html_label_class() { |
|
495 | 495 | return $this->_html_label_class; |
496 | 496 | } |
497 | 497 | |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | /** |
501 | 501 | * @return string |
502 | 502 | */ |
503 | - function html_label_style(){ |
|
503 | + function html_label_style() { |
|
504 | 504 | return $this->_html_label_style; |
505 | 505 | } |
506 | 506 | |
@@ -509,7 +509,7 @@ discard block |
||
509 | 509 | /** |
510 | 510 | * @return string |
511 | 511 | */ |
512 | - function html_label_text(){ |
|
512 | + function html_label_text() { |
|
513 | 513 | return $this->_html_label_text; |
514 | 514 | } |
515 | 515 | |
@@ -518,7 +518,7 @@ discard block |
||
518 | 518 | /** |
519 | 519 | * @return string |
520 | 520 | */ |
521 | - function html_help_text(){ |
|
521 | + function html_help_text() { |
|
522 | 522 | return $this->_html_help_text; |
523 | 523 | } |
524 | 524 | |
@@ -527,7 +527,7 @@ discard block |
||
527 | 527 | /** |
528 | 528 | * @return string |
529 | 529 | */ |
530 | - function html_help_class(){ |
|
530 | + function html_help_class() { |
|
531 | 531 | return $this->_html_help_class; |
532 | 532 | } |
533 | 533 | |
@@ -536,7 +536,7 @@ discard block |
||
536 | 536 | /** |
537 | 537 | * @return string |
538 | 538 | */ |
539 | - function html_help_style(){ |
|
539 | + function html_help_style() { |
|
540 | 540 | return $this->_html_style; |
541 | 541 | } |
542 | 542 | /** |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | * in which case, we would have stored the malicious content to our database. |
550 | 550 | * @return string |
551 | 551 | */ |
552 | - function raw_value(){ |
|
552 | + function raw_value() { |
|
553 | 553 | return $this->_raw_value; |
554 | 554 | } |
555 | 555 | /** |
@@ -557,15 +557,15 @@ discard block |
||
557 | 557 | * it escapes all html entities |
558 | 558 | * @return string |
559 | 559 | */ |
560 | - function raw_value_in_form(){ |
|
561 | - return htmlentities($this->raw_value(),ENT_QUOTES, 'UTF-8'); |
|
560 | + function raw_value_in_form() { |
|
561 | + return htmlentities($this->raw_value(), ENT_QUOTES, 'UTF-8'); |
|
562 | 562 | } |
563 | 563 | /** |
564 | 564 | * returns the value after it's been sanitized, and then converted into it's proper type |
565 | 565 | * in PHP. Eg, a string, an int, an array, |
566 | 566 | * @return mixed |
567 | 567 | */ |
568 | - function normalized_value(){ |
|
568 | + function normalized_value() { |
|
569 | 569 | return $this->_normalized_value; |
570 | 570 | } |
571 | 571 | |
@@ -575,7 +575,7 @@ discard block |
||
575 | 575 | * the best thing to display |
576 | 576 | * @return string |
577 | 577 | */ |
578 | - function pretty_value(){ |
|
578 | + function pretty_value() { |
|
579 | 579 | return $this->_normalized_value; |
580 | 580 | } |
581 | 581 | /** |
@@ -594,19 +594,19 @@ discard block |
||
594 | 594 | }</code> |
595 | 595 | * @return array |
596 | 596 | */ |
597 | - function get_jquery_validation_rules(){ |
|
597 | + function get_jquery_validation_rules() { |
|
598 | 598 | |
599 | 599 | $jquery_validation_rules = array(); |
600 | - foreach($this->get_validation_strategies() as $validation_strategy){ |
|
600 | + foreach ($this->get_validation_strategies() as $validation_strategy) { |
|
601 | 601 | $jquery_validation_rules = array_replace_recursive( |
602 | 602 | $jquery_validation_rules, |
603 | 603 | $validation_strategy->get_jquery_validation_rule_array() |
604 | 604 | ); |
605 | 605 | } |
606 | 606 | |
607 | - if(! empty($jquery_validation_rules)){ |
|
608 | - $jquery_validation_js[ $this->html_id( TRUE ) ] = $jquery_validation_rules; |
|
609 | - }else{ |
|
607 | + if ( ! empty($jquery_validation_rules)) { |
|
608 | + $jquery_validation_js[$this->html_id(TRUE)] = $jquery_validation_rules; |
|
609 | + } else { |
|
610 | 610 | return array(); |
611 | 611 | } |
612 | 612 | return $jquery_validation_js; |
@@ -618,9 +618,9 @@ discard block |
||
618 | 618 | * @param mixed $value |
619 | 619 | * @return void |
620 | 620 | */ |
621 | - function set_default($value){ |
|
621 | + function set_default($value) { |
|
622 | 622 | $this->_normalized_value = $value; |
623 | - $this->_raw_value = $this->_normalization_strategy->unnormalize( $value ); |
|
623 | + $this->_raw_value = $this->_normalization_strategy->unnormalize($value); |
|
624 | 624 | } |
625 | 625 | |
626 | 626 | /** |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | * @param string $label |
629 | 629 | * @return void |
630 | 630 | */ |
631 | - function set_html_label_text($label){ |
|
631 | + function set_html_label_text($label) { |
|
632 | 632 | $this->_html_label_text = $label; |
633 | 633 | } |
634 | 634 | |
@@ -640,12 +640,12 @@ discard block |
||
640 | 640 | * @param boolean $required |
641 | 641 | * @param null $required_text |
642 | 642 | */ |
643 | - function set_required($required = true, $required_text = NULL ){ |
|
644 | - $required = filter_var( $required, FILTER_VALIDATE_BOOLEAN ); |
|
645 | - if ( $required ) { |
|
646 | - $this->_add_validation_strategy( new EE_Required_Validation_Strategy( $required_text ) ); |
|
643 | + function set_required($required = true, $required_text = NULL) { |
|
644 | + $required = filter_var($required, FILTER_VALIDATE_BOOLEAN); |
|
645 | + if ($required) { |
|
646 | + $this->_add_validation_strategy(new EE_Required_Validation_Strategy($required_text)); |
|
647 | 647 | } else { |
648 | - unset( $this->_validation_strategies[ 'EE_Required_Validation_Strategy' ] ); |
|
648 | + unset($this->_validation_strategies['EE_Required_Validation_Strategy']); |
|
649 | 649 | } |
650 | 650 | $this->_required = $required; |
651 | 651 | } |
@@ -653,7 +653,7 @@ discard block |
||
653 | 653 | * Returns whether or not this field is required |
654 | 654 | * @return boolean |
655 | 655 | */ |
656 | - public function required(){ |
|
656 | + public function required() { |
|
657 | 657 | return $this->_required; |
658 | 658 | } |
659 | 659 | |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | /** |
663 | 663 | * @param string $required_css_class |
664 | 664 | */ |
665 | - public function set_required_css_class( $required_css_class ) { |
|
665 | + public function set_required_css_class($required_css_class) { |
|
666 | 666 | $this->_required_css_class = $required_css_class; |
667 | 667 | } |
668 | 668 | |
@@ -681,7 +681,7 @@ discard block |
||
681 | 681 | * Sets the help text, in case |
682 | 682 | * @param string $text |
683 | 683 | */ |
684 | - public function set_html_help_text($text){ |
|
684 | + public function set_html_help_text($text) { |
|
685 | 685 | $this->_html_help_text = $text; |
686 | 686 | } |
687 | 687 | /** |
@@ -693,8 +693,8 @@ discard block |
||
693 | 693 | public function clean_sensitive_data() { |
694 | 694 | //if we do ANY kind of sensitive data removal on this, then just clear out the raw value |
695 | 695 | //if we need more logic than this we'll make a strategy for it |
696 | - if( $this->_sensitive_data_removal_strategy && |
|
697 | - ! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal ){ |
|
696 | + if ($this->_sensitive_data_removal_strategy && |
|
697 | + ! $this->_sensitive_data_removal_strategy instanceof EE_No_Sensitive_Data_Removal) { |
|
698 | 698 | $this->_raw_value = NULL; |
699 | 699 | } |
700 | 700 | //and clean the normalized value according to the appropriate strategy |
@@ -708,10 +708,10 @@ discard block |
||
708 | 708 | * @param string $button_size |
709 | 709 | * @param string $other_attributes |
710 | 710 | */ |
711 | - public function set_button_css_attributes( $primary = TRUE, $button_size = '', $other_attributes = '' ) { |
|
711 | + public function set_button_css_attributes($primary = TRUE, $button_size = '', $other_attributes = '') { |
|
712 | 712 | $button_css_attributes = 'button'; |
713 | 713 | $button_css_attributes .= $primary === TRUE ? ' button-primary' : ' button-secondary'; |
714 | - switch ( $button_size ) { |
|
714 | + switch ($button_size) { |
|
715 | 715 | case 'xs' : |
716 | 716 | case 'extra-small' : |
717 | 717 | $button_css_attributes .= ' button-xs'; |
@@ -732,7 +732,7 @@ discard block |
||
732 | 732 | default : |
733 | 733 | $button_css_attributes .= ''; |
734 | 734 | } |
735 | - $this->_button_css_attributes .= ! empty( $other_attributes ) ? $button_css_attributes . ' ' . $other_attributes : $button_css_attributes; |
|
735 | + $this->_button_css_attributes .= ! empty($other_attributes) ? $button_css_attributes.' '.$other_attributes : $button_css_attributes; |
|
736 | 736 | } |
737 | 737 | |
738 | 738 | |
@@ -741,7 +741,7 @@ discard block |
||
741 | 741 | * @return string |
742 | 742 | */ |
743 | 743 | public function button_css_attributes() { |
744 | - if ( empty( $this->_button_css_attributes )) { |
|
744 | + if (empty($this->_button_css_attributes)) { |
|
745 | 745 | $this->set_button_css_attributes(); |
746 | 746 | } |
747 | 747 | return $this->_button_css_attributes; |
@@ -761,27 +761,27 @@ discard block |
||
761 | 761 | * @param array $req_data |
762 | 762 | * @return mixed whatever the raw value of this form section is in the request data |
763 | 763 | */ |
764 | - public function find_form_data_for_this_section( $req_data ){ |
|
764 | + public function find_form_data_for_this_section($req_data) { |
|
765 | 765 | // break up the html name by "[]" |
766 | - if ( strpos( $this->html_name(), '[' ) !== FALSE ) { |
|
767 | - $before_any_brackets = substr( $this->html_name(), 0, strpos($this->html_name(), '[') ); |
|
766 | + if (strpos($this->html_name(), '[') !== FALSE) { |
|
767 | + $before_any_brackets = substr($this->html_name(), 0, strpos($this->html_name(), '[')); |
|
768 | 768 | } else { |
769 | 769 | $before_any_brackets = $this->html_name(); |
770 | 770 | } |
771 | 771 | // grab all of the segments |
772 | - preg_match_all('~\[([^]]*)\]~',$this->html_name(), $matches); |
|
773 | - if( isset( $matches[ 1 ] ) && is_array( $matches[ 1 ] ) ){ |
|
774 | - $name_parts = $matches[ 1 ]; |
|
772 | + preg_match_all('~\[([^]]*)\]~', $this->html_name(), $matches); |
|
773 | + if (isset($matches[1]) && is_array($matches[1])) { |
|
774 | + $name_parts = $matches[1]; |
|
775 | 775 | array_unshift($name_parts, $before_any_brackets); |
776 | - }else{ |
|
777 | - $name_parts = array( $before_any_brackets ); |
|
776 | + } else { |
|
777 | + $name_parts = array($before_any_brackets); |
|
778 | 778 | } |
779 | 779 | // now get the value for the input |
780 | 780 | $value = $this->_find_form_data_for_this_section_using_name_parts($name_parts, $req_data); |
781 | - if( $value === NULL ){ |
|
781 | + if ($value === NULL) { |
|
782 | 782 | //check if this thing's name is at the TOP level of the request data |
783 | - if( isset( $req_data[ $this->name() ] ) ){ |
|
784 | - $value = $req_data[ $this->name() ]; |
|
783 | + if (isset($req_data[$this->name()])) { |
|
784 | + $value = $req_data[$this->name()]; |
|
785 | 785 | } |
786 | 786 | } |
787 | 787 | return $value; |
@@ -795,15 +795,15 @@ discard block |
||
795 | 795 | * @param array $req_data |
796 | 796 | * @return array | NULL |
797 | 797 | */ |
798 | - public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data){ |
|
799 | - $first_part_to_consider = array_shift( $html_name_parts ); |
|
800 | - if( isset( $req_data[ $first_part_to_consider ] ) ){ |
|
801 | - if( empty($html_name_parts ) ){ |
|
802 | - return $req_data[ $first_part_to_consider ]; |
|
803 | - }else{ |
|
804 | - return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[ $first_part_to_consider ] ); |
|
798 | + public function _find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data) { |
|
799 | + $first_part_to_consider = array_shift($html_name_parts); |
|
800 | + if (isset($req_data[$first_part_to_consider])) { |
|
801 | + if (empty($html_name_parts)) { |
|
802 | + return $req_data[$first_part_to_consider]; |
|
803 | + } else { |
|
804 | + return $this->_find_form_data_for_this_section_using_name_parts($html_name_parts, $req_data[$first_part_to_consider]); |
|
805 | 805 | } |
806 | - }else{ |
|
806 | + } else { |
|
807 | 807 | return NULL; |
808 | 808 | } |
809 | 809 | } |
@@ -815,14 +815,14 @@ discard block |
||
815 | 815 | * @param array $req_data like $_POST |
816 | 816 | * @return boolean |
817 | 817 | */ |
818 | - public function form_data_present_in($req_data = NULL){ |
|
819 | - if( $req_data === NULL ){ |
|
818 | + public function form_data_present_in($req_data = NULL) { |
|
819 | + if ($req_data === NULL) { |
|
820 | 820 | $req_data = $_POST; |
821 | 821 | } |
822 | - $checked_value = $this->find_form_data_for_this_section( $req_data ); |
|
823 | - if( $checked_value !== null ){ |
|
822 | + $checked_value = $this->find_form_data_for_this_section($req_data); |
|
823 | + if ($checked_value !== null) { |
|
824 | 824 | return TRUE; |
825 | - }else{ |
|
825 | + } else { |
|
826 | 826 | return FALSE; |
827 | 827 | } |
828 | 828 | } |
@@ -1,14 +1,14 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * This template will display The Loop that displays your venues |
|
4 | - * |
|
5 | - * @ package Event Espresso |
|
6 | - * @ author Seth Shoultes |
|
7 | - * @ copyright (c) 2008-2013 Event Espresso All Rights Reserved. |
|
8 | - * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
9 | - * @ link http://www.eventespresso.com |
|
10 | - * @ version 4+ |
|
11 | - */ |
|
3 | + * This template will display The Loop that displays your venues |
|
4 | + * |
|
5 | + * @ package Event Espresso |
|
6 | + * @ author Seth Shoultes |
|
7 | + * @ copyright (c) 2008-2013 Event Espresso All Rights Reserved. |
|
8 | + * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
9 | + * @ link http://www.eventespresso.com |
|
10 | + * @ version 4+ |
|
11 | + */ |
|
12 | 12 | |
13 | 13 | if ( have_posts() ) : ?> |
14 | 14 |
@@ -1,33 +1,33 @@ discard block |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
2 | 2 | /** |
3 | - * Event Espresso |
|
4 | - * |
|
5 | - * Event Registration and Management Plugin for WordPress |
|
6 | - * |
|
7 | - * @ package Event Espresso |
|
8 | - * @ author Seth Shoultes |
|
9 | - * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
10 | - * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
11 | - * @ link http://www.eventespresso.com |
|
12 | - * @ version 4.0 |
|
13 | - * |
|
14 | - * ------------------------------------------------------------------------ |
|
15 | - * |
|
16 | - * EE_Admin |
|
17 | - * |
|
18 | - * @package Event Espresso |
|
19 | - * @subpackage /core/admin/ |
|
20 | - * @author Brent Christensen |
|
21 | - * |
|
22 | - * ------------------------------------------------------------------------ |
|
23 | - */ |
|
3 | + * Event Espresso |
|
4 | + * |
|
5 | + * Event Registration and Management Plugin for WordPress |
|
6 | + * |
|
7 | + * @ package Event Espresso |
|
8 | + * @ author Seth Shoultes |
|
9 | + * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
10 | + * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
11 | + * @ link http://www.eventespresso.com |
|
12 | + * @ version 4.0 |
|
13 | + * |
|
14 | + * ------------------------------------------------------------------------ |
|
15 | + * |
|
16 | + * EE_Admin |
|
17 | + * |
|
18 | + * @package Event Espresso |
|
19 | + * @subpackage /core/admin/ |
|
20 | + * @author Brent Christensen |
|
21 | + * |
|
22 | + * ------------------------------------------------------------------------ |
|
23 | + */ |
|
24 | 24 | final class EE_Admin { |
25 | 25 | |
26 | 26 | /** |
27 | - * EE_Admin Object |
|
28 | - * @private _instance |
|
29 | - * @private protected |
|
30 | - */ |
|
27 | + * EE_Admin Object |
|
28 | + * @private _instance |
|
29 | + * @private protected |
|
30 | + */ |
|
31 | 31 | private static $_instance = NULL; |
32 | 32 | |
33 | 33 | /** |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | |
57 | 57 | |
58 | 58 | /** |
59 | - * class constructor |
|
60 | - */ |
|
59 | + * class constructor |
|
60 | + */ |
|
61 | 61 | protected function __construct() { |
62 | 62 | // define global EE_Admin constants |
63 | 63 | $this->_define_all_constants(); |
@@ -168,11 +168,11 @@ discard block |
||
168 | 168 | |
169 | 169 | |
170 | 170 | /** |
171 | - * init- should fire after shortcode, module, addon, other plugin (default priority), and even EE_Front_Controller's init phases have run |
|
172 | - * |
|
173 | - * @access public |
|
174 | - * @return void |
|
175 | - */ |
|
171 | + * init- should fire after shortcode, module, addon, other plugin (default priority), and even EE_Front_Controller's init phases have run |
|
172 | + * |
|
173 | + * @access public |
|
174 | + * @return void |
|
175 | + */ |
|
176 | 176 | public function init() { |
177 | 177 | |
178 | 178 | //only enable most of the EE_Admin IF we're not in full maintenance mode |
@@ -463,11 +463,11 @@ discard block |
||
463 | 463 | |
464 | 464 | |
465 | 465 | /** |
466 | - * admin_init |
|
467 | - * |
|
468 | - * @access public |
|
469 | - * @return void |
|
470 | - */ |
|
466 | + * admin_init |
|
467 | + * |
|
468 | + * @access public |
|
469 | + * @return void |
|
470 | + */ |
|
471 | 471 | public function admin_init() { |
472 | 472 | |
473 | 473 | /** |
@@ -624,11 +624,11 @@ discard block |
||
624 | 624 | |
625 | 625 | |
626 | 626 | /** |
627 | - * dismiss_persistent_admin_notice |
|
628 | - * |
|
629 | - * @access public |
|
630 | - * @return void |
|
631 | - */ |
|
627 | + * dismiss_persistent_admin_notice |
|
628 | + * |
|
629 | + * @access public |
|
630 | + * @return void |
|
631 | + */ |
|
632 | 632 | public function dismiss_ee_nag_notice_callback() { |
633 | 633 | EE_Error::dismiss_persistent_admin_notice(); |
634 | 634 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public static function instance() { |
49 | 49 | // check if class object is instantiated |
50 | - if ( ! self::$_instance instanceof EE_Admin ) { |
|
50 | + if ( ! self::$_instance instanceof EE_Admin) { |
|
51 | 51 | self::$_instance = new self(); |
52 | 52 | } |
53 | 53 | return self::$_instance; |
@@ -62,25 +62,25 @@ discard block |
||
62 | 62 | // define global EE_Admin constants |
63 | 63 | $this->_define_all_constants(); |
64 | 64 | // set autoloaders for our admin page classes based on included path information |
65 | - EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_ADMIN ); |
|
65 | + EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_ADMIN); |
|
66 | 66 | // admin hooks |
67 | - add_filter( 'plugin_action_links', array( $this, 'filter_plugin_actions' ), 10, 2 ); |
|
67 | + add_filter('plugin_action_links', array($this, 'filter_plugin_actions'), 10, 2); |
|
68 | 68 | // load EE_Request_Handler early |
69 | - add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'get_request' )); |
|
70 | - add_action( 'AHEE__EE_System__initialize_last', array( $this, 'init' )); |
|
71 | - add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'route_admin_request' ), 100, 2 ); |
|
72 | - add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 100 ); |
|
73 | - add_action( 'admin_init', array( $this, 'admin_init' ), 100 ); |
|
74 | - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ), 20 ); |
|
75 | - add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 10 ); |
|
76 | - add_action( 'network_admin_notices', array( $this, 'display_admin_notices' ), 10 ); |
|
77 | - add_filter( 'pre_update_option', array( $this, 'check_for_invalid_datetime_formats' ), 100, 2 ); |
|
78 | - add_filter('admin_footer_text', array( $this, 'espresso_admin_footer' )); |
|
69 | + add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'get_request')); |
|
70 | + add_action('AHEE__EE_System__initialize_last', array($this, 'init')); |
|
71 | + add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'route_admin_request'), 100, 2); |
|
72 | + add_action('wp_loaded', array($this, 'wp_loaded'), 100); |
|
73 | + add_action('admin_init', array($this, 'admin_init'), 100); |
|
74 | + add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'), 20); |
|
75 | + add_action('admin_notices', array($this, 'display_admin_notices'), 10); |
|
76 | + add_action('network_admin_notices', array($this, 'display_admin_notices'), 10); |
|
77 | + add_filter('pre_update_option', array($this, 'check_for_invalid_datetime_formats'), 100, 2); |
|
78 | + add_filter('admin_footer_text', array($this, 'espresso_admin_footer')); |
|
79 | 79 | |
80 | 80 | //reset Environment config (we only do this on admin page loads); |
81 | 81 | EE_Registry::instance()->CFG->environment->recheck_values(); |
82 | 82 | |
83 | - do_action( 'AHEE__EE_Admin__loaded' ); |
|
83 | + do_action('AHEE__EE_Admin__loaded'); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | |
@@ -95,11 +95,11 @@ discard block |
||
95 | 95 | * @return void |
96 | 96 | */ |
97 | 97 | private function _define_all_constants() { |
98 | - define( 'EE_ADMIN_URL', EE_PLUGIN_DIR_URL . 'core/admin/' ); |
|
99 | - define( 'EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL . 'admin_pages/' ); |
|
100 | - define( 'EE_ADMIN_TEMPLATE', EE_ADMIN . 'templates' . DS ); |
|
101 | - define( 'WP_ADMIN_PATH', ABSPATH . 'wp-admin/' ); |
|
102 | - define( 'WP_AJAX_URL', admin_url( 'admin-ajax.php' )); |
|
98 | + define('EE_ADMIN_URL', EE_PLUGIN_DIR_URL.'core/admin/'); |
|
99 | + define('EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL.'admin_pages/'); |
|
100 | + define('EE_ADMIN_TEMPLATE', EE_ADMIN.'templates'.DS); |
|
101 | + define('WP_ADMIN_PATH', ABSPATH.'wp-admin/'); |
|
102 | + define('WP_AJAX_URL', admin_url('admin-ajax.php')); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | |
@@ -112,23 +112,23 @@ discard block |
||
112 | 112 | * @param string $plugin |
113 | 113 | * @return array |
114 | 114 | */ |
115 | - public function filter_plugin_actions( $links, $plugin ) { |
|
115 | + public function filter_plugin_actions($links, $plugin) { |
|
116 | 116 | // set $main_file in stone |
117 | 117 | static $main_file; |
118 | 118 | // if $main_file is not set yet |
119 | - if ( ! $main_file ) { |
|
120 | - $main_file = plugin_basename( EVENT_ESPRESSO_MAIN_FILE ); |
|
119 | + if ( ! $main_file) { |
|
120 | + $main_file = plugin_basename(EVENT_ESPRESSO_MAIN_FILE); |
|
121 | 121 | } |
122 | - if ( $plugin == $main_file ) { |
|
122 | + if ($plugin == $main_file) { |
|
123 | 123 | // compare current plugin to this one |
124 | - if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) { |
|
125 | - $maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode. Click this link to learn why.">' . __('Maintenance Mode Active', 'event_espresso' ) . '</a>'; |
|
126 | - array_unshift( $links, $maintenance_link ); |
|
124 | + if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) { |
|
125 | + $maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode. Click this link to learn why.">'.__('Maintenance Mode Active', 'event_espresso').'</a>'; |
|
126 | + array_unshift($links, $maintenance_link); |
|
127 | 127 | } else { |
128 | - $org_settings_link = '<a href="admin.php?page=espresso_general_settings">' . __( 'Settings', 'event_espresso' ) . '</a>'; |
|
129 | - $events_link = '<a href="admin.php?page=espresso_events">' . __( 'Events', 'event_espresso' ) . '</a>'; |
|
128 | + $org_settings_link = '<a href="admin.php?page=espresso_general_settings">'.__('Settings', 'event_espresso').'</a>'; |
|
129 | + $events_link = '<a href="admin.php?page=espresso_events">'.__('Events', 'event_espresso').'</a>'; |
|
130 | 130 | // add before other links |
131 | - array_unshift( $links, $org_settings_link, $events_link ); |
|
131 | + array_unshift($links, $org_settings_link, $events_link); |
|
132 | 132 | } |
133 | 133 | } |
134 | 134 | return $links; |
@@ -143,8 +143,8 @@ discard block |
||
143 | 143 | * @return void |
144 | 144 | */ |
145 | 145 | public function get_request() { |
146 | - EE_Registry::instance()->load_core( 'Request_Handler' ); |
|
147 | - EE_Registry::instance()->load_core( 'CPT_Strategy' ); |
|
146 | + EE_Registry::instance()->load_core('Request_Handler'); |
|
147 | + EE_Registry::instance()->load_core('CPT_Strategy'); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | |
@@ -156,11 +156,11 @@ discard block |
||
156 | 156 | * @param array $admin_page_folder_names |
157 | 157 | * @return array |
158 | 158 | */ |
159 | - public function hide_admin_pages_except_maintenance_mode( $admin_page_folder_names = array() ){ |
|
159 | + public function hide_admin_pages_except_maintenance_mode($admin_page_folder_names = array()) { |
|
160 | 160 | return array( |
161 | - 'maintenance' => EE_ADMIN_PAGES . 'maintenance' . DS, |
|
162 | - 'about' => EE_ADMIN_PAGES . 'about' . DS, |
|
163 | - 'support' => EE_ADMIN_PAGES . 'support' . DS |
|
161 | + 'maintenance' => EE_ADMIN_PAGES.'maintenance'.DS, |
|
162 | + 'about' => EE_ADMIN_PAGES.'about'.DS, |
|
163 | + 'support' => EE_ADMIN_PAGES.'support'.DS |
|
164 | 164 | ); |
165 | 165 | } |
166 | 166 | |
@@ -175,36 +175,36 @@ discard block |
||
175 | 175 | public function init() { |
176 | 176 | |
177 | 177 | //only enable most of the EE_Admin IF we're not in full maintenance mode |
178 | - if ( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ){ |
|
178 | + if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) { |
|
179 | 179 | //ok so we want to enable the entire admin |
180 | - add_action( 'wp_ajax_dismiss_ee_nag_notice', array( $this, 'dismiss_ee_nag_notice_callback' )); |
|
181 | - add_action( 'save_post', array( 'EE_Admin', 'parse_post_content_on_save' ), 100, 2 ); |
|
182 | - add_action( 'update_option', array( $this, 'reset_page_for_posts_on_change' ), 100, 3 ); |
|
183 | - add_filter( 'content_save_pre', array( $this, 'its_eSpresso' ), 10, 1 ); |
|
184 | - add_action( 'admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 ); |
|
185 | - add_action( 'network_admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 ); |
|
180 | + add_action('wp_ajax_dismiss_ee_nag_notice', array($this, 'dismiss_ee_nag_notice_callback')); |
|
181 | + add_action('save_post', array('EE_Admin', 'parse_post_content_on_save'), 100, 2); |
|
182 | + add_action('update_option', array($this, 'reset_page_for_posts_on_change'), 100, 3); |
|
183 | + add_filter('content_save_pre', array($this, 'its_eSpresso'), 10, 1); |
|
184 | + add_action('admin_notices', array($this, 'get_persistent_admin_notices'), 9); |
|
185 | + add_action('network_admin_notices', array($this, 'get_persistent_admin_notices'), 9); |
|
186 | 186 | //at a glance dashboard widget |
187 | - add_filter( 'dashboard_glance_items', array( $this, 'dashboard_glance_items'), 10 ); |
|
187 | + add_filter('dashboard_glance_items', array($this, 'dashboard_glance_items'), 10); |
|
188 | 188 | //filter for get_edit_post_link used on comments for custom post types |
189 | - add_filter('get_edit_post_link', array( $this, 'modify_edit_post_link' ), 10, 3 ); |
|
189 | + add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 3); |
|
190 | 190 | } |
191 | 191 | |
192 | 192 | // run the admin page factory but ONLY if we are doing an ee admin ajax request |
193 | - if ( !defined('DOING_AJAX') || EE_ADMIN_AJAX ) { |
|
193 | + if ( ! defined('DOING_AJAX') || EE_ADMIN_AJAX) { |
|
194 | 194 | try { |
195 | 195 | //this loads the controller for the admin pages which will setup routing etc |
196 | - EE_Registry::instance()->load_core( 'Admin_Page_Loader' ); |
|
197 | - } catch ( EE_Error $e ) { |
|
196 | + EE_Registry::instance()->load_core('Admin_Page_Loader'); |
|
197 | + } catch (EE_Error $e) { |
|
198 | 198 | $e->get_error(); |
199 | 199 | } |
200 | 200 | } |
201 | 201 | |
202 | 202 | //make sure our CPTs and custom taxonomy metaboxes get shown for first time users |
203 | - add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes' ), 10 ); |
|
204 | - add_action('admin_head', array( $this, 'register_custom_nav_menu_boxes' ), 10 ); |
|
203 | + add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes'), 10); |
|
204 | + add_action('admin_head', array($this, 'register_custom_nav_menu_boxes'), 10); |
|
205 | 205 | |
206 | 206 | //exclude EE critical pages from all nav menus and wp_list_pages |
207 | - add_filter('nav_menu_meta_box_object', array( $this, 'remove_pages_from_nav_menu'), 10 ); |
|
207 | + add_filter('nav_menu_meta_box_object', array($this, 'remove_pages_from_nav_menu'), 10); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | |
@@ -217,9 +217,9 @@ discard block |
||
217 | 217 | * @param object $post_type WP post type object |
218 | 218 | * @return object WP post type object |
219 | 219 | */ |
220 | - public function remove_pages_from_nav_menu( $post_type ) { |
|
220 | + public function remove_pages_from_nav_menu($post_type) { |
|
221 | 221 | //if this isn't the "pages" post type let's get out |
222 | - if ( $post_type->name !== 'page' ) |
|
222 | + if ($post_type->name !== 'page') |
|
223 | 223 | return $post_type; |
224 | 224 | |
225 | 225 | $critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array(); |
@@ -239,28 +239,28 @@ discard block |
||
239 | 239 | */ |
240 | 240 | public function enable_hidden_ee_nav_menu_metaboxes() { |
241 | 241 | global $wp_meta_boxes, $pagenow; |
242 | - if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' ) { |
|
242 | + if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php') { |
|
243 | 243 | return; |
244 | 244 | } |
245 | 245 | $user = wp_get_current_user(); |
246 | 246 | //has this been done yet? |
247 | - if ( get_user_option( 'ee_nav_menu_initialized', $user->ID ) ) { |
|
247 | + if (get_user_option('ee_nav_menu_initialized', $user->ID)) { |
|
248 | 248 | return; |
249 | 249 | } |
250 | 250 | |
251 | - $hidden_meta_boxes = get_user_option( 'metaboxhidden_nav-menus', $user->ID ); |
|
252 | - $initial_meta_boxes = apply_filters( 'FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page' ) ); |
|
251 | + $hidden_meta_boxes = get_user_option('metaboxhidden_nav-menus', $user->ID); |
|
252 | + $initial_meta_boxes = apply_filters('FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array('nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page')); |
|
253 | 253 | |
254 | - if ( is_array( $hidden_meta_boxes ) ) { |
|
255 | - foreach ( $hidden_meta_boxes as $key => $meta_box_id ) { |
|
256 | - if ( in_array( $meta_box_id, $initial_meta_boxes ) ) { |
|
257 | - unset( $hidden_meta_boxes[ $key ] ); |
|
254 | + if (is_array($hidden_meta_boxes)) { |
|
255 | + foreach ($hidden_meta_boxes as $key => $meta_box_id) { |
|
256 | + if (in_array($meta_box_id, $initial_meta_boxes)) { |
|
257 | + unset($hidden_meta_boxes[$key]); |
|
258 | 258 | } |
259 | 259 | } |
260 | 260 | } |
261 | 261 | |
262 | - update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true ); |
|
263 | - update_user_option( $user->ID, 'ee_nav_menu_initialized', 1, true ); |
|
262 | + update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true); |
|
263 | + update_user_option($user->ID, 'ee_nav_menu_initialized', 1, true); |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | * @return void |
280 | 280 | */ |
281 | 281 | public function register_custom_nav_menu_boxes() { |
282 | - add_meta_box( 'add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array( $this, 'ee_cpt_archive_pages' ), 'nav-menus', 'side', 'core' ); |
|
282 | + add_meta_box('add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array($this, 'ee_cpt_archive_pages'), 'nav-menus', 'side', 'core'); |
|
283 | 283 | } |
284 | 284 | |
285 | 285 | |
@@ -296,17 +296,17 @@ discard block |
||
296 | 296 | * |
297 | 297 | * @return string the (maybe) modified link |
298 | 298 | */ |
299 | - public function modify_edit_post_link( $link, $id, $context ) { |
|
300 | - if ( ! $post = get_post( $id ) ) |
|
299 | + public function modify_edit_post_link($link, $id, $context) { |
|
300 | + if ( ! $post = get_post($id)) |
|
301 | 301 | return $link; |
302 | 302 | |
303 | - if ( $post->post_type == 'espresso_attendees' ) { |
|
303 | + if ($post->post_type == 'espresso_attendees') { |
|
304 | 304 | $query_args = array( |
305 | 305 | 'action' => 'edit_attendee', |
306 | 306 | 'post' => $id |
307 | 307 | ); |
308 | 308 | EE_Registry::instance()->load_helper('URL'); |
309 | - return EEH_URL::add_query_args_and_nonce( $query_args, admin_url('admin.php?page=espresso_registrations') ); |
|
309 | + return EEH_URL::add_query_args_and_nonce($query_args, admin_url('admin.php?page=espresso_registrations')); |
|
310 | 310 | } |
311 | 311 | return $link; |
312 | 312 | } |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | global $nav_menu_selected_id; |
319 | 319 | |
320 | 320 | $db_fields = false; |
321 | - $walker = new Walker_Nav_Menu_Checklist( $db_fields ); |
|
321 | + $walker = new Walker_Nav_Menu_Checklist($db_fields); |
|
322 | 322 | $current_tab = 'event-archives'; |
323 | 323 | |
324 | 324 | /*if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) { |
@@ -337,9 +337,9 @@ discard block |
||
337 | 337 | ?> |
338 | 338 | <div id="posttype-extra-nav-menu-pages" class="posttypediv"> |
339 | 339 | <ul id="posttype-extra-nav-menu-pages-tabs" class="posttype-tabs add-menu-item-tabs"> |
340 | - <li <?php echo ( 'event-archives' == $current_tab ? ' class="tabs"' : '' ); ?>> |
|
341 | - <a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives"> |
|
342 | - <?php _e( 'Event Archive Pages', 'event_espresso' ); ?> |
|
340 | + <li <?php echo ('event-archives' == $current_tab ? ' class="tabs"' : ''); ?>> |
|
341 | + <a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives"> |
|
342 | + <?php _e('Event Archive Pages', 'event_espresso'); ?> |
|
343 | 343 | </a> |
344 | 344 | </li> |
345 | 345 | <?php /* // temporarily removing but leaving skeleton in place in case we ever decide to add more tabs. |
@@ -357,13 +357,13 @@ discard block |
||
357 | 357 | <?php */ ?> |
358 | 358 | |
359 | 359 | <div id="tabs-panel-posttype-extra-nav-menu-pages-event-archives" class="tabs-panel <?php |
360 | - echo ( 'event-archives' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); |
|
360 | + echo ('event-archives' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive'); |
|
361 | 361 | ?>"> |
362 | 362 | <ul id="extra-nav-menu-pageschecklist-event-archives" class="categorychecklist form-no-clear"> |
363 | 363 | <?php |
364 | 364 | $pages = $this->_get_extra_nav_menu_pages_items(); |
365 | 365 | $args['walker'] = $walker; |
366 | - echo walk_nav_menu_tree( array_map( array( $this, '_setup_extra_nav_menu_pages_items' ), $pages), 0, (object) $args ); |
|
366 | + echo walk_nav_menu_tree(array_map(array($this, '_setup_extra_nav_menu_pages_items'), $pages), 0, (object) $args); |
|
367 | 367 | ?> |
368 | 368 | </ul> |
369 | 369 | </div><!-- /.tabs-panel --> |
@@ -371,18 +371,18 @@ discard block |
||
371 | 371 | <p class="button-controls"> |
372 | 372 | <span class="list-controls"> |
373 | 373 | <a href="<?php |
374 | - echo esc_url( add_query_arg( |
|
374 | + echo esc_url(add_query_arg( |
|
375 | 375 | array( |
376 | 376 | 'extra-nav-menu-pages-tab' => 'event-archives', |
377 | 377 | 'selectall' => 1, |
378 | 378 | ), |
379 | - remove_query_arg( $removed_args ) |
|
379 | + remove_query_arg($removed_args) |
|
380 | 380 | )); |
381 | 381 | ?>#posttype-extra-nav-menu-pages>" class="select-all"><?php _e('Select All'); ?></a> |
382 | 382 | </span> |
383 | 383 | |
384 | 384 | <span class="add-to-menu"> |
385 | - <input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( __( 'Add to Menu' ) ); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e( 'submit-posttype-extra-nav-menu-pages' ); ?>" /> |
|
385 | + <input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e(__('Add to Menu')); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e('submit-posttype-extra-nav-menu-pages'); ?>" /> |
|
386 | 386 | <span class="spinner"></span> |
387 | 387 | </span> |
388 | 388 | </p> |
@@ -403,10 +403,10 @@ discard block |
||
403 | 403 | private function _get_extra_nav_menu_pages_items() { |
404 | 404 | $menuitems[] = array( |
405 | 405 | 'title' => __('Event List', 'event_espresso'), |
406 | - 'url' => get_post_type_archive_link( 'espresso_events' ), |
|
406 | + 'url' => get_post_type_archive_link('espresso_events'), |
|
407 | 407 | 'description' => __('Archive page for all events.', 'event_espresso') |
408 | 408 | ); |
409 | - return apply_filters( 'FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems ); |
|
409 | + return apply_filters('FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems); |
|
410 | 410 | } |
411 | 411 | |
412 | 412 | |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | * @param $menu_item_values |
419 | 419 | * @return stdClass |
420 | 420 | */ |
421 | - private function _setup_extra_nav_menu_pages_items( $menu_item_values ) { |
|
421 | + private function _setup_extra_nav_menu_pages_items($menu_item_values) { |
|
422 | 422 | $menu_item = new stdClass(); |
423 | 423 | $keys = array( |
424 | 424 | 'ID' => 0, |
@@ -438,8 +438,8 @@ discard block |
||
438 | 438 | 'xfn' => '' |
439 | 439 | ); |
440 | 440 | |
441 | - foreach ( $keys as $key => $value) { |
|
442 | - $menu_item->{$key} = isset( $menu_item_values[ $key]) ? $menu_item_values[ $key] : $value; |
|
441 | + foreach ($keys as $key => $value) { |
|
442 | + $menu_item->{$key} = isset($menu_item_values[$key]) ? $menu_item_values[$key] : $value; |
|
443 | 443 | } |
444 | 444 | return $menu_item; |
445 | 445 | } |
@@ -478,10 +478,10 @@ discard block |
||
478 | 478 | * - check if doing post processing of one of EE CPTs |
479 | 479 | * - instantiate the corresponding EE CPT model for the post_type being processed. |
480 | 480 | */ |
481 | - if ( isset( $_POST['action'] ) && $_POST['action'] == 'editpost' ) { |
|
482 | - if ( isset( $_POST['post_type'] ) ) { |
|
483 | - EE_Registry::instance()->load_core( 'Register_CPTs' ); |
|
484 | - EE_Register_CPTs::instantiate_cpt_models( $_POST['post_type'] ); |
|
481 | + if (isset($_POST['action']) && $_POST['action'] == 'editpost') { |
|
482 | + if (isset($_POST['post_type'])) { |
|
483 | + EE_Registry::instance()->load_core('Register_CPTs'); |
|
484 | + EE_Register_CPTs::instantiate_cpt_models($_POST['post_type']); |
|
485 | 485 | } |
486 | 486 | } |
487 | 487 | |
@@ -491,8 +491,8 @@ discard block |
||
491 | 491 | * 'options-reading.php' core WordPress admin settings page. This is for user-proofing. |
492 | 492 | */ |
493 | 493 | global $pagenow; |
494 | - if ( $pagenow == 'options-reading.php' ) { |
|
495 | - add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) ); |
|
494 | + if ($pagenow == 'options-reading.php') { |
|
495 | + add_filter('wp_dropdown_pages', array($this, 'modify_dropdown_pages')); |
|
496 | 496 | } |
497 | 497 | |
498 | 498 | } |
@@ -504,25 +504,25 @@ discard block |
||
504 | 504 | * @param string $output Current output. |
505 | 505 | * @return string |
506 | 506 | */ |
507 | - public function modify_dropdown_pages( $output ) { |
|
507 | + public function modify_dropdown_pages($output) { |
|
508 | 508 | //get critical pages |
509 | 509 | $critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array(); |
510 | 510 | |
511 | 511 | //split current output by line break for easier parsing. |
512 | - $split_output = explode( "\n", $output ); |
|
512 | + $split_output = explode("\n", $output); |
|
513 | 513 | |
514 | 514 | //loop through to remove any critical pages from the array. |
515 | - foreach ( $critical_pages as $page_id ) { |
|
516 | - $needle = 'value="' . $page_id . '"'; |
|
517 | - foreach( $split_output as $key => $haystack ) { |
|
518 | - if( strpos( $haystack, $needle ) !== false ) { |
|
519 | - unset( $split_output[$key] ); |
|
515 | + foreach ($critical_pages as $page_id) { |
|
516 | + $needle = 'value="'.$page_id.'"'; |
|
517 | + foreach ($split_output as $key => $haystack) { |
|
518 | + if (strpos($haystack, $needle) !== false) { |
|
519 | + unset($split_output[$key]); |
|
520 | 520 | } |
521 | 521 | } |
522 | 522 | } |
523 | 523 | |
524 | 524 | //replace output with the new contents |
525 | - $output = implode( "\n", $split_output ); |
|
525 | + $output = implode("\n", $split_output); |
|
526 | 526 | |
527 | 527 | return $output; |
528 | 528 | } |
@@ -538,37 +538,37 @@ discard block |
||
538 | 538 | public function enqueue_admin_scripts() { |
539 | 539 | // this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js. |
540 | 540 | // Note: the intention of this script is to only do TARGETED injections. I.E, only injecting on certain script calls. |
541 | - wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
541 | + wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL.'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
542 | 542 | // register cookie script for future dependencies |
543 | - wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE ); |
|
543 | + wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL.'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE); |
|
544 | 544 | // jquery_validate loading is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via: add_filter( 'FHEE_load_jquery_validate', '__return_true' ); |
545 | - if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) { |
|
545 | + if (apply_filters('FHEE_load_jquery_validate', FALSE)) { |
|
546 | 546 | // register jQuery Validate |
547 | - wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE); |
|
547 | + wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE); |
|
548 | 548 | } |
549 | 549 | //joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again vai: add_filter('FHEE_load_joyride', '__return_true' ); |
550 | - if ( apply_filters( 'FHEE_load_joyride', FALSE ) ) { |
|
550 | + if (apply_filters('FHEE_load_joyride', FALSE)) { |
|
551 | 551 | //joyride style |
552 | - wp_register_style('joyride-css', EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css', array(), '2.1'); |
|
553 | - wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION ); |
|
554 | - wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js', array(), '2.1', TRUE ); |
|
552 | + wp_register_style('joyride-css', EE_THIRD_PARTY_URL.'joyride/joyride-2.1.css', array(), '2.1'); |
|
553 | + wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL.'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION); |
|
554 | + wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL.'joyride/modernizr.mq.js', array(), '2.1', TRUE); |
|
555 | 555 | //joyride JS |
556 | - wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE ); |
|
556 | + wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL.'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE); |
|
557 | 557 | // wanna go for a joyride? |
558 | 558 | wp_enqueue_style('ee-joyride-css'); |
559 | 559 | wp_enqueue_script('jquery-joyride'); |
560 | 560 | } |
561 | 561 | //qtip is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtips', '__return_true' ); |
562 | - if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) { |
|
562 | + if (apply_filters('FHEE_load_qtip', FALSE)) { |
|
563 | 563 | EE_Registry::instance()->load_helper('Qtip_Loader'); |
564 | 564 | EEH_Qtip_Loader::instance()->register_and_enqueue(); |
565 | 565 | } |
566 | 566 | //accounting.js library |
567 | 567 | // @link http://josscrowcroft.github.io/accounting.js/ |
568 | - if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) { |
|
569 | - wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
570 | - wp_register_script( 'ee-accounting-core', EE_THIRD_PARTY_URL . 'accounting/accounting.js', array('underscore'), '0.3.2', TRUE ); |
|
571 | - wp_enqueue_script( 'ee-accounting' ); |
|
568 | + if (apply_filters('FHEE_load_accounting_js', FALSE)) { |
|
569 | + wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE); |
|
570 | + wp_register_script('ee-accounting-core', EE_THIRD_PARTY_URL.'accounting/accounting.js', array('underscore'), '0.3.2', TRUE); |
|
571 | + wp_enqueue_script('ee-accounting'); |
|
572 | 572 | // array of settings to get converted to JSON array via wp_localize_script |
573 | 573 | $currency_config = array( |
574 | 574 | 'currency' => array( |
@@ -615,11 +615,11 @@ discard block |
||
615 | 615 | public function get_persistent_admin_notices() { |
616 | 616 | // http://www.example.com/wp-admin/admin.php?page=espresso_general_settings&action=critical_pages&critical_pages_nonce=2831ce0f30 |
617 | 617 | $args = array( |
618 | - 'page' => EE_Registry::instance()->REQ->is_set( 'page' ) ? EE_Registry::instance()->REQ->get( 'page' ) : '', |
|
619 | - 'action' => EE_Registry::instance()->REQ->is_set( 'action' ) ? EE_Registry::instance()->REQ->get( 'action' ) : '', |
|
618 | + 'page' => EE_Registry::instance()->REQ->is_set('page') ? EE_Registry::instance()->REQ->get('page') : '', |
|
619 | + 'action' => EE_Registry::instance()->REQ->is_set('action') ? EE_Registry::instance()->REQ->get('action') : '', |
|
620 | 620 | ); |
621 | - $return_url = EE_Admin_Page::add_query_args_and_nonce( $args, EE_ADMIN_URL ); |
|
622 | - echo EE_Error::get_persistent_admin_notices( $return_url ); |
|
621 | + $return_url = EE_Admin_Page::add_query_args_and_nonce($args, EE_ADMIN_URL); |
|
622 | + echo EE_Error::get_persistent_admin_notices($return_url); |
|
623 | 623 | } |
624 | 624 | |
625 | 625 | |
@@ -640,26 +640,26 @@ discard block |
||
640 | 640 | * @param $elements |
641 | 641 | * @return array |
642 | 642 | */ |
643 | - public function dashboard_glance_items( $elements ) { |
|
643 | + public function dashboard_glance_items($elements) { |
|
644 | 644 | $events = EEM_Event::instance()->count(); |
645 | - $items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_events'), admin_url('admin.php') ); |
|
646 | - $items['events']['text'] = sprintf( _n( '%s Event', '%s Events', $events ), number_format_i18n( $events ) ); |
|
645 | + $items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events'), admin_url('admin.php')); |
|
646 | + $items['events']['text'] = sprintf(_n('%s Event', '%s Events', $events), number_format_i18n($events)); |
|
647 | 647 | $items['events']['title'] = __('Click to view all Events', 'event_espresso'); |
648 | 648 | $registrations = EEM_Registration::instance()->count( |
649 | 649 | array( |
650 | 650 | array( |
651 | - 'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete ) |
|
651 | + 'STS_ID' => array('!=', EEM_Registration::status_id_incomplete) |
|
652 | 652 | ) |
653 | 653 | ) |
654 | 654 | ); |
655 | - $items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_registrations' ), admin_url('admin.php') ); |
|
656 | - $items['registrations']['text'] = sprintf( _n( '%s Registration', '%s Registrations', $registrations ), number_format_i18n($registrations) ); |
|
655 | + $items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_registrations'), admin_url('admin.php')); |
|
656 | + $items['registrations']['text'] = sprintf(_n('%s Registration', '%s Registrations', $registrations), number_format_i18n($registrations)); |
|
657 | 657 | $items['registrations']['title'] = __('Click to view all registrations', 'event_espresso'); |
658 | 658 | |
659 | - $items = apply_filters( 'FHEE__EE_Admin__dashboard_glance_items__items', $items ); |
|
659 | + $items = apply_filters('FHEE__EE_Admin__dashboard_glance_items__items', $items); |
|
660 | 660 | |
661 | - foreach ( $items as $type => $item_properties ) { |
|
662 | - $elements[] = sprintf( '<a class="ee-dashboard-link-' . $type . '" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text'] ); |
|
661 | + foreach ($items as $type => $item_properties) { |
|
662 | + $elements[] = sprintf('<a class="ee-dashboard-link-'.$type.'" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text']); |
|
663 | 663 | } |
664 | 664 | return $elements; |
665 | 665 | } |
@@ -678,63 +678,63 @@ discard block |
||
678 | 678 | * @param $post |
679 | 679 | * @return void |
680 | 680 | */ |
681 | - public static function parse_post_content_on_save( $post_ID, $post ) { |
|
681 | + public static function parse_post_content_on_save($post_ID, $post) { |
|
682 | 682 | // default post types |
683 | - $post_types = array( 'post' => 0, 'page' => 1 ); |
|
683 | + $post_types = array('post' => 0, 'page' => 1); |
|
684 | 684 | // add CPTs |
685 | 685 | $CPTs = EE_Register_CPTs::get_CPTs(); |
686 | - $post_types = array_merge( $post_types, $CPTs ); |
|
686 | + $post_types = array_merge($post_types, $CPTs); |
|
687 | 687 | // for default or CPT posts... |
688 | - if ( isset( $post_types[ $post->post_type ] )) { |
|
688 | + if (isset($post_types[$post->post_type])) { |
|
689 | 689 | // post on frontpage ? |
690 | 690 | $page_for_posts = EE_Config::get_page_for_posts(); |
691 | 691 | $maybe_remove_from_posts = array(); |
692 | 692 | // critical page shortcodes that we do NOT want added to the Posts page (blog) |
693 | 693 | $critical_shortcodes = EE_Registry::instance()->CFG->core->get_critical_pages_shortcodes_array(); |
694 | 694 | // array of shortcodes indexed by post name |
695 | - EE_Registry::instance()->CFG->core->post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes ) ? EE_Registry::instance()->CFG->core->post_shortcodes : array(); |
|
695 | + EE_Registry::instance()->CFG->core->post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes) ? EE_Registry::instance()->CFG->core->post_shortcodes : array(); |
|
696 | 696 | // whether to proceed with update, if an entry already exists for this post, then we want to update |
697 | - $update_post_shortcodes = isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ] ) ? true : false; |
|
697 | + $update_post_shortcodes = isset(EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name]) ? true : false; |
|
698 | 698 | // empty both arrays |
699 | - EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ] = array(); |
|
699 | + EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name] = array(); |
|
700 | 700 | // check that posts page is already being tracked |
701 | - if ( ! isset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] ) ) { |
|
701 | + if ( ! isset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts])) { |
|
702 | 702 | // if not, then ensure that it is properly added |
703 | - EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ] = array(); |
|
703 | + EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts] = array(); |
|
704 | 704 | } |
705 | 705 | // loop thru shortcodes |
706 | - foreach ( EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) { |
|
706 | + foreach (EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir) { |
|
707 | 707 | // convert to UPPERCASE to get actual shortcode |
708 | - $EES_Shortcode = strtoupper( $EES_Shortcode ); |
|
708 | + $EES_Shortcode = strtoupper($EES_Shortcode); |
|
709 | 709 | // is the shortcode in the post_content ? |
710 | - if ( strpos( $post->post_content, $EES_Shortcode ) !== FALSE ) { |
|
710 | + if (strpos($post->post_content, $EES_Shortcode) !== FALSE) { |
|
711 | 711 | // map shortcode to post names and post IDs |
712 | - EE_Registry::instance()->CFG->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID; |
|
712 | + EE_Registry::instance()->CFG->core->post_shortcodes[$post->post_name][$EES_Shortcode] = $post_ID; |
|
713 | 713 | // if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE |
714 | - if ( ! in_array( $EES_Shortcode, $critical_shortcodes )) { |
|
714 | + if ( ! in_array($EES_Shortcode, $critical_shortcodes)) { |
|
715 | 715 | // add shortcode to "Posts page" tracking |
716 | - EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = $post_ID; |
|
716 | + EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = $post_ID; |
|
717 | 717 | } |
718 | 718 | $update_post_shortcodes = TRUE; |
719 | - unset( $maybe_remove_from_posts[ $EES_Shortcode ] ); |
|
719 | + unset($maybe_remove_from_posts[$EES_Shortcode]); |
|
720 | 720 | } else { |
721 | - $maybe_remove_from_posts[ $EES_Shortcode ] = $post_ID; |
|
721 | + $maybe_remove_from_posts[$EES_Shortcode] = $post_ID; |
|
722 | 722 | } |
723 | 723 | } |
724 | - if ( $update_post_shortcodes ) { |
|
724 | + if ($update_post_shortcodes) { |
|
725 | 725 | // remove shortcodes from $maybe_remove_from_posts that are still being used |
726 | - foreach ( EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $shortcodes ) { |
|
727 | - if ( $post_name == $page_for_posts ) { |
|
726 | + foreach (EE_Registry::instance()->CFG->core->post_shortcodes as $post_name => $shortcodes) { |
|
727 | + if ($post_name == $page_for_posts) { |
|
728 | 728 | continue; |
729 | 729 | } |
730 | 730 | // compute difference between active post_shortcodes array and $maybe_remove_from_posts array |
731 | - $maybe_remove_from_posts = array_diff_key( $maybe_remove_from_posts, $shortcodes ); |
|
731 | + $maybe_remove_from_posts = array_diff_key($maybe_remove_from_posts, $shortcodes); |
|
732 | 732 | } |
733 | 733 | // now unset unused shortcodes from the $page_for_posts post_shortcodes |
734 | - foreach ( $maybe_remove_from_posts as $shortcode => $post_ID ) { |
|
735 | - unset( EE_Registry::instance()->CFG->core->post_shortcodes[ $page_for_posts ][ $shortcode ] ); |
|
734 | + foreach ($maybe_remove_from_posts as $shortcode => $post_ID) { |
|
735 | + unset(EE_Registry::instance()->CFG->core->post_shortcodes[$page_for_posts][$shortcode]); |
|
736 | 736 | } |
737 | - EE_Registry::instance()->CFG->update_post_shortcodes( $page_for_posts ); |
|
737 | + EE_Registry::instance()->CFG->update_post_shortcodes($page_for_posts); |
|
738 | 738 | } |
739 | 739 | } |
740 | 740 | } |
@@ -752,32 +752,32 @@ discard block |
||
752 | 752 | * @throws EE_Error |
753 | 753 | * @return string |
754 | 754 | */ |
755 | - public function check_for_invalid_datetime_formats( $value, $option ) { |
|
756 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
755 | + public function check_for_invalid_datetime_formats($value, $option) { |
|
756 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
757 | 757 | // check for date_format or time_format |
758 | - switch ( $option ) { |
|
758 | + switch ($option) { |
|
759 | 759 | case 'date_format' : |
760 | - $date_time_format = $value . ' ' . get_option('time_format'); |
|
760 | + $date_time_format = $value.' '.get_option('time_format'); |
|
761 | 761 | break; |
762 | 762 | case 'time_format' : |
763 | - $date_time_format = get_option('date_format') . ' ' . $value; |
|
763 | + $date_time_format = get_option('date_format').' '.$value; |
|
764 | 764 | break; |
765 | 765 | default : |
766 | 766 | $date_time_format = FALSE; |
767 | 767 | } |
768 | 768 | // do we have a date_time format to check ? |
769 | - if ( $date_time_format ) { |
|
770 | - $error_msg = EEH_DTT_Helper::validate_format_string( $date_time_format ); |
|
769 | + if ($date_time_format) { |
|
770 | + $error_msg = EEH_DTT_Helper::validate_format_string($date_time_format); |
|
771 | 771 | |
772 | - if ( is_array( $error_msg ) ) { |
|
773 | - $msg = '<p>' . sprintf( __( 'The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso' ), date( $date_time_format ) , $date_time_format ) . '</p><p><ul>'; |
|
772 | + if (is_array($error_msg)) { |
|
773 | + $msg = '<p>'.sprintf(__('The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso'), date($date_time_format), $date_time_format).'</p><p><ul>'; |
|
774 | 774 | |
775 | 775 | |
776 | - foreach ( $error_msg as $error ) { |
|
777 | - $msg .= '<li>' . $error . '</li>'; |
|
776 | + foreach ($error_msg as $error) { |
|
777 | + $msg .= '<li>'.$error.'</li>'; |
|
778 | 778 | } |
779 | 779 | |
780 | - $msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>'; |
|
780 | + $msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>'; |
|
781 | 781 | |
782 | 782 | // trigger WP settings error |
783 | 783 | add_settings_error( |
@@ -787,7 +787,7 @@ discard block |
||
787 | 787 | ); |
788 | 788 | |
789 | 789 | // set format to something valid |
790 | - switch ( $option ) { |
|
790 | + switch ($option) { |
|
791 | 791 | case 'date_format' : |
792 | 792 | $value = 'F j, Y'; |
793 | 793 | break; |
@@ -813,14 +813,14 @@ discard block |
||
813 | 813 | * @param $value |
814 | 814 | * @return void |
815 | 815 | */ |
816 | - public function reset_page_for_posts_on_change( $option, $old_value, $value ) { |
|
817 | - if ( $option == 'page_for_posts' ) { |
|
816 | + public function reset_page_for_posts_on_change($option, $old_value, $value) { |
|
817 | + if ($option == 'page_for_posts') { |
|
818 | 818 | global $wpdb; |
819 | - $SQL = 'SELECT post_name from ' . $wpdb->posts . ' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s'; |
|
820 | - $old_page_for_posts = $old_value ? $wpdb->get_var( $wpdb->prepare( $SQL, $old_value )) : 'posts'; |
|
821 | - $new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value )) : 'posts'; |
|
822 | - EE_Registry::instance()->CFG->core->post_shortcodes[ $new_page_for_posts ] = EE_Registry::instance()->CFG->core->post_shortcodes[ $old_page_for_posts ]; |
|
823 | - EE_Registry::instance()->CFG->update_post_shortcodes( $new_page_for_posts ); |
|
819 | + $SQL = 'SELECT post_name from '.$wpdb->posts.' WHERE post_type="posts" OR post_type="page" AND post_status="publish" AND ID=%s'; |
|
820 | + $old_page_for_posts = $old_value ? $wpdb->get_var($wpdb->prepare($SQL, $old_value)) : 'posts'; |
|
821 | + $new_page_for_posts = $value ? $wpdb->get_var($wpdb->prepare($SQL, $value)) : 'posts'; |
|
822 | + EE_Registry::instance()->CFG->core->post_shortcodes[$new_page_for_posts] = EE_Registry::instance()->CFG->core->post_shortcodes[$old_page_for_posts]; |
|
823 | + EE_Registry::instance()->CFG->update_post_shortcodes($new_page_for_posts); |
|
824 | 824 | } |
825 | 825 | } |
826 | 826 | |
@@ -833,8 +833,8 @@ discard block |
||
833 | 833 | * @param $content |
834 | 834 | * @return string |
835 | 835 | */ |
836 | - public function its_eSpresso( $content ) { |
|
837 | - return str_replace( '[EXPRESSO_', '[ESPRESSO_', $content ); |
|
836 | + public function its_eSpresso($content) { |
|
837 | + return str_replace('[EXPRESSO_', '[ESPRESSO_', $content); |
|
838 | 838 | } |
839 | 839 | |
840 | 840 | |
@@ -847,9 +847,9 @@ discard block |
||
847 | 847 | */ |
848 | 848 | public function espresso_admin_footer() { |
849 | 849 | return sprintf( |
850 | - __( 'Event Registration and Ticketing Powered by %sEvent Registration Powered by Event Espresso%s', 'event_espresso' ), |
|
850 | + __('Event Registration and Ticketing Powered by %sEvent Registration Powered by Event Espresso%s', 'event_espresso'), |
|
851 | 851 | '<a href="https://eventespresso.com/" title="', |
852 | - '">' . EVENT_ESPRESSO_POWERED_BY . '</a>' |
|
852 | + '">'.EVENT_ESPRESSO_POWERED_BY.'</a>' |
|
853 | 853 | ); |
854 | 854 | } |
855 | 855 | |
@@ -869,11 +869,11 @@ discard block |
||
869 | 869 | * @param array $config |
870 | 870 | * @return void |
871 | 871 | */ |
872 | - public static function register_ee_admin_page( $page_basename, $page_path, $config = array() ) { |
|
873 | - EE_Error::doing_it_wrong( __METHOD__, sprintf( __('Usage is deprecated. Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3' ); |
|
874 | - if ( class_exists( 'EE_Register_Admin_Page' ) ) |
|
872 | + public static function register_ee_admin_page($page_basename, $page_path, $config = array()) { |
|
873 | + EE_Error::doing_it_wrong(__METHOD__, sprintf(__('Usage is deprecated. Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3'); |
|
874 | + if (class_exists('EE_Register_Admin_Page')) |
|
875 | 875 | $config['page_path'] = $page_path; |
876 | - EE_Register_Admin_Page::register( $page_basename, $config ); |
|
876 | + EE_Register_Admin_Page::register($page_basename, $config); |
|
877 | 877 | } |
878 | 878 | |
879 | 879 |
@@ -1,28 +1,28 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * Class EEM_Base |
|
5 | - * |
|
6 | - * Multi-table model. Especially handles joins when querying. |
|
7 | - * An important note about values dealt with in models and model objects: |
|
8 | - * values used by models exist in basically 3 different domains, which the EE_Model_Fields help convert between: |
|
9 | - * 1. Client-code values (eg, controller code may refer to a date as "March 21, 2013") |
|
10 | - * 2. Model object values (eg, after the model object has called set() on the value and saves it onto the model object, it may become a unix timestamp, eg 12312412412) |
|
11 | - * 3. Database values (eg, we may later decide to store dates as mysql dates, in which case they'd be stored as '2013-03-21 00:00:00') |
|
12 | - * Sometimes these values are the same, but often they are not. When your client code is using a model's functions, you need to be aware |
|
13 | - * which domain your data exists in. If it is client-code values (ie, it hasn't had a EE_Model_Field call prepare_for_set on it) then use the |
|
14 | - * model functions as normal. However, if you are calling the model functions with values from the model object domain (ie, the code your writing is |
|
15 | - * probably within a model object, and all the values you're dealing with have had an EE_Model_Field call prepare_for_set on them), then you'll want |
|
16 | - * to set $values_already_prepared_by_model_object to FALSE within the argument-list of the functions you call (in order to avoid re-processing those values). |
|
17 | - * If your values are already in the database values domain, you'll either way to convert them into the model object domain by creating model objects |
|
18 | - * from those raw db values (ie,using EEM_Base::_create_objects), or just use $wpdb directly. |
|
19 | - * |
|
20 | - * @package Event Espresso |
|
21 | - * @subpackage core |
|
22 | - * @author Michael Nelson |
|
23 | - * @since EE4 |
|
24 | - * |
|
25 | - */ |
|
3 | + * |
|
4 | + * Class EEM_Base |
|
5 | + * |
|
6 | + * Multi-table model. Especially handles joins when querying. |
|
7 | + * An important note about values dealt with in models and model objects: |
|
8 | + * values used by models exist in basically 3 different domains, which the EE_Model_Fields help convert between: |
|
9 | + * 1. Client-code values (eg, controller code may refer to a date as "March 21, 2013") |
|
10 | + * 2. Model object values (eg, after the model object has called set() on the value and saves it onto the model object, it may become a unix timestamp, eg 12312412412) |
|
11 | + * 3. Database values (eg, we may later decide to store dates as mysql dates, in which case they'd be stored as '2013-03-21 00:00:00') |
|
12 | + * Sometimes these values are the same, but often they are not. When your client code is using a model's functions, you need to be aware |
|
13 | + * which domain your data exists in. If it is client-code values (ie, it hasn't had a EE_Model_Field call prepare_for_set on it) then use the |
|
14 | + * model functions as normal. However, if you are calling the model functions with values from the model object domain (ie, the code your writing is |
|
15 | + * probably within a model object, and all the values you're dealing with have had an EE_Model_Field call prepare_for_set on them), then you'll want |
|
16 | + * to set $values_already_prepared_by_model_object to FALSE within the argument-list of the functions you call (in order to avoid re-processing those values). |
|
17 | + * If your values are already in the database values domain, you'll either way to convert them into the model object domain by creating model objects |
|
18 | + * from those raw db values (ie,using EEM_Base::_create_objects), or just use $wpdb directly. |
|
19 | + * |
|
20 | + * @package Event Espresso |
|
21 | + * @subpackage core |
|
22 | + * @author Michael Nelson |
|
23 | + * @since EE4 |
|
24 | + * |
|
25 | + */ |
|
26 | 26 | abstract class EEM_Base extends EE_Base{ |
27 | 27 | |
28 | 28 | //admin posty |
@@ -578,10 +578,10 @@ discard block |
||
578 | 578 | $stati = EEM_Status::instance()->get_all(array(array('STS_type' => $status_type) ) ); |
579 | 579 | $status_array = array(); |
580 | 580 | foreach ( $stati as $status ) { |
581 | - $status_array[ $status->ID() ] = $status->get('STS_code'); |
|
582 | - } |
|
583 | - return $translated ? EEM_Status::instance()->localized_status($status_array, FALSE, 'sentence') : $status_array; |
|
584 | - } |
|
581 | + $status_array[ $status->ID() ] = $status->get('STS_code'); |
|
582 | + } |
|
583 | + return $translated ? EEM_Status::instance()->localized_status($status_array, FALSE, 'sentence') : $status_array; |
|
584 | + } |
|
585 | 585 | |
586 | 586 | |
587 | 587 |
@@ -1,26 +1,26 @@ discard block |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
2 | 2 | /** |
3 | - * Event Espresso |
|
4 | - * |
|
5 | - * Event Registration and Management Plugin for WordPress |
|
6 | - * |
|
7 | - * @ package Event Espresso |
|
8 | - * @ author Event Espresso |
|
9 | - * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
10 | - * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
11 | - * @ link http://www.eventespresso.com |
|
12 | - * @ version 4.0 |
|
13 | - * |
|
14 | - * ------------------------------------------------------------------------ |
|
15 | - * |
|
16 | - * EE_System |
|
17 | - * |
|
18 | - * @package Event Espresso |
|
19 | - * @subpackage core/ |
|
20 | - * @author Brent Christensen, Michael Nelson |
|
21 | - * |
|
22 | - * ------------------------------------------------------------------------ |
|
23 | - */ |
|
3 | + * Event Espresso |
|
4 | + * |
|
5 | + * Event Registration and Management Plugin for WordPress |
|
6 | + * |
|
7 | + * @ package Event Espresso |
|
8 | + * @ author Event Espresso |
|
9 | + * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
10 | + * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
11 | + * @ link http://www.eventespresso.com |
|
12 | + * @ version 4.0 |
|
13 | + * |
|
14 | + * ------------------------------------------------------------------------ |
|
15 | + * |
|
16 | + * EE_System |
|
17 | + * |
|
18 | + * @package Event Espresso |
|
19 | + * @subpackage core/ |
|
20 | + * @author Brent Christensen, Michael Nelson |
|
21 | + * |
|
22 | + * ------------------------------------------------------------------------ |
|
23 | + */ |
|
24 | 24 | final class EE_System { |
25 | 25 | |
26 | 26 | |
@@ -206,14 +206,14 @@ discard block |
||
206 | 206 | |
207 | 207 | |
208 | 208 | /** |
209 | - * detect_if_activation_or_upgrade |
|
210 | - * |
|
211 | - * Takes care of detecting whether this is a brand new install or code upgrade, |
|
212 | - * and either setting up the DB or setting up maintenance mode etc. |
|
213 | - * |
|
214 | - * @access public |
|
215 | - * @return void |
|
216 | - */ |
|
209 | + * detect_if_activation_or_upgrade |
|
210 | + * |
|
211 | + * Takes care of detecting whether this is a brand new install or code upgrade, |
|
212 | + * and either setting up the DB or setting up maintenance mode etc. |
|
213 | + * |
|
214 | + * @access public |
|
215 | + * @return void |
|
216 | + */ |
|
217 | 217 | public function detect_if_activation_or_upgrade() { |
218 | 218 | do_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin'); |
219 | 219 | |
@@ -517,11 +517,11 @@ discard block |
||
517 | 517 | $query_params = array( 'page' => 'espresso_about' ); |
518 | 518 | |
519 | 519 | if ( EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation ) { |
520 | - $query_params['new_activation'] = TRUE; |
|
520 | + $query_params['new_activation'] = TRUE; |
|
521 | 521 | } |
522 | 522 | |
523 | 523 | if ( EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation ) { |
524 | - $query_params['reactivation'] = TRUE; |
|
524 | + $query_params['reactivation'] = TRUE; |
|
525 | 525 | } |
526 | 526 | $url = add_query_arg( $query_params, admin_url( 'admin.php' ) ); |
527 | 527 | wp_safe_redirect( $url ); |
@@ -624,11 +624,11 @@ discard block |
||
624 | 624 | |
625 | 625 | |
626 | 626 | /** |
627 | - * _incompatible_addon_error |
|
628 | - * |
|
629 | - * @access public |
|
630 | - * @return void |
|
631 | - */ |
|
627 | + * _incompatible_addon_error |
|
628 | + * |
|
629 | + * @access public |
|
630 | + * @return void |
|
631 | + */ |
|
632 | 632 | private function _incompatible_addon_error() { |
633 | 633 | // get array of classes hooking into here |
634 | 634 | $class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook( 'AHEE__EE_System__register_shortcodes_modules_and_addons' ); |
@@ -750,14 +750,14 @@ discard block |
||
750 | 750 | |
751 | 751 | |
752 | 752 | /** |
753 | - * load_controllers |
|
754 | - * |
|
755 | - * this is the best place to load any additional controllers that needs access to EE core. |
|
756 | - * it is expected that all basic core EE systems, that are not dependant on the current request are loaded at this time |
|
757 | - * |
|
758 | - * @access public |
|
759 | - * @return void |
|
760 | - */ |
|
753 | + * load_controllers |
|
754 | + * |
|
755 | + * this is the best place to load any additional controllers that needs access to EE core. |
|
756 | + * it is expected that all basic core EE systems, that are not dependant on the current request are loaded at this time |
|
757 | + * |
|
758 | + * @access public |
|
759 | + * @return void |
|
760 | + */ |
|
761 | 761 | public function load_controllers() { |
762 | 762 | do_action( 'AHEE__EE_System__load_controllers__start' ); |
763 | 763 | // let's get it started |
@@ -774,13 +774,13 @@ discard block |
||
774 | 774 | |
775 | 775 | |
776 | 776 | /** |
777 | - * core_loaded_and_ready |
|
778 | - * |
|
779 | - * all of the basic EE core should be loaded at this point and available regardless of M-Mode |
|
780 | - * |
|
781 | - * @access public |
|
782 | - * @return void |
|
783 | - */ |
|
777 | + * core_loaded_and_ready |
|
778 | + * |
|
779 | + * all of the basic EE core should be loaded at this point and available regardless of M-Mode |
|
780 | + * |
|
781 | + * @access public |
|
782 | + * @return void |
|
783 | + */ |
|
784 | 784 | public function core_loaded_and_ready() { |
785 | 785 | do_action( 'AHEE__EE_System__core_loaded_and_ready' ); |
786 | 786 | do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' ); |
@@ -791,13 +791,13 @@ discard block |
||
791 | 791 | |
792 | 792 | |
793 | 793 | /** |
794 | - * initialize |
|
795 | - * |
|
796 | - * this is the best place to begin initializing client code |
|
797 | - * |
|
798 | - * @access public |
|
799 | - * @return void |
|
800 | - */ |
|
794 | + * initialize |
|
795 | + * |
|
796 | + * this is the best place to begin initializing client code |
|
797 | + * |
|
798 | + * @access public |
|
799 | + * @return void |
|
800 | + */ |
|
801 | 801 | public function initialize() { |
802 | 802 | do_action( 'AHEE__EE_System__initialize' ); |
803 | 803 | } |
@@ -805,13 +805,13 @@ discard block |
||
805 | 805 | |
806 | 806 | |
807 | 807 | /** |
808 | - * initialize_last |
|
809 | - * |
|
810 | - * this is run really late during the WP init hookpoint, and ensures that mostly everything else that needs to initialize has done so |
|
811 | - * |
|
812 | - * @access public |
|
813 | - * @return void |
|
814 | - */ |
|
808 | + * initialize_last |
|
809 | + * |
|
810 | + * this is run really late during the WP init hookpoint, and ensures that mostly everything else that needs to initialize has done so |
|
811 | + * |
|
812 | + * @access public |
|
813 | + * @return void |
|
814 | + */ |
|
815 | 815 | public function initialize_last() { |
816 | 816 | do_action( 'AHEE__EE_System__initialize_last' ); |
817 | 817 | } |
@@ -820,14 +820,14 @@ discard block |
||
820 | 820 | |
821 | 821 | |
822 | 822 | /** |
823 | - * set_hooks_for_shortcodes_modules_and_addons |
|
824 | - * |
|
825 | - * this is the best place for other systems to set callbacks for hooking into other parts of EE |
|
826 | - * this happens at the very beginning of the wp_loaded hookpoint |
|
827 | - * |
|
828 | - * @access public |
|
829 | - * @return void |
|
830 | - */ |
|
823 | + * set_hooks_for_shortcodes_modules_and_addons |
|
824 | + * |
|
825 | + * this is the best place for other systems to set callbacks for hooking into other parts of EE |
|
826 | + * this happens at the very beginning of the wp_loaded hookpoint |
|
827 | + * |
|
828 | + * @access public |
|
829 | + * @return void |
|
830 | + */ |
|
831 | 831 | public function set_hooks_for_shortcodes_modules_and_addons() { |
832 | 832 | // do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' ); |
833 | 833 | } |
@@ -836,13 +836,13 @@ discard block |
||
836 | 836 | |
837 | 837 | |
838 | 838 | /** |
839 | - * do_not_cache |
|
840 | - * |
|
841 | - * sets no cache headers and defines no cache constants for WP plugins |
|
842 | - * |
|
843 | - * @access public |
|
844 | - * @return void |
|
845 | - */ |
|
839 | + * do_not_cache |
|
840 | + * |
|
841 | + * sets no cache headers and defines no cache constants for WP plugins |
|
842 | + * |
|
843 | + * @access public |
|
844 | + * @return void |
|
845 | + */ |
|
846 | 846 | public static function do_not_cache() { |
847 | 847 | // set no cache constants |
848 | 848 | if ( ! defined( 'DONOTCACHEPAGE' ) ) { |
@@ -961,7 +961,7 @@ discard block |
||
961 | 961 | //Current post |
962 | 962 | global $post; |
963 | 963 | |
964 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) { |
|
964 | + if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) { |
|
965 | 965 | //Events Edit Current Event |
966 | 966 | $admin_bar->add_menu(array( |
967 | 967 | 'id' => 'espresso-toolbar-events-edit', |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | */ |
103 | 103 | public static function instance() { |
104 | 104 | // check if class object is instantiated |
105 | - if ( ! self::$_instance instanceof EE_System ) { |
|
105 | + if ( ! self::$_instance instanceof EE_System) { |
|
106 | 106 | self::$_instance = new self(); |
107 | 107 | } |
108 | 108 | return self::$_instance; |
@@ -113,12 +113,12 @@ discard block |
||
113 | 113 | * resets the instance and returns it |
114 | 114 | * @return EE_System |
115 | 115 | */ |
116 | - public static function reset(){ |
|
116 | + public static function reset() { |
|
117 | 117 | self::$_instance->_req_type = NULL; |
118 | 118 | //we need to reset the migration manager in order for it to detect DMSs properly |
119 | 119 | EE_Data_Migration_Manager::reset(); |
120 | 120 | //make sure none of the old hooks are left hanging around |
121 | - remove_all_actions( 'AHEE__EE_System__perform_activations_upgrades_and_migrations'); |
|
121 | + remove_all_actions('AHEE__EE_System__perform_activations_upgrades_and_migrations'); |
|
122 | 122 | self::instance()->detect_activations_or_upgrades(); |
123 | 123 | self::instance()->perform_activations_upgrades_and_migrations(); |
124 | 124 | return self::instance(); |
@@ -134,26 +134,26 @@ discard block |
||
134 | 134 | * @access private |
135 | 135 | */ |
136 | 136 | private function __construct() { |
137 | - do_action( 'AHEE__EE_System__construct__begin', $this ); |
|
137 | + do_action('AHEE__EE_System__construct__begin', $this); |
|
138 | 138 | // allow addons to load first so that they can register autoloaders, set hooks for running DMS's, etc |
139 | - add_action( 'AHEE__EE_Bootstrap__load_espresso_addons', array( $this, 'load_espresso_addons' ) ); |
|
139 | + add_action('AHEE__EE_Bootstrap__load_espresso_addons', array($this, 'load_espresso_addons')); |
|
140 | 140 | // when an ee addon is activated, we want to call the core hook(s) again |
141 | 141 | // because the newly-activated addon didn't get a chance to run at all |
142 | - add_action( 'activate_plugin', array( $this, 'load_espresso_addons' ), 1 ); |
|
142 | + add_action('activate_plugin', array($this, 'load_espresso_addons'), 1); |
|
143 | 143 | // detect whether install or upgrade |
144 | - add_action( 'AHEE__EE_Bootstrap__detect_activations_or_upgrades', array( $this, 'detect_activations_or_upgrades' ), 3 ); |
|
144 | + add_action('AHEE__EE_Bootstrap__detect_activations_or_upgrades', array($this, 'detect_activations_or_upgrades'), 3); |
|
145 | 145 | // load EE_Config, EE_Textdomain, etc |
146 | - add_action( 'AHEE__EE_Bootstrap__load_core_configuration', array( $this, 'load_core_configuration' ), 5 ); |
|
146 | + add_action('AHEE__EE_Bootstrap__load_core_configuration', array($this, 'load_core_configuration'), 5); |
|
147 | 147 | // load EE_Config, EE_Textdomain, etc |
148 | - add_action( 'AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets', array( $this, 'register_shortcodes_modules_and_widgets' ), 7 ); |
|
148 | + add_action('AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets', array($this, 'register_shortcodes_modules_and_widgets'), 7); |
|
149 | 149 | // you wanna get going? I wanna get going... let's get going! |
150 | - add_action( 'AHEE__EE_Bootstrap__brew_espresso', array( $this, 'brew_espresso' ), 9 ); |
|
150 | + add_action('AHEE__EE_Bootstrap__brew_espresso', array($this, 'brew_espresso'), 9); |
|
151 | 151 | //other housekeeping |
152 | 152 | //exclude EE critical pages from wp_list_pages |
153 | - add_filter( 'wp_list_pages_excludes', array( $this, 'remove_pages_from_wp_list_pages' ), 10 ); |
|
153 | + add_filter('wp_list_pages_excludes', array($this, 'remove_pages_from_wp_list_pages'), 10); |
|
154 | 154 | // ALL EE Addons should use the following hook point to attach their initial setup too |
155 | 155 | // it's extremely important for EE Addons to register any class autoloaders so that they can be available when the EE_Config loads |
156 | - do_action( 'AHEE__EE_System__construct__complete', $this ); |
|
156 | + do_action('AHEE__EE_System__construct__complete', $this); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | |
@@ -173,30 +173,30 @@ discard block |
||
173 | 173 | public function load_espresso_addons() { |
174 | 174 | // set autoloaders for all of the classes implementing EEI_Plugin_API |
175 | 175 | // which provide helpers for EE plugin authors to more easily register certain components with EE. |
176 | - EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_LIBRARIES . 'plugin_api' ); |
|
176 | + EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'plugin_api'); |
|
177 | 177 | //load and setup EE_Capabilities |
178 | - EE_Registry::instance()->load_core( 'Capabilities' ); |
|
178 | + EE_Registry::instance()->load_core('Capabilities'); |
|
179 | 179 | //caps need to be initialized on every request so that capability maps are set. |
180 | 180 | //@see https://events.codebasehq.com/projects/event-espresso/tickets/8674 |
181 | 181 | EE_Registry::instance()->CAP->init_caps(); |
182 | - do_action( 'AHEE__EE_System__load_espresso_addons' ); |
|
182 | + do_action('AHEE__EE_System__load_espresso_addons'); |
|
183 | 183 | //if the WP API basic auth plugin isn't already loaded, load it now. |
184 | 184 | //We want it for mobile apps. Just include the entire plugin |
185 | 185 | //also, don't load the basic auth when a plugin is getting activated, because |
186 | 186 | //it could be the basic auth plugin, and it doesn't check if its methods are already defined |
187 | 187 | //and causes a fatal error |
188 | - if( !function_exists( 'json_basic_auth_handler' ) |
|
189 | - && ! function_exists( 'json_basic_auth_error' ) |
|
188 | + if ( ! function_exists('json_basic_auth_handler') |
|
189 | + && ! function_exists('json_basic_auth_error') |
|
190 | 190 | && ! ( |
191 | - isset( $_GET[ 'action'] ) |
|
192 | - && in_array( $_GET[ 'action' ], array( 'activate', 'activate-selected' ) ) |
|
191 | + isset($_GET['action']) |
|
192 | + && in_array($_GET['action'], array('activate', 'activate-selected')) |
|
193 | 193 | ) |
194 | 194 | && ! ( |
195 | - isset( $_GET['activate' ] ) |
|
196 | - && $_GET['activate' ] === 'true' |
|
195 | + isset($_GET['activate']) |
|
196 | + && $_GET['activate'] === 'true' |
|
197 | 197 | ) |
198 | 198 | ) { |
199 | - include_once EE_THIRD_PARTY . 'wp-api-basic-auth' . DS . 'basic-auth.php'; |
|
199 | + include_once EE_THIRD_PARTY.'wp-api-basic-auth'.DS.'basic-auth.php'; |
|
200 | 200 | } |
201 | 201 | } |
202 | 202 | |
@@ -212,10 +212,10 @@ discard block |
||
212 | 212 | * @access public |
213 | 213 | * @return void |
214 | 214 | */ |
215 | - public function detect_activations_or_upgrades(){ |
|
215 | + public function detect_activations_or_upgrades() { |
|
216 | 216 | //first off: let's make sure to handle core |
217 | 217 | $this->detect_if_activation_or_upgrade(); |
218 | - foreach(EE_Registry::instance()->addons as $addon){ |
|
218 | + foreach (EE_Registry::instance()->addons as $addon) { |
|
219 | 219 | //detect teh request type for that addon |
220 | 220 | $addon->detect_activation_or_upgrade(); |
221 | 221 | } |
@@ -236,44 +236,44 @@ discard block |
||
236 | 236 | do_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin'); |
237 | 237 | |
238 | 238 | // load M-Mode class |
239 | - EE_Registry::instance()->load_core( 'Maintenance_Mode' ); |
|
239 | + EE_Registry::instance()->load_core('Maintenance_Mode'); |
|
240 | 240 | // check if db has been updated, or if its a brand-new installation |
241 | 241 | |
242 | 242 | $espresso_db_update = $this->fix_espresso_db_upgrade_option(); |
243 | - $request_type = $this->detect_req_type($espresso_db_update); |
|
243 | + $request_type = $this->detect_req_type($espresso_db_update); |
|
244 | 244 | //EEH_Debug_Tools::printr( $request_type, '$request_type', __FILE__, __LINE__ ); |
245 | - if( $request_type != EE_System::req_type_normal){ |
|
245 | + if ($request_type != EE_System::req_type_normal) { |
|
246 | 246 | EE_Registry::instance()->load_helper('Activation'); |
247 | 247 | } |
248 | 248 | |
249 | - switch($request_type){ |
|
249 | + switch ($request_type) { |
|
250 | 250 | case EE_System::req_type_new_activation: |
251 | - do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__new_activation' ); |
|
252 | - $this->_handle_core_version_change( $espresso_db_update ); |
|
251 | + do_action('AHEE__EE_System__detect_if_activation_or_upgrade__new_activation'); |
|
252 | + $this->_handle_core_version_change($espresso_db_update); |
|
253 | 253 | break; |
254 | 254 | case EE_System::req_type_reactivation: |
255 | - do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__reactivation' ); |
|
256 | - $this->_handle_core_version_change( $espresso_db_update ); |
|
255 | + do_action('AHEE__EE_System__detect_if_activation_or_upgrade__reactivation'); |
|
256 | + $this->_handle_core_version_change($espresso_db_update); |
|
257 | 257 | break; |
258 | 258 | case EE_System::req_type_upgrade: |
259 | - do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__upgrade' ); |
|
259 | + do_action('AHEE__EE_System__detect_if_activation_or_upgrade__upgrade'); |
|
260 | 260 | //migrations may be required now that we've upgraded |
261 | 261 | EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old(); |
262 | - $this->_handle_core_version_change( $espresso_db_update ); |
|
262 | + $this->_handle_core_version_change($espresso_db_update); |
|
263 | 263 | // echo "done upgrade";die; |
264 | 264 | break; |
265 | 265 | case EE_System::req_type_downgrade: |
266 | - do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__downgrade' ); |
|
266 | + do_action('AHEE__EE_System__detect_if_activation_or_upgrade__downgrade'); |
|
267 | 267 | //its possible migrations are no longer required |
268 | 268 | EE_Maintenance_Mode::instance()->set_maintenance_mode_if_db_old(); |
269 | - $this->_handle_core_version_change( $espresso_db_update ); |
|
269 | + $this->_handle_core_version_change($espresso_db_update); |
|
270 | 270 | break; |
271 | 271 | case EE_System::req_type_normal: |
272 | 272 | default: |
273 | 273 | // $this->_maybe_redirect_to_ee_about(); |
274 | 274 | break; |
275 | 275 | } |
276 | - do_action( 'AHEE__EE_System__detect_if_activation_or_upgrade__complete' ); |
|
276 | + do_action('AHEE__EE_System__detect_if_activation_or_upgrade__complete'); |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | /** |
@@ -281,10 +281,10 @@ discard block |
||
281 | 281 | * initializing the database later during the request |
282 | 282 | * @param array $espresso_db_update |
283 | 283 | */ |
284 | - protected function _handle_core_version_change( $espresso_db_update ){ |
|
285 | - $this->update_list_of_installed_versions( $espresso_db_update ); |
|
284 | + protected function _handle_core_version_change($espresso_db_update) { |
|
285 | + $this->update_list_of_installed_versions($espresso_db_update); |
|
286 | 286 | //get ready to verify the DB is ok (provided we aren't in maintenance mode, of course) |
287 | - add_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations', array( $this, 'initialize_db_if_no_migrations_required' )); |
|
287 | + add_action('AHEE__EE_System__perform_activations_upgrades_and_migrations', array($this, 'initialize_db_if_no_migrations_required')); |
|
288 | 288 | } |
289 | 289 | |
290 | 290 | |
@@ -299,44 +299,44 @@ discard block |
||
299 | 299 | * @internal param array $espresso_db_update_value the value of the WordPress option. If not supplied, fetches it from the options table |
300 | 300 | * @return array the correct value of 'espresso_db_upgrade', after saving it, if it needed correction |
301 | 301 | */ |
302 | - private function fix_espresso_db_upgrade_option($espresso_db_update = null){ |
|
303 | - do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update ); |
|
304 | - if( ! $espresso_db_update){ |
|
305 | - $espresso_db_update = get_option( 'espresso_db_update' ); |
|
302 | + private function fix_espresso_db_upgrade_option($espresso_db_update = null) { |
|
303 | + do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__begin', $espresso_db_update); |
|
304 | + if ( ! $espresso_db_update) { |
|
305 | + $espresso_db_update = get_option('espresso_db_update'); |
|
306 | 306 | } |
307 | 307 | // check that option is an array |
308 | - if( ! is_array( $espresso_db_update )) { |
|
308 | + if ( ! is_array($espresso_db_update)) { |
|
309 | 309 | // if option is FALSE, then it never existed |
310 | - if ( $espresso_db_update === FALSE ) { |
|
310 | + if ($espresso_db_update === FALSE) { |
|
311 | 311 | // make $espresso_db_update an array and save option with autoload OFF |
312 | - $espresso_db_update = array(); |
|
313 | - add_option( 'espresso_db_update', $espresso_db_update, '', 'no' ); |
|
312 | + $espresso_db_update = array(); |
|
313 | + add_option('espresso_db_update', $espresso_db_update, '', 'no'); |
|
314 | 314 | } else { |
315 | 315 | // option is NOT FALSE but also is NOT an array, so make it an array and save it |
316 | - $espresso_db_update = array( $espresso_db_update=>array() ); |
|
317 | - update_option( 'espresso_db_update', $espresso_db_update ); |
|
316 | + $espresso_db_update = array($espresso_db_update=>array()); |
|
317 | + update_option('espresso_db_update', $espresso_db_update); |
|
318 | 318 | } |
319 | - }else{ |
|
319 | + } else { |
|
320 | 320 | $corrected_db_update = array(); |
321 | 321 | //if IS an array, but is it an array where KEYS are version numbers, and values are arrays? |
322 | - foreach($espresso_db_update as $should_be_version_string => $should_be_array){ |
|
323 | - if(is_int($should_be_version_string) && ! is_array($should_be_array)){ |
|
322 | + foreach ($espresso_db_update as $should_be_version_string => $should_be_array) { |
|
323 | + if (is_int($should_be_version_string) && ! is_array($should_be_array)) { |
|
324 | 324 | //the key is an int, and the value IS NOT an array |
325 | 325 | //so it must be numerically-indexed, where values are versions installed... |
326 | 326 | //fix it! |
327 | 327 | $version_string = $should_be_array; |
328 | 328 | $corrected_db_update[$version_string] = array('unknown-date'); |
329 | - }else{ |
|
329 | + } else { |
|
330 | 330 | //ok it checks out |
331 | 331 | $corrected_db_update[$should_be_version_string] = $should_be_array; |
332 | 332 | } |
333 | 333 | } |
334 | 334 | $espresso_db_update = $corrected_db_update; |
335 | - update_option( 'espresso_db_update', $espresso_db_update ); |
|
335 | + update_option('espresso_db_update', $espresso_db_update); |
|
336 | 336 | |
337 | 337 | } |
338 | 338 | |
339 | - do_action( 'FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update ); |
|
339 | + do_action('FHEE__EE_System__manage_fix_espresso_db_upgrade_option__complete', $espresso_db_update); |
|
340 | 340 | return $espresso_db_update; |
341 | 341 | } |
342 | 342 | |
@@ -355,34 +355,34 @@ discard block |
||
355 | 355 | * so we prefer to only do it when necessary |
356 | 356 | * @return void |
357 | 357 | */ |
358 | - public function initialize_db_if_no_migrations_required( $initialize_addons_too = FALSE, $verify_schema = true ){ |
|
358 | + public function initialize_db_if_no_migrations_required($initialize_addons_too = FALSE, $verify_schema = true) { |
|
359 | 359 | $request_type = $this->detect_req_type(); |
360 | 360 | //only initialize system if we're not in maintenance mode. |
361 | - if( EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ){ |
|
362 | - update_option( 'ee_flush_rewrite_rules', TRUE ); |
|
361 | + if (EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance) { |
|
362 | + update_option('ee_flush_rewrite_rules', TRUE); |
|
363 | 363 | |
364 | - if( $verify_schema ) { |
|
364 | + if ($verify_schema) { |
|
365 | 365 | EEH_Activation::initialize_db_and_folders(); |
366 | 366 | } |
367 | 367 | EEH_Activation::initialize_db_content(); |
368 | 368 | EEH_Activation::system_initialization(); |
369 | - if( $initialize_addons_too ) { |
|
369 | + if ($initialize_addons_too) { |
|
370 | 370 | $this->initialize_addons(); |
371 | 371 | } |
372 | - }else{ |
|
373 | - EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for( 'Core' ); |
|
372 | + } else { |
|
373 | + EE_Data_Migration_Manager::instance()->enqueue_db_initialization_for('Core'); |
|
374 | 374 | } |
375 | - if ( $request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade ) { |
|
376 | - add_action( 'AHEE__EE_System__load_CPTs_and_session__start', array( $this, 'redirect_to_about_ee' ), 9 ); |
|
375 | + if ($request_type == EE_System::req_type_new_activation || $request_type == EE_System::req_type_reactivation || $request_type == EE_System::req_type_upgrade) { |
|
376 | + add_action('AHEE__EE_System__load_CPTs_and_session__start', array($this, 'redirect_to_about_ee'), 9); |
|
377 | 377 | } |
378 | 378 | } |
379 | 379 | |
380 | 380 | /** |
381 | 381 | * Initializes the db for all registered addons |
382 | 382 | */ |
383 | - public function initialize_addons(){ |
|
383 | + public function initialize_addons() { |
|
384 | 384 | //foreach registered addon, make sure its db is up-to-date too |
385 | - foreach(EE_Registry::instance()->addons as $addon){ |
|
385 | + foreach (EE_Registry::instance()->addons as $addon) { |
|
386 | 386 | $addon->initialize_db_if_no_migrations_required(); |
387 | 387 | } |
388 | 388 | } |
@@ -394,16 +394,16 @@ discard block |
||
394 | 394 | * @param string $current_version_to_add version to be added to the version history |
395 | 395 | * @return boolean success as to whether or not this option was changed |
396 | 396 | */ |
397 | - public function update_list_of_installed_versions($version_history = NULL,$current_version_to_add = NULL) { |
|
398 | - if( ! $version_history ) { |
|
397 | + public function update_list_of_installed_versions($version_history = NULL, $current_version_to_add = NULL) { |
|
398 | + if ( ! $version_history) { |
|
399 | 399 | $version_history = $this->fix_espresso_db_upgrade_option($version_history); |
400 | 400 | } |
401 | - if( $current_version_to_add == NULL){ |
|
401 | + if ($current_version_to_add == NULL) { |
|
402 | 402 | $current_version_to_add = espresso_version(); |
403 | 403 | } |
404 | - $version_history[ $current_version_to_add ][] = date( 'Y-m-d H:i:s',time() ); |
|
404 | + $version_history[$current_version_to_add][] = date('Y-m-d H:i:s', time()); |
|
405 | 405 | // re-save |
406 | - return update_option( 'espresso_db_update', $version_history ); |
|
406 | + return update_option('espresso_db_update', $version_history); |
|
407 | 407 | } |
408 | 408 | |
409 | 409 | |
@@ -420,10 +420,10 @@ discard block |
||
420 | 420 | * but still know if this is a new install or not |
421 | 421 | * @return int one of the constants on EE_System::req_type_ |
422 | 422 | */ |
423 | - public function detect_req_type( $espresso_db_update = NULL ){ |
|
424 | - if ( $this->_req_type === NULL ){ |
|
425 | - $espresso_db_update = ! empty( $espresso_db_update ) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option(); |
|
426 | - $this->_req_type = $this->detect_req_type_given_activation_history( $espresso_db_update, 'ee_espresso_activation', espresso_version() ); |
|
423 | + public function detect_req_type($espresso_db_update = NULL) { |
|
424 | + if ($this->_req_type === NULL) { |
|
425 | + $espresso_db_update = ! empty($espresso_db_update) ? $espresso_db_update : $this->fix_espresso_db_upgrade_option(); |
|
426 | + $this->_req_type = $this->detect_req_type_given_activation_history($espresso_db_update, 'ee_espresso_activation', espresso_version()); |
|
427 | 427 | } |
428 | 428 | return $this->_req_type; |
429 | 429 | } |
@@ -439,39 +439,39 @@ discard block |
||
439 | 439 | * @param string $version_to_upgrade_to the version that was just upgraded to (for core that will be espresso_version()) |
440 | 440 | * @return int one of the constants on EE_System::req_type_* |
441 | 441 | */ |
442 | - public static function detect_req_type_given_activation_history( $activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to ){ |
|
443 | - $version_is_higher = self::_new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to ); |
|
444 | - if( $activation_history_for_addon ){ |
|
442 | + public static function detect_req_type_given_activation_history($activation_history_for_addon, $activation_indicator_option_name, $version_to_upgrade_to) { |
|
443 | + $version_is_higher = self::_new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to); |
|
444 | + if ($activation_history_for_addon) { |
|
445 | 445 | //it exists, so this isn't a completely new install |
446 | 446 | //check if this version already in that list of previously installed versions |
447 | - if ( ! isset( $activation_history_for_addon[ $version_to_upgrade_to ] )) { |
|
447 | + if ( ! isset($activation_history_for_addon[$version_to_upgrade_to])) { |
|
448 | 448 | //it a version we haven't seen before |
449 | - if( $version_is_higher === 1 ){ |
|
449 | + if ($version_is_higher === 1) { |
|
450 | 450 | $req_type = EE_System::req_type_upgrade; |
451 | - }else{ |
|
451 | + } else { |
|
452 | 452 | $req_type = EE_System::req_type_downgrade; |
453 | 453 | } |
454 | - delete_option( $activation_indicator_option_name ); |
|
454 | + delete_option($activation_indicator_option_name); |
|
455 | 455 | } else { |
456 | 456 | // its not an update. maybe a reactivation? |
457 | - if( get_option( $activation_indicator_option_name, FALSE ) ){ |
|
458 | - if ( $version_is_higher === -1 ){ |
|
457 | + if (get_option($activation_indicator_option_name, FALSE)) { |
|
458 | + if ($version_is_higher === -1) { |
|
459 | 459 | $req_type = EE_System::req_type_downgrade; |
460 | - }elseif( $version_is_higher === 0 ){ |
|
460 | + }elseif ($version_is_higher === 0) { |
|
461 | 461 | //we've seen this version before, but it's an activation. must be a reactivation |
462 | 462 | $req_type = EE_System::req_type_reactivation; |
463 | - }else{//$version_is_higher === 1 |
|
463 | + } else {//$version_is_higher === 1 |
|
464 | 464 | $req_type = EE_System::req_type_upgrade; |
465 | 465 | } |
466 | - delete_option( $activation_indicator_option_name ); |
|
466 | + delete_option($activation_indicator_option_name); |
|
467 | 467 | } else { |
468 | 468 | //we've seen this version before and the activation indicate doesn't show it was just activated |
469 | - if ( $version_is_higher === -1 ){ |
|
469 | + if ($version_is_higher === -1) { |
|
470 | 470 | $req_type = EE_System::req_type_downgrade; |
471 | - }elseif( $version_is_higher === 0 ){ |
|
471 | + }elseif ($version_is_higher === 0) { |
|
472 | 472 | //we've seen this version before and it's not an activation. its normal request |
473 | 473 | $req_type = EE_System::req_type_normal; |
474 | - }else{//$version_is_higher === 1 |
|
474 | + } else {//$version_is_higher === 1 |
|
475 | 475 | $req_type = EE_System::req_type_upgrade; |
476 | 476 | } |
477 | 477 | } |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | } else { |
480 | 480 | //brand new install |
481 | 481 | $req_type = EE_System::req_type_new_activation; |
482 | - delete_option( $activation_indicator_option_name ); |
|
482 | + delete_option($activation_indicator_option_name); |
|
483 | 483 | } |
484 | 484 | return $req_type; |
485 | 485 | } |
@@ -497,30 +497,30 @@ discard block |
||
497 | 497 | * 0 if $version_to_upgrade_to MATCHES (reactivation or normal request); |
498 | 498 | * 1 if $version_to_upgrade_to is HIGHER (upgrade) ; |
499 | 499 | */ |
500 | - protected static function _new_version_is_higher( $activation_history_for_addon, $version_to_upgrade_to ){ |
|
500 | + protected static function _new_version_is_higher($activation_history_for_addon, $version_to_upgrade_to) { |
|
501 | 501 | //find the most recently-activated version |
502 | 502 | $most_recently_active_version_activation = '1970-01-01 00:00:00'; |
503 | 503 | $most_recently_active_version = '0.0.0.dev.000'; |
504 | - if( is_array( $activation_history_for_addon ) ){ |
|
505 | - foreach( $activation_history_for_addon as $version => $times_activated ){ |
|
504 | + if (is_array($activation_history_for_addon)) { |
|
505 | + foreach ($activation_history_for_addon as $version => $times_activated) { |
|
506 | 506 | //check there is a record of when this version was activated. Otherwise, |
507 | 507 | //mark it as unknown |
508 | - if( ! $times_activated ){ |
|
509 | - $times_activated = array( 'unknown-date'); |
|
508 | + if ( ! $times_activated) { |
|
509 | + $times_activated = array('unknown-date'); |
|
510 | 510 | } |
511 | - if( is_string( $times_activated ) ){ |
|
512 | - $times_activated = array( $times_activated ); |
|
511 | + if (is_string($times_activated)) { |
|
512 | + $times_activated = array($times_activated); |
|
513 | 513 | } |
514 | - foreach( $times_activated as $an_activation ){ |
|
515 | - if( $an_activation != 'unknown-date' && |
|
516 | - $an_activation > $most_recently_active_version_activation ){ |
|
514 | + foreach ($times_activated as $an_activation) { |
|
515 | + if ($an_activation != 'unknown-date' && |
|
516 | + $an_activation > $most_recently_active_version_activation) { |
|
517 | 517 | $most_recently_active_version = $version; |
518 | 518 | $most_recently_active_version_activation = $an_activation == 'unknown-date' ? '1970-01-01 00:00:00' : $an_activation; |
519 | 519 | } |
520 | 520 | } |
521 | 521 | } |
522 | 522 | } |
523 | - return version_compare( $version_to_upgrade_to, $most_recently_active_version ); |
|
523 | + return version_compare($version_to_upgrade_to, $most_recently_active_version); |
|
524 | 524 | } |
525 | 525 | |
526 | 526 | |
@@ -530,20 +530,20 @@ discard block |
||
530 | 530 | * @return void |
531 | 531 | */ |
532 | 532 | public function redirect_to_about_ee() { |
533 | - $notices = EE_Error::get_notices( FALSE ); |
|
533 | + $notices = EE_Error::get_notices(FALSE); |
|
534 | 534 | //if current user is an admin and it's not an ajax request |
535 | - if(EE_Registry::instance()->CAP->current_user_can( 'manage_options', 'espresso_about_default' ) && ! ( defined('DOING_AJAX') && DOING_AJAX ) && ! isset( $notices[ 'errors' ] ) ){ |
|
536 | - $query_params = array( 'page' => 'espresso_about' ); |
|
535 | + if (EE_Registry::instance()->CAP->current_user_can('manage_options', 'espresso_about_default') && ! (defined('DOING_AJAX') && DOING_AJAX) && ! isset($notices['errors'])) { |
|
536 | + $query_params = array('page' => 'espresso_about'); |
|
537 | 537 | |
538 | - if ( EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation ) { |
|
538 | + if (EE_System::instance()->detect_req_type() == EE_System::req_type_new_activation) { |
|
539 | 539 | $query_params['new_activation'] = TRUE; |
540 | 540 | } |
541 | 541 | |
542 | - if ( EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation ) { |
|
542 | + if (EE_System::instance()->detect_req_type() == EE_System::req_type_reactivation) { |
|
543 | 543 | $query_params['reactivation'] = TRUE; |
544 | 544 | } |
545 | - $url = add_query_arg( $query_params, admin_url( 'admin.php' ) ); |
|
546 | - wp_safe_redirect( $url ); |
|
545 | + $url = add_query_arg($query_params, admin_url('admin.php')); |
|
546 | + wp_safe_redirect($url); |
|
547 | 547 | exit(); |
548 | 548 | } |
549 | 549 | } |
@@ -557,31 +557,31 @@ discard block |
||
557 | 557 | * |
558 | 558 | * @return void |
559 | 559 | */ |
560 | - public function load_core_configuration(){ |
|
561 | - do_action( 'AHEE__EE_System__load_core_configuration__begin', $this ); |
|
562 | - EE_Registry::instance()->load_core( 'EE_Load_Textdomain' ); |
|
560 | + public function load_core_configuration() { |
|
561 | + do_action('AHEE__EE_System__load_core_configuration__begin', $this); |
|
562 | + EE_Registry::instance()->load_core('EE_Load_Textdomain'); |
|
563 | 563 | //load textdomain |
564 | 564 | EE_Load_Textdomain::load_textdomain(); |
565 | 565 | // load and setup EE_Config and EE_Network_Config |
566 | - EE_Registry::instance()->load_core( 'Config' ); |
|
567 | - EE_Registry::instance()->load_core( 'Network_Config' ); |
|
566 | + EE_Registry::instance()->load_core('Config'); |
|
567 | + EE_Registry::instance()->load_core('Network_Config'); |
|
568 | 568 | // setup autoloaders |
569 | 569 | // enable logging? |
570 | - if ( EE_Registry::instance()->CFG->admin->use_full_logging ) { |
|
571 | - EE_Registry::instance()->load_core( 'Log' ); |
|
570 | + if (EE_Registry::instance()->CFG->admin->use_full_logging) { |
|
571 | + EE_Registry::instance()->load_core('Log'); |
|
572 | 572 | } |
573 | 573 | // check for activation errors |
574 | - $activation_errors = get_option( 'ee_plugin_activation_errors', FALSE ); |
|
575 | - if ( $activation_errors ) { |
|
576 | - EE_Error::add_error( $activation_errors, __FILE__, __FUNCTION__, __LINE__ ); |
|
577 | - update_option( 'ee_plugin_activation_errors', FALSE ); |
|
574 | + $activation_errors = get_option('ee_plugin_activation_errors', FALSE); |
|
575 | + if ($activation_errors) { |
|
576 | + EE_Error::add_error($activation_errors, __FILE__, __FUNCTION__, __LINE__); |
|
577 | + update_option('ee_plugin_activation_errors', FALSE); |
|
578 | 578 | } |
579 | 579 | // get model names |
580 | 580 | $this->_parse_model_names(); |
581 | 581 | |
582 | 582 | //load caf stuff a chance to play during the activation process too. |
583 | 583 | $this->_maybe_brew_regular(); |
584 | - do_action( 'AHEE__EE_System__load_core_configuration__complete', $this ); |
|
584 | + do_action('AHEE__EE_System__load_core_configuration__complete', $this); |
|
585 | 585 | } |
586 | 586 | |
587 | 587 | |
@@ -590,23 +590,23 @@ discard block |
||
590 | 590 | * |
591 | 591 | * @return void |
592 | 592 | */ |
593 | - private function _parse_model_names(){ |
|
593 | + private function _parse_model_names() { |
|
594 | 594 | //get all the files in the EE_MODELS folder that end in .model.php |
595 | - $models = glob( EE_MODELS.'*.model.php'); |
|
595 | + $models = glob(EE_MODELS.'*.model.php'); |
|
596 | 596 | $model_names = array(); |
597 | 597 | $non_abstract_db_models = array(); |
598 | - foreach( $models as $model ){ |
|
598 | + foreach ($models as $model) { |
|
599 | 599 | // get model classname |
600 | - $classname = EEH_File::get_classname_from_filepath_with_standard_filename( $model ); |
|
601 | - $shortname = str_replace( 'EEM_', '', $classname ); |
|
600 | + $classname = EEH_File::get_classname_from_filepath_with_standard_filename($model); |
|
601 | + $shortname = str_replace('EEM_', '', $classname); |
|
602 | 602 | $reflectionClass = new ReflectionClass($classname); |
603 | - if( $reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()){ |
|
603 | + if ($reflectionClass->isSubclassOf('EEM_Base') && ! $reflectionClass->isAbstract()) { |
|
604 | 604 | $non_abstract_db_models[$shortname] = $classname; |
605 | 605 | } |
606 | - $model_names[ $shortname ] = $classname; |
|
606 | + $model_names[$shortname] = $classname; |
|
607 | 607 | } |
608 | - EE_Registry::instance()->models = apply_filters( 'FHEE__EE_System__parse_model_names', $model_names ); |
|
609 | - EE_Registry::instance()->non_abstract_db_models = apply_filters( 'FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models ); |
|
608 | + EE_Registry::instance()->models = apply_filters('FHEE__EE_System__parse_model_names', $model_names); |
|
609 | + EE_Registry::instance()->non_abstract_db_models = apply_filters('FHEE__EE_System__parse_implemented_model_names', $non_abstract_db_models); |
|
610 | 610 | } |
611 | 611 | |
612 | 612 | |
@@ -616,8 +616,8 @@ discard block |
||
616 | 616 | * @return void |
617 | 617 | */ |
618 | 618 | private function _maybe_brew_regular() { |
619 | - if (( ! defined( 'EE_DECAF' ) || EE_DECAF !== TRUE ) && is_readable( EE_CAFF_PATH . 'brewing_regular.php' )) { |
|
620 | - require_once EE_CAFF_PATH . 'brewing_regular.php'; |
|
619 | + if (( ! defined('EE_DECAF') || EE_DECAF !== TRUE) && is_readable(EE_CAFF_PATH.'brewing_regular.php')) { |
|
620 | + require_once EE_CAFF_PATH.'brewing_regular.php'; |
|
621 | 621 | } |
622 | 622 | } |
623 | 623 | |
@@ -634,9 +634,9 @@ discard block |
||
634 | 634 | * @return void |
635 | 635 | */ |
636 | 636 | public function register_shortcodes_modules_and_widgets() { |
637 | - do_action( 'AHEE__EE_System__register_shortcodes_modules_and_widgets' ); |
|
637 | + do_action('AHEE__EE_System__register_shortcodes_modules_and_widgets'); |
|
638 | 638 | // check for addons using old hookpoint |
639 | - if ( has_action( 'AHEE__EE_System__register_shortcodes_modules_and_addons' )) { |
|
639 | + if (has_action('AHEE__EE_System__register_shortcodes_modules_and_addons')) { |
|
640 | 640 | $this->_incompatible_addon_error(); |
641 | 641 | } |
642 | 642 | } |
@@ -650,19 +650,19 @@ discard block |
||
650 | 650 | */ |
651 | 651 | private function _incompatible_addon_error() { |
652 | 652 | // get array of classes hooking into here |
653 | - $class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook( 'AHEE__EE_System__register_shortcodes_modules_and_addons' ); |
|
654 | - if ( ! empty( $class_names )) { |
|
655 | - $msg = __( 'The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso' ); |
|
653 | + $class_names = EEH_Class_Tools::get_class_names_for_all_callbacks_on_hook('AHEE__EE_System__register_shortcodes_modules_and_addons'); |
|
654 | + if ( ! empty($class_names)) { |
|
655 | + $msg = __('The following plugins, addons, or modules appear to be incompatible with this version of Event Espresso and were automatically deactivated to avoid fatal errors:', 'event_espresso'); |
|
656 | 656 | $msg .= '<ul>'; |
657 | - foreach ( $class_names as $class_name ) { |
|
658 | - $msg .= '<li><b>Event Espresso - ' . str_replace( array( 'EE_', 'EEM_', 'EED_', 'EES_', 'EEW_' ), '', $class_name ) . '</b></li>'; |
|
657 | + foreach ($class_names as $class_name) { |
|
658 | + $msg .= '<li><b>Event Espresso - '.str_replace(array('EE_', 'EEM_', 'EED_', 'EES_', 'EEW_'), '', $class_name).'</b></li>'; |
|
659 | 659 | } |
660 | 660 | $msg .= '</ul>'; |
661 | - $msg .= __( 'Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso' ); |
|
661 | + $msg .= __('Compatibility issues can be avoided and/or resolved by keeping addons and plugins updated to the latest version.', 'event_espresso'); |
|
662 | 662 | // save list of incompatible addons to wp-options for later use |
663 | - add_option( 'ee_incompatible_addons', $class_names, '', 'no' ); |
|
664 | - if ( is_admin() ) { |
|
665 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
663 | + add_option('ee_incompatible_addons', $class_names, '', 'no'); |
|
664 | + if (is_admin()) { |
|
665 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
666 | 666 | } |
667 | 667 | } |
668 | 668 | } |
@@ -679,25 +679,25 @@ discard block |
||
679 | 679 | * |
680 | 680 | * @return void |
681 | 681 | */ |
682 | - public function brew_espresso(){ |
|
683 | - do_action( 'AHEE__EE_System__brew_espresso__begin', $this ); |
|
682 | + public function brew_espresso() { |
|
683 | + do_action('AHEE__EE_System__brew_espresso__begin', $this); |
|
684 | 684 | // load some final core systems |
685 | - add_action( 'init', array( $this, 'set_hooks_for_core' ), 1 ); |
|
686 | - add_action( 'init', array( $this, 'perform_activations_upgrades_and_migrations' ), 3 ); |
|
687 | - add_action( 'init', array( $this, 'load_CPTs_and_session' ), 5 ); |
|
688 | - add_action( 'init', array( $this, 'load_controllers' ), 7 ); |
|
689 | - add_action( 'init', array( $this, 'core_loaded_and_ready' ), 9 ); |
|
690 | - add_action( 'init', array( $this, 'initialize' ), 10 ); |
|
691 | - add_action( 'init', array( $this, 'initialize_last' ), 100 ); |
|
692 | - add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 25 ); |
|
693 | - add_action( 'admin_bar_menu', array( $this, 'espresso_toolbar_items' ), 100 ); |
|
694 | - |
|
695 | - if ( is_admin() && apply_filters( 'FHEE__EE_System__brew_espresso__load_pue', TRUE ) ) { |
|
685 | + add_action('init', array($this, 'set_hooks_for_core'), 1); |
|
686 | + add_action('init', array($this, 'perform_activations_upgrades_and_migrations'), 3); |
|
687 | + add_action('init', array($this, 'load_CPTs_and_session'), 5); |
|
688 | + add_action('init', array($this, 'load_controllers'), 7); |
|
689 | + add_action('init', array($this, 'core_loaded_and_ready'), 9); |
|
690 | + add_action('init', array($this, 'initialize'), 10); |
|
691 | + add_action('init', array($this, 'initialize_last'), 100); |
|
692 | + add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 25); |
|
693 | + add_action('admin_bar_menu', array($this, 'espresso_toolbar_items'), 100); |
|
694 | + |
|
695 | + if (is_admin() && apply_filters('FHEE__EE_System__brew_espresso__load_pue', TRUE)) { |
|
696 | 696 | // pew pew pew |
697 | - EE_Registry::instance()->load_core( 'PUE' ); |
|
698 | - do_action( 'AHEE__EE_System__brew_espresso__after_pue_init' ); |
|
697 | + EE_Registry::instance()->load_core('PUE'); |
|
698 | + do_action('AHEE__EE_System__brew_espresso__after_pue_init'); |
|
699 | 699 | } |
700 | - do_action( 'AHEE__EE_System__brew_espresso__complete', $this ); |
|
700 | + do_action('AHEE__EE_System__brew_espresso__complete', $this); |
|
701 | 701 | } |
702 | 702 | |
703 | 703 | |
@@ -711,7 +711,7 @@ discard block |
||
711 | 711 | */ |
712 | 712 | public function set_hooks_for_core() { |
713 | 713 | $this->_deactivate_incompatible_addons(); |
714 | - do_action( 'AHEE__EE_System__set_hooks_for_core' ); |
|
714 | + do_action('AHEE__EE_System__set_hooks_for_core'); |
|
715 | 715 | } |
716 | 716 | |
717 | 717 | |
@@ -720,15 +720,15 @@ discard block |
||
720 | 720 | * Using the information gathered in EE_System::_incompatible_addon_error, |
721 | 721 | * deactivates any addons considered incompatible with the current version of EE |
722 | 722 | */ |
723 | - private function _deactivate_incompatible_addons(){ |
|
724 | - $incompatible_addons = get_option( 'ee_incompatible_addons', array() ); |
|
725 | - if ( ! empty( $incompatible_addons )) { |
|
726 | - $active_plugins = get_option( 'active_plugins', array() ); |
|
727 | - foreach ( $active_plugins as $active_plugin ) { |
|
728 | - foreach ( $incompatible_addons as $incompatible_addon ) { |
|
729 | - if ( strpos( $active_plugin, $incompatible_addon ) !== FALSE ) { |
|
730 | - unset( $_GET['activate'] ); |
|
731 | - espresso_deactivate_plugin( $active_plugin ); |
|
723 | + private function _deactivate_incompatible_addons() { |
|
724 | + $incompatible_addons = get_option('ee_incompatible_addons', array()); |
|
725 | + if ( ! empty($incompatible_addons)) { |
|
726 | + $active_plugins = get_option('active_plugins', array()); |
|
727 | + foreach ($active_plugins as $active_plugin) { |
|
728 | + foreach ($incompatible_addons as $incompatible_addon) { |
|
729 | + if (strpos($active_plugin, $incompatible_addon) !== FALSE) { |
|
730 | + unset($_GET['activate']); |
|
731 | + espresso_deactivate_plugin($active_plugin); |
|
732 | 732 | } |
733 | 733 | } |
734 | 734 | } |
@@ -745,10 +745,10 @@ discard block |
||
745 | 745 | */ |
746 | 746 | public function perform_activations_upgrades_and_migrations() { |
747 | 747 | //first check if we had previously attempted to setup EE's directories but failed |
748 | - if( EEH_Activation::upload_directories_incomplete() ) { |
|
748 | + if (EEH_Activation::upload_directories_incomplete()) { |
|
749 | 749 | EEH_Activation::create_upload_directories(); |
750 | 750 | } |
751 | - do_action( 'AHEE__EE_System__perform_activations_upgrades_and_migrations' ); |
|
751 | + do_action('AHEE__EE_System__perform_activations_upgrades_and_migrations'); |
|
752 | 752 | } |
753 | 753 | |
754 | 754 | |
@@ -760,10 +760,10 @@ discard block |
||
760 | 760 | * @return void |
761 | 761 | */ |
762 | 762 | public function load_CPTs_and_session() { |
763 | - do_action( 'AHEE__EE_System__load_CPTs_and_session__start' ); |
|
763 | + do_action('AHEE__EE_System__load_CPTs_and_session__start'); |
|
764 | 764 | // register Custom Post Types |
765 | - EE_Registry::instance()->load_core( 'Register_CPTs' ); |
|
766 | - do_action( 'AHEE__EE_System__load_CPTs_and_session__complete' ); |
|
765 | + EE_Registry::instance()->load_core('Register_CPTs'); |
|
766 | + do_action('AHEE__EE_System__load_CPTs_and_session__complete'); |
|
767 | 767 | } |
768 | 768 | |
769 | 769 | |
@@ -778,19 +778,19 @@ discard block |
||
778 | 778 | * @return void |
779 | 779 | */ |
780 | 780 | public function load_controllers() { |
781 | - do_action( 'AHEE__EE_System__load_controllers__start' ); |
|
781 | + do_action('AHEE__EE_System__load_controllers__start'); |
|
782 | 782 | // let's get it started |
783 | - if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level() ) { |
|
784 | - do_action( 'AHEE__EE_System__load_controllers__load_front_controllers' ); |
|
785 | - EE_Registry::instance()->load_core( 'Front_Controller' ); |
|
786 | - } else if ( ! EE_FRONT_AJAX ) { |
|
787 | - do_action( 'AHEE__EE_System__load_controllers__load_admin_controllers' ); |
|
788 | - EE_Registry::instance()->load_core( 'Admin' ); |
|
789 | - } else if ( EE_Maintenance_Mode::instance()->level() ) { |
|
783 | + if ( ! is_admin() && ! EE_Maintenance_Mode::instance()->level()) { |
|
784 | + do_action('AHEE__EE_System__load_controllers__load_front_controllers'); |
|
785 | + EE_Registry::instance()->load_core('Front_Controller'); |
|
786 | + } else if ( ! EE_FRONT_AJAX) { |
|
787 | + do_action('AHEE__EE_System__load_controllers__load_admin_controllers'); |
|
788 | + EE_Registry::instance()->load_core('Admin'); |
|
789 | + } else if (EE_Maintenance_Mode::instance()->level()) { |
|
790 | 790 | // still need to make sure template helper functions are loaded in M-Mode |
791 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
791 | + EE_Registry::instance()->load_helper('Template'); |
|
792 | 792 | } |
793 | - do_action( 'AHEE__EE_System__load_controllers__complete' ); |
|
793 | + do_action('AHEE__EE_System__load_controllers__complete'); |
|
794 | 794 | } |
795 | 795 | |
796 | 796 | |
@@ -804,10 +804,10 @@ discard block |
||
804 | 804 | * @return void |
805 | 805 | */ |
806 | 806 | public function core_loaded_and_ready() { |
807 | - do_action( 'AHEE__EE_System__core_loaded_and_ready' ); |
|
808 | - do_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons' ); |
|
807 | + do_action('AHEE__EE_System__core_loaded_and_ready'); |
|
808 | + do_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons'); |
|
809 | 809 | // add_action( 'wp_loaded', array( $this, 'set_hooks_for_shortcodes_modules_and_addons' ), 1 ); |
810 | - EE_Registry::instance()->load_core( 'Session' ); |
|
810 | + EE_Registry::instance()->load_core('Session'); |
|
811 | 811 | } |
812 | 812 | |
813 | 813 | |
@@ -821,7 +821,7 @@ discard block |
||
821 | 821 | * @return void |
822 | 822 | */ |
823 | 823 | public function initialize() { |
824 | - do_action( 'AHEE__EE_System__initialize' ); |
|
824 | + do_action('AHEE__EE_System__initialize'); |
|
825 | 825 | } |
826 | 826 | |
827 | 827 | |
@@ -835,7 +835,7 @@ discard block |
||
835 | 835 | * @return void |
836 | 836 | */ |
837 | 837 | public function initialize_last() { |
838 | - do_action( 'AHEE__EE_System__initialize_last' ); |
|
838 | + do_action('AHEE__EE_System__initialize_last'); |
|
839 | 839 | } |
840 | 840 | |
841 | 841 | |
@@ -867,21 +867,21 @@ discard block |
||
867 | 867 | */ |
868 | 868 | public static function do_not_cache() { |
869 | 869 | // set no cache constants |
870 | - if ( ! defined( 'DONOTCACHEPAGE' ) ) { |
|
871 | - define( 'DONOTCACHEPAGE', true ); |
|
870 | + if ( ! defined('DONOTCACHEPAGE')) { |
|
871 | + define('DONOTCACHEPAGE', true); |
|
872 | 872 | } |
873 | - if ( ! defined( 'DONOTCACHCEOBJECT' ) ) { |
|
874 | - define( 'DONOTCACHCEOBJECT', true ); |
|
873 | + if ( ! defined('DONOTCACHCEOBJECT')) { |
|
874 | + define('DONOTCACHCEOBJECT', true); |
|
875 | 875 | } |
876 | - if ( ! defined( 'DONOTCACHEDB' ) ) { |
|
877 | - define( 'DONOTCACHEDB', true ); |
|
876 | + if ( ! defined('DONOTCACHEDB')) { |
|
877 | + define('DONOTCACHEDB', true); |
|
878 | 878 | } |
879 | 879 | // add no cache headers |
880 | - add_action( 'send_headers' , array( 'EE_System', 'nocache_headers' ), 10 ); |
|
880 | + add_action('send_headers', array('EE_System', 'nocache_headers'), 10); |
|
881 | 881 | // plus a little extra for nginx and Google Chrome |
882 | - add_filter( 'nocache_headers', array( 'EE_System', 'extra_nocache_headers' ), 10, 1 ); |
|
882 | + add_filter('nocache_headers', array('EE_System', 'extra_nocache_headers'), 10, 1); |
|
883 | 883 | // prevent browsers from prefetching of the rel='next' link, because it may contain content that interferes with the registration process |
884 | - remove_action( 'wp_head', 'adjacent_posts_rel_link_wp_head' ); |
|
884 | + remove_action('wp_head', 'adjacent_posts_rel_link_wp_head'); |
|
885 | 885 | } |
886 | 886 | |
887 | 887 | |
@@ -893,7 +893,7 @@ discard block |
||
893 | 893 | * @param $headers |
894 | 894 | * @return array |
895 | 895 | */ |
896 | - public static function extra_nocache_headers ( $headers ) { |
|
896 | + public static function extra_nocache_headers($headers) { |
|
897 | 897 | // for NGINX |
898 | 898 | $headers['X-Accel-Expires'] = 0; |
899 | 899 | // plus extra for Google Chrome since it doesn't seem to respect "no-cache", but WILL respect "no-store" |
@@ -922,15 +922,15 @@ discard block |
||
922 | 922 | * @param $admin_bar |
923 | 923 | * @return void |
924 | 924 | */ |
925 | - public function espresso_toolbar_items( $admin_bar ) { |
|
925 | + public function espresso_toolbar_items($admin_bar) { |
|
926 | 926 | |
927 | 927 | // if in full M-Mode, or its an AJAX request, or user is NOT an admin |
928 | - if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined( 'DOING_AJAX' ) || ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_top_level' )) { |
|
928 | + if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance || defined('DOING_AJAX') || ! EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_top_level')) { |
|
929 | 929 | return; |
930 | 930 | } |
931 | 931 | |
932 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
933 | - EE_Registry::instance()->load_helper( 'URL' ); |
|
932 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
933 | + EE_Registry::instance()->load_helper('URL'); |
|
934 | 934 | $menu_class = 'espresso_menu_item_class'; |
935 | 935 | //we don't use the constants EVENTS_ADMIN_URL or REG_ADMIN_URL |
936 | 936 | //because they're only defined in each of their respective constructors |
@@ -942,20 +942,20 @@ discard block |
||
942 | 942 | //Top Level |
943 | 943 | $admin_bar->add_menu(array( |
944 | 944 | 'id' => 'espresso-toolbar', |
945 | - 'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">' . _x('Event Espresso', 'admin bar menu group label', 'event_espresso') . '</span>', |
|
945 | + 'title' => '<span class="ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">'._x('Event Espresso', 'admin bar menu group label', 'event_espresso').'</span>', |
|
946 | 946 | 'href' => $events_admin_url, |
947 | 947 | 'meta' => array( |
948 | 948 | 'title' => __('Event Espresso', 'event_espresso'), |
949 | - 'class' => $menu_class . 'first' |
|
949 | + 'class' => $menu_class.'first' |
|
950 | 950 | ), |
951 | 951 | )); |
952 | 952 | |
953 | 953 | //Events |
954 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events' ) ) { |
|
954 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events')) { |
|
955 | 955 | $admin_bar->add_menu(array( |
956 | 956 | 'id' => 'espresso-toolbar-events', |
957 | 957 | 'parent' => 'espresso-toolbar', |
958 | - 'title' => __( 'Events', 'event_espresso' ), |
|
958 | + 'title' => __('Events', 'event_espresso'), |
|
959 | 959 | 'href' => $events_admin_url, |
960 | 960 | 'meta' => array( |
961 | 961 | 'title' => __('Events', 'event_espresso'), |
@@ -966,13 +966,13 @@ discard block |
||
966 | 966 | } |
967 | 967 | |
968 | 968 | |
969 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new' ) ) { |
|
969 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_events', 'ee_admin_bar_menu_espresso-toolbar-events-new')) { |
|
970 | 970 | //Events Add New |
971 | 971 | $admin_bar->add_menu(array( |
972 | 972 | 'id' => 'espresso-toolbar-events-new', |
973 | 973 | 'parent' => 'espresso-toolbar-events', |
974 | 974 | 'title' => __('Add New', 'event_espresso'), |
975 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'create_new' ), $events_admin_url ), |
|
975 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'create_new'), $events_admin_url), |
|
976 | 976 | 'meta' => array( |
977 | 977 | 'title' => __('Add New', 'event_espresso'), |
978 | 978 | 'target' => '', |
@@ -981,18 +981,18 @@ discard block |
||
981 | 981 | )); |
982 | 982 | } |
983 | 983 | |
984 | - if ( is_single() && ( get_post_type() == 'espresso_events' ) ) { |
|
984 | + if (is_single() && (get_post_type() == 'espresso_events')) { |
|
985 | 985 | |
986 | 986 | //Current post |
987 | 987 | global $post; |
988 | 988 | |
989 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID ) ) { |
|
989 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'ee_admin_bar_menu_espresso-toolbar-events-edit', $post->ID)) { |
|
990 | 990 | //Events Edit Current Event |
991 | 991 | $admin_bar->add_menu(array( |
992 | 992 | 'id' => 'espresso-toolbar-events-edit', |
993 | 993 | 'parent' => 'espresso-toolbar-events', |
994 | 994 | 'title' => __('Edit Event', 'event_espresso'), |
995 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$post->ID ), $events_admin_url ), |
|
995 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$post->ID), $events_admin_url), |
|
996 | 996 | 'meta' => array( |
997 | 997 | 'title' => __('Edit Event', 'event_espresso'), |
998 | 998 | 'target' => '', |
@@ -1004,11 +1004,11 @@ discard block |
||
1004 | 1004 | } |
1005 | 1005 | |
1006 | 1006 | //Events View |
1007 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view' ) ) { |
|
1007 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-view')) { |
|
1008 | 1008 | $admin_bar->add_menu(array( |
1009 | 1009 | 'id' => 'espresso-toolbar-events-view', |
1010 | 1010 | 'parent' => 'espresso-toolbar-events', |
1011 | - 'title' => __( 'View', 'event_espresso' ), |
|
1011 | + 'title' => __('View', 'event_espresso'), |
|
1012 | 1012 | 'href' => $events_admin_url, |
1013 | 1013 | 'meta' => array( |
1014 | 1014 | 'title' => __('View', 'event_espresso'), |
@@ -1018,12 +1018,12 @@ discard block |
||
1018 | 1018 | )); |
1019 | 1019 | } |
1020 | 1020 | |
1021 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all' ) ) { |
|
1021 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-all')) { |
|
1022 | 1022 | //Events View All |
1023 | 1023 | $admin_bar->add_menu(array( |
1024 | 1024 | 'id' => 'espresso-toolbar-events-all', |
1025 | 1025 | 'parent' => 'espresso-toolbar-events-view', |
1026 | - 'title' => __( 'All', 'event_espresso' ), |
|
1026 | + 'title' => __('All', 'event_espresso'), |
|
1027 | 1027 | 'href' => $events_admin_url, |
1028 | 1028 | 'meta' => array( |
1029 | 1029 | 'title' => __('All', 'event_espresso'), |
@@ -1034,13 +1034,13 @@ discard block |
||
1034 | 1034 | } |
1035 | 1035 | |
1036 | 1036 | |
1037 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today' ) ) { |
|
1037 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-today')) { |
|
1038 | 1038 | //Events View Today |
1039 | 1039 | $admin_bar->add_menu(array( |
1040 | 1040 | 'id' => 'espresso-toolbar-events-today', |
1041 | 1041 | 'parent' => 'espresso-toolbar-events-view', |
1042 | 1042 | 'title' => __('Today', 'event_espresso'), |
1043 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $events_admin_url ), |
|
1043 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $events_admin_url), |
|
1044 | 1044 | 'meta' => array( |
1045 | 1045 | 'title' => __('Today', 'event_espresso'), |
1046 | 1046 | 'target' => '', |
@@ -1050,13 +1050,13 @@ discard block |
||
1050 | 1050 | } |
1051 | 1051 | |
1052 | 1052 | |
1053 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month' ) ) { |
|
1053 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_events', 'ee_admin_bar_menu_espresso-toolbar-events-month')) { |
|
1054 | 1054 | //Events View This Month |
1055 | 1055 | $admin_bar->add_menu(array( |
1056 | 1056 | 'id' => 'espresso-toolbar-events-month', |
1057 | 1057 | 'parent' => 'espresso-toolbar-events-view', |
1058 | - 'title' => __( 'This Month', 'event_espresso'), |
|
1059 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $events_admin_url ), |
|
1058 | + 'title' => __('This Month', 'event_espresso'), |
|
1059 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $events_admin_url), |
|
1060 | 1060 | 'meta' => array( |
1061 | 1061 | 'title' => __('This Month', 'event_espresso'), |
1062 | 1062 | 'target' => '', |
@@ -1066,11 +1066,11 @@ discard block |
||
1066 | 1066 | } |
1067 | 1067 | |
1068 | 1068 | //Registration Overview |
1069 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations' ) ) { |
|
1069 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations')) { |
|
1070 | 1070 | $admin_bar->add_menu(array( |
1071 | 1071 | 'id' => 'espresso-toolbar-registrations', |
1072 | 1072 | 'parent' => 'espresso-toolbar', |
1073 | - 'title' => __( 'Registrations', 'event_espresso' ), |
|
1073 | + 'title' => __('Registrations', 'event_espresso'), |
|
1074 | 1074 | 'href' => $reg_admin_url, |
1075 | 1075 | 'meta' => array( |
1076 | 1076 | 'title' => __('Registrations', 'event_espresso'), |
@@ -1081,12 +1081,12 @@ discard block |
||
1081 | 1081 | } |
1082 | 1082 | |
1083 | 1083 | //Registration Overview Today |
1084 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today' ) ) { |
|
1084 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today')) { |
|
1085 | 1085 | $admin_bar->add_menu(array( |
1086 | 1086 | 'id' => 'espresso-toolbar-registrations-today', |
1087 | 1087 | 'parent' => 'espresso-toolbar-registrations', |
1088 | - 'title' => __( 'Today', 'event_espresso'), |
|
1089 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today' ), $reg_admin_url ), |
|
1088 | + 'title' => __('Today', 'event_espresso'), |
|
1089 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today'), $reg_admin_url), |
|
1090 | 1090 | 'meta' => array( |
1091 | 1091 | 'title' => __('Today', 'event_espresso'), |
1092 | 1092 | 'target' => '', |
@@ -1096,14 +1096,14 @@ discard block |
||
1096 | 1096 | } |
1097 | 1097 | |
1098 | 1098 | //Registration Overview Today Completed |
1099 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved' ) ) { |
|
1099 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved')) { |
|
1100 | 1100 | $admin_bar->add_menu(array( |
1101 | 1101 | 'id' => 'espresso-toolbar-registrations-today-approved', |
1102 | 1102 | 'parent' => 'espresso-toolbar-registrations-today', |
1103 | - 'title' => __( 'Approved', 'event_espresso' ), |
|
1104 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ), |
|
1103 | + 'title' => __('Approved', 'event_espresso'), |
|
1104 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url), |
|
1105 | 1105 | 'meta' => array( |
1106 | - 'title' => __('Approved', 'event_espresso' ), |
|
1106 | + 'title' => __('Approved', 'event_espresso'), |
|
1107 | 1107 | 'target' => '', |
1108 | 1108 | 'class' => $menu_class |
1109 | 1109 | ), |
@@ -1111,14 +1111,14 @@ discard block |
||
1111 | 1111 | } |
1112 | 1112 | |
1113 | 1113 | //Registration Overview Today Pending\ |
1114 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending' ) ) { |
|
1114 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending')) { |
|
1115 | 1115 | $admin_bar->add_menu(array( |
1116 | 1116 | 'id' => 'espresso-toolbar-registrations-today-pending', |
1117 | 1117 | 'parent' => 'espresso-toolbar-registrations-today', |
1118 | - 'title' => __( 'Pending', 'event_espresso' ), |
|
1119 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ), |
|
1118 | + 'title' => __('Pending', 'event_espresso'), |
|
1119 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', 'reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url), |
|
1120 | 1120 | 'meta' => array( |
1121 | - 'title' => __('Pending Payment', 'event_espresso' ), |
|
1121 | + 'title' => __('Pending Payment', 'event_espresso'), |
|
1122 | 1122 | 'target' => '', |
1123 | 1123 | 'class' => $menu_class |
1124 | 1124 | ), |
@@ -1126,14 +1126,14 @@ discard block |
||
1126 | 1126 | } |
1127 | 1127 | |
1128 | 1128 | //Registration Overview Today Incomplete |
1129 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved' ) ) { |
|
1129 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved')) { |
|
1130 | 1130 | $admin_bar->add_menu(array( |
1131 | 1131 | 'id' => 'espresso-toolbar-registrations-today-not-approved', |
1132 | 1132 | 'parent' => 'espresso-toolbar-registrations-today', |
1133 | - 'title' => __( 'Not Approved', 'event_espresso' ), |
|
1134 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ), |
|
1133 | + 'title' => __('Not Approved', 'event_espresso'), |
|
1134 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url), |
|
1135 | 1135 | 'meta' => array( |
1136 | - 'title' => __('Not Approved', 'event_espresso' ), |
|
1136 | + 'title' => __('Not Approved', 'event_espresso'), |
|
1137 | 1137 | 'target' => '', |
1138 | 1138 | 'class' => $menu_class |
1139 | 1139 | ), |
@@ -1141,12 +1141,12 @@ discard block |
||
1141 | 1141 | } |
1142 | 1142 | |
1143 | 1143 | //Registration Overview Today Incomplete |
1144 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled' ) ) { |
|
1144 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled')) { |
|
1145 | 1145 | $admin_bar->add_menu(array( |
1146 | 1146 | 'id' => 'espresso-toolbar-registrations-today-cancelled', |
1147 | 1147 | 'parent' => 'espresso-toolbar-registrations-today', |
1148 | - 'title' => __( 'Cancelled', 'event_espresso'), |
|
1149 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ), |
|
1148 | + 'title' => __('Cancelled', 'event_espresso'), |
|
1149 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'today', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url), |
|
1150 | 1150 | 'meta' => array( |
1151 | 1151 | 'title' => __('Cancelled', 'event_espresso'), |
1152 | 1152 | 'target' => '', |
@@ -1156,12 +1156,12 @@ discard block |
||
1156 | 1156 | } |
1157 | 1157 | |
1158 | 1158 | //Registration Overview This Month |
1159 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month' ) ) { |
|
1159 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month')) { |
|
1160 | 1160 | $admin_bar->add_menu(array( |
1161 | 1161 | 'id' => 'espresso-toolbar-registrations-month', |
1162 | 1162 | 'parent' => 'espresso-toolbar-registrations', |
1163 | - 'title' => __( 'This Month', 'event_espresso' ), |
|
1164 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month' ), $reg_admin_url ), |
|
1163 | + 'title' => __('This Month', 'event_espresso'), |
|
1164 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month'), $reg_admin_url), |
|
1165 | 1165 | 'meta' => array( |
1166 | 1166 | 'title' => __('This Month', 'event_espresso'), |
1167 | 1167 | 'target' => '', |
@@ -1171,12 +1171,12 @@ discard block |
||
1171 | 1171 | } |
1172 | 1172 | |
1173 | 1173 | //Registration Overview This Month Approved |
1174 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved' ) ) { |
|
1174 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved')) { |
|
1175 | 1175 | $admin_bar->add_menu(array( |
1176 | 1176 | 'id' => 'espresso-toolbar-registrations-month-approved', |
1177 | 1177 | 'parent' => 'espresso-toolbar-registrations-month', |
1178 | - 'title' => __( 'Approved', 'event_espresso' ), |
|
1179 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved ), $reg_admin_url ), |
|
1178 | + 'title' => __('Approved', 'event_espresso'), |
|
1179 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_approved), $reg_admin_url), |
|
1180 | 1180 | 'meta' => array( |
1181 | 1181 | 'title' => __('Approved', 'event_espresso'), |
1182 | 1182 | 'target' => '', |
@@ -1186,12 +1186,12 @@ discard block |
||
1186 | 1186 | } |
1187 | 1187 | |
1188 | 1188 | //Registration Overview This Month Pending |
1189 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending' ) ) { |
|
1189 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending')) { |
|
1190 | 1190 | $admin_bar->add_menu(array( |
1191 | 1191 | 'id' => 'espresso-toolbar-registrations-month-pending', |
1192 | 1192 | 'parent' => 'espresso-toolbar-registrations-month', |
1193 | - 'title' => __( 'Pending', 'event_espresso'), |
|
1194 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment ), $reg_admin_url ), |
|
1193 | + 'title' => __('Pending', 'event_espresso'), |
|
1194 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_pending_payment), $reg_admin_url), |
|
1195 | 1195 | 'meta' => array( |
1196 | 1196 | 'title' => __('Pending', 'event_espresso'), |
1197 | 1197 | 'target' => '', |
@@ -1201,14 +1201,14 @@ discard block |
||
1201 | 1201 | } |
1202 | 1202 | |
1203 | 1203 | //Registration Overview This Month Not Approved |
1204 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved' ) ) { |
|
1204 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved')) { |
|
1205 | 1205 | $admin_bar->add_menu(array( |
1206 | 1206 | 'id' => 'espresso-toolbar-registrations-month-not-approved', |
1207 | 1207 | 'parent' => 'espresso-toolbar-registrations-month', |
1208 | - 'title' => __( 'Not Approved', 'event_espresso'), |
|
1209 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved ), $reg_admin_url ), |
|
1208 | + 'title' => __('Not Approved', 'event_espresso'), |
|
1209 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_not_approved), $reg_admin_url), |
|
1210 | 1210 | 'meta' => array( |
1211 | - 'title' => __('Not Approved', 'event_espresso' ), |
|
1211 | + 'title' => __('Not Approved', 'event_espresso'), |
|
1212 | 1212 | 'target' => '', |
1213 | 1213 | 'class' => $menu_class |
1214 | 1214 | ), |
@@ -1217,12 +1217,12 @@ discard block |
||
1217 | 1217 | |
1218 | 1218 | |
1219 | 1219 | //Registration Overview This Month Cancelled |
1220 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled' ) ) { |
|
1220 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registrations', 'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled')) { |
|
1221 | 1221 | $admin_bar->add_menu(array( |
1222 | 1222 | 'id' => 'espresso-toolbar-registrations-month-cancelled', |
1223 | 1223 | 'parent' => 'espresso-toolbar-registrations-month', |
1224 | 1224 | 'title' => __('Cancelled', 'event_espresso'), |
1225 | - 'href' => EEH_URL::add_query_args_and_nonce( array( 'action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled ), $reg_admin_url ), |
|
1225 | + 'href' => EEH_URL::add_query_args_and_nonce(array('action'=>'default', 'status'=>'month', '_reg_status'=>EEM_Registration::status_id_cancelled), $reg_admin_url), |
|
1226 | 1226 | 'meta' => array( |
1227 | 1227 | 'title' => __('Cancelled', 'event_espresso'), |
1228 | 1228 | 'target' => '', |
@@ -1232,11 +1232,11 @@ discard block |
||
1232 | 1232 | } |
1233 | 1233 | |
1234 | 1234 | //Extensions & Services |
1235 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'ee_admin_bar_menu_espresso-toolbar-extensions-and-services' ) ) { |
|
1235 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'ee_admin_bar_menu_espresso-toolbar-extensions-and-services')) { |
|
1236 | 1236 | $admin_bar->add_menu(array( |
1237 | 1237 | 'id' => 'espresso-toolbar-extensions-and-services', |
1238 | 1238 | 'parent' => 'espresso-toolbar', |
1239 | - 'title' => __( 'Extensions & Services', 'event_espresso' ), |
|
1239 | + 'title' => __('Extensions & Services', 'event_espresso'), |
|
1240 | 1240 | 'href' => $extensions_admin_url, |
1241 | 1241 | 'meta' => array( |
1242 | 1242 | 'title' => __('Extensions & Services', 'event_espresso'), |
@@ -1258,8 +1258,8 @@ discard block |
||
1258 | 1258 | * @param array $exclude_array any existing pages being excluded are in this array. |
1259 | 1259 | * @return array |
1260 | 1260 | */ |
1261 | - public function remove_pages_from_wp_list_pages( $exclude_array ) { |
|
1262 | - return array_merge( $exclude_array, EE_Registry::instance()->CFG->core->get_critical_pages_array() ); |
|
1261 | + public function remove_pages_from_wp_list_pages($exclude_array) { |
|
1262 | + return array_merge($exclude_array, EE_Registry::instance()->CFG->core->get_critical_pages_array()); |
|
1263 | 1263 | } |
1264 | 1264 | |
1265 | 1265 | |
@@ -1279,11 +1279,11 @@ discard block |
||
1279 | 1279 | */ |
1280 | 1280 | public function wp_enqueue_scripts() { |
1281 | 1281 | // unlike other systems, EE_System_scripts loading is turned ON by default, but prior to the init hook, can be turned off via: add_filter( 'FHEE_load_EE_System_scripts', '__return_false' ); |
1282 | - if ( apply_filters( 'FHEE_load_EE_System_scripts', TRUE ) ) { |
|
1282 | + if (apply_filters('FHEE_load_EE_System_scripts', TRUE)) { |
|
1283 | 1283 | // jquery_validate loading is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via: add_filter( 'FHEE_load_jquery_validate', '__return_true' ); |
1284 | - if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) { |
|
1284 | + if (apply_filters('FHEE_load_jquery_validate', FALSE)) { |
|
1285 | 1285 | // register jQuery Validate |
1286 | - wp_register_script( 'jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE ); |
|
1286 | + wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE); |
|
1287 | 1287 | } |
1288 | 1288 | } |
1289 | 1289 | } |
@@ -1,28 +1,28 @@ discard block |
||
1 | 1 | <?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
2 | 2 | do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' ); |
3 | 3 | /** |
4 | - * |
|
5 | - * Event Espresso |
|
6 | - * |
|
7 | - * Event Registration and Management Plugin for WordPress |
|
8 | - * |
|
9 | - * @ package Event Espresso |
|
10 | - * @ author Seth Shoultes |
|
11 | - * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
12 | - * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
13 | - * @ link http://www.eventespresso.com |
|
14 | - * @ version 4.0 |
|
15 | - * |
|
16 | - * ------------------------------------------------------------------------ |
|
17 | - * |
|
18 | - * EE_Base_Class class |
|
19 | - * |
|
20 | - * @package Event Espresso |
|
21 | - * @subpackage includes/classes/EE_Base_Class.class.php |
|
22 | - * @author Michael Nelson |
|
23 | - * |
|
24 | - * ------------------------------------------------------------------------ |
|
25 | - */ |
|
4 | + * |
|
5 | + * Event Espresso |
|
6 | + * |
|
7 | + * Event Registration and Management Plugin for WordPress |
|
8 | + * |
|
9 | + * @ package Event Espresso |
|
10 | + * @ author Seth Shoultes |
|
11 | + * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
12 | + * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * |
|
13 | + * @ link http://www.eventespresso.com |
|
14 | + * @ version 4.0 |
|
15 | + * |
|
16 | + * ------------------------------------------------------------------------ |
|
17 | + * |
|
18 | + * EE_Base_Class class |
|
19 | + * |
|
20 | + * @package Event Espresso |
|
21 | + * @subpackage includes/classes/EE_Base_Class.class.php |
|
22 | + * @author Michael Nelson |
|
23 | + * |
|
24 | + * ------------------------------------------------------------------------ |
|
25 | + */ |
|
26 | 26 | |
27 | 27 | abstract class EE_Base_Class{ |
28 | 28 | |
@@ -47,25 +47,25 @@ discard block |
||
47 | 47 | |
48 | 48 | |
49 | 49 | /** |
50 | - * date format |
|
51 | - * |
|
52 | - * pattern or format for displaying dates |
|
53 | - * |
|
54 | - * @access protected |
|
55 | - * @var string |
|
56 | - */ |
|
50 | + * date format |
|
51 | + * |
|
52 | + * pattern or format for displaying dates |
|
53 | + * |
|
54 | + * @access protected |
|
55 | + * @var string |
|
56 | + */ |
|
57 | 57 | protected $_dt_frmt; |
58 | 58 | |
59 | 59 | |
60 | 60 | |
61 | - /** |
|
62 | - * time format |
|
63 | - * |
|
64 | - * pattern or format for displaying time |
|
65 | - * |
|
66 | - * @access protected |
|
67 | - * @var string |
|
68 | - */ |
|
61 | + /** |
|
62 | + * time format |
|
63 | + * |
|
64 | + * pattern or format for displaying time |
|
65 | + * |
|
66 | + * @access protected |
|
67 | + * @var string |
|
68 | + */ |
|
69 | 69 | protected $_tm_frmt; |
70 | 70 | |
71 | 71 | |
@@ -205,12 +205,12 @@ discard block |
||
205 | 205 | |
206 | 206 | |
207 | 207 | /** |
208 | - * Gets the field's original value when this object was constructed during this request. |
|
209 | - * This can be helpful when determining if a model object has changed or not |
|
210 | - * |
|
211 | - * @param string $field_name |
|
212 | - * @return mixed|null |
|
213 | - */ |
|
208 | + * Gets the field's original value when this object was constructed during this request. |
|
209 | + * This can be helpful when determining if a model object has changed or not |
|
210 | + * |
|
211 | + * @param string $field_name |
|
212 | + * @return mixed|null |
|
213 | + */ |
|
214 | 214 | public function get_original( $field_name ){ |
215 | 215 | if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) && |
216 | 216 | $field_settings = $this->get_Model()->field_settings_for( $field_name )){ |
@@ -1310,28 +1310,28 @@ discard block |
||
1310 | 1310 | return $result ? true : false; |
1311 | 1311 | } |
1312 | 1312 | |
1313 | - /** |
|
1314 | - * When this model object is deleted, it may still be cached on related model objects. This clears the cache of |
|
1315 | - * related model objects |
|
1316 | - */ |
|
1317 | - public function refresh_cache_of_related_objects() { |
|
1318 | - foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) { |
|
1319 | - if( ! empty( $this->_model_relations[ $relation_name ] ) ) { |
|
1320 | - $related_objects = $this->_model_relations[ $relation_name ]; |
|
1321 | - if( $relation_obj instanceof EE_Belongs_To_Relation ) { |
|
1322 | - //this relation only stores a single model object, not an array |
|
1323 | - //but let's make it consistent |
|
1324 | - $related_objects = array( $related_objects ); |
|
1325 | - } |
|
1326 | - foreach( $related_objects as $related_object ) { |
|
1327 | - //only refresh their cache if they're in memory |
|
1328 | - if( $related_object instanceof EE_Base_Class ) { |
|
1313 | + /** |
|
1314 | + * When this model object is deleted, it may still be cached on related model objects. This clears the cache of |
|
1315 | + * related model objects |
|
1316 | + */ |
|
1317 | + public function refresh_cache_of_related_objects() { |
|
1318 | + foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) { |
|
1319 | + if( ! empty( $this->_model_relations[ $relation_name ] ) ) { |
|
1320 | + $related_objects = $this->_model_relations[ $relation_name ]; |
|
1321 | + if( $relation_obj instanceof EE_Belongs_To_Relation ) { |
|
1322 | + //this relation only stores a single model object, not an array |
|
1323 | + //but let's make it consistent |
|
1324 | + $related_objects = array( $related_objects ); |
|
1325 | + } |
|
1326 | + foreach( $related_objects as $related_object ) { |
|
1327 | + //only refresh their cache if they're in memory |
|
1328 | + if( $related_object instanceof EE_Base_Class ) { |
|
1329 | 1329 | $related_object->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
1330 | - } |
|
1331 | - } |
|
1332 | - } |
|
1333 | - } |
|
1334 | - } |
|
1330 | + } |
|
1331 | + } |
|
1332 | + } |
|
1333 | + } |
|
1334 | + } |
|
1335 | 1335 | |
1336 | 1336 | |
1337 | 1337 | |
@@ -1681,9 +1681,9 @@ discard block |
||
1681 | 1681 | $otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values ); |
1682 | 1682 | //clear cache so future get_many_related and get_first_related() return new results. |
1683 | 1683 | $this->clear_cache( $relationName, $otherObject, TRUE ); |
1684 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1685 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1686 | - } |
|
1684 | + if( $otherObject instanceof EE_Base_Class ) { |
|
1685 | + $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1686 | + } |
|
1687 | 1687 | } else { |
1688 | 1688 | //this thing doesn't exist in the DB, so just cache it |
1689 | 1689 | if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){ |
@@ -1697,18 +1697,18 @@ discard block |
||
1697 | 1697 | } |
1698 | 1698 | $this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id ); |
1699 | 1699 | } |
1700 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1701 | - //fix the reciprocal relation too |
|
1702 | - if( $otherObject->ID() ) { |
|
1703 | - //its saved so assumed relations exist in the DB, so we can just |
|
1704 | - //clear the cache so future queries use the updated info in the DB |
|
1705 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true ); |
|
1706 | - } else { |
|
1707 | - |
|
1708 | - //it's not saved, so it caches relations like this |
|
1709 | - $otherObject->cache( $this->get_model()->get_this_model_name(), $this ); |
|
1710 | - } |
|
1711 | - } |
|
1700 | + if( $otherObject instanceof EE_Base_Class ) { |
|
1701 | + //fix the reciprocal relation too |
|
1702 | + if( $otherObject->ID() ) { |
|
1703 | + //its saved so assumed relations exist in the DB, so we can just |
|
1704 | + //clear the cache so future queries use the updated info in the DB |
|
1705 | + $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true ); |
|
1706 | + } else { |
|
1707 | + |
|
1708 | + //it's not saved, so it caches relations like this |
|
1709 | + $otherObject->cache( $this->get_model()->get_this_model_name(), $this ); |
|
1710 | + } |
|
1711 | + } |
|
1712 | 1712 | return $otherObject; |
1713 | 1713 | } |
1714 | 1714 | |
@@ -1738,9 +1738,9 @@ discard block |
||
1738 | 1738 | //this doesn't exist in the DB, just remove it from the cache |
1739 | 1739 | $otherObject = $this->clear_cache( $relationName, $otherObjectModelObjectOrID ); |
1740 | 1740 | } |
1741 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1742 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1743 | - } |
|
1741 | + if( $otherObject instanceof EE_Base_Class ) { |
|
1742 | + $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1743 | + } |
|
1744 | 1744 | return $otherObject; |
1745 | 1745 | } |
1746 | 1746 | |
@@ -1759,11 +1759,11 @@ discard block |
||
1759 | 1759 | //this doesn't exist in the DB, just remove it from the cache |
1760 | 1760 | $otherObjects = $this->clear_cache( $relationName, null, true ); |
1761 | 1761 | } |
1762 | - if( is_array( $otherObjects ) ) { |
|
1763 | - foreach ( $otherObjects as $otherObject ) { |
|
1764 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1765 | - } |
|
1766 | - } |
|
1762 | + if( is_array( $otherObjects ) ) { |
|
1763 | + foreach ( $otherObjects as $otherObject ) { |
|
1764 | + $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1765 | + } |
|
1766 | + } |
|
1767 | 1767 | return $otherObjects; |
1768 | 1768 | } |
1769 | 1769 |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | * @access protected |
513 | 513 | * @param string $fieldname the property item the corresponding value is for. |
514 | 514 | * @param mixed $value The value we are caching. |
515 | - * @param null $cache_type |
|
515 | + * @param string $cache_type |
|
516 | 516 | * @return void |
517 | 517 | */ |
518 | 518 | protected function _set_cached_property( $fieldname, $value, $cache_type = NULL ) { |
@@ -825,7 +825,7 @@ discard block |
||
825 | 825 | * |
826 | 826 | * @param null $field_to_order_by What field is being used as the reference point. |
827 | 827 | * @param array $query_params Any additional conditions on the query. |
828 | - * @param null $columns_to_select If left null, then an array of EE_Base_Class objects is returned, otherwise |
|
828 | + * @param string $columns_to_select If left null, then an array of EE_Base_Class objects is returned, otherwise |
|
829 | 829 | * you can indicate just the columns you want returned |
830 | 830 | * |
831 | 831 | * @return array|EE_Base_Class |
@@ -850,7 +850,7 @@ discard block |
||
850 | 850 | * |
851 | 851 | * @param null $field_to_order_by What field is being used as the reference point. |
852 | 852 | * @param array $query_params Any additional conditions on the query. |
853 | - * @param null $columns_to_select If left null, then an EE_Base_Class object is returned, otherwise |
|
853 | + * @param string $columns_to_select If left null, then an EE_Base_Class object is returned, otherwise |
|
854 | 854 | * you can indicate just the column you want returned |
855 | 855 | * |
856 | 856 | * @return array|EE_Base_Class |
@@ -913,7 +913,7 @@ discard block |
||
913 | 913 | /** |
914 | 914 | * This method simply returns the RAW unprocessed value for the given property in this class |
915 | 915 | * @param string $field_name A valid fieldname |
916 | - * @return mixed Whatever the raw value stored on the property is. |
|
916 | + * @return integer|null Whatever the raw value stored on the property is. |
|
917 | 917 | * @throws EE_Error if fieldSettings is misconfigured or the field doesn't exist. |
918 | 918 | */ |
919 | 919 | public function get_raw($field_name) { |
@@ -987,11 +987,11 @@ discard block |
||
987 | 987 | * |
988 | 988 | * @access protected |
989 | 989 | * @param string $field_name Field on the instantiated EE_Base_Class child object |
990 | - * @param null $dt_frmt valid datetime format used for date (if '' then we just use the default on the field, if NULL we use the last-used format) |
|
991 | - * @param null $tm_frmt Same as above except this is for time format |
|
990 | + * @param string|null $dt_frmt valid datetime format used for date (if '' then we just use the default on the field, if NULL we use the last-used format) |
|
991 | + * @param null|string $tm_frmt Same as above except this is for time format |
|
992 | 992 | * @param string $date_or_time if NULL then both are returned, otherwise "D" = only date and "T" = only time. |
993 | 993 | * @param boolean $echo Whether the dtt is echoing using pretty echoing or just returned using vanilla get |
994 | - * @return void | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing |
|
994 | + * @return string|boolean | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing |
|
995 | 995 | */ |
996 | 996 | protected function _get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE ) { |
997 | 997 | |
@@ -1164,7 +1164,7 @@ discard block |
||
1164 | 1164 | * sets the time on a datetime property |
1165 | 1165 | * |
1166 | 1166 | * @access protected |
1167 | - * @param string|Datetime $time a valid time string for php datetime functions (or DateTime object) |
|
1167 | + * @param string $time a valid time string for php datetime functions (or DateTime object) |
|
1168 | 1168 | * @param string $fieldname the name of the field the time is being set on (must match a EE_Datetime_Field) |
1169 | 1169 | */ |
1170 | 1170 | protected function _set_time_for( $time, $fieldname ) { |
@@ -1179,7 +1179,7 @@ discard block |
||
1179 | 1179 | * sets the date on a datetime property |
1180 | 1180 | * |
1181 | 1181 | * @access protected |
1182 | - * @param string|DateTime $date a valid date string for php datetime functions ( or DateTime object) |
|
1182 | + * @param string $date a valid date string for php datetime functions ( or DateTime object) |
|
1183 | 1183 | * @param string $fieldname the name of the field the date is being set on (must match a EE_Datetime_Field) |
1184 | 1184 | */ |
1185 | 1185 | protected function _set_date_for( $date, $fieldname ) { |
@@ -1233,6 +1233,7 @@ discard block |
||
1233 | 1233 | * @param mixed (array|string) $args This is the arguments that will be passed to the callback. |
1234 | 1234 | * @param string $prepend You can include something to prepend on the timestamp |
1235 | 1235 | * @param string $append You can include something to append on the timestamp |
1236 | + * @param string $args |
|
1236 | 1237 | * @throws EE_Error |
1237 | 1238 | * @return string timestamp |
1238 | 1239 | */ |
@@ -1266,7 +1267,7 @@ discard block |
||
1266 | 1267 | * This calls the `EE_Base_Class::_delete` method. Child classes wishing to change default behaviour should override |
1267 | 1268 | * `EE_Base_Class::_delete` NOT this class. |
1268 | 1269 | * |
1269 | - * @return boolean | int |
|
1270 | + * @return integer | int |
|
1270 | 1271 | */ |
1271 | 1272 | public function delete(){ |
1272 | 1273 | /** |
@@ -1297,7 +1298,7 @@ discard block |
||
1297 | 1298 | * This method is called by the public `EE_Base_Class::delete` method. Any child classes desiring to override default |
1298 | 1299 | * functionality for "delete" (which is to call `permanently_delete`) should override this method NOT `EE_Base_Class::delete` |
1299 | 1300 | * |
1300 | - * @return bool|int |
|
1301 | + * @return boolean |
|
1301 | 1302 | */ |
1302 | 1303 | protected function _delete() { |
1303 | 1304 | $result = $this->delete_permanently(); |
@@ -1537,7 +1538,7 @@ discard block |
||
1537 | 1538 | |
1538 | 1539 | /** |
1539 | 1540 | * for getting a model while instantiated. |
1540 | - * @return \EEM_Base | \EEM_CPT_Base |
|
1541 | + * @return boolean | \EEM_CPT_Base |
|
1541 | 1542 | */ |
1542 | 1543 | public function get_model() { |
1543 | 1544 | $modelName = self::_get_model_classname( get_class($this) ); |
@@ -1568,7 +1569,7 @@ discard block |
||
1568 | 1569 | * If there is a key in the incoming array that matches the primary key for the model AND it is not null, then we check the db. If there's a an object we return it. If not we return false. |
1569 | 1570 | * @param array $props_n_values incoming array of properties and their values |
1570 | 1571 | * @param string $classname the classname of the child class |
1571 | - * @param null $timezone |
|
1572 | + * @param string|null $timezone |
|
1572 | 1573 | * @param array $date_formats incoming date_formats in an array where the first value is the |
1573 | 1574 | * date_format and the second value is the time format |
1574 | 1575 | * @return mixed (EE_Base_Class|bool) |
@@ -1617,7 +1618,7 @@ discard block |
||
1617 | 1618 | * @param $classname |
1618 | 1619 | * @param null $timezone |
1619 | 1620 | * @throws EE_Error |
1620 | - * @return EEM_Base |
|
1621 | + * @return boolean |
|
1621 | 1622 | */ |
1622 | 1623 | protected static function _get_model( $classname, $timezone = NULL ){ |
1623 | 1624 | //find model for this class |
@@ -1633,8 +1634,8 @@ discard block |
||
1633 | 1634 | /** |
1634 | 1635 | * Gets the model instance (eg instance of EEM_Attendee) given its classname (eg EE_Attendee) |
1635 | 1636 | * @param string $model_classname |
1636 | - * @param null $timezone |
|
1637 | - * @return EEM_Base |
|
1637 | + * @param string|null $timezone |
|
1638 | + * @return boolean |
|
1638 | 1639 | */ |
1639 | 1640 | protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){ |
1640 | 1641 | $model_classname = str_replace( 'EEM_', '', $model_classname ); |
@@ -1,5 +1,5 @@ discard block |
||
1 | -<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
2 | -do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' ); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
2 | +do_action('AHEE_log', __FILE__, ' FILE LOADED', ''); |
|
3 | 3 | /** |
4 | 4 | * |
5 | 5 | * Event Espresso |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * ------------------------------------------------------------------------ |
25 | 25 | */ |
26 | 26 | |
27 | -abstract class EE_Base_Class{ |
|
27 | +abstract class EE_Base_Class { |
|
28 | 28 | |
29 | 29 | /** |
30 | 30 | * This is an array of the original properties and values provided during construction |
@@ -117,60 +117,60 @@ discard block |
||
117 | 117 | * @throws EE_Error |
118 | 118 | * @return \EE_Base_Class |
119 | 119 | */ |
120 | - protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array() ){ |
|
120 | + protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array()) { |
|
121 | 121 | |
122 | - $className=get_class($this); |
|
122 | + $className = get_class($this); |
|
123 | 123 | |
124 | - do_action("AHEE__{$className}__construct",$this,$fieldValues); |
|
125 | - $model=$this->get_model(); |
|
126 | - $model_fields = $model->field_settings( FALSE ); |
|
124 | + do_action("AHEE__{$className}__construct", $this, $fieldValues); |
|
125 | + $model = $this->get_model(); |
|
126 | + $model_fields = $model->field_settings(FALSE); |
|
127 | 127 | // ensure $fieldValues is an array |
128 | - $fieldValues = is_array( $fieldValues ) ? $fieldValues : array( $fieldValues ); |
|
128 | + $fieldValues = is_array($fieldValues) ? $fieldValues : array($fieldValues); |
|
129 | 129 | // EEH_Debug_Tools::printr( $fieldValues, '$fieldValues <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
130 | 130 | // verify client code has not passed any invalid field names |
131 | - foreach($fieldValues as $field_name=> $field_value){ |
|
132 | - if( ! isset( $model_fields[ $field_name] ) ){ |
|
133 | - throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"),$field_name,get_class($this),implode(", ",array_keys($model_fields)))); |
|
131 | + foreach ($fieldValues as $field_name=> $field_value) { |
|
132 | + if ( ! isset($model_fields[$field_name])) { |
|
133 | + throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"), $field_name, get_class($this), implode(", ", array_keys($model_fields)))); |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 | // EEH_Debug_Tools::printr( $model_fields, '$model_fields <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
137 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
138 | - $this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone ); |
|
137 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
138 | + $this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone); |
|
139 | 139 | |
140 | - if ( ! empty( $date_formats ) && is_array( $date_formats ) ) { |
|
140 | + if ( ! empty($date_formats) && is_array($date_formats)) { |
|
141 | 141 | $this->_dt_frmt = $date_formats[0]; |
142 | 142 | $this->_tm_frmt = $date_formats[1]; |
143 | 143 | } else { |
144 | 144 | //set default formats for date and time |
145 | - $this->_dt_frmt = get_option( 'date_format' ); |
|
146 | - $this->_tm_frmt = get_option( 'time_format' ); |
|
145 | + $this->_dt_frmt = get_option('date_format'); |
|
146 | + $this->_tm_frmt = get_option('time_format'); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | //if db model is instantiating |
150 | - if ( $bydb ){ |
|
150 | + if ($bydb) { |
|
151 | 151 | //client code has indicated these field values are from the database |
152 | - foreach( $model_fields as $fieldName => $field ){ |
|
153 | - $this->set_from_db( $fieldName, isset( $fieldValues[ $fieldName] ) ? $fieldValues[ $fieldName ] : null ); |
|
152 | + foreach ($model_fields as $fieldName => $field) { |
|
153 | + $this->set_from_db($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null); |
|
154 | 154 | } |
155 | 155 | } else { |
156 | 156 | //we're constructing a brand |
157 | 157 | //new instance of the model object. Generally, this means we'll need to do more field validation |
158 | - foreach( $model_fields as $fieldName => $field ){ |
|
159 | - $this->set( $fieldName, isset( $fieldValues[ $fieldName ] ) ? $fieldValues[ $fieldName ] : null, true ); |
|
158 | + foreach ($model_fields as $fieldName => $field) { |
|
159 | + $this->set($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null, true); |
|
160 | 160 | } |
161 | 161 | } |
162 | 162 | |
163 | 163 | //remember what values were passed to this constructor |
164 | 164 | $this->_props_n_values_provided_in_constructor = $fieldValues; |
165 | 165 | //remember in entity mapper |
166 | - if($model->has_primary_key_field() && $this->ID() && ! $bydb ){ |
|
166 | + if ($model->has_primary_key_field() && $this->ID() && ! $bydb) { |
|
167 | 167 | $model->add_to_entity_map($this); |
168 | 168 | } |
169 | 169 | //setup all the relations |
170 | - foreach($this->get_model()->relation_settings() as $relation_name=>$relation_obj){ |
|
171 | - if($relation_obj instanceof EE_Belongs_To_Relation){ |
|
170 | + foreach ($this->get_model()->relation_settings() as $relation_name=>$relation_obj) { |
|
171 | + if ($relation_obj instanceof EE_Belongs_To_Relation) { |
|
172 | 172 | $this->_model_relations[$relation_name] = NULL; |
173 | - }else{ |
|
173 | + } else { |
|
174 | 174 | $this->_model_relations[$relation_name] = array(); |
175 | 175 | } |
176 | 176 | } |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | * Action done at the end of each model object construction |
179 | 179 | * @param EE_Base_Class $this the model object just created |
180 | 180 | */ |
181 | - do_action( 'AHEE__EE_Base_Class__construct__finished', $this ); |
|
181 | + do_action('AHEE__EE_Base_Class__construct__finished', $this); |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | /** |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | * @param boolean $allow_persist |
199 | 199 | * @return boolean |
200 | 200 | */ |
201 | - function set_allow_persist( $allow_persist ) { |
|
201 | + function set_allow_persist($allow_persist) { |
|
202 | 202 | return $this->_allow_persist = $allow_persist; |
203 | 203 | } |
204 | 204 | |
@@ -211,11 +211,11 @@ discard block |
||
211 | 211 | * @param string $field_name |
212 | 212 | * @return mixed|null |
213 | 213 | */ |
214 | - public function get_original( $field_name ){ |
|
215 | - if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) && |
|
216 | - $field_settings = $this->get_Model()->field_settings_for( $field_name )){ |
|
217 | - return $field_settings->prepare_for_get( $this->_props_n_values_provided_in_constructor[ $field_name ] ); |
|
218 | - }else{ |
|
214 | + public function get_original($field_name) { |
|
215 | + if (isset($this->_props_n_values_provided_in_constructor[$field_name]) && |
|
216 | + $field_settings = $this->get_Model()->field_settings_for($field_name)) { |
|
217 | + return $field_settings->prepare_for_get($this->_props_n_values_provided_in_constructor[$field_name]); |
|
218 | + } else { |
|
219 | 219 | return NULL; |
220 | 220 | } |
221 | 221 | } |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | * @param EE_Base_Class $obj |
226 | 226 | * @return string |
227 | 227 | */ |
228 | - public function get_class($obj){ |
|
228 | + public function get_class($obj) { |
|
229 | 229 | return get_class($obj); |
230 | 230 | } |
231 | 231 | |
@@ -238,19 +238,19 @@ discard block |
||
238 | 238 | * @param mixed $field_value |
239 | 239 | * @param bool $use_default |
240 | 240 | */ |
241 | - public function set( $field_name, $field_value, $use_default = FALSE ){ |
|
242 | - $field_obj = $this->get_model()->field_settings_for( $field_name ); |
|
243 | - if ( $field_obj instanceof EE_Model_Field_Base ) { |
|
241 | + public function set($field_name, $field_value, $use_default = FALSE) { |
|
242 | + $field_obj = $this->get_model()->field_settings_for($field_name); |
|
243 | + if ($field_obj instanceof EE_Model_Field_Base) { |
|
244 | 244 | // if ( method_exists( $field_obj, 'set_timezone' )) { |
245 | - if ( $field_obj instanceof EE_Datetime_Field ) { |
|
246 | - $field_obj->set_timezone( $this->_timezone ); |
|
247 | - $field_obj->set_date_format( $this->_dt_frmt ); |
|
248 | - $field_obj->set_time_format( $this->_tm_frmt ); |
|
245 | + if ($field_obj instanceof EE_Datetime_Field) { |
|
246 | + $field_obj->set_timezone($this->_timezone); |
|
247 | + $field_obj->set_date_format($this->_dt_frmt); |
|
248 | + $field_obj->set_time_format($this->_tm_frmt); |
|
249 | 249 | } |
250 | 250 | |
251 | 251 | $holder_of_value = $field_obj->prepare_for_set($field_value); |
252 | 252 | //should the value be null? |
253 | - if( ($field_value === NULL || $holder_of_value === NULL || $holder_of_value ==='') && $use_default){ |
|
253 | + if (($field_value === NULL || $holder_of_value === NULL || $holder_of_value === '') && $use_default) { |
|
254 | 254 | $this->_fields[$field_name] = $field_obj->get_default_value(); |
255 | 255 | |
256 | 256 | /** |
@@ -260,19 +260,19 @@ discard block |
||
260 | 260 | * object. |
261 | 261 | * @since 4.6.10+ |
262 | 262 | */ |
263 | - if ( $field_obj instanceof EE_Datetime_Field && ! is_null( $this->_fields[$field_name] ) && ! $this->_fields[$field_name] instanceof DateTime ) { |
|
264 | - empty( $this->_fields[$field_name] ) ? $this->set( $field_name, time() ) : $this->set( $field_name, $this->_fields[$field_name] ); |
|
263 | + if ($field_obj instanceof EE_Datetime_Field && ! is_null($this->_fields[$field_name]) && ! $this->_fields[$field_name] instanceof DateTime) { |
|
264 | + empty($this->_fields[$field_name]) ? $this->set($field_name, time()) : $this->set($field_name, $this->_fields[$field_name]); |
|
265 | 265 | } |
266 | 266 | |
267 | - }else{ |
|
267 | + } else { |
|
268 | 268 | $this->_fields[$field_name] = $holder_of_value; |
269 | 269 | } |
270 | 270 | |
271 | 271 | //if we're not in the constructor... |
272 | 272 | //now check if what we set was a primary key |
273 | - if($this->_props_n_values_provided_in_constructor && //note: props_n_values_provided_in_constructor is only set at the END of the constructor |
|
273 | + if ($this->_props_n_values_provided_in_constructor && //note: props_n_values_provided_in_constructor is only set at the END of the constructor |
|
274 | 274 | $field_name == $this->_get_primary_key_name(get_class($this)) && |
275 | - $field_value){ |
|
275 | + $field_value) { |
|
276 | 276 | //if so, we want all this object's fields to be filled either with |
277 | 277 | //what we've explicitly set on this model |
278 | 278 | //or what we have in the db |
@@ -280,20 +280,20 @@ discard block |
||
280 | 280 | $fields_on_model = $this->_get_model(get_class($this))->field_settings(); |
281 | 281 | |
282 | 282 | $obj_in_db = $this->_get_model(get_class($this))->get_one_by_ID($field_value); |
283 | - foreach($fields_on_model as $field_obj){ |
|
284 | - if( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor) |
|
285 | - && $field_obj->get_name() != $field_name ){ |
|
283 | + foreach ($fields_on_model as $field_obj) { |
|
284 | + if ( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor) |
|
285 | + && $field_obj->get_name() != $field_name) { |
|
286 | 286 | |
287 | - $this->set($field_obj->get_name(),$obj_in_db->get($field_obj->get_name())); |
|
287 | + $this->set($field_obj->get_name(), $obj_in_db->get($field_obj->get_name())); |
|
288 | 288 | } |
289 | 289 | } |
290 | 290 | //oh this model object has an ID? well make sure its in the entity mapper |
291 | 291 | $this->get_model()->add_to_entity_map($this); |
292 | 292 | } |
293 | 293 | //let's unset any cache for this field_name from the $_cached_properties property. |
294 | - $this->_clear_cached_property( $field_name ); |
|
295 | - }else{ |
|
296 | - throw new EE_Error( sprintf( __( "A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso" ), $field_name ) ); |
|
294 | + $this->_clear_cached_property($field_name); |
|
295 | + } else { |
|
296 | + throw new EE_Error(sprintf(__("A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso"), $field_name)); |
|
297 | 297 | } |
298 | 298 | |
299 | 299 | } |
@@ -312,14 +312,14 @@ discard block |
||
312 | 312 | * @param mixed $field_value The value to set. |
313 | 313 | * @return int|bool @see EE_Base_Class::update_extra_meta() for return docs. |
314 | 314 | */ |
315 | - public function set_field_or_extra_meta( $field_name, $field_value ) { |
|
316 | - if ( $this->get_model()->has_field( $field_name ) ) { |
|
317 | - $this->set( $field_name, $field_value ); |
|
315 | + public function set_field_or_extra_meta($field_name, $field_value) { |
|
316 | + if ($this->get_model()->has_field($field_name)) { |
|
317 | + $this->set($field_name, $field_value); |
|
318 | 318 | return true; |
319 | 319 | } else { |
320 | 320 | //ensure this object is saved first so that extra meta can be properly related. |
321 | 321 | $this->save(); |
322 | - return $this->update_extra_meta( $field_name, $field_value ); |
|
322 | + return $this->update_extra_meta($field_name, $field_value); |
|
323 | 323 | } |
324 | 324 | } |
325 | 325 | |
@@ -343,12 +343,12 @@ discard block |
||
343 | 343 | * @param string $field_name expecting the fully qualified field name. |
344 | 344 | * @return mixed|null value for the field if found. null if not found. |
345 | 345 | */ |
346 | - public function get_field_or_extra_meta( $field_name ) { |
|
347 | - if ( $this->get_model()->has_field( $field_name ) ) { |
|
348 | - $column_value = $this->get( $field_name ); |
|
346 | + public function get_field_or_extra_meta($field_name) { |
|
347 | + if ($this->get_model()->has_field($field_name)) { |
|
348 | + $column_value = $this->get($field_name); |
|
349 | 349 | } else { |
350 | 350 | //This isn't a column in the main table, let's see if it is in the extra meta. |
351 | - $column_value = $this->get_extra_meta( $field_name, true, null ); |
|
351 | + $column_value = $this->get_extra_meta($field_name, true, null); |
|
352 | 352 | } |
353 | 353 | return $column_value; |
354 | 354 | } |
@@ -367,19 +367,19 @@ discard block |
||
367 | 367 | * @param string $timezone A valid timezone string as described by @link http://www.php.net/manual/en/timezones.php |
368 | 368 | * @return void |
369 | 369 | */ |
370 | - public function set_timezone( $timezone = '' ) { |
|
370 | + public function set_timezone($timezone = '') { |
|
371 | 371 | EE_Registry::instance()->load_helper('DTT_Helper'); |
372 | - $this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone ); |
|
372 | + $this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone); |
|
373 | 373 | //make sure we clear all cached properties because they won't be relevant now |
374 | 374 | $this->_clear_cached_properties(); |
375 | 375 | |
376 | 376 | //make sure we update field settings and the date for all EE_Datetime_Fields |
377 | - $model_fields = $this->get_model()->field_settings( false ); |
|
378 | - foreach ( $model_fields as $field_name => $field_obj ) { |
|
379 | - if ( $field_obj instanceof EE_Datetime_Field ) { |
|
380 | - $field_obj->set_timezone( $this->_timezone ); |
|
381 | - if ( isset( $this->_fields[$field_name] ) && $this->_fields[$field_name] instanceof DateTime ) { |
|
382 | - $this->_fields[$field_name]->setTimezone( new DateTimeZone( $this->_timezone ) ); |
|
377 | + $model_fields = $this->get_model()->field_settings(false); |
|
378 | + foreach ($model_fields as $field_name => $field_obj) { |
|
379 | + if ($field_obj instanceof EE_Datetime_Field) { |
|
380 | + $field_obj->set_timezone($this->_timezone); |
|
381 | + if (isset($this->_fields[$field_name]) && $this->_fields[$field_name] instanceof DateTime) { |
|
382 | + $this->_fields[$field_name]->setTimezone(new DateTimeZone($this->_timezone)); |
|
383 | 383 | } |
384 | 384 | } |
385 | 385 | } |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | * |
409 | 409 | * @param string $format should be a format recognizable by PHP date() functions. |
410 | 410 | */ |
411 | - public function set_date_format( $format ) { |
|
411 | + public function set_date_format($format) { |
|
412 | 412 | $this->_dt_frmt = $format; |
413 | 413 | //clear cached_properties because they won't be relevant now. |
414 | 414 | $this->_clear_cached_properties(); |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | * @since 4.6 |
425 | 425 | * @param string $format should be a format recognizable by PHP date() functions. |
426 | 426 | */ |
427 | - public function set_time_format( $format ) { |
|
427 | + public function set_time_format($format) { |
|
428 | 428 | $this->_tm_frmt = $format; |
429 | 429 | //clear cached_properties because they won't be relevant now. |
430 | 430 | $this->_clear_cached_properties(); |
@@ -441,8 +441,8 @@ discard block |
||
441 | 441 | * |
442 | 442 | * @return mixed string|array |
443 | 443 | */ |
444 | - public function get_format( $full = true ) { |
|
445 | - return $full ? $this->_dt_frmt . ' ' . $this->_tm_frmt : array( $this->_dt_frmt, $this->_tm_frmt ); |
|
444 | + public function get_format($full = true) { |
|
445 | + return $full ? $this->_dt_frmt.' '.$this->_tm_frmt : array($this->_dt_frmt, $this->_tm_frmt); |
|
446 | 446 | } |
447 | 447 | |
448 | 448 | |
@@ -460,17 +460,17 @@ discard block |
||
460 | 460 | * @throws EE_Error |
461 | 461 | * @return mixed index into cache, or just TRUE if the relation is of type Belongs_To (because there's only one related thing, no array) |
462 | 462 | */ |
463 | - public function cache( $relationName = '', $object_to_cache = NULL, $cache_id = NULL ){ |
|
463 | + public function cache($relationName = '', $object_to_cache = NULL, $cache_id = NULL) { |
|
464 | 464 | // its entirely possible that there IS no related object yet in which case there is nothing to cache. |
465 | - if ( ! $object_to_cache instanceof EE_Base_Class ) { |
|
465 | + if ( ! $object_to_cache instanceof EE_Base_Class) { |
|
466 | 466 | return FALSE; |
467 | 467 | } |
468 | 468 | // also get "how" the object is related, or throw an error |
469 | - if( ! $relationship_to_model = $this->get_model()->related_settings_for( $relationName )) { |
|
470 | - throw new EE_Error( sprintf( __( 'There is no relationship to %s on a %s. Cannot cache it', 'event_espresso' ), $relationName, get_class( $this ))); |
|
469 | + if ( ! $relationship_to_model = $this->get_model()->related_settings_for($relationName)) { |
|
470 | + throw new EE_Error(sprintf(__('There is no relationship to %s on a %s. Cannot cache it', 'event_espresso'), $relationName, get_class($this))); |
|
471 | 471 | } |
472 | 472 | // how many things are related ? |
473 | - if( $relationship_to_model instanceof EE_Belongs_To_Relation ){ |
|
473 | + if ($relationship_to_model instanceof EE_Belongs_To_Relation) { |
|
474 | 474 | // if it's a "belongs to" relationship, then there's only one related model object eg, if this is a registration, there's only 1 attendee for it |
475 | 475 | // so for these model objects just set it to be cached |
476 | 476 | $this->_model_relations[$relationName] = $object_to_cache; |
@@ -478,26 +478,26 @@ discard block |
||
478 | 478 | } else { |
479 | 479 | // otherwise, this is the "many" side of a one to many relationship, so we'll add the object to the array of related objects for that type. |
480 | 480 | // eg: if this is an event, there are many registrations for that event, so we cache the registrations in an array |
481 | - if( ! is_array( $this->_model_relations[$relationName] )) { |
|
481 | + if ( ! is_array($this->_model_relations[$relationName])) { |
|
482 | 482 | // if for some reason, the cached item is a model object, then stick that in the array, otherwise start with an empty array |
483 | - $this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array( $this->_model_relations[$relationName] ) : array(); |
|
483 | + $this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array($this->_model_relations[$relationName]) : array(); |
|
484 | 484 | } |
485 | 485 | // first check for a cache_id which is normally empty |
486 | - if ( ! empty( $cache_id )) { |
|
486 | + if ( ! empty($cache_id)) { |
|
487 | 487 | // if the cache_id exists, then it means we are purposely trying to cache this with a known key that can then be used to retrieve the object later on |
488 | - $this->_model_relations[$relationName][ $cache_id ] = $object_to_cache; |
|
488 | + $this->_model_relations[$relationName][$cache_id] = $object_to_cache; |
|
489 | 489 | $return = $cache_id; |
490 | - } elseif ( $object_to_cache->ID() ) { |
|
490 | + } elseif ($object_to_cache->ID()) { |
|
491 | 491 | // OR the cached object originally came from the db, so let's just use it's PK for an ID |
492 | - $this->_model_relations[$relationName][ $object_to_cache->ID() ] = $object_to_cache; |
|
492 | + $this->_model_relations[$relationName][$object_to_cache->ID()] = $object_to_cache; |
|
493 | 493 | $return = $object_to_cache->ID(); |
494 | 494 | } else { |
495 | 495 | // OR it's a new object with no ID, so just throw it in the array with an auto-incremented ID |
496 | 496 | $this->_model_relations[$relationName][] = $object_to_cache; |
497 | 497 | // move the internal pointer to the end of the array |
498 | - end( $this->_model_relations[$relationName] ); |
|
498 | + end($this->_model_relations[$relationName]); |
|
499 | 499 | // and grab the key so that we can return it |
500 | - $return = key( $this->_model_relations[$relationName] ); |
|
500 | + $return = key($this->_model_relations[$relationName]); |
|
501 | 501 | } |
502 | 502 | |
503 | 503 | } |
@@ -515,11 +515,11 @@ discard block |
||
515 | 515 | * @param null $cache_type |
516 | 516 | * @return void |
517 | 517 | */ |
518 | - protected function _set_cached_property( $fieldname, $value, $cache_type = NULL ) { |
|
518 | + protected function _set_cached_property($fieldname, $value, $cache_type = NULL) { |
|
519 | 519 | //first make sure this property exists |
520 | 520 | $this->get_model()->field_settings_for($fieldname); |
521 | 521 | |
522 | - $cache_type = empty( $cache_type ) ? 'standard' : $cache_type; |
|
522 | + $cache_type = empty($cache_type) ? 'standard' : $cache_type; |
|
523 | 523 | $this->_cached_properties[$fieldname][$cache_type] = $value; |
524 | 524 | } |
525 | 525 | |
@@ -534,34 +534,34 @@ discard block |
||
534 | 534 | * It can also accept certain pre-defined "schema" strings to define how to output the property. see the field's prepare_for_pretty_echoing for what strings can be used |
535 | 535 | * @return mixed whatever the value for the property is we're retrieving |
536 | 536 | */ |
537 | - protected function _get_cached_property( $fieldname, $pretty = FALSE, $extra_cache_ref = NULL ) { |
|
537 | + protected function _get_cached_property($fieldname, $pretty = FALSE, $extra_cache_ref = NULL) { |
|
538 | 538 | //verify the field exists |
539 | 539 | $this->get_model()->field_settings_for($fieldname); |
540 | 540 | |
541 | 541 | $cache_type = $pretty ? 'pretty' : 'standard'; |
542 | - $cache_type .= !empty( $extra_cache_ref ) ? '_' . $extra_cache_ref : ''; |
|
542 | + $cache_type .= ! empty($extra_cache_ref) ? '_'.$extra_cache_ref : ''; |
|
543 | 543 | |
544 | - if ( isset( $this->_cached_properties[$fieldname][$cache_type] ) ) { |
|
544 | + if (isset($this->_cached_properties[$fieldname][$cache_type])) { |
|
545 | 545 | return $this->_cached_properties[$fieldname][$cache_type]; |
546 | 546 | } |
547 | 547 | |
548 | 548 | $field_obj = $this->get_model()->field_settings_for($fieldname); |
549 | - if ( $field_obj instanceof EE_Model_Field_Base ) { |
|
549 | + if ($field_obj instanceof EE_Model_Field_Base) { |
|
550 | 550 | /** |
551 | 551 | * maybe this is EE_Datetime_Field. If so we need to make sure timezone and |
552 | 552 | * formats are correct. |
553 | 553 | */ |
554 | - if ( $field_obj instanceof EE_Datetime_Field ) { |
|
555 | - $field_obj->set_timezone( $this->_timezone ); |
|
556 | - $field_obj->set_date_format( $this->_dt_frmt, $pretty ); |
|
557 | - $field_obj->set_time_format( $this->_tm_frmt, $pretty ); |
|
554 | + if ($field_obj instanceof EE_Datetime_Field) { |
|
555 | + $field_obj->set_timezone($this->_timezone); |
|
556 | + $field_obj->set_date_format($this->_dt_frmt, $pretty); |
|
557 | + $field_obj->set_time_format($this->_tm_frmt, $pretty); |
|
558 | 558 | } |
559 | 559 | |
560 | - if( ! isset($this->_fields[$fieldname])){ |
|
560 | + if ( ! isset($this->_fields[$fieldname])) { |
|
561 | 561 | $this->_fields[$fieldname] = NULL; |
562 | 562 | } |
563 | - $value = $pretty ? $field_obj->prepare_for_pretty_echoing($this->_fields[$fieldname], $extra_cache_ref) : $field_obj->prepare_for_get($this->_fields[$fieldname] ); |
|
564 | - $this->_set_cached_property( $fieldname, $value, $cache_type ); |
|
563 | + $value = $pretty ? $field_obj->prepare_for_pretty_echoing($this->_fields[$fieldname], $extra_cache_ref) : $field_obj->prepare_for_get($this->_fields[$fieldname]); |
|
564 | + $this->_set_cached_property($fieldname, $value, $cache_type); |
|
565 | 565 | return $value; |
566 | 566 | } |
567 | 567 | return FALSE; |
@@ -587,9 +587,9 @@ discard block |
||
587 | 587 | * @param string $property_name the property to remove if it exists (from the _cached_properties array) |
588 | 588 | * @return void |
589 | 589 | */ |
590 | - protected function _clear_cached_property( $property_name ) { |
|
591 | - if ( isset( $this->_cached_properties[ $property_name ] ) ) |
|
592 | - unset( $this->_cached_properties[ $property_name ] ); |
|
590 | + protected function _clear_cached_property($property_name) { |
|
591 | + if (isset($this->_cached_properties[$property_name])) |
|
592 | + unset($this->_cached_properties[$property_name]); |
|
593 | 593 | } |
594 | 594 | |
595 | 595 | |
@@ -600,7 +600,7 @@ discard block |
||
600 | 600 | * @param string $model_name name of the related thing, eg 'Attendee', |
601 | 601 | * @return EE_Base_Class |
602 | 602 | */ |
603 | - protected function ensure_related_thing_is_model_obj($object_or_id,$model_name){ |
|
603 | + protected function ensure_related_thing_is_model_obj($object_or_id, $model_name) { |
|
604 | 604 | $other_model_instance = self::_get_model_instance_with_name(self::_get_model_classname($model_name), $this->_timezone); |
605 | 605 | $model_obj = $other_model_instance->ensure_is_obj($object_or_id); |
606 | 606 | return $model_obj; |
@@ -620,55 +620,55 @@ discard block |
||
620 | 620 | * @throws EE_Error |
621 | 621 | * @return EE_Base_Class | boolean from which was cleared from the cache, or true if we requested to remove a relation from all |
622 | 622 | */ |
623 | - public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE){ |
|
623 | + public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE) { |
|
624 | 624 | $relationship_to_model = $this->get_model()->related_settings_for($relationName); |
625 | 625 | $index_in_cache = ''; |
626 | - if( ! $relationship_to_model){ |
|
627 | - throw new EE_Error(sprintf(__("There is no relationship to %s on a %s. Cannot clear that cache",'event_espresso'),$relationName,get_class($this))); |
|
626 | + if ( ! $relationship_to_model) { |
|
627 | + throw new EE_Error(sprintf(__("There is no relationship to %s on a %s. Cannot clear that cache", 'event_espresso'), $relationName, get_class($this))); |
|
628 | 628 | } |
629 | - if($clear_all){ |
|
629 | + if ($clear_all) { |
|
630 | 630 | $obj_removed = true; |
631 | 631 | $this->_model_relations[$relationName] = null; |
632 | - }elseif($relationship_to_model instanceof EE_Belongs_To_Relation){ |
|
632 | + }elseif ($relationship_to_model instanceof EE_Belongs_To_Relation) { |
|
633 | 633 | $obj_removed = $this->_model_relations[$relationName]; |
634 | 634 | $this->_model_relations[$relationName] = null; |
635 | - }else{ |
|
636 | - if($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()){ |
|
635 | + } else { |
|
636 | + if ($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()) { |
|
637 | 637 | $index_in_cache = $object_to_remove_or_index_into_array->ID(); |
638 | - if( is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])){ |
|
638 | + if (is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])) { |
|
639 | 639 | $index_found_at = NULL; |
640 | 640 | //find this object in the array even though it has a different key |
641 | - foreach($this->_model_relations[$relationName] as $index=>$obj){ |
|
642 | - if( $obj instanceof EE_Base_Class && ( $obj == $object_to_remove_or_index_into_array || $obj->ID() == $object_to_remove_or_index_into_array->ID() )) { |
|
641 | + foreach ($this->_model_relations[$relationName] as $index=>$obj) { |
|
642 | + if ($obj instanceof EE_Base_Class && ($obj == $object_to_remove_or_index_into_array || $obj->ID() == $object_to_remove_or_index_into_array->ID())) { |
|
643 | 643 | $index_found_at = $index; |
644 | 644 | break; |
645 | 645 | } |
646 | 646 | } |
647 | - if($index_found_at){ |
|
647 | + if ($index_found_at) { |
|
648 | 648 | $index_in_cache = $index_found_at; |
649 | - }else{ |
|
649 | + } else { |
|
650 | 650 | //it wasn't found. huh. well obviously it doesn't need to be removed from teh cache |
651 | 651 | //if it wasn't in it to begin with. So we're done |
652 | 652 | return $object_to_remove_or_index_into_array; |
653 | 653 | } |
654 | 654 | } |
655 | - }elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){ |
|
655 | + }elseif ($object_to_remove_or_index_into_array instanceof EE_Base_Class) { |
|
656 | 656 | //so they provided a model object, but it's not yet saved to the DB... so let's go hunting for it! |
657 | - foreach($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want){ |
|
658 | - if($potentially_obj_we_want == $object_to_remove_or_index_into_array){ |
|
657 | + foreach ($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want) { |
|
658 | + if ($potentially_obj_we_want == $object_to_remove_or_index_into_array) { |
|
659 | 659 | $index_in_cache = $index; |
660 | 660 | } |
661 | 661 | } |
662 | - }else{ |
|
662 | + } else { |
|
663 | 663 | $index_in_cache = $object_to_remove_or_index_into_array; |
664 | 664 | } |
665 | 665 | //supposedly we've found it. But it could just be that the client code |
666 | 666 | //provided a bad index/object |
667 | - if(isset( $this->_model_relations[$relationName]) && |
|
668 | - isset( $this->_model_relations[$relationName][$index_in_cache])){ |
|
667 | + if (isset($this->_model_relations[$relationName]) && |
|
668 | + isset($this->_model_relations[$relationName][$index_in_cache])) { |
|
669 | 669 | $obj_removed = $this->_model_relations[$relationName][$index_in_cache]; |
670 | 670 | unset($this->_model_relations[$relationName][$index_in_cache]); |
671 | - }else{ |
|
671 | + } else { |
|
672 | 672 | //that thing was never cached anyways. |
673 | 673 | $obj_removed = NULL; |
674 | 674 | } |
@@ -687,24 +687,24 @@ discard block |
||
687 | 687 | * @param string $current_cache_id - the ID that was used when originally caching the object |
688 | 688 | * @return boolean TRUE on success, FALSE on fail |
689 | 689 | */ |
690 | - public function update_cache_after_object_save( $relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') { |
|
690 | + public function update_cache_after_object_save($relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') { |
|
691 | 691 | // verify that incoming object is of the correct type |
692 | - $obj_class = 'EE_' . $relationName; |
|
693 | - if ( $newly_saved_object instanceof $obj_class ) { |
|
692 | + $obj_class = 'EE_'.$relationName; |
|
693 | + if ($newly_saved_object instanceof $obj_class) { |
|
694 | 694 | /* @type EE_Base_Class $newly_saved_object*/ |
695 | 695 | // now get the type of relation |
696 | - $relationship_to_model = $this->get_model()->related_settings_for( $relationName ); |
|
696 | + $relationship_to_model = $this->get_model()->related_settings_for($relationName); |
|
697 | 697 | // if this is a 1:1 relationship |
698 | - if( $relationship_to_model instanceof EE_Belongs_To_Relation ) { |
|
698 | + if ($relationship_to_model instanceof EE_Belongs_To_Relation) { |
|
699 | 699 | // then just replace the cached object with the newly saved object |
700 | 700 | $this->_model_relations[$relationName] = $newly_saved_object; |
701 | 701 | return TRUE; |
702 | 702 | // or if it's some kind of sordid feral polyamorous relationship... |
703 | - } elseif ( is_array( $this->_model_relations[$relationName] ) && isset( $this->_model_relations[$relationName][ $current_cache_id ] )) { |
|
703 | + } elseif (is_array($this->_model_relations[$relationName]) && isset($this->_model_relations[$relationName][$current_cache_id])) { |
|
704 | 704 | // then remove the current cached item |
705 | - unset( $this->_model_relations[$relationName][ $current_cache_id ] ); |
|
705 | + unset($this->_model_relations[$relationName][$current_cache_id]); |
|
706 | 706 | // and cache the newly saved object using it's new ID |
707 | - $this->_model_relations[$relationName][ $newly_saved_object->ID() ] = $newly_saved_object; |
|
707 | + $this->_model_relations[$relationName][$newly_saved_object->ID()] = $newly_saved_object; |
|
708 | 708 | return TRUE; |
709 | 709 | } |
710 | 710 | } |
@@ -720,11 +720,11 @@ discard block |
||
720 | 720 | * @param string $relationName |
721 | 721 | * @return EE_Base_Class |
722 | 722 | */ |
723 | - public function get_one_from_cache($relationName){ |
|
724 | - $cached_array_or_object = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : null; |
|
725 | - if(is_array($cached_array_or_object)){ |
|
723 | + public function get_one_from_cache($relationName) { |
|
724 | + $cached_array_or_object = isset($this->_model_relations[$relationName]) ? $this->_model_relations[$relationName] : null; |
|
725 | + if (is_array($cached_array_or_object)) { |
|
726 | 726 | return array_shift($cached_array_or_object); |
727 | - }else{ |
|
727 | + } else { |
|
728 | 728 | return $cached_array_or_object; |
729 | 729 | } |
730 | 730 | } |
@@ -739,14 +739,14 @@ discard block |
||
739 | 739 | * @throws \EE_Error |
740 | 740 | * @return EE_Base_Class[] NOT necessarily indexed by primary keys |
741 | 741 | */ |
742 | - public function get_all_from_cache($relationName){ |
|
743 | - $cached_array_or_object = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : array(); |
|
744 | - if(is_array($cached_array_or_object)){ |
|
742 | + public function get_all_from_cache($relationName) { |
|
743 | + $cached_array_or_object = isset($this->_model_relations[$relationName]) ? $this->_model_relations[$relationName] : array(); |
|
744 | + if (is_array($cached_array_or_object)) { |
|
745 | 745 | $objects = $cached_array_or_object; |
746 | - }elseif($cached_array_or_object){ |
|
746 | + }elseif ($cached_array_or_object) { |
|
747 | 747 | //if the result is not an array, but exists, make it an array |
748 | 748 | $objects = array($cached_array_or_object); |
749 | - }else{ |
|
749 | + } else { |
|
750 | 750 | //if nothing was found, return an empty array |
751 | 751 | $objects = array(); |
752 | 752 | } |
@@ -754,15 +754,15 @@ discard block |
||
754 | 754 | //basically, if this model object was stored in the session, and these cached model objects |
755 | 755 | //already have IDs, let's make sure they're in their model's entity mapper |
756 | 756 | //otherwise we will have duplicates next time we call EE_Registry::instance()->load_model( $relationName )->get_one_by_ID( $result->ID() ); |
757 | - foreach( $objects as $model_object ){ |
|
758 | - $model = EE_Registry::instance()->load_model( $relationName ); |
|
759 | - if( $model instanceof EEM_Base && $model_object instanceof EE_Base_Class ){ |
|
757 | + foreach ($objects as $model_object) { |
|
758 | + $model = EE_Registry::instance()->load_model($relationName); |
|
759 | + if ($model instanceof EEM_Base && $model_object instanceof EE_Base_Class) { |
|
760 | 760 | //ensure its in the map if it has an ID; otherwise it will be added to the map when its saved |
761 | - if( $model_object->ID() ){ |
|
762 | - $model->add_to_entity_map( $model_object ); |
|
761 | + if ($model_object->ID()) { |
|
762 | + $model->add_to_entity_map($model_object); |
|
763 | 763 | } |
764 | - }else{ |
|
765 | - throw new EE_Error( sprintf( __( 'Error retrieving related model objects. Either $1%s is not a model or $2%s is not a model object', 'event_espresso' ), $relationName, gettype( $model_object ))); |
|
764 | + } else { |
|
765 | + throw new EE_Error(sprintf(__('Error retrieving related model objects. Either $1%s is not a model or $2%s is not a model object', 'event_espresso'), $relationName, gettype($model_object))); |
|
766 | 766 | } |
767 | 767 | } |
768 | 768 | return $objects; |
@@ -781,13 +781,13 @@ discard block |
||
781 | 781 | * |
782 | 782 | * @return array|EE_Base_Class[] |
783 | 783 | */ |
784 | - public function next_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) { |
|
785 | - $field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by; |
|
786 | - $current_value = ! empty( $field ) ? $this->get( $field ) : null; |
|
787 | - if ( empty( $field ) || empty( $current_value ) ) { |
|
784 | + public function next_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) { |
|
785 | + $field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by; |
|
786 | + $current_value = ! empty($field) ? $this->get($field) : null; |
|
787 | + if (empty($field) || empty($current_value)) { |
|
788 | 788 | return array(); |
789 | 789 | } |
790 | - return $this->get_model()->next_x( $current_value, $field, $limit, $query_params, $columns_to_select ); |
|
790 | + return $this->get_model()->next_x($current_value, $field, $limit, $query_params, $columns_to_select); |
|
791 | 791 | } |
792 | 792 | |
793 | 793 | |
@@ -806,13 +806,13 @@ discard block |
||
806 | 806 | * |
807 | 807 | * @return array|EE_Base_Class[] |
808 | 808 | */ |
809 | - public function previous_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) { |
|
810 | - $field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by; |
|
811 | - $current_value = ! empty( $field ) ? $this->get( $field ) : null; |
|
812 | - if ( empty( $field ) || empty( $current_value ) ) { |
|
809 | + public function previous_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) { |
|
810 | + $field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by; |
|
811 | + $current_value = ! empty($field) ? $this->get($field) : null; |
|
812 | + if (empty($field) || empty($current_value)) { |
|
813 | 813 | return array(); |
814 | 814 | } |
815 | - return $this->get_model()->previous_x( $current_value, $field, $limit, $query_params, $columns_to_select ); |
|
815 | + return $this->get_model()->previous_x($current_value, $field, $limit, $query_params, $columns_to_select); |
|
816 | 816 | } |
817 | 817 | |
818 | 818 | |
@@ -830,13 +830,13 @@ discard block |
||
830 | 830 | * |
831 | 831 | * @return array|EE_Base_Class |
832 | 832 | */ |
833 | - public function next( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) { |
|
834 | - $field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by; |
|
835 | - $current_value = ! empty( $field ) ? $this->get( $field ) : null; |
|
836 | - if ( empty( $field ) || empty( $current_value ) ) { |
|
833 | + public function next($field_to_order_by = null, $query_params = array(), $columns_to_select = null) { |
|
834 | + $field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by; |
|
835 | + $current_value = ! empty($field) ? $this->get($field) : null; |
|
836 | + if (empty($field) || empty($current_value)) { |
|
837 | 837 | return array(); |
838 | 838 | } |
839 | - return $this->get_model()->next( $current_value, $field, $query_params, $columns_to_select ); |
|
839 | + return $this->get_model()->next($current_value, $field, $query_params, $columns_to_select); |
|
840 | 840 | } |
841 | 841 | |
842 | 842 | |
@@ -855,13 +855,13 @@ discard block |
||
855 | 855 | * |
856 | 856 | * @return array|EE_Base_Class |
857 | 857 | */ |
858 | - public function previous( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) { |
|
859 | - $field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by; |
|
860 | - $current_value = ! empty( $field ) ? $this->get( $field ) : null; |
|
861 | - if ( empty( $field ) || empty( $current_value ) ) { |
|
858 | + public function previous($field_to_order_by = null, $query_params = array(), $columns_to_select = null) { |
|
859 | + $field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by; |
|
860 | + $current_value = ! empty($field) ? $this->get($field) : null; |
|
861 | + if (empty($field) || empty($current_value)) { |
|
862 | 862 | return array(); |
863 | 863 | } |
864 | - return $this->get_model()->previous( $current_value, $field, $query_params, $columns_to_select ); |
|
864 | + return $this->get_model()->previous($current_value, $field, $query_params, $columns_to_select); |
|
865 | 865 | } |
866 | 866 | |
867 | 867 | |
@@ -875,25 +875,25 @@ discard block |
||
875 | 875 | * @param string $field_name |
876 | 876 | * @param mixed $field_value_from_db |
877 | 877 | */ |
878 | - public function set_from_db($field_name,$field_value_from_db){ |
|
878 | + public function set_from_db($field_name, $field_value_from_db) { |
|
879 | 879 | $field_obj = $this->get_model()->field_settings_for($field_name); |
880 | - if ( $field_obj instanceof EE_Model_Field_Base ) { |
|
880 | + if ($field_obj instanceof EE_Model_Field_Base) { |
|
881 | 881 | //you would think the DB has no NULLs for non-null label fields right? wrong! |
882 | 882 | //eg, a CPT model object could have an entry in the posts table, but no |
883 | 883 | //entry in the meta table. Meaning that all its columns in the meta table |
884 | 884 | //are null! yikes! so when we find one like that, use defaults for its meta columns |
885 | - if($field_value_from_db === NULL ){ |
|
886 | - if( $field_obj->is_nullable()){ |
|
885 | + if ($field_value_from_db === NULL) { |
|
886 | + if ($field_obj->is_nullable()) { |
|
887 | 887 | //if the field allows nulls, then let it be null |
888 | 888 | $field_value = NULL; |
889 | - }else{ |
|
889 | + } else { |
|
890 | 890 | $field_value = $field_obj->get_default_value(); |
891 | 891 | } |
892 | - }else{ |
|
893 | - $field_value = $field_obj->prepare_for_set_from_db( $field_value_from_db ); |
|
892 | + } else { |
|
893 | + $field_value = $field_obj->prepare_for_set_from_db($field_value_from_db); |
|
894 | 894 | } |
895 | 895 | $this->_fields[$field_name] = $field_value; |
896 | - $this->_clear_cached_property( $field_name ); |
|
896 | + $this->_clear_cached_property($field_name); |
|
897 | 897 | } |
898 | 898 | } |
899 | 899 | |
@@ -905,8 +905,8 @@ discard block |
||
905 | 905 | * @param string $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.) |
906 | 906 | * @return boolean |
907 | 907 | */ |
908 | - public function get($field_name, $extra_cache_ref = NULL ){ |
|
909 | - return $this->_get_cached_property( $field_name, FALSE, $extra_cache_ref ); |
|
908 | + public function get($field_name, $extra_cache_ref = NULL) { |
|
909 | + return $this->_get_cached_property($field_name, FALSE, $extra_cache_ref); |
|
910 | 910 | } |
911 | 911 | |
912 | 912 | |
@@ -936,11 +936,11 @@ discard block |
||
936 | 936 | * just null is returned (because that indicates that likely |
937 | 937 | * this field is nullable). |
938 | 938 | */ |
939 | - public function get_DateTime_object( $field_name ) { |
|
940 | - $field_settings = $this->get_model()->field_settings_for( $field_name ); |
|
939 | + public function get_DateTime_object($field_name) { |
|
940 | + $field_settings = $this->get_model()->field_settings_for($field_name); |
|
941 | 941 | |
942 | - if ( ! $field_settings instanceof EE_Datetime_Field ) { |
|
943 | - EE_Error::add_error( sprintf( __('The field %s is not an EE_Datetime_Field field. There is no DateTime object stored on this field type.', 'event_espresso' ), $field_name ), __FILE__, __FUNCTION__, __LINE__ ); |
|
942 | + if ( ! $field_settings instanceof EE_Datetime_Field) { |
|
943 | + EE_Error::add_error(sprintf(__('The field %s is not an EE_Datetime_Field field. There is no DateTime object stored on this field type.', 'event_espresso'), $field_name), __FILE__, __FUNCTION__, __LINE__); |
|
944 | 944 | return false; |
945 | 945 | } |
946 | 946 | |
@@ -956,7 +956,7 @@ discard block |
||
956 | 956 | * @param string $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.) |
957 | 957 | * @return void |
958 | 958 | */ |
959 | - public function e($field_name, $extra_cache_ref = NULL){ |
|
959 | + public function e($field_name, $extra_cache_ref = NULL) { |
|
960 | 960 | echo $this->get_pretty($field_name, $extra_cache_ref); |
961 | 961 | } |
962 | 962 | /** |
@@ -965,8 +965,8 @@ discard block |
||
965 | 965 | * @param string $field_name |
966 | 966 | * @return void |
967 | 967 | */ |
968 | - public function f($field_name){ |
|
969 | - $this->e($field_name,'form_input'); |
|
968 | + public function f($field_name) { |
|
969 | + $this->e($field_name, 'form_input'); |
|
970 | 970 | } |
971 | 971 | |
972 | 972 | /** |
@@ -975,8 +975,8 @@ discard block |
||
975 | 975 | * @param string $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.) |
976 | 976 | * @return mixed |
977 | 977 | */ |
978 | - public function get_pretty($field_name, $extra_cache_ref = NULL){ |
|
979 | - return $this->_get_cached_property( $field_name, TRUE, $extra_cache_ref ); |
|
978 | + public function get_pretty($field_name, $extra_cache_ref = NULL) { |
|
979 | + return $this->_get_cached_property($field_name, TRUE, $extra_cache_ref); |
|
980 | 980 | } |
981 | 981 | |
982 | 982 | |
@@ -993,37 +993,37 @@ discard block |
||
993 | 993 | * @param boolean $echo Whether the dtt is echoing using pretty echoing or just returned using vanilla get |
994 | 994 | * @return void | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing |
995 | 995 | */ |
996 | - protected function _get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE ) { |
|
996 | + protected function _get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE) { |
|
997 | 997 | |
998 | - $in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt : $dt_frmt; |
|
998 | + $in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt : $dt_frmt; |
|
999 | 999 | $in_tm_frmt = empty($tm_frmt) ? $this->_tm_frmt : $tm_frmt; |
1000 | 1000 | |
1001 | 1001 | //validate field for datetime and returns field settings if valid. |
1002 | - $field = $this->_get_dtt_field_settings( $field_name ); |
|
1002 | + $field = $this->_get_dtt_field_settings($field_name); |
|
1003 | 1003 | |
1004 | 1004 | //clear cached property if either formats are not null. |
1005 | - if( $dt_frmt !== null || $tm_frmt !== null ) { |
|
1006 | - $this->_clear_cached_property( $field_name ); |
|
1005 | + if ($dt_frmt !== null || $tm_frmt !== null) { |
|
1006 | + $this->_clear_cached_property($field_name); |
|
1007 | 1007 | //reset format properties because they are used in get() |
1008 | 1008 | $this->_dt_frmt = $in_dt_frmt; |
1009 | 1009 | $this->_tm_frmt = $in_tm_frmt; |
1010 | 1010 | } |
1011 | 1011 | |
1012 | - if ( $echo ) |
|
1013 | - $field->set_pretty_date_format( $in_dt_frmt ); |
|
1012 | + if ($echo) |
|
1013 | + $field->set_pretty_date_format($in_dt_frmt); |
|
1014 | 1014 | else |
1015 | - $field->set_date_format( $in_dt_frmt ); |
|
1015 | + $field->set_date_format($in_dt_frmt); |
|
1016 | 1016 | |
1017 | - if ( $echo ) |
|
1018 | - $field->set_pretty_time_format( $in_tm_frmt ); |
|
1017 | + if ($echo) |
|
1018 | + $field->set_pretty_time_format($in_tm_frmt); |
|
1019 | 1019 | else |
1020 | - $field->set_time_format( $in_tm_frmt ); |
|
1020 | + $field->set_time_format($in_tm_frmt); |
|
1021 | 1021 | |
1022 | 1022 | //set timezone in field object |
1023 | - $field->set_timezone( $this->_timezone ); |
|
1023 | + $field->set_timezone($this->_timezone); |
|
1024 | 1024 | |
1025 | 1025 | //set the output returned |
1026 | - switch ( $date_or_time ) { |
|
1026 | + switch ($date_or_time) { |
|
1027 | 1027 | |
1028 | 1028 | case 'D' : |
1029 | 1029 | $field->set_date_time_output('date'); |
@@ -1038,11 +1038,11 @@ discard block |
||
1038 | 1038 | } |
1039 | 1039 | |
1040 | 1040 | |
1041 | - if ( $echo ) { |
|
1042 | - $this->e( $field_name, $date_or_time ); |
|
1041 | + if ($echo) { |
|
1042 | + $this->e($field_name, $date_or_time); |
|
1043 | 1043 | return ''; |
1044 | 1044 | } |
1045 | - return $this->get( $field_name, $date_or_time ); |
|
1045 | + return $this->get($field_name, $date_or_time); |
|
1046 | 1046 | } |
1047 | 1047 | |
1048 | 1048 | |
@@ -1052,8 +1052,8 @@ discard block |
||
1052 | 1052 | * @param string $format format for the date returned (if NULL we use default in dt_frmt property) |
1053 | 1053 | * @return string datetime value formatted |
1054 | 1054 | */ |
1055 | - public function get_date( $field_name, $format = NULL ) { |
|
1056 | - return $this->_get_datetime( $field_name, $format, NULL, 'D' ); |
|
1055 | + public function get_date($field_name, $format = NULL) { |
|
1056 | + return $this->_get_datetime($field_name, $format, NULL, 'D'); |
|
1057 | 1057 | } |
1058 | 1058 | |
1059 | 1059 | |
@@ -1062,8 +1062,8 @@ discard block |
||
1062 | 1062 | * @param $field_name |
1063 | 1063 | * @param null $format |
1064 | 1064 | */ |
1065 | - public function e_date( $field_name, $format = NULL ) { |
|
1066 | - $this->_get_datetime( $field_name, $format, NULL, 'D', TRUE ); |
|
1065 | + public function e_date($field_name, $format = NULL) { |
|
1066 | + $this->_get_datetime($field_name, $format, NULL, 'D', TRUE); |
|
1067 | 1067 | } |
1068 | 1068 | |
1069 | 1069 | |
@@ -1073,8 +1073,8 @@ discard block |
||
1073 | 1073 | * @param string $format format for the time returned ( if NULL we use default in tm_frmt property) |
1074 | 1074 | * @return string datetime value formatted |
1075 | 1075 | */ |
1076 | - public function get_time( $field_name, $format = NULL ) { |
|
1077 | - return $this->_get_datetime( $field_name, NULL, $format, 'T' ); |
|
1076 | + public function get_time($field_name, $format = NULL) { |
|
1077 | + return $this->_get_datetime($field_name, NULL, $format, 'T'); |
|
1078 | 1078 | } |
1079 | 1079 | |
1080 | 1080 | |
@@ -1083,8 +1083,8 @@ discard block |
||
1083 | 1083 | * @param $field_name |
1084 | 1084 | * @param null $format |
1085 | 1085 | */ |
1086 | - public function e_time( $field_name, $format = NULL ) { |
|
1087 | - $this->_get_datetime( $field_name, NULL, $format, 'T', TRUE ); |
|
1086 | + public function e_time($field_name, $format = NULL) { |
|
1087 | + $this->_get_datetime($field_name, NULL, $format, 'T', TRUE); |
|
1088 | 1088 | } |
1089 | 1089 | |
1090 | 1090 | |
@@ -1097,8 +1097,8 @@ discard block |
||
1097 | 1097 | * @param string $tm_frmt format for the time returned (if NULL we use default in tm_frmt property) |
1098 | 1098 | * @return string datetime value formatted |
1099 | 1099 | */ |
1100 | - public function get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) { |
|
1101 | - return $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt ); |
|
1100 | + public function get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) { |
|
1101 | + return $this->_get_datetime($field_name, $dt_frmt, $tm_frmt); |
|
1102 | 1102 | } |
1103 | 1103 | |
1104 | 1104 | |
@@ -1108,8 +1108,8 @@ discard block |
||
1108 | 1108 | * @param null $dt_frmt |
1109 | 1109 | * @param null $tm_frmt |
1110 | 1110 | */ |
1111 | - public function e_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) { |
|
1112 | - $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, NULL, TRUE); |
|
1111 | + public function e_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) { |
|
1112 | + $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, NULL, TRUE); |
|
1113 | 1113 | } |
1114 | 1114 | |
1115 | 1115 | |
@@ -1124,10 +1124,10 @@ discard block |
||
1124 | 1124 | * @return string Date and time string in set locale or false if no field exists for the given |
1125 | 1125 | * field name. |
1126 | 1126 | */ |
1127 | - public function get_i18n_datetime( $field_name, $format = NULL ) { |
|
1128 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
1129 | - $format = empty( $format ) ? $this->_dt_frmt . ' ' . $this->_tm_frmt : $format; |
|
1130 | - return date_i18n( $format, EEH_DTT_Helper::get_timestamp_with_offset( $this->get_raw( $field_name ), $this->_timezone ) ); |
|
1127 | + public function get_i18n_datetime($field_name, $format = NULL) { |
|
1128 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
1129 | + $format = empty($format) ? $this->_dt_frmt.' '.$this->_tm_frmt : $format; |
|
1130 | + return date_i18n($format, EEH_DTT_Helper::get_timestamp_with_offset($this->get_raw($field_name), $this->_timezone)); |
|
1131 | 1131 | } |
1132 | 1132 | |
1133 | 1133 | |
@@ -1139,14 +1139,14 @@ discard block |
||
1139 | 1139 | * @throws EE_Error |
1140 | 1140 | * @return EE_Datetime_Field |
1141 | 1141 | */ |
1142 | - protected function _get_dtt_field_settings( $field_name ) { |
|
1142 | + protected function _get_dtt_field_settings($field_name) { |
|
1143 | 1143 | $field = $this->get_model()->field_settings_for($field_name); |
1144 | 1144 | |
1145 | 1145 | //check if field is dtt |
1146 | - if ( $field instanceof EE_Datetime_Field ) { |
|
1146 | + if ($field instanceof EE_Datetime_Field) { |
|
1147 | 1147 | return $field; |
1148 | 1148 | } else { |
1149 | - throw new EE_Error( sprintf( __('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field. Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname( get_class($this) ) ) ); |
|
1149 | + throw new EE_Error(sprintf(__('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field. Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname(get_class($this)))); |
|
1150 | 1150 | } |
1151 | 1151 | } |
1152 | 1152 | |
@@ -1167,8 +1167,8 @@ discard block |
||
1167 | 1167 | * @param string|Datetime $time a valid time string for php datetime functions (or DateTime object) |
1168 | 1168 | * @param string $fieldname the name of the field the time is being set on (must match a EE_Datetime_Field) |
1169 | 1169 | */ |
1170 | - protected function _set_time_for( $time, $fieldname ) { |
|
1171 | - $this->_set_date_time( 'T', $time, $fieldname ); |
|
1170 | + protected function _set_time_for($time, $fieldname) { |
|
1171 | + $this->_set_date_time('T', $time, $fieldname); |
|
1172 | 1172 | } |
1173 | 1173 | |
1174 | 1174 | |
@@ -1182,8 +1182,8 @@ discard block |
||
1182 | 1182 | * @param string|DateTime $date a valid date string for php datetime functions ( or DateTime object) |
1183 | 1183 | * @param string $fieldname the name of the field the date is being set on (must match a EE_Datetime_Field) |
1184 | 1184 | */ |
1185 | - protected function _set_date_for( $date, $fieldname ) { |
|
1186 | - $this->_set_date_time( 'D', $date, $fieldname ); |
|
1185 | + protected function _set_date_for($date, $fieldname) { |
|
1186 | + $this->_set_date_time('D', $date, $fieldname); |
|
1187 | 1187 | } |
1188 | 1188 | |
1189 | 1189 | |
@@ -1199,21 +1199,21 @@ discard block |
||
1199 | 1199 | * @param string|DateTime $datetime_value A valid Date or Time string (or DateTime object) |
1200 | 1200 | * @param string $fieldname the name of the field the date OR time is being set on (must match a EE_Datetime_Field property) |
1201 | 1201 | */ |
1202 | - protected function _set_date_time( $what = 'T', $datetime_value, $fieldname ) { |
|
1203 | - $field = $this->_get_dtt_field_settings( $fieldname ); |
|
1204 | - $field->set_timezone( $this->_timezone ); |
|
1205 | - $field->set_date_format( $this->_dt_frmt ); |
|
1206 | - $field->set_time_format( $this->_tm_frmt ); |
|
1202 | + protected function _set_date_time($what = 'T', $datetime_value, $fieldname) { |
|
1203 | + $field = $this->_get_dtt_field_settings($fieldname); |
|
1204 | + $field->set_timezone($this->_timezone); |
|
1205 | + $field->set_date_format($this->_dt_frmt); |
|
1206 | + $field->set_time_format($this->_tm_frmt); |
|
1207 | 1207 | |
1208 | - switch ( $what ) { |
|
1208 | + switch ($what) { |
|
1209 | 1209 | case 'T' : |
1210 | - $this->_fields[$fieldname] = $field->prepare_for_set_with_new_time( $datetime_value, $this->_fields[$fieldname] ); |
|
1210 | + $this->_fields[$fieldname] = $field->prepare_for_set_with_new_time($datetime_value, $this->_fields[$fieldname]); |
|
1211 | 1211 | break; |
1212 | 1212 | case 'D' : |
1213 | - $this->_fields[$fieldname] = $field->prepare_for_set_with_new_date( $datetime_value, $this->_fields[$fieldname] ); |
|
1213 | + $this->_fields[$fieldname] = $field->prepare_for_set_with_new_date($datetime_value, $this->_fields[$fieldname]); |
|
1214 | 1214 | break; |
1215 | 1215 | case 'B' : |
1216 | - $this->_fields[$fieldname] = $field->prepare_for_set( $datetime_value ); |
|
1216 | + $this->_fields[$fieldname] = $field->prepare_for_set($datetime_value); |
|
1217 | 1217 | break; |
1218 | 1218 | } |
1219 | 1219 | |
@@ -1236,25 +1236,25 @@ discard block |
||
1236 | 1236 | * @throws EE_Error |
1237 | 1237 | * @return string timestamp |
1238 | 1238 | */ |
1239 | - public function display_in_my_timezone( $field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '' ) { |
|
1239 | + public function display_in_my_timezone($field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '') { |
|
1240 | 1240 | EE_Registry::instance()->load_helper('DTT_Helper'); |
1241 | 1241 | $timezone = EEH_DTT_Helper::get_timezone(); |
1242 | 1242 | |
1243 | - if ( $timezone == $this->_timezone ) |
|
1243 | + if ($timezone == $this->_timezone) |
|
1244 | 1244 | return ''; |
1245 | 1245 | |
1246 | 1246 | $original_timezone = $this->_timezone; |
1247 | - $this->set_timezone( $timezone ); |
|
1247 | + $this->set_timezone($timezone); |
|
1248 | 1248 | |
1249 | 1249 | $fn = (array) $field_name; |
1250 | - $args = array_merge( $fn, (array) $args ); |
|
1250 | + $args = array_merge($fn, (array) $args); |
|
1251 | 1251 | |
1252 | - if ( !method_exists( $this, $callback ) ) |
|
1253 | - throw new EE_Error(sprintf( __('The method named "%s" given as the callback param in "display_in_my_timezone" does not exist. Please check your spelling', 'event_espresso'), $callback ) ); |
|
1252 | + if ( ! method_exists($this, $callback)) |
|
1253 | + throw new EE_Error(sprintf(__('The method named "%s" given as the callback param in "display_in_my_timezone" does not exist. Please check your spelling', 'event_espresso'), $callback)); |
|
1254 | 1254 | $args = (array) $args; |
1255 | - $return = $prepend . call_user_func_array( array( $this, $callback ), $args ) . $append; |
|
1255 | + $return = $prepend.call_user_func_array(array($this, $callback), $args).$append; |
|
1256 | 1256 | |
1257 | - $this->set_timezone( $original_timezone ); |
|
1257 | + $this->set_timezone($original_timezone); |
|
1258 | 1258 | return $return; |
1259 | 1259 | } |
1260 | 1260 | |
@@ -1268,7 +1268,7 @@ discard block |
||
1268 | 1268 | * |
1269 | 1269 | * @return boolean | int |
1270 | 1270 | */ |
1271 | - public function delete(){ |
|
1271 | + public function delete() { |
|
1272 | 1272 | /** |
1273 | 1273 | * Called just before the `EE_Base_Class::_delete` method call. |
1274 | 1274 | * Note: `EE_Base_Class::_delete` might be overridden by child classes so any client code hooking into these actions |
@@ -1277,7 +1277,7 @@ discard block |
||
1277 | 1277 | * |
1278 | 1278 | * @param EE_Base_Class $model_object about to be 'deleted' |
1279 | 1279 | */ |
1280 | - do_action( 'AHEE__EE_Base_Class__delete__before', $this ); |
|
1280 | + do_action('AHEE__EE_Base_Class__delete__before', $this); |
|
1281 | 1281 | $result = $this->_delete(); |
1282 | 1282 | /** |
1283 | 1283 | * Called just after the `EE_Base_Class::_delete` method call. |
@@ -1287,7 +1287,7 @@ discard block |
||
1287 | 1287 | * @param EE_Base_Class $model_object that was just 'deleted' |
1288 | 1288 | * @param boolean $result |
1289 | 1289 | */ |
1290 | - do_action( 'AHEE__EE_Base_Class__delete__end', $this, $result ); |
|
1290 | + do_action('AHEE__EE_Base_Class__delete__end', $this, $result); |
|
1291 | 1291 | return $result; |
1292 | 1292 | } |
1293 | 1293 | |
@@ -1310,22 +1310,22 @@ discard block |
||
1310 | 1310 | * Deletes this model object permanently from db (but keep in mind related models my block the delete and return an error) |
1311 | 1311 | * @return bool | int |
1312 | 1312 | */ |
1313 | - public function delete_permanently(){ |
|
1313 | + public function delete_permanently() { |
|
1314 | 1314 | /** |
1315 | 1315 | * Called just before HARD deleting a model object |
1316 | 1316 | * |
1317 | 1317 | * @param EE_Base_Class $model_object about to be 'deleted' |
1318 | 1318 | */ |
1319 | - do_action( 'AHEE__EE_Base_Class__delete_permanently__before', $this ); |
|
1320 | - $model=$this->get_model(); |
|
1321 | - $result=$model->delete_permanently_by_ID($this->ID()); |
|
1319 | + do_action('AHEE__EE_Base_Class__delete_permanently__before', $this); |
|
1320 | + $model = $this->get_model(); |
|
1321 | + $result = $model->delete_permanently_by_ID($this->ID()); |
|
1322 | 1322 | $this->refresh_cache_of_related_objects(); |
1323 | 1323 | /** |
1324 | 1324 | * Called just after HARD deleting a model object |
1325 | 1325 | * @param EE_Base_Class $model_object that was just 'deleted' |
1326 | 1326 | * @param boolean $result |
1327 | 1327 | */ |
1328 | - do_action( 'AHEE__EE_Base_Class__delete_permanently__end', $this, $result ); |
|
1328 | + do_action('AHEE__EE_Base_Class__delete_permanently__end', $this, $result); |
|
1329 | 1329 | return $result; |
1330 | 1330 | } |
1331 | 1331 | |
@@ -1334,18 +1334,18 @@ discard block |
||
1334 | 1334 | * related model objects |
1335 | 1335 | */ |
1336 | 1336 | public function refresh_cache_of_related_objects() { |
1337 | - foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) { |
|
1338 | - if( ! empty( $this->_model_relations[ $relation_name ] ) ) { |
|
1339 | - $related_objects = $this->_model_relations[ $relation_name ]; |
|
1340 | - if( $relation_obj instanceof EE_Belongs_To_Relation ) { |
|
1337 | + foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) { |
|
1338 | + if ( ! empty($this->_model_relations[$relation_name])) { |
|
1339 | + $related_objects = $this->_model_relations[$relation_name]; |
|
1340 | + if ($relation_obj instanceof EE_Belongs_To_Relation) { |
|
1341 | 1341 | //this relation only stores a single model object, not an array |
1342 | 1342 | //but let's make it consistent |
1343 | - $related_objects = array( $related_objects ); |
|
1343 | + $related_objects = array($related_objects); |
|
1344 | 1344 | } |
1345 | - foreach( $related_objects as $related_object ) { |
|
1345 | + foreach ($related_objects as $related_object) { |
|
1346 | 1346 | //only refresh their cache if they're in memory |
1347 | - if( $related_object instanceof EE_Base_Class ) { |
|
1348 | - $related_object->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1347 | + if ($related_object instanceof EE_Base_Class) { |
|
1348 | + $related_object->clear_cache($this->get_model()->get_this_model_name(), $this); |
|
1349 | 1349 | } |
1350 | 1350 | } |
1351 | 1351 | } |
@@ -1365,17 +1365,17 @@ discard block |
||
1365 | 1365 | * @return int , 1 on a successful update, the ID of the new entry on insert; 0 on failure or if the model object |
1366 | 1366 | * isn't allowed to persist (as determined by EE_Base_Class::allow_persist()) |
1367 | 1367 | */ |
1368 | - public function save($set_cols_n_values=array()) { |
|
1368 | + public function save($set_cols_n_values = array()) { |
|
1369 | 1369 | /** |
1370 | 1370 | * Filters the fields we're about to save on the model object |
1371 | 1371 | * |
1372 | 1372 | * @param array $set_cols_n_values |
1373 | 1373 | * @param EE_Base_Class $model_object |
1374 | 1374 | */ |
1375 | - $set_cols_n_values = apply_filters( 'FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this ); |
|
1375 | + $set_cols_n_values = apply_filters('FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this); |
|
1376 | 1376 | //set attributes as provided in $set_cols_n_values |
1377 | - foreach($set_cols_n_values as $column=>$value){ |
|
1378 | - $this->set($column,$value); |
|
1377 | + foreach ($set_cols_n_values as $column=>$value) { |
|
1378 | + $this->set($column, $value); |
|
1379 | 1379 | } |
1380 | 1380 | /** |
1381 | 1381 | * Saving a model object. |
@@ -1383,8 +1383,8 @@ discard block |
||
1383 | 1383 | * Before we perform a save, this action is fired. |
1384 | 1384 | * @param EE_Base_Class $model_object the model object about to be saved. |
1385 | 1385 | */ |
1386 | - do_action( 'AHEE__EE_Base_Class__save__begin', $this ); |
|
1387 | - if( ! $this->allow_persist() ) { |
|
1386 | + do_action('AHEE__EE_Base_Class__save__begin', $this); |
|
1387 | + if ( ! $this->allow_persist()) { |
|
1388 | 1388 | return 0; |
1389 | 1389 | } |
1390 | 1390 | //now get current attribute values |
@@ -1394,61 +1394,61 @@ discard block |
||
1394 | 1394 | $old_assumption_concerning_value_preparation = $this->get_model()->get_assumption_concerning_values_already_prepared_by_model_object(); |
1395 | 1395 | $this->get_model()->assume_values_already_prepared_by_model_object(true); |
1396 | 1396 | //does this model have an autoincrement PK? |
1397 | - if($this->get_model()->has_primary_key_field()){ |
|
1398 | - if($this->get_model()->get_primary_key_field()->is_auto_increment()){ |
|
1397 | + if ($this->get_model()->has_primary_key_field()) { |
|
1398 | + if ($this->get_model()->get_primary_key_field()->is_auto_increment()) { |
|
1399 | 1399 | //ok check if it's set, if so: update; if not, insert |
1400 | - if ( ! empty( $save_cols_n_values[self::_get_primary_key_name( get_class($this) )] ) ){ |
|
1401 | - $results = $this->get_model()->update_by_ID ( $save_cols_n_values, $this->ID() ); |
|
1400 | + if ( ! empty($save_cols_n_values[self::_get_primary_key_name(get_class($this))])) { |
|
1401 | + $results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID()); |
|
1402 | 1402 | } else { |
1403 | - unset($save_cols_n_values[self::_get_primary_key_name( get_class( $this) )]); |
|
1404 | - $results = $this->get_model()->insert( $save_cols_n_values, true); |
|
1405 | - if($results){ |
|
1403 | + unset($save_cols_n_values[self::_get_primary_key_name(get_class($this))]); |
|
1404 | + $results = $this->get_model()->insert($save_cols_n_values, true); |
|
1405 | + if ($results) { |
|
1406 | 1406 | //if successful, set the primary key |
1407 | 1407 | //but don't use the normal SET method, because it will check if |
1408 | 1408 | //an item with the same ID exists in the mapper & db, then |
1409 | 1409 | //will find it in the db (because we just added it) and THAT object |
1410 | 1410 | //will get added to the mapper before we can add this one! |
1411 | 1411 | //but if we just avoid using the SET method, all that headache can be avoided |
1412 | - $pk_field_name =self::_get_primary_key_name( get_class($this)); |
|
1412 | + $pk_field_name = self::_get_primary_key_name(get_class($this)); |
|
1413 | 1413 | $this->_fields[$pk_field_name] = $results; |
1414 | 1414 | $this->_clear_cached_property($pk_field_name); |
1415 | - $this->get_model()->add_to_entity_map( $this ); |
|
1415 | + $this->get_model()->add_to_entity_map($this); |
|
1416 | 1416 | $this->_update_cached_related_model_objs_fks(); |
1417 | 1417 | } |
1418 | 1418 | } |
1419 | - }else{//PK is NOT auto-increment |
|
1419 | + } else {//PK is NOT auto-increment |
|
1420 | 1420 | //so check if one like it already exists in the db |
1421 | - if( $this->get_model()->exists_by_ID( $this->ID() ) ){ |
|
1422 | - if( ! $this->in_entity_map() && WP_DEBUG ){ |
|
1421 | + if ($this->get_model()->exists_by_ID($this->ID())) { |
|
1422 | + if ( ! $this->in_entity_map() && WP_DEBUG) { |
|
1423 | 1423 | throw new EE_Error( |
1424 | 1424 | sprintf( |
1425 | - __( 'Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso' ), |
|
1425 | + __('Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso'), |
|
1426 | 1426 | get_class($this), |
1427 | - get_class( $this->get_model() ) . '::instance()->add_to_entity_map()', |
|
1428 | - get_class( $this->get_model() ) . '::instance()->get_one_by_ID()', |
|
1427 | + get_class($this->get_model()).'::instance()->add_to_entity_map()', |
|
1428 | + get_class($this->get_model()).'::instance()->get_one_by_ID()', |
|
1429 | 1429 | '<br />' |
1430 | 1430 | ) |
1431 | 1431 | ); |
1432 | 1432 | } |
1433 | 1433 | $results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID()); |
1434 | - }else{ |
|
1434 | + } else { |
|
1435 | 1435 | $results = $this->get_model()->insert($save_cols_n_values); |
1436 | 1436 | $this->_update_cached_related_model_objs_fks(); |
1437 | 1437 | } |
1438 | 1438 | } |
1439 | - }else{//there is NO primary key |
|
1439 | + } else {//there is NO primary key |
|
1440 | 1440 | $already_in_db = false; |
1441 | - foreach($this->get_model()->unique_indexes() as $index){ |
|
1441 | + foreach ($this->get_model()->unique_indexes() as $index) { |
|
1442 | 1442 | $uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields()); |
1443 | - if($this->get_model()->exists(array($uniqueness_where_params))){ |
|
1443 | + if ($this->get_model()->exists(array($uniqueness_where_params))) { |
|
1444 | 1444 | $already_in_db = true; |
1445 | 1445 | } |
1446 | 1446 | } |
1447 | - if( $already_in_db ){ |
|
1448 | - $combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() ); |
|
1449 | - $results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values ); |
|
1450 | - }else{ |
|
1451 | - $results = $this->get_model()->insert( $save_cols_n_values ); |
|
1447 | + if ($already_in_db) { |
|
1448 | + $combined_pk_fields_n_values = array_intersect_key($save_cols_n_values, $this->get_model()->get_combined_primary_key_fields()); |
|
1449 | + $results = $this->get_model()->update($save_cols_n_values, $combined_pk_fields_n_values); |
|
1450 | + } else { |
|
1451 | + $results = $this->get_model()->insert($save_cols_n_values); |
|
1452 | 1452 | } |
1453 | 1453 | } |
1454 | 1454 | //restore the old assumption about values being prepared by the model object |
@@ -1461,7 +1461,7 @@ discard block |
||
1461 | 1461 | * @param boolean|int $results if it were updated, TRUE or FALSE; if it were newly inserted |
1462 | 1462 | * the new ID (or 0 if an error occurred and it wasn't updated) |
1463 | 1463 | */ |
1464 | - do_action( 'AHEE__EE_Base_Class__save__end', $this, $results ); |
|
1464 | + do_action('AHEE__EE_Base_Class__save__end', $this, $results); |
|
1465 | 1465 | return $results; |
1466 | 1466 | } |
1467 | 1467 | |
@@ -1473,13 +1473,13 @@ discard block |
||
1473 | 1473 | * and we want to let its cached relations with foreign keys to it know about that change. Eg: we've created a transaction but haven't saved it to the db. We also create a registration and don't save it to the DB, but we DO cache it on the transaction. Now, when we save the transaction, the registration's TXN_ID will be automatically updated, whether or not they exist in the DB (if they do, their DB records will be automatically updated) |
1474 | 1474 | * @return void |
1475 | 1475 | */ |
1476 | - protected function _update_cached_related_model_objs_fks(){ |
|
1477 | - foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ){ |
|
1478 | - if( $relation_obj instanceof EE_Has_Many_Relation ){ |
|
1479 | - foreach( $this->get_all_from_cache( $relation_name ) as $related_model_obj_in_cache) { |
|
1480 | - $fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to( $this->get_model()->get_this_model_name() ); |
|
1481 | - $related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID() ); |
|
1482 | - if( $related_model_obj_in_cache->ID() ){ |
|
1476 | + protected function _update_cached_related_model_objs_fks() { |
|
1477 | + foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) { |
|
1478 | + if ($relation_obj instanceof EE_Has_Many_Relation) { |
|
1479 | + foreach ($this->get_all_from_cache($relation_name) as $related_model_obj_in_cache) { |
|
1480 | + $fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to($this->get_model()->get_this_model_name()); |
|
1481 | + $related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID()); |
|
1482 | + if ($related_model_obj_in_cache->ID()) { |
|
1483 | 1483 | $related_model_obj_in_cache->save(); |
1484 | 1484 | } |
1485 | 1485 | } |
@@ -1495,21 +1495,21 @@ discard block |
||
1495 | 1495 | * and this object and properly setup |
1496 | 1496 | * @return int ID of new model object on save; 0 on failure+ |
1497 | 1497 | */ |
1498 | - public function save_new_cached_related_model_objs(){ |
|
1498 | + public function save_new_cached_related_model_objs() { |
|
1499 | 1499 | //make sure this has been saved |
1500 | - if( ! $this->ID()){ |
|
1500 | + if ( ! $this->ID()) { |
|
1501 | 1501 | $id = $this->save(); |
1502 | - }else{ |
|
1502 | + } else { |
|
1503 | 1503 | $id = $this->ID(); |
1504 | 1504 | } |
1505 | 1505 | //now save all the NEW cached model objects (ie they don't exist in the DB) |
1506 | - foreach($this->get_model()->relation_settings() as $relationName => $relationObj){ |
|
1506 | + foreach ($this->get_model()->relation_settings() as $relationName => $relationObj) { |
|
1507 | 1507 | |
1508 | 1508 | |
1509 | - if($this->_model_relations[$relationName]){ |
|
1509 | + if ($this->_model_relations[$relationName]) { |
|
1510 | 1510 | //is this a relation where we should expect just ONE related object (ie, EE_Belongs_To_relation) |
1511 | 1511 | //or MANY related objects (ie, EE_HABTM_Relation or EE_Has_Many_Relation)? |
1512 | - if($relationObj instanceof EE_Belongs_To_Relation){ |
|
1512 | + if ($relationObj instanceof EE_Belongs_To_Relation) { |
|
1513 | 1513 | //add a relation to that relation type (which saves the appropriate thing in the process) |
1514 | 1514 | //but ONLY if it DOES NOT exist in the DB |
1515 | 1515 | /* @var $related_model_obj EE_Base_Class */ |
@@ -1518,8 +1518,8 @@ discard block |
||
1518 | 1518 | $this->_add_relation_to($related_model_obj, $relationName); |
1519 | 1519 | $related_model_obj->save_new_cached_related_model_objs(); |
1520 | 1520 | // } |
1521 | - }else{ |
|
1522 | - foreach($this->_model_relations[$relationName] as $related_model_obj){ |
|
1521 | + } else { |
|
1522 | + foreach ($this->_model_relations[$relationName] as $related_model_obj) { |
|
1523 | 1523 | //add a relation to that relation type (which saves the appropriate thing in the process) |
1524 | 1524 | //but ONLY if it DOES NOT exist in the DB |
1525 | 1525 | // if( ! $related_model_obj->ID()){ |
@@ -1540,8 +1540,8 @@ discard block |
||
1540 | 1540 | * @return \EEM_Base | \EEM_CPT_Base |
1541 | 1541 | */ |
1542 | 1542 | public function get_model() { |
1543 | - $modelName = self::_get_model_classname( get_class($this) ); |
|
1544 | - return self::_get_model_instance_with_name($modelName, $this->_timezone ); |
|
1543 | + $modelName = self::_get_model_classname(get_class($this)); |
|
1544 | + return self::_get_model_instance_with_name($modelName, $this->_timezone); |
|
1545 | 1545 | } |
1546 | 1546 | |
1547 | 1547 | |
@@ -1551,10 +1551,10 @@ discard block |
||
1551 | 1551 | * @param $classname |
1552 | 1552 | * @return mixed bool|EE_Base_Class|EEM_CPT_Base |
1553 | 1553 | */ |
1554 | - protected static function _get_object_from_entity_mapper($props_n_values, $classname){ |
|
1554 | + protected static function _get_object_from_entity_mapper($props_n_values, $classname) { |
|
1555 | 1555 | //TODO: will not work for Term_Relationships because they have no PK! |
1556 | - $primary_id_ref = self::_get_primary_key_name( $classname ); |
|
1557 | - if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) { |
|
1556 | + $primary_id_ref = self::_get_primary_key_name($classname); |
|
1557 | + if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) { |
|
1558 | 1558 | $id = $props_n_values[$primary_id_ref]; |
1559 | 1559 | return self::_get_model($classname)->get_from_entity_map($id); |
1560 | 1560 | } |
@@ -1573,35 +1573,35 @@ discard block |
||
1573 | 1573 | * date_format and the second value is the time format |
1574 | 1574 | * @return mixed (EE_Base_Class|bool) |
1575 | 1575 | */ |
1576 | - protected static function _check_for_object( $props_n_values, $classname, $timezone = NULL, $date_formats = array() ) { |
|
1577 | - if( self::_get_model( $classname )->has_primary_key_field()){ |
|
1578 | - $primary_id_ref = self::_get_primary_key_name( $classname ); |
|
1576 | + protected static function _check_for_object($props_n_values, $classname, $timezone = NULL, $date_formats = array()) { |
|
1577 | + if (self::_get_model($classname)->has_primary_key_field()) { |
|
1578 | + $primary_id_ref = self::_get_primary_key_name($classname); |
|
1579 | 1579 | |
1580 | - if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) { |
|
1581 | - $existing = self::_get_model( $classname, $timezone )->get_one_by_ID( $props_n_values[$primary_id_ref] ); |
|
1582 | - }else{ |
|
1580 | + if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) { |
|
1581 | + $existing = self::_get_model($classname, $timezone)->get_one_by_ID($props_n_values[$primary_id_ref]); |
|
1582 | + } else { |
|
1583 | 1583 | $existing = null; |
1584 | 1584 | } |
1585 | - }elseif( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields( $props_n_values ) ){ |
|
1585 | + }elseif (self::_get_model($classname, $timezone)->has_all_combined_primary_key_fields($props_n_values)) { |
|
1586 | 1586 | //no primary key on this model, but there's still a matching item in the DB |
1587 | - $existing = self::_get_model($classname, $timezone)->get_one_by_ID( self::_get_model($classname, $timezone)->get_index_primary_key_string( $props_n_values ) ); |
|
1588 | - }else{ |
|
1587 | + $existing = self::_get_model($classname, $timezone)->get_one_by_ID(self::_get_model($classname, $timezone)->get_index_primary_key_string($props_n_values)); |
|
1588 | + } else { |
|
1589 | 1589 | $existing = null; |
1590 | 1590 | } |
1591 | - if ( $existing ) { |
|
1591 | + if ($existing) { |
|
1592 | 1592 | |
1593 | 1593 | //set date formats if present before setting values |
1594 | - if ( ! empty( $date_formats ) && is_array( $date_formats ) ) { |
|
1595 | - $existing->set_date_format( $date_formats[0] ); |
|
1596 | - $existing->set_time_format( $date_formats[1] ); |
|
1594 | + if ( ! empty($date_formats) && is_array($date_formats)) { |
|
1595 | + $existing->set_date_format($date_formats[0]); |
|
1596 | + $existing->set_time_format($date_formats[1]); |
|
1597 | 1597 | } else { |
1598 | 1598 | //set default formats for date and time |
1599 | - $existing->set_date_format( get_option( 'date_format' ) ); |
|
1600 | - $existing->set_time_format( get_option( 'time_format' ) ); |
|
1599 | + $existing->set_date_format(get_option('date_format')); |
|
1600 | + $existing->set_time_format(get_option('time_format')); |
|
1601 | 1601 | } |
1602 | 1602 | |
1603 | - foreach ( $props_n_values as $property => $field_value ) { |
|
1604 | - $existing->set( $property, $field_value ); |
|
1603 | + foreach ($props_n_values as $property => $field_value) { |
|
1604 | + $existing->set($property, $field_value); |
|
1605 | 1605 | } |
1606 | 1606 | return $existing; |
1607 | 1607 | } else { |
@@ -1619,13 +1619,13 @@ discard block |
||
1619 | 1619 | * @throws EE_Error |
1620 | 1620 | * @return EEM_Base |
1621 | 1621 | */ |
1622 | - protected static function _get_model( $classname, $timezone = NULL ){ |
|
1622 | + protected static function _get_model($classname, $timezone = NULL) { |
|
1623 | 1623 | //find model for this class |
1624 | - if( ! $classname ){ |
|
1625 | - throw new EE_Error(sprintf(__("What were you thinking calling _get_model(%s)?? You need to specify the class name", "event_espresso"),$classname)); |
|
1624 | + if ( ! $classname) { |
|
1625 | + throw new EE_Error(sprintf(__("What were you thinking calling _get_model(%s)?? You need to specify the class name", "event_espresso"), $classname)); |
|
1626 | 1626 | } |
1627 | - $modelName=self::_get_model_classname($classname); |
|
1628 | - return self::_get_model_instance_with_name($modelName, $timezone ); |
|
1627 | + $modelName = self::_get_model_classname($classname); |
|
1628 | + return self::_get_model_instance_with_name($modelName, $timezone); |
|
1629 | 1629 | } |
1630 | 1630 | |
1631 | 1631 | |
@@ -1636,10 +1636,10 @@ discard block |
||
1636 | 1636 | * @param null $timezone |
1637 | 1637 | * @return EEM_Base |
1638 | 1638 | */ |
1639 | - protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){ |
|
1640 | - $model_classname = str_replace( 'EEM_', '', $model_classname ); |
|
1641 | - $model = EE_Registry::instance()->load_model( $model_classname ); |
|
1642 | - $model->set_timezone( $timezone ); |
|
1639 | + protected static function _get_model_instance_with_name($model_classname, $timezone = NULL) { |
|
1640 | + $model_classname = str_replace('EEM_', '', $model_classname); |
|
1641 | + $model = EE_Registry::instance()->load_model($model_classname); |
|
1642 | + $model->set_timezone($timezone); |
|
1643 | 1643 | return $model; |
1644 | 1644 | } |
1645 | 1645 | |
@@ -1651,10 +1651,10 @@ discard block |
||
1651 | 1651 | * @param null $model_name |
1652 | 1652 | * @return string like EEM_Attendee |
1653 | 1653 | */ |
1654 | - private static function _get_model_classname( $model_name = null){ |
|
1655 | - if(strpos($model_name,"EE_")===0){ |
|
1656 | - $model_classname=str_replace("EE_","EEM_",$model_name); |
|
1657 | - }else{ |
|
1654 | + private static function _get_model_classname($model_name = null) { |
|
1655 | + if (strpos($model_name, "EE_") === 0) { |
|
1656 | + $model_classname = str_replace("EE_", "EEM_", $model_name); |
|
1657 | + } else { |
|
1658 | 1658 | $model_classname = "EEM_".$model_name; |
1659 | 1659 | } |
1660 | 1660 | return $model_classname; |
@@ -1668,11 +1668,11 @@ discard block |
||
1668 | 1668 | * @throws EE_Error |
1669 | 1669 | * @return string |
1670 | 1670 | */ |
1671 | - protected static function _get_primary_key_name( $classname = NULL ){ |
|
1672 | - if( ! $classname){ |
|
1673 | - throw new EE_Error(sprintf(__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"),$classname)); |
|
1671 | + protected static function _get_primary_key_name($classname = NULL) { |
|
1672 | + if ( ! $classname) { |
|
1673 | + throw new EE_Error(sprintf(__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"), $classname)); |
|
1674 | 1674 | } |
1675 | - return self::_get_model( $classname )->get_primary_key_field()->get_name(); |
|
1675 | + return self::_get_model($classname)->get_primary_key_field()->get_name(); |
|
1676 | 1676 | } |
1677 | 1677 | |
1678 | 1678 | |
@@ -1684,12 +1684,12 @@ discard block |
||
1684 | 1684 | * Usually defaults for integer primary keys are 0; string primary keys are usually NULL). |
1685 | 1685 | * @return mixed, if the primary key is of type INT it'll be an int. Otherwise it could be a string |
1686 | 1686 | */ |
1687 | - public function ID(){ |
|
1687 | + public function ID() { |
|
1688 | 1688 | //now that we know the name of the variable, use a variable variable to get its value and return its |
1689 | - if( $this->get_model()->has_primary_key_field() ) { |
|
1690 | - return $this->_fields[self::_get_primary_key_name( get_class($this) )]; |
|
1691 | - }else{ |
|
1692 | - return $this->get_model()->get_index_primary_key_string( $this->_fields ); |
|
1689 | + if ($this->get_model()->has_primary_key_field()) { |
|
1690 | + return $this->_fields[self::_get_primary_key_name(get_class($this))]; |
|
1691 | + } else { |
|
1692 | + return $this->get_model()->get_index_primary_key_string($this->_fields); |
|
1693 | 1693 | } |
1694 | 1694 | } |
1695 | 1695 | |
@@ -1707,38 +1707,38 @@ discard block |
||
1707 | 1707 | * @throws EE_Error |
1708 | 1708 | * @return EE_Base_Class the object the relation was added to |
1709 | 1709 | */ |
1710 | - public function _add_relation_to( $otherObjectModelObjectOrID,$relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL ){ |
|
1710 | + public function _add_relation_to($otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL) { |
|
1711 | 1711 | //if this thing exists in the DB, save the relation to the DB |
1712 | - if( $this->ID() ){ |
|
1713 | - $otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values ); |
|
1712 | + if ($this->ID()) { |
|
1713 | + $otherObject = $this->get_model()->add_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values); |
|
1714 | 1714 | //clear cache so future get_many_related and get_first_related() return new results. |
1715 | - $this->clear_cache( $relationName, $otherObject, TRUE ); |
|
1716 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1717 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1715 | + $this->clear_cache($relationName, $otherObject, TRUE); |
|
1716 | + if ($otherObject instanceof EE_Base_Class) { |
|
1717 | + $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this); |
|
1718 | 1718 | } |
1719 | 1719 | } else { |
1720 | 1720 | //this thing doesn't exist in the DB, so just cache it |
1721 | - if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){ |
|
1722 | - throw new EE_Error( sprintf( |
|
1723 | - __( 'Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso' ), |
|
1721 | + if ( ! $otherObjectModelObjectOrID instanceof EE_Base_Class) { |
|
1722 | + throw new EE_Error(sprintf( |
|
1723 | + __('Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso'), |
|
1724 | 1724 | $otherObjectModelObjectOrID, |
1725 | - get_class( $this ) |
|
1725 | + get_class($this) |
|
1726 | 1726 | )); |
1727 | 1727 | } else { |
1728 | 1728 | $otherObject = $otherObjectModelObjectOrID; |
1729 | 1729 | } |
1730 | - $this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id ); |
|
1730 | + $this->cache($relationName, $otherObjectModelObjectOrID, $cache_id); |
|
1731 | 1731 | } |
1732 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1732 | + if ($otherObject instanceof EE_Base_Class) { |
|
1733 | 1733 | //fix the reciprocal relation too |
1734 | - if( $otherObject->ID() ) { |
|
1734 | + if ($otherObject->ID()) { |
|
1735 | 1735 | //its saved so assumed relations exist in the DB, so we can just |
1736 | 1736 | //clear the cache so future queries use the updated info in the DB |
1737 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true ); |
|
1737 | + $otherObject->clear_cache($this->get_model()->get_this_model_name(), null, true); |
|
1738 | 1738 | } else { |
1739 | 1739 | |
1740 | 1740 | //it's not saved, so it caches relations like this |
1741 | - $otherObject->cache( $this->get_model()->get_this_model_name(), $this ); |
|
1741 | + $otherObject->cache($this->get_model()->get_this_model_name(), $this); |
|
1742 | 1742 | } |
1743 | 1743 | } |
1744 | 1744 | return $otherObject; |
@@ -1761,17 +1761,17 @@ discard block |
||
1761 | 1761 | * Also remember that if an exact match isn't found for these extra cols/val pairs, then a NEW row is created in the join table. |
1762 | 1762 | * @return EE_Base_Class the relation was removed from |
1763 | 1763 | */ |
1764 | - public function _remove_relation_to($otherObjectModelObjectOrID,$relationName, $where_query = array() ){ |
|
1765 | - if ( $this->ID() ) { |
|
1764 | + public function _remove_relation_to($otherObjectModelObjectOrID, $relationName, $where_query = array()) { |
|
1765 | + if ($this->ID()) { |
|
1766 | 1766 | //if this exists in the DB, save the relation change to the DB too |
1767 | - $otherObject = $this->get_model()->remove_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $where_query ); |
|
1768 | - $this->clear_cache( $relationName, $otherObject ); |
|
1767 | + $otherObject = $this->get_model()->remove_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $where_query); |
|
1768 | + $this->clear_cache($relationName, $otherObject); |
|
1769 | 1769 | } else { |
1770 | 1770 | //this doesn't exist in the DB, just remove it from the cache |
1771 | - $otherObject = $this->clear_cache( $relationName, $otherObjectModelObjectOrID ); |
|
1771 | + $otherObject = $this->clear_cache($relationName, $otherObjectModelObjectOrID); |
|
1772 | 1772 | } |
1773 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1774 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1773 | + if ($otherObject instanceof EE_Base_Class) { |
|
1774 | + $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this); |
|
1775 | 1775 | } |
1776 | 1776 | return $otherObject; |
1777 | 1777 | } |
@@ -1782,18 +1782,18 @@ discard block |
||
1782 | 1782 | * @param array $where_query_params like EEM_Base::get_all's $query_params[0] (where conditions) |
1783 | 1783 | * @return EE_Base_Class |
1784 | 1784 | */ |
1785 | - public function _remove_relations($relationName,$where_query_params = array()){ |
|
1786 | - if ( $this->ID() ) { |
|
1785 | + public function _remove_relations($relationName, $where_query_params = array()) { |
|
1786 | + if ($this->ID()) { |
|
1787 | 1787 | //if this exists in the DB, save the relation change to the DB too |
1788 | - $otherObjects = $this->get_model()->remove_relations( $this, $relationName, $where_query_params ); |
|
1789 | - $this->clear_cache( $relationName, null, true ); |
|
1788 | + $otherObjects = $this->get_model()->remove_relations($this, $relationName, $where_query_params); |
|
1789 | + $this->clear_cache($relationName, null, true); |
|
1790 | 1790 | } else { |
1791 | 1791 | //this doesn't exist in the DB, just remove it from the cache |
1792 | - $otherObjects = $this->clear_cache( $relationName, null, true ); |
|
1792 | + $otherObjects = $this->clear_cache($relationName, null, true); |
|
1793 | 1793 | } |
1794 | - if( is_array( $otherObjects ) ) { |
|
1795 | - foreach ( $otherObjects as $otherObject ) { |
|
1796 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1794 | + if (is_array($otherObjects)) { |
|
1795 | + foreach ($otherObjects as $otherObject) { |
|
1796 | + $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this); |
|
1797 | 1797 | } |
1798 | 1798 | } |
1799 | 1799 | return $otherObjects; |
@@ -1811,26 +1811,26 @@ discard block |
||
1811 | 1811 | * @return EE_Base_Class[] Results not necessarily indexed by IDs, because some results might not have primary keys |
1812 | 1812 | * or might not be saved yet. Consider using EEM_Base::get_IDs() on these results if you want IDs |
1813 | 1813 | */ |
1814 | - public function get_many_related($relationName,$query_params = array()){ |
|
1815 | - if($this->ID()){//this exists in the DB, so get the related things from either the cache or the DB |
|
1814 | + public function get_many_related($relationName, $query_params = array()) { |
|
1815 | + if ($this->ID()) {//this exists in the DB, so get the related things from either the cache or the DB |
|
1816 | 1816 | //if there are query parameters, forget about caching the related model objects. |
1817 | - if( $query_params ){ |
|
1817 | + if ($query_params) { |
|
1818 | 1818 | $related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params); |
1819 | - }else{ |
|
1819 | + } else { |
|
1820 | 1820 | //did we already cache the result of this query? |
1821 | 1821 | $cached_results = $this->get_all_from_cache($relationName); |
1822 | - if ( ! $cached_results ){ |
|
1822 | + if ( ! $cached_results) { |
|
1823 | 1823 | $related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params); |
1824 | 1824 | //if no query parameters were passed, then we got all the related model objects |
1825 | 1825 | //for that relation. We can cache them then. |
1826 | - foreach($related_model_objects as $related_model_object){ |
|
1826 | + foreach ($related_model_objects as $related_model_object) { |
|
1827 | 1827 | $this->cache($relationName, $related_model_object); |
1828 | 1828 | } |
1829 | - }else{ |
|
1829 | + } else { |
|
1830 | 1830 | $related_model_objects = $cached_results; |
1831 | 1831 | } |
1832 | 1832 | } |
1833 | - }else{//this doesn't exist itn eh DB, so just get the related things from the cache |
|
1833 | + } else {//this doesn't exist itn eh DB, so just get the related things from the cache |
|
1834 | 1834 | $related_model_objects = $this->get_all_from_cache($relationName); |
1835 | 1835 | } |
1836 | 1836 | return $related_model_objects; |
@@ -1847,8 +1847,8 @@ discard block |
||
1847 | 1847 | * @param bool $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE; |
1848 | 1848 | * @return int |
1849 | 1849 | */ |
1850 | - public function count_related($relation_name, $query_params =array(),$field_to_count = NULL, $distinct = FALSE){ |
|
1851 | - return $this->get_model()->count_related($this,$relation_name,$query_params,$field_to_count,$distinct); |
|
1850 | + public function count_related($relation_name, $query_params = array(), $field_to_count = NULL, $distinct = FALSE) { |
|
1851 | + return $this->get_model()->count_related($this, $relation_name, $query_params, $field_to_count, $distinct); |
|
1852 | 1852 | } |
1853 | 1853 | |
1854 | 1854 | |
@@ -1862,7 +1862,7 @@ discard block |
||
1862 | 1862 | * By default, uses primary key (which doesn't make much sense, so you should probably change it) |
1863 | 1863 | * @return int |
1864 | 1864 | */ |
1865 | - public function sum_related($relation_name, $query_params = array(), $field_to_sum = null){ |
|
1865 | + public function sum_related($relation_name, $query_params = array(), $field_to_sum = null) { |
|
1866 | 1866 | return $this->get_model()->sum_related($this, $relation_name, $query_params, $field_to_sum); |
1867 | 1867 | } |
1868 | 1868 | |
@@ -1874,34 +1874,34 @@ discard block |
||
1874 | 1874 | * @param array $query_params like EEM_Base::get_all |
1875 | 1875 | * @return EE_Base_Class (not an array, a single object) |
1876 | 1876 | */ |
1877 | - public function get_first_related($relationName,$query_params = array()){ |
|
1878 | - if($this->ID()){//this exists in the DB, get from the cache OR the DB |
|
1877 | + public function get_first_related($relationName, $query_params = array()) { |
|
1878 | + if ($this->ID()) {//this exists in the DB, get from the cache OR the DB |
|
1879 | 1879 | |
1880 | 1880 | //if they've provided some query parameters, don't bother trying to cache the result |
1881 | 1881 | //also make sure we're not caching the result of get_first_related |
1882 | 1882 | //on a relation which should have an array of objects (because the cache might have an array of objects) |
1883 | - if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){ |
|
1884 | - $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
|
1885 | - }else{ |
|
1883 | + if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) { |
|
1884 | + $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
|
1885 | + } else { |
|
1886 | 1886 | //first, check if we've already cached the result of this query |
1887 | 1887 | $cached_result = $this->get_one_from_cache($relationName); |
1888 | - if ( ! $cached_result ){ |
|
1888 | + if ( ! $cached_result) { |
|
1889 | 1889 | |
1890 | 1890 | $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
1891 | - $this->cache($relationName,$related_model_object); |
|
1892 | - }else{ |
|
1891 | + $this->cache($relationName, $related_model_object); |
|
1892 | + } else { |
|
1893 | 1893 | $related_model_object = $cached_result; |
1894 | 1894 | } |
1895 | 1895 | } |
1896 | - }else{ |
|
1896 | + } else { |
|
1897 | 1897 | //this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might |
1898 | - if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){ |
|
1899 | - $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
|
1900 | - }else{ |
|
1898 | + if ($this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) { |
|
1899 | + $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
|
1900 | + } else { |
|
1901 | 1901 | $related_model_object = null; |
1902 | 1902 | } |
1903 | 1903 | //this doesn't exist in the DB and apparently the thing it belongs to doesn't either, just get what's cached on this object |
1904 | - if( ! $related_model_object){ |
|
1904 | + if ( ! $related_model_object) { |
|
1905 | 1905 | $related_model_object = $this->get_one_from_cache($relationName); |
1906 | 1906 | } |
1907 | 1907 | |
@@ -1920,12 +1920,12 @@ discard block |
||
1920 | 1920 | * @param array $query_params like EEM_Base::get_all's |
1921 | 1921 | * @return int how many deleted |
1922 | 1922 | */ |
1923 | - public function delete_related($relationName,$query_params = array()){ |
|
1924 | - if($this->ID()){ |
|
1925 | - $count = $this->get_model()->delete_related($this, $relationName, $query_params); |
|
1926 | - }else{ |
|
1923 | + public function delete_related($relationName, $query_params = array()) { |
|
1924 | + if ($this->ID()) { |
|
1925 | + $count = $this->get_model()->delete_related($this, $relationName, $query_params); |
|
1926 | + } else { |
|
1927 | 1927 | $count = count($this->get_all_from_cache($relationName)); |
1928 | - $this->clear_cache($relationName,NULL,TRUE); |
|
1928 | + $this->clear_cache($relationName, NULL, TRUE); |
|
1929 | 1929 | } |
1930 | 1930 | return $count; |
1931 | 1931 | } |
@@ -1940,13 +1940,13 @@ discard block |
||
1940 | 1940 | * @param array $query_params like EEM_Base::get_all's |
1941 | 1941 | * @return int how many deleted (including those soft deleted) |
1942 | 1942 | */ |
1943 | - public function delete_related_permanently($relationName,$query_params = array()){ |
|
1944 | - if($this->ID()){ |
|
1945 | - $count = $this->get_model()->delete_related_permanently($this, $relationName, $query_params); |
|
1946 | - }else{ |
|
1943 | + public function delete_related_permanently($relationName, $query_params = array()) { |
|
1944 | + if ($this->ID()) { |
|
1945 | + $count = $this->get_model()->delete_related_permanently($this, $relationName, $query_params); |
|
1946 | + } else { |
|
1947 | 1947 | $count = count($this->get_all_from_cache($relationName)); |
1948 | 1948 | } |
1949 | - $this->clear_cache($relationName,NULL,TRUE); |
|
1949 | + $this->clear_cache($relationName, NULL, TRUE); |
|
1950 | 1950 | return $count; |
1951 | 1951 | } |
1952 | 1952 | |
@@ -1962,7 +1962,7 @@ discard block |
||
1962 | 1962 | * @param string $field_name property to check |
1963 | 1963 | * @return bool TRUE if existing,FALSE if not. |
1964 | 1964 | */ |
1965 | - public function is_set( $field_name ) { |
|
1965 | + public function is_set($field_name) { |
|
1966 | 1966 | return isset($this->_fields[$field_name]); |
1967 | 1967 | } |
1968 | 1968 | |
@@ -1974,12 +1974,12 @@ discard block |
||
1974 | 1974 | * @throws EE_Error |
1975 | 1975 | * @return bool TRUE if existing, throw EE_Error if not. |
1976 | 1976 | */ |
1977 | - protected function _property_exists( $properties ) { |
|
1977 | + protected function _property_exists($properties) { |
|
1978 | 1978 | |
1979 | - foreach ( (array) $properties as $property_name ) { |
|
1979 | + foreach ((array) $properties as $property_name) { |
|
1980 | 1980 | //first make sure this property exists |
1981 | - if ( ! $this->_fields[ $property_name ] ) |
|
1982 | - throw new EE_Error( sprintf( __('Trying to retrieve a non-existent property (%s). Double check the spelling please', 'event_espresso'), $property_name ) ); |
|
1981 | + if ( ! $this->_fields[$property_name]) |
|
1982 | + throw new EE_Error(sprintf(__('Trying to retrieve a non-existent property (%s). Double check the spelling please', 'event_espresso'), $property_name)); |
|
1983 | 1983 | } |
1984 | 1984 | |
1985 | 1985 | return TRUE; |
@@ -1996,7 +1996,7 @@ discard block |
||
1996 | 1996 | $fields = $this->get_model()->field_settings(FALSE); |
1997 | 1997 | $properties = array(); |
1998 | 1998 | //remove prepended underscore |
1999 | - foreach ( $fields as $field_name => $settings ) { |
|
1999 | + foreach ($fields as $field_name => $settings) { |
|
2000 | 2000 | $properties[$field_name] = $this->get($field_name); |
2001 | 2001 | } |
2002 | 2002 | return $properties; |
@@ -2026,14 +2026,14 @@ discard block |
||
2026 | 2026 | * @throws EE_Error |
2027 | 2027 | * @return mixed whatever the plugin which calls add_filter decides |
2028 | 2028 | */ |
2029 | - public function __call($methodName,$args){ |
|
2030 | - $className=get_class($this); |
|
2031 | - $tagName="FHEE__{$className}__{$methodName}"; |
|
2032 | - if(!has_filter($tagName)){ |
|
2033 | - throw new EE_Error(sprintf(__("Method %s on class %s does not exist! You can create one with the following code in functions.php or in a plugin: add_filter('%s','my_callback',10,3);function my_callback(\$previousReturnValue,EE_Base_Class \$object, \$argsArray){/*function body*/return \$whatever;}","event_espresso"), |
|
2034 | - $methodName,$className,$tagName)); |
|
2029 | + public function __call($methodName, $args) { |
|
2030 | + $className = get_class($this); |
|
2031 | + $tagName = "FHEE__{$className}__{$methodName}"; |
|
2032 | + if ( ! has_filter($tagName)) { |
|
2033 | + throw new EE_Error(sprintf(__("Method %s on class %s does not exist! You can create one with the following code in functions.php or in a plugin: add_filter('%s','my_callback',10,3);function my_callback(\$previousReturnValue,EE_Base_Class \$object, \$argsArray){/*function body*/return \$whatever;}", "event_espresso"), |
|
2034 | + $methodName, $className, $tagName)); |
|
2035 | 2035 | } |
2036 | - return apply_filters($tagName,null,$this,$args); |
|
2036 | + return apply_filters($tagName, null, $this, $args); |
|
2037 | 2037 | } |
2038 | 2038 | |
2039 | 2039 | |
@@ -2048,22 +2048,22 @@ discard block |
||
2048 | 2048 | * @return int records updated (or BOOLEAN if we actually ended up inserting the extra meta row) |
2049 | 2049 | * NOTE: if the values haven't changed, returns 0 |
2050 | 2050 | */ |
2051 | - public function update_extra_meta($meta_key,$meta_value,$previous_value = NULL){ |
|
2052 | - $query_params = array(array( |
|
2051 | + public function update_extra_meta($meta_key, $meta_value, $previous_value = NULL) { |
|
2052 | + $query_params = array(array( |
|
2053 | 2053 | 'EXM_key'=>$meta_key, |
2054 | 2054 | 'OBJ_ID'=>$this->ID(), |
2055 | 2055 | 'EXM_type'=>$this->get_model()->get_this_model_name())); |
2056 | - if($previous_value !== NULL){ |
|
2056 | + if ($previous_value !== NULL) { |
|
2057 | 2057 | $query_params[0]['EXM_value'] = $meta_value; |
2058 | 2058 | } |
2059 | 2059 | $existing_rows_like_that = EEM_Extra_Meta::instance()->get_all($query_params); |
2060 | - if( ! $existing_rows_like_that){ |
|
2060 | + if ( ! $existing_rows_like_that) { |
|
2061 | 2061 | return $this->add_extra_meta($meta_key, $meta_value); |
2062 | - }else{ |
|
2063 | - foreach( $existing_rows_like_that as $existing_row){ |
|
2064 | - $existing_row->save( array( 'EXM_value' => $meta_value ) ); |
|
2062 | + } else { |
|
2063 | + foreach ($existing_rows_like_that as $existing_row) { |
|
2064 | + $existing_row->save(array('EXM_value' => $meta_value)); |
|
2065 | 2065 | } |
2066 | - return count( $existing_rows_like_that ); |
|
2066 | + return count($existing_rows_like_that); |
|
2067 | 2067 | } |
2068 | 2068 | } |
2069 | 2069 | |
@@ -2076,10 +2076,10 @@ discard block |
||
2076 | 2076 | * @param boolean $unique |
2077 | 2077 | * @return boolean |
2078 | 2078 | */ |
2079 | - public function add_extra_meta($meta_key,$meta_value,$unique = false){ |
|
2080 | - if($unique){ |
|
2081 | - $existing_extra_meta = EEM_Extra_Meta::instance()->get_one(array(array('EXM_key'=>$meta_key,'OBJ_ID'=>$this->ID(),'EXM_type'=>$this->_get_model_classname(get_class($this))))); |
|
2082 | - if($existing_extra_meta){ |
|
2079 | + public function add_extra_meta($meta_key, $meta_value, $unique = false) { |
|
2080 | + if ($unique) { |
|
2081 | + $existing_extra_meta = EEM_Extra_Meta::instance()->get_one(array(array('EXM_key'=>$meta_key, 'OBJ_ID'=>$this->ID(), 'EXM_type'=>$this->_get_model_classname(get_class($this))))); |
|
2082 | + if ($existing_extra_meta) { |
|
2083 | 2083 | return false; |
2084 | 2084 | } |
2085 | 2085 | } |
@@ -2099,12 +2099,12 @@ discard block |
||
2099 | 2099 | * @param string $meta_value |
2100 | 2100 | * @return int number of extra meta rows deleted |
2101 | 2101 | */ |
2102 | - public function delete_extra_meta($meta_key,$meta_value = NULL){ |
|
2103 | - $query_params = array(array( |
|
2102 | + public function delete_extra_meta($meta_key, $meta_value = NULL) { |
|
2103 | + $query_params = array(array( |
|
2104 | 2104 | 'EXM_key'=>$meta_key, |
2105 | 2105 | 'OBJ_ID'=>$this->ID(), |
2106 | 2106 | 'EXM_type'=>$this->get_model()->get_this_model_name())); |
2107 | - if($meta_value !== NULL){ |
|
2107 | + if ($meta_value !== NULL) { |
|
2108 | 2108 | $query_params[0]['EXM_value'] = $meta_value; |
2109 | 2109 | } |
2110 | 2110 | $count_deleted = EEM_Extra_Meta::instance()->delete($query_params); |
@@ -2120,25 +2120,25 @@ discard block |
||
2120 | 2120 | * @param mixed $default if we don't find anything, what should we return? |
2121 | 2121 | * @return mixed single value if $single; array if ! $single |
2122 | 2122 | */ |
2123 | - public function get_extra_meta($meta_key,$single = FALSE,$default = NULL){ |
|
2124 | - if($single){ |
|
2125 | - $result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key))); |
|
2126 | - if ( $result instanceof EE_Extra_Meta ){ |
|
2123 | + public function get_extra_meta($meta_key, $single = FALSE, $default = NULL) { |
|
2124 | + if ($single) { |
|
2125 | + $result = $this->get_first_related('Extra_Meta', array(array('EXM_key'=>$meta_key))); |
|
2126 | + if ($result instanceof EE_Extra_Meta) { |
|
2127 | 2127 | return $result->value(); |
2128 | - }else{ |
|
2128 | + } else { |
|
2129 | 2129 | return $default; |
2130 | 2130 | } |
2131 | - }else{ |
|
2132 | - $results = $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key))); |
|
2133 | - if($results){ |
|
2131 | + } else { |
|
2132 | + $results = $this->get_many_related('Extra_Meta', array(array('EXM_key'=>$meta_key))); |
|
2133 | + if ($results) { |
|
2134 | 2134 | $values = array(); |
2135 | - foreach($results as $result){ |
|
2136 | - if ( $result instanceof EE_Extra_Meta ){ |
|
2135 | + foreach ($results as $result) { |
|
2136 | + if ($result instanceof EE_Extra_Meta) { |
|
2137 | 2137 | $values[$result->ID()] = $result->value(); |
2138 | 2138 | } |
2139 | 2139 | } |
2140 | 2140 | return $values; |
2141 | - }else{ |
|
2141 | + } else { |
|
2142 | 2142 | return $default; |
2143 | 2143 | } |
2144 | 2144 | } |
@@ -2155,20 +2155,20 @@ discard block |
||
2155 | 2155 | * @param boolean $one_of_each_key |
2156 | 2156 | * @return array |
2157 | 2157 | */ |
2158 | - public function all_extra_meta_array($one_of_each_key = true){ |
|
2158 | + public function all_extra_meta_array($one_of_each_key = true) { |
|
2159 | 2159 | $return_array = array(); |
2160 | - if($one_of_each_key){ |
|
2160 | + if ($one_of_each_key) { |
|
2161 | 2161 | $extra_meta_objs = $this->get_many_related('Extra_Meta', array('group_by'=>'EXM_key')); |
2162 | - foreach($extra_meta_objs as $extra_meta_obj){ |
|
2163 | - if ( $extra_meta_obj instanceof EE_Extra_Meta ) { |
|
2162 | + foreach ($extra_meta_objs as $extra_meta_obj) { |
|
2163 | + if ($extra_meta_obj instanceof EE_Extra_Meta) { |
|
2164 | 2164 | $return_array[$extra_meta_obj->key()] = $extra_meta_obj->value(); |
2165 | 2165 | } |
2166 | 2166 | } |
2167 | - }else{ |
|
2167 | + } else { |
|
2168 | 2168 | $extra_meta_objs = $this->get_many_related('Extra_Meta'); |
2169 | - foreach($extra_meta_objs as $extra_meta_obj){ |
|
2170 | - if ( $extra_meta_obj instanceof EE_Extra_Meta ) { |
|
2171 | - if( ! isset($return_array[$extra_meta_obj->key()])){ |
|
2169 | + foreach ($extra_meta_objs as $extra_meta_obj) { |
|
2170 | + if ($extra_meta_obj instanceof EE_Extra_Meta) { |
|
2171 | + if ( ! isset($return_array[$extra_meta_obj->key()])) { |
|
2172 | 2172 | $return_array[$extra_meta_obj->key()] = array(); |
2173 | 2173 | } |
2174 | 2174 | $return_array[$extra_meta_obj->key()][$extra_meta_obj->ID()] = $extra_meta_obj->value(); |
@@ -2181,19 +2181,19 @@ discard block |
||
2181 | 2181 | * Gets a pretty nice displayable nice for this model object. Often overridden |
2182 | 2182 | * @return string |
2183 | 2183 | */ |
2184 | - public function name(){ |
|
2184 | + public function name() { |
|
2185 | 2185 | //find a field that's not a text field |
2186 | 2186 | $field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base'); |
2187 | - if($field_we_can_use){ |
|
2187 | + if ($field_we_can_use) { |
|
2188 | 2188 | return $this->get($field_we_can_use->get_name()); |
2189 | - }else{ |
|
2189 | + } else { |
|
2190 | 2190 | $first_few_properties = $this->model_field_array(); |
2191 | - $first_few_properties = array_slice($first_few_properties,0,3); |
|
2191 | + $first_few_properties = array_slice($first_few_properties, 0, 3); |
|
2192 | 2192 | $name_parts = array(); |
2193 | - foreach( $first_few_properties as $name=> $value ){ |
|
2193 | + foreach ($first_few_properties as $name=> $value) { |
|
2194 | 2194 | $name_parts[] = "$name:$value"; |
2195 | 2195 | } |
2196 | - return implode(",",$name_parts); |
|
2196 | + return implode(",", $name_parts); |
|
2197 | 2197 | } |
2198 | 2198 | } |
2199 | 2199 | |
@@ -2202,11 +2202,11 @@ discard block |
||
2202 | 2202 | * Checks if this model object has been proven to already be in the entity map |
2203 | 2203 | * @return boolean |
2204 | 2204 | */ |
2205 | - public function in_entity_map(){ |
|
2206 | - if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) { |
|
2205 | + public function in_entity_map() { |
|
2206 | + if ($this->ID() && $this->get_model()->get_from_entity_map($this->ID()) === $this) { |
|
2207 | 2207 | //well, if we looked, did we find it in the entity map? |
2208 | 2208 | return TRUE; |
2209 | - }else{ |
|
2209 | + } else { |
|
2210 | 2210 | return FALSE; |
2211 | 2211 | } |
2212 | 2212 | } |
@@ -2217,21 +2217,21 @@ discard block |
||
2217 | 2217 | * @throws EE_Error if this model object isn't in the entity mapper (because then you should |
2218 | 2218 | * just use what's in the entity mapper and refresh it) and WP_DEBUG is TRUE |
2219 | 2219 | */ |
2220 | - public function refresh_from_db(){ |
|
2221 | - if( $this->ID() && $this->in_entity_map() ){ |
|
2222 | - $this->get_model()->refresh_entity_map_from_db( $this->ID() ); |
|
2223 | - }else{ |
|
2220 | + public function refresh_from_db() { |
|
2221 | + if ($this->ID() && $this->in_entity_map()) { |
|
2222 | + $this->get_model()->refresh_entity_map_from_db($this->ID()); |
|
2223 | + } else { |
|
2224 | 2224 | //if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database) |
2225 | 2225 | //if it has an ID but it's not in the map, and you're asking me to refresh it |
2226 | 2226 | //that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's |
2227 | 2227 | //absolutely nothing in it for this ID |
2228 | - if( WP_DEBUG ) { |
|
2228 | + if (WP_DEBUG) { |
|
2229 | 2229 | throw new EE_Error( |
2230 | 2230 | sprintf( |
2231 | - __( 'Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso' ), |
|
2231 | + __('Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso'), |
|
2232 | 2232 | $this->ID(), |
2233 | - get_class( $this->get_model() ) . '::instance()->add_to_entity_map()', |
|
2234 | - get_class( $this->get_model() ) . '::instance()->refresh_entity_map()' |
|
2233 | + get_class($this->get_model()).'::instance()->add_to_entity_map()', |
|
2234 | + get_class($this->get_model()).'::instance()->refresh_entity_map()' |
|
2235 | 2235 | ) |
2236 | 2236 | ); |
2237 | 2237 | } |
@@ -2243,8 +2243,8 @@ discard block |
||
2243 | 2243 | * (probably a bad assumption they have made, oh well) |
2244 | 2244 | * @return string |
2245 | 2245 | */ |
2246 | - public function __toString(){ |
|
2247 | - return sprintf( '%s (%s)', $this->name(), $this->ID() ); |
|
2246 | + public function __toString() { |
|
2247 | + return sprintf('%s (%s)', $this->name(), $this->ID()); |
|
2248 | 2248 | } |
2249 | 2249 | |
2250 | 2250 | /** |
@@ -2276,16 +2276,16 @@ discard block |
||
2276 | 2276 | * @return array |
2277 | 2277 | */ |
2278 | 2278 | public function __sleep() { |
2279 | - foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) { |
|
2280 | - if( $relation_obj instanceof EE_Belongs_To_Relation ) { |
|
2281 | - $classname = 'EE_' . $this->get_model()->get_this_model_name(); |
|
2282 | - if( $this->get_one_from_cache( $relation_name ) instanceof $classname && |
|
2283 | - $this->get_one_from_cache( $relation_name )->ID() ) { |
|
2284 | - $this->clear_cache( $relation_name, $this->get_one_from_cache( $relation_name )->ID() ); |
|
2279 | + foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) { |
|
2280 | + if ($relation_obj instanceof EE_Belongs_To_Relation) { |
|
2281 | + $classname = 'EE_'.$this->get_model()->get_this_model_name(); |
|
2282 | + if ($this->get_one_from_cache($relation_name) instanceof $classname && |
|
2283 | + $this->get_one_from_cache($relation_name)->ID()) { |
|
2284 | + $this->clear_cache($relation_name, $this->get_one_from_cache($relation_name)->ID()); |
|
2285 | 2285 | } |
2286 | 2286 | } |
2287 | 2287 | } |
2288 | - return array_keys( get_object_vars( $this ) ); |
|
2288 | + return array_keys(get_object_vars($this)); |
|
2289 | 2289 | } |
2290 | 2290 | |
2291 | 2291 |
@@ -503,7 +503,7 @@ |
||
503 | 503 | /** |
504 | 504 | * @param $message_types |
505 | 505 | * @param array $extra |
506 | - * @return mixed|string |
|
506 | + * @return string |
|
507 | 507 | */ |
508 | 508 | protected function _get_admin_content_events_edit( $message_types, $extra ) { |
509 | 509 | //defaults |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | 4 | |
5 | 5 | /** |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * |
44 | 44 | * @param EE_Admin_Page $admin_page |
45 | 45 | */ |
46 | - public function __construct( $admin_page ) { |
|
46 | + public function __construct($admin_page) { |
|
47 | 47 | parent::__construct($admin_page); |
48 | - require_once( EE_HELPERS . 'EEH_DTT_Helper.helper.php' ); |
|
48 | + require_once(EE_HELPERS.'EEH_DTT_Helper.helper.php'); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | protected function _setup_data() { |
56 | 56 | $this->_data = $this->_admin_page->get_events($this->_per_page, $this->_current_page); |
57 | - $this->_all_data_count = $this->_admin_page->get_events(0,0, TRUE); |
|
57 | + $this->_all_data_count = $this->_admin_page->get_events(0, 0, TRUE); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | |
@@ -85,17 +85,17 @@ discard block |
||
85 | 85 | |
86 | 86 | |
87 | 87 | $this->_sortable_columns = array( |
88 | - 'id' => array( 'EVT_ID' => true ), |
|
89 | - 'name' => array( 'EVT_name' => false ), |
|
90 | - 'author' => array( 'EVT_wp_user' => false ), |
|
91 | - 'venue' => array( 'Venue.VNU_name' => false ), |
|
88 | + 'id' => array('EVT_ID' => true), |
|
89 | + 'name' => array('EVT_name' => false), |
|
90 | + 'author' => array('EVT_wp_user' => false), |
|
91 | + 'venue' => array('Venue.VNU_name' => false), |
|
92 | 92 | 'start_date_time' => array('Datetime.DTT_EVT_start' => false), |
93 | 93 | 'reg_begins' => array('Datetime.Ticket.TKT_start_date' => false), |
94 | 94 | ); |
95 | 95 | |
96 | 96 | $this->_primary_column = 'id'; |
97 | 97 | |
98 | - $this->_hidden_columns = array( 'author' ); |
|
98 | + $this->_hidden_columns = array('author'); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | protected function _add_view_counts() { |
114 | 114 | $this->_views['all']['count'] = $this->_admin_page->total_events(); |
115 | 115 | $this->_views['draft']['count'] = $this->_admin_page->total_events_draft(); |
116 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) { |
|
116 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) { |
|
117 | 117 | $this->_views['trash']['count'] = $this->_admin_page->total_trashed_events(); |
118 | 118 | } |
119 | 119 | } |
@@ -124,11 +124,11 @@ discard block |
||
124 | 124 | * |
125 | 125 | * @return string |
126 | 126 | */ |
127 | - protected function _get_row_class( $item ) { |
|
128 | - $class = parent::_get_row_class( $item ); |
|
127 | + protected function _get_row_class($item) { |
|
128 | + $class = parent::_get_row_class($item); |
|
129 | 129 | //add status class |
130 | - $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-' . $item->get_active_status() : ''; |
|
131 | - if ( $this->_has_checkbox_column ) { |
|
130 | + $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-'.$item->get_active_status() : ''; |
|
131 | + if ($this->_has_checkbox_column) { |
|
132 | 132 | $class .= ' has-checkbox-column'; |
133 | 133 | } |
134 | 134 | return $class; |
@@ -140,8 +140,8 @@ discard block |
||
140 | 140 | * |
141 | 141 | * @return string |
142 | 142 | */ |
143 | - public function column_status( EE_Event $item ) { |
|
144 | - return '<span class="ee-status-strip ee-status-strip-td event-status-' . $item->get_active_status() . '"></span>'; |
|
143 | + public function column_status(EE_Event $item) { |
|
144 | + return '<span class="ee-status-strip ee-status-strip-td event-status-'.$item->get_active_status().'"></span>'; |
|
145 | 145 | }/**/ |
146 | 146 | |
147 | 147 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * |
151 | 151 | * @return string |
152 | 152 | */ |
153 | - public function column_cb( $item ) { |
|
153 | + public function column_cb($item) { |
|
154 | 154 | $this->_dtt = $item->primary_datetime(); //set this for use in other columns |
155 | 155 | |
156 | 156 | //does event have any attached registrations? |
@@ -166,9 +166,9 @@ discard block |
||
166 | 166 | * |
167 | 167 | * @return mixed|string |
168 | 168 | */ |
169 | - public function column_id( EE_Event $item ) { |
|
169 | + public function column_id(EE_Event $item) { |
|
170 | 170 | $content = $item->ID(); |
171 | - $content .= ' <span class="show-on-mobile-view-only">' . $item->name() . '</span>'; |
|
171 | + $content .= ' <span class="show-on-mobile-view-only">'.$item->name().'</span>'; |
|
172 | 172 | return $content; |
173 | 173 | } |
174 | 174 | |
@@ -178,16 +178,16 @@ discard block |
||
178 | 178 | * |
179 | 179 | * @return string |
180 | 180 | */ |
181 | - public function column_name( EE_Event $item ) { |
|
181 | + public function column_name(EE_Event $item) { |
|
182 | 182 | $edit_query_args = array( |
183 | 183 | 'action' => 'edit', |
184 | 184 | 'post' => $item->ID() |
185 | 185 | ); |
186 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
187 | - $actions = $this->_column_name_action_setup( $item ); |
|
186 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
187 | + $actions = $this->_column_name_action_setup($item); |
|
188 | 188 | $status = ''; //$item->status() !== 'publish' ? ' (' . $item->status() . ')' : ''; |
189 | - $content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' . $status; |
|
190 | - $content .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->get_active_status(), false, 'sentence' ) . '</span>'; |
|
189 | + $content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>'.$status; |
|
190 | + $content .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->get_active_status(), false, 'sentence').'</span>'; |
|
191 | 191 | $content .= $this->row_actions($actions); |
192 | 192 | return $content; |
193 | 193 | |
@@ -204,72 +204,72 @@ discard block |
||
204 | 204 | * |
205 | 205 | * @return array array of actions |
206 | 206 | */ |
207 | - protected function _column_name_action_setup( EE_Event $item ) { |
|
207 | + protected function _column_name_action_setup(EE_Event $item) { |
|
208 | 208 | //todo: remove when attendees is active |
209 | - if ( !defined('REG_ADMIN_URL') ) |
|
209 | + if ( ! defined('REG_ADMIN_URL')) |
|
210 | 210 | define('REG_ADMIN_URL', EVENTS_ADMIN_URL); |
211 | 211 | |
212 | 212 | $actions = array(); |
213 | 213 | |
214 | - if ( EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID() ) ) { |
|
214 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) { |
|
215 | 215 | $edit_query_args = array( |
216 | 216 | 'action' => 'edit', |
217 | 217 | 'post' => $item->ID() |
218 | 218 | ); |
219 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
220 | - $actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'; |
|
219 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
220 | + $actions['edit'] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'; |
|
221 | 221 | |
222 | 222 | } |
223 | 223 | |
224 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) { |
|
224 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) { |
|
225 | 225 | $attendees_query_args = array( |
226 | 226 | 'action' => 'default', |
227 | 227 | 'event_id' => $item->ID() |
228 | 228 | ); |
229 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
230 | - $actions['attendees'] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrations', 'event_espresso') . '">' . __('Registrations', 'event_espresso') . '</a>'; |
|
229 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
230 | + $actions['attendees'] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrations', 'event_espresso').'">'.__('Registrations', 'event_espresso').'</a>'; |
|
231 | 231 | } |
232 | 232 | |
233 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) { |
|
233 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) { |
|
234 | 234 | $trash_event_query_args = array( |
235 | 235 | 'action' => 'trash_event', |
236 | 236 | 'EVT_ID' => $item->ID() |
237 | 237 | ); |
238 | - $trash_event_link = EE_Admin_Page::add_query_args_and_nonce( $trash_event_query_args, EVENTS_ADMIN_URL ); |
|
238 | + $trash_event_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args, EVENTS_ADMIN_URL); |
|
239 | 239 | } |
240 | 240 | |
241 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) { |
|
241 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) { |
|
242 | 242 | $restore_event_query_args = array( |
243 | 243 | 'action' => 'restore_event', |
244 | 244 | 'EVT_ID' => $item->ID() |
245 | 245 | ); |
246 | - $restore_event_link = EE_Admin_Page::add_query_args_and_nonce( $restore_event_query_args, EVENTS_ADMIN_URL ); |
|
246 | + $restore_event_link = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args, EVENTS_ADMIN_URL); |
|
247 | 247 | } |
248 | 248 | |
249 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) { |
|
249 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) { |
|
250 | 250 | $delete_event_query_args = array( |
251 | 251 | 'action' => 'delete_event', |
252 | 252 | 'EVT_ID' => $item->ID() |
253 | 253 | ); |
254 | - $delete_event_link = EE_Admin_Page::add_query_args_and_nonce( $delete_event_query_args, EVENTS_ADMIN_URL ); |
|
254 | + $delete_event_link = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args, EVENTS_ADMIN_URL); |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | $view_link = get_permalink($item->ID()); |
258 | 258 | |
259 | - $actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '">' . __('View', 'event_espresso') . '</a>'; |
|
259 | + $actions['view'] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'">'.__('View', 'event_espresso').'</a>'; |
|
260 | 260 | |
261 | - switch ( $item->get( 'status' ) ) { |
|
261 | + switch ($item->get('status')) { |
|
262 | 262 | case 'trash' : |
263 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) { |
|
264 | - $actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" title="' . esc_attr__('Restore from Trash', 'event_espresso') . '">' . __('Restore from Trash', 'event_espresso') . '</a>'; |
|
263 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) { |
|
264 | + $actions['restore_from_trash'] = '<a href="'.$restore_event_link.'" title="'.esc_attr__('Restore from Trash', 'event_espresso').'">'.__('Restore from Trash', 'event_espresso').'</a>'; |
|
265 | 265 | } |
266 | - if ( $item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) { |
|
267 | - $actions['delete'] = '<a href="' . $delete_event_link . '" title="' . esc_attr__('Delete Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>'; |
|
266 | + if ($item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) { |
|
267 | + $actions['delete'] = '<a href="'.$delete_event_link.'" title="'.esc_attr__('Delete Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>'; |
|
268 | 268 | } |
269 | 269 | break; |
270 | 270 | default : |
271 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) { |
|
272 | - $actions['move to trash'] = '<a href="' . $trash_event_link . '" title="' . esc_attr__('Trash Event', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>'; |
|
271 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) { |
|
272 | + $actions['move to trash'] = '<a href="'.$trash_event_link.'" title="'.esc_attr__('Trash Event', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>'; |
|
273 | 273 | } |
274 | 274 | } |
275 | 275 | return $actions; |
@@ -281,17 +281,17 @@ discard block |
||
281 | 281 | * |
282 | 282 | * @return string |
283 | 283 | */ |
284 | - public function column_author( EE_Event $item ) { |
|
284 | + public function column_author(EE_Event $item) { |
|
285 | 285 | //user author info |
286 | - $event_author = get_userdata( $item->wp_user() ); |
|
287 | - $gravatar = get_avatar( $item->wp_user(), '15' ); |
|
286 | + $event_author = get_userdata($item->wp_user()); |
|
287 | + $gravatar = get_avatar($item->wp_user(), '15'); |
|
288 | 288 | //filter link |
289 | 289 | $query_args = array( |
290 | 290 | 'action' => 'default', |
291 | 291 | 'EVT_wp_user' => $item->wp_user() |
292 | 292 | ); |
293 | - $filter_url = EE_Admin_Page::add_query_args_and_nonce( $query_args, EVENTS_ADMIN_URL ); |
|
294 | - return $gravatar . ' <a href="' . $filter_url . '" title="' . esc_attr__('Click to filter events by this author.', 'event_espresso') . '">' . $event_author->display_name . '</a>'; |
|
293 | + $filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL); |
|
294 | + return $gravatar.' <a href="'.$filter_url.'" title="'.esc_attr__('Click to filter events by this author.', 'event_espresso').'">'.$event_author->display_name.'</a>'; |
|
295 | 295 | } |
296 | 296 | |
297 | 297 | |
@@ -300,9 +300,9 @@ discard block |
||
300 | 300 | * |
301 | 301 | * @return string |
302 | 302 | */ |
303 | - public function column_venue( EE_Event $item ) { |
|
304 | - $venue = $item->get_first_related( 'Venue' ); |
|
305 | - return !empty( $venue ) ? $venue->name() : ''; |
|
303 | + public function column_venue(EE_Event $item) { |
|
304 | + $venue = $item->get_first_related('Venue'); |
|
305 | + return ! empty($venue) ? $venue->name() : ''; |
|
306 | 306 | } |
307 | 307 | |
308 | 308 | |
@@ -311,10 +311,10 @@ discard block |
||
311 | 311 | * |
312 | 312 | * @throws EE_Error |
313 | 313 | */ |
314 | - public function column_start_date_time( EE_Event $item ) { |
|
315 | - echo !empty( $this->_dtt ) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso'); |
|
314 | + public function column_start_date_time(EE_Event $item) { |
|
315 | + echo ! empty($this->_dtt) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso'); |
|
316 | 316 | //display in user's timezone? |
317 | - echo !empty( $this->_dtt ) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ' ) : ''; |
|
317 | + echo ! empty($this->_dtt) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ') : ''; |
|
318 | 318 | |
319 | 319 | } |
320 | 320 | |
@@ -324,11 +324,11 @@ discard block |
||
324 | 324 | * |
325 | 325 | * @throws EE_Error |
326 | 326 | */ |
327 | - public function column_reg_begins( EE_Event $item ) { |
|
327 | + public function column_reg_begins(EE_Event $item) { |
|
328 | 328 | $reg_start = $item->get_ticket_with_earliest_start_time(); |
329 | - echo !empty( $reg_start ) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso'); |
|
329 | + echo ! empty($reg_start) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso'); |
|
330 | 330 | //display in user's timezone? |
331 | - echo !empty( $reg_start ) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ' ) : '';/**/ |
|
331 | + echo ! empty($reg_start) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ') : ''; /**/ |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | |
@@ -337,14 +337,14 @@ discard block |
||
337 | 337 | * |
338 | 338 | * @return int|string |
339 | 339 | */ |
340 | - public function column_attendees( EE_Event $item ) { |
|
340 | + public function column_attendees(EE_Event $item) { |
|
341 | 341 | $attendees_query_args = array( |
342 | 342 | 'action' => 'default', |
343 | 343 | 'event_id' => $item->ID() |
344 | 344 | ); |
345 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
346 | - $registered_attendees = EEM_Registration::instance()->get_event_registration_count( $item->ID() ); |
|
347 | - return EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>' : $registered_attendees; |
|
345 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
346 | + $registered_attendees = EEM_Registration::instance()->get_event_registration_count($item->ID()); |
|
347 | + return EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '<a href="'.$attendees_link.'">'.$registered_attendees.'</a>' : $registered_attendees; |
|
348 | 348 | } |
349 | 349 | |
350 | 350 | |
@@ -353,8 +353,8 @@ discard block |
||
353 | 353 | * |
354 | 354 | * @return float |
355 | 355 | */ |
356 | - public function column_tkts_sold( EE_Event $item ) { |
|
357 | - return EEM_Ticket::instance()->sum(array( array('Datetime.EVT_ID' => $item->ID() )), 'TKT_sold' ); |
|
356 | + public function column_tkts_sold(EE_Event $item) { |
|
357 | + return EEM_Ticket::instance()->sum(array(array('Datetime.EVT_ID' => $item->ID())), 'TKT_sold'); |
|
358 | 358 | } |
359 | 359 | |
360 | 360 | |
@@ -363,38 +363,38 @@ discard block |
||
363 | 363 | * |
364 | 364 | * @return string |
365 | 365 | */ |
366 | - public function column_actions( EE_Event $item ) { |
|
366 | + public function column_actions(EE_Event $item) { |
|
367 | 367 | //todo: remove when attendees is active |
368 | - if ( !defined('REG_ADMIN_URL') ) |
|
368 | + if ( ! defined('REG_ADMIN_URL')) |
|
369 | 369 | define('REG_ADMIN_URL', EVENTS_ADMIN_URL); |
370 | 370 | $actionlinks = array(); |
371 | 371 | |
372 | 372 | $view_link = get_permalink($item->ID()); |
373 | 373 | |
374 | - $actionlinks[] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '" target="_blank">'; |
|
374 | + $actionlinks[] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'" target="_blank">'; |
|
375 | 375 | $actionlinks[] = '<div class="dashicons dashicons-search"></div></a>'; |
376 | 376 | |
377 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $item->ID() ) ) { |
|
377 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) { |
|
378 | 378 | $edit_query_args = array( |
379 | 379 | 'action' => 'edit', |
380 | 380 | 'post' => $item->ID() |
381 | 381 | ); |
382 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
383 | - $actionlinks[] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '"><div class="ee-icon ee-icon-calendar-edit"></div></a>'; |
|
382 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
383 | + $actionlinks[] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'"><div class="ee-icon ee-icon-calendar-edit"></div></a>'; |
|
384 | 384 | } |
385 | 385 | |
386 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) { |
|
386 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) { |
|
387 | 387 | $attendees_query_args = array( |
388 | 388 | 'action' => 'default', |
389 | 389 | 'event_id' => $item->ID() |
390 | 390 | ); |
391 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
392 | - $actionlinks[] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrants', 'event_espresso') . '"><div class="dashicons dashicons-groups"></div></a>'; |
|
391 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
392 | + $actionlinks[] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrants', 'event_espresso').'"><div class="dashicons dashicons-groups"></div></a>'; |
|
393 | 393 | } |
394 | 394 | |
395 | - $actionlinks = apply_filters( 'FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item ); |
|
395 | + $actionlinks = apply_filters('FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item); |
|
396 | 396 | |
397 | - return $this->_action_string( implode( "\n\t", $actionlinks ), $item, 'div' ); |
|
397 | + return $this->_action_string(implode("\n\t", $actionlinks), $item, 'div'); |
|
398 | 398 | } |
399 | 399 | |
400 | 400 |
@@ -1455,7 +1455,7 @@ discard block |
||
1455 | 1455 | * @param EE_Transaction $transaction |
1456 | 1456 | * @param \EE_Payment $payment |
1457 | 1457 | * @param array $REG_IDs |
1458 | - * @return bool |
|
1458 | + * @return boolean|null |
|
1459 | 1459 | */ |
1460 | 1460 | protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) { |
1461 | 1461 | // we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments() |
@@ -1647,6 +1647,7 @@ discard block |
||
1647 | 1647 | * |
1648 | 1648 | * @access protected |
1649 | 1649 | * @param \EE_Payment | null $payment |
1650 | + * @param EE_Payment $payment |
|
1650 | 1651 | */ |
1651 | 1652 | protected function _maybe_send_notifications( $payment = null ) { |
1652 | 1653 | switch ( $payment instanceof EE_Payment ) { |
@@ -106,9 +106,9 @@ discard block |
||
106 | 106 | |
107 | 107 | /** |
108 | 108 | * grab url requests and route them |
109 | - * @access private |
|
110 | - * @return void |
|
111 | - */ |
|
109 | + * @access private |
|
110 | + * @return void |
|
111 | + */ |
|
112 | 112 | public function _set_page_routes() { |
113 | 113 | |
114 | 114 | $this->_set_transaction_status_array(); |
@@ -261,10 +261,10 @@ discard block |
||
261 | 261 | /** |
262 | 262 | * _set_transaction_status_array |
263 | 263 | * sets list of transaction statuses |
264 | - * |
|
264 | + * |
|
265 | 265 | * @access private |
266 | - * @return void |
|
267 | - */ |
|
266 | + * @return void |
|
267 | + */ |
|
268 | 268 | private function _set_transaction_status_array() { |
269 | 269 | self::$_txn_status = EEM_Transaction::instance()->status_array(TRUE); |
270 | 270 | } |
@@ -286,10 +286,10 @@ discard block |
||
286 | 286 | |
287 | 287 | /** |
288 | 288 | * get list of payment statuses |
289 | - * |
|
289 | + * |
|
290 | 290 | * @access private |
291 | - * @return void |
|
292 | - */ |
|
291 | + * @return void |
|
292 | + */ |
|
293 | 293 | private function _get_payment_status_array() { |
294 | 294 | self::$_pay_status = EEM_Payment::instance()->status_array(TRUE); |
295 | 295 | $this->_template_args['payment_status'] = self::$_pay_status; |
@@ -397,18 +397,18 @@ discard block |
||
397 | 397 | if ( is_object( $this->_transaction) ) |
398 | 398 | return; //get out we've already set the object |
399 | 399 | |
400 | - $TXN = EEM_Transaction::instance(); |
|
400 | + $TXN = EEM_Transaction::instance(); |
|
401 | 401 | |
402 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
402 | + $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
403 | 403 | |
404 | - //get transaction object |
|
405 | - $this->_transaction = $TXN->get_one_by_ID($TXN_ID); |
|
406 | - $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
404 | + //get transaction object |
|
405 | + $this->_transaction = $TXN->get_one_by_ID($TXN_ID); |
|
406 | + $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
407 | 407 | |
408 | 408 | if ( empty( $this->_transaction ) ) { |
409 | - $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID . __(' could not be retrieved.', 'event_espresso'); |
|
409 | + $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID . __(' could not be retrieved.', 'event_espresso'); |
|
410 | 410 | EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ ); |
411 | - } |
|
411 | + } |
|
412 | 412 | } |
413 | 413 | |
414 | 414 | |
@@ -510,12 +510,12 @@ discard block |
||
510 | 510 | |
511 | 511 | |
512 | 512 | /** |
513 | - * _transaction_details |
|
513 | + * _transaction_details |
|
514 | 514 | * generates HTML for the View Transaction Details Admin page |
515 | - * |
|
515 | + * |
|
516 | 516 | * @access protected |
517 | - * @return void |
|
518 | - */ |
|
517 | + * @return void |
|
518 | + */ |
|
519 | 519 | protected function _transaction_details() { |
520 | 520 | do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction ); |
521 | 521 | EE_Registry::instance()->load_helper( 'MSG_Template' ); |
@@ -568,7 +568,7 @@ discard block |
||
568 | 568 | 'button secondary-button right', |
569 | 569 | 'dashicons dashicons-email-alt' |
570 | 570 | ) |
571 | - : ''; |
|
571 | + : ''; |
|
572 | 572 | } else { |
573 | 573 | $this->_template_args['send_payment_reminder_button'] = ''; |
574 | 574 | } |
@@ -722,10 +722,10 @@ discard block |
||
722 | 722 | /** |
723 | 723 | * txn_details_meta_box |
724 | 724 | * generates HTML for the Transaction main meta box |
725 | - * |
|
725 | + * |
|
726 | 726 | * @access public |
727 | - * @return void |
|
728 | - */ |
|
727 | + * @return void |
|
728 | + */ |
|
729 | 729 | public function txn_details_meta_box() { |
730 | 730 | |
731 | 731 | $this->_set_transaction_object(); |
@@ -1066,10 +1066,10 @@ discard block |
||
1066 | 1066 | /** |
1067 | 1067 | * txn_billing_info_side_meta_box |
1068 | 1068 | * generates HTML for the Edit Transaction side meta box |
1069 | - * |
|
1069 | + * |
|
1070 | 1070 | * @access public |
1071 | - * @return void |
|
1072 | - */ |
|
1071 | + * @return void |
|
1072 | + */ |
|
1073 | 1073 | public function txn_billing_info_side_meta_box() { |
1074 | 1074 | |
1075 | 1075 | $this->_template_args['billing_form'] = $this->_transaction->billing_info(); |
@@ -1087,10 +1087,10 @@ discard block |
||
1087 | 1087 | /** |
1088 | 1088 | * apply_payments_or_refunds |
1089 | 1089 | * registers a payment or refund made towards a transaction |
1090 | - * |
|
1090 | + * |
|
1091 | 1091 | * @access public |
1092 | - * @return void |
|
1093 | - */ |
|
1092 | + * @return void |
|
1093 | + */ |
|
1094 | 1094 | public function apply_payments_or_refunds() { |
1095 | 1095 | $json_response_data = array( 'return_data' => FALSE ); |
1096 | 1096 | $valid_data = $this->_validate_payment_request_data(); |
@@ -1244,9 +1244,9 @@ discard block |
||
1244 | 1244 | 'default' => '', |
1245 | 1245 | 'required' => false, |
1246 | 1246 | 'html_label_text' => __( 'Transaction or Cheque Number', 'event_espresso' ), |
1247 | - 'validation_strategies' => array( |
|
1248 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1249 | - ) |
|
1247 | + 'validation_strategies' => array( |
|
1248 | + new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1249 | + ) |
|
1250 | 1250 | ) |
1251 | 1251 | ), |
1252 | 1252 | 'po_number' => new EE_Text_Input( |
@@ -1254,9 +1254,9 @@ discard block |
||
1254 | 1254 | 'default' => '', |
1255 | 1255 | 'required' => false, |
1256 | 1256 | 'html_label_text' => __( 'Purchase Order Number', 'event_espresso' ), |
1257 | - 'validation_strategies' => array( |
|
1258 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1259 | - ) |
|
1257 | + 'validation_strategies' => array( |
|
1258 | + new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1259 | + ) |
|
1260 | 1260 | ) |
1261 | 1261 | ), |
1262 | 1262 | 'accounting' => new EE_Text_Input( |
@@ -1264,9 +1264,9 @@ discard block |
||
1264 | 1264 | 'default' => '', |
1265 | 1265 | 'required' => false, |
1266 | 1266 | 'html_label_text' => __( 'Extra Field for Accounting', 'event_espresso' ), |
1267 | - 'validation_strategies' => array( |
|
1268 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1269 | - ) |
|
1267 | + 'validation_strategies' => array( |
|
1268 | + new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1269 | + ) |
|
1270 | 1270 | ) |
1271 | 1271 | ), |
1272 | 1272 | ) |
@@ -1561,10 +1561,10 @@ discard block |
||
1561 | 1561 | /** |
1562 | 1562 | * delete_payment |
1563 | 1563 | * delete a payment or refund made towards a transaction |
1564 | - * |
|
1564 | + * |
|
1565 | 1565 | * @access public |
1566 | - * @return void |
|
1567 | - */ |
|
1566 | + * @return void |
|
1567 | + */ |
|
1568 | 1568 | public function delete_payment() { |
1569 | 1569 | $json_response_data = array( 'return_data' => FALSE ); |
1570 | 1570 | $PAY_ID = isset( $this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) ? absint( $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) : 0; |
@@ -1682,12 +1682,12 @@ discard block |
||
1682 | 1682 | /** |
1683 | 1683 | * _send_payment_reminder |
1684 | 1684 | * generates HTML for the View Transaction Details Admin page |
1685 | - * |
|
1685 | + * |
|
1686 | 1686 | * @access protected |
1687 | - * @return void |
|
1688 | - */ |
|
1687 | + * @return void |
|
1688 | + */ |
|
1689 | 1689 | protected function _send_payment_reminder() { |
1690 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
1690 | + $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
1691 | 1691 | $transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID ); |
1692 | 1692 | $query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array(); |
1693 | 1693 | do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction ); |
@@ -1709,29 +1709,29 @@ discard block |
||
1709 | 1709 | |
1710 | 1710 | $TXN = EEM_Transaction::instance(); |
1711 | 1711 | |
1712 | - $start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' )); |
|
1713 | - $end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' ); |
|
1712 | + $start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' )); |
|
1713 | + $end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' ); |
|
1714 | 1714 | |
1715 | - //make sure our timestamps start and end right at the boundaries for each day |
|
1716 | - $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00'; |
|
1717 | - $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59'; |
|
1715 | + //make sure our timestamps start and end right at the boundaries for each day |
|
1716 | + $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00'; |
|
1717 | + $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59'; |
|
1718 | 1718 | |
1719 | 1719 | |
1720 | - //convert to timestamps |
|
1721 | - $start_date = strtotime( $start_date ); |
|
1722 | - $end_date = strtotime( $end_date ); |
|
1720 | + //convert to timestamps |
|
1721 | + $start_date = strtotime( $start_date ); |
|
1722 | + $end_date = strtotime( $end_date ); |
|
1723 | 1723 | |
1724 | - //makes sure start date is the lowest value and vice versa |
|
1725 | - $start_date = min( $start_date, $end_date ); |
|
1726 | - $end_date = max( $start_date, $end_date ); |
|
1724 | + //makes sure start date is the lowest value and vice versa |
|
1725 | + $start_date = min( $start_date, $end_date ); |
|
1726 | + $end_date = max( $start_date, $end_date ); |
|
1727 | 1727 | |
1728 | - //convert to correct format for query |
|
1728 | + //convert to correct format for query |
|
1729 | 1729 | $start_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' ); |
1730 | 1730 | $end_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' ); |
1731 | 1731 | |
1732 | 1732 | |
1733 | 1733 | |
1734 | - //set orderby |
|
1734 | + //set orderby |
|
1735 | 1735 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
1736 | 1736 | |
1737 | 1737 | switch ( $this->_req_data['orderby'] ) { |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | * @param bool $routing |
57 | 57 | * @return Transactions_Admin_Page |
58 | 58 | */ |
59 | - public function __construct( $routing = TRUE ) { |
|
60 | - parent::__construct( $routing ); |
|
59 | + public function __construct($routing = TRUE) { |
|
60 | + parent::__construct($routing); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | * @return void |
81 | 81 | */ |
82 | 82 | protected function _ajax_hooks() { |
83 | - add_action('wp_ajax_espresso_apply_payment', array( $this, 'apply_payments_or_refunds')); |
|
84 | - add_action('wp_ajax_espresso_apply_refund', array( $this, 'apply_payments_or_refunds')); |
|
85 | - add_action('wp_ajax_espresso_delete_payment', array( $this, 'delete_payment')); |
|
83 | + add_action('wp_ajax_espresso_apply_payment', array($this, 'apply_payments_or_refunds')); |
|
84 | + add_action('wp_ajax_espresso_apply_refund', array($this, 'apply_payments_or_refunds')); |
|
85 | + add_action('wp_ajax_espresso_delete_payment', array($this, 'delete_payment')); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | 'buttons' => array( |
98 | 98 | 'add' => __('Add New Transaction', 'event_espresso'), |
99 | 99 | 'edit' => __('Edit Transaction', 'event_espresso'), |
100 | - 'delete' => __('Delete Transaction','event_espresso'), |
|
100 | + 'delete' => __('Delete Transaction', 'event_espresso'), |
|
101 | 101 | ) |
102 | 102 | ); |
103 | 103 | } |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | $this->_set_transaction_status_array(); |
115 | 115 | |
116 | - $txn_id = ! empty( $this->_req_data['TXN_ID'] ) && ! is_array( $this->_req_data['TXN_ID'] ) ? $this->_req_data['TXN_ID'] : 0; |
|
116 | + $txn_id = ! empty($this->_req_data['TXN_ID']) && ! is_array($this->_req_data['TXN_ID']) ? $this->_req_data['TXN_ID'] : 0; |
|
117 | 117 | |
118 | 118 | $this->_page_routes = array( |
119 | 119 | |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | 'filename' => 'transactions_overview_views_filters_search' |
186 | 186 | ), |
187 | 187 | ), |
188 | - 'help_tour' => array( 'Transactions_Overview_Help_Tour' ), |
|
188 | + 'help_tour' => array('Transactions_Overview_Help_Tour'), |
|
189 | 189 | /** |
190 | 190 | * commented out because currently we are not displaying tips for transaction list table status but this |
191 | 191 | * may change in a later iteration so want to keep the code for then. |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | 'nav' => array( |
198 | 198 | 'label' => __('View Transaction', 'event_espresso'), |
199 | 199 | 'order' => 5, |
200 | - 'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID'] ), $this->_current_page_view_url ) : $this->_admin_base_url, |
|
200 | + 'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID']), $this->_current_page_view_url) : $this->_admin_base_url, |
|
201 | 201 | 'persistent' => FALSE |
202 | 202 | ), |
203 | 203 | 'help_tabs' => array( |
@@ -218,8 +218,8 @@ discard block |
||
218 | 218 | 'filename' => 'transactions_view_transaction_primary_registrant_billing_information' |
219 | 219 | ), |
220 | 220 | ), |
221 | - 'qtips' => array( 'Transaction_Details_Tips' ), |
|
222 | - 'help_tour' => array( 'Transaction_Details_Help_Tour' ), |
|
221 | + 'qtips' => array('Transaction_Details_Tips'), |
|
222 | + 'help_tour' => array('Transaction_Details_Help_Tour'), |
|
223 | 223 | 'metaboxes' => array('_transaction_details_metaboxes'), |
224 | 224 | |
225 | 225 | 'require_nonce' => FALSE |
@@ -237,21 +237,21 @@ discard block |
||
237 | 237 | // IF a registration was JUST added via the admin... |
238 | 238 | if ( |
239 | 239 | isset( |
240 | - $this->_req_data[ 'redirect_from' ], |
|
241 | - $this->_req_data[ 'EVT_ID' ], |
|
242 | - $this->_req_data[ 'event_name' ] |
|
240 | + $this->_req_data['redirect_from'], |
|
241 | + $this->_req_data['EVT_ID'], |
|
242 | + $this->_req_data['event_name'] |
|
243 | 243 | ) |
244 | 244 | ) { |
245 | 245 | // then set a cookie so that we can block any attempts to use |
246 | 246 | // the back button as a way to enter another registration. |
247 | - setcookie( 'ee_registration_added', $this->_req_data[ 'EVT_ID' ], time() + WEEK_IN_SECONDS, '/' ); |
|
247 | + setcookie('ee_registration_added', $this->_req_data['EVT_ID'], time() + WEEK_IN_SECONDS, '/'); |
|
248 | 248 | // and update the global |
249 | - $_COOKIE[ 'ee_registration_added' ] = $this->_req_data[ 'EVT_ID' ]; |
|
249 | + $_COOKIE['ee_registration_added'] = $this->_req_data['EVT_ID']; |
|
250 | 250 | } |
251 | - EE_Registry::$i18n_js_strings[ 'invalid_server_response' ] = __( 'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso' ); |
|
252 | - EE_Registry::$i18n_js_strings[ 'error_occurred' ] = __( 'An error occurred! Please refresh the page and try again.', 'event_espresso' ); |
|
253 | - EE_Registry::$i18n_js_strings[ 'txn_status_array' ] = self::$_txn_status; |
|
254 | - EE_Registry::$i18n_js_strings[ 'pay_status_array' ] = self::$_pay_status; |
|
251 | + EE_Registry::$i18n_js_strings['invalid_server_response'] = __('An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso'); |
|
252 | + EE_Registry::$i18n_js_strings['error_occurred'] = __('An error occurred! Please refresh the page and try again.', 'event_espresso'); |
|
253 | + EE_Registry::$i18n_js_strings['txn_status_array'] = self::$_txn_status; |
|
254 | + EE_Registry::$i18n_js_strings['pay_status_array'] = self::$_pay_status; |
|
255 | 255 | } |
256 | 256 | public function admin_notices() {} |
257 | 257 | public function admin_footer_scripts() {} |
@@ -318,14 +318,14 @@ discard block |
||
318 | 318 | */ |
319 | 319 | public function load_scripts_styles() { |
320 | 320 | //enqueue style |
321 | - wp_register_style( 'espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION ); |
|
321 | + wp_register_style('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION); |
|
322 | 322 | wp_enqueue_style('espresso_txn'); |
323 | 323 | |
324 | 324 | //scripts |
325 | 325 | add_filter('FHEE_load_accounting_js', '__return_true'); |
326 | 326 | |
327 | 327 | //scripts |
328 | - wp_register_script('espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE); |
|
328 | + wp_register_script('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE); |
|
329 | 329 | wp_enqueue_script('espresso_txn'); |
330 | 330 | |
331 | 331 | } |
@@ -365,8 +365,8 @@ discard block |
||
365 | 365 | * @return void |
366 | 366 | */ |
367 | 367 | protected function _set_list_table_views_default() { |
368 | - $this->_views = array ( |
|
369 | - 'all' => array ( |
|
368 | + $this->_views = array( |
|
369 | + 'all' => array( |
|
370 | 370 | 'slug' => 'all', |
371 | 371 | 'label' => __('View All Transactions', 'event_espresso'), |
372 | 372 | 'count' => 0 |
@@ -394,20 +394,20 @@ discard block |
||
394 | 394 | * @return void |
395 | 395 | */ |
396 | 396 | private function _set_transaction_object() { |
397 | - if ( is_object( $this->_transaction) ) |
|
397 | + if (is_object($this->_transaction)) |
|
398 | 398 | return; //get out we've already set the object |
399 | 399 | |
400 | 400 | $TXN = EEM_Transaction::instance(); |
401 | 401 | |
402 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
402 | + $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE; |
|
403 | 403 | |
404 | 404 | //get transaction object |
405 | 405 | $this->_transaction = $TXN->get_one_by_ID($TXN_ID); |
406 | - $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
406 | + $this->_session = ! empty($this->_transaction) ? $this->_transaction->get('TXN_session_data') : NULL; |
|
407 | 407 | |
408 | - if ( empty( $this->_transaction ) ) { |
|
409 | - $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID . __(' could not be retrieved.', 'event_espresso'); |
|
410 | - EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
408 | + if (empty($this->_transaction)) { |
|
409 | + $error_msg = __('An error occurred and the details for Transaction ID #', 'event_espresso').$TXN_ID.__(' could not be retrieved.', 'event_espresso'); |
|
410 | + EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__); |
|
411 | 411 | } |
412 | 412 | } |
413 | 413 | |
@@ -433,7 +433,7 @@ discard block |
||
433 | 433 | ), |
434 | 434 | 'view_receipt' => array( |
435 | 435 | 'class' => 'dashicons dashicons-media-default', |
436 | - 'desc' => __('View Transaction Receipt', 'event_espresso' ) |
|
436 | + 'desc' => __('View Transaction Receipt', 'event_espresso') |
|
437 | 437 | ), |
438 | 438 | 'view_registration' => array( |
439 | 439 | 'class' => 'dashicons dashicons-clipboard', |
@@ -442,10 +442,10 @@ discard block |
||
442 | 442 | ) |
443 | 443 | ); |
444 | 444 | |
445 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ) { |
|
445 | + if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder')) { |
|
446 | 446 | |
447 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
448 | - if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) { |
|
447 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
448 | + if (EEH_MSG_Template::is_mt_active('payment_reminder')) { |
|
449 | 449 | $items['send_payment_reminder'] = array( |
450 | 450 | 'class' => 'dashicons dashicons-email-alt', |
451 | 451 | 'desc' => __('Send Payment Reminder', 'event_espresso') |
@@ -466,29 +466,29 @@ discard block |
||
466 | 466 | 'FHEE__Transactions_Admin_Page___transaction_legend_items__more_items', |
467 | 467 | array( |
468 | 468 | 'overpaid' => array( |
469 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::overpaid_status_code, |
|
470 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::overpaid_status_code, FALSE, 'sentence' ) |
|
469 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::overpaid_status_code, |
|
470 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::overpaid_status_code, FALSE, 'sentence') |
|
471 | 471 | ), |
472 | 472 | 'complete' => array( |
473 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::complete_status_code, |
|
474 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::complete_status_code, FALSE, 'sentence' ) |
|
473 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::complete_status_code, |
|
474 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::complete_status_code, FALSE, 'sentence') |
|
475 | 475 | ), |
476 | 476 | 'incomplete' => array( |
477 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::incomplete_status_code, |
|
478 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::incomplete_status_code, FALSE, 'sentence' ) |
|
477 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::incomplete_status_code, |
|
478 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::incomplete_status_code, FALSE, 'sentence') |
|
479 | 479 | ), |
480 | 480 | 'abandoned' => array( |
481 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::abandoned_status_code, |
|
482 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::abandoned_status_code, FALSE, 'sentence' ) |
|
481 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::abandoned_status_code, |
|
482 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::abandoned_status_code, FALSE, 'sentence') |
|
483 | 483 | ), |
484 | 484 | 'failed' => array( |
485 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::failed_status_code, |
|
486 | - 'desc' => EEH_Template::pretty_status( EEM_Transaction::failed_status_code, FALSE, 'sentence' ) |
|
485 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::failed_status_code, |
|
486 | + 'desc' => EEH_Template::pretty_status(EEM_Transaction::failed_status_code, FALSE, 'sentence') |
|
487 | 487 | ) |
488 | 488 | ) |
489 | 489 | ); |
490 | 490 | |
491 | - return array_merge( $items, $more_items); |
|
491 | + return array_merge($items, $more_items); |
|
492 | 492 | } |
493 | 493 | |
494 | 494 | |
@@ -501,9 +501,9 @@ discard block |
||
501 | 501 | */ |
502 | 502 | protected function _transactions_overview_list_table() { |
503 | 503 | $this->_admin_page_title = __('Transactions', 'event_espresso'); |
504 | - $event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID'] ) : NULL; |
|
505 | - $this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( __('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL ) . '" title="' . esc_attr__('Click to Edit event', 'event_espresso') . '">' . $event->get('EVT_name') . '</a>', '</h3>' ) : ''; |
|
506 | - $this->_template_args['after_list_table'] = $this->_display_legend( $this->_transaction_legend_items() ); |
|
504 | + $event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']) : NULL; |
|
505 | + $this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(__('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'" title="'.esc_attr__('Click to Edit event', 'event_espresso').'">'.$event->get('EVT_name').'</a>', '</h3>') : ''; |
|
506 | + $this->_template_args['after_list_table'] = $this->_display_legend($this->_transaction_legend_items()); |
|
507 | 507 | $this->display_admin_list_table_page_with_no_sidebar(); |
508 | 508 | } |
509 | 509 | |
@@ -517,8 +517,8 @@ discard block |
||
517 | 517 | * @return void |
518 | 518 | */ |
519 | 519 | protected function _transaction_details() { |
520 | - do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction ); |
|
521 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
520 | + do_action('AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction); |
|
521 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
522 | 522 | |
523 | 523 | $this->_set_transaction_status_array(); |
524 | 524 | |
@@ -531,14 +531,14 @@ discard block |
||
531 | 531 | $attendee = $primary_registration instanceof EE_Registration ? $primary_registration->attendee() : NULL; |
532 | 532 | |
533 | 533 | $this->_template_args['txn_nmbr']['value'] = $this->_transaction->ID(); |
534 | - $this->_template_args['txn_nmbr']['label'] = __( 'Transaction Number', 'event_espresso' ); |
|
534 | + $this->_template_args['txn_nmbr']['label'] = __('Transaction Number', 'event_espresso'); |
|
535 | 535 | |
536 | - $this->_template_args['txn_datetime']['value'] = $this->_transaction->get_datetime('TXN_timestamp', 'l F j, Y', 'g:i:s a' ); |
|
537 | - $this->_template_args['txn_datetime']['label'] = __( 'Date', 'event_espresso' ); |
|
536 | + $this->_template_args['txn_datetime']['value'] = $this->_transaction->get_datetime('TXN_timestamp', 'l F j, Y', 'g:i:s a'); |
|
537 | + $this->_template_args['txn_datetime']['label'] = __('Date', 'event_espresso'); |
|
538 | 538 | |
539 | - $this->_template_args['txn_status']['value'] = self::$_txn_status[ $this->_transaction->get('STS_ID') ]; |
|
540 | - $this->_template_args['txn_status']['label'] = __( 'Transaction Status', 'event_espresso' ); |
|
541 | - $this->_template_args['txn_status']['class'] = 'status-' . $this->_transaction->get('STS_ID'); |
|
539 | + $this->_template_args['txn_status']['value'] = self::$_txn_status[$this->_transaction->get('STS_ID')]; |
|
540 | + $this->_template_args['txn_status']['label'] = __('Transaction Status', 'event_espresso'); |
|
541 | + $this->_template_args['txn_status']['class'] = 'status-'.$this->_transaction->get('STS_ID'); |
|
542 | 542 | |
543 | 543 | $this->_template_args['grand_total'] = $this->_transaction->get('TXN_total'); |
544 | 544 | $this->_template_args['total_paid'] = $this->_transaction->get('TXN_paid'); |
@@ -550,9 +550,9 @@ discard block |
||
550 | 550 | 'espresso_transactions_send_payment_reminder' |
551 | 551 | ) |
552 | 552 | ) { |
553 | - EE_Registry::instance()->load_helper( 'MSG_Template' ); |
|
553 | + EE_Registry::instance()->load_helper('MSG_Template'); |
|
554 | 554 | $this->_template_args['send_payment_reminder_button'] = |
555 | - EEH_MSG_Template::is_mt_active( 'payment_reminder' ) |
|
555 | + EEH_MSG_Template::is_mt_active('payment_reminder') |
|
556 | 556 | && $this->_transaction->get('STS_ID') != EEM_Transaction::complete_status_code |
557 | 557 | && $this->_transaction->get('STS_ID') != EEM_Transaction::overpaid_status_code |
558 | 558 | ? EEH_Template::get_button_or_link( |
@@ -574,40 +574,40 @@ discard block |
||
574 | 574 | } |
575 | 575 | |
576 | 576 | $amount_due = $this->_transaction->get('TXN_total') - $this->_transaction->get('TXN_paid'); |
577 | - $this->_template_args['amount_due'] = EEH_Template::format_currency( $amount_due, TRUE ); |
|
578 | - if ( EE_Registry::instance()->CFG->currency->sign_b4 ) { |
|
579 | - $this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign . $this->_template_args['amount_due']; |
|
577 | + $this->_template_args['amount_due'] = EEH_Template::format_currency($amount_due, TRUE); |
|
578 | + if (EE_Registry::instance()->CFG->currency->sign_b4) { |
|
579 | + $this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign.$this->_template_args['amount_due']; |
|
580 | 580 | } else { |
581 | - $this->_template_args['amount_due'] = $this->_template_args['amount_due'] . EE_Registry::instance()->CFG->currency->sign; |
|
581 | + $this->_template_args['amount_due'] = $this->_template_args['amount_due'].EE_Registry::instance()->CFG->currency->sign; |
|
582 | 582 | } |
583 | - $this->_template_args['amount_due_class'] = ''; |
|
583 | + $this->_template_args['amount_due_class'] = ''; |
|
584 | 584 | |
585 | - if ( $this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total') ) { |
|
585 | + if ($this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total')) { |
|
586 | 586 | // paid in full |
587 | - $this->_template_args['amount_due'] = FALSE; |
|
588 | - } elseif ( $this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total') ) { |
|
587 | + $this->_template_args['amount_due'] = FALSE; |
|
588 | + } elseif ($this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total')) { |
|
589 | 589 | // overpaid |
590 | - $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
591 | - } elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') > 0 )) { |
|
590 | + $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
591 | + } elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') > 0)) { |
|
592 | 592 | // monies owing |
593 | - $this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn'; |
|
594 | - } elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') == 0 )) { |
|
593 | + $this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn'; |
|
594 | + } elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') == 0)) { |
|
595 | 595 | // no payments made yet |
596 | - $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
597 | - } elseif ( $this->_transaction->get('TXN_total') == 0 ) { |
|
596 | + $this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn'; |
|
597 | + } elseif ($this->_transaction->get('TXN_total') == 0) { |
|
598 | 598 | // free event |
599 | - $this->_template_args['amount_due'] = FALSE; |
|
599 | + $this->_template_args['amount_due'] = FALSE; |
|
600 | 600 | } |
601 | 601 | |
602 | 602 | $payment_method = $this->_transaction->payment_method(); |
603 | 603 | |
604 | 604 | $this->_template_args['method_of_payment_name'] = $payment_method instanceof EE_Payment_Method |
605 | 605 | ? $payment_method->admin_name() |
606 | - : __( 'Unknown', 'event_espresso' ); |
|
606 | + : __('Unknown', 'event_espresso'); |
|
607 | 607 | |
608 | 608 | $this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign; |
609 | 609 | // link back to overview |
610 | - $this->_template_args['txn_overview_url'] = ! empty ( $_SERVER['HTTP_REFERER'] ) |
|
610 | + $this->_template_args['txn_overview_url'] = ! empty ($_SERVER['HTTP_REFERER']) |
|
611 | 611 | ? $_SERVER['HTTP_REFERER'] |
612 | 612 | : TXN_ADMIN_URL; |
613 | 613 | |
@@ -615,13 +615,13 @@ discard block |
||
615 | 615 | // next link |
616 | 616 | $next_txn = $this->_transaction->next( |
617 | 617 | null, |
618 | - array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ), |
|
618 | + array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))), |
|
619 | 619 | 'TXN_ID' |
620 | 620 | ); |
621 | 621 | $this->_template_args['next_transaction'] = $next_txn |
622 | 622 | ? $this->_next_link( |
623 | 623 | EE_Admin_Page::add_query_args_and_nonce( |
624 | - array( 'action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID'] ), |
|
624 | + array('action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID']), |
|
625 | 625 | TXN_ADMIN_URL |
626 | 626 | ), |
627 | 627 | 'dashicons dashicons-arrow-right ee-icon-size-22' |
@@ -630,13 +630,13 @@ discard block |
||
630 | 630 | // previous link |
631 | 631 | $previous_txn = $this->_transaction->previous( |
632 | 632 | null, |
633 | - array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ), |
|
633 | + array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))), |
|
634 | 634 | 'TXN_ID' |
635 | 635 | ); |
636 | 636 | $this->_template_args['previous_transaction'] = $previous_txn |
637 | 637 | ? $this->_previous_link( |
638 | 638 | EE_Admin_Page::add_query_args_and_nonce( |
639 | - array( 'action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID'] ), |
|
639 | + array('action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID']), |
|
640 | 640 | TXN_ADMIN_URL |
641 | 641 | ), |
642 | 642 | 'dashicons dashicons-arrow-left ee-icon-size-22' |
@@ -646,16 +646,16 @@ discard block |
||
646 | 646 | // were we just redirected here after adding a new registration ??? |
647 | 647 | if ( |
648 | 648 | isset( |
649 | - $this->_req_data[ 'redirect_from' ], |
|
650 | - $this->_req_data[ 'EVT_ID' ], |
|
651 | - $this->_req_data[ 'event_name' ] |
|
649 | + $this->_req_data['redirect_from'], |
|
650 | + $this->_req_data['EVT_ID'], |
|
651 | + $this->_req_data['event_name'] |
|
652 | 652 | ) |
653 | 653 | ) { |
654 | 654 | if ( |
655 | 655 | EE_Registry::instance()->CAP->current_user_can( |
656 | 656 | 'ee_edit_registrations', |
657 | 657 | 'espresso_registrations_new_registration', |
658 | - $this->_req_data[ 'EVT_ID' ] |
|
658 | + $this->_req_data['EVT_ID'] |
|
659 | 659 | ) |
660 | 660 | ) { |
661 | 661 | $this->_admin_page_title .= '<a id="add-new-registration" class="add-new-h2 button-primary" href="'; |
@@ -665,7 +665,7 @@ discard block |
||
665 | 665 | 'action' => 'new_registration', |
666 | 666 | 'return' => 'default', |
667 | 667 | 'TXN_ID' => $this->_transaction->ID(), |
668 | - 'event_id' => $this->_req_data[ 'EVT_ID' ], |
|
668 | + 'event_id' => $this->_req_data['EVT_ID'], |
|
669 | 669 | ), |
670 | 670 | REG_ADMIN_URL |
671 | 671 | ); |
@@ -673,17 +673,17 @@ discard block |
||
673 | 673 | |
674 | 674 | $this->_admin_page_title .= sprintf( |
675 | 675 | __('Add Another New Registration to Event: "%1$s" ?'), |
676 | - htmlentities( urldecode( $this->_req_data[ 'event_name' ] ), ENT_QUOTES, 'UTF-8' ) |
|
676 | + htmlentities(urldecode($this->_req_data['event_name']), ENT_QUOTES, 'UTF-8') |
|
677 | 677 | ); |
678 | 678 | $this->_admin_page_title .= '</a>'; |
679 | 679 | } |
680 | - EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ ); |
|
680 | + EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__); |
|
681 | 681 | } |
682 | 682 | // grab messages at the last second |
683 | 683 | $this->_template_args['notices'] = EE_Error::get_notices(); |
684 | 684 | // path to template |
685 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_header.template.php'; |
|
686 | - $this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
685 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_header.template.php'; |
|
686 | + $this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
687 | 687 | |
688 | 688 | // the details template wrapper |
689 | 689 | $this->display_admin_page_with_sidebar(); |
@@ -702,18 +702,18 @@ discard block |
||
702 | 702 | |
703 | 703 | $this->_set_transaction_object(); |
704 | 704 | |
705 | - add_meta_box( 'edit-txn-details-mbox', __( 'Transaction Details', 'event_espresso' ), array( $this, 'txn_details_meta_box' ), $this->_wp_page_slug, 'normal', 'high' ); |
|
705 | + add_meta_box('edit-txn-details-mbox', __('Transaction Details', 'event_espresso'), array($this, 'txn_details_meta_box'), $this->_wp_page_slug, 'normal', 'high'); |
|
706 | 706 | add_meta_box( |
707 | 707 | 'edit-txn-attendees-mbox', |
708 | - __( 'Attendees Registered in this Transaction', 'event_espresso' ), |
|
709 | - array( $this, 'txn_attendees_meta_box' ), |
|
708 | + __('Attendees Registered in this Transaction', 'event_espresso'), |
|
709 | + array($this, 'txn_attendees_meta_box'), |
|
710 | 710 | $this->_wp_page_slug, |
711 | 711 | 'normal', |
712 | 712 | 'high', |
713 | - array( 'TXN_ID' => $this->_transaction->ID() ) |
|
713 | + array('TXN_ID' => $this->_transaction->ID()) |
|
714 | 714 | ); |
715 | - add_meta_box( 'edit-txn-registrant-mbox', __( 'Primary Contact', 'event_espresso' ), array( $this, 'txn_registrant_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' ); |
|
716 | - add_meta_box( 'edit-txn-billing-info-mbox', __( 'Billing Information', 'event_espresso' ), array( $this, 'txn_billing_info_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' ); |
|
715 | + add_meta_box('edit-txn-registrant-mbox', __('Primary Contact', 'event_espresso'), array($this, 'txn_registrant_side_meta_box'), $this->_wp_page_slug, 'side', 'high'); |
|
716 | + add_meta_box('edit-txn-billing-info-mbox', __('Billing Information', 'event_espresso'), array($this, 'txn_billing_info_side_meta_box'), $this->_wp_page_slug, 'side', 'high'); |
|
717 | 717 | |
718 | 718 | } |
719 | 719 | |
@@ -734,15 +734,15 @@ discard block |
||
734 | 734 | |
735 | 735 | //get line table |
736 | 736 | EEH_Autoloader::register_line_item_display_autoloaders(); |
737 | - $Line_Item_Display = new EE_Line_Item_Display( 'admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy' ); |
|
738 | - $this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item( $this->_transaction->total_line_item() ); |
|
737 | + $Line_Item_Display = new EE_Line_Item_Display('admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy'); |
|
738 | + $this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item($this->_transaction->total_line_item()); |
|
739 | 739 | $this->_template_args['REG_code'] = $this->_transaction->get_first_related('Registration')->get('REG_code'); |
740 | 740 | |
741 | 741 | // process taxes |
742 | - $taxes = $this->_transaction->get_many_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_tax ))); |
|
743 | - $this->_template_args['taxes'] = ! empty( $taxes ) ? $taxes : FALSE; |
|
742 | + $taxes = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_tax))); |
|
743 | + $this->_template_args['taxes'] = ! empty($taxes) ? $taxes : FALSE; |
|
744 | 744 | |
745 | - $this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE ); |
|
745 | + $this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE); |
|
746 | 746 | $this->_template_args['grand_raw_total'] = $this->_transaction->get('TXN_total'); |
747 | 747 | $this->_template_args['TXN_status'] = $this->_transaction->get('STS_ID'); |
748 | 748 | |
@@ -750,63 +750,63 @@ discard block |
||
750 | 750 | |
751 | 751 | // process payment details |
752 | 752 | $payments = $this->_transaction->get_many_related('Payment'); |
753 | - if( ! empty( $payments ) ) { |
|
754 | - $this->_template_args[ 'payments' ] = $payments; |
|
755 | - $this->_template_args[ 'existing_reg_payments' ] = $this->_get_registration_payment_IDs( $payments ); |
|
753 | + if ( ! empty($payments)) { |
|
754 | + $this->_template_args['payments'] = $payments; |
|
755 | + $this->_template_args['existing_reg_payments'] = $this->_get_registration_payment_IDs($payments); |
|
756 | 756 | } else { |
757 | - $this->_template_args[ 'payments' ] = false; |
|
758 | - $this->_template_args[ 'existing_reg_payments' ] = array(); |
|
757 | + $this->_template_args['payments'] = false; |
|
758 | + $this->_template_args['existing_reg_payments'] = array(); |
|
759 | 759 | } |
760 | 760 | |
761 | - $this->_template_args['edit_payment_url'] = add_query_arg( array( 'action' => 'edit_payment' ), TXN_ADMIN_URL ); |
|
762 | - $this->_template_args['delete_payment_url'] = add_query_arg( array( 'action' => 'espresso_delete_payment' ), TXN_ADMIN_URL ); |
|
761 | + $this->_template_args['edit_payment_url'] = add_query_arg(array('action' => 'edit_payment'), TXN_ADMIN_URL); |
|
762 | + $this->_template_args['delete_payment_url'] = add_query_arg(array('action' => 'espresso_delete_payment'), TXN_ADMIN_URL); |
|
763 | 763 | |
764 | - if ( isset( $txn_details['invoice_number'] )) { |
|
764 | + if (isset($txn_details['invoice_number'])) { |
|
765 | 765 | $this->_template_args['txn_details']['invoice_number']['value'] = $this->_template_args['REG_code']; |
766 | - $this->_template_args['txn_details']['invoice_number']['label'] = __( 'Invoice Number', 'event_espresso' ); |
|
766 | + $this->_template_args['txn_details']['invoice_number']['label'] = __('Invoice Number', 'event_espresso'); |
|
767 | 767 | } |
768 | 768 | |
769 | 769 | $this->_template_args['txn_details']['registration_session']['value'] = $this->_transaction->get_first_related('Registration')->get('REG_session'); |
770 | - $this->_template_args['txn_details']['registration_session']['label'] = __( 'Registration Session', 'event_espresso' ); |
|
770 | + $this->_template_args['txn_details']['registration_session']['label'] = __('Registration Session', 'event_espresso'); |
|
771 | 771 | |
772 | - $this->_template_args['txn_details']['ip_address']['value'] = isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : ''; |
|
773 | - $this->_template_args['txn_details']['ip_address']['label'] = __( 'Transaction placed from IP', 'event_espresso' ); |
|
772 | + $this->_template_args['txn_details']['ip_address']['value'] = isset($this->_session['ip_address']) ? $this->_session['ip_address'] : ''; |
|
773 | + $this->_template_args['txn_details']['ip_address']['label'] = __('Transaction placed from IP', 'event_espresso'); |
|
774 | 774 | |
775 | - $this->_template_args['txn_details']['user_agent']['value'] = isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : ''; |
|
776 | - $this->_template_args['txn_details']['user_agent']['label'] = __( 'Registrant User Agent', 'event_espresso' ); |
|
775 | + $this->_template_args['txn_details']['user_agent']['value'] = isset($this->_session['user_agent']) ? $this->_session['user_agent'] : ''; |
|
776 | + $this->_template_args['txn_details']['user_agent']['label'] = __('Registrant User Agent', 'event_espresso'); |
|
777 | 777 | |
778 | 778 | $reg_steps = '<ul>'; |
779 | - foreach ( $this->_transaction->reg_steps() as $reg_step => $reg_step_status ) { |
|
780 | - if ( $reg_step_status === true ) { |
|
781 | - $reg_steps .= '<li style="color:#70cc50">' . sprintf( __( '%1$s : Completed', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>'; |
|
782 | - } else if ( is_numeric( $reg_step_status ) && $reg_step_status !== false ) { |
|
783 | - $reg_steps .= '<li style="color:#2EA2CC">' . sprintf( |
|
784 | - __( '%1$s : Initiated %2$s', 'event_espresso' ), |
|
785 | - ucwords( str_replace( '_', ' ', $reg_step ) ), |
|
786 | - gmdate( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), ( $reg_step_status + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) ) |
|
787 | - ) . '</li>'; |
|
779 | + foreach ($this->_transaction->reg_steps() as $reg_step => $reg_step_status) { |
|
780 | + if ($reg_step_status === true) { |
|
781 | + $reg_steps .= '<li style="color:#70cc50">'.sprintf(__('%1$s : Completed', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>'; |
|
782 | + } else if (is_numeric($reg_step_status) && $reg_step_status !== false) { |
|
783 | + $reg_steps .= '<li style="color:#2EA2CC">'.sprintf( |
|
784 | + __('%1$s : Initiated %2$s', 'event_espresso'), |
|
785 | + ucwords(str_replace('_', ' ', $reg_step)), |
|
786 | + gmdate(get_option('date_format').' '.get_option('time_format'), ($reg_step_status + (get_option('gmt_offset') * HOUR_IN_SECONDS))) |
|
787 | + ).'</li>'; |
|
788 | 788 | } else { |
789 | - $reg_steps .= '<li style="color:#E76700">' . sprintf( __( '%1$s : Never Initiated', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>'; |
|
789 | + $reg_steps .= '<li style="color:#E76700">'.sprintf(__('%1$s : Never Initiated', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>'; |
|
790 | 790 | } |
791 | 791 | } |
792 | 792 | $reg_steps .= '</ul>'; |
793 | 793 | $this->_template_args['txn_details']['reg_steps']['value'] = $reg_steps; |
794 | - $this->_template_args['txn_details']['reg_steps']['label'] = __( 'Registration Step Progress', 'event_espresso' ); |
|
794 | + $this->_template_args['txn_details']['reg_steps']['label'] = __('Registration Step Progress', 'event_espresso'); |
|
795 | 795 | |
796 | 796 | |
797 | 797 | $this->_get_registrations_to_apply_payment_to(); |
798 | - $this->_get_payment_methods( $payments ); |
|
798 | + $this->_get_payment_methods($payments); |
|
799 | 799 | $this->_get_payment_status_array(); |
800 | 800 | $this->_get_reg_status_selection(); //sets up the template args for the reg status array for the transaction. |
801 | 801 | |
802 | - $this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'transaction' ), TXN_ADMIN_URL ); |
|
803 | - $this->_template_args['apply_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_apply_payment' ), WP_AJAX_URL ); |
|
804 | - $this->_template_args['delete_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_delete_payment' ), WP_AJAX_URL ); |
|
802 | + $this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'transaction'), TXN_ADMIN_URL); |
|
803 | + $this->_template_args['apply_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_apply_payment'), WP_AJAX_URL); |
|
804 | + $this->_template_args['delete_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_delete_payment'), WP_AJAX_URL); |
|
805 | 805 | |
806 | 806 | // 'espresso_delete_payment_nonce' |
807 | 807 | |
808 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_txn_details.template.php'; |
|
809 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
808 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_txn_details.template.php'; |
|
809 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
810 | 810 | |
811 | 811 | } |
812 | 812 | |
@@ -821,27 +821,27 @@ discard block |
||
821 | 821 | * @param EE_Payment[] $payments |
822 | 822 | * @return array |
823 | 823 | */ |
824 | - protected function _get_registration_payment_IDs( $payments = array() ) { |
|
824 | + protected function _get_registration_payment_IDs($payments = array()) { |
|
825 | 825 | $existing_reg_payments = array(); |
826 | 826 | // get all reg payments for these payments |
827 | - $reg_payments = EEM_Registration_Payment::instance()->get_all( array( |
|
827 | + $reg_payments = EEM_Registration_Payment::instance()->get_all(array( |
|
828 | 828 | array( |
829 | 829 | 'PAY_ID' => array( |
830 | 830 | 'IN', |
831 | - array_keys( $payments ) |
|
831 | + array_keys($payments) |
|
832 | 832 | ) |
833 | 833 | ) |
834 | - ) ); |
|
835 | - if ( ! empty( $reg_payments ) ) { |
|
836 | - foreach ( $payments as $payment ) { |
|
837 | - if ( ! $payment instanceof EE_Payment ) { |
|
834 | + )); |
|
835 | + if ( ! empty($reg_payments)) { |
|
836 | + foreach ($payments as $payment) { |
|
837 | + if ( ! $payment instanceof EE_Payment) { |
|
838 | 838 | continue; |
839 | - } else if ( ! isset( $existing_reg_payments[ $payment->ID() ] ) ) { |
|
840 | - $existing_reg_payments[ $payment->ID() ] = array(); |
|
839 | + } else if ( ! isset($existing_reg_payments[$payment->ID()])) { |
|
840 | + $existing_reg_payments[$payment->ID()] = array(); |
|
841 | 841 | } |
842 | - foreach ( $reg_payments as $reg_payment ) { |
|
843 | - if ( $reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID() ) { |
|
844 | - $existing_reg_payments[ $payment->ID() ][ ] = $reg_payment->registration_ID(); |
|
842 | + foreach ($reg_payments as $reg_payment) { |
|
843 | + if ($reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID()) { |
|
844 | + $existing_reg_payments[$payment->ID()][] = $reg_payment->registration_ID(); |
|
845 | 845 | } |
846 | 846 | } |
847 | 847 | } |
@@ -878,39 +878,39 @@ discard block |
||
878 | 878 | $registrations_to_apply_payment_to .= '<br /><div class="admin-primary-mbox-tbl-wrap">'; |
879 | 879 | $registrations_to_apply_payment_to .= '<table class="admin-primary-mbox-tbl">'; |
880 | 880 | $registrations_to_apply_payment_to .= '<thead><tr>'; |
881 | - $registrations_to_apply_payment_to .= '<td>' . __( 'ID', 'event_espresso' ) . '</td>'; |
|
882 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Registrant', 'event_espresso' ) . '</td>'; |
|
883 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Ticket', 'event_espresso' ) . '</td>'; |
|
884 | - $registrations_to_apply_payment_to .= '<td>' . __( 'Event', 'event_espresso' ) . '</td>'; |
|
885 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-cntr">' . __( 'Paid', 'event_espresso' ) . '</td>'; |
|
886 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-cntr">' . __( 'Owing', 'event_espresso' ) . '</td>'; |
|
887 | - $registrations_to_apply_payment_to .= '<td class="jst-cntr">' . __( 'Apply', 'event_espresso' ) . '</td>'; |
|
881 | + $registrations_to_apply_payment_to .= '<td>'.__('ID', 'event_espresso').'</td>'; |
|
882 | + $registrations_to_apply_payment_to .= '<td>'.__('Registrant', 'event_espresso').'</td>'; |
|
883 | + $registrations_to_apply_payment_to .= '<td>'.__('Ticket', 'event_espresso').'</td>'; |
|
884 | + $registrations_to_apply_payment_to .= '<td>'.__('Event', 'event_espresso').'</td>'; |
|
885 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-cntr">'.__('Paid', 'event_espresso').'</td>'; |
|
886 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-cntr">'.__('Owing', 'event_espresso').'</td>'; |
|
887 | + $registrations_to_apply_payment_to .= '<td class="jst-cntr">'.__('Apply', 'event_espresso').'</td>'; |
|
888 | 888 | $registrations_to_apply_payment_to .= '</tr></thead><tbody>'; |
889 | 889 | // get registrations for TXN |
890 | - $registrations = $this->_transaction->registrations( $query_params ); |
|
891 | - foreach ( $registrations as $registration ) { |
|
892 | - if ( $registration instanceof EE_Registration ) { |
|
890 | + $registrations = $this->_transaction->registrations($query_params); |
|
891 | + foreach ($registrations as $registration) { |
|
892 | + if ($registration instanceof EE_Registration) { |
|
893 | 893 | $owing = $registration->final_price() - $registration->paid(); |
894 | - $taxable = $registration->ticket()->taxable() ? ' <span class="smaller-text lt-grey-text"> ' . __( '+ tax', 'event_espresso' ) . '</span>' : ''; |
|
895 | - $checked = empty( $existing_reg_payments ) || in_array( $registration->ID(), $existing_reg_payments ) ? ' checked="checked"' : ''; |
|
896 | - $registrations_to_apply_payment_to .= '<tr id="apply-payment-registration-row-' . $registration->ID() . '">'; |
|
894 | + $taxable = $registration->ticket()->taxable() ? ' <span class="smaller-text lt-grey-text"> '.__('+ tax', 'event_espresso').'</span>' : ''; |
|
895 | + $checked = empty($existing_reg_payments) || in_array($registration->ID(), $existing_reg_payments) ? ' checked="checked"' : ''; |
|
896 | + $registrations_to_apply_payment_to .= '<tr id="apply-payment-registration-row-'.$registration->ID().'">'; |
|
897 | 897 | // add html for checkbox input and label |
898 | - $registrations_to_apply_payment_to .= '<td>' . $registration->ID() . '</td>'; |
|
899 | - $registrations_to_apply_payment_to .= '<td>' . $registration->attendee() instanceof EE_Attendee ? $registration->attendee()->full_name() : __( 'Unknown Attendee', 'event_espresso' ) . '</td>'; |
|
900 | - $registrations_to_apply_payment_to .= '<td>' . $registration->ticket()->name() . ' : ' . $registration->ticket()->pretty_price() . $taxable . '</td>'; |
|
901 | - $registrations_to_apply_payment_to .= '<td>' . $registration->event_name() . '</td>'; |
|
902 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-rght">' . $registration->pretty_paid() . '</td>'; |
|
903 | - $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-rght">' . EEH_Template::format_currency( $owing ) . '</td>'; |
|
898 | + $registrations_to_apply_payment_to .= '<td>'.$registration->ID().'</td>'; |
|
899 | + $registrations_to_apply_payment_to .= '<td>'.$registration->attendee() instanceof EE_Attendee ? $registration->attendee()->full_name() : __('Unknown Attendee', 'event_espresso').'</td>'; |
|
900 | + $registrations_to_apply_payment_to .= '<td>'.$registration->ticket()->name().' : '.$registration->ticket()->pretty_price().$taxable.'</td>'; |
|
901 | + $registrations_to_apply_payment_to .= '<td>'.$registration->event_name().'</td>'; |
|
902 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-paid-td jst-rght">'.$registration->pretty_paid().'</td>'; |
|
903 | + $registrations_to_apply_payment_to .= '<td class="txn-admin-payment-owing-td jst-rght">'.EEH_Template::format_currency($owing).'</td>'; |
|
904 | 904 | $registrations_to_apply_payment_to .= '<td class="jst-cntr">'; |
905 | 905 | $disabled = $registration->final_price() > 0 ? '' : ' disabled'; |
906 | - $registrations_to_apply_payment_to .= '<input type="checkbox" value="' . $registration->ID() . '" name="txn_admin_payment[registrations]"' . $checked . $disabled . '>'; |
|
906 | + $registrations_to_apply_payment_to .= '<input type="checkbox" value="'.$registration->ID().'" name="txn_admin_payment[registrations]"'.$checked.$disabled.'>'; |
|
907 | 907 | $registrations_to_apply_payment_to .= '</td>'; |
908 | 908 | $registrations_to_apply_payment_to .= '</tr>'; |
909 | 909 | } |
910 | 910 | } |
911 | 911 | $registrations_to_apply_payment_to .= '</tbody></table></div>'; |
912 | - $registrations_to_apply_payment_to .= '<p class="clear description">' . __( 'The payment will only be applied to the registrations that have a check mark in their corresponding check box. Checkboxes for free registrations have been disabled.', 'event_espresso' ) . '</p></div>'; |
|
913 | - $this->_template_args[ 'registrations_to_apply_payment_to' ] = $registrations_to_apply_payment_to; |
|
912 | + $registrations_to_apply_payment_to .= '<p class="clear description">'.__('The payment will only be applied to the registrations that have a check mark in their corresponding check box. Checkboxes for free registrations have been disabled.', 'event_espresso').'</p></div>'; |
|
913 | + $this->_template_args['registrations_to_apply_payment_to'] = $registrations_to_apply_payment_to; |
|
914 | 914 | } |
915 | 915 | |
916 | 916 | |
@@ -927,9 +927,9 @@ discard block |
||
927 | 927 | $statuses = EEM_Registration::reg_status_array(array(), TRUE); |
928 | 928 | //let's add a "don't change" option. |
929 | 929 | $status_array['NAN'] = __('Leave the Same', 'event_espresso'); |
930 | - $status_array = array_merge( $status_array, $statuses ); |
|
931 | - $this->_template_args['status_change_select'] = EEH_Form_Fields::select_input( 'txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status' ); |
|
932 | - $this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input( 'delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status' ); |
|
930 | + $status_array = array_merge($status_array, $statuses); |
|
931 | + $this->_template_args['status_change_select'] = EEH_Form_Fields::select_input('txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status'); |
|
932 | + $this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input('delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status'); |
|
933 | 933 | |
934 | 934 | } |
935 | 935 | |
@@ -944,21 +944,21 @@ discard block |
||
944 | 944 | * @param EE_Payment[] to show on this page |
945 | 945 | * @return void |
946 | 946 | */ |
947 | - private function _get_payment_methods( $payments = array() ) { |
|
947 | + private function _get_payment_methods($payments = array()) { |
|
948 | 948 | $payment_methods_of_payments = array(); |
949 | - foreach( $payments as $payment ){ |
|
950 | - if( $payment instanceof EE_Payment ){ |
|
951 | - $payment_methods_of_payments[] = $payment->get( 'PMD_ID' ); |
|
949 | + foreach ($payments as $payment) { |
|
950 | + if ($payment instanceof EE_Payment) { |
|
951 | + $payment_methods_of_payments[] = $payment->get('PMD_ID'); |
|
952 | 952 | } |
953 | 953 | } |
954 | - if( $payment_methods_of_payments ){ |
|
955 | - $query_args = array( array( 'OR*payment_method_for_payment' => array( |
|
956 | - 'PMD_ID' => array( 'IN', $payment_methods_of_payments ), |
|
957 | - 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ) ); |
|
958 | - }else{ |
|
959 | - $query_args = array( array( 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ); |
|
954 | + if ($payment_methods_of_payments) { |
|
955 | + $query_args = array(array('OR*payment_method_for_payment' => array( |
|
956 | + 'PMD_ID' => array('IN', $payment_methods_of_payments), |
|
957 | + 'PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%') ))); |
|
958 | + } else { |
|
959 | + $query_args = array(array('PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%'))); |
|
960 | 960 | } |
961 | - $this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all( $query_args ); |
|
961 | + $this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all($query_args); |
|
962 | 962 | } |
963 | 963 | |
964 | 964 | |
@@ -972,46 +972,46 @@ discard block |
||
972 | 972 | * @param array $metabox |
973 | 973 | * @return void |
974 | 974 | */ |
975 | - public function txn_attendees_meta_box( $post, $metabox = array( 'args' => array() )) { |
|
975 | + public function txn_attendees_meta_box($post, $metabox = array('args' => array())) { |
|
976 | 976 | |
977 | - extract( $metabox['args'] ); |
|
977 | + extract($metabox['args']); |
|
978 | 978 | $this->_template_args['post'] = $post; |
979 | 979 | $this->_template_args['event_attendees'] = array(); |
980 | 980 | // process items in cart |
981 | - $line_items = $this->_transaction->get_many_related('Line_Item', array( array( 'LIN_type' => 'line-item' ) ) ); |
|
982 | - if ( ! empty( $line_items )) { |
|
983 | - foreach ( $line_items as $item ) { |
|
984 | - if ( $item instanceof EE_Line_Item ) { |
|
985 | - switch( $item->OBJ_type() ) { |
|
981 | + $line_items = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => 'line-item'))); |
|
982 | + if ( ! empty($line_items)) { |
|
983 | + foreach ($line_items as $item) { |
|
984 | + if ($item instanceof EE_Line_Item) { |
|
985 | + switch ($item->OBJ_type()) { |
|
986 | 986 | |
987 | 987 | case 'Event' : |
988 | 988 | break; |
989 | 989 | |
990 | 990 | case 'Ticket' : |
991 | 991 | $ticket = $item->ticket(); |
992 | - if ( empty( $ticket )) { |
|
992 | + if (empty($ticket)) { |
|
993 | 993 | continue; //right now we're only handling tickets here. Cause its expected that only tickets will have attendees right? |
994 | 994 | } |
995 | - $ticket_price = EEH_Template::format_currency( $item->get( 'LIN_unit_price' )); |
|
995 | + $ticket_price = EEH_Template::format_currency($item->get('LIN_unit_price')); |
|
996 | 996 | $event = $ticket->get_first_related('Registration')->get_first_related('Event'); |
997 | - $event_name = $event instanceof EE_Event ? $event->get('EVT_name') . ' - ' . $item->get('LIN_name') : ''; |
|
997 | + $event_name = $event instanceof EE_Event ? $event->get('EVT_name').' - '.$item->get('LIN_name') : ''; |
|
998 | 998 | |
999 | - $registrations = $ticket->get_many_related('Registration', array( array('TXN_ID' => $this->_transaction->ID() ))); |
|
1000 | - foreach( $registrations as $registration ) { |
|
1001 | - $this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->get('REG_count'); |
|
1002 | - $this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name; |
|
1003 | - $this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price; |
|
999 | + $registrations = $ticket->get_many_related('Registration', array(array('TXN_ID' => $this->_transaction->ID()))); |
|
1000 | + foreach ($registrations as $registration) { |
|
1001 | + $this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->get('REG_count'); |
|
1002 | + $this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name; |
|
1003 | + $this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price; |
|
1004 | 1004 | // attendee info |
1005 | 1005 | $attendee = $registration->get_first_related('Attendee'); |
1006 | - if ( $attendee instanceof EE_Attendee ) { |
|
1006 | + if ($attendee instanceof EE_Attendee) { |
|
1007 | 1007 | $this->_template_args['event_attendees'][$registration->ID()]['att_id'] = $attendee->ID(); |
1008 | 1008 | $this->_template_args['event_attendees'][$registration->ID()]['attendee'] = $attendee->full_name(); |
1009 | - $this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:' . $attendee->email() . '?subject=' . $event->get('EVT_name') . __(' Event', 'event_espresso') . '">' . $attendee->email() . '</a>'; |
|
1010 | - $this->_template_args['event_attendees'][$registration->ID()]['address'] = implode(',<br>', $attendee->full_address_as_array() ); |
|
1009 | + $this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:'.$attendee->email().'?subject='.$event->get('EVT_name').__(' Event', 'event_espresso').'">'.$attendee->email().'</a>'; |
|
1010 | + $this->_template_args['event_attendees'][$registration->ID()]['address'] = implode(',<br>', $attendee->full_address_as_array()); |
|
1011 | 1011 | } else { |
1012 | 1012 | $this->_template_args['event_attendees'][$registration->ID()]['att_id'] = ''; |
1013 | 1013 | $this->_template_args['event_attendees'][$registration->ID()]['attendee'] = ''; |
1014 | - $this->_template_args['event_attendees'][$registration->ID()]['email'] = ''; |
|
1014 | + $this->_template_args['event_attendees'][$registration->ID()]['email'] = ''; |
|
1015 | 1015 | $this->_template_args['event_attendees'][$registration->ID()]['address'] = ''; |
1016 | 1016 | } |
1017 | 1017 | } |
@@ -1021,12 +1021,12 @@ discard block |
||
1021 | 1021 | } |
1022 | 1022 | } |
1023 | 1023 | |
1024 | - $this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'attendees' ), TXN_ADMIN_URL ); |
|
1025 | - echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE ); |
|
1024 | + $this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'attendees'), TXN_ADMIN_URL); |
|
1025 | + echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE); |
|
1026 | 1026 | |
1027 | 1027 | } else { |
1028 | 1028 | echo sprintf( |
1029 | - __( '%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso' ), |
|
1029 | + __('%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso'), |
|
1030 | 1030 | '<p class="important-notice">', |
1031 | 1031 | '</p>' |
1032 | 1032 | ); |
@@ -1045,20 +1045,20 @@ discard block |
||
1045 | 1045 | */ |
1046 | 1046 | public function txn_registrant_side_meta_box() { |
1047 | 1047 | $primary_att = $this->_transaction->primary_registration() instanceof EE_Registration ? $this->_transaction->primary_registration()->get_first_related('Attendee') : null; |
1048 | - if ( ! $primary_att instanceof EE_Attendee ) { |
|
1048 | + if ( ! $primary_att instanceof EE_Attendee) { |
|
1049 | 1049 | $this->_template_args['no_attendee_message'] = __('There is no attached contact for this transaction. The transaction either failed due to an error or was abandoned.', 'event_espresso'); |
1050 | 1050 | $primary_att = EEM_Attendee::instance()->create_default_object(); |
1051 | 1051 | } |
1052 | - $this->_template_args['ATT_ID'] = $primary_att->ID(); |
|
1052 | + $this->_template_args['ATT_ID'] = $primary_att->ID(); |
|
1053 | 1053 | $this->_template_args['prime_reg_fname'] = $primary_att->fname(); |
1054 | 1054 | $this->_template_args['prime_reg_lname'] = $primary_att->lname(); |
1055 | - $this->_template_args['prime_reg_email'] = $primary_att->email(); |
|
1055 | + $this->_template_args['prime_reg_email'] = $primary_att->email(); |
|
1056 | 1056 | $this->_template_args['prime_reg_phone'] = $primary_att->phone(); |
1057 | - $this->_template_args['edit_attendee_url'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'edit_attendee', 'post' => $primary_att->ID() ), REG_ADMIN_URL ); |
|
1057 | + $this->_template_args['edit_attendee_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit_attendee', 'post' => $primary_att->ID()), REG_ADMIN_URL); |
|
1058 | 1058 | // get formatted address for registrant |
1059 | - EE_Registry::instance()->load_helper( 'Formatter' ); |
|
1060 | - $this->_template_args[ 'formatted_address' ] = EEH_Address::format( $primary_att ); |
|
1061 | - echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE ); |
|
1059 | + EE_Registry::instance()->load_helper('Formatter'); |
|
1060 | + $this->_template_args['formatted_address'] = EEH_Address::format($primary_att); |
|
1061 | + echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE); |
|
1062 | 1062 | } |
1063 | 1063 | |
1064 | 1064 | |
@@ -1074,12 +1074,12 @@ discard block |
||
1074 | 1074 | |
1075 | 1075 | $this->_template_args['billing_form'] = $this->_transaction->billing_info(); |
1076 | 1076 | $this->_template_args['billing_form_url'] = add_query_arg( |
1077 | - array( 'action' => 'edit_transaction', 'process' => 'billing' ), |
|
1077 | + array('action' => 'edit_transaction', 'process' => 'billing'), |
|
1078 | 1078 | TXN_ADMIN_URL |
1079 | 1079 | ); |
1080 | 1080 | |
1081 | - $template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_billing_info.template.php'; |
|
1082 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );/**/ |
|
1081 | + $template_path = TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_billing_info.template.php'; |
|
1082 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); /**/ |
|
1083 | 1083 | } |
1084 | 1084 | |
1085 | 1085 | |
@@ -1092,42 +1092,42 @@ discard block |
||
1092 | 1092 | * @return void |
1093 | 1093 | */ |
1094 | 1094 | public function apply_payments_or_refunds() { |
1095 | - $json_response_data = array( 'return_data' => FALSE ); |
|
1095 | + $json_response_data = array('return_data' => FALSE); |
|
1096 | 1096 | $valid_data = $this->_validate_payment_request_data(); |
1097 | - if ( ! empty( $valid_data ) ) { |
|
1098 | - $PAY_ID = $valid_data[ 'PAY_ID' ]; |
|
1097 | + if ( ! empty($valid_data)) { |
|
1098 | + $PAY_ID = $valid_data['PAY_ID']; |
|
1099 | 1099 | //save the new payment |
1100 | - $payment = $this->_create_payment_from_request_data( $valid_data ); |
|
1100 | + $payment = $this->_create_payment_from_request_data($valid_data); |
|
1101 | 1101 | // get the TXN for this payment |
1102 | 1102 | $transaction = $payment->transaction(); |
1103 | 1103 | // verify transaction |
1104 | - if ( $transaction instanceof EE_Transaction ) { |
|
1104 | + if ($transaction instanceof EE_Transaction) { |
|
1105 | 1105 | // calculate_total_payments_and_update_status |
1106 | - $this->_process_transaction_payments( $transaction ); |
|
1107 | - $REG_IDs = $this->_get_REG_IDs_to_apply_payment_to( $payment ); |
|
1108 | - $this->_remove_existing_registration_payments( $payment, $PAY_ID ); |
|
1106 | + $this->_process_transaction_payments($transaction); |
|
1107 | + $REG_IDs = $this->_get_REG_IDs_to_apply_payment_to($payment); |
|
1108 | + $this->_remove_existing_registration_payments($payment, $PAY_ID); |
|
1109 | 1109 | // apply payment to registrations (if applicable) |
1110 | - if ( ! empty( $REG_IDs ) ) { |
|
1111 | - $this->_update_registration_payments( $transaction, $payment, $REG_IDs ); |
|
1110 | + if ( ! empty($REG_IDs)) { |
|
1111 | + $this->_update_registration_payments($transaction, $payment, $REG_IDs); |
|
1112 | 1112 | $this->_maybe_send_notifications(); |
1113 | 1113 | // now process status changes for the same registrations |
1114 | - $this->_process_registration_status_change( $transaction, $REG_IDs ); |
|
1114 | + $this->_process_registration_status_change($transaction, $REG_IDs); |
|
1115 | 1115 | } |
1116 | - $this->_maybe_send_notifications( $payment ); |
|
1116 | + $this->_maybe_send_notifications($payment); |
|
1117 | 1117 | //prepare to render page |
1118 | - $json_response_data[ 'return_data' ] = $this->_build_payment_json_response( $payment, $REG_IDs ); |
|
1119 | - do_action( 'AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment ); |
|
1118 | + $json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs); |
|
1119 | + do_action('AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment); |
|
1120 | 1120 | } else { |
1121 | 1121 | EE_Error::add_error( |
1122 | - __( 'A valid Transaction for this payment could not be retrieved.', 'event_espresso' ), |
|
1122 | + __('A valid Transaction for this payment could not be retrieved.', 'event_espresso'), |
|
1123 | 1123 | __FILE__, __FUNCTION__, __LINE__ |
1124 | 1124 | ); |
1125 | 1125 | } |
1126 | 1126 | } else { |
1127 | - EE_Error::add_error( __( 'The payment form data could not be processed. Please try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1127 | + EE_Error::add_error(__('The payment form data could not be processed. Please try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1128 | 1128 | } |
1129 | 1129 | |
1130 | - $notices = EE_Error::get_notices( false, false, false ); |
|
1130 | + $notices = EE_Error::get_notices(false, false, false); |
|
1131 | 1131 | $this->_template_args = array( |
1132 | 1132 | 'data' => $json_response_data, |
1133 | 1133 | 'error' => $notices['errors'], |
@@ -1144,30 +1144,30 @@ discard block |
||
1144 | 1144 | * @return array |
1145 | 1145 | */ |
1146 | 1146 | protected function _validate_payment_request_data() { |
1147 | - if ( ! isset( $this->_req_data[ 'txn_admin_payment' ] ) ) { |
|
1147 | + if ( ! isset($this->_req_data['txn_admin_payment'])) { |
|
1148 | 1148 | return false; |
1149 | 1149 | } |
1150 | 1150 | $payment_form = $this->_generate_payment_form_section(); |
1151 | 1151 | try { |
1152 | - if ( $payment_form->was_submitted() ) { |
|
1152 | + if ($payment_form->was_submitted()) { |
|
1153 | 1153 | $payment_form->receive_form_submission(); |
1154 | - if ( ! $payment_form->is_valid() ) { |
|
1154 | + if ( ! $payment_form->is_valid()) { |
|
1155 | 1155 | $submission_error_messages = array(); |
1156 | - foreach ( $payment_form->get_validation_errors_accumulated() as $validation_error ) { |
|
1157 | - if ( $validation_error instanceof EE_Validation_Error ) { |
|
1156 | + foreach ($payment_form->get_validation_errors_accumulated() as $validation_error) { |
|
1157 | + if ($validation_error instanceof EE_Validation_Error) { |
|
1158 | 1158 | $submission_error_messages[] = sprintf( |
1159 | - _x( '%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso' ), |
|
1159 | + _x('%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso'), |
|
1160 | 1160 | $validation_error->get_form_section()->html_label_text(), |
1161 | 1161 | $validation_error->getMessage() |
1162 | 1162 | ); |
1163 | 1163 | } |
1164 | 1164 | } |
1165 | - EE_Error::add_error( join( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1165 | + EE_Error::add_error(join('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__); |
|
1166 | 1166 | return array(); |
1167 | 1167 | } |
1168 | 1168 | } |
1169 | - } catch ( EE_Error $e ) { |
|
1170 | - EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ ); |
|
1169 | + } catch (EE_Error $e) { |
|
1170 | + EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__); |
|
1171 | 1171 | return array(); |
1172 | 1172 | } |
1173 | 1173 | return $payment_form->valid_data(); |
@@ -1189,63 +1189,63 @@ discard block |
||
1189 | 1189 | array( |
1190 | 1190 | 'default' => 0, |
1191 | 1191 | 'required' => false, |
1192 | - 'html_label_text' => __( 'Payment ID', 'event_espresso' ), |
|
1193 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1192 | + 'html_label_text' => __('Payment ID', 'event_espresso'), |
|
1193 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1194 | 1194 | ) |
1195 | 1195 | ), |
1196 | 1196 | 'TXN_ID' => new EE_Text_Input( |
1197 | 1197 | array( |
1198 | 1198 | 'default' => 0, |
1199 | 1199 | 'required' => true, |
1200 | - 'html_label_text' => __( 'Transaction ID', 'event_espresso' ), |
|
1201 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1200 | + 'html_label_text' => __('Transaction ID', 'event_espresso'), |
|
1201 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1202 | 1202 | ) |
1203 | 1203 | ), |
1204 | 1204 | 'type' => new EE_Text_Input( |
1205 | 1205 | array( |
1206 | 1206 | 'default' => 1, |
1207 | 1207 | 'required' => true, |
1208 | - 'html_label_text' => __( 'Payment or Refund', 'event_espresso' ), |
|
1209 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1208 | + 'html_label_text' => __('Payment or Refund', 'event_espresso'), |
|
1209 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1210 | 1210 | ) |
1211 | 1211 | ), |
1212 | 1212 | 'amount' => new EE_Text_Input( |
1213 | 1213 | array( |
1214 | 1214 | 'default' => 0, |
1215 | 1215 | 'required' => true, |
1216 | - 'html_label_text' => __( 'Payment amount', 'event_espresso' ), |
|
1217 | - 'validation_strategies' => array( new EE_Float_Normalization() ) |
|
1216 | + 'html_label_text' => __('Payment amount', 'event_espresso'), |
|
1217 | + 'validation_strategies' => array(new EE_Float_Normalization()) |
|
1218 | 1218 | ) |
1219 | 1219 | ), |
1220 | 1220 | 'status' => new EE_Text_Input( |
1221 | 1221 | array( |
1222 | 1222 | 'default' => EEM_Payment::status_id_approved, |
1223 | 1223 | 'required' => true, |
1224 | - 'html_label_text' => __( 'Payment status', 'event_espresso' ), |
|
1224 | + 'html_label_text' => __('Payment status', 'event_espresso'), |
|
1225 | 1225 | ) |
1226 | 1226 | ), |
1227 | 1227 | 'PMD_ID' => new EE_Text_Input( |
1228 | 1228 | array( |
1229 | 1229 | 'default' => 2, |
1230 | 1230 | 'required' => true, |
1231 | - 'html_label_text' => __( 'Payment Method', 'event_espresso' ), |
|
1232 | - 'validation_strategies' => array( new EE_Int_Normalization() ) |
|
1231 | + 'html_label_text' => __('Payment Method', 'event_espresso'), |
|
1232 | + 'validation_strategies' => array(new EE_Int_Normalization()) |
|
1233 | 1233 | ) |
1234 | 1234 | ), |
1235 | 1235 | 'date' => new EE_Text_Input( |
1236 | 1236 | array( |
1237 | 1237 | 'default' => time(), |
1238 | 1238 | 'required' => true, |
1239 | - 'html_label_text' => __( 'Payment date', 'event_espresso' ), |
|
1239 | + 'html_label_text' => __('Payment date', 'event_espresso'), |
|
1240 | 1240 | ) |
1241 | 1241 | ), |
1242 | 1242 | 'txn_id_chq_nmbr' => new EE_Text_Input( |
1243 | 1243 | array( |
1244 | 1244 | 'default' => '', |
1245 | 1245 | 'required' => false, |
1246 | - 'html_label_text' => __( 'Transaction or Cheque Number', 'event_espresso' ), |
|
1246 | + 'html_label_text' => __('Transaction or Cheque Number', 'event_espresso'), |
|
1247 | 1247 | 'validation_strategies' => array( |
1248 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1248 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1249 | 1249 | ) |
1250 | 1250 | ) |
1251 | 1251 | ), |
@@ -1253,9 +1253,9 @@ discard block |
||
1253 | 1253 | array( |
1254 | 1254 | 'default' => '', |
1255 | 1255 | 'required' => false, |
1256 | - 'html_label_text' => __( 'Purchase Order Number', 'event_espresso' ), |
|
1256 | + 'html_label_text' => __('Purchase Order Number', 'event_espresso'), |
|
1257 | 1257 | 'validation_strategies' => array( |
1258 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1258 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1259 | 1259 | ) |
1260 | 1260 | ) |
1261 | 1261 | ), |
@@ -1263,9 +1263,9 @@ discard block |
||
1263 | 1263 | array( |
1264 | 1264 | 'default' => '', |
1265 | 1265 | 'required' => false, |
1266 | - 'html_label_text' => __( 'Extra Field for Accounting', 'event_espresso' ), |
|
1266 | + 'html_label_text' => __('Extra Field for Accounting', 'event_espresso'), |
|
1267 | 1267 | 'validation_strategies' => array( |
1268 | - new EE_Max_Length_Validation_Strategy( __('Input too long', 'event_espresso'), 100 ), |
|
1268 | + new EE_Max_Length_Validation_Strategy(__('Input too long', 'event_espresso'), 100), |
|
1269 | 1269 | ) |
1270 | 1270 | ) |
1271 | 1271 | ), |
@@ -1282,37 +1282,37 @@ discard block |
||
1282 | 1282 | * @param array $valid_data |
1283 | 1283 | * @return EE_Payment |
1284 | 1284 | */ |
1285 | - protected function _create_payment_from_request_data( $valid_data ) { |
|
1286 | - $PAY_ID = $valid_data[ 'PAY_ID' ]; |
|
1285 | + protected function _create_payment_from_request_data($valid_data) { |
|
1286 | + $PAY_ID = $valid_data['PAY_ID']; |
|
1287 | 1287 | // get payment amount |
1288 | - $amount = $valid_data[ 'amount' ] ? abs( $valid_data[ 'amount' ] ) : 0; |
|
1288 | + $amount = $valid_data['amount'] ? abs($valid_data['amount']) : 0; |
|
1289 | 1289 | // payments have a type value of 1 and refunds have a type value of -1 |
1290 | 1290 | // so multiplying amount by type will give a positive value for payments, and negative values for refunds |
1291 | - $amount = $valid_data[ 'type' ] < 0 ? $amount * -1 : $amount; |
|
1291 | + $amount = $valid_data['type'] < 0 ? $amount * -1 : $amount; |
|
1292 | 1292 | // for some reason the date string coming in has extra spaces between the date and time. This fixes that. |
1293 | - $date = $valid_data['date'] ? preg_replace( '/\s+/', ' ', $valid_data['date'] ) : date( 'Y-m-d g:i a', current_time( 'timestamp' ) ); |
|
1293 | + $date = $valid_data['date'] ? preg_replace('/\s+/', ' ', $valid_data['date']) : date('Y-m-d g:i a', current_time('timestamp')); |
|
1294 | 1294 | $payment = EE_Payment::new_instance( |
1295 | 1295 | array( |
1296 | - 'TXN_ID' => $valid_data[ 'TXN_ID' ], |
|
1297 | - 'STS_ID' => $valid_data[ 'status' ], |
|
1296 | + 'TXN_ID' => $valid_data['TXN_ID'], |
|
1297 | + 'STS_ID' => $valid_data['status'], |
|
1298 | 1298 | 'PAY_timestamp' => $date, |
1299 | 1299 | 'PAY_source' => EEM_Payment_Method::scope_admin, |
1300 | - 'PMD_ID' => $valid_data[ 'PMD_ID' ], |
|
1300 | + 'PMD_ID' => $valid_data['PMD_ID'], |
|
1301 | 1301 | 'PAY_amount' => $amount, |
1302 | - 'PAY_txn_id_chq_nmbr' => $valid_data[ 'txn_id_chq_nmbr' ], |
|
1303 | - 'PAY_po_number' => $valid_data[ 'po_number' ], |
|
1304 | - 'PAY_extra_accntng' => $valid_data[ 'accounting' ], |
|
1302 | + 'PAY_txn_id_chq_nmbr' => $valid_data['txn_id_chq_nmbr'], |
|
1303 | + 'PAY_po_number' => $valid_data['po_number'], |
|
1304 | + 'PAY_extra_accntng' => $valid_data['accounting'], |
|
1305 | 1305 | 'PAY_details' => $valid_data, |
1306 | 1306 | 'PAY_ID' => $PAY_ID |
1307 | 1307 | ), |
1308 | 1308 | '', |
1309 | - array( 'Y-m-d', 'g:i a' ) |
|
1309 | + array('Y-m-d', 'g:i a') |
|
1310 | 1310 | ); |
1311 | 1311 | |
1312 | - if ( ! $payment->save() ) { |
|
1312 | + if ( ! $payment->save()) { |
|
1313 | 1313 | EE_Error::add_error( |
1314 | 1314 | sprintf( |
1315 | - __( 'Payment %1$d has not been successfully saved to the database.', 'event_espresso' ), |
|
1315 | + __('Payment %1$d has not been successfully saved to the database.', 'event_espresso'), |
|
1316 | 1316 | $payment->ID() |
1317 | 1317 | ), |
1318 | 1318 | __FILE__, __FUNCTION__, __LINE__ |
@@ -1329,15 +1329,15 @@ discard block |
||
1329 | 1329 | * @param \EE_Transaction $transaction |
1330 | 1330 | * @return array |
1331 | 1331 | */ |
1332 | - protected function _process_transaction_payments( EE_Transaction $transaction ) { |
|
1332 | + protected function _process_transaction_payments(EE_Transaction $transaction) { |
|
1333 | 1333 | /** @type EE_Transaction_Payments $transaction_payments */ |
1334 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1334 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1335 | 1335 | //update the transaction with this payment |
1336 | - if ( $transaction_payments->calculate_total_payments_and_update_status( $transaction ) ) { |
|
1337 | - EE_Error::add_success( __( 'The payment has been processed successfully.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1336 | + if ($transaction_payments->calculate_total_payments_and_update_status($transaction)) { |
|
1337 | + EE_Error::add_success(__('The payment has been processed successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1338 | 1338 | } else { |
1339 | 1339 | EE_Error::add_error( |
1340 | - __( 'The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso' ) |
|
1340 | + __('The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso') |
|
1341 | 1341 | , __FILE__, __FUNCTION__, __LINE__ |
1342 | 1342 | ); |
1343 | 1343 | } |
@@ -1353,19 +1353,19 @@ discard block |
||
1353 | 1353 | * @param \EE_Payment $payment |
1354 | 1354 | * @return array |
1355 | 1355 | */ |
1356 | - protected function _get_REG_IDs_to_apply_payment_to( EE_Payment $payment ) { |
|
1356 | + protected function _get_REG_IDs_to_apply_payment_to(EE_Payment $payment) { |
|
1357 | 1357 | $REG_IDs = array(); |
1358 | 1358 | // grab array of IDs for specific registrations to apply changes to |
1359 | - if ( isset( $this->_req_data[ 'txn_admin_payment' ][ 'registrations' ] ) ) { |
|
1360 | - $REG_IDs = (array)$this->_req_data[ 'txn_admin_payment' ][ 'registrations' ]; |
|
1359 | + if (isset($this->_req_data['txn_admin_payment']['registrations'])) { |
|
1360 | + $REG_IDs = (array) $this->_req_data['txn_admin_payment']['registrations']; |
|
1361 | 1361 | } |
1362 | 1362 | //nothing specified ? then get all reg IDs |
1363 | - if ( empty( $REG_IDs ) ) { |
|
1363 | + if (empty($REG_IDs)) { |
|
1364 | 1364 | $registrations = $payment->transaction()->registrations(); |
1365 | - $REG_IDs = ! empty( $registrations ) ? array_keys( $registrations ) : $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1365 | + $REG_IDs = ! empty($registrations) ? array_keys($registrations) : $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1366 | 1366 | } |
1367 | 1367 | // ensure that REG_IDs are integers and NOT strings |
1368 | - return array_map( 'intval', $REG_IDs ); |
|
1368 | + return array_map('intval', $REG_IDs); |
|
1369 | 1369 | } |
1370 | 1370 | |
1371 | 1371 | |
@@ -1382,7 +1382,7 @@ discard block |
||
1382 | 1382 | /** |
1383 | 1383 | * @param array $existing_reg_payment_REG_IDs |
1384 | 1384 | */ |
1385 | - public function set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs = null ) { |
|
1385 | + public function set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs = null) { |
|
1386 | 1386 | $this->_existing_reg_payment_REG_IDs = $existing_reg_payment_REG_IDs; |
1387 | 1387 | } |
1388 | 1388 | |
@@ -1397,13 +1397,13 @@ discard block |
||
1397 | 1397 | * @param \EE_Payment $payment |
1398 | 1398 | * @return array |
1399 | 1399 | */ |
1400 | - protected function _get_existing_reg_payment_REG_IDs( EE_Payment $payment ) { |
|
1401 | - if ( $this->existing_reg_payment_REG_IDs() === null ) { |
|
1400 | + protected function _get_existing_reg_payment_REG_IDs(EE_Payment $payment) { |
|
1401 | + if ($this->existing_reg_payment_REG_IDs() === null) { |
|
1402 | 1402 | // let's get any existing reg payment records for this payment |
1403 | - $existing_reg_payment_REG_IDs = $payment->get_many_related( 'Registration' ); |
|
1403 | + $existing_reg_payment_REG_IDs = $payment->get_many_related('Registration'); |
|
1404 | 1404 | // but we only want the REG IDs, so grab the array keys |
1405 | - $existing_reg_payment_REG_IDs = ! empty( $existing_reg_payment_REG_IDs ) ? array_keys( $existing_reg_payment_REG_IDs ) : array(); |
|
1406 | - $this->set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs ); |
|
1405 | + $existing_reg_payment_REG_IDs = ! empty($existing_reg_payment_REG_IDs) ? array_keys($existing_reg_payment_REG_IDs) : array(); |
|
1406 | + $this->set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs); |
|
1407 | 1407 | } |
1408 | 1408 | return $this->existing_reg_payment_REG_IDs(); |
1409 | 1409 | } |
@@ -1422,23 +1422,23 @@ discard block |
||
1422 | 1422 | * @param int $PAY_ID |
1423 | 1423 | * @return bool; |
1424 | 1424 | */ |
1425 | - protected function _remove_existing_registration_payments( EE_Payment $payment, $PAY_ID = 0 ) { |
|
1425 | + protected function _remove_existing_registration_payments(EE_Payment $payment, $PAY_ID = 0) { |
|
1426 | 1426 | // newly created payments will have nothing recorded for $PAY_ID |
1427 | - if ( $PAY_ID == 0 ) { |
|
1427 | + if ($PAY_ID == 0) { |
|
1428 | 1428 | return false; |
1429 | 1429 | } |
1430 | - $existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1431 | - if ( empty( $existing_reg_payment_REG_IDs )) { |
|
1430 | + $existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1431 | + if (empty($existing_reg_payment_REG_IDs)) { |
|
1432 | 1432 | return false; |
1433 | 1433 | } |
1434 | 1434 | /** @type EE_Transaction_Payments $transaction_payments */ |
1435 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1435 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1436 | 1436 | return $transaction_payments->delete_registration_payments_and_update_registrations( |
1437 | 1437 | $payment, |
1438 | 1438 | array( |
1439 | 1439 | array( |
1440 | 1440 | 'PAY_ID' => $payment->ID(), |
1441 | - 'REG_ID' => array( 'IN', $existing_reg_payment_REG_IDs ), |
|
1441 | + 'REG_ID' => array('IN', $existing_reg_payment_REG_IDs), |
|
1442 | 1442 | ) |
1443 | 1443 | ) |
1444 | 1444 | ); |
@@ -1457,25 +1457,25 @@ discard block |
||
1457 | 1457 | * @param array $REG_IDs |
1458 | 1458 | * @return bool |
1459 | 1459 | */ |
1460 | - protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) { |
|
1460 | + protected function _update_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array()) { |
|
1461 | 1461 | // we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments() |
1462 | 1462 | // so let's do that using our set of REG_IDs from the form |
1463 | 1463 | $registration_query_where_params = array( |
1464 | - 'REG_ID' => array( 'IN', $REG_IDs ) |
|
1464 | + 'REG_ID' => array('IN', $REG_IDs) |
|
1465 | 1465 | ); |
1466 | 1466 | // but add in some conditions regarding payment, |
1467 | 1467 | // so that we don't apply payments to registrations that are free or have already been paid for |
1468 | 1468 | // but ONLY if the payment is NOT a refund ( ie: the payment amount is not negative ) |
1469 | - if ( ! $payment->is_a_refund() ) { |
|
1470 | - $registration_query_where_params[ 'REG_final_price' ] = array( '!=', 0 ); |
|
1471 | - $registration_query_where_params[ 'REG_final_price*' ] = array( '!=', 'REG_paid', true ); |
|
1469 | + if ( ! $payment->is_a_refund()) { |
|
1470 | + $registration_query_where_params['REG_final_price'] = array('!=', 0); |
|
1471 | + $registration_query_where_params['REG_final_price*'] = array('!=', 'REG_paid', true); |
|
1472 | 1472 | } |
1473 | 1473 | //EEH_Debug_Tools::printr( $registration_query_where_params, '$registration_query_where_params', __FILE__, __LINE__ ); |
1474 | - $registrations = $transaction->registrations( array( $registration_query_where_params ) ); |
|
1475 | - if ( ! empty( $registrations ) ) { |
|
1474 | + $registrations = $transaction->registrations(array($registration_query_where_params)); |
|
1475 | + if ( ! empty($registrations)) { |
|
1476 | 1476 | /** @type EE_Payment_Processor $payment_processor */ |
1477 | - $payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' ); |
|
1478 | - $payment_processor->process_registration_payments( $transaction, $payment, $registrations ); |
|
1477 | + $payment_processor = EE_Registry::instance()->load_core('Payment_Processor'); |
|
1478 | + $payment_processor->process_registration_payments($transaction, $payment, $registrations); |
|
1479 | 1479 | } |
1480 | 1480 | } |
1481 | 1481 | |
@@ -1491,22 +1491,22 @@ discard block |
||
1491 | 1491 | * @param array $REG_IDs |
1492 | 1492 | * @return bool |
1493 | 1493 | */ |
1494 | - protected function _process_registration_status_change( EE_Transaction $transaction, $REG_IDs = array() ) { |
|
1494 | + protected function _process_registration_status_change(EE_Transaction $transaction, $REG_IDs = array()) { |
|
1495 | 1495 | // first if there is no change in status then we get out. |
1496 | 1496 | if ( |
1497 | - ! isset( $this->_req_data['txn_reg_status_change'], $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ) |
|
1497 | + ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['reg_status']) |
|
1498 | 1498 | || $this->_req_data['txn_reg_status_change']['reg_status'] == 'NAN' |
1499 | 1499 | ) { |
1500 | 1500 | //no error message, no change requested, just nothing to do man. |
1501 | 1501 | return FALSE; |
1502 | 1502 | } |
1503 | 1503 | /** @type EE_Transaction_Processor $transaction_processor */ |
1504 | - $transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' ); |
|
1504 | + $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor'); |
|
1505 | 1505 | // made it here dude? Oh WOW. K, let's take care of changing the statuses |
1506 | 1506 | return $transaction_processor->manually_update_registration_statuses( |
1507 | 1507 | $transaction, |
1508 | - sanitize_text_field( $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ), |
|
1509 | - array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) |
|
1508 | + sanitize_text_field($this->_req_data['txn_reg_status_change']['reg_status']), |
|
1509 | + array(array('REG_ID' => array('IN', $REG_IDs))) |
|
1510 | 1510 | ); |
1511 | 1511 | } |
1512 | 1512 | |
@@ -1521,16 +1521,16 @@ discard block |
||
1521 | 1521 | * @param bool | null $delete_txn_reg_status_change |
1522 | 1522 | * @return array |
1523 | 1523 | */ |
1524 | - protected function _build_payment_json_response( EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null ) { |
|
1524 | + protected function _build_payment_json_response(EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null) { |
|
1525 | 1525 | // was the payment deleted ? |
1526 | - if ( is_bool( $delete_txn_reg_status_change )) { |
|
1526 | + if (is_bool($delete_txn_reg_status_change)) { |
|
1527 | 1527 | return array( |
1528 | 1528 | 'PAY_ID' => $payment->ID(), |
1529 | 1529 | 'amount' => $payment->amount(), |
1530 | 1530 | 'total_paid' => $payment->transaction()->paid(), |
1531 | 1531 | 'txn_status' => $payment->transaction()->status_ID(), |
1532 | 1532 | 'pay_status' => $payment->STS_ID(), |
1533 | - 'registrations' => $this->_registration_payment_data_array( $REG_IDs ), |
|
1533 | + 'registrations' => $this->_registration_payment_data_array($REG_IDs), |
|
1534 | 1534 | 'delete_txn_reg_status_change' => $delete_txn_reg_status_change, |
1535 | 1535 | ); |
1536 | 1536 | } else { |
@@ -1542,16 +1542,16 @@ discard block |
||
1542 | 1542 | 'pay_status' => $payment->STS_ID(), |
1543 | 1543 | 'PAY_ID' => $payment->ID(), |
1544 | 1544 | 'STS_ID' => $payment->STS_ID(), |
1545 | - 'status' => self::$_pay_status[ $payment->STS_ID() ], |
|
1546 | - 'date' => $payment->timestamp( 'Y-m-d', 'h:i a' ), |
|
1547 | - 'method' => strtoupper( $payment->source() ), |
|
1545 | + 'status' => self::$_pay_status[$payment->STS_ID()], |
|
1546 | + 'date' => $payment->timestamp('Y-m-d', 'h:i a'), |
|
1547 | + 'method' => strtoupper($payment->source()), |
|
1548 | 1548 | 'PM_ID' => $payment->payment_method() ? $payment->payment_method()->ID() : 1, |
1549 | - 'gateway' => $payment->payment_method() ? $payment->payment_method()->admin_name() : __( "Unknown", 'event_espresso' ), |
|
1549 | + 'gateway' => $payment->payment_method() ? $payment->payment_method()->admin_name() : __("Unknown", 'event_espresso'), |
|
1550 | 1550 | 'gateway_response' => $payment->gateway_response(), |
1551 | 1551 | 'txn_id_chq_nmbr' => $payment->txn_id_chq_nmbr(), |
1552 | 1552 | 'po_number' => $payment->po_number(), |
1553 | 1553 | 'extra_accntng' => $payment->extra_accntng(), |
1554 | - 'registrations' => $this->_registration_payment_data_array( $REG_IDs ), |
|
1554 | + 'registrations' => $this->_registration_payment_data_array($REG_IDs), |
|
1555 | 1555 | ); |
1556 | 1556 | } |
1557 | 1557 | } |
@@ -1566,39 +1566,39 @@ discard block |
||
1566 | 1566 | * @return void |
1567 | 1567 | */ |
1568 | 1568 | public function delete_payment() { |
1569 | - $json_response_data = array( 'return_data' => FALSE ); |
|
1570 | - $PAY_ID = isset( $this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) ? absint( $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) : 0; |
|
1571 | - if ( $PAY_ID ) { |
|
1572 | - $delete_txn_reg_status_change = isset( $this->_req_data[ 'delete_txn_reg_status_change' ] ) ? $this->_req_data[ 'delete_txn_reg_status_change' ] : false; |
|
1573 | - $payment = EEM_Payment::instance()->get_one_by_ID( $PAY_ID ); |
|
1574 | - if ( $payment instanceof EE_Payment ) { |
|
1575 | - $REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment ); |
|
1569 | + $json_response_data = array('return_data' => FALSE); |
|
1570 | + $PAY_ID = isset($this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID']) ? absint($this->_req_data['delete_txn_admin_payment']['PAY_ID']) : 0; |
|
1571 | + if ($PAY_ID) { |
|
1572 | + $delete_txn_reg_status_change = isset($this->_req_data['delete_txn_reg_status_change']) ? $this->_req_data['delete_txn_reg_status_change'] : false; |
|
1573 | + $payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID); |
|
1574 | + if ($payment instanceof EE_Payment) { |
|
1575 | + $REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment); |
|
1576 | 1576 | /** @type EE_Transaction_Payments $transaction_payments */ |
1577 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
1578 | - if ( $transaction_payments->delete_payment_and_update_transaction( $payment )) { |
|
1579 | - $json_response_data['return_data'] = $this->_build_payment_json_response( $payment, $REG_IDs, $delete_txn_reg_status_change ); |
|
1580 | - if ( $delete_txn_reg_status_change ) { |
|
1577 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
1578 | + if ($transaction_payments->delete_payment_and_update_transaction($payment)) { |
|
1579 | + $json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs, $delete_txn_reg_status_change); |
|
1580 | + if ($delete_txn_reg_status_change) { |
|
1581 | 1581 | $this->_req_data['txn_reg_status_change'] = $delete_txn_reg_status_change; |
1582 | 1582 | //MAKE sure we also add the delete_txn_req_status_change to the |
1583 | 1583 | //$_REQUEST global because that's how messages will be looking for it. |
1584 | 1584 | $_REQUEST['txn_reg_status_change'] = $delete_txn_reg_status_change; |
1585 | 1585 | $this->_maybe_send_notifications(); |
1586 | - $this->_process_registration_status_change( $payment->transaction(), $REG_IDs ); |
|
1586 | + $this->_process_registration_status_change($payment->transaction(), $REG_IDs); |
|
1587 | 1587 | } |
1588 | 1588 | } |
1589 | 1589 | } else { |
1590 | 1590 | EE_Error::add_error( |
1591 | - __( 'Valid Payment data could not be retrieved from the database.', 'event_espresso' ), |
|
1591 | + __('Valid Payment data could not be retrieved from the database.', 'event_espresso'), |
|
1592 | 1592 | __FILE__, __FUNCTION__, __LINE__ |
1593 | 1593 | ); |
1594 | 1594 | } |
1595 | 1595 | } else { |
1596 | 1596 | EE_Error::add_error( |
1597 | - __( 'A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso' ), |
|
1597 | + __('A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso'), |
|
1598 | 1598 | __FILE__, __FUNCTION__, __LINE__ |
1599 | 1599 | ); |
1600 | 1600 | } |
1601 | - $notices = EE_Error::get_notices( false, false, false); |
|
1601 | + $notices = EE_Error::get_notices(false, false, false); |
|
1602 | 1602 | $this->_template_args = array( |
1603 | 1603 | 'data' => $json_response_data, |
1604 | 1604 | 'success' => $notices['success'], |
@@ -1618,17 +1618,17 @@ discard block |
||
1618 | 1618 | * @param array $REG_IDs |
1619 | 1619 | * @return array |
1620 | 1620 | */ |
1621 | - protected function _registration_payment_data_array( $REG_IDs ) { |
|
1621 | + protected function _registration_payment_data_array($REG_IDs) { |
|
1622 | 1622 | $registration_payment_data = array(); |
1623 | 1623 | //if non empty reg_ids lets get an array of registrations and update the values for the apply_payment/refund rows. |
1624 | - if ( ! empty( $REG_IDs ) ) { |
|
1625 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
1626 | - $registrations = EEM_Registration::instance()->get_all( array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) ); |
|
1627 | - foreach ( $registrations as $registration ) { |
|
1628 | - if ( $registration instanceof EE_Registration ) { |
|
1629 | - $registration_payment_data[ $registration->ID() ] = array( |
|
1624 | + if ( ! empty($REG_IDs)) { |
|
1625 | + EE_Registry::instance()->load_helper('Template'); |
|
1626 | + $registrations = EEM_Registration::instance()->get_all(array(array('REG_ID' => array('IN', $REG_IDs)))); |
|
1627 | + foreach ($registrations as $registration) { |
|
1628 | + if ($registration instanceof EE_Registration) { |
|
1629 | + $registration_payment_data[$registration->ID()] = array( |
|
1630 | 1630 | 'paid' => $registration->pretty_paid(), |
1631 | - 'owing' => EEH_Template::format_currency( $registration->final_price() - $registration->paid() ), |
|
1631 | + 'owing' => EEH_Template::format_currency($registration->final_price() - $registration->paid()), |
|
1632 | 1632 | ); |
1633 | 1633 | } |
1634 | 1634 | } |
@@ -1648,30 +1648,30 @@ discard block |
||
1648 | 1648 | * @access protected |
1649 | 1649 | * @param \EE_Payment | null $payment |
1650 | 1650 | */ |
1651 | - protected function _maybe_send_notifications( $payment = null ) { |
|
1652 | - switch ( $payment instanceof EE_Payment ) { |
|
1651 | + protected function _maybe_send_notifications($payment = null) { |
|
1652 | + switch ($payment instanceof EE_Payment) { |
|
1653 | 1653 | // payment notifications |
1654 | 1654 | case true : |
1655 | 1655 | if ( |
1656 | 1656 | isset( |
1657 | - $this->_req_data[ 'txn_payments' ], |
|
1658 | - $this->_req_data[ 'txn_payments' ][ 'send_notifications' ] |
|
1657 | + $this->_req_data['txn_payments'], |
|
1658 | + $this->_req_data['txn_payments']['send_notifications'] |
|
1659 | 1659 | ) && |
1660 | - filter_var( $this->_req_data[ 'txn_payments' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN ) |
|
1660 | + filter_var($this->_req_data['txn_payments']['send_notifications'], FILTER_VALIDATE_BOOLEAN) |
|
1661 | 1661 | ) { |
1662 | - $this->_process_payment_notification( $payment ); |
|
1662 | + $this->_process_payment_notification($payment); |
|
1663 | 1663 | } |
1664 | 1664 | break; |
1665 | 1665 | // registration notifications |
1666 | 1666 | case false : |
1667 | 1667 | if ( |
1668 | 1668 | isset( |
1669 | - $this->_req_data[ 'txn_reg_status_change' ], |
|
1670 | - $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ] |
|
1669 | + $this->_req_data['txn_reg_status_change'], |
|
1670 | + $this->_req_data['txn_reg_status_change']['send_notifications'] |
|
1671 | 1671 | ) && |
1672 | - filter_var( $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN ) |
|
1672 | + filter_var($this->_req_data['txn_reg_status_change']['send_notifications'], FILTER_VALIDATE_BOOLEAN) |
|
1673 | 1673 | ) { |
1674 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' ); |
|
1674 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true'); |
|
1675 | 1675 | } |
1676 | 1676 | break; |
1677 | 1677 | } |
@@ -1687,11 +1687,11 @@ discard block |
||
1687 | 1687 | * @return void |
1688 | 1688 | */ |
1689 | 1689 | protected function _send_payment_reminder() { |
1690 | - $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE; |
|
1691 | - $transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID ); |
|
1692 | - $query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array(); |
|
1693 | - do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction ); |
|
1694 | - $this->_redirect_after_action( FALSE, __('payment reminder', 'event_espresso'), __('sent', 'event_espresso'), $query_args, TRUE ); |
|
1690 | + $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE; |
|
1691 | + $transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID); |
|
1692 | + $query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID']) : array(); |
|
1693 | + do_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction); |
|
1694 | + $this->_redirect_after_action(FALSE, __('payment reminder', 'event_espresso'), __('sent', 'event_espresso'), $query_args, TRUE); |
|
1695 | 1695 | } |
1696 | 1696 | |
1697 | 1697 | |
@@ -1705,36 +1705,36 @@ discard block |
||
1705 | 1705 | * @param string $view |
1706 | 1706 | * @return mixed int = count || array of transaction objects |
1707 | 1707 | */ |
1708 | - public function get_transactions( $perpage, $count = FALSE, $view = '' ) { |
|
1708 | + public function get_transactions($perpage, $count = FALSE, $view = '') { |
|
1709 | 1709 | |
1710 | 1710 | $TXN = EEM_Transaction::instance(); |
1711 | 1711 | |
1712 | - $start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' )); |
|
1713 | - $end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' ); |
|
1712 | + $start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year')); |
|
1713 | + $end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y'); |
|
1714 | 1714 | |
1715 | 1715 | //make sure our timestamps start and end right at the boundaries for each day |
1716 | - $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00'; |
|
1717 | - $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59'; |
|
1716 | + $start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00'; |
|
1717 | + $end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59'; |
|
1718 | 1718 | |
1719 | 1719 | |
1720 | 1720 | //convert to timestamps |
1721 | - $start_date = strtotime( $start_date ); |
|
1722 | - $end_date = strtotime( $end_date ); |
|
1721 | + $start_date = strtotime($start_date); |
|
1722 | + $end_date = strtotime($end_date); |
|
1723 | 1723 | |
1724 | 1724 | //makes sure start date is the lowest value and vice versa |
1725 | - $start_date = min( $start_date, $end_date ); |
|
1726 | - $end_date = max( $start_date, $end_date ); |
|
1725 | + $start_date = min($start_date, $end_date); |
|
1726 | + $end_date = max($start_date, $end_date); |
|
1727 | 1727 | |
1728 | 1728 | //convert to correct format for query |
1729 | - $start_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' ); |
|
1730 | - $end_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' ); |
|
1729 | + $start_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s'); |
|
1730 | + $end_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s'); |
|
1731 | 1731 | |
1732 | 1732 | |
1733 | 1733 | |
1734 | 1734 | //set orderby |
1735 | 1735 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
1736 | 1736 | |
1737 | - switch ( $this->_req_data['orderby'] ) { |
|
1737 | + switch ($this->_req_data['orderby']) { |
|
1738 | 1738 | case 'TXN_ID': |
1739 | 1739 | $orderby = 'TXN_ID'; |
1740 | 1740 | break; |
@@ -1748,66 +1748,66 @@ discard block |
||
1748 | 1748 | $orderby = 'TXN_timestamp'; |
1749 | 1749 | } |
1750 | 1750 | |
1751 | - $sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC'; |
|
1752 | - $current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1; |
|
1753 | - $per_page = isset( $perpage ) && !empty( $perpage ) ? $perpage : 10; |
|
1754 | - $per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page; |
|
1751 | + $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC'; |
|
1752 | + $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1; |
|
1753 | + $per_page = isset($perpage) && ! empty($perpage) ? $perpage : 10; |
|
1754 | + $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page; |
|
1755 | 1755 | |
1756 | - $offset = ($current_page-1)*$per_page; |
|
1757 | - $limit = array( $offset, $per_page ); |
|
1756 | + $offset = ($current_page - 1) * $per_page; |
|
1757 | + $limit = array($offset, $per_page); |
|
1758 | 1758 | |
1759 | 1759 | $_where = array( |
1760 | - 'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date) ), |
|
1760 | + 'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date)), |
|
1761 | 1761 | 'Registration.REG_count' => 1 |
1762 | 1762 | ); |
1763 | 1763 | |
1764 | - if ( isset( $this->_req_data['EVT_ID'] ) ) { |
|
1764 | + if (isset($this->_req_data['EVT_ID'])) { |
|
1765 | 1765 | $_where['Registration.EVT_ID'] = $this->_req_data['EVT_ID']; |
1766 | 1766 | } |
1767 | 1767 | |
1768 | - if ( isset( $this->_req_data['s'] ) ) { |
|
1769 | - $search_string = '%' . $this->_req_data['s'] . '%'; |
|
1768 | + if (isset($this->_req_data['s'])) { |
|
1769 | + $search_string = '%'.$this->_req_data['s'].'%'; |
|
1770 | 1770 | $_where['OR'] = array( |
1771 | - 'Registration.Event.EVT_name' => array( 'LIKE', $search_string ), |
|
1772 | - 'Registration.Event.EVT_desc' => array( 'LIKE', $search_string ), |
|
1773 | - 'Registration.Event.EVT_short_desc' => array( 'LIKE' , $search_string ), |
|
1774 | - 'Registration.Attendee.ATT_full_name' => array( 'LIKE', $search_string ), |
|
1775 | - 'Registration.Attendee.ATT_fname' => array( 'LIKE', $search_string ), |
|
1776 | - 'Registration.Attendee.ATT_lname' => array( 'LIKE', $search_string ), |
|
1777 | - 'Registration.Attendee.ATT_short_bio' => array( 'LIKE', $search_string ), |
|
1778 | - 'Registration.Attendee.ATT_email' => array('LIKE', $search_string ), |
|
1779 | - 'Registration.Attendee.ATT_address' => array( 'LIKE', $search_string ), |
|
1780 | - 'Registration.Attendee.ATT_address2' => array( 'LIKE', $search_string ), |
|
1781 | - 'Registration.Attendee.ATT_city' => array( 'LIKE', $search_string ), |
|
1782 | - 'Registration.REG_final_price' => array( 'LIKE', $search_string ), |
|
1783 | - 'Registration.REG_code' => array( 'LIKE', $search_string ), |
|
1784 | - 'Registration.REG_count' => array( 'LIKE' , $search_string ), |
|
1785 | - 'Registration.REG_group_size' => array( 'LIKE' , $search_string ), |
|
1786 | - 'Registration.Ticket.TKT_name' => array( 'LIKE', $search_string ), |
|
1787 | - 'Registration.Ticket.TKT_description' => array( 'LIKE', $search_string ), |
|
1788 | - 'Payment.PAY_source' => array('LIKE', $search_string ), |
|
1789 | - 'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string ), |
|
1790 | - 'TXN_session_data' => array( 'LIKE', $search_string ), |
|
1791 | - 'Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $search_string ) |
|
1771 | + 'Registration.Event.EVT_name' => array('LIKE', $search_string), |
|
1772 | + 'Registration.Event.EVT_desc' => array('LIKE', $search_string), |
|
1773 | + 'Registration.Event.EVT_short_desc' => array('LIKE', $search_string), |
|
1774 | + 'Registration.Attendee.ATT_full_name' => array('LIKE', $search_string), |
|
1775 | + 'Registration.Attendee.ATT_fname' => array('LIKE', $search_string), |
|
1776 | + 'Registration.Attendee.ATT_lname' => array('LIKE', $search_string), |
|
1777 | + 'Registration.Attendee.ATT_short_bio' => array('LIKE', $search_string), |
|
1778 | + 'Registration.Attendee.ATT_email' => array('LIKE', $search_string), |
|
1779 | + 'Registration.Attendee.ATT_address' => array('LIKE', $search_string), |
|
1780 | + 'Registration.Attendee.ATT_address2' => array('LIKE', $search_string), |
|
1781 | + 'Registration.Attendee.ATT_city' => array('LIKE', $search_string), |
|
1782 | + 'Registration.REG_final_price' => array('LIKE', $search_string), |
|
1783 | + 'Registration.REG_code' => array('LIKE', $search_string), |
|
1784 | + 'Registration.REG_count' => array('LIKE', $search_string), |
|
1785 | + 'Registration.REG_group_size' => array('LIKE', $search_string), |
|
1786 | + 'Registration.Ticket.TKT_name' => array('LIKE', $search_string), |
|
1787 | + 'Registration.Ticket.TKT_description' => array('LIKE', $search_string), |
|
1788 | + 'Payment.PAY_source' => array('LIKE', $search_string), |
|
1789 | + 'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string), |
|
1790 | + 'TXN_session_data' => array('LIKE', $search_string), |
|
1791 | + 'Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $search_string) |
|
1792 | 1792 | ); |
1793 | 1793 | } |
1794 | 1794 | |
1795 | 1795 | //failed transactions |
1796 | - $failed = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'failed' && ! $count ) || ( $count && $view == 'failed' ) ? TRUE: FALSE; |
|
1797 | - $abandoned = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'abandoned' && ! $count ) || ( $count && $view == 'abandoned' ) ? TRUE: FALSE; |
|
1796 | + $failed = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'failed' && ! $count) || ($count && $view == 'failed') ? TRUE : FALSE; |
|
1797 | + $abandoned = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'abandoned' && ! $count) || ($count && $view == 'abandoned') ? TRUE : FALSE; |
|
1798 | 1798 | |
1799 | - if ( $failed ) { |
|
1800 | - $_where[ 'STS_ID' ] = EEM_Transaction::failed_status_code; |
|
1801 | - } else if ( $abandoned ) { |
|
1799 | + if ($failed) { |
|
1800 | + $_where['STS_ID'] = EEM_Transaction::failed_status_code; |
|
1801 | + } else if ($abandoned) { |
|
1802 | 1802 | $_where['STS_ID'] = EEM_Transaction::abandoned_status_code; |
1803 | 1803 | } else { |
1804 | - $_where['STS_ID'] = array( '!=', EEM_Transaction::failed_status_code ); |
|
1805 | - $_where['STS_ID*'] = array( '!=', EEM_Transaction::abandoned_status_code ); |
|
1804 | + $_where['STS_ID'] = array('!=', EEM_Transaction::failed_status_code); |
|
1805 | + $_where['STS_ID*'] = array('!=', EEM_Transaction::abandoned_status_code); |
|
1806 | 1806 | } |
1807 | 1807 | |
1808 | - $query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'limit' => $limit ); |
|
1808 | + $query_params = array($_where, 'order_by' => array($orderby => $sort), 'limit' => $limit); |
|
1809 | 1809 | |
1810 | - $transactions = $count ? $TXN->count( array($_where), 'TXN_ID', TRUE ) : $TXN->get_all($query_params); |
|
1810 | + $transactions = $count ? $TXN->count(array($_where), 'TXN_ID', TRUE) : $TXN->get_all($query_params); |
|
1811 | 1811 | |
1812 | 1812 | |
1813 | 1813 | return $transactions; |