@@ -30,20 +30,20 @@ discard block |
||
30 | 30 | |
31 | 31 | * |
32 | 32 | */ |
33 | -class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage{ |
|
33 | +class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage { |
|
34 | 34 | private $_old_table; |
35 | 35 | private $_new_table; |
36 | - function _migration_step($num_items=50){ |
|
36 | + function _migration_step($num_items = 50) { |
|
37 | 37 | |
38 | 38 | global $wpdb; |
39 | 39 | $start_at_record = $this->count_records_migrated(); |
40 | - $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A); |
|
40 | + $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A); |
|
41 | 41 | $items_actually_migrated = 0; |
42 | - foreach($rows as $event_venue_rel){ |
|
42 | + foreach ($rows as $event_venue_rel) { |
|
43 | 43 | $this->_insert_new_event_to_venue_rel($event_venue_rel); |
44 | 44 | $items_actually_migrated++; |
45 | 45 | } |
46 | - if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){ |
|
46 | + if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) { |
|
47 | 47 | $this->set_completed(); |
48 | 48 | } |
49 | 49 | return $items_actually_migrated; |
@@ -67,26 +67,26 @@ discard block |
||
67 | 67 | * @param array $old_event_venue_rel |
68 | 68 | * @return int |
69 | 69 | */ |
70 | - private function _insert_new_event_to_venue_rel($old_event_venue_rel){ |
|
70 | + private function _insert_new_event_to_venue_rel($old_event_venue_rel) { |
|
71 | 71 | global $wpdb; |
72 | 72 | $new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_venue_rel['event_id'], $wpdb->prefix."posts"); |
73 | 73 | $new_venue_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_venue", $old_event_venue_rel['venue_id'], $wpdb->prefix."posts"); |
74 | - if( ! $new_event_id){ |
|
75 | - $this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$old_event_venue_rel['event_id'])); |
|
74 | + if ( ! $new_event_id) { |
|
75 | + $this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_venue_rel['event_id'])); |
|
76 | 76 | return 0; |
77 | 77 | } |
78 | - if( ! $new_venue_id){ |
|
79 | - $this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),$old_event_venue_rel['venue_id'])); |
|
78 | + if ( ! $new_venue_id) { |
|
79 | + $this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $old_event_venue_rel['venue_id'])); |
|
80 | 80 | return 0; |
81 | 81 | } |
82 | 82 | //first ensure there are no other relation entries for this event |
83 | 83 | //because although EE4 supports it, EE3 didn't really |
84 | - $wpdb->delete( $this->_new_table, |
|
84 | + $wpdb->delete($this->_new_table, |
|
85 | 85 | array( |
86 | 86 | 'EVT_ID' => $new_event_id, |
87 | 87 | ), |
88 | 88 | array( |
89 | - '%d',//EVT_ID |
|
89 | + '%d', //EVT_ID |
|
90 | 90 | )); |
91 | 91 | // echo "last query". $wpdb->last_query;die; |
92 | 92 | $cols_n_values = array( |
@@ -95,12 +95,12 @@ discard block |
||
95 | 95 | 'EVV_primary'=>true |
96 | 96 | ); |
97 | 97 | $datatypes = array( |
98 | - '%d',//EVT_ID |
|
99 | - '%d',//VNU_ID |
|
100 | - '%d',//EVT_primary |
|
98 | + '%d', //EVT_ID |
|
99 | + '%d', //VNU_ID |
|
100 | + '%d', //EVT_primary |
|
101 | 101 | ); |
102 | - $success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes); |
|
103 | - if ( ! $success){ |
|
102 | + $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes); |
|
103 | + if ( ! $success) { |
|
104 | 104 | $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_venue_rel, $this->_new_table, $cols_n_values, $datatypes)); |
105 | 105 | return 0; |
106 | 106 | } |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | 'DTT_deleted' => new EE_Trashed_Flag_Field('DTT_deleted', __('Flag indicating datetime is archived', 'event_espresso'), false, false ), |
159 | 159 | )); |
160 | 160 | */ |
161 | -class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage{ |
|
161 | +class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage { |
|
162 | 162 | private $_old_table; |
163 | 163 | private $_old_start_end_table; |
164 | 164 | private $_new_table; |
@@ -184,41 +184,41 @@ discard block |
||
184 | 184 | protected function _migration_step($num_items_to_migrate = 50) { |
185 | 185 | global $wpdb; |
186 | 186 | //because the migration of each event can be a LOT more work, make each step smaller |
187 | - $num_items_to_migrate = max(1,$num_items_to_migrate/5); |
|
188 | - $events = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$this->count_records_migrated(),$num_items_to_migrate),ARRAY_A); |
|
187 | + $num_items_to_migrate = max(1, $num_items_to_migrate / 5); |
|
188 | + $events = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $this->count_records_migrated(), $num_items_to_migrate), ARRAY_A); |
|
189 | 189 | $items_migrated_this_step = 0; |
190 | 190 | |
191 | - foreach($events as $event_row){ |
|
191 | + foreach ($events as $event_row) { |
|
192 | 192 | $created_attachment_post = false; |
193 | 193 | //insert new 4.1 Attendee object using $wpdb |
194 | 194 | $post_id = $this->_insert_cpt($event_row); |
195 | - if($post_id){ |
|
195 | + if ($post_id) { |
|
196 | 196 | $this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_table, $post_id); |
197 | 197 | $meta_id = $this->_insert_event_meta($event_row, $post_id); |
198 | - if($meta_id){ |
|
198 | + if ($meta_id) { |
|
199 | 199 | $this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_meta_table, $meta_id); |
200 | 200 | } |
201 | - $this->_convert_start_end_times($event_row,$post_id); |
|
201 | + $this->_convert_start_end_times($event_row, $post_id); |
|
202 | 202 | $event_meta = maybe_unserialize($event_row['event_meta']); |
203 | 203 | $guid = isset($event_meta['event_thumbnail_url']) ? $event_meta['event_thumbnail_url'] : null; |
204 | - $created_attachment_post = $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid,$post_id,$this); |
|
204 | + $created_attachment_post = $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $post_id, $this); |
|
205 | 205 | |
206 | 206 | //maybe create a venue from info on the event? |
207 | 207 | $new_venue_id = $this->_maybe_create_venue($event_row); |
208 | - if($new_venue_id){ |
|
209 | - $this->_insert_new_venue_to_event($post_id,$new_venue_id); |
|
208 | + if ($new_venue_id) { |
|
209 | + $this->_insert_new_venue_to_event($post_id, $new_venue_id); |
|
210 | 210 | } |
211 | 211 | $this->_add_post_metas($event_row, $post_id); |
212 | 212 | |
213 | 213 | } |
214 | 214 | $items_migrated_this_step++; |
215 | - if($guid){ |
|
215 | + if ($guid) { |
|
216 | 216 | //if we had to check for an image attachment |
217 | 217 | //then let's call it a day (avoid timing out, because this took a long time) |
218 | 218 | break; |
219 | 219 | } |
220 | 220 | } |
221 | - if($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()){ |
|
221 | + if ($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()) { |
|
222 | 222 | $this->set_status(EE_Data_Migration_Manager::status_completed); |
223 | 223 | } |
224 | 224 | return $items_migrated_this_step; |
@@ -230,28 +230,28 @@ discard block |
||
230 | 230 | * @param type $post_id |
231 | 231 | * @return void |
232 | 232 | */ |
233 | - private function _add_post_metas($old_event,$post_id){ |
|
233 | + private function _add_post_metas($old_event, $post_id) { |
|
234 | 234 | $event_meta = maybe_unserialize($old_event['event_meta']); |
235 | - if( ! $event_meta || ! is_array( $event_meta ) ){ |
|
235 | + if ( ! $event_meta || ! is_array($event_meta)) { |
|
236 | 236 | return; |
237 | 237 | } |
238 | - unset($event_meta['date_submitted']);//factored into CPT |
|
239 | - unset($event_meta['additional_attendee_reg_info']);//facotred into event meta table |
|
240 | - unset($event_meta['default_payment_status']);//dido |
|
241 | - unset($event_meta['event_thumbnail_url']);//used to find post featured image |
|
242 | - foreach($event_meta as $meta_key => $meta_value){ |
|
243 | - if ($meta_key){//if th emeta key is just an empty string, ignore it |
|
244 | - $success = add_post_meta($post_id,$meta_key,$meta_value,true); |
|
245 | - if( ! $success ){ |
|
246 | - $this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"),$post_id,$meta_key,$meta_value,implode(",",$old_event))); |
|
238 | + unset($event_meta['date_submitted']); //factored into CPT |
|
239 | + unset($event_meta['additional_attendee_reg_info']); //facotred into event meta table |
|
240 | + unset($event_meta['default_payment_status']); //dido |
|
241 | + unset($event_meta['event_thumbnail_url']); //used to find post featured image |
|
242 | + foreach ($event_meta as $meta_key => $meta_value) { |
|
243 | + if ($meta_key) {//if th emeta key is just an empty string, ignore it |
|
244 | + $success = add_post_meta($post_id, $meta_key, $meta_value, true); |
|
245 | + if ( ! $success) { |
|
246 | + $this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"), $post_id, $meta_key, $meta_value, implode(",", $old_event))); |
|
247 | 247 | } |
248 | 248 | } |
249 | 249 | } |
250 | - if($old_event['alt_email']){ |
|
251 | - add_post_meta($post_id,'alt_email',$old_event['alt_email']); |
|
250 | + if ($old_event['alt_email']) { |
|
251 | + add_post_meta($post_id, 'alt_email', $old_event['alt_email']); |
|
252 | 252 | } |
253 | - if($old_event['recurrence_id']){ |
|
254 | - add_post_meta($post_id,'recurrence_id',$old_event['recurrence_id']); |
|
253 | + if ($old_event['recurrence_id']) { |
|
254 | + add_post_meta($post_id, 'recurrence_id', $old_event['recurrence_id']); |
|
255 | 255 | } |
256 | 256 | } |
257 | 257 | /** |
@@ -261,11 +261,11 @@ discard block |
||
261 | 261 | * @param string $event_name |
262 | 262 | * @return string |
263 | 263 | */ |
264 | - private function _find_unique_slug($event_name, $old_identifier = ''){ |
|
264 | + private function _find_unique_slug($event_name, $old_identifier = '') { |
|
265 | 265 | $count = 0; |
266 | 266 | $original_name = $event_name ? sanitize_title($event_name) : $old_identifier; |
267 | 267 | $event_slug = $original_name; |
268 | - while( $this->_other_post_exists_with_that_slug($event_slug) && $count<50){ |
|
268 | + while ($this->_other_post_exists_with_that_slug($event_slug) && $count < 50) { |
|
269 | 269 | $event_slug = sanitize_title($original_name."-".++$count); |
270 | 270 | } |
271 | 271 | return $event_slug; |
@@ -277,13 +277,13 @@ discard block |
||
277 | 277 | * @param type $slug |
278 | 278 | * @return boolean |
279 | 279 | */ |
280 | - private function _other_post_exists_with_that_slug($slug){ |
|
280 | + private function _other_post_exists_with_that_slug($slug) { |
|
281 | 281 | global $wpdb; |
282 | - $query = $wpdb->prepare("SELECT COUNT(ID) FROM ".$this->_new_table." WHERE post_name = %s",$slug); |
|
282 | + $query = $wpdb->prepare("SELECT COUNT(ID) FROM ".$this->_new_table." WHERE post_name = %s", $slug); |
|
283 | 283 | $count = $wpdb->get_var($query); |
284 | - return (boolean)intval($count); |
|
284 | + return (boolean) intval($count); |
|
285 | 285 | } |
286 | - private function _insert_cpt($old_event){ |
|
286 | + private function _insert_cpt($old_event) { |
|
287 | 287 | global $wpdb; |
288 | 288 | //convert 3.1 event status to 4.1 CPT status |
289 | 289 | //for refrence, 3.1 event stati available for setting are: |
@@ -302,55 +302,55 @@ discard block |
||
302 | 302 | // and 3 custom ones: cancelled,postponed,sold_out |
303 | 303 | $status_conversions = array( |
304 | 304 | 'R'=>'draft', |
305 | - 'X'=>'draft',//4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved |
|
305 | + 'X'=>'draft', //4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved |
|
306 | 306 | 'P'=>'pending', |
307 | - 'IA'=>'draft',//draft and in the past |
|
307 | + 'IA'=>'draft', //draft and in the past |
|
308 | 308 | //IA=inactive in 3.1: events were switched to this when they expired. in 4.1 that's just calculated |
309 | - 'O'=>'publish',//@todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing' |
|
309 | + 'O'=>'publish', //@todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing' |
|
310 | 310 | 'A'=>'publish', |
311 | - 'S'=>'draft',//@todo: is it ok to just mark secondary/waitlist events as DRAFTS? |
|
311 | + 'S'=>'draft', //@todo: is it ok to just mark secondary/waitlist events as DRAFTS? |
|
312 | 312 | 'D'=>'trash', |
313 | 313 | ); |
314 | 314 | $post_status = $status_conversions[$old_event['event_status']]; |
315 | 315 | //check if we've sold out |
316 | - if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])){ |
|
316 | + if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) { |
|
317 | 317 | $post_status = 'sold_out'; |
318 | 318 | } |
319 | 319 | // FYI postponed and cancelled don't exist in 3.1 |
320 | 320 | $cols_n_values = array( |
321 | - 'post_title'=>stripslashes($old_event['event_name']),//EVT_name |
|
322 | - 'post_content'=>stripslashes($old_event['event_desc']),//EVT_desc |
|
323 | - 'post_name'=>$this->_find_unique_slug($old_event['event_name']),//$old_event['event_identifier'],//EVT_slug |
|
324 | - 'post_date'=>$old_event['submitted'],//EVT_created NOT |
|
321 | + 'post_title'=>stripslashes($old_event['event_name']), //EVT_name |
|
322 | + 'post_content'=>stripslashes($old_event['event_desc']), //EVT_desc |
|
323 | + 'post_name'=>$this->_find_unique_slug($old_event['event_name']), //$old_event['event_identifier'],//EVT_slug |
|
324 | + 'post_date'=>$old_event['submitted'], //EVT_created NOT |
|
325 | 325 | 'post_date_gmt'=>get_gmt_from_date($old_event['submitted']), |
326 | - 'post_excerpt'=>'',//EVT_short_desc |
|
327 | - 'post_modified'=>$old_event['submitted'],//EVT_modified |
|
326 | + 'post_excerpt'=>'', //EVT_short_desc |
|
327 | + 'post_modified'=>$old_event['submitted'], //EVT_modified |
|
328 | 328 | 'post_modified_gmt'=>get_gmt_from_date($old_event['submitted']), |
329 | - 'post_author'=>$old_event['wp_user'],//EVT_wp_user |
|
330 | - 'post_parent'=>0,//parent maybe get this from some REM field? |
|
331 | - 'menu_order'=>0,//EVT_order |
|
332 | - 'post_type'=>'espresso_events',//post_type |
|
333 | - 'post_status'=>$post_status,//status |
|
329 | + 'post_author'=>$old_event['wp_user'], //EVT_wp_user |
|
330 | + 'post_parent'=>0, //parent maybe get this from some REM field? |
|
331 | + 'menu_order'=>0, //EVT_order |
|
332 | + 'post_type'=>'espresso_events', //post_type |
|
333 | + 'post_status'=>$post_status, //status |
|
334 | 334 | ); |
335 | 335 | $datatypes = array( |
336 | - '%s',//EVT_name |
|
337 | - '%s',//EVT_desc |
|
338 | - '%s',//EVT_slug |
|
339 | - '%s',//EVT_created |
|
336 | + '%s', //EVT_name |
|
337 | + '%s', //EVT_desc |
|
338 | + '%s', //EVT_slug |
|
339 | + '%s', //EVT_created |
|
340 | 340 | '%s', |
341 | - '%s',//EVT_short_desc |
|
342 | - '%s',//EVT_modified |
|
341 | + '%s', //EVT_short_desc |
|
342 | + '%s', //EVT_modified |
|
343 | 343 | '%s', |
344 | - '%s',//EVT_wp_user |
|
345 | - '%d',//post_parent |
|
346 | - '%d',//EVT_order |
|
347 | - '%s',//post_type |
|
348 | - '%s',//status |
|
344 | + '%s', //EVT_wp_user |
|
345 | + '%d', //post_parent |
|
346 | + '%d', //EVT_order |
|
347 | + '%s', //post_type |
|
348 | + '%s', //status |
|
349 | 349 | ); |
350 | 350 | $success = $wpdb->insert($this->_new_table, |
351 | 351 | $cols_n_values, |
352 | 352 | $datatypes); |
353 | - if( ! $success ){ |
|
353 | + if ( ! $success) { |
|
354 | 354 | $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_table, $cols_n_values, $datatypes)); |
355 | 355 | return 0; |
356 | 356 | } |
@@ -363,13 +363,13 @@ discard block |
||
363 | 363 | * @param type $event_id |
364 | 364 | * @return int |
365 | 365 | */ |
366 | - public static function count_registrations($event_id){ |
|
366 | + public static function count_registrations($event_id) { |
|
367 | 367 | global $wpdb; |
368 | - $count = $wpdb->get_var($wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d",$event_id)); |
|
368 | + $count = $wpdb->get_var($wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d", $event_id)); |
|
369 | 369 | return intval($count); |
370 | 370 | } |
371 | 371 | |
372 | - private function _insert_event_meta($old_event,$new_cpt_id){ |
|
372 | + private function _insert_event_meta($old_event, $new_cpt_id) { |
|
373 | 373 | global $wpdb; |
374 | 374 | $event_meta = maybe_unserialize($old_event['event_meta']); |
375 | 375 | // for reference, 3.1 'default_payment_status' are: $default_payment_status = array( |
@@ -380,10 +380,10 @@ discard block |
||
380 | 380 | //); |
381 | 381 | $default_reg_status = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(isset($event_meta['default_payment_status']) ? $event_meta['default_payment_status'] : '', intval($old_event['require_pre_approval'])); |
382 | 382 | $cols_n_values = array( |
383 | - 'EVT_ID'=>$new_cpt_id,//EVT_ID_fk |
|
383 | + 'EVT_ID'=>$new_cpt_id, //EVT_ID_fk |
|
384 | 384 | 'EVT_display_desc'=> 'Y' == $old_event['display_desc'], |
385 | - 'EVT_display_ticket_selector'=> 'Y'== $old_event['display_reg_form'], |
|
386 | - 'EVT_visible_on'=> $this->get_migration_script()->convert_date_string_to_utc($this,$old_event,current_time('mysql'),$old_event['timezone_string']),//don't use the old 'visible_on', as it wasnt ever used |
|
385 | + 'EVT_display_ticket_selector'=> 'Y' == $old_event['display_reg_form'], |
|
386 | + 'EVT_visible_on'=> $this->get_migration_script()->convert_date_string_to_utc($this, $old_event, current_time('mysql'), $old_event['timezone_string']), //don't use the old 'visible_on', as it wasnt ever used |
|
387 | 387 | 'EVT_additional_limit'=> $old_event['allow_multiple'] == 'N' ? 1 : $old_event['additional_limit'], |
388 | 388 | 'EVT_default_registration_status' => $default_reg_status, |
389 | 389 | 'EVT_member_only'=>$old_event['member_only'], |
@@ -395,31 +395,31 @@ discard block |
||
395 | 395 | |
396 | 396 | ); |
397 | 397 | $datatypes = array( |
398 | - '%s',//EVT_ID |
|
399 | - '%d',//EVT_display_desc |
|
400 | - '%d',//EVT_display_ticket_selector |
|
401 | - '%s',//EVT_visible_on |
|
402 | - '%d',//EVT_additional_limit |
|
403 | - '%s',//EVT_default_registration_status |
|
404 | - '%d',//EVT_member_only |
|
405 | - '%s',//EVT_phone |
|
406 | - '%d',//EVT_allow_overflow |
|
407 | - '%s',//EVT_timezone_string |
|
408 | - '%s',//EVT_external_URL |
|
409 | - '%d',//EVT_donations |
|
398 | + '%s', //EVT_ID |
|
399 | + '%d', //EVT_display_desc |
|
400 | + '%d', //EVT_display_ticket_selector |
|
401 | + '%s', //EVT_visible_on |
|
402 | + '%d', //EVT_additional_limit |
|
403 | + '%s', //EVT_default_registration_status |
|
404 | + '%d', //EVT_member_only |
|
405 | + '%s', //EVT_phone |
|
406 | + '%d', //EVT_allow_overflow |
|
407 | + '%s', //EVT_timezone_string |
|
408 | + '%s', //EVT_external_URL |
|
409 | + '%d', //EVT_donations |
|
410 | 410 | ); |
411 | 411 | $success = $wpdb->insert($this->_new_meta_table, |
412 | 412 | $cols_n_values, |
413 | 413 | $datatypes); |
414 | - if( ! $success ){ |
|
414 | + if ( ! $success) { |
|
415 | 415 | $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $cols_n_values, $datatypes)); |
416 | 416 | return 0; |
417 | 417 | } |
418 | 418 | return $wpdb->insert_id; |
419 | 419 | } |
420 | 420 | |
421 | - private function _maybe_create_venue($old_event){ |
|
422 | - if( $old_event['address'] || |
|
421 | + private function _maybe_create_venue($old_event) { |
|
422 | + if ($old_event['address'] || |
|
423 | 423 | $old_event['address2'] || |
424 | 424 | $old_event['city'] || |
425 | 425 | $old_event['state'] || |
@@ -430,21 +430,21 @@ discard block |
||
430 | 430 | $old_event['venue_phone'] || |
431 | 431 | $old_event['virtual_url'] || |
432 | 432 | $old_event['virtual_phone'] |
433 | - ){ |
|
434 | - $old_id = $this->_duplicate_venue_exists( $old_event ); |
|
435 | - if( $old_id ){ |
|
433 | + ) { |
|
434 | + $old_id = $this->_duplicate_venue_exists($old_event); |
|
435 | + if ($old_id) { |
|
436 | 436 | return $old_id; |
437 | 437 | } |
438 | 438 | $new_id = $this->_insert_venue_into_posts($old_event); |
439 | - if( $new_id ){ |
|
439 | + if ($new_id) { |
|
440 | 440 | $this->_insert_venue_into_meta_table($new_id, $old_event); |
441 | - $guid = isset($old_event['venue_image']) ? $old_event['venue_image'] : null; |
|
442 | - $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id,$this); |
|
441 | + $guid = isset($old_event['venue_image']) ? $old_event['venue_image'] : null; |
|
442 | + $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this); |
|
443 | 443 | } |
444 | 444 | //we don't bother recording the conversion from old events to venues as that |
445 | 445 | //will complicate finding the conversion from old venues to new events |
446 | 446 | return $new_id; |
447 | - }else{ |
|
447 | + } else { |
|
448 | 448 | return 0; |
449 | 449 | } |
450 | 450 | } |
@@ -455,29 +455,29 @@ discard block |
||
455 | 455 | * @param array $old_event |
456 | 456 | * @return int duplicate venue id |
457 | 457 | */ |
458 | - private function _duplicate_venue_exists($old_event){ |
|
458 | + private function _duplicate_venue_exists($old_event) { |
|
459 | 459 | global $wpdb; |
460 | 460 | $conditions = array( |
461 | - 'VNU_address' => $old_event [ 'address' ], |
|
462 | - 'VNU_address2' => $old_event[ 'address2' ], |
|
463 | - 'VNU_city' => $old_event[ 'city' ], |
|
464 | - 'VNU_zip' => $old_event[ 'zip' ], |
|
465 | - 'post_title'=> $this->_get_venue_title_for_event( $old_event ), |
|
466 | - 'VNU_phone'=>$old_event['venue_phone'],//VNU_phone |
|
467 | - 'VNU_url'=>$old_event['venue_url'],//VNU_url |
|
468 | - 'VNU_virtual_phone'=>$old_event['virtual_phone'],//VNU_virtual_phone |
|
469 | - 'VNU_virtual_url'=>$old_event['virtual_url'],//VNU_virtual_url |
|
461 | + 'VNU_address' => $old_event ['address'], |
|
462 | + 'VNU_address2' => $old_event['address2'], |
|
463 | + 'VNU_city' => $old_event['city'], |
|
464 | + 'VNU_zip' => $old_event['zip'], |
|
465 | + 'post_title'=> $this->_get_venue_title_for_event($old_event), |
|
466 | + 'VNU_phone'=>$old_event['venue_phone'], //VNU_phone |
|
467 | + 'VNU_url'=>$old_event['venue_url'], //VNU_url |
|
468 | + 'VNU_virtual_phone'=>$old_event['virtual_phone'], //VNU_virtual_phone |
|
469 | + 'VNU_virtual_url'=>$old_event['virtual_url'], //VNU_virtual_url |
|
470 | 470 | ); |
471 | 471 | $sql_conditions = array(); |
472 | - foreach($conditions as $column => $value){ |
|
472 | + foreach ($conditions as $column => $value) { |
|
473 | 473 | $sql_conditions [] = "$column = '$value'"; |
474 | 474 | } |
475 | 475 | $query = "SELECT VNU_ID |
476 | 476 | FROM |
477 | 477 | {$wpdb->posts} as p INNER JOIN |
478 | 478 | {$wpdb->prefix}esp_venue_meta as v ON p.ID = v.VNU_ID |
479 | - WHERE " . implode( " AND ",$sql_conditions ) . " LIMIT 1"; |
|
480 | - $id = $wpdb->get_var( $query ); |
|
479 | + WHERE ".implode(" AND ", $sql_conditions)." LIMIT 1"; |
|
480 | + $id = $wpdb->get_var($query); |
|
481 | 481 | return $id; |
482 | 482 | } |
483 | 483 | |
@@ -486,8 +486,8 @@ discard block |
||
486 | 486 | * @param array $event_data_array keys are events_details columns and valuesa re their values |
487 | 487 | * @return string |
488 | 488 | */ |
489 | - protected function _get_venue_title_for_event( $event_data_array ) { |
|
490 | - return $event_data_array['venue_title'] ? stripslashes($event_data_array['venue_title']) : stripslashes( sprintf( __( 'Venue of %s', 'event_espresso' ), $event_data_array['event_name'])); |
|
489 | + protected function _get_venue_title_for_event($event_data_array) { |
|
490 | + return $event_data_array['venue_title'] ? stripslashes($event_data_array['venue_title']) : stripslashes(sprintf(__('Venue of %s', 'event_espresso'), $event_data_array['event_name'])); |
|
491 | 491 | } |
492 | 492 | |
493 | 493 | /** |
@@ -495,40 +495,40 @@ discard block |
||
495 | 495 | * @param array $old_venue keys are cols, values are col values |
496 | 496 | * @return int |
497 | 497 | */ |
498 | - private function _insert_venue_into_posts($old_event){ |
|
498 | + private function _insert_venue_into_posts($old_event) { |
|
499 | 499 | global $wpdb; |
500 | 500 | $insertion_array = array( |
501 | - 'post_title'=> $this->_get_venue_title_for_event( $old_event ),//VNU_name |
|
502 | - 'post_content'=>'',//VNU_desc |
|
503 | - 'post_name'=> $this->_find_unique_slug( $old_event['venue_title'], sanitize_title( 'venue-of-' . $old_event['event_name'] ) ),//VNU_identifier |
|
504 | - 'post_date'=>current_time('mysql'),//VNU_created |
|
501 | + 'post_title'=> $this->_get_venue_title_for_event($old_event), //VNU_name |
|
502 | + 'post_content'=>'', //VNU_desc |
|
503 | + 'post_name'=> $this->_find_unique_slug($old_event['venue_title'], sanitize_title('venue-of-'.$old_event['event_name'])), //VNU_identifier |
|
504 | + 'post_date'=>current_time('mysql'), //VNU_created |
|
505 | 505 | 'post_date_gmt'=>get_gmt_from_date(current_time('mysql')), |
506 | - 'post_excerpt'=>'',//VNU_short_desc arbitraty only 50 characters |
|
507 | - 'post_modified'=>current_time('mysql'),//VNU_modified |
|
506 | + 'post_excerpt'=>'', //VNU_short_desc arbitraty only 50 characters |
|
507 | + 'post_modified'=>current_time('mysql'), //VNU_modified |
|
508 | 508 | 'post_modified_gmt'=>get_gmt_from_date(current_time('mysql')), |
509 | - 'post_author'=>$old_event['wp_user'],//VNU_wp_user |
|
510 | - 'post_parent'=>0,//parent |
|
511 | - 'menu_order'=>0,//VNU_order |
|
509 | + 'post_author'=>$old_event['wp_user'], //VNU_wp_user |
|
510 | + 'post_parent'=>0, //parent |
|
511 | + 'menu_order'=>0, //VNU_order |
|
512 | 512 | 'post_type'=>'espresso_venues'//post_type |
513 | 513 | ); |
514 | 514 | $datatypes_array = array( |
515 | - '%s',//VNU_name |
|
516 | - '%s',//VNU_desc |
|
517 | - '%s',//VNU_identifier |
|
518 | - '%s',//VNU_created |
|
515 | + '%s', //VNU_name |
|
516 | + '%s', //VNU_desc |
|
517 | + '%s', //VNU_identifier |
|
518 | + '%s', //VNU_created |
|
519 | 519 | '%s', |
520 | - '%s',//VNU_short_desc |
|
521 | - '%s',//VNU_modified |
|
520 | + '%s', //VNU_short_desc |
|
521 | + '%s', //VNU_modified |
|
522 | 522 | '%s', |
523 | - '%d',//VNU_wp_user |
|
524 | - '%d',//parent |
|
525 | - '%d',//VNU_order |
|
526 | - '%s',//post_type |
|
523 | + '%d', //VNU_wp_user |
|
524 | + '%d', //parent |
|
525 | + '%d', //VNU_order |
|
526 | + '%s', //post_type |
|
527 | 527 | ); |
528 | 528 | $success = $wpdb->insert($wpdb->posts, |
529 | 529 | $insertion_array, |
530 | 530 | $datatypes_array); |
531 | - if( ! $success ){ |
|
531 | + if ( ! $success) { |
|
532 | 532 | $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_table, $insertion_array, $datatypes_array)); |
533 | 533 | return 0; |
534 | 534 | } |
@@ -541,78 +541,78 @@ discard block |
||
541 | 541 | * @param type $old_event |
542 | 542 | * @return int |
543 | 543 | */ |
544 | - private function _insert_venue_into_meta_table($cpt_id,$old_event){ |
|
544 | + private function _insert_venue_into_meta_table($cpt_id, $old_event) { |
|
545 | 545 | global $wpdb; |
546 | 546 | |
547 | 547 | //assume the country is the same as the organization's old settings |
548 | 548 | $country_iso = $this->get_migration_script()->get_default_country_iso(); |
549 | 549 | //find the state from the venue, or the organization, or just guess california |
550 | - if( ! $old_event['state']){ |
|
550 | + if ( ! $old_event['state']) { |
|
551 | 551 | $old_org_options = get_option('events_organization_settings'); |
552 | 552 | $state_name = stripslashes($old_org_options['organization_state']); |
553 | - }else{ |
|
553 | + } else { |
|
554 | 554 | $state_name = $old_event['state']; |
555 | 555 | } |
556 | - if ( ! $state_name ){ |
|
556 | + if ( ! $state_name) { |
|
557 | 557 | $state_name = 'CA'; |
558 | 558 | } |
559 | 559 | //get a state ID with the same name, if possible |
560 | - try{ |
|
561 | - $state = $this->get_migration_script()->get_or_create_state($state_name,$country_iso); |
|
560 | + try { |
|
561 | + $state = $this->get_migration_script()->get_or_create_state($state_name, $country_iso); |
|
562 | 562 | $state_id = $state['STA_ID']; |
563 | - }catch(EE_Error $e){ |
|
563 | + } catch (EE_Error $e) { |
|
564 | 564 | $this->add_error($e->getMessage()); |
565 | 565 | $state_id = 0; |
566 | 566 | } |
567 | 567 | //now insert into meta table |
568 | 568 | $insertion_array = array( |
569 | - 'VNU_ID'=>$cpt_id,//VNU_ID_fk |
|
570 | - 'VNU_address'=>stripslashes($old_event['address']),//VNU_address |
|
571 | - 'VNU_address2'=>stripslashes($old_event['address2']),//VNU_address2 |
|
572 | - 'VNU_city'=>stripslashes($old_event['city']),//VNU_city |
|
573 | - 'STA_ID'=>$state_id,//STA_ID |
|
574 | - 'CNT_ISO'=>$country_iso,//CNT_ISO |
|
575 | - 'VNU_zip'=>$old_event['zip'],//VNU_zip |
|
576 | - 'VNU_phone'=>$old_event['venue_phone'],//VNU_phone |
|
577 | - 'VNU_capacity'=>-1,//VNU_capacity |
|
578 | - 'VNU_url'=>$old_event['venue_url'],//VNU_url |
|
579 | - 'VNU_virtual_phone'=>$old_event['virtual_phone'],//VNU_virtual_phone |
|
580 | - 'VNU_virtual_url'=>$old_event['virtual_url'],//VNU_virtual_url |
|
581 | - 'VNU_google_map_link'=>'',//VNU_google_map_link |
|
569 | + 'VNU_ID'=>$cpt_id, //VNU_ID_fk |
|
570 | + 'VNU_address'=>stripslashes($old_event['address']), //VNU_address |
|
571 | + 'VNU_address2'=>stripslashes($old_event['address2']), //VNU_address2 |
|
572 | + 'VNU_city'=>stripslashes($old_event['city']), //VNU_city |
|
573 | + 'STA_ID'=>$state_id, //STA_ID |
|
574 | + 'CNT_ISO'=>$country_iso, //CNT_ISO |
|
575 | + 'VNU_zip'=>$old_event['zip'], //VNU_zip |
|
576 | + 'VNU_phone'=>$old_event['venue_phone'], //VNU_phone |
|
577 | + 'VNU_capacity'=>-1, //VNU_capacity |
|
578 | + 'VNU_url'=>$old_event['venue_url'], //VNU_url |
|
579 | + 'VNU_virtual_phone'=>$old_event['virtual_phone'], //VNU_virtual_phone |
|
580 | + 'VNU_virtual_url'=>$old_event['virtual_url'], //VNU_virtual_url |
|
581 | + 'VNU_google_map_link'=>'', //VNU_google_map_link |
|
582 | 582 | 'VNU_enable_for_gmap'=>true //VNU_enable_for_gmap |
583 | 583 | ); |
584 | 584 | $datatypes = array( |
585 | - '%d',//VNU_ID_fk |
|
586 | - '%s',//VNU_address |
|
587 | - '%s',//VNU_address2 |
|
588 | - '%s',//VNU_city |
|
589 | - '%d',//STA_ID |
|
590 | - '%s',//CNT_ISO |
|
591 | - '%s',//VNU_zip |
|
592 | - '%s',//VNU_phone |
|
593 | - '%d',//VNU_capacity |
|
594 | - '%s',//VNU_url |
|
595 | - '%s',//VNU_virtual_phone |
|
596 | - '%s',//VNU_virtual_url |
|
597 | - '%s',//VNU_google_map_link |
|
598 | - '%d',//VNU_enable_for_gmap |
|
585 | + '%d', //VNU_ID_fk |
|
586 | + '%s', //VNU_address |
|
587 | + '%s', //VNU_address2 |
|
588 | + '%s', //VNU_city |
|
589 | + '%d', //STA_ID |
|
590 | + '%s', //CNT_ISO |
|
591 | + '%s', //VNU_zip |
|
592 | + '%s', //VNU_phone |
|
593 | + '%d', //VNU_capacity |
|
594 | + '%s', //VNU_url |
|
595 | + '%s', //VNU_virtual_phone |
|
596 | + '%s', //VNU_virtual_url |
|
597 | + '%s', //VNU_google_map_link |
|
598 | + '%d', //VNU_enable_for_gmap |
|
599 | 599 | ); |
600 | - $success = $wpdb->insert($wpdb->prefix."esp_venue_meta",$insertion_array,$datatypes); |
|
601 | - if( ! $success ){ |
|
600 | + $success = $wpdb->insert($wpdb->prefix."esp_venue_meta", $insertion_array, $datatypes); |
|
601 | + if ( ! $success) { |
|
602 | 602 | $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $insertion_array, $datatypes)); |
603 | 603 | return 0; |
604 | 604 | } |
605 | 605 | return $wpdb->insert_id; |
606 | 606 | } |
607 | 607 | |
608 | - private function _insert_new_venue_to_event($new_event_id,$new_venue_id){ |
|
608 | + private function _insert_new_venue_to_event($new_event_id, $new_venue_id) { |
|
609 | 609 | global $wpdb; |
610 | - if( ! $new_event_id){ |
|
611 | - $this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$new_event_id)); |
|
610 | + if ( ! $new_event_id) { |
|
611 | + $this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id)); |
|
612 | 612 | return 0; |
613 | 613 | } |
614 | - if( ! $new_venue_id){ |
|
615 | - $this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),$new_venue_id)); |
|
614 | + if ( ! $new_venue_id) { |
|
615 | + $this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id)); |
|
616 | 616 | return 0; |
617 | 617 | } |
618 | 618 | $cols_n_values = array( |
@@ -621,12 +621,12 @@ discard block |
||
621 | 621 | 'EVV_primary'=>true |
622 | 622 | ); |
623 | 623 | $datatypes = array( |
624 | - '%d',//EVT_ID |
|
625 | - '%d',//VNU_ID |
|
626 | - '%d',//EVT_primary |
|
624 | + '%d', //EVT_ID |
|
625 | + '%d', //VNU_ID |
|
626 | + '%d', //EVT_primary |
|
627 | 627 | ); |
628 | - $success = $wpdb->insert($wpdb->prefix."esp_event_venue",$cols_n_values,$datatypes); |
|
629 | - if ( ! $success){ |
|
628 | + $success = $wpdb->insert($wpdb->prefix."esp_event_venue", $cols_n_values, $datatypes); |
|
629 | + if ( ! $success) { |
|
630 | 630 | $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_venue_rel, $this->_new_table, $cols_n_values, $datatypes)); |
631 | 631 | return 0; |
632 | 632 | } |
@@ -640,11 +640,11 @@ discard block |
||
640 | 640 | * @param int $new_cpt_id new post ID |
641 | 641 | * @return void (if there are errors though, adds them to the stage's error list |
642 | 642 | */ |
643 | - private function _convert_start_end_times($old_event,$new_cpt_id){ |
|
643 | + private function _convert_start_end_times($old_event, $new_cpt_id) { |
|
644 | 644 | $start_end_times = $this->_get_old_start_end_times($old_event['id']); |
645 | - foreach($start_end_times as $start_end_time){ |
|
646 | - $datetime_id = $this->_insert_new_datetime($start_end_time,$old_event,$new_cpt_id); |
|
647 | - if($datetime_id){ |
|
645 | + foreach ($start_end_times as $start_end_time) { |
|
646 | + $datetime_id = $this->_insert_new_datetime($start_end_time, $old_event, $new_cpt_id); |
|
647 | + if ($datetime_id) { |
|
648 | 648 | $this->get_migration_script()->set_mapping($this->_old_start_end_table, $start_end_time['id'], $this->_new_datetime_table, $datetime_id); |
649 | 649 | } |
650 | 650 | } |
@@ -655,9 +655,9 @@ discard block |
||
655 | 655 | * @param type $old_event_id |
656 | 656 | * @return type |
657 | 657 | */ |
658 | - private function _get_old_start_end_times($old_event_id){ |
|
658 | + private function _get_old_start_end_times($old_event_id) { |
|
659 | 659 | global $wpdb; |
660 | - return $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d",$old_event_id),ARRAY_A); |
|
660 | + return $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d", $old_event_id), ARRAY_A); |
|
661 | 661 | } |
662 | 662 | /** |
663 | 663 | * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row |
@@ -666,40 +666,40 @@ discard block |
||
666 | 666 | * @param type $new_cpt_id |
667 | 667 | * @return int ID of new datetime |
668 | 668 | */ |
669 | - private function _insert_new_datetime($start_end_time_row,$old_event_row,$new_cpt_id){ |
|
669 | + private function _insert_new_datetime($start_end_time_row, $old_event_row, $new_cpt_id) { |
|
670 | 670 | global $wpdb; |
671 | 671 | $start_date = $old_event_row['start_date']; |
672 | 672 | $start_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['start_time']); |
673 | 673 | $end_date = $old_event_row['end_date']; |
674 | 674 | $end_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['end_time']); |
675 | 675 | $existing_datetimes = $this->_count_other_datetimes_exist_for_new_event($new_cpt_id); |
676 | - $start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$start_end_time_row,"$start_date $start_time:00",$old_event_row['timezone_string']); |
|
677 | - $end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$start_end_time_row,"$end_date $end_time:00",$old_event_row['timezone_string']); |
|
676 | + $start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$start_date $start_time:00", $old_event_row['timezone_string']); |
|
677 | + $end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$end_date $end_time:00", $old_event_row['timezone_string']); |
|
678 | 678 | $cols_n_values = array( |
679 | - 'EVT_ID'=>$new_cpt_id,//EVT_ID |
|
680 | - 'DTT_EVT_start'=>$start_datetime_utc,//DTT_EVT_start |
|
681 | - 'DTT_EVT_end'=> $end_datetime_utc,//DTT_EVT_end |
|
682 | - 'DTT_reg_limit'=>intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'],//DTT_reg_limit |
|
683 | - 'DTT_sold'=>0,//note: we will increment this as registrations are added during the migration |
|
679 | + 'EVT_ID'=>$new_cpt_id, //EVT_ID |
|
680 | + 'DTT_EVT_start'=>$start_datetime_utc, //DTT_EVT_start |
|
681 | + 'DTT_EVT_end'=> $end_datetime_utc, //DTT_EVT_end |
|
682 | + 'DTT_reg_limit'=>intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'], //DTT_reg_limit |
|
683 | + 'DTT_sold'=>0, //note: we will increment this as registrations are added during the migration |
|
684 | 684 | // 'DTT_is_primary'=> 0 == $existing_datetimes ,//DTT_is_primary... if count==0, then we'll call it the 'primary' |
685 | - 'DTT_order'=> $existing_datetimes,//DTT_order, just give it the same order as the count of how many datetimes already exist |
|
685 | + 'DTT_order'=> $existing_datetimes, //DTT_order, just give it the same order as the count of how many datetimes already exist |
|
686 | 686 | 'DTT_parent'=>0, |
687 | 687 | 'DTT_deleted'=>false |
688 | 688 | ); |
689 | 689 | $datatypes = array( |
690 | - '%d',//EVT_Id |
|
691 | - '%s',//DTT_EVT_start |
|
692 | - '%s',//DTT_EVT_end |
|
693 | - '%d',//DTT_reg_limit |
|
694 | - '%d',//DTT_sold |
|
690 | + '%d', //EVT_Id |
|
691 | + '%s', //DTT_EVT_start |
|
692 | + '%s', //DTT_EVT_end |
|
693 | + '%d', //DTT_reg_limit |
|
694 | + '%d', //DTT_sold |
|
695 | 695 | // '%d',//DTT_is_primary |
696 | - '%d',//DTT_order |
|
697 | - '%d',//DTT_parent |
|
698 | - '%d',//DTT_deleted |
|
696 | + '%d', //DTT_order |
|
697 | + '%d', //DTT_parent |
|
698 | + '%d', //DTT_deleted |
|
699 | 699 | ); |
700 | - $success = $wpdb->insert($this->_new_datetime_table,$cols_n_values,$datatypes); |
|
701 | - if ( ! $success){ |
|
702 | - $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row,$start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes)); |
|
700 | + $success = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $datatypes); |
|
701 | + if ( ! $success) { |
|
702 | + $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row, $start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes)); |
|
703 | 703 | return 0; |
704 | 704 | } |
705 | 705 | return $wpdb->insert_id; |
@@ -712,9 +712,9 @@ discard block |
||
712 | 712 | * @param type $cpt_event_id |
713 | 713 | * @return int |
714 | 714 | */ |
715 | - private function _count_other_datetimes_exist_for_new_event($cpt_event_id){ |
|
715 | + private function _count_other_datetimes_exist_for_new_event($cpt_event_id) { |
|
716 | 716 | global $wpdb; |
717 | - $count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d",$cpt_event_id)); |
|
717 | + $count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d", $cpt_event_id)); |
|
718 | 718 | return intval($count); |
719 | 719 | } |
720 | 720 |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * migrates old 3.1 events, and start_end entries to 4.1 event CPTs, tickets (although doesn't assign them any prices, only datetimes; also |
|
4 | - * this is run BEFORE migrating prices), and datetimes. |
|
5 | - * 3.1 events table: |
|
6 | - * delimiter $$ |
|
3 | + * migrates old 3.1 events, and start_end entries to 4.1 event CPTs, tickets (although doesn't assign them any prices, only datetimes; also |
|
4 | + * this is run BEFORE migrating prices), and datetimes. |
|
5 | + * 3.1 events table: |
|
6 | + * delimiter $$ |
|
7 | 7 | |
8 | 8 | CREATE TABLE `wp_events_detail` ( |
9 | 9 | `id` int(11) unsigned NOT NULL AUTO_INCREMENT, |
@@ -84,11 +84,9 @@ discard block |
||
84 | 84 | KEY `submitted` (`submitted`), |
85 | 85 | KEY `likes` (`likes`) |
86 | 86 | ) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8$$ |
87 | - |
|
88 | - |
|
89 | - * |
|
90 | - * 4.1 Event model: |
|
91 | - * $this->_tables = array( |
|
87 | + * |
|
88 | + * 4.1 Event model: |
|
89 | + * $this->_tables = array( |
|
92 | 90 | 'Event_CPT'=>new EE_Primary_Table('posts','ID'), |
93 | 91 | 'Event_Meta'=> new EE_Secondary_Table('esp_event_meta', 'EVTM_ID','EVT_ID') |
94 | 92 | ); |
@@ -124,10 +122,9 @@ discard block |
||
124 | 122 | 'EVT_donations'=>new EE_Boolean_Field('EVT_donations', __("Accept Donations?", "event_espresso"), false, false) |
125 | 123 | |
126 | 124 | )); |
127 | - |
|
128 | - * |
|
129 | - * 3.1's start end table |
|
130 | - * |
|
125 | + * |
|
126 | + * 3.1's start end table |
|
127 | + * |
|
131 | 128 | CREATE TABLE `wp_events_start_end` ( |
132 | 129 | `id` int(11) NOT NULL AUTO_INCREMENT, |
133 | 130 | `event_id` int(11) DEFAULT NULL, |
@@ -137,11 +134,9 @@ discard block |
||
137 | 134 | PRIMARY KEY (`id`), |
138 | 135 | KEY `event_id` (`event_id`) |
139 | 136 | ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8$$ |
140 | - |
|
141 | - |
|
142 | - * |
|
143 | - * and 4.1 Datetime model's tables and fields: |
|
144 | - * $this->_tables = array( |
|
137 | + * |
|
138 | + * and 4.1 Datetime model's tables and fields: |
|
139 | + * $this->_tables = array( |
|
145 | 140 | 'Datetime'=> new EE_Primary_Table('esp_datetime', 'DTT_ID') |
146 | 141 | ); |
147 | 142 | $this->_fields = array( |
@@ -157,7 +152,7 @@ discard block |
||
157 | 152 | 'DTT_parent' => new EE_Integer_Field('DTT_parent', __('Indicates what DTT_ID is the parent of this DTT_ID'), true, 0 ), |
158 | 153 | 'DTT_deleted' => new EE_Trashed_Flag_Field('DTT_deleted', __('Flag indicating datetime is archived', 'event_espresso'), false, false ), |
159 | 154 | )); |
160 | - */ |
|
155 | + */ |
|
161 | 156 | class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage{ |
162 | 157 | private $_old_table; |
163 | 158 | private $_old_start_end_table; |
@@ -61,44 +61,44 @@ discard block |
||
61 | 61 | // )); |
62 | 62 | * |
63 | 63 | */ |
64 | -class EE_DMS_4_1_0_venues extends EE_Data_Migration_Script_Stage{ |
|
64 | +class EE_DMS_4_1_0_venues extends EE_Data_Migration_Script_Stage { |
|
65 | 65 | private $_old_table; |
66 | 66 | private $_new_table; |
67 | 67 | private $_new_meta_table; |
68 | -function _migration_step($num_items=50){ |
|
68 | +function _migration_step($num_items = 50) { |
|
69 | 69 | global $wpdb; |
70 | 70 | $start_at_record = $this->count_records_migrated(); |
71 | - $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_old_table." LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A); |
|
71 | + $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_old_table." LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A); |
|
72 | 72 | $items_actually_migrated = 0; |
73 | - foreach($rows as $old_venue){ |
|
74 | - if ( ! $new_id = $this->_insert_into_posts($old_venue)){ |
|
73 | + foreach ($rows as $old_venue) { |
|
74 | + if ( ! $new_id = $this->_insert_into_posts($old_venue)) { |
|
75 | 75 | $items_actually_migrated++; |
76 | 76 | continue; |
77 | 77 | } |
78 | 78 | $this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_table, $new_id); |
79 | - if( ! $new_meta_id = $this->_insert_into_meta_table($new_id,$old_venue)){ |
|
79 | + if ( ! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) { |
|
80 | 80 | $items_actually_migrated++; |
81 | 81 | continue; |
82 | 82 | } |
83 | 83 | $this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_meta_table, $new_meta_id); |
84 | 84 | //lastly, save the 'contact' as post meta, because it doesn't exist anywhere else but someone may still want it |
85 | 85 | $venue_meta = maybe_unserialize($old_venue['meta']); |
86 | - if(isset($venue_meta['contact']) && $venue_meta['contact']){ |
|
87 | - add_post_meta($new_id,'contact',$venue_meta['contact']); |
|
86 | + if (isset($venue_meta['contact']) && $venue_meta['contact']) { |
|
87 | + add_post_meta($new_id, 'contact', $venue_meta['contact']); |
|
88 | 88 | } |
89 | 89 | //is there an image on this venue? |
90 | 90 | $guid = isset($venue_meta['image']) && $venue_meta['image'] ? $venue_meta['image'] : NULL; |
91 | - if($guid){ |
|
92 | - $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid,$new_id,$this); |
|
91 | + if ($guid) { |
|
92 | + $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this); |
|
93 | 93 | } |
94 | 94 | $items_actually_migrated++; |
95 | - if($guid){ |
|
95 | + if ($guid) { |
|
96 | 96 | //if there was an image, we may have had to download it etc and it may have taken |
97 | 97 | //longer, then let's not bother migrating anymore on this step |
98 | 98 | break; |
99 | 99 | } |
100 | 100 | } |
101 | - if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){ |
|
101 | + if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) { |
|
102 | 102 | $this->set_completed(); |
103 | 103 | } |
104 | 104 | return $items_actually_migrated; |
@@ -122,42 +122,42 @@ discard block |
||
122 | 122 | * @param array $old_venue keys are cols, values are col values |
123 | 123 | * @return int |
124 | 124 | */ |
125 | - private function _insert_into_posts($old_venue){ |
|
125 | + private function _insert_into_posts($old_venue) { |
|
126 | 126 | global $wpdb; |
127 | 127 | $meta = maybe_unserialize($old_venue['meta']); |
128 | - $slug = $this->_find_unique_slug( $old_venue[ 'name' ], $old_venue[ 'identifier' ] ); |
|
128 | + $slug = $this->_find_unique_slug($old_venue['name'], $old_venue['identifier']); |
|
129 | 129 | $insertion_array = array( |
130 | - 'post_title'=>stripslashes($old_venue['name']),//VNU_name |
|
131 | - 'post_content'=>isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '',//VNU_desc |
|
132 | - 'post_name'=> $slug,//VNU_identifier |
|
133 | - 'post_date'=>current_time('mysql'),//VNU_created |
|
134 | - 'post_date_gmt'=> current_time('mysql',true), |
|
135 | - 'post_excerpt'=>'',//wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitraty only 50 characters |
|
136 | - 'post_modified'=>current_time('mysql'),//VNU_modified |
|
137 | - 'post_modified_gmt'=>current_time('mysql',true), |
|
138 | - 'post_author'=>$old_venue['wp_user'],//VNU_wp_user |
|
139 | - 'post_parent'=>0,//parent |
|
140 | - 'menu_order'=>0,//VNU_order |
|
130 | + 'post_title'=>stripslashes($old_venue['name']), //VNU_name |
|
131 | + 'post_content'=>isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '', //VNU_desc |
|
132 | + 'post_name'=> $slug, //VNU_identifier |
|
133 | + 'post_date'=>current_time('mysql'), //VNU_created |
|
134 | + 'post_date_gmt'=> current_time('mysql', true), |
|
135 | + 'post_excerpt'=>'', //wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitraty only 50 characters |
|
136 | + 'post_modified'=>current_time('mysql'), //VNU_modified |
|
137 | + 'post_modified_gmt'=>current_time('mysql', true), |
|
138 | + 'post_author'=>$old_venue['wp_user'], //VNU_wp_user |
|
139 | + 'post_parent'=>0, //parent |
|
140 | + 'menu_order'=>0, //VNU_order |
|
141 | 141 | 'post_type'=>'espresso_venues'//post_type |
142 | 142 | ); |
143 | 143 | $datatypes_array = array( |
144 | - '%s',//VNU_name |
|
145 | - '%s',//VNU_desc |
|
146 | - '%s',//VNU_identifier |
|
147 | - '%s',//VNU_created |
|
144 | + '%s', //VNU_name |
|
145 | + '%s', //VNU_desc |
|
146 | + '%s', //VNU_identifier |
|
147 | + '%s', //VNU_created |
|
148 | 148 | '%s', |
149 | - '%s',//VNU_short_desc |
|
150 | - '%s',//VNU_modified |
|
149 | + '%s', //VNU_short_desc |
|
150 | + '%s', //VNU_modified |
|
151 | 151 | '%s', |
152 | - '%d',//VNU_wp_user |
|
153 | - '%d',//parent |
|
154 | - '%d',//VNU_order |
|
155 | - '%s',//post_type |
|
152 | + '%d', //VNU_wp_user |
|
153 | + '%d', //parent |
|
154 | + '%d', //VNU_order |
|
155 | + '%s', //post_type |
|
156 | 156 | ); |
157 | 157 | $success = $wpdb->insert($this->_new_table, |
158 | 158 | $insertion_array, |
159 | 159 | $datatypes_array); |
160 | - if( ! $success ){ |
|
160 | + if ( ! $success) { |
|
161 | 161 | $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_table, $insertion_array, $datatypes_array)); |
162 | 162 | return 0; |
163 | 163 | } |
@@ -171,11 +171,11 @@ discard block |
||
171 | 171 | * @param string $post_name |
172 | 172 | * @return string |
173 | 173 | */ |
174 | - private function _find_unique_slug($post_name, $old_identifier = '' ){ |
|
174 | + private function _find_unique_slug($post_name, $old_identifier = '') { |
|
175 | 175 | $count = 0; |
176 | - $original_name = $post_name ? sanitize_title( $post_name ) : $old_identifier; |
|
176 | + $original_name = $post_name ? sanitize_title($post_name) : $old_identifier; |
|
177 | 177 | $event_slug = $original_name; |
178 | - while( $this->_other_post_exists_with_that_slug($event_slug) && $count<50){ |
|
178 | + while ($this->_other_post_exists_with_that_slug($event_slug) && $count < 50) { |
|
179 | 179 | $event_slug = sanitize_title($original_name."-".++$count); |
180 | 180 | } |
181 | 181 | return $event_slug; |
@@ -187,11 +187,11 @@ discard block |
||
187 | 187 | * @param type $slug |
188 | 188 | * @return boolean |
189 | 189 | */ |
190 | - private function _other_post_exists_with_that_slug($slug){ |
|
190 | + private function _other_post_exists_with_that_slug($slug) { |
|
191 | 191 | global $wpdb; |
192 | - $query = $wpdb->prepare("SELECT COUNT(ID) FROM ".$this->_new_table." WHERE post_name = %s",$slug); |
|
192 | + $query = $wpdb->prepare("SELECT COUNT(ID) FROM ".$this->_new_table." WHERE post_name = %s", $slug); |
|
193 | 193 | $count = $wpdb->get_var($query); |
194 | - return (boolean)intval($count); |
|
194 | + return (boolean) intval($count); |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | /** |
@@ -200,60 +200,60 @@ discard block |
||
200 | 200 | * @param type $old_venue |
201 | 201 | * @return int |
202 | 202 | */ |
203 | - private function _insert_into_meta_table($cpt_id,$old_venue){ |
|
203 | + private function _insert_into_meta_table($cpt_id, $old_venue) { |
|
204 | 204 | global $wpdb; |
205 | 205 | //get a country with the same name, or insert one |
206 | - try{ |
|
206 | + try { |
|
207 | 207 | $country = $this->get_migration_script()->get_or_create_country(stripslashes($old_venue['country'])); |
208 | 208 | $country_iso = $country['CNT_ISO']; |
209 | - }catch(EE_Error $e){ |
|
210 | - $this->add_error(sprintf(__("%s for venue %s", "event_espresso"),$e->getMessage(),$this->_json_encode($old_venue))); |
|
209 | + } catch (EE_Error $e) { |
|
210 | + $this->add_error(sprintf(__("%s for venue %s", "event_espresso"), $e->getMessage(), $this->_json_encode($old_venue))); |
|
211 | 211 | $country_iso = null; |
212 | 212 | } |
213 | 213 | //get a state with the same name, if possible |
214 | - try{ |
|
215 | - $state = $this->get_migration_script()->get_or_create_state(stripslashes($old_venue['state']),isset($country['CNT_name']) ? $country['CNT_name'] : strip_tags($old_venue['country'])); |
|
214 | + try { |
|
215 | + $state = $this->get_migration_script()->get_or_create_state(stripslashes($old_venue['state']), isset($country['CNT_name']) ? $country['CNT_name'] : strip_tags($old_venue['country'])); |
|
216 | 216 | $state_id = $state['STA_ID']; |
217 | - }catch(EE_Error $e){ |
|
218 | - $this->add_error(sprintf(__("%s for venue %s", "event_espresso"),$e->getMessage(),$this->_json_encode($old_venue))); |
|
217 | + } catch (EE_Error $e) { |
|
218 | + $this->add_error(sprintf(__("%s for venue %s", "event_espresso"), $e->getMessage(), $this->_json_encode($old_venue))); |
|
219 | 219 | $state_id = 0; |
220 | 220 | } |
221 | 221 | $meta = maybe_unserialize($old_venue['meta']); |
222 | 222 | //now insert into meta table |
223 | 223 | $insertion_array = array( |
224 | - 'VNU_ID'=>$cpt_id,//VNU_ID_fk |
|
225 | - 'VNU_address'=>stripslashes($old_venue['address']),//VNU_address |
|
226 | - 'VNU_address2'=>stripslashes($old_venue['address2']),//VNU_address2 |
|
227 | - 'VNU_city'=>stripslashes($old_venue['city']),//VNU_city |
|
228 | - 'STA_ID'=>$state_id,//STA_ID |
|
229 | - 'CNT_ISO'=>$country_iso,//CNT_ISO |
|
230 | - 'VNU_zip'=>stripslashes($old_venue['zip']),//VNU_zip |
|
231 | - 'VNU_phone'=>isset($meta['phone']) ? stripslashes($meta['phone']) : '',//VNU_phone |
|
232 | - 'VNU_capacity'=>-1,//VNU_capacity |
|
233 | - 'VNU_url'=>isset($meta['website']) ? stripslashes($meta['website']) : '',//VNU_url |
|
234 | - 'VNU_virtual_phone'=>'',//VNU_virtual_phone |
|
235 | - 'VNU_virtual_url'=>'',//VNU_virtual_url |
|
236 | - 'VNU_google_map_link'=>'',//VNU_google_map_link |
|
224 | + 'VNU_ID'=>$cpt_id, //VNU_ID_fk |
|
225 | + 'VNU_address'=>stripslashes($old_venue['address']), //VNU_address |
|
226 | + 'VNU_address2'=>stripslashes($old_venue['address2']), //VNU_address2 |
|
227 | + 'VNU_city'=>stripslashes($old_venue['city']), //VNU_city |
|
228 | + 'STA_ID'=>$state_id, //STA_ID |
|
229 | + 'CNT_ISO'=>$country_iso, //CNT_ISO |
|
230 | + 'VNU_zip'=>stripslashes($old_venue['zip']), //VNU_zip |
|
231 | + 'VNU_phone'=>isset($meta['phone']) ? stripslashes($meta['phone']) : '', //VNU_phone |
|
232 | + 'VNU_capacity'=>-1, //VNU_capacity |
|
233 | + 'VNU_url'=>isset($meta['website']) ? stripslashes($meta['website']) : '', //VNU_url |
|
234 | + 'VNU_virtual_phone'=>'', //VNU_virtual_phone |
|
235 | + 'VNU_virtual_url'=>'', //VNU_virtual_url |
|
236 | + 'VNU_google_map_link'=>'', //VNU_google_map_link |
|
237 | 237 | 'VNU_enable_for_gmap'=>true //VNU_enable_for_gmap |
238 | 238 | ); |
239 | 239 | $datatypes = array( |
240 | - '%d',//VNU_ID_fk |
|
241 | - '%s',//VNU_address |
|
242 | - '%s',//VNU_address2 |
|
243 | - '%s',//VNU_city |
|
244 | - '%d',//STA_ID |
|
245 | - '%s',//CNT_ISO |
|
246 | - '%s',//VNU_zip |
|
247 | - '%s',//VNU_phone |
|
248 | - '%d',//VNU_capacity |
|
249 | - '%s',//VNU_url |
|
250 | - '%s',//VNU_virtual_phone |
|
251 | - '%s',//VNU_virtual_url |
|
252 | - '%s',//VNU_google_map_link |
|
253 | - '%d',//VNU_enable_for_gmap |
|
240 | + '%d', //VNU_ID_fk |
|
241 | + '%s', //VNU_address |
|
242 | + '%s', //VNU_address2 |
|
243 | + '%s', //VNU_city |
|
244 | + '%d', //STA_ID |
|
245 | + '%s', //CNT_ISO |
|
246 | + '%s', //VNU_zip |
|
247 | + '%s', //VNU_phone |
|
248 | + '%d', //VNU_capacity |
|
249 | + '%s', //VNU_url |
|
250 | + '%s', //VNU_virtual_phone |
|
251 | + '%s', //VNU_virtual_url |
|
252 | + '%s', //VNU_google_map_link |
|
253 | + '%d', //VNU_enable_for_gmap |
|
254 | 254 | ); |
255 | - $success = $wpdb->insert($this->_new_meta_table,$insertion_array,$datatypes); |
|
256 | - if( ! $success ){ |
|
255 | + $success = $wpdb->insert($this->_new_meta_table, $insertion_array, $datatypes); |
|
256 | + if ( ! $success) { |
|
257 | 257 | $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_meta_table, $insertion_array, $datatypes)); |
258 | 258 | return 0; |
259 | 259 | } |
@@ -10,13 +10,13 @@ discard block |
||
10 | 10 | //(all other times it gets resurrected from a wordpress option) |
11 | 11 | $stages = glob(EE_CORE.'data_migration_scripts/4_6_0_stages/*'); |
12 | 12 | $class_to_filepath = array(); |
13 | -foreach($stages as $filepath){ |
|
13 | +foreach ($stages as $filepath) { |
|
14 | 14 | $matches = array(); |
15 | - preg_match('~4_6_0_stages/(.*).dmsstage.php~',$filepath,$matches); |
|
15 | + preg_match('~4_6_0_stages/(.*).dmsstage.php~', $filepath, $matches); |
|
16 | 16 | $class_to_filepath[$matches[1]] = $filepath; |
17 | 17 | } |
18 | 18 | //give addons a chance to autoload their stages too |
19 | -$class_to_filepath = apply_filters('FHEE__EE_DMS_4_6_0__autoloaded_stages',$class_to_filepath); |
|
19 | +$class_to_filepath = apply_filters('FHEE__EE_DMS_4_6_0__autoloaded_stages', $class_to_filepath); |
|
20 | 20 | EEH_Autoloader::register_autoloader($class_to_filepath); |
21 | 21 | |
22 | 22 | |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * @since 4.6.0 |
33 | 33 | * |
34 | 34 | */ |
35 | -class EE_DMS_Core_4_6_0 extends EE_Data_Migration_Script_Base{ |
|
35 | +class EE_DMS_Core_4_6_0 extends EE_Data_Migration_Script_Base { |
|
36 | 36 | |
37 | 37 | /** |
38 | 38 | * return EE_DMS_Core_4_6_0 |
@@ -62,14 +62,14 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function can_migrate_from_version($version_array) { |
64 | 64 | $version_string = $version_array['Core']; |
65 | - if($version_string <= '4.6.0' && $version_string >= '4.5.0' ){ |
|
65 | + if ($version_string <= '4.6.0' && $version_string >= '4.5.0') { |
|
66 | 66 | // echo "$version_string can be migrated from"; |
67 | 67 | return true; |
68 | - }elseif( ! $version_string ){ |
|
68 | + }elseif ( ! $version_string) { |
|
69 | 69 | // echo "no version string provided: $version_string"; |
70 | 70 | //no version string provided... this must be pre 4.3 |
71 | - return false;//changed mind. dont want people thinking they should migrate yet because they cant |
|
72 | - }else{ |
|
71 | + return false; //changed mind. dont want people thinking they should migrate yet because they cant |
|
72 | + } else { |
|
73 | 73 | // echo "$version_string doesnt apply"; |
74 | 74 | return false; |
75 | 75 | } |
@@ -91,14 +91,14 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function schema_changes_before_migration() { |
93 | 93 | //relies on 4.1's EEH_Activation::create_table |
94 | - require_once( EE_HELPERS . 'EEH_Activation.helper.php' ); |
|
95 | - $table_name='esp_answer'; |
|
96 | - $sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
94 | + require_once(EE_HELPERS.'EEH_Activation.helper.php'); |
|
95 | + $table_name = 'esp_answer'; |
|
96 | + $sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
97 | 97 | REG_ID INT UNSIGNED NOT NULL, |
98 | 98 | QST_ID INT UNSIGNED NOT NULL, |
99 | 99 | ANS_value TEXT NOT NULL, |
100 | 100 | PRIMARY KEY (ANS_ID)"; |
101 | - $this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB'); |
|
101 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
102 | 102 | |
103 | 103 | $table_name = 'esp_attendee_meta'; |
104 | 104 | $sql = "ATTM_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | CNT_is_EU TINYINT(1) DEFAULT '0', |
138 | 138 | CNT_active TINYINT(1) DEFAULT '0', |
139 | 139 | PRIMARY KEY (CNT_ISO)"; |
140 | - $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' ); |
|
140 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
141 | 141 | |
142 | 142 | $table_name = 'esp_currency'; |
143 | 143 | $sql = "CUR_code VARCHAR(6) COLLATE utf8_bin NOT NULL, |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | CUR_dec_plc VARCHAR(1) COLLATE utf8_bin NOT NULL DEFAULT '2', |
148 | 148 | CUR_active TINYINT(1) DEFAULT '0', |
149 | 149 | PRIMARY KEY (CUR_code)"; |
150 | - $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' ); |
|
150 | + $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB'); |
|
151 | 151 | |
152 | 152 | |
153 | 153 | $table_name = 'esp_currency_payment_method'; |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | |
179 | 179 | |
180 | - $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' ); |
|
180 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
181 | 181 | $table_name = 'esp_event_meta'; |
182 | 182 | $sql = " |
183 | 183 | EVTM_ID INT NOT NULL AUTO_INCREMENT, |
@@ -194,41 +194,41 @@ discard block |
||
194 | 194 | EVT_external_URL VARCHAR(200) NULL, |
195 | 195 | EVT_donations TINYINT(1) NULL, |
196 | 196 | PRIMARY KEY (EVTM_ID)"; |
197 | - $this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB'); |
|
197 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
198 | 198 | |
199 | 199 | |
200 | 200 | |
201 | - $table_name='esp_event_question_group'; |
|
202 | - $sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
201 | + $table_name = 'esp_event_question_group'; |
|
202 | + $sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
203 | 203 | EVT_ID BIGINT(20) UNSIGNED NOT NULL, |
204 | 204 | QSG_ID INT UNSIGNED NOT NULL, |
205 | 205 | EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, |
206 | 206 | PRIMARY KEY (EQG_ID)"; |
207 | - $this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB'); |
|
207 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
208 | 208 | |
209 | 209 | |
210 | 210 | |
211 | - $table_name='esp_event_venue'; |
|
212 | - $sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT, |
|
211 | + $table_name = 'esp_event_venue'; |
|
212 | + $sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT, |
|
213 | 213 | EVT_ID BIGINT(20) UNSIGNED NOT NULL, |
214 | 214 | VNU_ID BIGINT(20) UNSIGNED NOT NULL, |
215 | 215 | EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, |
216 | 216 | PRIMARY KEY (EVV_ID)"; |
217 | - $this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB'); |
|
217 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
218 | 218 | |
219 | 219 | |
220 | 220 | |
221 | - $table_name='esp_extra_meta'; |
|
222 | - $sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT, |
|
221 | + $table_name = 'esp_extra_meta'; |
|
222 | + $sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT, |
|
223 | 223 | OBJ_ID INT(11) DEFAULT NULL, |
224 | 224 | EXM_type VARCHAR(45) DEFAULT NULL, |
225 | 225 | EXM_key VARCHAR(45) DEFAULT NULL, |
226 | 226 | EXM_value TEXT, |
227 | 227 | PRIMARY KEY (EXM_ID)"; |
228 | - $this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB'); |
|
228 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
229 | 229 | |
230 | - $table_name='esp_line_item'; |
|
231 | - $sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT, |
|
230 | + $table_name = 'esp_line_item'; |
|
231 | + $sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT, |
|
232 | 232 | LIN_code VARCHAR(245) NOT NULL DEFAULT '', |
233 | 233 | TXN_ID INT(11) DEFAULT NULL, |
234 | 234 | LIN_name VARCHAR(245) NOT NULL DEFAULT '', |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | OBJ_ID INT(11) DEFAULT NULL, |
245 | 245 | OBJ_type VARCHAR(45)DEFAULT NULL, |
246 | 246 | PRIMARY KEY (LIN_ID)"; |
247 | - $this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB' ); |
|
247 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
248 | 248 | |
249 | 249 | $table_name = 'esp_log'; |
250 | 250 | $sql = "LOG_ID INT(11) NOT NULL AUTO_INCREMENT, |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | KEY GRP_ID (GRP_ID)"; |
268 | 268 | $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
269 | 269 | |
270 | - EEH_Activation::drop_index( 'esp_message_template_group', 'EVT_ID' ); |
|
270 | + EEH_Activation::drop_index('esp_message_template_group', 'EVT_ID'); |
|
271 | 271 | |
272 | 272 | $table_name = 'esp_message_template_group'; |
273 | 273 | $sql = "GRP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | MTP_is_active TINYINT(1) NOT NULL DEFAULT '1', |
283 | 283 | PRIMARY KEY (GRP_ID), |
284 | 284 | KEY MTP_user_id (MTP_user_id)"; |
285 | - $this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB'); |
|
285 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
286 | 286 | |
287 | 287 | $table_name = 'esp_event_message_template'; |
288 | 288 | $sql = "EMT_ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | PRIMARY KEY (EMT_ID), |
292 | 292 | KEY EVT_ID (EVT_ID), |
293 | 293 | KEY GRP_ID (GRP_ID)"; |
294 | - $this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB'); |
|
294 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
295 | 295 | |
296 | 296 | |
297 | 297 | $table_name = 'esp_payment'; |
@@ -359,8 +359,8 @@ discard block |
||
359 | 359 | PRIMARY KEY (TTM_ID)"; |
360 | 360 | $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
361 | 361 | |
362 | - $table_name='esp_question'; |
|
363 | - $sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
362 | + $table_name = 'esp_question'; |
|
363 | + $sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
364 | 364 | QST_display_text TEXT NOT NULL, |
365 | 365 | QST_admin_label VARCHAR(255) NOT NULL, |
366 | 366 | QST_system VARCHAR(25) DEFAULT NULL, |
@@ -372,27 +372,27 @@ discard block |
||
372 | 372 | QST_wp_user BIGINT UNSIGNED NULL, |
373 | 373 | QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0, |
374 | 374 | PRIMARY KEY (QST_ID)'; |
375 | - $this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB'); |
|
375 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
376 | 376 | |
377 | - $table_name='esp_question_group_question'; |
|
378 | - $sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
377 | + $table_name = 'esp_question_group_question'; |
|
378 | + $sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
379 | 379 | QSG_ID INT UNSIGNED NOT NULL, |
380 | 380 | QST_ID INT UNSIGNED NOT NULL, |
381 | 381 | QGQ_order INT UNSIGNED NOT NULL DEFAULT 0, |
382 | 382 | PRIMARY KEY (QGQ_ID) "; |
383 | - $this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB'); |
|
383 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
384 | 384 | |
385 | 385 | |
386 | 386 | |
387 | - $table_name='esp_question_option'; |
|
388 | - $sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
387 | + $table_name = 'esp_question_option'; |
|
388 | + $sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
389 | 389 | QSO_value VARCHAR(255) NOT NULL, |
390 | 390 | QSO_desc TEXT NOT NULL, |
391 | 391 | QST_ID INT UNSIGNED NOT NULL, |
392 | 392 | QSO_order INT UNSIGNED NOT NULL DEFAULT 0, |
393 | 393 | QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0, |
394 | 394 | PRIMARY KEY (QSO_ID)"; |
395 | - $this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB'); |
|
395 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
396 | 396 | |
397 | 397 | |
398 | 398 | |
@@ -425,8 +425,8 @@ discard block |
||
425 | 425 | |
426 | 426 | |
427 | 427 | |
428 | - $table_name='esp_checkin'; |
|
429 | - $sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, |
|
428 | + $table_name = 'esp_checkin'; |
|
429 | + $sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, |
|
430 | 430 | REG_ID INT(10) UNSIGNED NOT NULL, |
431 | 431 | DTT_ID INT(10) UNSIGNED NOT NULL, |
432 | 432 | CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1, |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | PRC_wp_user BIGINT UNSIGNED NULL, |
516 | 516 | PRC_parent INT(10) UNSIGNED DEFAULT 0, |
517 | 517 | PRIMARY KEY (PRC_ID)"; |
518 | - $this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB'); |
|
518 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
519 | 519 | |
520 | 520 | $table_name = "esp_price_type"; |
521 | 521 | $sql = "PRT_ID TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT, |
@@ -552,12 +552,12 @@ discard block |
||
552 | 552 | TKT_parent INT(10) UNSIGNED DEFAULT '0', |
553 | 553 | TKT_deleted TINYINT(1) NOT NULL DEFAULT '0', |
554 | 554 | PRIMARY KEY (TKT_ID)"; |
555 | - $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' ); |
|
555 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
556 | 556 | |
557 | - EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' ); |
|
557 | + EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE'); |
|
558 | 558 | |
559 | 559 | $table_name = 'esp_question_group'; |
560 | - $sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
560 | + $sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT, |
|
561 | 561 | QSG_name VARCHAR(255) NOT NULL, |
562 | 562 | QSG_identifier VARCHAR(100) NOT NULL, |
563 | 563 | QSG_desc TEXT NULL, |
@@ -569,7 +569,7 @@ discard block |
||
569 | 569 | QSG_wp_user BIGINT UNSIGNED NULL, |
570 | 570 | PRIMARY KEY (QSG_ID), |
571 | 571 | UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)'; |
572 | - $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' ); |
|
572 | + $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB'); |
|
573 | 573 | |
574 | 574 | /** @var EE_DMS_Core_4_1_0 $script_4_1_defaults */ |
575 | 575 | $script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0'); |
@@ -597,15 +597,15 @@ discard block |
||
597 | 597 | return true; |
598 | 598 | } |
599 | 599 | |
600 | - public function migration_page_hooks(){ |
|
600 | + public function migration_page_hooks() { |
|
601 | 601 | |
602 | 602 | } |
603 | 603 | |
604 | - public function add_default_admin_only_payments(){ |
|
604 | + public function add_default_admin_only_payments() { |
|
605 | 605 | global $wpdb; |
606 | 606 | $table_name = $wpdb->prefix."esp_payment_method"; |
607 | 607 | $user_id = EEH_Activation::get_default_creator_id(); |
608 | - if ( $wpdb->get_var( "SHOW TABLES LIKE '" . $table_name . "'") == $table_name ) { |
|
608 | + if ($wpdb->get_var("SHOW TABLES LIKE '".$table_name."'") == $table_name) { |
|
609 | 609 | |
610 | 610 | $SQL = "SELECT COUNT( * ) FROM $table_name"; |
611 | 611 | $existing_payment_methods = $wpdb->get_var($SQL); |
@@ -626,11 +626,11 @@ discard block |
||
626 | 626 | //so admins can record payments for them from the admin page |
627 | 627 | |
628 | 628 | |
629 | - foreach($default_admin_only_payment_methods as $nicename => $description){ |
|
629 | + foreach ($default_admin_only_payment_methods as $nicename => $description) { |
|
630 | 630 | $slug = sanitize_key($nicename); |
631 | 631 | //check that such a payment method exists |
632 | - $exists = $wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $table_name WHERE PMD_slug = %s",$slug)); |
|
633 | - if( ! $exists){ |
|
632 | + $exists = $wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $table_name WHERE PMD_slug = %s", $slug)); |
|
633 | + if ( ! $exists) { |
|
634 | 634 | $values = array( |
635 | 635 | 'PMD_type'=>'Admin_Only', |
636 | 636 | 'PMD_name'=>$nicename, |
@@ -644,17 +644,17 @@ discard block |
||
644 | 644 | $table_name, |
645 | 645 | $values, |
646 | 646 | array( |
647 | - '%s',//PMD_type |
|
648 | - '%s',//PMD_name |
|
649 | - '%s',//PMD_admin_name |
|
650 | - '%s',//PMD_admin_desc |
|
651 | - '%s',//PMD_slug |
|
652 | - '%d',//PMD_wp_user |
|
653 | - '%s',//PMD_scope |
|
647 | + '%s', //PMD_type |
|
648 | + '%s', //PMD_name |
|
649 | + '%s', //PMD_admin_name |
|
650 | + '%s', //PMD_admin_desc |
|
651 | + '%s', //PMD_slug |
|
652 | + '%d', //PMD_wp_user |
|
653 | + '%s', //PMD_scope |
|
654 | 654 | ) |
655 | 655 | ); |
656 | - if( ! $success ){ |
|
657 | - $this->add_error(sprintf(__("Could not insert new admin-only payment method with values %s during migration", "event_espresso"),$this->_json_encode($values))); |
|
656 | + if ( ! $success) { |
|
657 | + $this->add_error(sprintf(__("Could not insert new admin-only payment method with values %s during migration", "event_espresso"), $this->_json_encode($values))); |
|
658 | 658 | } |
659 | 659 | } |
660 | 660 | } |
@@ -672,11 +672,11 @@ discard block |
||
672 | 672 | |
673 | 673 | global $wpdb; |
674 | 674 | $currency_table = $wpdb->prefix."esp_currency"; |
675 | - if ( $wpdb->get_var( "SHOW TABLES LIKE '" . $currency_table . "'") == $currency_table ) { |
|
675 | + if ($wpdb->get_var("SHOW TABLES LIKE '".$currency_table."'") == $currency_table) { |
|
676 | 676 | |
677 | 677 | $SQL = "SELECT COUNT('CUR_code') FROM $currency_table"; |
678 | 678 | $countries = $wpdb->get_var($SQL); |
679 | - if ( ! $countries ) { |
|
679 | + if ( ! $countries) { |
|
680 | 680 | $SQL = "INSERT INTO $currency_table |
681 | 681 | ( CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active) VALUES |
682 | 682 | ( 'EUR', 'Euro', 'Euros', '€', 2,1), |
@@ -1,9 +1,9 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * meant to convert DBs between 4.6 and 4.6 |
|
4 | - * mostly just |
|
5 | - * -move payment methods from EE_Config into a separate table just for them |
|
6 | - */ |
|
3 | + * meant to convert DBs between 4.6 and 4.6 |
|
4 | + * mostly just |
|
5 | + * -move payment methods from EE_Config into a separate table just for them |
|
6 | + */ |
|
7 | 7 | //make sure we have all the stages loaded too |
8 | 8 | //unfortunately, this needs to be done upon INCLUSION of this file, |
9 | 9 | //instead of construction, because it only gets constructed on first page load |
@@ -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 )){ |
@@ -1273,7 +1273,7 @@ discard block |
||
1273 | 1273 | */ |
1274 | 1274 | do_action( 'AHEE__EE_Base_Class__delete__before', $this ); |
1275 | 1275 | $result = $this->get_model()->delete_by_ID( $this->ID() ); |
1276 | - $this->refresh_cache_of_related_objects(); |
|
1276 | + $this->refresh_cache_of_related_objects(); |
|
1277 | 1277 | /** |
1278 | 1278 | * Called just after deleting a model object |
1279 | 1279 | * @param EE_Base_Class $model_object that was just 'deleted' |
@@ -1293,35 +1293,35 @@ discard block |
||
1293 | 1293 | $model=$this->get_model(); |
1294 | 1294 | if($model instanceof EEM_Soft_Delete_Base){ |
1295 | 1295 | $result=$model->delete_permanently_by_ID($this->ID()); |
1296 | - $this->refresh_cache_of_related_objects(); |
|
1296 | + $this->refresh_cache_of_related_objects(); |
|
1297 | 1297 | }else{ |
1298 | 1298 | $result = $this->delete(); |
1299 | 1299 | } |
1300 | 1300 | return $result ? true : false; |
1301 | 1301 | } |
1302 | 1302 | |
1303 | - /** |
|
1304 | - * When this model object is deleted, it may still be cached on related model objects. This clears the cache of |
|
1305 | - * related model objects |
|
1306 | - */ |
|
1307 | - public function refresh_cache_of_related_objects() { |
|
1308 | - foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) { |
|
1309 | - if( ! empty( $this->_model_relations[ $relation_name ] ) ) { |
|
1310 | - $related_objects = $this->_model_relations[ $relation_name ]; |
|
1311 | - if( $relation_obj instanceof EE_Belongs_To_Relation ) { |
|
1312 | - //this relation only stores a single model object, not an array |
|
1313 | - //but let's make it consistent |
|
1314 | - $related_objects = array( $related_objects ); |
|
1315 | - } |
|
1316 | - foreach( $related_objects as $related_object ) { |
|
1317 | - //only refresh their cache if they're in memory |
|
1318 | - if( $related_object instanceof EE_Base_Class ) { |
|
1303 | + /** |
|
1304 | + * When this model object is deleted, it may still be cached on related model objects. This clears the cache of |
|
1305 | + * related model objects |
|
1306 | + */ |
|
1307 | + public function refresh_cache_of_related_objects() { |
|
1308 | + foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) { |
|
1309 | + if( ! empty( $this->_model_relations[ $relation_name ] ) ) { |
|
1310 | + $related_objects = $this->_model_relations[ $relation_name ]; |
|
1311 | + if( $relation_obj instanceof EE_Belongs_To_Relation ) { |
|
1312 | + //this relation only stores a single model object, not an array |
|
1313 | + //but let's make it consistent |
|
1314 | + $related_objects = array( $related_objects ); |
|
1315 | + } |
|
1316 | + foreach( $related_objects as $related_object ) { |
|
1317 | + //only refresh their cache if they're in memory |
|
1318 | + if( $related_object instanceof EE_Base_Class ) { |
|
1319 | 1319 | $related_object->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
1320 | - } |
|
1321 | - } |
|
1322 | - } |
|
1323 | - } |
|
1324 | - } |
|
1320 | + } |
|
1321 | + } |
|
1322 | + } |
|
1323 | + } |
|
1324 | + } |
|
1325 | 1325 | |
1326 | 1326 | |
1327 | 1327 | |
@@ -1671,9 +1671,9 @@ discard block |
||
1671 | 1671 | $otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values ); |
1672 | 1672 | //clear cache so future get_many_related and get_first_related() return new results. |
1673 | 1673 | $this->clear_cache( $relationName, $otherObject, TRUE ); |
1674 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1675 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1676 | - } |
|
1674 | + if( $otherObject instanceof EE_Base_Class ) { |
|
1675 | + $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1676 | + } |
|
1677 | 1677 | } else { |
1678 | 1678 | //this thing doesn't exist in the DB, so just cache it |
1679 | 1679 | if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){ |
@@ -1687,18 +1687,18 @@ discard block |
||
1687 | 1687 | } |
1688 | 1688 | $this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id ); |
1689 | 1689 | } |
1690 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1691 | - //fix the reciprocal relation too |
|
1692 | - if( $otherObject->ID() ) { |
|
1693 | - //its saved so assumed relations exist in the DB, so we can just |
|
1694 | - //clear the cache so future queries use the updated info in the DB |
|
1695 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true ); |
|
1696 | - } else { |
|
1697 | - |
|
1698 | - //it's not saved, so it caches relations like this |
|
1699 | - $otherObject->cache( $this->get_model()->get_this_model_name(), $this ); |
|
1700 | - } |
|
1701 | - } |
|
1690 | + if( $otherObject instanceof EE_Base_Class ) { |
|
1691 | + //fix the reciprocal relation too |
|
1692 | + if( $otherObject->ID() ) { |
|
1693 | + //its saved so assumed relations exist in the DB, so we can just |
|
1694 | + //clear the cache so future queries use the updated info in the DB |
|
1695 | + $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true ); |
|
1696 | + } else { |
|
1697 | + |
|
1698 | + //it's not saved, so it caches relations like this |
|
1699 | + $otherObject->cache( $this->get_model()->get_this_model_name(), $this ); |
|
1700 | + } |
|
1701 | + } |
|
1702 | 1702 | return $otherObject; |
1703 | 1703 | } |
1704 | 1704 | |
@@ -1728,9 +1728,9 @@ discard block |
||
1728 | 1728 | //this doesn't exist in the DB, just remove it from the cache |
1729 | 1729 | $otherObject = $this->clear_cache( $relationName, $otherObjectModelObjectOrID ); |
1730 | 1730 | } |
1731 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1732 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1733 | - } |
|
1731 | + if( $otherObject instanceof EE_Base_Class ) { |
|
1732 | + $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1733 | + } |
|
1734 | 1734 | return $otherObject; |
1735 | 1735 | } |
1736 | 1736 | |
@@ -1749,11 +1749,11 @@ discard block |
||
1749 | 1749 | //this doesn't exist in the DB, just remove it from the cache |
1750 | 1750 | $otherObjects = $this->clear_cache( $relationName, null, true ); |
1751 | 1751 | } |
1752 | - if( is_array( $otherObjects ) ) { |
|
1753 | - foreach ( $otherObjects as $otherObject ) { |
|
1754 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1755 | - } |
|
1756 | - } |
|
1752 | + if( is_array( $otherObjects ) ) { |
|
1753 | + foreach ( $otherObjects as $otherObject ) { |
|
1754 | + $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1755 | + } |
|
1756 | + } |
|
1757 | 1757 | return $otherObjects; |
1758 | 1758 | } |
1759 | 1759 |
@@ -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 | |
@@ -1265,21 +1265,21 @@ discard block |
||
1265 | 1265 | * Deletes this model object. That may mean just 'soft deleting' it though. |
1266 | 1266 | * @return boolean | int |
1267 | 1267 | */ |
1268 | - public function delete(){ |
|
1268 | + public function delete() { |
|
1269 | 1269 | /** |
1270 | 1270 | * Called just before deleting a model object |
1271 | 1271 | * |
1272 | 1272 | * @param EE_Base_Class $model_object about to be 'deleted' |
1273 | 1273 | */ |
1274 | - do_action( 'AHEE__EE_Base_Class__delete__before', $this ); |
|
1275 | - $result = $this->get_model()->delete_by_ID( $this->ID() ); |
|
1274 | + do_action('AHEE__EE_Base_Class__delete__before', $this); |
|
1275 | + $result = $this->get_model()->delete_by_ID($this->ID()); |
|
1276 | 1276 | $this->refresh_cache_of_related_objects(); |
1277 | 1277 | /** |
1278 | 1278 | * Called just after deleting a model object |
1279 | 1279 | * @param EE_Base_Class $model_object that was just 'deleted' |
1280 | 1280 | * @param boolean $result |
1281 | 1281 | */ |
1282 | - do_action( 'AHEE__EE_Base_Class__delete__end', $this, $result ); |
|
1282 | + do_action('AHEE__EE_Base_Class__delete__end', $this, $result); |
|
1283 | 1283 | return $result; |
1284 | 1284 | } |
1285 | 1285 | |
@@ -1289,12 +1289,12 @@ discard block |
||
1289 | 1289 | * Deletes this model object permanently from db (but keep in mind related models my block the delete and return an error) |
1290 | 1290 | * @return bool |
1291 | 1291 | */ |
1292 | - public function delete_permanently(){ |
|
1293 | - $model=$this->get_model(); |
|
1294 | - if($model instanceof EEM_Soft_Delete_Base){ |
|
1295 | - $result=$model->delete_permanently_by_ID($this->ID()); |
|
1292 | + public function delete_permanently() { |
|
1293 | + $model = $this->get_model(); |
|
1294 | + if ($model instanceof EEM_Soft_Delete_Base) { |
|
1295 | + $result = $model->delete_permanently_by_ID($this->ID()); |
|
1296 | 1296 | $this->refresh_cache_of_related_objects(); |
1297 | - }else{ |
|
1297 | + } else { |
|
1298 | 1298 | $result = $this->delete(); |
1299 | 1299 | } |
1300 | 1300 | return $result ? true : false; |
@@ -1305,18 +1305,18 @@ discard block |
||
1305 | 1305 | * related model objects |
1306 | 1306 | */ |
1307 | 1307 | public function refresh_cache_of_related_objects() { |
1308 | - foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) { |
|
1309 | - if( ! empty( $this->_model_relations[ $relation_name ] ) ) { |
|
1310 | - $related_objects = $this->_model_relations[ $relation_name ]; |
|
1311 | - if( $relation_obj instanceof EE_Belongs_To_Relation ) { |
|
1308 | + foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) { |
|
1309 | + if ( ! empty($this->_model_relations[$relation_name])) { |
|
1310 | + $related_objects = $this->_model_relations[$relation_name]; |
|
1311 | + if ($relation_obj instanceof EE_Belongs_To_Relation) { |
|
1312 | 1312 | //this relation only stores a single model object, not an array |
1313 | 1313 | //but let's make it consistent |
1314 | - $related_objects = array( $related_objects ); |
|
1314 | + $related_objects = array($related_objects); |
|
1315 | 1315 | } |
1316 | - foreach( $related_objects as $related_object ) { |
|
1316 | + foreach ($related_objects as $related_object) { |
|
1317 | 1317 | //only refresh their cache if they're in memory |
1318 | - if( $related_object instanceof EE_Base_Class ) { |
|
1319 | - $related_object->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1318 | + if ($related_object instanceof EE_Base_Class) { |
|
1319 | + $related_object->clear_cache($this->get_model()->get_this_model_name(), $this); |
|
1320 | 1320 | } |
1321 | 1321 | } |
1322 | 1322 | } |
@@ -1336,17 +1336,17 @@ discard block |
||
1336 | 1336 | * @return int , 1 on a successful update, the ID of the new entry on insert; 0 on failure or if the model object |
1337 | 1337 | * isn't allowed to persist (as determined by EE_Base_Class::allow_persist()) |
1338 | 1338 | */ |
1339 | - public function save($set_cols_n_values=array()) { |
|
1339 | + public function save($set_cols_n_values = array()) { |
|
1340 | 1340 | /** |
1341 | 1341 | * Filters the fields we're about to save on the model object |
1342 | 1342 | * |
1343 | 1343 | * @param array $set_cols_n_values |
1344 | 1344 | * @param EE_Base_Class $model_object |
1345 | 1345 | */ |
1346 | - $set_cols_n_values = apply_filters( 'FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this ); |
|
1346 | + $set_cols_n_values = apply_filters('FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this); |
|
1347 | 1347 | //set attributes as provided in $set_cols_n_values |
1348 | - foreach($set_cols_n_values as $column=>$value){ |
|
1349 | - $this->set($column,$value); |
|
1348 | + foreach ($set_cols_n_values as $column=>$value) { |
|
1349 | + $this->set($column, $value); |
|
1350 | 1350 | } |
1351 | 1351 | /** |
1352 | 1352 | * Saving a model object. |
@@ -1354,8 +1354,8 @@ discard block |
||
1354 | 1354 | * Before we perform a save, this action is fired. |
1355 | 1355 | * @param EE_Base_Class $model_object the model object about to be saved. |
1356 | 1356 | */ |
1357 | - do_action( 'AHEE__EE_Base_Class__save__begin', $this ); |
|
1358 | - if( ! $this->allow_persist() ) { |
|
1357 | + do_action('AHEE__EE_Base_Class__save__begin', $this); |
|
1358 | + if ( ! $this->allow_persist()) { |
|
1359 | 1359 | return 0; |
1360 | 1360 | } |
1361 | 1361 | //now get current attribute values |
@@ -1365,61 +1365,61 @@ discard block |
||
1365 | 1365 | $old_assumption_concerning_value_preparation = $this->get_model()->get_assumption_concerning_values_already_prepared_by_model_object(); |
1366 | 1366 | $this->get_model()->assume_values_already_prepared_by_model_object(true); |
1367 | 1367 | //does this model have an autoincrement PK? |
1368 | - if($this->get_model()->has_primary_key_field()){ |
|
1369 | - if($this->get_model()->get_primary_key_field()->is_auto_increment()){ |
|
1368 | + if ($this->get_model()->has_primary_key_field()) { |
|
1369 | + if ($this->get_model()->get_primary_key_field()->is_auto_increment()) { |
|
1370 | 1370 | //ok check if it's set, if so: update; if not, insert |
1371 | - if ( ! empty( $save_cols_n_values[self::_get_primary_key_name( get_class($this) )] ) ){ |
|
1372 | - $results = $this->get_model()->update_by_ID ( $save_cols_n_values, $this->ID() ); |
|
1371 | + if ( ! empty($save_cols_n_values[self::_get_primary_key_name(get_class($this))])) { |
|
1372 | + $results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID()); |
|
1373 | 1373 | } else { |
1374 | - unset($save_cols_n_values[self::_get_primary_key_name( get_class( $this) )]); |
|
1375 | - $results = $this->get_model()->insert( $save_cols_n_values, true); |
|
1376 | - if($results){ |
|
1374 | + unset($save_cols_n_values[self::_get_primary_key_name(get_class($this))]); |
|
1375 | + $results = $this->get_model()->insert($save_cols_n_values, true); |
|
1376 | + if ($results) { |
|
1377 | 1377 | //if successful, set the primary key |
1378 | 1378 | //but don't use the normal SET method, because it will check if |
1379 | 1379 | //an item with the same ID exists in the mapper & db, then |
1380 | 1380 | //will find it in the db (because we just added it) and THAT object |
1381 | 1381 | //will get added to the mapper before we can add this one! |
1382 | 1382 | //but if we just avoid using the SET method, all that headache can be avoided |
1383 | - $pk_field_name =self::_get_primary_key_name( get_class($this)); |
|
1383 | + $pk_field_name = self::_get_primary_key_name(get_class($this)); |
|
1384 | 1384 | $this->_fields[$pk_field_name] = $results; |
1385 | 1385 | $this->_clear_cached_property($pk_field_name); |
1386 | - $this->get_model()->add_to_entity_map( $this ); |
|
1386 | + $this->get_model()->add_to_entity_map($this); |
|
1387 | 1387 | $this->_update_cached_related_model_objs_fks(); |
1388 | 1388 | } |
1389 | 1389 | } |
1390 | - }else{//PK is NOT auto-increment |
|
1390 | + } else {//PK is NOT auto-increment |
|
1391 | 1391 | //so check if one like it already exists in the db |
1392 | - if( $this->get_model()->exists_by_ID( $this->ID() ) ){ |
|
1393 | - if( ! $this->in_entity_map() && WP_DEBUG ){ |
|
1392 | + if ($this->get_model()->exists_by_ID($this->ID())) { |
|
1393 | + if ( ! $this->in_entity_map() && WP_DEBUG) { |
|
1394 | 1394 | throw new EE_Error( |
1395 | 1395 | sprintf( |
1396 | - __( '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' ), |
|
1396 | + __('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'), |
|
1397 | 1397 | get_class($this), |
1398 | - get_class( $this->get_model() ) . '::instance()->add_to_entity_map()', |
|
1399 | - get_class( $this->get_model() ) . '::instance()->get_one_by_ID()', |
|
1398 | + get_class($this->get_model()).'::instance()->add_to_entity_map()', |
|
1399 | + get_class($this->get_model()).'::instance()->get_one_by_ID()', |
|
1400 | 1400 | '<br />' |
1401 | 1401 | ) |
1402 | 1402 | ); |
1403 | 1403 | } |
1404 | 1404 | $results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID()); |
1405 | - }else{ |
|
1405 | + } else { |
|
1406 | 1406 | $results = $this->get_model()->insert($save_cols_n_values); |
1407 | 1407 | $this->_update_cached_related_model_objs_fks(); |
1408 | 1408 | } |
1409 | 1409 | } |
1410 | - }else{//there is NO primary key |
|
1410 | + } else {//there is NO primary key |
|
1411 | 1411 | $already_in_db = false; |
1412 | - foreach($this->get_model()->unique_indexes() as $index){ |
|
1412 | + foreach ($this->get_model()->unique_indexes() as $index) { |
|
1413 | 1413 | $uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields()); |
1414 | - if($this->get_model()->exists(array($uniqueness_where_params))){ |
|
1414 | + if ($this->get_model()->exists(array($uniqueness_where_params))) { |
|
1415 | 1415 | $already_in_db = true; |
1416 | 1416 | } |
1417 | 1417 | } |
1418 | - if( $already_in_db ){ |
|
1419 | - $combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() ); |
|
1420 | - $results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values ); |
|
1421 | - }else{ |
|
1422 | - $results = $this->get_model()->insert( $save_cols_n_values ); |
|
1418 | + if ($already_in_db) { |
|
1419 | + $combined_pk_fields_n_values = array_intersect_key($save_cols_n_values, $this->get_model()->get_combined_primary_key_fields()); |
|
1420 | + $results = $this->get_model()->update($save_cols_n_values, $combined_pk_fields_n_values); |
|
1421 | + } else { |
|
1422 | + $results = $this->get_model()->insert($save_cols_n_values); |
|
1423 | 1423 | } |
1424 | 1424 | } |
1425 | 1425 | //restore the old assumption about values being prepared by the model object |
@@ -1432,7 +1432,7 @@ discard block |
||
1432 | 1432 | * @param boolean|int $results if it were updated, TRUE or FALSE; if it were newly inserted |
1433 | 1433 | * the new ID (or 0 if an error occurred and it wasn't updated) |
1434 | 1434 | */ |
1435 | - do_action( 'AHEE__EE_Base_Class__save__end', $this, $results ); |
|
1435 | + do_action('AHEE__EE_Base_Class__save__end', $this, $results); |
|
1436 | 1436 | return $results; |
1437 | 1437 | } |
1438 | 1438 | |
@@ -1444,13 +1444,13 @@ discard block |
||
1444 | 1444 | * 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) |
1445 | 1445 | * @return void |
1446 | 1446 | */ |
1447 | - protected function _update_cached_related_model_objs_fks(){ |
|
1448 | - foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ){ |
|
1449 | - if( $relation_obj instanceof EE_Has_Many_Relation ){ |
|
1450 | - foreach( $this->get_all_from_cache( $relation_name ) as $related_model_obj_in_cache) { |
|
1451 | - $fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to( $this->get_model()->get_this_model_name() ); |
|
1452 | - $related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID() ); |
|
1453 | - if( $related_model_obj_in_cache->ID() ){ |
|
1447 | + protected function _update_cached_related_model_objs_fks() { |
|
1448 | + foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) { |
|
1449 | + if ($relation_obj instanceof EE_Has_Many_Relation) { |
|
1450 | + foreach ($this->get_all_from_cache($relation_name) as $related_model_obj_in_cache) { |
|
1451 | + $fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to($this->get_model()->get_this_model_name()); |
|
1452 | + $related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID()); |
|
1453 | + if ($related_model_obj_in_cache->ID()) { |
|
1454 | 1454 | $related_model_obj_in_cache->save(); |
1455 | 1455 | } |
1456 | 1456 | } |
@@ -1466,21 +1466,21 @@ discard block |
||
1466 | 1466 | * and this object and properly setup |
1467 | 1467 | * @return int ID of new model object on save; 0 on failure+ |
1468 | 1468 | */ |
1469 | - public function save_new_cached_related_model_objs(){ |
|
1469 | + public function save_new_cached_related_model_objs() { |
|
1470 | 1470 | //make sure this has been saved |
1471 | - if( ! $this->ID()){ |
|
1471 | + if ( ! $this->ID()) { |
|
1472 | 1472 | $id = $this->save(); |
1473 | - }else{ |
|
1473 | + } else { |
|
1474 | 1474 | $id = $this->ID(); |
1475 | 1475 | } |
1476 | 1476 | //now save all the NEW cached model objects (ie they don't exist in the DB) |
1477 | - foreach($this->get_model()->relation_settings() as $relationName => $relationObj){ |
|
1477 | + foreach ($this->get_model()->relation_settings() as $relationName => $relationObj) { |
|
1478 | 1478 | |
1479 | 1479 | |
1480 | - if($this->_model_relations[$relationName]){ |
|
1480 | + if ($this->_model_relations[$relationName]) { |
|
1481 | 1481 | //is this a relation where we should expect just ONE related object (ie, EE_Belongs_To_relation) |
1482 | 1482 | //or MANY related objects (ie, EE_HABTM_Relation or EE_Has_Many_Relation)? |
1483 | - if($relationObj instanceof EE_Belongs_To_Relation){ |
|
1483 | + if ($relationObj instanceof EE_Belongs_To_Relation) { |
|
1484 | 1484 | //add a relation to that relation type (which saves the appropriate thing in the process) |
1485 | 1485 | //but ONLY if it DOES NOT exist in the DB |
1486 | 1486 | /* @var $related_model_obj EE_Base_Class */ |
@@ -1489,8 +1489,8 @@ discard block |
||
1489 | 1489 | $this->_add_relation_to($related_model_obj, $relationName); |
1490 | 1490 | $related_model_obj->save_new_cached_related_model_objs(); |
1491 | 1491 | // } |
1492 | - }else{ |
|
1493 | - foreach($this->_model_relations[$relationName] as $related_model_obj){ |
|
1492 | + } else { |
|
1493 | + foreach ($this->_model_relations[$relationName] as $related_model_obj) { |
|
1494 | 1494 | //add a relation to that relation type (which saves the appropriate thing in the process) |
1495 | 1495 | //but ONLY if it DOES NOT exist in the DB |
1496 | 1496 | // if( ! $related_model_obj->ID()){ |
@@ -1511,8 +1511,8 @@ discard block |
||
1511 | 1511 | * @return \EEM_Base | \EEM_CPT_Base |
1512 | 1512 | */ |
1513 | 1513 | public function get_model() { |
1514 | - $modelName = self::_get_model_classname( get_class($this) ); |
|
1515 | - return self::_get_model_instance_with_name($modelName, $this->_timezone ); |
|
1514 | + $modelName = self::_get_model_classname(get_class($this)); |
|
1515 | + return self::_get_model_instance_with_name($modelName, $this->_timezone); |
|
1516 | 1516 | } |
1517 | 1517 | |
1518 | 1518 | |
@@ -1522,10 +1522,10 @@ discard block |
||
1522 | 1522 | * @param $classname |
1523 | 1523 | * @return mixed bool|EE_Base_Class|EEM_CPT_Base |
1524 | 1524 | */ |
1525 | - protected static function _get_object_from_entity_mapper($props_n_values, $classname){ |
|
1525 | + protected static function _get_object_from_entity_mapper($props_n_values, $classname) { |
|
1526 | 1526 | //TODO: will not work for Term_Relationships because they have no PK! |
1527 | - $primary_id_ref = self::_get_primary_key_name( $classname ); |
|
1528 | - if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) { |
|
1527 | + $primary_id_ref = self::_get_primary_key_name($classname); |
|
1528 | + if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) { |
|
1529 | 1529 | $id = $props_n_values[$primary_id_ref]; |
1530 | 1530 | return self::_get_model($classname)->get_from_entity_map($id); |
1531 | 1531 | } |
@@ -1542,24 +1542,24 @@ discard block |
||
1542 | 1542 | * @param null $timezone |
1543 | 1543 | * @return mixed (EE_Base_Class|bool) |
1544 | 1544 | */ |
1545 | - protected static function _check_for_object( $props_n_values, $classname, $timezone = NULL ) { |
|
1546 | - if( self::_get_model( $classname )->has_primary_key_field()){ |
|
1547 | - $primary_id_ref = self::_get_primary_key_name( $classname ); |
|
1545 | + protected static function _check_for_object($props_n_values, $classname, $timezone = NULL) { |
|
1546 | + if (self::_get_model($classname)->has_primary_key_field()) { |
|
1547 | + $primary_id_ref = self::_get_primary_key_name($classname); |
|
1548 | 1548 | |
1549 | - if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) { |
|
1550 | - $existing = self::_get_model( $classname, $timezone )->get_one_by_ID( $props_n_values[$primary_id_ref] ); |
|
1551 | - }else{ |
|
1549 | + if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) { |
|
1550 | + $existing = self::_get_model($classname, $timezone)->get_one_by_ID($props_n_values[$primary_id_ref]); |
|
1551 | + } else { |
|
1552 | 1552 | $existing = null; |
1553 | 1553 | } |
1554 | - }elseif( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields( $props_n_values ) ){ |
|
1554 | + }elseif (self::_get_model($classname, $timezone)->has_all_combined_primary_key_fields($props_n_values)) { |
|
1555 | 1555 | //no primary key on this model, but there's still a matching item in the DB |
1556 | - $existing = self::_get_model($classname, $timezone)->get_one_by_ID( self::_get_model($classname, $timezone)->get_index_primary_key_string( $props_n_values ) ); |
|
1557 | - }else{ |
|
1556 | + $existing = self::_get_model($classname, $timezone)->get_one_by_ID(self::_get_model($classname, $timezone)->get_index_primary_key_string($props_n_values)); |
|
1557 | + } else { |
|
1558 | 1558 | $existing = null; |
1559 | 1559 | } |
1560 | - if ( $existing ) { |
|
1561 | - foreach ( $props_n_values as $property => $field_value ) { |
|
1562 | - $existing->set( $property, $field_value ); |
|
1560 | + if ($existing) { |
|
1561 | + foreach ($props_n_values as $property => $field_value) { |
|
1562 | + $existing->set($property, $field_value); |
|
1563 | 1563 | } |
1564 | 1564 | return $existing; |
1565 | 1565 | } else { |
@@ -1577,13 +1577,13 @@ discard block |
||
1577 | 1577 | * @throws EE_Error |
1578 | 1578 | * @return EEM_Base |
1579 | 1579 | */ |
1580 | - protected static function _get_model( $classname, $timezone = NULL ){ |
|
1580 | + protected static function _get_model($classname, $timezone = NULL) { |
|
1581 | 1581 | //find model for this class |
1582 | - if( ! $classname ){ |
|
1583 | - throw new EE_Error(sprintf(__("What were you thinking calling _get_model(%s)?? You need to specify the class name", "event_espresso"),$classname)); |
|
1582 | + if ( ! $classname) { |
|
1583 | + throw new EE_Error(sprintf(__("What were you thinking calling _get_model(%s)?? You need to specify the class name", "event_espresso"), $classname)); |
|
1584 | 1584 | } |
1585 | - $modelName=self::_get_model_classname($classname); |
|
1586 | - return self::_get_model_instance_with_name($modelName, $timezone ); |
|
1585 | + $modelName = self::_get_model_classname($classname); |
|
1586 | + return self::_get_model_instance_with_name($modelName, $timezone); |
|
1587 | 1587 | } |
1588 | 1588 | |
1589 | 1589 | |
@@ -1594,10 +1594,10 @@ discard block |
||
1594 | 1594 | * @param null $timezone |
1595 | 1595 | * @return EEM_Base |
1596 | 1596 | */ |
1597 | - protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){ |
|
1598 | - $model_classname = str_replace( 'EEM_', '', $model_classname ); |
|
1599 | - $model = EE_Registry::instance()->load_model( $model_classname ); |
|
1600 | - $model->set_timezone( $timezone ); |
|
1597 | + protected static function _get_model_instance_with_name($model_classname, $timezone = NULL) { |
|
1598 | + $model_classname = str_replace('EEM_', '', $model_classname); |
|
1599 | + $model = EE_Registry::instance()->load_model($model_classname); |
|
1600 | + $model->set_timezone($timezone); |
|
1601 | 1601 | return $model; |
1602 | 1602 | } |
1603 | 1603 | |
@@ -1609,10 +1609,10 @@ discard block |
||
1609 | 1609 | * @param null $model_name |
1610 | 1610 | * @return string like EEM_Attendee |
1611 | 1611 | */ |
1612 | - private static function _get_model_classname( $model_name = null){ |
|
1613 | - if(strpos($model_name,"EE_")===0){ |
|
1614 | - $model_classname=str_replace("EE_","EEM_",$model_name); |
|
1615 | - }else{ |
|
1612 | + private static function _get_model_classname($model_name = null) { |
|
1613 | + if (strpos($model_name, "EE_") === 0) { |
|
1614 | + $model_classname = str_replace("EE_", "EEM_", $model_name); |
|
1615 | + } else { |
|
1616 | 1616 | $model_classname = "EEM_".$model_name; |
1617 | 1617 | } |
1618 | 1618 | return $model_classname; |
@@ -1626,11 +1626,11 @@ discard block |
||
1626 | 1626 | * @throws EE_Error |
1627 | 1627 | * @return string |
1628 | 1628 | */ |
1629 | - protected static function _get_primary_key_name( $classname = NULL ){ |
|
1630 | - if( ! $classname){ |
|
1631 | - throw new EE_Error(sprintf(__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"),$classname)); |
|
1629 | + protected static function _get_primary_key_name($classname = NULL) { |
|
1630 | + if ( ! $classname) { |
|
1631 | + throw new EE_Error(sprintf(__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"), $classname)); |
|
1632 | 1632 | } |
1633 | - return self::_get_model( $classname )->get_primary_key_field()->get_name(); |
|
1633 | + return self::_get_model($classname)->get_primary_key_field()->get_name(); |
|
1634 | 1634 | } |
1635 | 1635 | |
1636 | 1636 | |
@@ -1642,12 +1642,12 @@ discard block |
||
1642 | 1642 | * Usually defaults for integer primary keys are 0; string primary keys are usually NULL). |
1643 | 1643 | * @return mixed, if the primary key is of type INT it'll be an int. Otherwise it could be a string |
1644 | 1644 | */ |
1645 | - public function ID(){ |
|
1645 | + public function ID() { |
|
1646 | 1646 | //now that we know the name of the variable, use a variable variable to get its value and return its |
1647 | - if( $this->get_model()->has_primary_key_field() ) { |
|
1648 | - return $this->_fields[self::_get_primary_key_name( get_class($this) )]; |
|
1649 | - }else{ |
|
1650 | - return $this->get_model()->get_index_primary_key_string( $this->_fields ); |
|
1647 | + if ($this->get_model()->has_primary_key_field()) { |
|
1648 | + return $this->_fields[self::_get_primary_key_name(get_class($this))]; |
|
1649 | + } else { |
|
1650 | + return $this->get_model()->get_index_primary_key_string($this->_fields); |
|
1651 | 1651 | } |
1652 | 1652 | } |
1653 | 1653 | |
@@ -1665,38 +1665,38 @@ discard block |
||
1665 | 1665 | * @throws EE_Error |
1666 | 1666 | * @return EE_Base_Class the object the relation was added to |
1667 | 1667 | */ |
1668 | - public function _add_relation_to( $otherObjectModelObjectOrID,$relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL ){ |
|
1668 | + public function _add_relation_to($otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL) { |
|
1669 | 1669 | //if this thing exists in the DB, save the relation to the DB |
1670 | - if( $this->ID() ){ |
|
1671 | - $otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values ); |
|
1670 | + if ($this->ID()) { |
|
1671 | + $otherObject = $this->get_model()->add_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values); |
|
1672 | 1672 | //clear cache so future get_many_related and get_first_related() return new results. |
1673 | - $this->clear_cache( $relationName, $otherObject, TRUE ); |
|
1674 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1675 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1673 | + $this->clear_cache($relationName, $otherObject, TRUE); |
|
1674 | + if ($otherObject instanceof EE_Base_Class) { |
|
1675 | + $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this); |
|
1676 | 1676 | } |
1677 | 1677 | } else { |
1678 | 1678 | //this thing doesn't exist in the DB, so just cache it |
1679 | - if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){ |
|
1680 | - throw new EE_Error( sprintf( |
|
1681 | - __( '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' ), |
|
1679 | + if ( ! $otherObjectModelObjectOrID instanceof EE_Base_Class) { |
|
1680 | + throw new EE_Error(sprintf( |
|
1681 | + __('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'), |
|
1682 | 1682 | $otherObjectModelObjectOrID, |
1683 | - get_class( $this ) |
|
1683 | + get_class($this) |
|
1684 | 1684 | )); |
1685 | 1685 | } else { |
1686 | 1686 | $otherObject = $otherObjectModelObjectOrID; |
1687 | 1687 | } |
1688 | - $this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id ); |
|
1688 | + $this->cache($relationName, $otherObjectModelObjectOrID, $cache_id); |
|
1689 | 1689 | } |
1690 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1690 | + if ($otherObject instanceof EE_Base_Class) { |
|
1691 | 1691 | //fix the reciprocal relation too |
1692 | - if( $otherObject->ID() ) { |
|
1692 | + if ($otherObject->ID()) { |
|
1693 | 1693 | //its saved so assumed relations exist in the DB, so we can just |
1694 | 1694 | //clear the cache so future queries use the updated info in the DB |
1695 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true ); |
|
1695 | + $otherObject->clear_cache($this->get_model()->get_this_model_name(), null, true); |
|
1696 | 1696 | } else { |
1697 | 1697 | |
1698 | 1698 | //it's not saved, so it caches relations like this |
1699 | - $otherObject->cache( $this->get_model()->get_this_model_name(), $this ); |
|
1699 | + $otherObject->cache($this->get_model()->get_this_model_name(), $this); |
|
1700 | 1700 | } |
1701 | 1701 | } |
1702 | 1702 | return $otherObject; |
@@ -1719,17 +1719,17 @@ discard block |
||
1719 | 1719 | * 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. |
1720 | 1720 | * @return EE_Base_Class the relation was removed from |
1721 | 1721 | */ |
1722 | - public function _remove_relation_to($otherObjectModelObjectOrID,$relationName, $where_query = array() ){ |
|
1723 | - if ( $this->ID() ) { |
|
1722 | + public function _remove_relation_to($otherObjectModelObjectOrID, $relationName, $where_query = array()) { |
|
1723 | + if ($this->ID()) { |
|
1724 | 1724 | //if this exists in the DB, save the relation change to the DB too |
1725 | - $otherObject = $this->get_model()->remove_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $where_query ); |
|
1726 | - $this->clear_cache( $relationName, $otherObject ); |
|
1725 | + $otherObject = $this->get_model()->remove_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $where_query); |
|
1726 | + $this->clear_cache($relationName, $otherObject); |
|
1727 | 1727 | } else { |
1728 | 1728 | //this doesn't exist in the DB, just remove it from the cache |
1729 | - $otherObject = $this->clear_cache( $relationName, $otherObjectModelObjectOrID ); |
|
1729 | + $otherObject = $this->clear_cache($relationName, $otherObjectModelObjectOrID); |
|
1730 | 1730 | } |
1731 | - if( $otherObject instanceof EE_Base_Class ) { |
|
1732 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1731 | + if ($otherObject instanceof EE_Base_Class) { |
|
1732 | + $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this); |
|
1733 | 1733 | } |
1734 | 1734 | return $otherObject; |
1735 | 1735 | } |
@@ -1740,18 +1740,18 @@ discard block |
||
1740 | 1740 | * @param array $where_query_params like EEM_Base::get_all's $query_params[0] (where conditions) |
1741 | 1741 | * @return EE_Base_Class |
1742 | 1742 | */ |
1743 | - public function _remove_relations($relationName,$where_query_params = array()){ |
|
1744 | - if ( $this->ID() ) { |
|
1743 | + public function _remove_relations($relationName, $where_query_params = array()) { |
|
1744 | + if ($this->ID()) { |
|
1745 | 1745 | //if this exists in the DB, save the relation change to the DB too |
1746 | - $otherObjects = $this->get_model()->remove_relations( $this, $relationName, $where_query_params ); |
|
1747 | - $this->clear_cache( $relationName, null, true ); |
|
1746 | + $otherObjects = $this->get_model()->remove_relations($this, $relationName, $where_query_params); |
|
1747 | + $this->clear_cache($relationName, null, true); |
|
1748 | 1748 | } else { |
1749 | 1749 | //this doesn't exist in the DB, just remove it from the cache |
1750 | - $otherObjects = $this->clear_cache( $relationName, null, true ); |
|
1750 | + $otherObjects = $this->clear_cache($relationName, null, true); |
|
1751 | 1751 | } |
1752 | - if( is_array( $otherObjects ) ) { |
|
1753 | - foreach ( $otherObjects as $otherObject ) { |
|
1754 | - $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this ); |
|
1752 | + if (is_array($otherObjects)) { |
|
1753 | + foreach ($otherObjects as $otherObject) { |
|
1754 | + $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this); |
|
1755 | 1755 | } |
1756 | 1756 | } |
1757 | 1757 | return $otherObjects; |
@@ -1769,26 +1769,26 @@ discard block |
||
1769 | 1769 | * @return EE_Base_Class[] Results not necessarily indexed by IDs, because some results might not have primary keys |
1770 | 1770 | * or might not be saved yet. Consider using EEM_Base::get_IDs() on these results if you want IDs |
1771 | 1771 | */ |
1772 | - public function get_many_related($relationName,$query_params = array()){ |
|
1773 | - if($this->ID()){//this exists in the DB, so get the related things from either the cache or the DB |
|
1772 | + public function get_many_related($relationName, $query_params = array()) { |
|
1773 | + if ($this->ID()) {//this exists in the DB, so get the related things from either the cache or the DB |
|
1774 | 1774 | //if there are query parameters, forget about caching the related model objects. |
1775 | - if( $query_params ){ |
|
1775 | + if ($query_params) { |
|
1776 | 1776 | $related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params); |
1777 | - }else{ |
|
1777 | + } else { |
|
1778 | 1778 | //did we already cache the result of this query? |
1779 | 1779 | $cached_results = $this->get_all_from_cache($relationName); |
1780 | - if ( ! $cached_results ){ |
|
1780 | + if ( ! $cached_results) { |
|
1781 | 1781 | $related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params); |
1782 | 1782 | //if no query parameters were passed, then we got all the related model objects |
1783 | 1783 | //for that relation. We can cache them then. |
1784 | - foreach($related_model_objects as $related_model_object){ |
|
1784 | + foreach ($related_model_objects as $related_model_object) { |
|
1785 | 1785 | $this->cache($relationName, $related_model_object); |
1786 | 1786 | } |
1787 | - }else{ |
|
1787 | + } else { |
|
1788 | 1788 | $related_model_objects = $cached_results; |
1789 | 1789 | } |
1790 | 1790 | } |
1791 | - }else{//this doesn't exist itn eh DB, so just get the related things from the cache |
|
1791 | + } else {//this doesn't exist itn eh DB, so just get the related things from the cache |
|
1792 | 1792 | $related_model_objects = $this->get_all_from_cache($relationName); |
1793 | 1793 | } |
1794 | 1794 | return $related_model_objects; |
@@ -1805,8 +1805,8 @@ discard block |
||
1805 | 1805 | * @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; |
1806 | 1806 | * @return int |
1807 | 1807 | */ |
1808 | - public function count_related($relation_name, $query_params =array(),$field_to_count = NULL, $distinct = FALSE){ |
|
1809 | - return $this->get_model()->count_related($this,$relation_name,$query_params,$field_to_count,$distinct); |
|
1808 | + public function count_related($relation_name, $query_params = array(), $field_to_count = NULL, $distinct = FALSE) { |
|
1809 | + return $this->get_model()->count_related($this, $relation_name, $query_params, $field_to_count, $distinct); |
|
1810 | 1810 | } |
1811 | 1811 | |
1812 | 1812 | |
@@ -1820,7 +1820,7 @@ discard block |
||
1820 | 1820 | * By default, uses primary key (which doesn't make much sense, so you should probably change it) |
1821 | 1821 | * @return int |
1822 | 1822 | */ |
1823 | - public function sum_related($relation_name, $query_params = array(), $field_to_sum = null){ |
|
1823 | + public function sum_related($relation_name, $query_params = array(), $field_to_sum = null) { |
|
1824 | 1824 | return $this->get_model()->sum_related($this, $relation_name, $query_params, $field_to_sum); |
1825 | 1825 | } |
1826 | 1826 | |
@@ -1832,34 +1832,34 @@ discard block |
||
1832 | 1832 | * @param array $query_params like EEM_Base::get_all |
1833 | 1833 | * @return EE_Base_Class (not an array, a single object) |
1834 | 1834 | */ |
1835 | - public function get_first_related($relationName,$query_params = array()){ |
|
1836 | - if($this->ID()){//this exists in the DB, get from the cache OR the DB |
|
1835 | + public function get_first_related($relationName, $query_params = array()) { |
|
1836 | + if ($this->ID()) {//this exists in the DB, get from the cache OR the DB |
|
1837 | 1837 | |
1838 | 1838 | //if they've provided some query parameters, don't bother trying to cache the result |
1839 | 1839 | //also make sure we're not caching the result of get_first_related |
1840 | 1840 | //on a relation which should have an array of objects (because the cache might have an array of objects) |
1841 | - if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){ |
|
1842 | - $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
|
1843 | - }else{ |
|
1841 | + if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) { |
|
1842 | + $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
|
1843 | + } else { |
|
1844 | 1844 | //first, check if we've already cached the result of this query |
1845 | 1845 | $cached_result = $this->get_one_from_cache($relationName); |
1846 | - if ( ! $cached_result ){ |
|
1846 | + if ( ! $cached_result) { |
|
1847 | 1847 | |
1848 | 1848 | $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
1849 | - $this->cache($relationName,$related_model_object); |
|
1850 | - }else{ |
|
1849 | + $this->cache($relationName, $related_model_object); |
|
1850 | + } else { |
|
1851 | 1851 | $related_model_object = $cached_result; |
1852 | 1852 | } |
1853 | 1853 | } |
1854 | - }else{ |
|
1854 | + } else { |
|
1855 | 1855 | //this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might |
1856 | - if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){ |
|
1857 | - $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
|
1858 | - }else{ |
|
1856 | + if ($this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) { |
|
1857 | + $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
|
1858 | + } else { |
|
1859 | 1859 | $related_model_object = null; |
1860 | 1860 | } |
1861 | 1861 | //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 |
1862 | - if( ! $related_model_object){ |
|
1862 | + if ( ! $related_model_object) { |
|
1863 | 1863 | $related_model_object = $this->get_one_from_cache($relationName); |
1864 | 1864 | } |
1865 | 1865 | |
@@ -1878,12 +1878,12 @@ discard block |
||
1878 | 1878 | * @param array $query_params like EEM_Base::get_all's |
1879 | 1879 | * @return int how many deleted |
1880 | 1880 | */ |
1881 | - public function delete_related($relationName,$query_params = array()){ |
|
1882 | - if($this->ID()){ |
|
1883 | - $count = $this->get_model()->delete_related($this, $relationName, $query_params); |
|
1884 | - }else{ |
|
1881 | + public function delete_related($relationName, $query_params = array()) { |
|
1882 | + if ($this->ID()) { |
|
1883 | + $count = $this->get_model()->delete_related($this, $relationName, $query_params); |
|
1884 | + } else { |
|
1885 | 1885 | $count = count($this->get_all_from_cache($relationName)); |
1886 | - $this->clear_cache($relationName,NULL,TRUE); |
|
1886 | + $this->clear_cache($relationName, NULL, TRUE); |
|
1887 | 1887 | } |
1888 | 1888 | return $count; |
1889 | 1889 | } |
@@ -1898,13 +1898,13 @@ discard block |
||
1898 | 1898 | * @param array $query_params like EEM_Base::get_all's |
1899 | 1899 | * @return int how many deleted (including those soft deleted) |
1900 | 1900 | */ |
1901 | - public function delete_related_permanently($relationName,$query_params = array()){ |
|
1902 | - if($this->ID()){ |
|
1903 | - $count = $this->get_model()->delete_related_permanently($this, $relationName, $query_params); |
|
1904 | - }else{ |
|
1901 | + public function delete_related_permanently($relationName, $query_params = array()) { |
|
1902 | + if ($this->ID()) { |
|
1903 | + $count = $this->get_model()->delete_related_permanently($this, $relationName, $query_params); |
|
1904 | + } else { |
|
1905 | 1905 | $count = count($this->get_all_from_cache($relationName)); |
1906 | 1906 | } |
1907 | - $this->clear_cache($relationName,NULL,TRUE); |
|
1907 | + $this->clear_cache($relationName, NULL, TRUE); |
|
1908 | 1908 | return $count; |
1909 | 1909 | } |
1910 | 1910 | |
@@ -1920,7 +1920,7 @@ discard block |
||
1920 | 1920 | * @param string $field_name property to check |
1921 | 1921 | * @return bool TRUE if existing,FALSE if not. |
1922 | 1922 | */ |
1923 | - public function is_set( $field_name ) { |
|
1923 | + public function is_set($field_name) { |
|
1924 | 1924 | return isset($this->_fields[$field_name]); |
1925 | 1925 | } |
1926 | 1926 | |
@@ -1932,12 +1932,12 @@ discard block |
||
1932 | 1932 | * @throws EE_Error |
1933 | 1933 | * @return bool TRUE if existing, throw EE_Error if not. |
1934 | 1934 | */ |
1935 | - protected function _property_exists( $properties ) { |
|
1935 | + protected function _property_exists($properties) { |
|
1936 | 1936 | |
1937 | - foreach ( (array) $properties as $property_name ) { |
|
1937 | + foreach ((array) $properties as $property_name) { |
|
1938 | 1938 | //first make sure this property exists |
1939 | - if ( ! $this->_fields[ $property_name ] ) |
|
1940 | - throw new EE_Error( sprintf( __('Trying to retrieve a non-existent property (%s). Double check the spelling please', 'event_espresso'), $property_name ) ); |
|
1939 | + if ( ! $this->_fields[$property_name]) |
|
1940 | + throw new EE_Error(sprintf(__('Trying to retrieve a non-existent property (%s). Double check the spelling please', 'event_espresso'), $property_name)); |
|
1941 | 1941 | } |
1942 | 1942 | |
1943 | 1943 | return TRUE; |
@@ -1954,7 +1954,7 @@ discard block |
||
1954 | 1954 | $fields = $this->get_model()->field_settings(FALSE); |
1955 | 1955 | $properties = array(); |
1956 | 1956 | //remove prepended underscore |
1957 | - foreach ( $fields as $field_name => $settings ) { |
|
1957 | + foreach ($fields as $field_name => $settings) { |
|
1958 | 1958 | $properties[$field_name] = $this->get($field_name); |
1959 | 1959 | } |
1960 | 1960 | return $properties; |
@@ -1984,14 +1984,14 @@ discard block |
||
1984 | 1984 | * @throws EE_Error |
1985 | 1985 | * @return mixed whatever the plugin which calls add_filter decides |
1986 | 1986 | */ |
1987 | - public function __call($methodName,$args){ |
|
1988 | - $className=get_class($this); |
|
1989 | - $tagName="FHEE__{$className}__{$methodName}"; |
|
1990 | - if(!has_filter($tagName)){ |
|
1991 | - 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"), |
|
1992 | - $methodName,$className,$tagName)); |
|
1987 | + public function __call($methodName, $args) { |
|
1988 | + $className = get_class($this); |
|
1989 | + $tagName = "FHEE__{$className}__{$methodName}"; |
|
1990 | + if ( ! has_filter($tagName)) { |
|
1991 | + 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"), |
|
1992 | + $methodName, $className, $tagName)); |
|
1993 | 1993 | } |
1994 | - return apply_filters($tagName,null,$this,$args); |
|
1994 | + return apply_filters($tagName, null, $this, $args); |
|
1995 | 1995 | } |
1996 | 1996 | |
1997 | 1997 | |
@@ -2006,22 +2006,22 @@ discard block |
||
2006 | 2006 | * @return int records updated (or BOOLEAN if we actually ended up inserting the extra meta row) |
2007 | 2007 | * NOTE: if the values haven't changed, returns 0 |
2008 | 2008 | */ |
2009 | - public function update_extra_meta($meta_key,$meta_value,$previous_value = NULL){ |
|
2010 | - $query_params = array(array( |
|
2009 | + public function update_extra_meta($meta_key, $meta_value, $previous_value = NULL) { |
|
2010 | + $query_params = array(array( |
|
2011 | 2011 | 'EXM_key'=>$meta_key, |
2012 | 2012 | 'OBJ_ID'=>$this->ID(), |
2013 | 2013 | 'EXM_type'=>$this->get_model()->get_this_model_name())); |
2014 | - if($previous_value !== NULL){ |
|
2014 | + if ($previous_value !== NULL) { |
|
2015 | 2015 | $query_params[0]['EXM_value'] = $meta_value; |
2016 | 2016 | } |
2017 | 2017 | $existing_rows_like_that = EEM_Extra_Meta::instance()->get_all($query_params); |
2018 | - if( ! $existing_rows_like_that){ |
|
2018 | + if ( ! $existing_rows_like_that) { |
|
2019 | 2019 | return $this->add_extra_meta($meta_key, $meta_value); |
2020 | - }else{ |
|
2021 | - foreach( $existing_rows_like_that as $existing_row){ |
|
2022 | - $existing_row->save( array( 'EXM_value' => $meta_value ) ); |
|
2020 | + } else { |
|
2021 | + foreach ($existing_rows_like_that as $existing_row) { |
|
2022 | + $existing_row->save(array('EXM_value' => $meta_value)); |
|
2023 | 2023 | } |
2024 | - return count( $existing_rows_like_that ); |
|
2024 | + return count($existing_rows_like_that); |
|
2025 | 2025 | } |
2026 | 2026 | } |
2027 | 2027 | |
@@ -2034,10 +2034,10 @@ discard block |
||
2034 | 2034 | * @param boolean $unique |
2035 | 2035 | * @return boolean |
2036 | 2036 | */ |
2037 | - public function add_extra_meta($meta_key,$meta_value,$unique = false){ |
|
2038 | - if($unique){ |
|
2039 | - $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))))); |
|
2040 | - if($existing_extra_meta){ |
|
2037 | + public function add_extra_meta($meta_key, $meta_value, $unique = false) { |
|
2038 | + if ($unique) { |
|
2039 | + $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))))); |
|
2040 | + if ($existing_extra_meta) { |
|
2041 | 2041 | return false; |
2042 | 2042 | } |
2043 | 2043 | } |
@@ -2057,12 +2057,12 @@ discard block |
||
2057 | 2057 | * @param string $meta_value |
2058 | 2058 | * @return int number of extra meta rows deleted |
2059 | 2059 | */ |
2060 | - public function delete_extra_meta($meta_key,$meta_value = NULL){ |
|
2061 | - $query_params = array(array( |
|
2060 | + public function delete_extra_meta($meta_key, $meta_value = NULL) { |
|
2061 | + $query_params = array(array( |
|
2062 | 2062 | 'EXM_key'=>$meta_key, |
2063 | 2063 | 'OBJ_ID'=>$this->ID(), |
2064 | 2064 | 'EXM_type'=>$this->get_model()->get_this_model_name())); |
2065 | - if($meta_value !== NULL){ |
|
2065 | + if ($meta_value !== NULL) { |
|
2066 | 2066 | $query_params[0]['EXM_value'] = $meta_value; |
2067 | 2067 | } |
2068 | 2068 | $count_deleted = EEM_Extra_Meta::instance()->delete($query_params); |
@@ -2078,25 +2078,25 @@ discard block |
||
2078 | 2078 | * @param mixed $default if we don't find anything, what should we return? |
2079 | 2079 | * @return mixed single value if $single; array if ! $single |
2080 | 2080 | */ |
2081 | - public function get_extra_meta($meta_key,$single = FALSE,$default = NULL){ |
|
2082 | - if($single){ |
|
2083 | - $result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key))); |
|
2084 | - if ( $result instanceof EE_Extra_Meta ){ |
|
2081 | + public function get_extra_meta($meta_key, $single = FALSE, $default = NULL) { |
|
2082 | + if ($single) { |
|
2083 | + $result = $this->get_first_related('Extra_Meta', array(array('EXM_key'=>$meta_key))); |
|
2084 | + if ($result instanceof EE_Extra_Meta) { |
|
2085 | 2085 | return $result->value(); |
2086 | - }else{ |
|
2086 | + } else { |
|
2087 | 2087 | return $default; |
2088 | 2088 | } |
2089 | - }else{ |
|
2090 | - $results = $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key))); |
|
2091 | - if($results){ |
|
2089 | + } else { |
|
2090 | + $results = $this->get_many_related('Extra_Meta', array(array('EXM_key'=>$meta_key))); |
|
2091 | + if ($results) { |
|
2092 | 2092 | $values = array(); |
2093 | - foreach($results as $result){ |
|
2094 | - if ( $result instanceof EE_Extra_Meta ){ |
|
2093 | + foreach ($results as $result) { |
|
2094 | + if ($result instanceof EE_Extra_Meta) { |
|
2095 | 2095 | $values[$result->ID()] = $result->value(); |
2096 | 2096 | } |
2097 | 2097 | } |
2098 | 2098 | return $values; |
2099 | - }else{ |
|
2099 | + } else { |
|
2100 | 2100 | return $default; |
2101 | 2101 | } |
2102 | 2102 | } |
@@ -2113,20 +2113,20 @@ discard block |
||
2113 | 2113 | * @param boolean $one_of_each_key |
2114 | 2114 | * @return array |
2115 | 2115 | */ |
2116 | - public function all_extra_meta_array($one_of_each_key = true){ |
|
2116 | + public function all_extra_meta_array($one_of_each_key = true) { |
|
2117 | 2117 | $return_array = array(); |
2118 | - if($one_of_each_key){ |
|
2118 | + if ($one_of_each_key) { |
|
2119 | 2119 | $extra_meta_objs = $this->get_many_related('Extra_Meta', array('group_by'=>'EXM_key')); |
2120 | - foreach($extra_meta_objs as $extra_meta_obj){ |
|
2121 | - if ( $extra_meta_obj instanceof EE_Extra_Meta ) { |
|
2120 | + foreach ($extra_meta_objs as $extra_meta_obj) { |
|
2121 | + if ($extra_meta_obj instanceof EE_Extra_Meta) { |
|
2122 | 2122 | $return_array[$extra_meta_obj->key()] = $extra_meta_obj->value(); |
2123 | 2123 | } |
2124 | 2124 | } |
2125 | - }else{ |
|
2125 | + } else { |
|
2126 | 2126 | $extra_meta_objs = $this->get_many_related('Extra_Meta'); |
2127 | - foreach($extra_meta_objs as $extra_meta_obj){ |
|
2128 | - if ( $extra_meta_obj instanceof EE_Extra_Meta ) { |
|
2129 | - if( ! isset($return_array[$extra_meta_obj->key()])){ |
|
2127 | + foreach ($extra_meta_objs as $extra_meta_obj) { |
|
2128 | + if ($extra_meta_obj instanceof EE_Extra_Meta) { |
|
2129 | + if ( ! isset($return_array[$extra_meta_obj->key()])) { |
|
2130 | 2130 | $return_array[$extra_meta_obj->key()] = array(); |
2131 | 2131 | } |
2132 | 2132 | $return_array[$extra_meta_obj->key()][$extra_meta_obj->ID()] = $extra_meta_obj->value(); |
@@ -2139,19 +2139,19 @@ discard block |
||
2139 | 2139 | * Gets a pretty nice displayable nice for this model object. Often overridden |
2140 | 2140 | * @return string |
2141 | 2141 | */ |
2142 | - public function name(){ |
|
2142 | + public function name() { |
|
2143 | 2143 | //find a field that's not a text field |
2144 | 2144 | $field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base'); |
2145 | - if($field_we_can_use){ |
|
2145 | + if ($field_we_can_use) { |
|
2146 | 2146 | return $this->get($field_we_can_use->get_name()); |
2147 | - }else{ |
|
2147 | + } else { |
|
2148 | 2148 | $first_few_properties = $this->model_field_array(); |
2149 | - $first_few_properties = array_slice($first_few_properties,0,3); |
|
2149 | + $first_few_properties = array_slice($first_few_properties, 0, 3); |
|
2150 | 2150 | $name_parts = array(); |
2151 | - foreach( $first_few_properties as $name=> $value ){ |
|
2151 | + foreach ($first_few_properties as $name=> $value) { |
|
2152 | 2152 | $name_parts[] = "$name:$value"; |
2153 | 2153 | } |
2154 | - return implode(",",$name_parts); |
|
2154 | + return implode(",", $name_parts); |
|
2155 | 2155 | } |
2156 | 2156 | } |
2157 | 2157 | |
@@ -2160,11 +2160,11 @@ discard block |
||
2160 | 2160 | * Checks if this model object has been proven to already be in the entity map |
2161 | 2161 | * @return boolean |
2162 | 2162 | */ |
2163 | - public function in_entity_map(){ |
|
2164 | - if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) { |
|
2163 | + public function in_entity_map() { |
|
2164 | + if ($this->ID() && $this->get_model()->get_from_entity_map($this->ID()) === $this) { |
|
2165 | 2165 | //well, if we looked, did we find it in the entity map? |
2166 | 2166 | return TRUE; |
2167 | - }else{ |
|
2167 | + } else { |
|
2168 | 2168 | return FALSE; |
2169 | 2169 | } |
2170 | 2170 | } |
@@ -2175,21 +2175,21 @@ discard block |
||
2175 | 2175 | * @throws EE_Error if this model object isn't in the entity mapper (because then you should |
2176 | 2176 | * just use what's in the entity mapper and refresh it) and WP_DEBUG is TRUE |
2177 | 2177 | */ |
2178 | - public function refresh_from_db(){ |
|
2179 | - if( $this->ID() && $this->in_entity_map() ){ |
|
2180 | - $this->get_model()->refresh_entity_map_from_db( $this->ID() ); |
|
2181 | - }else{ |
|
2178 | + public function refresh_from_db() { |
|
2179 | + if ($this->ID() && $this->in_entity_map()) { |
|
2180 | + $this->get_model()->refresh_entity_map_from_db($this->ID()); |
|
2181 | + } else { |
|
2182 | 2182 | //if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database) |
2183 | 2183 | //if it has an ID but it's not in the map, and you're asking me to refresh it |
2184 | 2184 | //that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's |
2185 | 2185 | //absolutely nothing in it for this ID |
2186 | - if( WP_DEBUG ) { |
|
2186 | + if (WP_DEBUG) { |
|
2187 | 2187 | throw new EE_Error( |
2188 | 2188 | sprintf( |
2189 | - __( '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' ), |
|
2189 | + __('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'), |
|
2190 | 2190 | $this->ID(), |
2191 | - get_class( $this->get_model() ) . '::instance()->add_to_entity_map()', |
|
2192 | - get_class( $this->get_model() ) . '::instance()->refresh_entity_map()' |
|
2191 | + get_class($this->get_model()).'::instance()->add_to_entity_map()', |
|
2192 | + get_class($this->get_model()).'::instance()->refresh_entity_map()' |
|
2193 | 2193 | ) |
2194 | 2194 | ); |
2195 | 2195 | } |
@@ -2201,8 +2201,8 @@ discard block |
||
2201 | 2201 | * (probably a bad assumption they have made, oh well) |
2202 | 2202 | * @return string |
2203 | 2203 | */ |
2204 | - public function __toString(){ |
|
2205 | - return sprintf( '%s (%s)', $this->name(), $this->ID() ); |
|
2204 | + public function __toString() { |
|
2205 | + return sprintf('%s (%s)', $this->name(), $this->ID()); |
|
2206 | 2206 | } |
2207 | 2207 | |
2208 | 2208 | /** |
@@ -2234,16 +2234,16 @@ discard block |
||
2234 | 2234 | * @return array |
2235 | 2235 | */ |
2236 | 2236 | public function __sleep() { |
2237 | - foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) { |
|
2238 | - if( $relation_obj instanceof EE_Belongs_To_Relation ) { |
|
2239 | - $classname = 'EE_' . $this->get_model()->get_this_model_name(); |
|
2240 | - if( $this->get_one_from_cache( $relation_name ) instanceof $classname && |
|
2241 | - $this->get_one_from_cache( $relation_name )->ID() ) { |
|
2242 | - $this->clear_cache( $relation_name, $this->get_one_from_cache( $relation_name )->ID() ); |
|
2237 | + foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) { |
|
2238 | + if ($relation_obj instanceof EE_Belongs_To_Relation) { |
|
2239 | + $classname = 'EE_'.$this->get_model()->get_this_model_name(); |
|
2240 | + if ($this->get_one_from_cache($relation_name) instanceof $classname && |
|
2241 | + $this->get_one_from_cache($relation_name)->ID()) { |
|
2242 | + $this->clear_cache($relation_name, $this->get_one_from_cache($relation_name)->ID()); |
|
2243 | 2243 | } |
2244 | 2244 | } |
2245 | 2245 | } |
2246 | - return array_keys( get_object_vars( $this ) ); |
|
2246 | + return array_keys(get_object_vars($this)); |
|
2247 | 2247 | } |
2248 | 2248 | |
2249 | 2249 |
@@ -1,4 +1,6 @@ discard block |
||
1 | -<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
1 | +<?php if (!defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | +} |
|
2 | 4 | do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' ); |
3 | 5 | /** |
4 | 6 | * |
@@ -170,7 +172,7 @@ discard block |
||
170 | 172 | foreach($this->get_model()->relation_settings() as $relation_name=>$relation_obj){ |
171 | 173 | if($relation_obj instanceof EE_Belongs_To_Relation){ |
172 | 174 | $this->_model_relations[$relation_name] = NULL; |
173 | - }else{ |
|
175 | + } else{ |
|
174 | 176 | $this->_model_relations[$relation_name] = array(); |
175 | 177 | } |
176 | 178 | } |
@@ -215,7 +217,7 @@ discard block |
||
215 | 217 | if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) && |
216 | 218 | $field_settings = $this->get_Model()->field_settings_for( $field_name )){ |
217 | 219 | return $field_settings->prepare_for_get( $this->_props_n_values_provided_in_constructor[ $field_name ] ); |
218 | - }else{ |
|
220 | + } else{ |
|
219 | 221 | return NULL; |
220 | 222 | } |
221 | 223 | } |
@@ -264,7 +266,7 @@ discard block |
||
264 | 266 | empty( $this->_fields[$field_name] ) ? $this->set( $field_name, time() ) : $this->set( $field_name, $this->_fields[$field_name] ); |
265 | 267 | } |
266 | 268 | |
267 | - }else{ |
|
269 | + } else{ |
|
268 | 270 | $this->_fields[$field_name] = $holder_of_value; |
269 | 271 | } |
270 | 272 | |
@@ -292,7 +294,7 @@ discard block |
||
292 | 294 | } |
293 | 295 | //let's unset any cache for this field_name from the $_cached_properties property. |
294 | 296 | $this->_clear_cached_property( $field_name ); |
295 | - }else{ |
|
297 | + } else{ |
|
296 | 298 | 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 | 299 | } |
298 | 300 | |
@@ -588,8 +590,9 @@ discard block |
||
588 | 590 | * @return void |
589 | 591 | */ |
590 | 592 | protected function _clear_cached_property( $property_name ) { |
591 | - if ( isset( $this->_cached_properties[ $property_name ] ) ) |
|
592 | - unset( $this->_cached_properties[ $property_name ] ); |
|
593 | + if ( isset( $this->_cached_properties[ $property_name ] ) ) { |
|
594 | + unset( $this->_cached_properties[ $property_name ] ); |
|
595 | + } |
|
593 | 596 | } |
594 | 597 | |
595 | 598 | |
@@ -629,10 +632,10 @@ discard block |
||
629 | 632 | if($clear_all){ |
630 | 633 | $obj_removed = true; |
631 | 634 | $this->_model_relations[$relationName] = null; |
632 | - }elseif($relationship_to_model instanceof EE_Belongs_To_Relation){ |
|
635 | + } elseif($relationship_to_model instanceof EE_Belongs_To_Relation){ |
|
633 | 636 | $obj_removed = $this->_model_relations[$relationName]; |
634 | 637 | $this->_model_relations[$relationName] = null; |
635 | - }else{ |
|
638 | + } else{ |
|
636 | 639 | if($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()){ |
637 | 640 | $index_in_cache = $object_to_remove_or_index_into_array->ID(); |
638 | 641 | if( is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])){ |
@@ -646,20 +649,20 @@ discard block |
||
646 | 649 | } |
647 | 650 | if($index_found_at){ |
648 | 651 | $index_in_cache = $index_found_at; |
649 | - }else{ |
|
652 | + } else{ |
|
650 | 653 | //it wasn't found. huh. well obviously it doesn't need to be removed from teh cache |
651 | 654 | //if it wasn't in it to begin with. So we're done |
652 | 655 | return $object_to_remove_or_index_into_array; |
653 | 656 | } |
654 | 657 | } |
655 | - }elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){ |
|
658 | + } elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){ |
|
656 | 659 | //so they provided a model object, but it's not yet saved to the DB... so let's go hunting for it! |
657 | 660 | foreach($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want){ |
658 | 661 | if($potentially_obj_we_want == $object_to_remove_or_index_into_array){ |
659 | 662 | $index_in_cache = $index; |
660 | 663 | } |
661 | 664 | } |
662 | - }else{ |
|
665 | + } else{ |
|
663 | 666 | $index_in_cache = $object_to_remove_or_index_into_array; |
664 | 667 | } |
665 | 668 | //supposedly we've found it. But it could just be that the client code |
@@ -668,7 +671,7 @@ discard block |
||
668 | 671 | isset( $this->_model_relations[$relationName][$index_in_cache])){ |
669 | 672 | $obj_removed = $this->_model_relations[$relationName][$index_in_cache]; |
670 | 673 | unset($this->_model_relations[$relationName][$index_in_cache]); |
671 | - }else{ |
|
674 | + } else{ |
|
672 | 675 | //that thing was never cached anyways. |
673 | 676 | $obj_removed = NULL; |
674 | 677 | } |
@@ -724,7 +727,7 @@ discard block |
||
724 | 727 | $cached_array_or_object = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : null; |
725 | 728 | if(is_array($cached_array_or_object)){ |
726 | 729 | return array_shift($cached_array_or_object); |
727 | - }else{ |
|
730 | + } else{ |
|
728 | 731 | return $cached_array_or_object; |
729 | 732 | } |
730 | 733 | } |
@@ -743,10 +746,10 @@ discard block |
||
743 | 746 | $cached_array_or_object = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : array(); |
744 | 747 | if(is_array($cached_array_or_object)){ |
745 | 748 | $objects = $cached_array_or_object; |
746 | - }elseif($cached_array_or_object){ |
|
749 | + } elseif($cached_array_or_object){ |
|
747 | 750 | //if the result is not an array, but exists, make it an array |
748 | 751 | $objects = array($cached_array_or_object); |
749 | - }else{ |
|
752 | + } else{ |
|
750 | 753 | //if nothing was found, return an empty array |
751 | 754 | $objects = array(); |
752 | 755 | } |
@@ -761,7 +764,7 @@ discard block |
||
761 | 764 | if( $model_object->ID() ){ |
762 | 765 | $model->add_to_entity_map( $model_object ); |
763 | 766 | } |
764 | - }else{ |
|
767 | + } else{ |
|
765 | 768 | 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 | 769 | } |
767 | 770 | } |
@@ -886,10 +889,10 @@ discard block |
||
886 | 889 | if( $field_obj->is_nullable()){ |
887 | 890 | //if the field allows nulls, then let it be null |
888 | 891 | $field_value = NULL; |
889 | - }else{ |
|
892 | + } else{ |
|
890 | 893 | $field_value = $field_obj->get_default_value(); |
891 | 894 | } |
892 | - }else{ |
|
895 | + } else{ |
|
893 | 896 | $field_value = $field_obj->prepare_for_set_from_db( $field_value_from_db ); |
894 | 897 | } |
895 | 898 | $this->_fields[$field_name] = $field_value; |
@@ -1009,15 +1012,17 @@ discard block |
||
1009 | 1012 | $this->_tm_frmt = $in_tm_frmt; |
1010 | 1013 | } |
1011 | 1014 | |
1012 | - if ( $echo ) |
|
1013 | - $field->set_pretty_date_format( $in_dt_frmt ); |
|
1014 | - else |
|
1015 | - $field->set_date_format( $in_dt_frmt ); |
|
1015 | + if ( $echo ) { |
|
1016 | + $field->set_pretty_date_format( $in_dt_frmt ); |
|
1017 | + } else { |
|
1018 | + $field->set_date_format( $in_dt_frmt ); |
|
1019 | + } |
|
1016 | 1020 | |
1017 | - if ( $echo ) |
|
1018 | - $field->set_pretty_time_format( $in_tm_frmt ); |
|
1019 | - else |
|
1020 | - $field->set_time_format( $in_tm_frmt ); |
|
1021 | + if ( $echo ) { |
|
1022 | + $field->set_pretty_time_format( $in_tm_frmt ); |
|
1023 | + } else { |
|
1024 | + $field->set_time_format( $in_tm_frmt ); |
|
1025 | + } |
|
1021 | 1026 | |
1022 | 1027 | //set timezone in field object |
1023 | 1028 | $field->set_timezone( $this->_timezone ); |
@@ -1240,8 +1245,9 @@ discard block |
||
1240 | 1245 | EE_Registry::instance()->load_helper('DTT_Helper'); |
1241 | 1246 | $timezone = EEH_DTT_Helper::get_timezone(); |
1242 | 1247 | |
1243 | - if ( $timezone == $this->_timezone ) |
|
1244 | - return ''; |
|
1248 | + if ( $timezone == $this->_timezone ) { |
|
1249 | + return ''; |
|
1250 | + } |
|
1245 | 1251 | |
1246 | 1252 | $original_timezone = $this->_timezone; |
1247 | 1253 | $this->set_timezone( $timezone ); |
@@ -1249,8 +1255,9 @@ discard block |
||
1249 | 1255 | $fn = (array) $field_name; |
1250 | 1256 | $args = array_merge( $fn, (array) $args ); |
1251 | 1257 | |
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 ) ); |
|
1258 | + if ( !method_exists( $this, $callback ) ) { |
|
1259 | + 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 ) ); |
|
1260 | + } |
|
1254 | 1261 | $args = (array) $args; |
1255 | 1262 | $return = $prepend . call_user_func_array( array( $this, $callback ), $args ) . $append; |
1256 | 1263 | |
@@ -1294,7 +1301,7 @@ discard block |
||
1294 | 1301 | if($model instanceof EEM_Soft_Delete_Base){ |
1295 | 1302 | $result=$model->delete_permanently_by_ID($this->ID()); |
1296 | 1303 | $this->refresh_cache_of_related_objects(); |
1297 | - }else{ |
|
1304 | + } else{ |
|
1298 | 1305 | $result = $this->delete(); |
1299 | 1306 | } |
1300 | 1307 | return $result ? true : false; |
@@ -1387,7 +1394,7 @@ discard block |
||
1387 | 1394 | $this->_update_cached_related_model_objs_fks(); |
1388 | 1395 | } |
1389 | 1396 | } |
1390 | - }else{//PK is NOT auto-increment |
|
1397 | + } else{//PK is NOT auto-increment |
|
1391 | 1398 | //so check if one like it already exists in the db |
1392 | 1399 | if( $this->get_model()->exists_by_ID( $this->ID() ) ){ |
1393 | 1400 | if( ! $this->in_entity_map() && WP_DEBUG ){ |
@@ -1402,12 +1409,12 @@ discard block |
||
1402 | 1409 | ); |
1403 | 1410 | } |
1404 | 1411 | $results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID()); |
1405 | - }else{ |
|
1412 | + } else{ |
|
1406 | 1413 | $results = $this->get_model()->insert($save_cols_n_values); |
1407 | 1414 | $this->_update_cached_related_model_objs_fks(); |
1408 | 1415 | } |
1409 | 1416 | } |
1410 | - }else{//there is NO primary key |
|
1417 | + } else{//there is NO primary key |
|
1411 | 1418 | $already_in_db = false; |
1412 | 1419 | foreach($this->get_model()->unique_indexes() as $index){ |
1413 | 1420 | $uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields()); |
@@ -1418,7 +1425,7 @@ discard block |
||
1418 | 1425 | if( $already_in_db ){ |
1419 | 1426 | $combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() ); |
1420 | 1427 | $results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values ); |
1421 | - }else{ |
|
1428 | + } else{ |
|
1422 | 1429 | $results = $this->get_model()->insert( $save_cols_n_values ); |
1423 | 1430 | } |
1424 | 1431 | } |
@@ -1470,7 +1477,7 @@ discard block |
||
1470 | 1477 | //make sure this has been saved |
1471 | 1478 | if( ! $this->ID()){ |
1472 | 1479 | $id = $this->save(); |
1473 | - }else{ |
|
1480 | + } else{ |
|
1474 | 1481 | $id = $this->ID(); |
1475 | 1482 | } |
1476 | 1483 | //now save all the NEW cached model objects (ie they don't exist in the DB) |
@@ -1489,7 +1496,7 @@ discard block |
||
1489 | 1496 | $this->_add_relation_to($related_model_obj, $relationName); |
1490 | 1497 | $related_model_obj->save_new_cached_related_model_objs(); |
1491 | 1498 | // } |
1492 | - }else{ |
|
1499 | + } else{ |
|
1493 | 1500 | foreach($this->_model_relations[$relationName] as $related_model_obj){ |
1494 | 1501 | //add a relation to that relation type (which saves the appropriate thing in the process) |
1495 | 1502 | //but ONLY if it DOES NOT exist in the DB |
@@ -1548,13 +1555,13 @@ discard block |
||
1548 | 1555 | |
1549 | 1556 | if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) { |
1550 | 1557 | $existing = self::_get_model( $classname, $timezone )->get_one_by_ID( $props_n_values[$primary_id_ref] ); |
1551 | - }else{ |
|
1558 | + } else{ |
|
1552 | 1559 | $existing = null; |
1553 | 1560 | } |
1554 | - }elseif( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields( $props_n_values ) ){ |
|
1561 | + } elseif( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields( $props_n_values ) ){ |
|
1555 | 1562 | //no primary key on this model, but there's still a matching item in the DB |
1556 | 1563 | $existing = self::_get_model($classname, $timezone)->get_one_by_ID( self::_get_model($classname, $timezone)->get_index_primary_key_string( $props_n_values ) ); |
1557 | - }else{ |
|
1564 | + } else{ |
|
1558 | 1565 | $existing = null; |
1559 | 1566 | } |
1560 | 1567 | if ( $existing ) { |
@@ -1612,7 +1619,7 @@ discard block |
||
1612 | 1619 | private static function _get_model_classname( $model_name = null){ |
1613 | 1620 | if(strpos($model_name,"EE_")===0){ |
1614 | 1621 | $model_classname=str_replace("EE_","EEM_",$model_name); |
1615 | - }else{ |
|
1622 | + } else{ |
|
1616 | 1623 | $model_classname = "EEM_".$model_name; |
1617 | 1624 | } |
1618 | 1625 | return $model_classname; |
@@ -1646,7 +1653,7 @@ discard block |
||
1646 | 1653 | //now that we know the name of the variable, use a variable variable to get its value and return its |
1647 | 1654 | if( $this->get_model()->has_primary_key_field() ) { |
1648 | 1655 | return $this->_fields[self::_get_primary_key_name( get_class($this) )]; |
1649 | - }else{ |
|
1656 | + } else{ |
|
1650 | 1657 | return $this->get_model()->get_index_primary_key_string( $this->_fields ); |
1651 | 1658 | } |
1652 | 1659 | } |
@@ -1774,7 +1781,7 @@ discard block |
||
1774 | 1781 | //if there are query parameters, forget about caching the related model objects. |
1775 | 1782 | if( $query_params ){ |
1776 | 1783 | $related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params); |
1777 | - }else{ |
|
1784 | + } else{ |
|
1778 | 1785 | //did we already cache the result of this query? |
1779 | 1786 | $cached_results = $this->get_all_from_cache($relationName); |
1780 | 1787 | if ( ! $cached_results ){ |
@@ -1784,11 +1791,11 @@ discard block |
||
1784 | 1791 | foreach($related_model_objects as $related_model_object){ |
1785 | 1792 | $this->cache($relationName, $related_model_object); |
1786 | 1793 | } |
1787 | - }else{ |
|
1794 | + } else{ |
|
1788 | 1795 | $related_model_objects = $cached_results; |
1789 | 1796 | } |
1790 | 1797 | } |
1791 | - }else{//this doesn't exist itn eh DB, so just get the related things from the cache |
|
1798 | + } else{//this doesn't exist itn eh DB, so just get the related things from the cache |
|
1792 | 1799 | $related_model_objects = $this->get_all_from_cache($relationName); |
1793 | 1800 | } |
1794 | 1801 | return $related_model_objects; |
@@ -1840,22 +1847,22 @@ discard block |
||
1840 | 1847 | //on a relation which should have an array of objects (because the cache might have an array of objects) |
1841 | 1848 | if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){ |
1842 | 1849 | $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
1843 | - }else{ |
|
1850 | + } else{ |
|
1844 | 1851 | //first, check if we've already cached the result of this query |
1845 | 1852 | $cached_result = $this->get_one_from_cache($relationName); |
1846 | 1853 | if ( ! $cached_result ){ |
1847 | 1854 | |
1848 | 1855 | $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
1849 | 1856 | $this->cache($relationName,$related_model_object); |
1850 | - }else{ |
|
1857 | + } else{ |
|
1851 | 1858 | $related_model_object = $cached_result; |
1852 | 1859 | } |
1853 | 1860 | } |
1854 | - }else{ |
|
1861 | + } else{ |
|
1855 | 1862 | //this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might |
1856 | 1863 | if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){ |
1857 | 1864 | $related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params); |
1858 | - }else{ |
|
1865 | + } else{ |
|
1859 | 1866 | $related_model_object = null; |
1860 | 1867 | } |
1861 | 1868 | //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 |
@@ -1881,7 +1888,7 @@ discard block |
||
1881 | 1888 | public function delete_related($relationName,$query_params = array()){ |
1882 | 1889 | if($this->ID()){ |
1883 | 1890 | $count = $this->get_model()->delete_related($this, $relationName, $query_params); |
1884 | - }else{ |
|
1891 | + } else{ |
|
1885 | 1892 | $count = count($this->get_all_from_cache($relationName)); |
1886 | 1893 | $this->clear_cache($relationName,NULL,TRUE); |
1887 | 1894 | } |
@@ -1901,7 +1908,7 @@ discard block |
||
1901 | 1908 | public function delete_related_permanently($relationName,$query_params = array()){ |
1902 | 1909 | if($this->ID()){ |
1903 | 1910 | $count = $this->get_model()->delete_related_permanently($this, $relationName, $query_params); |
1904 | - }else{ |
|
1911 | + } else{ |
|
1905 | 1912 | $count = count($this->get_all_from_cache($relationName)); |
1906 | 1913 | } |
1907 | 1914 | $this->clear_cache($relationName,NULL,TRUE); |
@@ -1936,8 +1943,9 @@ discard block |
||
1936 | 1943 | |
1937 | 1944 | foreach ( (array) $properties as $property_name ) { |
1938 | 1945 | //first make sure this property exists |
1939 | - if ( ! $this->_fields[ $property_name ] ) |
|
1940 | - throw new EE_Error( sprintf( __('Trying to retrieve a non-existent property (%s). Double check the spelling please', 'event_espresso'), $property_name ) ); |
|
1946 | + if ( ! $this->_fields[ $property_name ] ) { |
|
1947 | + throw new EE_Error( sprintf( __('Trying to retrieve a non-existent property (%s). Double check the spelling please', 'event_espresso'), $property_name ) ); |
|
1948 | + } |
|
1941 | 1949 | } |
1942 | 1950 | |
1943 | 1951 | return TRUE; |
@@ -2017,7 +2025,7 @@ discard block |
||
2017 | 2025 | $existing_rows_like_that = EEM_Extra_Meta::instance()->get_all($query_params); |
2018 | 2026 | if( ! $existing_rows_like_that){ |
2019 | 2027 | return $this->add_extra_meta($meta_key, $meta_value); |
2020 | - }else{ |
|
2028 | + } else{ |
|
2021 | 2029 | foreach( $existing_rows_like_that as $existing_row){ |
2022 | 2030 | $existing_row->save( array( 'EXM_value' => $meta_value ) ); |
2023 | 2031 | } |
@@ -2083,10 +2091,10 @@ discard block |
||
2083 | 2091 | $result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key))); |
2084 | 2092 | if ( $result instanceof EE_Extra_Meta ){ |
2085 | 2093 | return $result->value(); |
2086 | - }else{ |
|
2094 | + } else{ |
|
2087 | 2095 | return $default; |
2088 | 2096 | } |
2089 | - }else{ |
|
2097 | + } else{ |
|
2090 | 2098 | $results = $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key))); |
2091 | 2099 | if($results){ |
2092 | 2100 | $values = array(); |
@@ -2096,7 +2104,7 @@ discard block |
||
2096 | 2104 | } |
2097 | 2105 | } |
2098 | 2106 | return $values; |
2099 | - }else{ |
|
2107 | + } else{ |
|
2100 | 2108 | return $default; |
2101 | 2109 | } |
2102 | 2110 | } |
@@ -2122,7 +2130,7 @@ discard block |
||
2122 | 2130 | $return_array[$extra_meta_obj->key()] = $extra_meta_obj->value(); |
2123 | 2131 | } |
2124 | 2132 | } |
2125 | - }else{ |
|
2133 | + } else{ |
|
2126 | 2134 | $extra_meta_objs = $this->get_many_related('Extra_Meta'); |
2127 | 2135 | foreach($extra_meta_objs as $extra_meta_obj){ |
2128 | 2136 | if ( $extra_meta_obj instanceof EE_Extra_Meta ) { |
@@ -2144,7 +2152,7 @@ discard block |
||
2144 | 2152 | $field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base'); |
2145 | 2153 | if($field_we_can_use){ |
2146 | 2154 | return $this->get($field_we_can_use->get_name()); |
2147 | - }else{ |
|
2155 | + } else{ |
|
2148 | 2156 | $first_few_properties = $this->model_field_array(); |
2149 | 2157 | $first_few_properties = array_slice($first_few_properties,0,3); |
2150 | 2158 | $name_parts = array(); |
@@ -2164,7 +2172,7 @@ discard block |
||
2164 | 2172 | if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) { |
2165 | 2173 | //well, if we looked, did we find it in the entity map? |
2166 | 2174 | return TRUE; |
2167 | - }else{ |
|
2175 | + } else{ |
|
2168 | 2176 | return FALSE; |
2169 | 2177 | } |
2170 | 2178 | } |
@@ -2178,7 +2186,7 @@ discard block |
||
2178 | 2186 | public function refresh_from_db(){ |
2179 | 2187 | if( $this->ID() && $this->in_entity_map() ){ |
2180 | 2188 | $this->get_model()->refresh_entity_map_from_db( $this->ID() ); |
2181 | - }else{ |
|
2189 | + } else{ |
|
2182 | 2190 | //if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database) |
2183 | 2191 | //if it has an ID but it's not in the map, and you're asking me to refresh it |
2184 | 2192 | //that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's |
@@ -510,7 +510,7 @@ discard block |
||
510 | 510 | * @access protected |
511 | 511 | * @param string $fieldname the property item the corresponding value is for. |
512 | 512 | * @param mixed $value The value we are caching. |
513 | - * @param null $cache_type |
|
513 | + * @param string $cache_type |
|
514 | 514 | * @return void |
515 | 515 | */ |
516 | 516 | protected function _set_cached_property( $fieldname, $value, $cache_type = NULL ) { |
@@ -823,7 +823,7 @@ discard block |
||
823 | 823 | * |
824 | 824 | * @param null $field_to_order_by What field is being used as the reference point. |
825 | 825 | * @param array $query_params Any additional conditions on the query. |
826 | - * @param null $columns_to_select If left null, then an array of EE_Base_Class objects is returned, otherwise |
|
826 | + * @param string $columns_to_select If left null, then an array of EE_Base_Class objects is returned, otherwise |
|
827 | 827 | * you can indicate just the columns you want returned |
828 | 828 | * |
829 | 829 | * @return array|EE_Base_Class |
@@ -848,7 +848,7 @@ discard block |
||
848 | 848 | * |
849 | 849 | * @param null $field_to_order_by What field is being used as the reference point. |
850 | 850 | * @param array $query_params Any additional conditions on the query. |
851 | - * @param null $columns_to_select If left null, then an EE_Base_Class object is returned, otherwise |
|
851 | + * @param string $columns_to_select If left null, then an EE_Base_Class object is returned, otherwise |
|
852 | 852 | * you can indicate just the column you want returned |
853 | 853 | * |
854 | 854 | * @return array|EE_Base_Class |
@@ -911,7 +911,7 @@ discard block |
||
911 | 911 | /** |
912 | 912 | * This method simply returns the RAW unprocessed value for the given property in this class |
913 | 913 | * @param string $field_name A valid fieldname |
914 | - * @return mixed Whatever the raw value stored on the property is. |
|
914 | + * @return integer|null Whatever the raw value stored on the property is. |
|
915 | 915 | * @throws EE_Error if fieldSettings is misconfigured or the field doesn't exist. |
916 | 916 | */ |
917 | 917 | public function get_raw($field_name) { |
@@ -985,11 +985,11 @@ discard block |
||
985 | 985 | * |
986 | 986 | * @access protected |
987 | 987 | * @param string $field_name Field on the instantiated EE_Base_Class child object |
988 | - * @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) |
|
989 | - * @param null $tm_frmt Same as above except this is for time format |
|
988 | + * @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) |
|
989 | + * @param null|string $tm_frmt Same as above except this is for time format |
|
990 | 990 | * @param string $date_or_time if NULL then both are returned, otherwise "D" = only date and "T" = only time. |
991 | 991 | * @param boolean $echo Whether the dtt is echoing using pretty echoing or just returned using vanilla get |
992 | - * @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 |
|
992 | + * @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 |
|
993 | 993 | */ |
994 | 994 | protected function _get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE ) { |
995 | 995 | |
@@ -1162,7 +1162,7 @@ discard block |
||
1162 | 1162 | * sets the time on a datetime property |
1163 | 1163 | * |
1164 | 1164 | * @access protected |
1165 | - * @param string|Datetime $time a valid time string for php datetime functions (or DateTime object) |
|
1165 | + * @param string $time a valid time string for php datetime functions (or DateTime object) |
|
1166 | 1166 | * @param string $fieldname the name of the field the time is being set on (must match a EE_Datetime_Field) |
1167 | 1167 | */ |
1168 | 1168 | protected function _set_time_for( $time, $fieldname ) { |
@@ -1177,7 +1177,7 @@ discard block |
||
1177 | 1177 | * sets the date on a datetime property |
1178 | 1178 | * |
1179 | 1179 | * @access protected |
1180 | - * @param string|DateTime $date a valid date string for php datetime functions ( or DateTime object) |
|
1180 | + * @param string $date a valid date string for php datetime functions ( or DateTime object) |
|
1181 | 1181 | * @param string $fieldname the name of the field the date is being set on (must match a EE_Datetime_Field) |
1182 | 1182 | */ |
1183 | 1183 | protected function _set_date_for( $date, $fieldname ) { |
@@ -1506,7 +1506,7 @@ discard block |
||
1506 | 1506 | |
1507 | 1507 | /** |
1508 | 1508 | * for getting a model while instantiated. |
1509 | - * @return \EEM_Base | \EEM_CPT_Base |
|
1509 | + * @return boolean | \EEM_CPT_Base |
|
1510 | 1510 | */ |
1511 | 1511 | public function get_model() { |
1512 | 1512 | $modelName = self::_get_model_classname( get_class($this) ); |
@@ -1537,7 +1537,7 @@ discard block |
||
1537 | 1537 | * 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. |
1538 | 1538 | * @param array $props_n_values incoming array of properties and their values |
1539 | 1539 | * @param string $classname the classname of the child class |
1540 | - * @param null $timezone |
|
1540 | + * @param null|string $timezone |
|
1541 | 1541 | * @return mixed (EE_Base_Class|bool) |
1542 | 1542 | */ |
1543 | 1543 | protected static function _check_for_object( $props_n_values, $classname, $timezone = NULL ) { |
@@ -1573,7 +1573,7 @@ discard block |
||
1573 | 1573 | * @param $classname |
1574 | 1574 | * @param null $timezone |
1575 | 1575 | * @throws EE_Error |
1576 | - * @return EEM_Base |
|
1576 | + * @return boolean |
|
1577 | 1577 | */ |
1578 | 1578 | protected static function _get_model( $classname, $timezone = NULL ){ |
1579 | 1579 | //find model for this class |
@@ -1589,8 +1589,8 @@ discard block |
||
1589 | 1589 | /** |
1590 | 1590 | * Gets the model instance (eg instance of EEM_Attendee) given its classname (eg EE_Attendee) |
1591 | 1591 | * @param string $model_classname |
1592 | - * @param null $timezone |
|
1593 | - * @return EEM_Base |
|
1592 | + * @param string|null $timezone |
|
1593 | + * @return boolean |
|
1594 | 1594 | */ |
1595 | 1595 | protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){ |
1596 | 1596 | $model_classname = str_replace( 'EEM_', '', $model_classname ); |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
2 | 2 | /** |
3 | 3 | * CSV Import Export class |
4 | 4 | * |
@@ -41,31 +41,31 @@ discard block |
||
41 | 41 | global $wpdb; |
42 | 42 | |
43 | 43 | $this->_primary_keys = array( |
44 | - $wpdb->prefix . 'esp_answer' => array( 'ANS_ID' ), |
|
45 | - $wpdb->prefix . 'esp_attendee' => array( 'ATT_ID' ), |
|
46 | - $wpdb->prefix . 'esp_datetime' => array( 'DTT_ID' ), |
|
47 | - $wpdb->prefix . 'esp_event_question_group' => array( 'EQG_ID' ), |
|
48 | - $wpdb->prefix . 'esp_message_template' => array( 'MTP_ID' ), |
|
49 | - $wpdb->prefix . 'esp_payment' => array( 'PAY_ID' ), |
|
50 | - $wpdb->prefix . 'esp_price' => array( 'PRC_ID' ), |
|
51 | - $wpdb->prefix . 'esp_price_type' => array( 'PRT_ID' ), |
|
52 | - $wpdb->prefix . 'esp_question' => array( 'QST_ID' ), |
|
53 | - $wpdb->prefix . 'esp_question_group' => array( 'QSG_ID' ), |
|
54 | - $wpdb->prefix . 'esp_question_group_question' => array( 'QGQ_ID' ), |
|
55 | - $wpdb->prefix . 'esp_question_option' => array( 'QSO_ID' ), |
|
56 | - $wpdb->prefix . 'esp_registration' => array( 'REG_ID' ), |
|
57 | - $wpdb->prefix . 'esp_status' => array( 'STS_ID' ), |
|
58 | - $wpdb->prefix . 'esp_transaction' => array( 'TXN_ID' ), |
|
59 | - $wpdb->prefix . 'esp_transaction' => array( 'TXN_ID' ), |
|
60 | - $wpdb->prefix . 'events_detail' => array( 'id' ), |
|
61 | - $wpdb->prefix . 'events_category_detail' => array( 'id' ), |
|
62 | - $wpdb->prefix . 'events_category_rel' => array( 'id' ), |
|
63 | - $wpdb->prefix . 'events_venue' => array( 'id' ), |
|
64 | - $wpdb->prefix . 'events_venue_rel' => array( 'emeta_id' ), |
|
65 | - $wpdb->prefix . 'events_locale' => array( 'id' ), |
|
66 | - $wpdb->prefix . 'events_locale_rel' => array( 'id' ), |
|
67 | - $wpdb->prefix . 'events_personnel' => array( 'id' ), |
|
68 | - $wpdb->prefix . 'events_personnel_rel' => array( 'id' ), |
|
44 | + $wpdb->prefix.'esp_answer' => array('ANS_ID'), |
|
45 | + $wpdb->prefix.'esp_attendee' => array('ATT_ID'), |
|
46 | + $wpdb->prefix.'esp_datetime' => array('DTT_ID'), |
|
47 | + $wpdb->prefix.'esp_event_question_group' => array('EQG_ID'), |
|
48 | + $wpdb->prefix.'esp_message_template' => array('MTP_ID'), |
|
49 | + $wpdb->prefix.'esp_payment' => array('PAY_ID'), |
|
50 | + $wpdb->prefix.'esp_price' => array('PRC_ID'), |
|
51 | + $wpdb->prefix.'esp_price_type' => array('PRT_ID'), |
|
52 | + $wpdb->prefix.'esp_question' => array('QST_ID'), |
|
53 | + $wpdb->prefix.'esp_question_group' => array('QSG_ID'), |
|
54 | + $wpdb->prefix.'esp_question_group_question' => array('QGQ_ID'), |
|
55 | + $wpdb->prefix.'esp_question_option' => array('QSO_ID'), |
|
56 | + $wpdb->prefix.'esp_registration' => array('REG_ID'), |
|
57 | + $wpdb->prefix.'esp_status' => array('STS_ID'), |
|
58 | + $wpdb->prefix.'esp_transaction' => array('TXN_ID'), |
|
59 | + $wpdb->prefix.'esp_transaction' => array('TXN_ID'), |
|
60 | + $wpdb->prefix.'events_detail' => array('id'), |
|
61 | + $wpdb->prefix.'events_category_detail' => array('id'), |
|
62 | + $wpdb->prefix.'events_category_rel' => array('id'), |
|
63 | + $wpdb->prefix.'events_venue' => array('id'), |
|
64 | + $wpdb->prefix.'events_venue_rel' => array('emeta_id'), |
|
65 | + $wpdb->prefix.'events_locale' => array('id'), |
|
66 | + $wpdb->prefix.'events_locale_rel' => array('id'), |
|
67 | + $wpdb->prefix.'events_personnel' => array('id'), |
|
68 | + $wpdb->prefix.'events_personnel_rel' => array('id'), |
|
69 | 69 | ); |
70 | 70 | |
71 | 71 | } |
@@ -77,9 +77,9 @@ discard block |
||
77 | 77 | * @ access public |
78 | 78 | * @return EE_CSV |
79 | 79 | */ |
80 | - public static function instance ( ) { |
|
80 | + public static function instance( ) { |
|
81 | 81 | // check if class object is instantiated |
82 | - if ( self::$_instance === NULL or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_CSV )) { |
|
82 | + if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_CSV)) { |
|
83 | 83 | self::$_instance = new self(); |
84 | 84 | } |
85 | 85 | return self::$_instance; |
@@ -91,22 +91,22 @@ discard block |
||
91 | 91 | * @return string |
92 | 92 | * @throws EE_Error |
93 | 93 | */ |
94 | - private function read_unicode_file($file_path){ |
|
94 | + private function read_unicode_file($file_path) { |
|
95 | 95 | $fc = ""; |
96 | - $fh = fopen($file_path,"rb"); |
|
97 | - if( ! $fh ){ |
|
98 | - throw new EE_Error( sprintf( __("Cannot open file for read: %s<br>\n", 'event_espresso'), $file_path ) ); |
|
96 | + $fh = fopen($file_path, "rb"); |
|
97 | + if ( ! $fh) { |
|
98 | + throw new EE_Error(sprintf(__("Cannot open file for read: %s<br>\n", 'event_espresso'), $file_path)); |
|
99 | 99 | } |
100 | 100 | $flen = filesize($file_path); |
101 | 101 | $bc = fread($fh, $flen); |
102 | - for ($i=0; $i<$flen; $i++){ |
|
103 | - $c = substr($bc,$i,1); |
|
104 | - if ((ord($c) != 0) && (ord($c) != 13)){ |
|
105 | - $fc = $fc . $c; |
|
102 | + for ($i = 0; $i < $flen; $i++) { |
|
103 | + $c = substr($bc, $i, 1); |
|
104 | + if ((ord($c) != 0) && (ord($c) != 13)) { |
|
105 | + $fc = $fc.$c; |
|
106 | 106 | } |
107 | 107 | } |
108 | - if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254)) |
|
109 | - $fc = substr($fc,2); |
|
108 | + if ((ord(substr($fc, 0, 1)) == 255) && (ord(substr($fc, 1, 1)) == 254)) |
|
109 | + $fc = substr($fc, 2); |
|
110 | 110 | return ($fc); |
111 | 111 | } |
112 | 112 | |
@@ -118,15 +118,15 @@ discard block |
||
118 | 118 | * @param string $path_to_file |
119 | 119 | * @return array of arrays. Top-level array has rows, second-level array has each item |
120 | 120 | */ |
121 | - public function import_csv_to_multi_dimensional_array($path_to_file){ |
|
121 | + public function import_csv_to_multi_dimensional_array($path_to_file) { |
|
122 | 122 | // needed to deal with Mac line endings |
123 | - ini_set('auto_detect_line_endings',TRUE); |
|
123 | + ini_set('auto_detect_line_endings', TRUE); |
|
124 | 124 | |
125 | 125 | // because fgetcsv does not correctly deal with backslashed quotes such as \" |
126 | 126 | // we'll read the file into a string |
127 | - $file_contents = $this->read_unicode_file( $path_to_file ); |
|
127 | + $file_contents = $this->read_unicode_file($path_to_file); |
|
128 | 128 | // replace backslashed quotes with CSV enclosures |
129 | - $file_contents = str_replace ( '\\"', '"""', $file_contents ); |
|
129 | + $file_contents = str_replace('\\"', '"""', $file_contents); |
|
130 | 130 | // HEY YOU! PUT THAT FILE BACK!!! |
131 | 131 | file_put_contents($path_to_file, $file_contents); |
132 | 132 | |
@@ -136,25 +136,25 @@ discard block |
||
136 | 136 | $csvarray = array(); |
137 | 137 | |
138 | 138 | // in PHP 5.3 fgetcsv accepts a 5th parameter, but the pre 5.3 versions of fgetcsv choke if passed more than 4 - is that crazy or what? |
139 | - if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) { |
|
139 | + if (version_compare(PHP_VERSION, '5.3.0') < 0) { |
|
140 | 140 | |
141 | 141 | // PHP 5.2- version |
142 | 142 | |
143 | 143 | // loop through each row of the file |
144 | - while(($data = fgetcsv($file_handle, 0, ',', '"' )) !== FALSE){ |
|
145 | - $csvarray[]= $data; |
|
144 | + while (($data = fgetcsv($file_handle, 0, ',', '"')) !== FALSE) { |
|
145 | + $csvarray[] = $data; |
|
146 | 146 | } |
147 | - }else{ |
|
147 | + } else { |
|
148 | 148 | // loop through each row of the file |
149 | - while (( $data = fgetcsv( $file_handle, 0, ',', '"', '\\' )) !== FALSE ) { |
|
150 | - $csvarray[]=$data; |
|
149 | + while (($data = fgetcsv($file_handle, 0, ',', '"', '\\')) !== FALSE) { |
|
150 | + $csvarray[] = $data; |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | # Close the File. |
154 | 154 | fclose($file_handle); |
155 | 155 | return $csvarray; |
156 | - }else{ |
|
157 | - EE_Error::add_error( sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"),$path_to_file), __FILE__, __FUNCTION__, __LINE__ ); |
|
156 | + } else { |
|
157 | + EE_Error::add_error(sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"), $path_to_file), __FILE__, __FUNCTION__, __LINE__); |
|
158 | 158 | return false; |
159 | 159 | } |
160 | 160 | } |
@@ -184,9 +184,9 @@ discard block |
||
184 | 184 | * ... |
185 | 185 | * ) |
186 | 186 | */ |
187 | - public function import_csv_to_model_data_array( $path_to_file, $model_name = FALSE, $first_row_is_headers = TRUE ) { |
|
187 | + public function import_csv_to_model_data_array($path_to_file, $model_name = FALSE, $first_row_is_headers = TRUE) { |
|
188 | 188 | $multi_dimensional_array = $this->import_csv_to_multi_dimensional_array($path_to_file); |
189 | - if( ! $multi_dimensional_array ){ |
|
189 | + if ( ! $multi_dimensional_array) { |
|
190 | 190 | return false; |
191 | 191 | } |
192 | 192 | // gotta start somewhere |
@@ -195,9 +195,9 @@ discard block |
||
195 | 195 | $ee_formatted_data = array(); |
196 | 196 | // array to store headers (column names) |
197 | 197 | $headers = array(); |
198 | - foreach($multi_dimensional_array as $data){ |
|
198 | + foreach ($multi_dimensional_array as $data) { |
|
199 | 199 | // if first cell is MODEL, then second cell is the MODEL name |
200 | - if ( $data[0] == 'MODEL' ) { |
|
200 | + if ($data[0] == 'MODEL') { |
|
201 | 201 | $model_name = $data[1]; |
202 | 202 | //don't bother looking for model data in this row. The rest of this |
203 | 203 | //row should be blank |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | $headers = array(); |
208 | 208 | continue; |
209 | 209 | } |
210 | - if( strpos( $data[0], EE_CSV::metadata_header ) !==FALSE ){ |
|
210 | + if (strpos($data[0], EE_CSV::metadata_header) !== FALSE) { |
|
211 | 211 | $model_name = EE_CSV::metadata_header; |
212 | 212 | //store like model data, we just won't try importing it etc. |
213 | 213 | $row = 1; |
@@ -220,31 +220,31 @@ discard block |
||
220 | 220 | |
221 | 221 | $model_entry = array(); |
222 | 222 | // loop through each column |
223 | - for ( $i=0; $i < $columns; $i++ ) { |
|
223 | + for ($i = 0; $i < $columns; $i++) { |
|
224 | 224 | |
225 | 225 | //replace csv_enclosures with backslashed quotes |
226 | - $data[$i] = str_replace ( '"""', '\\"', $data[$i] ); |
|
226 | + $data[$i] = str_replace('"""', '\\"', $data[$i]); |
|
227 | 227 | // do we need to grab the column names? |
228 | - if ( $row === 1){ |
|
229 | - if( $first_row_is_headers ) { |
|
228 | + if ($row === 1) { |
|
229 | + if ($first_row_is_headers) { |
|
230 | 230 | // store the column names to use for keys |
231 | 231 | $column_name = $data[$i]; |
232 | 232 | //check it's not blank... sometimes CSV editign programs adda bunch of empty columns onto the end... |
233 | - if(!$column_name){continue;} |
|
233 | + if ( ! $column_name) {continue; } |
|
234 | 234 | $matches = array(); |
235 | - if($model_name == EE_CSV::metadata_header){ |
|
235 | + if ($model_name == EE_CSV::metadata_header) { |
|
236 | 236 | $headers[$i] = $column_name; |
237 | - }else{ |
|
237 | + } else { |
|
238 | 238 | //now get the db table name from it (the part between square brackets) |
239 | - $success = preg_match('~(.*)\[(.*)\]~', $column_name,$matches); |
|
240 | - if (!$success){ |
|
241 | - EE_Error::add_error( sprintf(__("The column titled %s is invalid for importing. It must be be in the format of 'Nice Name[model_field_name]' in row %s", "event_espresso"),$column_name,implode(",",$data)), __FILE__, __FUNCTION__, __LINE__ ); |
|
239 | + $success = preg_match('~(.*)\[(.*)\]~', $column_name, $matches); |
|
240 | + if ( ! $success) { |
|
241 | + EE_Error::add_error(sprintf(__("The column titled %s is invalid for importing. It must be be in the format of 'Nice Name[model_field_name]' in row %s", "event_espresso"), $column_name, implode(",", $data)), __FILE__, __FUNCTION__, __LINE__); |
|
242 | 242 | return false; |
243 | 243 | } |
244 | 244 | $headers[$i] = $matches[2]; |
245 | 245 | } |
246 | 246 | |
247 | - }else{ |
|
247 | + } else { |
|
248 | 248 | // no column names means our final array will just use counters for keys |
249 | 249 | $model_entry[$headers[$i]] = $data[$i]; |
250 | 250 | $headers[$i] = $i; |
@@ -252,14 +252,14 @@ discard block |
||
252 | 252 | // and we need to store csv data |
253 | 253 | } else { |
254 | 254 | // this column isn' ta header, store it if there is a header for it |
255 | - if(isset($headers[$i])){ |
|
255 | + if (isset($headers[$i])) { |
|
256 | 256 | $model_entry[$headers[$i]] = $data[$i]; |
257 | 257 | } |
258 | 258 | } |
259 | 259 | |
260 | 260 | } |
261 | 261 | //save the row's data IF it's a non-header-row |
262 | - if( ! $first_row_is_headers || ($first_row_is_headers && $row > 1)){ |
|
262 | + if ( ! $first_row_is_headers || ($first_row_is_headers && $row > 1)) { |
|
263 | 263 | $ee_formatted_data[$model_name][] = $model_entry; |
264 | 264 | } |
265 | 265 | // advance to next row |
@@ -278,9 +278,9 @@ discard block |
||
278 | 278 | } |
279 | 279 | |
280 | 280 | |
281 | - public function save_csv_to_db( $csv_data_array, $model_name = FALSE ) { |
|
282 | - EE_Error::doing_it_wrong('save_csv_to_db', __( 'Function moved to EE_Import and renamed to save_csv_data_array_to_db', 'event_espresso' ), '4.6.7' ); |
|
283 | - return EE_Import::instance()->save_csv_data_array_to_db( $csv_data_array, $model_name ); |
|
281 | + public function save_csv_to_db($csv_data_array, $model_name = FALSE) { |
|
282 | + EE_Error::doing_it_wrong('save_csv_to_db', __('Function moved to EE_Import and renamed to save_csv_data_array_to_db', 'event_espresso'), '4.6.7'); |
|
283 | + return EE_Import::instance()->save_csv_data_array_to_db($csv_data_array, $model_name); |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | /** |
@@ -290,11 +290,11 @@ discard block |
||
290 | 290 | * @param string $new_filename the name of the file that the user will download |
291 | 291 | * @return resource, like the results of fopen(), which can be used for fwrite, fputcsv2, etc. |
292 | 292 | */ |
293 | - public function begin_sending_csv($filename){ |
|
293 | + public function begin_sending_csv($filename) { |
|
294 | 294 | // grab file extension |
295 | 295 | $ext = substr(strrchr($filename, '.'), 1); |
296 | - if ( $ext == '.csv' or $ext == '.xls' ) { |
|
297 | - str_replace( $ext, '', $filename ); |
|
296 | + if ($ext == '.csv' or $ext == '.xls') { |
|
297 | + str_replace($ext, '', $filename); |
|
298 | 298 | } |
299 | 299 | $filename .= '.csv'; |
300 | 300 | |
@@ -315,8 +315,8 @@ discard block |
||
315 | 315 | // header("Content-Type: application/download"); |
316 | 316 | header('Content-disposition: attachment; filename='.$filename); |
317 | 317 | header("Content-Type: text/csv; charset=utf-8"); |
318 | - do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' ); |
|
319 | - echo apply_filters('FHEE__EE_CSV__begin_sending_csv__start_writing', "\xEF\xBB\xBF" ); // makes excel open it as UTF-8. UTF-8 BOM, see http://stackoverflow.com/a/4440143/2773835 |
|
318 | + do_action('AHEE__EE_CSV__begin_sending_csv__headers'); |
|
319 | + echo apply_filters('FHEE__EE_CSV__begin_sending_csv__start_writing', "\xEF\xBB\xBF"); // makes excel open it as UTF-8. UTF-8 BOM, see http://stackoverflow.com/a/4440143/2773835 |
|
320 | 320 | $fh = fopen('php://output', 'w'); |
321 | 321 | return $fh; |
322 | 322 | } |
@@ -326,12 +326,12 @@ discard block |
||
326 | 326 | * mentioning the version and timezone |
327 | 327 | * @param resource $filehandle |
328 | 328 | */ |
329 | - public function write_metadata_to_csv($filehandle){ |
|
329 | + public function write_metadata_to_csv($filehandle) { |
|
330 | 330 | EE_Registry::instance()->load_helper('DTT_Helper'); |
331 | - $data_row = array(EE_CSV::metadata_header);//do NOT translate because this exact string is used when importing |
|
331 | + $data_row = array(EE_CSV::metadata_header); //do NOT translate because this exact string is used when importing |
|
332 | 332 | $this->fputcsv2($filehandle, $data_row); |
333 | 333 | EE_Registry::instance()->load_helper('DTT_Helper'); |
334 | - $meta_data = array( 0=> array( |
|
334 | + $meta_data = array(0=> array( |
|
335 | 335 | 'version'=>espresso_version(), |
336 | 336 | 'timezone'=> EEH_DTT_Helper::get_timezone(), |
337 | 337 | 'time_of_export'=>current_time('mysql'), |
@@ -349,30 +349,30 @@ discard block |
||
349 | 349 | * then the first row we'd write to the CSV would be "EVT_ID,EVT_name,..." |
350 | 350 | * @return boolean if we successfully wrote to the CSV or not. If there's no $data, we consider that a success (because we wrote everything there was...nothing) |
351 | 351 | */ |
352 | - public function write_data_array_to_csv($filehandle, $data){ |
|
352 | + public function write_data_array_to_csv($filehandle, $data) { |
|
353 | 353 | EE_Registry::instance()->load_helper('Array'); |
354 | 354 | |
355 | 355 | |
356 | 356 | //determine if $data is actually a 2d array |
357 | - if ( $data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))){ |
|
357 | + if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) { |
|
358 | 358 | //make sure top level is numerically indexed, |
359 | 359 | |
360 | - if( EEH_Array::is_associative_array($data)){ |
|
361 | - throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s","event_espresso"),implode(",",array_keys($data)))); |
|
360 | + if (EEH_Array::is_associative_array($data)) { |
|
361 | + throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s", "event_espresso"), implode(",", array_keys($data)))); |
|
362 | 362 | } |
363 | 363 | $item_in_top_level_array = EEH_Array::get_one_item_from_array($data); |
364 | 364 | //now, is the last item in the top-level array of $data an associative or numeric array? |
365 | - if(EEH_Array::is_associative_array($item_in_top_level_array)){ |
|
365 | + if (EEH_Array::is_associative_array($item_in_top_level_array)) { |
|
366 | 366 | //its associative, so we want to output its keys as column headers |
367 | 367 | $keys = array_keys($item_in_top_level_array); |
368 | 368 | echo $this->fputcsv2($filehandle, $keys); |
369 | 369 | } |
370 | 370 | //start writing data |
371 | - foreach($data as $data_row){ |
|
371 | + foreach ($data as $data_row) { |
|
372 | 372 | echo $this->fputcsv2($filehandle, $data_row); |
373 | 373 | } |
374 | 374 | return true; |
375 | - }else{ |
|
375 | + } else { |
|
376 | 376 | //no data TO write... so we can assume that's a success |
377 | 377 | return true; |
378 | 378 | } |
@@ -417,7 +417,7 @@ discard block |
||
417 | 417 | * Calls exit to prevent polluting the CSV file with other junk |
418 | 418 | * @param resource $fh filehandle where we're writing the CSV to |
419 | 419 | */ |
420 | - public function end_sending_csv($fh){ |
|
420 | + public function end_sending_csv($fh) { |
|
421 | 421 | fclose($fh); |
422 | 422 | exit(0); |
423 | 423 | } |
@@ -430,23 +430,23 @@ discard block |
||
430 | 430 | * has all the attributes o fthat model object (eg, the event's id, name, etc) |
431 | 431 | * @return boolean success |
432 | 432 | */ |
433 | - public function write_model_data_to_csv($filehandle,$model_data_array){ |
|
433 | + public function write_model_data_to_csv($filehandle, $model_data_array) { |
|
434 | 434 | $this->write_metadata_to_csv($filehandle); |
435 | - foreach($model_data_array as $model_name => $model_instance_arrays){ |
|
435 | + foreach ($model_data_array as $model_name => $model_instance_arrays) { |
|
436 | 436 | //first: output a special row stating the model |
437 | - echo $this->fputcsv2($filehandle,array('MODEL',$model_name)); |
|
437 | + echo $this->fputcsv2($filehandle, array('MODEL', $model_name)); |
|
438 | 438 | //if we have items to put in the CSV, do it normally |
439 | 439 | |
440 | - if( ! empty($model_instance_arrays) ){ |
|
440 | + if ( ! empty($model_instance_arrays)) { |
|
441 | 441 | $this->write_data_array_to_csv($filehandle, $model_instance_arrays); |
442 | - }else{ |
|
442 | + } else { |
|
443 | 443 | // echo "no data to write... so just write the headers"; |
444 | 444 | //so there's actually NO model objects for that model. |
445 | 445 | //probably still want to show the columns |
446 | 446 | $model = EE_Registry::instance()->load_model($model_name); |
447 | 447 | $column_names = array(); |
448 | - foreach($model->field_settings() as $field){ |
|
449 | - $column_names[$field->get_nicename()."[".$field->get_name()."]"] = null ; |
|
448 | + foreach ($model->field_settings() as $field) { |
|
449 | + $column_names[$field->get_nicename()."[".$field->get_name()."]"] = null; |
|
450 | 450 | } |
451 | 451 | $this->write_data_array_to_csv($filehandle, array($column_names)); |
452 | 452 | } |
@@ -460,7 +460,7 @@ discard block |
||
460 | 460 | * @param array $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv() |
461 | 461 | * @return bool | void writes CSV file to output and dies |
462 | 462 | */ |
463 | - public function export_multiple_model_data_to_csv($filename,$model_data_array){ |
|
463 | + public function export_multiple_model_data_to_csv($filename, $model_data_array) { |
|
464 | 464 | $filehandle = $this->begin_sending_csv($filename); |
465 | 465 | $this->write_model_data_to_csv($filehandle, $model_data_array); |
466 | 466 | $this->end_sending_csv($filehandle); |
@@ -472,15 +472,15 @@ discard block |
||
472 | 472 | * @param string $filename - name for newly created csv file |
473 | 473 | * @return TRUE on success, FALSE on fail |
474 | 474 | */ |
475 | - public function export_array_to_csv( $data = FALSE, $filename = FALSE ) { |
|
475 | + public function export_array_to_csv($data = FALSE, $filename = FALSE) { |
|
476 | 476 | |
477 | 477 | // no data file?? get outta here |
478 | - if ( ! $data or ! is_array( $data ) or empty( $data ) ) { |
|
478 | + if ( ! $data or ! is_array($data) or empty($data)) { |
|
479 | 479 | return FALSE; |
480 | 480 | } |
481 | 481 | |
482 | 482 | // no filename?? get outta here |
483 | - if ( ! $filename ) { |
|
483 | + if ( ! $filename) { |
|
484 | 484 | return FALSE; |
485 | 485 | } |
486 | 486 | |
@@ -506,11 +506,11 @@ discard block |
||
506 | 506 | * @param int $percent_of_max - desired percentage of the max upload_mb |
507 | 507 | * @return int KB |
508 | 508 | */ |
509 | - public function get_max_upload_size ( $percent_of_max = FALSE ) { |
|
509 | + public function get_max_upload_size($percent_of_max = FALSE) { |
|
510 | 510 | |
511 | - $max_upload = (int)(ini_get('upload_max_filesize')); |
|
512 | - $max_post = (int)(ini_get('post_max_size')); |
|
513 | - $memory_limit = (int)(ini_get('memory_limit')); |
|
511 | + $max_upload = (int) (ini_get('upload_max_filesize')); |
|
512 | + $max_post = (int) (ini_get('post_max_size')); |
|
513 | + $memory_limit = (int) (ini_get('memory_limit')); |
|
514 | 514 | |
515 | 515 | // determine the smallest of the three values from above |
516 | 516 | $upload_mb = min($max_upload, $max_post, $memory_limit); |
@@ -519,9 +519,9 @@ discard block |
||
519 | 519 | $upload_mb = $upload_mb * 1024; |
520 | 520 | |
521 | 521 | // don't want the full monty? then reduce the max uplaod size |
522 | - if ( $percent_of_max ) { |
|
522 | + if ($percent_of_max) { |
|
523 | 523 | // is percent_of_max like this -> 50 or like this -> 0.50 ? |
524 | - if ( $percent_of_max > 1 ) { |
|
524 | + if ($percent_of_max > 1) { |
|
525 | 525 | // chnages 50 to 0.50 |
526 | 526 | $percent_of_max = $percent_of_max / 100; |
527 | 527 | } |
@@ -543,17 +543,17 @@ discard block |
||
543 | 543 | * @param string $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value |
544 | 544 | * @return void |
545 | 545 | */ |
546 | - private function fputcsv2 ($fh, array $row, $delimiter = ',', $enclosure = '"', $mysql_null = FALSE) { |
|
546 | + private function fputcsv2($fh, array $row, $delimiter = ',', $enclosure = '"', $mysql_null = FALSE) { |
|
547 | 547 | //Allow user to filter the csv delimiter and enclosure for other countries csv standards |
548 | - $delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter ); |
|
549 | - $enclosure = apply_filters( 'FHEE__EE_CSV__fputcsv2__enclosure', $enclosure ); |
|
548 | + $delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter); |
|
549 | + $enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure); |
|
550 | 550 | |
551 | 551 | $delimiter_esc = preg_quote($delimiter, '/'); |
552 | 552 | $enclosure_esc = preg_quote($enclosure, '/'); |
553 | 553 | |
554 | 554 | $output = array(); |
555 | 555 | foreach ($row as $field_value) { |
556 | - if(is_object($field_value) || is_array($field_value)){ |
|
556 | + if (is_object($field_value) || is_array($field_value)) { |
|
557 | 557 | $field_value = serialize($field_value); |
558 | 558 | } |
559 | 559 | if ($field_value === null && $mysql_null) { |
@@ -562,10 +562,10 @@ discard block |
||
562 | 562 | } |
563 | 563 | |
564 | 564 | $output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value) ? |
565 | - ( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure ) : $field_value; |
|
565 | + ($enclosure.str_replace($enclosure, $enclosure.$enclosure, $field_value).$enclosure) : $field_value; |
|
566 | 566 | } |
567 | 567 | |
568 | - fwrite($fh, join($delimiter, $output) . PHP_EOL); |
|
568 | + fwrite($fh, join($delimiter, $output).PHP_EOL); |
|
569 | 569 | } |
570 | 570 | |
571 | 571 | |
@@ -603,8 +603,8 @@ discard block |
||
603 | 603 | * @param string $current_format |
604 | 604 | * @return string |
605 | 605 | */ |
606 | - public function get_date_format_for_csv( $current_format = null ) { |
|
607 | - return apply_filters( 'FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format ); |
|
606 | + public function get_date_format_for_csv($current_format = null) { |
|
607 | + return apply_filters('FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format); |
|
608 | 608 | } |
609 | 609 | |
610 | 610 | /** |
@@ -612,8 +612,8 @@ discard block |
||
612 | 612 | * @param string $current_format |
613 | 613 | * @return string |
614 | 614 | */ |
615 | - public function get_time_format_for_csv( $current_format = null ) { |
|
616 | - return apply_filters( 'FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format ); |
|
615 | + public function get_time_format_for_csv($current_format = null) { |
|
616 | + return apply_filters('FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format); |
|
617 | 617 | } |
618 | 618 | |
619 | 619 |
@@ -315,7 +315,7 @@ |
||
315 | 315 | // header("Content-Type: application/download"); |
316 | 316 | header('Content-disposition: attachment; filename='.$filename); |
317 | 317 | header("Content-Type: text/csv; charset=utf-8"); |
318 | - do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' ); |
|
318 | + do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' ); |
|
319 | 319 | echo apply_filters('FHEE__EE_CSV__begin_sending_csv__start_writing', "\xEF\xBB\xBF" ); // makes excel open it as UTF-8. UTF-8 BOM, see http://stackoverflow.com/a/4440143/2773835 |
320 | 320 | $fh = fopen('php://output', 'w'); |
321 | 321 | return $fh; |
@@ -500,11 +500,11 @@ |
||
500 | 500 | }else{ |
501 | 501 | $question_label = sprintf( __( 'Question $s', 'event_espresso' ), $answer_row[ 'Answer.QST_ID' ] ); |
502 | 502 | } |
503 | - if( isset( $answer_row[ 'Question.QST_type'] ) && $answer_row[ 'Question.QST_type' ] == EEM_Question::QST_type_state ) { |
|
504 | - $reg_csv_array[ $question_label ] = EEM_State::instance()->get_state_name_by_ID( $answer_row[ 'Answer.ANS_value' ] ); |
|
505 | - } else { |
|
506 | - $reg_csv_array[ $question_label ] = $this->_prepare_value_from_db_for_display( EEM_Answer::instance(), 'ANS_value', $answer_row[ 'Answer.ANS_value' ] ); |
|
507 | - } |
|
503 | + if( isset( $answer_row[ 'Question.QST_type'] ) && $answer_row[ 'Question.QST_type' ] == EEM_Question::QST_type_state ) { |
|
504 | + $reg_csv_array[ $question_label ] = EEM_State::instance()->get_state_name_by_ID( $answer_row[ 'Answer.ANS_value' ] ); |
|
505 | + } else { |
|
506 | + $reg_csv_array[ $question_label ] = $this->_prepare_value_from_db_for_display( EEM_Answer::instance(), 'ANS_value', $answer_row[ 'Answer.ANS_value' ] ); |
|
507 | + } |
|
508 | 508 | } |
509 | 509 | $registrations_csv_ready_array[] = apply_filters( 'FHEE__EE_Export__report_registrations__reg_csv_array', $reg_csv_array, $reg_row ); |
510 | 510 | } |
@@ -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__, __FUNCTION__, '' ); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
2 | +do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
3 | 3 | /** |
4 | 4 | * EE_Export class |
5 | 5 | * |
@@ -39,11 +39,11 @@ discard block |
||
39 | 39 | * @access private |
40 | 40 | * @param array $request_data |
41 | 41 | */ |
42 | - private function __construct( $request_data = array() ) { |
|
42 | + private function __construct($request_data = array()) { |
|
43 | 43 | $this->_req_data = $request_data; |
44 | - $this->today = date("Y-m-d",time()); |
|
45 | - require_once( EE_CLASSES . 'EE_CSV.class.php' ); |
|
46 | - $this->EE_CSV= EE_CSV::instance(); |
|
44 | + $this->today = date("Y-m-d", time()); |
|
45 | + require_once(EE_CLASSES.'EE_CSV.class.php'); |
|
46 | + $this->EE_CSV = EE_CSV::instance(); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
@@ -55,10 +55,10 @@ discard block |
||
55 | 55 | * @param array $request_data |
56 | 56 | * @return \EE_Export |
57 | 57 | */ |
58 | - public static function instance( $request_data = array() ) { |
|
58 | + public static function instance($request_data = array()) { |
|
59 | 59 | // check if class object is instantiated |
60 | - if ( self::$_instance === NULL or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Export )) { |
|
61 | - self::$_instance = new self( $request_data ); |
|
60 | + if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Export)) { |
|
61 | + self::$_instance = new self($request_data); |
|
62 | 62 | } |
63 | 63 | return self::$_instance; |
64 | 64 | } |
@@ -72,15 +72,15 @@ discard block |
||
72 | 72 | public function export() { |
73 | 73 | |
74 | 74 | // in case of bulk exports, the "actual" action will be in action2, but first check regular action for "export" keyword |
75 | - if ( isset( $this->_req_data['action'] ) && strpos( $this->_req_data['action'], 'export' ) === FALSE ) { |
|
75 | + if (isset($this->_req_data['action']) && strpos($this->_req_data['action'], 'export') === FALSE) { |
|
76 | 76 | // check if action2 has export action |
77 | - if ( isset( $this->_req_data['action2'] ) && strpos( $this->_req_data['action2'], 'export' ) !== FALSE ) { |
|
77 | + if (isset($this->_req_data['action2']) && strpos($this->_req_data['action2'], 'export') !== FALSE) { |
|
78 | 78 | // whoop! there it is! |
79 | 79 | $this->_req_data['action'] = $this->_req_data['action2']; |
80 | 80 | } |
81 | 81 | } |
82 | 82 | |
83 | - $this->_req_data['export'] = isset( $this->_req_data['export'] ) ? $this->_req_data['export'] : ''; |
|
83 | + $this->_req_data['export'] = isset($this->_req_data['export']) ? $this->_req_data['export'] : ''; |
|
84 | 84 | |
85 | 85 | switch ($this->_req_data['export']) { |
86 | 86 | case 'report': |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | break; |
95 | 95 | |
96 | 96 | case 'registrations_report_for_event': |
97 | - $this->report_registrations_for_event( $this->_req_data['EVT_ID'] ); |
|
97 | + $this->report_registrations_for_event($this->_req_data['EVT_ID']); |
|
98 | 98 | break; |
99 | 99 | |
100 | 100 | case 'attendees': |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | break; |
107 | 107 | |
108 | 108 | default: |
109 | - EE_Error::add_error(__('An error occurred! The requested export report could not be found.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ ) ; |
|
109 | + EE_Error::add_error(__('An error occurred! The requested export report could not be found.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
110 | 110 | return FALSE; |
111 | 111 | break; |
112 | 112 | |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * Downloads a CSV file with all the columns, but no data. This should be used for importing |
125 | 125 | * @return null kills execution |
126 | 126 | */ |
127 | - function export_sample(){ |
|
127 | + function export_sample() { |
|
128 | 128 | $event = EEM_Event::instance()->get_one(); |
129 | 129 | $this->_req_data['EVT_ID'] = $event->ID(); |
130 | 130 | $this->export_all_event_data(); |
@@ -150,23 +150,23 @@ discard block |
||
150 | 150 | $state_country_query_params = array(); |
151 | 151 | $question_group_query_params = array(); |
152 | 152 | $question_query_params = array(); |
153 | - if ( isset( $this->_req_data['EVT_ID'] )) { |
|
153 | + if (isset($this->_req_data['EVT_ID'])) { |
|
154 | 154 | // do we have an array of IDs ? |
155 | 155 | |
156 | - if ( is_array( $this->_req_data['EVT_ID'] )) { |
|
157 | - $EVT_IDs = array_map( 'sanitize_text_field', $this->_req_data['EVT_ID'] ); |
|
158 | - $value_to_equal = array('IN',$EVT_IDs); |
|
156 | + if (is_array($this->_req_data['EVT_ID'])) { |
|
157 | + $EVT_IDs = array_map('sanitize_text_field', $this->_req_data['EVT_ID']); |
|
158 | + $value_to_equal = array('IN', $EVT_IDs); |
|
159 | 159 | $filename = 'events'; |
160 | 160 | } else { |
161 | 161 | // generate regular where = clause |
162 | - $EVT_ID = absint( $this->_req_data['EVT_ID'] ); |
|
162 | + $EVT_ID = absint($this->_req_data['EVT_ID']); |
|
163 | 163 | $value_to_equal = $EVT_ID; |
164 | 164 | $event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($EVT_ID); |
165 | 165 | |
166 | - $filename = 'event-' . ( $event instanceof EE_Event ? $event->slug() : __( 'unknown', 'event_espresso' ) ); |
|
166 | + $filename = 'event-'.($event instanceof EE_Event ? $event->slug() : __('unknown', 'event_espresso')); |
|
167 | 167 | |
168 | 168 | } |
169 | - $event_query_params[0]['EVT_ID'] =$value_to_equal; |
|
169 | + $event_query_params[0]['EVT_ID'] = $value_to_equal; |
|
170 | 170 | $related_models_query_params[0]['Event.EVT_ID'] = $value_to_equal; |
171 | 171 | $related_through_reg_query_params[0]['Registration.EVT_ID'] = $value_to_equal; |
172 | 172 | $datetime_ticket_query_params[0]['Datetime.EVT_ID'] = $value_to_equal; |
@@ -210,37 +210,37 @@ discard block |
||
210 | 210 | |
211 | 211 | ); |
212 | 212 | |
213 | - $model_data = $this->_get_export_data_for_models( $models_to_export ); |
|
213 | + $model_data = $this->_get_export_data_for_models($models_to_export); |
|
214 | 214 | |
215 | - $filename = $this->generate_filename ( $filename ); |
|
215 | + $filename = $this->generate_filename($filename); |
|
216 | 216 | |
217 | - if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $model_data )) { |
|
218 | - EE_Error::add_error(__("'An error occurred and the Event details could not be exported from the database.'", "event_espresso"), __FILE__, __FUNCTION__, __LINE__ ); |
|
217 | + if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $model_data)) { |
|
218 | + EE_Error::add_error(__("'An error occurred and the Event details could not be exported from the database.'", "event_espresso"), __FILE__, __FUNCTION__, __LINE__); |
|
219 | 219 | } |
220 | 220 | } |
221 | 221 | |
222 | - function report_attendees(){ |
|
223 | - $attendee_rows = EEM_Attendee::instance()->get_all_wpdb_results( array( 'force_join' => array( 'State', 'Country' ) ) ); |
|
222 | + function report_attendees() { |
|
223 | + $attendee_rows = EEM_Attendee::instance()->get_all_wpdb_results(array('force_join' => array('State', 'Country'))); |
|
224 | 224 | $csv_data = array(); |
225 | - foreach( $attendee_rows as $attendee_row ){ |
|
225 | + foreach ($attendee_rows as $attendee_row) { |
|
226 | 226 | $csv_row = array(); |
227 | - foreach( EEM_Attendee::instance()->field_settings() as $field_name => $field_obj ){ |
|
228 | - if( $field_name == 'STA_ID' ){ |
|
229 | - $state_name_field = EEM_State::instance()->field_settings_for( 'STA_name' ); |
|
230 | - $csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ]; |
|
231 | - }elseif( $field_name == 'CNT_ISO' ){ |
|
232 | - $country_name_field = EEM_Country::instance()->field_settings_for( 'CNT_name' ); |
|
233 | - $csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ]; |
|
234 | - }else{ |
|
235 | - $csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ]; |
|
227 | + foreach (EEM_Attendee::instance()->field_settings() as $field_name => $field_obj) { |
|
228 | + if ($field_name == 'STA_ID') { |
|
229 | + $state_name_field = EEM_State::instance()->field_settings_for('STA_name'); |
|
230 | + $csv_row[__('State', 'event_espresso')] = $attendee_row[$state_name_field->get_qualified_column()]; |
|
231 | + }elseif ($field_name == 'CNT_ISO') { |
|
232 | + $country_name_field = EEM_Country::instance()->field_settings_for('CNT_name'); |
|
233 | + $csv_row[__('Country', 'event_espresso')] = $attendee_row[$country_name_field->get_qualified_column()]; |
|
234 | + } else { |
|
235 | + $csv_row[$field_obj->get_nicename()] = $attendee_row[$field_obj->get_qualified_column()]; |
|
236 | 236 | } |
237 | 237 | } |
238 | 238 | $csv_data[] = $csv_row; |
239 | 239 | } |
240 | 240 | |
241 | - $filename = $this->generate_filename ( 'contact-list-report' ); |
|
241 | + $filename = $this->generate_filename('contact-list-report'); |
|
242 | 242 | |
243 | - $handle = $this->EE_CSV->begin_sending_csv( $filename); |
|
243 | + $handle = $this->EE_CSV->begin_sending_csv($filename); |
|
244 | 244 | $this->EE_CSV->write_data_array_to_csv($handle, $csv_data); |
245 | 245 | $this->EE_CSV->end_sending_csv($handle); |
246 | 246 | } |
@@ -257,18 +257,18 @@ discard block |
||
257 | 257 | $countries_that_have_an_attendee = EEM_Country::instance()->get_all(array(0=>array('Attendee.ATT_ID'=>array('IS NOT NULL')))); |
258 | 258 | // $states_to_export_query_params |
259 | 259 | $models_to_export = array( |
260 | - 'Country'=>array(array('CNT_ISO'=>array('IN',array_keys($countries_that_have_an_attendee)))), |
|
261 | - 'State'=>array(array('STA_ID'=>array('IN',array_keys($states_that_have_an_attendee)))), |
|
260 | + 'Country'=>array(array('CNT_ISO'=>array('IN', array_keys($countries_that_have_an_attendee)))), |
|
261 | + 'State'=>array(array('STA_ID'=>array('IN', array_keys($states_that_have_an_attendee)))), |
|
262 | 262 | 'Attendee'=>array(), |
263 | 263 | ); |
264 | 264 | |
265 | 265 | |
266 | 266 | |
267 | - $model_data = $this->_get_export_data_for_models( $models_to_export ); |
|
268 | - $filename = $this->generate_filename ( 'all-attendees' ); |
|
267 | + $model_data = $this->_get_export_data_for_models($models_to_export); |
|
268 | + $filename = $this->generate_filename('all-attendees'); |
|
269 | 269 | |
270 | - if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $model_data )) { |
|
271 | - EE_Error::add_error(__('An error occurred and the Attendee data could not be exported from the database.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
270 | + if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $model_data)) { |
|
271 | + EE_Error::add_error(__('An error occurred and the Attendee data could not be exported from the database.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
272 | 272 | } |
273 | 273 | } |
274 | 274 | |
@@ -280,19 +280,19 @@ discard block |
||
280 | 280 | * @param boolean|string $pretty_schema true to display pretty, a string to use a specific "Schema", or false to NOT display pretty |
281 | 281 | * @return string |
282 | 282 | */ |
283 | - protected function _prepare_value_from_db_for_display( $model, $field_name, $raw_db_value, $pretty_schema = true ) { |
|
284 | - $field_obj = $model->field_settings_for( $field_name ); |
|
285 | - $value_on_model_obj = $field_obj->prepare_for_set_from_db( $raw_db_value ); |
|
286 | - if( $field_obj instanceof EE_Datetime_Field ) { |
|
287 | - $field_obj->set_date_format( EE_CSV::instance()->get_date_format_for_csv( $field_obj->get_date_format( $pretty_schema ) ), $pretty_schema ); |
|
288 | - $field_obj->set_time_format( EE_CSV::instance()->get_time_format_for_csv( $field_obj->get_time_format( $pretty_schema ) ), $pretty_schema ); |
|
283 | + protected function _prepare_value_from_db_for_display($model, $field_name, $raw_db_value, $pretty_schema = true) { |
|
284 | + $field_obj = $model->field_settings_for($field_name); |
|
285 | + $value_on_model_obj = $field_obj->prepare_for_set_from_db($raw_db_value); |
|
286 | + if ($field_obj instanceof EE_Datetime_Field) { |
|
287 | + $field_obj->set_date_format(EE_CSV::instance()->get_date_format_for_csv($field_obj->get_date_format($pretty_schema)), $pretty_schema); |
|
288 | + $field_obj->set_time_format(EE_CSV::instance()->get_time_format_for_csv($field_obj->get_time_format($pretty_schema)), $pretty_schema); |
|
289 | 289 | } |
290 | - if( $pretty_schema === true){ |
|
291 | - return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj ); |
|
292 | - }elseif( is_string( $pretty_schema ) ) { |
|
293 | - return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema ); |
|
294 | - }else{ |
|
295 | - return $field_obj->prepare_for_get( $value_on_model_obj ); |
|
290 | + if ($pretty_schema === true) { |
|
291 | + return $field_obj->prepare_for_pretty_echoing($value_on_model_obj); |
|
292 | + }elseif (is_string($pretty_schema)) { |
|
293 | + return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema); |
|
294 | + } else { |
|
295 | + return $field_obj->prepare_for_get($value_on_model_obj); |
|
296 | 296 | } |
297 | 297 | } |
298 | 298 | |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | * and the questions associated with the registrations |
302 | 302 | * @param int $event_id |
303 | 303 | */ |
304 | - function report_registrations_for_event( $event_id = NULL ){ |
|
304 | + function report_registrations_for_event($event_id = NULL) { |
|
305 | 305 | $reg_fields_to_include = array( |
306 | 306 | 'TXN_ID', |
307 | 307 | 'ATT_ID', |
@@ -333,125 +333,125 @@ discard block |
||
333 | 333 | array( |
334 | 334 | 'OR' => array( |
335 | 335 | //don't include registrations from failed or abandoned transactions... |
336 | - 'Transaction.STS_ID' => array( 'NOT IN', array( EEM_Transaction::failed_status_code, EEM_Transaction::abandoned_status_code ) ), |
|
336 | + 'Transaction.STS_ID' => array('NOT IN', array(EEM_Transaction::failed_status_code, EEM_Transaction::abandoned_status_code)), |
|
337 | 337 | //unless the registration is approved, in which case include it regardless of transaction status |
338 | 338 | 'STS_ID' => EEM_Registration::status_id_approved |
339 | 339 | ), |
340 | - 'Ticket.TKT_deleted' => array( 'IN', array( true, false ) ) |
|
340 | + 'Ticket.TKT_deleted' => array('IN', array(true, false)) |
|
341 | 341 | ), |
342 | - 'order_by' => array('Transaction.TXN_ID'=>'asc','REG_count'=>'asc'), |
|
343 | - 'force_join' => array( 'Transaction', 'Ticket', 'Attendee' ) |
|
342 | + 'order_by' => array('Transaction.TXN_ID'=>'asc', 'REG_count'=>'asc'), |
|
343 | + 'force_join' => array('Transaction', 'Ticket', 'Attendee') |
|
344 | 344 | ), |
345 | 345 | $event_id |
346 | 346 | ); |
347 | - if( $event_id ){ |
|
348 | - $query_params[0]['EVT_ID'] = $event_id; |
|
349 | - }else{ |
|
350 | - $query_params[ 'force_join' ][] = 'Event'; |
|
347 | + if ($event_id) { |
|
348 | + $query_params[0]['EVT_ID'] = $event_id; |
|
349 | + } else { |
|
350 | + $query_params['force_join'][] = 'Event'; |
|
351 | 351 | } |
352 | - $registration_rows = $reg_model->get_all_wpdb_results( $query_params ); |
|
352 | + $registration_rows = $reg_model->get_all_wpdb_results($query_params); |
|
353 | 353 | //get all questions which relate to someone in this group |
354 | 354 | $registration_ids = array(); |
355 | - foreach( $registration_rows as $reg_row ) { |
|
356 | - $registration_ids[] = intval( $reg_row[ 'Registration.REG_ID'] ); |
|
355 | + foreach ($registration_rows as $reg_row) { |
|
356 | + $registration_ids[] = intval($reg_row['Registration.REG_ID']); |
|
357 | 357 | } |
358 | 358 | // EEM_Question::instance()->show_next_x_db_queries(); |
359 | - $questions_for_these_regs_rows = EEM_Question::instance()->get_all_wpdb_results(array(array('Answer.REG_ID'=>array('IN',$registration_ids)))); |
|
360 | - foreach($registration_rows as $reg_row){ |
|
361 | - if ( is_array( $reg_row ) ) { |
|
359 | + $questions_for_these_regs_rows = EEM_Question::instance()->get_all_wpdb_results(array(array('Answer.REG_ID'=>array('IN', $registration_ids)))); |
|
360 | + foreach ($registration_rows as $reg_row) { |
|
361 | + if (is_array($reg_row)) { |
|
362 | 362 | $reg_csv_array = array(); |
363 | - if( ! $event_id ){ |
|
363 | + if ( ! $event_id) { |
|
364 | 364 | //get the event's name and Id |
365 | - $reg_csv_array[ __( 'Event', 'event_espresso' ) ] = sprintf( __( '%1$s (%2$s)', 'event_espresso' ), $this->_prepare_value_from_db_for_display( EEM_Event::instance(), 'EVT_name', $reg_row[ 'Event_CPT.post_title'] ), $reg_row[ 'Event_CPT.ID' ] ); |
|
365 | + $reg_csv_array[__('Event', 'event_espresso')] = sprintf(__('%1$s (%2$s)', 'event_espresso'), $this->_prepare_value_from_db_for_display(EEM_Event::instance(), 'EVT_name', $reg_row['Event_CPT.post_title']), $reg_row['Event_CPT.ID']); |
|
366 | 366 | } |
367 | - $is_primary_reg = $reg_row[ 'Registration.REG_count' ] == '1' ? true : false; |
|
367 | + $is_primary_reg = $reg_row['Registration.REG_count'] == '1' ? true : false; |
|
368 | 368 | /*@var $reg_row EE_Registration */ |
369 | - foreach($reg_fields_to_include as $field_name){ |
|
369 | + foreach ($reg_fields_to_include as $field_name) { |
|
370 | 370 | $field = $reg_model->field_settings_for($field_name); |
371 | - if($field_name == 'REG_final_price'){ |
|
372 | - $value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_final_price'], 'localized_float' ); |
|
373 | - }elseif( $field_name == 'REG_count' ){ |
|
374 | - $value = sprintf( __( '%s of %s', 'event_espresso' ), $this->_prepare_value_from_db_for_display( $reg_model, 'REG_count', $reg_row['Registration.REG_count'] ), $this->_prepare_value_from_db_for_display( $reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size' ] ) ); |
|
375 | - }elseif( $field_name == 'REG_date' ) { |
|
376 | - $value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_date'], 'no_html' ); |
|
377 | - }else{ |
|
378 | - $value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ $field->get_qualified_column() ] ); |
|
371 | + if ($field_name == 'REG_final_price') { |
|
372 | + $value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row['Registration.REG_final_price'], 'localized_float'); |
|
373 | + }elseif ($field_name == 'REG_count') { |
|
374 | + $value = sprintf(__('%s of %s', 'event_espresso'), $this->_prepare_value_from_db_for_display($reg_model, 'REG_count', $reg_row['Registration.REG_count']), $this->_prepare_value_from_db_for_display($reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size'])); |
|
375 | + }elseif ($field_name == 'REG_date') { |
|
376 | + $value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row['Registration.REG_date'], 'no_html'); |
|
377 | + } else { |
|
378 | + $value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row[$field->get_qualified_column()]); |
|
379 | 379 | } |
380 | 380 | $reg_csv_array[$this->_get_column_name_for_field($field)] = $value; |
381 | - if($field_name == 'REG_final_price'){ |
|
381 | + if ($field_name == 'REG_final_price') { |
|
382 | 382 | //add a column named Currency after the final price |
383 | 383 | $reg_csv_array[__("Currency", "event_espresso")] = EE_Config::instance()->currency->code; |
384 | 384 | } |
385 | 385 | } |
386 | 386 | //get pretty status |
387 | - $stati = EEM_Status::instance()->localized_status( array( |
|
388 | - $reg_row[ 'Registration.STS_ID' ] => __( 'unknown', 'event_espresso' ), |
|
389 | - $reg_row[ 'Transaction.STS_ID' ] => __( 'unknown', 'event_espresso' ) ), |
|
387 | + $stati = EEM_Status::instance()->localized_status(array( |
|
388 | + $reg_row['Registration.STS_ID'] => __('unknown', 'event_espresso'), |
|
389 | + $reg_row['Transaction.STS_ID'] => __('unknown', 'event_espresso') ), |
|
390 | 390 | FALSE, |
391 | - 'sentence' ); |
|
392 | - $reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[ $reg_row[ 'Registration.STS_ID' ] ]; |
|
391 | + 'sentence'); |
|
392 | + $reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[$reg_row['Registration.STS_ID']]; |
|
393 | 393 | //get pretty trnasaction status |
394 | - $reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[ $reg_row[ 'Transaction.STS_ID' ] ]; |
|
395 | - $reg_csv_array[ __( 'Transaction Amount Due', 'event_espresso' ) ] = $is_primary_reg ? $this->_prepare_value_from_db_for_display( EEM_Transaction::instance(), 'TXN_total', $reg_row[ 'Transaction.TXN_total' ], 'localized_float' ) : '0.00'; |
|
396 | - $reg_csv_array[ __( 'Amount Paid', 'event_espresso' )] = $is_primary_reg ? $this->_prepare_value_from_db_for_display( EEM_Transaction::instance(), 'TXN_paid', $reg_row[ 'Transaction.TXN_paid' ], 'localized_float' ) : '0.00'; |
|
394 | + $reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[$reg_row['Transaction.STS_ID']]; |
|
395 | + $reg_csv_array[__('Transaction Amount Due', 'event_espresso')] = $is_primary_reg ? $this->_prepare_value_from_db_for_display(EEM_Transaction::instance(), 'TXN_total', $reg_row['Transaction.TXN_total'], 'localized_float') : '0.00'; |
|
396 | + $reg_csv_array[__('Amount Paid', 'event_espresso')] = $is_primary_reg ? $this->_prepare_value_from_db_for_display(EEM_Transaction::instance(), 'TXN_paid', $reg_row['Transaction.TXN_paid'], 'localized_float') : '0.00'; |
|
397 | 397 | $payment_methods = array(); |
398 | 398 | $gateway_txn_ids_etc = array(); |
399 | 399 | $payment_times = array(); |
400 | - if( $is_primary_reg && $reg_row[ 'Transaction.TXN_ID' ] ){ |
|
400 | + if ($is_primary_reg && $reg_row['Transaction.TXN_ID']) { |
|
401 | 401 | $payments_info = EEM_Payment::instance()->get_all_wpdb_results( |
402 | 402 | array( |
403 | 403 | array( |
404 | - 'TXN_ID' => $reg_row[ 'Transaction.TXN_ID' ], |
|
404 | + 'TXN_ID' => $reg_row['Transaction.TXN_ID'], |
|
405 | 405 | 'STS_ID' => EEM_Payment::status_id_approved |
406 | 406 | ), |
407 | - 'force_join' => array( 'Payment_Method' ), |
|
407 | + 'force_join' => array('Payment_Method'), |
|
408 | 408 | |
409 | 409 | ), |
410 | 410 | ARRAY_A, |
411 | 411 | 'Payment_Method.PMD_admin_name as name, Payment.PAY_txn_id_chq_nmbr as gateway_txn_id, Payment.PAY_timestamp as payment_time' ); |
412 | 412 | |
413 | - foreach( $payments_info as $payment_method_and_gateway_txn_id ){ |
|
414 | - $payment_methods[] = isset( $payment_method_and_gateway_txn_id[ 'name' ] ) ? $payment_method_and_gateway_txn_id[ 'name' ] : __( 'Unknown', 'event_espresso' ); |
|
415 | - $gateway_txn_ids_etc[] = isset( $payment_method_and_gateway_txn_id[ 'gateway_txn_id' ] ) ? $payment_method_and_gateway_txn_id[ 'gateway_txn_id' ] : ''; |
|
416 | - $payment_times[] = isset( $payment_method_and_gateway_txn_id[ 'payment_time' ] ) ? $payment_method_and_gateway_txn_id[ 'payment_time' ] : ''; |
|
413 | + foreach ($payments_info as $payment_method_and_gateway_txn_id) { |
|
414 | + $payment_methods[] = isset($payment_method_and_gateway_txn_id['name']) ? $payment_method_and_gateway_txn_id['name'] : __('Unknown', 'event_espresso'); |
|
415 | + $gateway_txn_ids_etc[] = isset($payment_method_and_gateway_txn_id['gateway_txn_id']) ? $payment_method_and_gateway_txn_id['gateway_txn_id'] : ''; |
|
416 | + $payment_times[] = isset($payment_method_and_gateway_txn_id['payment_time']) ? $payment_method_and_gateway_txn_id['payment_time'] : ''; |
|
417 | 417 | } |
418 | 418 | |
419 | 419 | } |
420 | - $reg_csv_array[ __( 'Payment Date(s)', 'event_espresso' ) ] = implode( ',', $payment_times ); |
|
421 | - $reg_csv_array[ __( 'Payment Method(s)', 'event_espresso' ) ] = implode( ",", $payment_methods ); |
|
422 | - $reg_csv_array[ __( 'Gateway Transaction ID(s)', 'event_espresso' )] = implode( ',', $gateway_txn_ids_etc ); |
|
420 | + $reg_csv_array[__('Payment Date(s)', 'event_espresso')] = implode(',', $payment_times); |
|
421 | + $reg_csv_array[__('Payment Method(s)', 'event_espresso')] = implode(",", $payment_methods); |
|
422 | + $reg_csv_array[__('Gateway Transaction ID(s)', 'event_espresso')] = implode(',', $gateway_txn_ids_etc); |
|
423 | 423 | |
424 | 424 | //get whether or not the user has checked in |
425 | - $reg_csv_array[__("Check-Ins", "event_espresso")] = $reg_model->count_related( $reg_row[ 'Registration.REG_ID'] , 'Checkin' ); |
|
425 | + $reg_csv_array[__("Check-Ins", "event_espresso")] = $reg_model->count_related($reg_row['Registration.REG_ID'], 'Checkin'); |
|
426 | 426 | //get ticket of registration and its price |
427 | 427 | $ticket_model = EE_Registry::instance()->load_model('Ticket'); |
428 | - if( $reg_row[ 'Ticket.TKT_ID'] ) { |
|
429 | - $ticket_name = $this->_prepare_value_from_db_for_display( $ticket_model, 'TKT_name', $reg_row[ 'Ticket.TKT_name' ] ); |
|
428 | + if ($reg_row['Ticket.TKT_ID']) { |
|
429 | + $ticket_name = $this->_prepare_value_from_db_for_display($ticket_model, 'TKT_name', $reg_row['Ticket.TKT_name']); |
|
430 | 430 | $datetimes_strings = array(); |
431 | - foreach( EEM_Datetime::instance()->get_all_wpdb_results( array( array( 'Ticket.TKT_ID' => $reg_row[ 'Ticket.TKT_ID' ] ), 'order_by' => array( 'DTT_EVT_start' => 'ASC' ), 'default_where_conditions' => 'none' ) ) as $datetime){ |
|
432 | - $datetimes_strings[] = $this->_prepare_value_from_db_for_display( EEM_Datetime::instance(), 'DTT_EVT_start', $datetime[ 'Datetime.DTT_EVT_start'] ); |
|
431 | + foreach (EEM_Datetime::instance()->get_all_wpdb_results(array(array('Ticket.TKT_ID' => $reg_row['Ticket.TKT_ID']), 'order_by' => array('DTT_EVT_start' => 'ASC'), 'default_where_conditions' => 'none')) as $datetime) { |
|
432 | + $datetimes_strings[] = $this->_prepare_value_from_db_for_display(EEM_Datetime::instance(), 'DTT_EVT_start', $datetime['Datetime.DTT_EVT_start']); |
|
433 | 433 | } |
434 | 434 | |
435 | 435 | } else { |
436 | - $ticket_name = __( 'Unknown', 'event_espresso' ); |
|
437 | - $datetimes_strings = array( __( 'Unknown', 'event_espresso' ) ); |
|
436 | + $ticket_name = __('Unknown', 'event_espresso'); |
|
437 | + $datetimes_strings = array(__('Unknown', 'event_espresso')); |
|
438 | 438 | } |
439 | 439 | $reg_csv_array[$ticket_model->field_settings_for('TKT_name')->get_nicename()] = $ticket_name; |
440 | 440 | $reg_csv_array[__("Datetimes of Ticket", "event_espresso")] = implode(", ", $datetimes_strings); |
441 | 441 | //get datetime(s) of registration |
442 | 442 | |
443 | 443 | //add attendee columns |
444 | - foreach($att_fields_to_include as $att_field_name){ |
|
444 | + foreach ($att_fields_to_include as $att_field_name) { |
|
445 | 445 | $field_obj = EEM_Attendee::instance()->field_settings_for($att_field_name); |
446 | - if( $reg_row[ 'Attendee_CPT.ID' ]){ |
|
447 | - if($att_field_name == 'STA_ID'){ |
|
448 | - $value = EEM_State::instance()->get_var( array( array( 'STA_ID' => $reg_row[ 'Attendee_Meta.STA_ID' ] ) ), 'STA_name' ); |
|
449 | - }elseif($att_field_name == 'CNT_ISO'){ |
|
450 | - $value = EEM_Country::instance()->get_var( array( array( 'CNT_ISO' => $reg_row[ 'Attendee_Meta.CNT_ISO' ] ) ), 'CNT_name' ); |
|
451 | - }else{ |
|
452 | - $value = $this->_prepare_value_from_db_for_display( EEM_Attendee::instance(), $att_field_name, $reg_row[ $field_obj->get_qualified_column() ] ); |
|
446 | + if ($reg_row['Attendee_CPT.ID']) { |
|
447 | + if ($att_field_name == 'STA_ID') { |
|
448 | + $value = EEM_State::instance()->get_var(array(array('STA_ID' => $reg_row['Attendee_Meta.STA_ID'])), 'STA_name'); |
|
449 | + }elseif ($att_field_name == 'CNT_ISO') { |
|
450 | + $value = EEM_Country::instance()->get_var(array(array('CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO'])), 'CNT_name'); |
|
451 | + } else { |
|
452 | + $value = $this->_prepare_value_from_db_for_display(EEM_Attendee::instance(), $att_field_name, $reg_row[$field_obj->get_qualified_column()]); |
|
453 | 453 | } |
454 | - }else{ |
|
454 | + } else { |
|
455 | 455 | $value = ''; |
456 | 456 | } |
457 | 457 | |
@@ -459,56 +459,56 @@ discard block |
||
459 | 459 | } |
460 | 460 | |
461 | 461 | //make sure each registration has the same questions in the same order |
462 | - foreach($questions_for_these_regs_rows as $question_row){ |
|
463 | - if( ! isset($reg_csv_array[$question_row[ 'Question.QST_admin_label']])){ |
|
464 | - $reg_csv_array[$question_row[ 'Question.QST_admin_label' ] ] = null; |
|
462 | + foreach ($questions_for_these_regs_rows as $question_row) { |
|
463 | + if ( ! isset($reg_csv_array[$question_row['Question.QST_admin_label']])) { |
|
464 | + $reg_csv_array[$question_row['Question.QST_admin_label']] = null; |
|
465 | 465 | } |
466 | 466 | } |
467 | 467 | //now fill out the questions THEY answered |
468 | - foreach( EEM_Answer::instance()->get_all_wpdb_results( array( array( 'REG_ID' => $reg_row[ 'Registration.REG_ID' ] ), 'force_join' => array( 'Question' ) ) ) as $answer_row){ |
|
468 | + foreach (EEM_Answer::instance()->get_all_wpdb_results(array(array('REG_ID' => $reg_row['Registration.REG_ID']), 'force_join' => array('Question'))) as $answer_row) { |
|
469 | 469 | /* @var $answer EE_Answer */ |
470 | - if( $answer_row[ 'Question.QST_ID' ] ){ |
|
471 | - $question_label = $this->_prepare_value_from_db_for_display( EEM_Question::instance(), 'QST_admin_label', $answer_row[ 'Question.QST_admin_label' ] ); |
|
472 | - }else{ |
|
473 | - $question_label = sprintf( __( 'Question $s', 'event_espresso' ), $answer_row[ 'Answer.QST_ID' ] ); |
|
470 | + if ($answer_row['Question.QST_ID']) { |
|
471 | + $question_label = $this->_prepare_value_from_db_for_display(EEM_Question::instance(), 'QST_admin_label', $answer_row['Question.QST_admin_label']); |
|
472 | + } else { |
|
473 | + $question_label = sprintf(__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']); |
|
474 | 474 | } |
475 | - if( isset( $answer_row[ 'Question.QST_type'] ) && $answer_row[ 'Question.QST_type' ] == EEM_Question::QST_type_state ) { |
|
476 | - $reg_csv_array[ $question_label ] = EEM_State::instance()->get_state_name_by_ID( $answer_row[ 'Answer.ANS_value' ] ); |
|
475 | + if (isset($answer_row['Question.QST_type']) && $answer_row['Question.QST_type'] == EEM_Question::QST_type_state) { |
|
476 | + $reg_csv_array[$question_label] = EEM_State::instance()->get_state_name_by_ID($answer_row['Answer.ANS_value']); |
|
477 | 477 | } else { |
478 | - $reg_csv_array[ $question_label ] = $this->_prepare_value_from_db_for_display( EEM_Answer::instance(), 'ANS_value', $answer_row[ 'Answer.ANS_value' ] ); |
|
478 | + $reg_csv_array[$question_label] = $this->_prepare_value_from_db_for_display(EEM_Answer::instance(), 'ANS_value', $answer_row['Answer.ANS_value']); |
|
479 | 479 | } |
480 | 480 | } |
481 | - $registrations_csv_ready_array[] = apply_filters( 'FHEE__EE_Export__report_registrations__reg_csv_array', $reg_csv_array, $reg_row ); |
|
481 | + $registrations_csv_ready_array[] = apply_filters('FHEE__EE_Export__report_registrations__reg_csv_array', $reg_csv_array, $reg_row); |
|
482 | 482 | } |
483 | 483 | } |
484 | 484 | |
485 | 485 | //if we couldn't export anything, we want to at least show the column headers |
486 | - if(empty($registrations_csv_ready_array)){ |
|
486 | + if (empty($registrations_csv_ready_array)) { |
|
487 | 487 | $reg_csv_array = array(); |
488 | 488 | $model_and_fields_to_include = array( |
489 | 489 | 'Registration' => $reg_fields_to_include, |
490 | 490 | 'Attendee' => $att_fields_to_include |
491 | 491 | ); |
492 | - foreach($model_and_fields_to_include as $model_name => $field_list){ |
|
492 | + foreach ($model_and_fields_to_include as $model_name => $field_list) { |
|
493 | 493 | $model = EE_Registry::instance()->load_model($model_name); |
494 | - foreach($field_list as $field_name){ |
|
494 | + foreach ($field_list as $field_name) { |
|
495 | 495 | $field = $model->field_settings_for($field_name); |
496 | - $reg_csv_array[$this->_get_column_name_for_field($field)] = null;//$registration->get($field->get_name()); |
|
496 | + $reg_csv_array[$this->_get_column_name_for_field($field)] = null; //$registration->get($field->get_name()); |
|
497 | 497 | } |
498 | 498 | } |
499 | 499 | $registrations_csv_ready_array [] = $reg_csv_array; |
500 | 500 | } |
501 | - if( $event_id ){ |
|
502 | - $event_slug = EEM_Event::instance()->get_var( array( array( 'EVT_ID' => $event_id ) ), 'EVT_slug' ); |
|
503 | - if( ! $event_slug ) { |
|
504 | - $event_slug = __( 'unknown', 'event_espresso' ); |
|
501 | + if ($event_id) { |
|
502 | + $event_slug = EEM_Event::instance()->get_var(array(array('EVT_ID' => $event_id)), 'EVT_slug'); |
|
503 | + if ( ! $event_slug) { |
|
504 | + $event_slug = __('unknown', 'event_espresso'); |
|
505 | 505 | } |
506 | - }else{ |
|
507 | - $event_slug = __( 'all', 'event_espresso' ); |
|
506 | + } else { |
|
507 | + $event_slug = __('all', 'event_espresso'); |
|
508 | 508 | } |
509 | - $filename = sprintf( "registrations-for-%s", $event_slug ); |
|
509 | + $filename = sprintf("registrations-for-%s", $event_slug); |
|
510 | 510 | |
511 | - $handle = $this->EE_CSV->begin_sending_csv( $filename); |
|
511 | + $handle = $this->EE_CSV->begin_sending_csv($filename); |
|
512 | 512 | $this->EE_CSV->write_data_array_to_csv($handle, $registrations_csv_ready_array); |
513 | 513 | $this->EE_CSV->end_sending_csv($handle); |
514 | 514 | } |
@@ -518,7 +518,7 @@ discard block |
||
518 | 518 | * @param EE_Model_Field_Base $field |
519 | 519 | * @return string |
520 | 520 | */ |
521 | - protected function _get_column_name_for_field(EE_Model_Field_Base $field){ |
|
521 | + protected function _get_column_name_for_field(EE_Model_Field_Base $field) { |
|
522 | 522 | return $field->get_nicename()."[".$field->get_name()."]"; |
523 | 523 | } |
524 | 524 | |
@@ -531,17 +531,17 @@ discard block |
||
531 | 531 | function export_categories() { |
532 | 532 | // are any Event IDs set? |
533 | 533 | $query_params = array(); |
534 | - if ( isset( $this->_req_data['EVT_CAT_ID'] )) { |
|
534 | + if (isset($this->_req_data['EVT_CAT_ID'])) { |
|
535 | 535 | // do we have an array of IDs ? |
536 | - if ( is_array( $this->_req_data['EVT_CAT_ID'] )) { |
|
536 | + if (is_array($this->_req_data['EVT_CAT_ID'])) { |
|
537 | 537 | // generate an "IN (CSV)" where clause |
538 | - $EVT_CAT_IDs = array_map( 'sanitize_text_field', $this->_req_data['EVT_CAT_ID'] ); |
|
538 | + $EVT_CAT_IDs = array_map('sanitize_text_field', $this->_req_data['EVT_CAT_ID']); |
|
539 | 539 | $filename = 'event-categories'; |
540 | - $query_params[0]['term_taxonomy_id'] = array('IN',$EVT_CAT_IDs); |
|
540 | + $query_params[0]['term_taxonomy_id'] = array('IN', $EVT_CAT_IDs); |
|
541 | 541 | } else { |
542 | 542 | // generate regular where = clause |
543 | - $EVT_CAT_ID = absint( $this->_req_data['EVT_CAT_ID'] ); |
|
544 | - $filename = 'event-category#' . $EVT_CAT_ID; |
|
543 | + $EVT_CAT_ID = absint($this->_req_data['EVT_CAT_ID']); |
|
544 | + $filename = 'event-category#'.$EVT_CAT_ID; |
|
545 | 545 | $query_params[0]['term_taxonomy_id'] = $EVT_CAT_ID; |
546 | 546 | } |
547 | 547 | } else { |
@@ -553,11 +553,11 @@ discard block |
||
553 | 553 | 'Term_Taxonomy' => $query_params |
554 | 554 | ); |
555 | 555 | |
556 | - $table_data = $this->_get_export_data_for_models( $tables_to_export ); |
|
557 | - $filename = $this->generate_filename ( $filename ); |
|
556 | + $table_data = $this->_get_export_data_for_models($tables_to_export); |
|
557 | + $filename = $this->generate_filename($filename); |
|
558 | 558 | |
559 | - if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $table_data )) { |
|
560 | - EE_Error::add_error(__('An error occurred and the Category details could not be exported from the database.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
559 | + if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $table_data)) { |
|
560 | + EE_Error::add_error(__('An error occurred and the Category details could not be exported from the database.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
561 | 561 | } |
562 | 562 | } |
563 | 563 | |
@@ -568,13 +568,13 @@ discard block |
||
568 | 568 | * @param string - export_name |
569 | 569 | * @return string on success, FALSE on fail |
570 | 570 | */ |
571 | - private function generate_filename ( $export_name = '' ) { |
|
572 | - if ( $export_name != '' ) { |
|
573 | - $filename = get_bloginfo('name') . '-' . $export_name; |
|
574 | - $filename = sanitize_key( $filename ) . '-' . $this->today; |
|
571 | + private function generate_filename($export_name = '') { |
|
572 | + if ($export_name != '') { |
|
573 | + $filename = get_bloginfo('name').'-'.$export_name; |
|
574 | + $filename = sanitize_key($filename).'-'.$this->today; |
|
575 | 575 | return $filename; |
576 | - } else { |
|
577 | - EE_Error::add_error(__("No filename was provided", "event_espresso"), __FILE__, __FUNCTION__, __LINE__ ); |
|
576 | + } else { |
|
577 | + EE_Error::add_error(__("No filename was provided", "event_espresso"), __FILE__, __FUNCTION__, __LINE__); |
|
578 | 578 | } |
579 | 579 | return false; |
580 | 580 | } |
@@ -587,12 +587,12 @@ discard block |
||
587 | 587 | * @param array $models_to_export keys are model names (eg 'Event', 'Attendee', etc.) and values are arrays of query params like on EEM_Base::get_all |
588 | 588 | * @return array on success, FALSE on fail |
589 | 589 | */ |
590 | - private function _get_export_data_for_models( $models_to_export = array() ) { |
|
590 | + private function _get_export_data_for_models($models_to_export = array()) { |
|
591 | 591 | $table_data = FALSE; |
592 | - if ( is_array( $models_to_export ) ) { |
|
593 | - foreach ( $models_to_export as $model_name => $query_params ) { |
|
592 | + if (is_array($models_to_export)) { |
|
593 | + foreach ($models_to_export as $model_name => $query_params) { |
|
594 | 594 | //check for a numerically-indexed array. in that case, $model_name is the value!! |
595 | - if(is_int($model_name)){ |
|
595 | + if (is_int($model_name)) { |
|
596 | 596 | $model_name = $query_params; |
597 | 597 | $query_params = array(); |
598 | 598 | } |
@@ -600,17 +600,17 @@ discard block |
||
600 | 600 | $model_objects = $model->get_all($query_params); |
601 | 601 | |
602 | 602 | $table_data[$model_name] = array(); |
603 | - foreach($model_objects as $model_object){ |
|
603 | + foreach ($model_objects as $model_object) { |
|
604 | 604 | $model_data_array = array(); |
605 | 605 | $fields = $model->field_settings(); |
606 | - foreach($fields as $field){ |
|
606 | + foreach ($fields as $field) { |
|
607 | 607 | $column_name = $field->get_nicename()."[".$field->get_name()."]"; |
608 | - if($field instanceof EE_Datetime_Field){ |
|
608 | + if ($field instanceof EE_Datetime_Field) { |
|
609 | 609 | // $field->set_date_format('Y-m-d'); |
610 | 610 | // $field->set_time_format('H:i:s'); |
611 | - $model_data_array[$column_name] = $model_object->get_datetime($field->get_name(),'Y-m-d','H:i:s'); |
|
611 | + $model_data_array[$column_name] = $model_object->get_datetime($field->get_name(), 'Y-m-d', 'H:i:s'); |
|
612 | 612 | } |
613 | - else{ |
|
613 | + else { |
|
614 | 614 | $model_data_array[$column_name] = $model_object->get($field->get_name()); |
615 | 615 | } |
616 | 616 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | -<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
2 | - exit( 'No direct script access allowed' ); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | 3 | } |
4 | 4 | /** |
5 | 5 | * Event Espresso |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | * date_format and the second value is the time format |
51 | 51 | * @return EE_Line_Item |
52 | 52 | */ |
53 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
54 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__ ); |
|
55 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
53 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
54 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__); |
|
55 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | |
@@ -63,8 +63,8 @@ discard block |
||
63 | 63 | * the website will be used. |
64 | 64 | * @return EE_Line_Item |
65 | 65 | */ |
66 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
67 | - return new self( $props_n_values, TRUE, $timezone ); |
|
66 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
67 | + return new self($props_n_values, TRUE, $timezone); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | |
@@ -75,10 +75,10 @@ discard block |
||
75 | 75 | * @param bool $bydb |
76 | 76 | * @param string $timezone |
77 | 77 | */ |
78 | - protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '' ) { |
|
79 | - parent::__construct( $fieldValues, $bydb, $timezone ); |
|
80 | - if ( ! $this->get( 'LIN_code' ) ) { |
|
81 | - $this->set_code( $this->generate_code() ); |
|
78 | + protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '') { |
|
79 | + parent::__construct($fieldValues, $bydb, $timezone); |
|
80 | + if ( ! $this->get('LIN_code')) { |
|
81 | + $this->set_code($this->generate_code()); |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * @return int |
90 | 90 | */ |
91 | 91 | function ID() { |
92 | - return $this->get( 'LIN_ID' ); |
|
92 | + return $this->get('LIN_ID'); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | * @return int |
100 | 100 | */ |
101 | 101 | function TXN_ID() { |
102 | - return $this->get( 'TXN_ID' ); |
|
102 | + return $this->get('TXN_ID'); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | |
@@ -109,8 +109,8 @@ discard block |
||
109 | 109 | * @param int $TXN_ID |
110 | 110 | * @return boolean |
111 | 111 | */ |
112 | - function set_TXN_ID( $TXN_ID ) { |
|
113 | - $this->set( 'TXN_ID', $TXN_ID ); |
|
112 | + function set_TXN_ID($TXN_ID) { |
|
113 | + $this->set('TXN_ID', $TXN_ID); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | |
@@ -120,9 +120,9 @@ discard block |
||
120 | 120 | * @return string |
121 | 121 | */ |
122 | 122 | function name() { |
123 | - $name = $this->get( 'LIN_name' ); |
|
124 | - if( ! $name ){ |
|
125 | - $name = ucwords( str_replace( '-', ' ', $this->type() ) ); |
|
123 | + $name = $this->get('LIN_name'); |
|
124 | + if ( ! $name) { |
|
125 | + $name = ucwords(str_replace('-', ' ', $this->type())); |
|
126 | 126 | } |
127 | 127 | return $name; |
128 | 128 | } |
@@ -134,8 +134,8 @@ discard block |
||
134 | 134 | * @param string $name |
135 | 135 | * @return boolean |
136 | 136 | */ |
137 | - function set_name( $name ) { |
|
138 | - $this->set( 'LIN_name', $name ); |
|
137 | + function set_name($name) { |
|
138 | + $this->set('LIN_name', $name); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | * @return string |
146 | 146 | */ |
147 | 147 | function desc() { |
148 | - return $this->get( 'LIN_desc' ); |
|
148 | + return $this->get('LIN_desc'); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | |
@@ -155,8 +155,8 @@ discard block |
||
155 | 155 | * @param string $desc |
156 | 156 | * @return boolean |
157 | 157 | */ |
158 | - function set_desc( $desc ) { |
|
159 | - $this->set( 'LIN_desc', $desc ); |
|
158 | + function set_desc($desc) { |
|
159 | + $this->set('LIN_desc', $desc); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | * @return int |
167 | 167 | */ |
168 | 168 | function quantity() { |
169 | - return $this->get( 'LIN_quantity' ); |
|
169 | + return $this->get('LIN_quantity'); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | |
@@ -176,8 +176,8 @@ discard block |
||
176 | 176 | * @param int $quantity |
177 | 177 | * @return boolean |
178 | 178 | */ |
179 | - function set_quantity( $quantity ) { |
|
180 | - $this->set( 'LIN_quantity', $quantity ); |
|
179 | + function set_quantity($quantity) { |
|
180 | + $this->set('LIN_quantity', $quantity); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | * @return string |
188 | 188 | */ |
189 | 189 | function OBJ_ID() { |
190 | - return $this->get( 'OBJ_ID' ); |
|
190 | + return $this->get('OBJ_ID'); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | |
@@ -197,8 +197,8 @@ discard block |
||
197 | 197 | * @param string $item_id |
198 | 198 | * @return boolean |
199 | 199 | */ |
200 | - function set_OBJ_ID( $item_id ) { |
|
201 | - $this->set( 'OBJ_ID', $item_id ); |
|
200 | + function set_OBJ_ID($item_id) { |
|
201 | + $this->set('OBJ_ID', $item_id); |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | * @return string |
209 | 209 | */ |
210 | 210 | function OBJ_type() { |
211 | - return $this->get( 'OBJ_type' ); |
|
211 | + return $this->get('OBJ_type'); |
|
212 | 212 | } |
213 | 213 | |
214 | 214 | |
@@ -218,8 +218,8 @@ discard block |
||
218 | 218 | * @param string $OBJ_type |
219 | 219 | * @return boolean |
220 | 220 | */ |
221 | - function set_OBJ_type( $OBJ_type ) { |
|
222 | - $this->set( 'OBJ_type', $OBJ_type ); |
|
221 | + function set_OBJ_type($OBJ_type) { |
|
222 | + $this->set('OBJ_type', $OBJ_type); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | * @return float |
230 | 230 | */ |
231 | 231 | function unit_price() { |
232 | - return $this->get( 'LIN_unit_price' ); |
|
232 | + return $this->get('LIN_unit_price'); |
|
233 | 233 | } |
234 | 234 | |
235 | 235 | |
@@ -239,8 +239,8 @@ discard block |
||
239 | 239 | * @param float $unit_price |
240 | 240 | * @return boolean |
241 | 241 | */ |
242 | - function set_unit_price( $unit_price ) { |
|
243 | - $this->set( 'LIN_unit_price', $unit_price ); |
|
242 | + function set_unit_price($unit_price) { |
|
243 | + $this->set('LIN_unit_price', $unit_price); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | |
@@ -251,19 +251,19 @@ discard block |
||
251 | 251 | * @return boolean |
252 | 252 | */ |
253 | 253 | function is_percent() { |
254 | - if( $this->is_tax_sub_total() ) { |
|
254 | + if ($this->is_tax_sub_total()) { |
|
255 | 255 | //tax subtotals HAVE a percent on them, that percentage only applies |
256 | 256 | //to taxable items, so its' an exception. Treat it like a flat line item |
257 | 257 | return false; |
258 | 258 | } |
259 | - $unit_price = abs( $this->get( 'LIN_unit_price' ) ); |
|
260 | - $percent = abs( $this->get( 'LIN_percent' ) ); |
|
261 | - if ( $unit_price < .001 && $percent ) { |
|
259 | + $unit_price = abs($this->get('LIN_unit_price')); |
|
260 | + $percent = abs($this->get('LIN_percent')); |
|
261 | + if ($unit_price < .001 && $percent) { |
|
262 | 262 | return TRUE; |
263 | - } elseif ( $unit_price >= .001 && !$percent ) { |
|
263 | + } elseif ($unit_price >= .001 && ! $percent) { |
|
264 | 264 | return FALSE; |
265 | - } elseif ( $unit_price >= .001 && $percent ) { |
|
266 | - throw new EE_Error( sprintf( __( "A Line Item can not have a unit price of (%s) AND a percent (%s)!", "event_espresso" ), $unit_price, $percent ) ); |
|
265 | + } elseif ($unit_price >= .001 && $percent) { |
|
266 | + throw new EE_Error(sprintf(__("A Line Item can not have a unit price of (%s) AND a percent (%s)!", "event_espresso"), $unit_price, $percent)); |
|
267 | 267 | } else { |
268 | 268 | // if they're both 0, assume its not a percent item |
269 | 269 | return FALSE; |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | * @return float |
278 | 278 | */ |
279 | 279 | function percent() { |
280 | - return $this->get( 'LIN_percent' ); |
|
280 | + return $this->get('LIN_percent'); |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | |
@@ -287,8 +287,8 @@ discard block |
||
287 | 287 | * @param float $percent |
288 | 288 | * @return boolean |
289 | 289 | */ |
290 | - function set_percent( $percent ) { |
|
291 | - $this->set( 'LIN_percent', $percent ); |
|
290 | + function set_percent($percent) { |
|
291 | + $this->set('LIN_percent', $percent); |
|
292 | 292 | } |
293 | 293 | |
294 | 294 | |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | * @return float |
299 | 299 | */ |
300 | 300 | function total() { |
301 | - return $this->get( 'LIN_total' ); |
|
301 | + return $this->get('LIN_total'); |
|
302 | 302 | } |
303 | 303 | |
304 | 304 | |
@@ -308,8 +308,8 @@ discard block |
||
308 | 308 | * @param float $total |
309 | 309 | * @return boolean |
310 | 310 | */ |
311 | - function set_total( $total ) { |
|
312 | - $this->set( 'LIN_total', $total ); |
|
311 | + function set_total($total) { |
|
312 | + $this->set('LIN_total', $total); |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | * @return int |
320 | 320 | */ |
321 | 321 | function order() { |
322 | - return $this->get( 'LIN_order' ); |
|
322 | + return $this->get('LIN_order'); |
|
323 | 323 | } |
324 | 324 | |
325 | 325 | |
@@ -328,8 +328,8 @@ discard block |
||
328 | 328 | * Sets order |
329 | 329 | * @param int $order |
330 | 330 | */ |
331 | - function set_order( $order ) { |
|
332 | - $this->set( 'LIN_order', $order ); |
|
331 | + function set_order($order) { |
|
332 | + $this->set('LIN_order', $order); |
|
333 | 333 | } |
334 | 334 | |
335 | 335 | |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | * @return int |
340 | 340 | */ |
341 | 341 | function parent_ID() { |
342 | - return $this->get( 'LIN_parent' ); |
|
342 | + return $this->get('LIN_parent'); |
|
343 | 343 | } |
344 | 344 | |
345 | 345 | |
@@ -349,8 +349,8 @@ discard block |
||
349 | 349 | * @param int $parent |
350 | 350 | * @return boolean |
351 | 351 | */ |
352 | - function set_parent_ID( $parent ) { |
|
353 | - $this->set( 'LIN_parent', $parent ); |
|
352 | + function set_parent_ID($parent) { |
|
353 | + $this->set('LIN_parent', $parent); |
|
354 | 354 | } |
355 | 355 | |
356 | 356 | |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | * @return string |
361 | 361 | */ |
362 | 362 | function type() { |
363 | - return $this->get( 'LIN_type' ); |
|
363 | + return $this->get('LIN_type'); |
|
364 | 364 | } |
365 | 365 | |
366 | 366 | |
@@ -370,8 +370,8 @@ discard block |
||
370 | 370 | * @param string $type |
371 | 371 | * @return boolean |
372 | 372 | */ |
373 | - function set_type( $type ) { |
|
374 | - $this->set( 'LIN_type', $type ); |
|
373 | + function set_type($type) { |
|
374 | + $this->set('LIN_type', $type); |
|
375 | 375 | } |
376 | 376 | |
377 | 377 | |
@@ -384,8 +384,8 @@ discard block |
||
384 | 384 | * @return EE_Line_Item |
385 | 385 | */ |
386 | 386 | public function parent() { |
387 | - if( $this->ID() ) { |
|
388 | - return $this->get_model()->get_one_by_ID( $this->parent_ID() ); |
|
387 | + if ($this->ID()) { |
|
388 | + return $this->get_model()->get_one_by_ID($this->parent_ID()); |
|
389 | 389 | } else { |
390 | 390 | return $this->_parent; |
391 | 391 | } |
@@ -398,13 +398,13 @@ discard block |
||
398 | 398 | * @return EE_Line_Item[] |
399 | 399 | */ |
400 | 400 | public function children() { |
401 | - if ( $this->ID() ) { |
|
401 | + if ($this->ID()) { |
|
402 | 402 | return $this->get_model()->get_all( |
403 | 403 | array( |
404 | - array( 'LIN_parent' => $this->ID() ), |
|
405 | - 'order_by' => array( 'LIN_order' => 'ASC' ) ) ); |
|
404 | + array('LIN_parent' => $this->ID()), |
|
405 | + 'order_by' => array('LIN_order' => 'ASC') ) ); |
|
406 | 406 | } else { |
407 | - if ( ! is_array( $this->_children ) ) { |
|
407 | + if ( ! is_array($this->_children)) { |
|
408 | 408 | $this->_children = array(); |
409 | 409 | } |
410 | 410 | return $this->_children; |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | * @return string |
419 | 419 | */ |
420 | 420 | function code() { |
421 | - return $this->get( 'LIN_code' ); |
|
421 | + return $this->get('LIN_code'); |
|
422 | 422 | } |
423 | 423 | |
424 | 424 | |
@@ -428,8 +428,8 @@ discard block |
||
428 | 428 | * @param string $code |
429 | 429 | * @return boolean |
430 | 430 | */ |
431 | - function set_code( $code ) { |
|
432 | - $this->set( 'LIN_code', $code ); |
|
431 | + function set_code($code) { |
|
432 | + $this->set('LIN_code', $code); |
|
433 | 433 | } |
434 | 434 | |
435 | 435 | |
@@ -439,7 +439,7 @@ discard block |
||
439 | 439 | * @return boolean |
440 | 440 | */ |
441 | 441 | function is_taxable() { |
442 | - return $this->get( 'LIN_is_taxable' ); |
|
442 | + return $this->get('LIN_is_taxable'); |
|
443 | 443 | } |
444 | 444 | |
445 | 445 | |
@@ -449,8 +449,8 @@ discard block |
||
449 | 449 | * @param boolean $is_taxable |
450 | 450 | * @return boolean |
451 | 451 | */ |
452 | - function set_is_taxable( $is_taxable ) { |
|
453 | - $this->set( 'LIN_is_taxable', $is_taxable ); |
|
452 | + function set_is_taxable($is_taxable) { |
|
453 | + $this->set('LIN_is_taxable', $is_taxable); |
|
454 | 454 | } |
455 | 455 | |
456 | 456 | |
@@ -465,7 +465,7 @@ discard block |
||
465 | 465 | */ |
466 | 466 | function get_object() { |
467 | 467 | $model_name_of_related_obj = $this->OBJ_type(); |
468 | - return $this->get_model()->has_relation( $model_name_of_related_obj ) ? $this->get_first_related( $model_name_of_related_obj ) : NULL; |
|
468 | + return $this->get_model()->has_relation($model_name_of_related_obj) ? $this->get_first_related($model_name_of_related_obj) : NULL; |
|
469 | 469 | } |
470 | 470 | |
471 | 471 | |
@@ -476,11 +476,11 @@ discard block |
||
476 | 476 | * @param array $query_params |
477 | 477 | * @return EE_Ticket |
478 | 478 | */ |
479 | - function ticket( $query_params = array() ) { |
|
479 | + function ticket($query_params = array()) { |
|
480 | 480 | //we're going to assume that when this method is called we always want to receive the attached ticket EVEN if that ticket is archived. This can be overridden via the incoming $query_params argument |
481 | - $remove_defaults = array( 'default_where_conditions' => 'none' ); |
|
482 | - $query_params = array_merge( $remove_defaults, $query_params ); |
|
483 | - return $this->get_first_related( 'Ticket', $query_params ); |
|
481 | + $remove_defaults = array('default_where_conditions' => 'none'); |
|
482 | + $query_params = array_merge($remove_defaults, $query_params); |
|
483 | + return $this->get_first_related('Ticket', $query_params); |
|
484 | 484 | } |
485 | 485 | |
486 | 486 | |
@@ -490,11 +490,11 @@ discard block |
||
490 | 490 | * @return EE_Datetime | NULL |
491 | 491 | */ |
492 | 492 | function get_ticket_datetime() { |
493 | - if ( $this->OBJ_type() === 'Ticket' ) { |
|
493 | + if ($this->OBJ_type() === 'Ticket') { |
|
494 | 494 | $ticket = $this->ticket(); |
495 | - if ( $ticket instanceof EE_Ticket ) { |
|
495 | + if ($ticket instanceof EE_Ticket) { |
|
496 | 496 | $datetime = $ticket->first_datetime(); |
497 | - if ( $datetime instanceof EE_Datetime ) { |
|
497 | + if ($datetime instanceof EE_Datetime) { |
|
498 | 498 | return $datetime; |
499 | 499 | } |
500 | 500 | } |
@@ -510,9 +510,9 @@ discard block |
||
510 | 510 | * @return string |
511 | 511 | */ |
512 | 512 | function ticket_event_name() { |
513 | - $event_name = __( "Unknown", "event_espresso" ); |
|
513 | + $event_name = __("Unknown", "event_espresso"); |
|
514 | 514 | $event = $this->ticket_event(); |
515 | - if ( $event instanceof EE_Event ) { |
|
515 | + if ($event instanceof EE_Event) { |
|
516 | 516 | $event_name = $event->name(); |
517 | 517 | } |
518 | 518 | return $event_name; |
@@ -526,9 +526,9 @@ discard block |
||
526 | 526 | function ticket_event() { |
527 | 527 | $event = null; |
528 | 528 | $ticket = $this->ticket(); |
529 | - if ( $ticket instanceof EE_Ticket ) { |
|
529 | + if ($ticket instanceof EE_Ticket) { |
|
530 | 530 | $datetime = $ticket->first_datetime(); |
531 | - if ( $datetime instanceof EE_Datetime ) { |
|
531 | + if ($datetime instanceof EE_Datetime) { |
|
532 | 532 | $event = $datetime->event(); |
533 | 533 | } |
534 | 534 | } |
@@ -543,11 +543,11 @@ discard block |
||
543 | 543 | * @param string $time_format |
544 | 544 | * @return string |
545 | 545 | */ |
546 | - function ticket_datetime_start( $date_format = '', $time_format = '' ) { |
|
547 | - $first_datetime_string = __( "Unknown", "event_espresso" ); |
|
546 | + function ticket_datetime_start($date_format = '', $time_format = '') { |
|
547 | + $first_datetime_string = __("Unknown", "event_espresso"); |
|
548 | 548 | $datetime = $this->get_ticket_datetime(); |
549 | - if ( $datetime ) { |
|
550 | - $first_datetime_string = $datetime->start_date_and_time( $date_format, $time_format ); |
|
549 | + if ($datetime) { |
|
550 | + $first_datetime_string = $datetime->start_date_and_time($date_format, $time_format); |
|
551 | 551 | } |
552 | 552 | return $first_datetime_string; |
553 | 553 | } |
@@ -562,26 +562,26 @@ discard block |
||
562 | 562 | * @return bool success |
563 | 563 | * @throws \EE_Error |
564 | 564 | */ |
565 | - function add_child_line_item( EEI_Line_Item $line_item, $set_order = true ) { |
|
565 | + function add_child_line_item(EEI_Line_Item $line_item, $set_order = true) { |
|
566 | 566 | // should we calculate the LIN_order for this line item ? |
567 | - if ( $set_order || $line_item->order() === null ) { |
|
568 | - $line_item->set_order( count( $this->children() ) ); |
|
567 | + if ($set_order || $line_item->order() === null) { |
|
568 | + $line_item->set_order(count($this->children())); |
|
569 | 569 | } |
570 | - if ( $this->ID() ) { |
|
570 | + if ($this->ID()) { |
|
571 | 571 | //check for any duplicate line items (with the same code), if so, this replaces it |
572 | - $line_item_with_same_code = $this->get_child_line_item( $line_item->code() ); |
|
573 | - if( $line_item_with_same_code instanceof EE_Line_Item && $line_item_with_same_code !== $line_item ) { |
|
574 | - $this->delete_child_line_item( $line_item_with_same_code->code() ); |
|
572 | + $line_item_with_same_code = $this->get_child_line_item($line_item->code()); |
|
573 | + if ($line_item_with_same_code instanceof EE_Line_Item && $line_item_with_same_code !== $line_item) { |
|
574 | + $this->delete_child_line_item($line_item_with_same_code->code()); |
|
575 | 575 | } |
576 | - $line_item->set_parent_ID( $this->ID() ); |
|
577 | - if( $this->TXN_ID() ){ |
|
578 | - $line_item->set_TXN_ID( $this->TXN_ID() ); |
|
576 | + $line_item->set_parent_ID($this->ID()); |
|
577 | + if ($this->TXN_ID()) { |
|
578 | + $line_item->set_TXN_ID($this->TXN_ID()); |
|
579 | 579 | } |
580 | 580 | return $line_item->save(); |
581 | 581 | } else { |
582 | - $this->_children[ $line_item->code() ] = $line_item; |
|
583 | - if( $line_item->parent() != $this ) { |
|
584 | - $line_item->set_parent( $this ); |
|
582 | + $this->_children[$line_item->code()] = $line_item; |
|
583 | + if ($line_item->parent() != $this) { |
|
584 | + $line_item->set_parent($this); |
|
585 | 585 | } |
586 | 586 | return TRUE; |
587 | 587 | } |
@@ -595,16 +595,16 @@ discard block |
||
595 | 595 | * @param EE_Line_Item $line_item |
596 | 596 | * |
597 | 597 | */ |
598 | - public function set_parent( $line_item ) { |
|
599 | - if ( $this->ID() ) { |
|
600 | - if( ! $line_item->ID() ) { |
|
598 | + public function set_parent($line_item) { |
|
599 | + if ($this->ID()) { |
|
600 | + if ( ! $line_item->ID()) { |
|
601 | 601 | $line_item->save(); |
602 | 602 | } |
603 | - $this->set_parent_ID( $line_item->ID() ); |
|
603 | + $this->set_parent_ID($line_item->ID()); |
|
604 | 604 | $this->save(); |
605 | 605 | } else { |
606 | 606 | $this->_parent = $line_item; |
607 | - $this->set_parent_ID( $line_item->ID() ); |
|
607 | + $this->set_parent_ID($line_item->ID()); |
|
608 | 608 | } |
609 | 609 | } |
610 | 610 | |
@@ -617,11 +617,11 @@ discard block |
||
617 | 617 | * @param string $code |
618 | 618 | * @return EE_Line_Item |
619 | 619 | */ |
620 | - function get_child_line_item( $code ) { |
|
621 | - if ( $this->ID() ) { |
|
622 | - return $this->get_model()->get_one( array( array( 'LIN_parent' => $this->ID(), 'LIN_code' => $code ) ) ); |
|
620 | + function get_child_line_item($code) { |
|
621 | + if ($this->ID()) { |
|
622 | + return $this->get_model()->get_one(array(array('LIN_parent' => $this->ID(), 'LIN_code' => $code))); |
|
623 | 623 | } else { |
624 | - return isset( $this->_children[ $code ] ) ? $this->_children[ $code ] : null; |
|
624 | + return isset($this->_children[$code]) ? $this->_children[$code] : null; |
|
625 | 625 | } |
626 | 626 | } |
627 | 627 | |
@@ -632,10 +632,10 @@ discard block |
||
632 | 632 | * @return int |
633 | 633 | */ |
634 | 634 | function delete_children_line_items() { |
635 | - if ( $this->ID() ) { |
|
636 | - return $this->get_model()->delete( array( array( 'LIN_parent' => $this->ID() ) ) ); |
|
635 | + if ($this->ID()) { |
|
636 | + return $this->get_model()->delete(array(array('LIN_parent' => $this->ID()))); |
|
637 | 637 | } else { |
638 | - $count = count( $this->_children ); |
|
638 | + $count = count($this->_children); |
|
639 | 639 | $this->_children = array(); |
640 | 640 | return $count; |
641 | 641 | } |
@@ -652,25 +652,25 @@ discard block |
||
652 | 652 | * @param bool $stop_search_once_found |
653 | 653 | * @return int count of items deleted (or simply removed from the line item's cache, if not has not been saved to the DB yet) |
654 | 654 | */ |
655 | - function delete_child_line_item( $code, $stop_search_once_found = true ) { |
|
656 | - if ( $this->ID() ) { |
|
655 | + function delete_child_line_item($code, $stop_search_once_found = true) { |
|
656 | + if ($this->ID()) { |
|
657 | 657 | $items_deleted = 0; |
658 | - if( $this->code() == $code ) { |
|
659 | - $items_deleted += EEH_Line_Item::delete_all_child_items( $this ); |
|
660 | - $items_deleted += intval( $this->delete() ); |
|
661 | - if( $stop_search_once_found ){ |
|
658 | + if ($this->code() == $code) { |
|
659 | + $items_deleted += EEH_Line_Item::delete_all_child_items($this); |
|
660 | + $items_deleted += intval($this->delete()); |
|
661 | + if ($stop_search_once_found) { |
|
662 | 662 | return $items_deleted; |
663 | 663 | } |
664 | 664 | } |
665 | - foreach( $this->children() as $child_line_item ) { |
|
666 | - $items_deleted += $child_line_item->delete_child_line_item( $code, $stop_search_once_found ); |
|
665 | + foreach ($this->children() as $child_line_item) { |
|
666 | + $items_deleted += $child_line_item->delete_child_line_item($code, $stop_search_once_found); |
|
667 | 667 | } |
668 | 668 | return $items_deleted; |
669 | 669 | } else { |
670 | - if( isset( $this->_children[ $code ] ) ) { |
|
671 | - unset( $this->_children[ $code ] ); |
|
670 | + if (isset($this->_children[$code])) { |
|
671 | + unset($this->_children[$code]); |
|
672 | 672 | return 1; |
673 | - }else{ |
|
673 | + } else { |
|
674 | 674 | return 0; |
675 | 675 | } |
676 | 676 | } |
@@ -683,9 +683,9 @@ discard block |
||
683 | 683 | * @return boolean |
684 | 684 | */ |
685 | 685 | public function delete_if_childless_subtotal() { |
686 | - if( $this->ID() && |
|
686 | + if ($this->ID() && |
|
687 | 687 | $this->type() == EEM_Line_Item::type_sub_total && |
688 | - ! $this->children() ) { |
|
688 | + ! $this->children()) { |
|
689 | 689 | return $this->delete(); |
690 | 690 | } else { |
691 | 691 | return false; |
@@ -700,7 +700,7 @@ discard block |
||
700 | 700 | */ |
701 | 701 | function generate_code() { |
702 | 702 | // each line item in the cart requires a unique identifier |
703 | - return md5( $this->get( 'OBJ_type' ) . $this->get( 'OBJ_ID' ) . microtime() ); |
|
703 | + return md5($this->get('OBJ_type').$this->get('OBJ_ID').microtime()); |
|
704 | 704 | } |
705 | 705 | |
706 | 706 | |
@@ -764,7 +764,7 @@ discard block |
||
764 | 764 | * @return string like '2, 004.00', formatted according to the localized currency |
765 | 765 | */ |
766 | 766 | function unit_price_no_code() { |
767 | - return $this->get_pretty( 'LIN_unit_price', 'no_currency_code' ); |
|
767 | + return $this->get_pretty('LIN_unit_price', 'no_currency_code'); |
|
768 | 768 | } |
769 | 769 | |
770 | 770 | |
@@ -774,7 +774,7 @@ discard block |
||
774 | 774 | * @return string like '2, 004.00', formatted according to the localized currency |
775 | 775 | */ |
776 | 776 | function total_no_code() { |
777 | - return $this->get_pretty( 'LIN_total', 'no_currency_code' ); |
|
777 | + return $this->get_pretty('LIN_total', 'no_currency_code'); |
|
778 | 778 | } |
779 | 779 | |
780 | 780 | |
@@ -793,17 +793,17 @@ discard block |
||
793 | 793 | |
794 | 794 | $total = $pre_tax_total + $tax_total; |
795 | 795 | // no negative totals plz |
796 | - $total = max( $total, 0 ); |
|
797 | - $this->set_total( $total ); |
|
796 | + $total = max($total, 0); |
|
797 | + $this->set_total($total); |
|
798 | 798 | //only update the related transaction's total |
799 | 799 | //if we intend to save this line item and its a grand total |
800 | - if( |
|
800 | + if ( |
|
801 | 801 | $this->allow_persist() && |
802 | 802 | $this->type() == EEM_Line_Item::type_total && |
803 | 803 | $this->transaction() instanceof EE_Transaction |
804 | - ){ |
|
805 | - $this->transaction()->set_total( $total ); |
|
806 | - if ( $this->transaction()->ID() ) { |
|
804 | + ) { |
|
805 | + $this->transaction()->set_total($total); |
|
806 | + if ($this->transaction()->ID()) { |
|
807 | 807 | $this->transaction()->save(); |
808 | 808 | } |
809 | 809 | } |
@@ -824,42 +824,42 @@ discard block |
||
824 | 824 | $total = 0; |
825 | 825 | $my_children = $this->children(); |
826 | 826 | //completely ignore tax and tax sub-totals when calculating the pre-tax-total |
827 | - if ( $this->is_tax_sub_total() || $this->is_tax() ) { |
|
827 | + if ($this->is_tax_sub_total() || $this->is_tax()) { |
|
828 | 828 | return 0; |
829 | 829 | } elseif ( |
830 | - ( $this->is_sub_line_item() || $this->is_line_item() ) |
|
831 | - && empty( $my_children ) |
|
830 | + ($this->is_sub_line_item() || $this->is_line_item()) |
|
831 | + && empty($my_children) |
|
832 | 832 | ) { |
833 | 833 | $total = $this->unit_price() * $this->quantity(); |
834 | - } elseif( $this->is_sub_total() || $this->is_total() ) { |
|
835 | - $total = $this->_recalculate_pretax_total_for_subtotal( $total, $my_children ); |
|
836 | - } elseif ( $this->is_line_item() && ! empty( $my_children ) ) { |
|
837 | - $total = $this->_recalculate_pretax_total_for_line_item( $total, $my_children ); |
|
834 | + } elseif ($this->is_sub_total() || $this->is_total()) { |
|
835 | + $total = $this->_recalculate_pretax_total_for_subtotal($total, $my_children); |
|
836 | + } elseif ($this->is_line_item() && ! empty($my_children)) { |
|
837 | + $total = $this->_recalculate_pretax_total_for_line_item($total, $my_children); |
|
838 | 838 | } |
839 | 839 | //ensure all non-line items and non-sub-line-items have a quantity of 1 |
840 | - if( ! $this->is_line_item() && ! $this->is_sub_line_item() ) { |
|
841 | - $this->set_quantity( 1 ); |
|
842 | - if( ! $this->is_percent() ) { |
|
843 | - $this->set_unit_price( $this->total() ); |
|
840 | + if ( ! $this->is_line_item() && ! $this->is_sub_line_item()) { |
|
841 | + $this->set_quantity(1); |
|
842 | + if ( ! $this->is_percent()) { |
|
843 | + $this->set_unit_price($this->total()); |
|
844 | 844 | } |
845 | 845 | } |
846 | 846 | |
847 | 847 | //we don't want to bother saving grand totals, because that needs to factor in taxes anyways |
848 | 848 | //so it ought to be |
849 | - if( ! $this->is_total() ) { |
|
850 | - $this->set_total( $total ); |
|
849 | + if ( ! $this->is_total()) { |
|
850 | + $this->set_total($total); |
|
851 | 851 | //if not a percent line item, make sure we keep the unit price in sync |
852 | - if( |
|
852 | + if ( |
|
853 | 853 | $this->is_line_item() && |
854 | - ! empty( $my_children ) && |
|
854 | + ! empty($my_children) && |
|
855 | 855 | ! $this->is_percent() |
856 | 856 | ) { |
857 | - if( $this->quantity() === 0 ){ |
|
857 | + if ($this->quantity() === 0) { |
|
858 | 858 | $new_unit_price = 0; |
859 | 859 | } else { |
860 | 860 | $new_unit_price = $this->total() / $this->quantity(); |
861 | 861 | } |
862 | - $this->set_unit_price( $new_unit_price ); |
|
862 | + $this->set_unit_price($new_unit_price); |
|
863 | 863 | } |
864 | 864 | $this->maybe_save(); |
865 | 865 | } |
@@ -875,34 +875,34 @@ discard block |
||
875 | 875 | * @param EE_Line_Item[] $my_children |
876 | 876 | * @return float |
877 | 877 | */ |
878 | - protected function _recalculate_pretax_total_for_subtotal( $calculated_total_so_far, $my_children = null ) { |
|
879 | - if( $my_children === null ) { |
|
878 | + protected function _recalculate_pretax_total_for_subtotal($calculated_total_so_far, $my_children = null) { |
|
879 | + if ($my_children === null) { |
|
880 | 880 | $my_children = $this->children(); |
881 | 881 | } |
882 | 882 | //get the total of all its children |
883 | - foreach ( $my_children as $child_line_item ) { |
|
884 | - if ( $child_line_item instanceof EE_Line_Item ) { |
|
885 | - if ( $child_line_item->is_percent() ) { |
|
883 | + foreach ($my_children as $child_line_item) { |
|
884 | + if ($child_line_item instanceof EE_Line_Item) { |
|
885 | + if ($child_line_item->is_percent()) { |
|
886 | 886 | $percent_total = $calculated_total_so_far * $child_line_item->percent() / 100; |
887 | - $child_line_item->set_total( $percent_total ); |
|
887 | + $child_line_item->set_total($percent_total); |
|
888 | 888 | //so far all percent line items should have a quantity of 1 |
889 | 889 | //(ie, no double percent discounts. Although that might be requested someday) |
890 | - $child_line_item->set_quantity( 1 ); |
|
890 | + $child_line_item->set_quantity(1); |
|
891 | 891 | $child_line_item->maybe_save(); |
892 | 892 | $calculated_total_so_far += $percent_total; |
893 | 893 | } else { |
894 | 894 | //verify flat sub-line-item quantities match their parent |
895 | - if( $child_line_item->is_sub_line_item() ) { |
|
896 | - $child_line_item->set_quantity( $this->quantity() ); |
|
895 | + if ($child_line_item->is_sub_line_item()) { |
|
896 | + $child_line_item->set_quantity($this->quantity()); |
|
897 | 897 | } |
898 | 898 | $calculated_total_so_far += $child_line_item->recalculate_pre_tax_total(); |
899 | 899 | } |
900 | 900 | } |
901 | 901 | } |
902 | 902 | |
903 | - if( $this->is_sub_total() ){ |
|
903 | + if ($this->is_sub_total()) { |
|
904 | 904 | // no negative totals plz |
905 | - $calculated_total_so_far = max( $calculated_total_so_far, 0 ); |
|
905 | + $calculated_total_so_far = max($calculated_total_so_far, 0); |
|
906 | 906 | } |
907 | 907 | return $calculated_total_so_far; |
908 | 908 | } |
@@ -916,8 +916,8 @@ discard block |
||
916 | 916 | * @param EE_Line_Item[] $my_children |
917 | 917 | * @return float |
918 | 918 | */ |
919 | - protected function _recalculate_pretax_total_for_line_item( $calculated_total_so_far, $my_children = null ) { |
|
920 | - if( $my_children === null ) { |
|
919 | + protected function _recalculate_pretax_total_for_line_item($calculated_total_so_far, $my_children = null) { |
|
920 | + if ($my_children === null) { |
|
921 | 921 | $my_children = $this->children(); |
922 | 922 | } |
923 | 923 | //we need to keep track of the running total for a single item, |
@@ -925,9 +925,9 @@ discard block |
||
925 | 925 | $unit_price_for_total = 0; |
926 | 926 | $quantity_for_total = 1; |
927 | 927 | //get the total of all its children |
928 | - foreach ( $my_children as $child_line_item ) { |
|
929 | - if ( $child_line_item instanceof EE_Line_Item ) { |
|
930 | - if ( $child_line_item->is_percent() ) { |
|
928 | + foreach ($my_children as $child_line_item) { |
|
929 | + if ($child_line_item instanceof EE_Line_Item) { |
|
930 | + if ($child_line_item->is_percent()) { |
|
931 | 931 | //it should be the unit-price-so-far multiplied by teh percent multiplied by the quantity |
932 | 932 | //not total multiplied by percent, because that ignores rounding along-the-way |
933 | 933 | $percent_unit_price = round( |
@@ -935,17 +935,17 @@ discard block |
||
935 | 935 | EE_Registry::instance()->CFG->currency->dec_plc |
936 | 936 | ); |
937 | 937 | $percent_total = $percent_unit_price * $quantity_for_total; |
938 | - $child_line_item->set_total( $percent_total ); |
|
938 | + $child_line_item->set_total($percent_total); |
|
939 | 939 | //so far all percent line items should have a quantity of 1 |
940 | 940 | //(ie, no double percent discounts. Although that might be requested someday) |
941 | - $child_line_item->set_quantity( 1 ); |
|
941 | + $child_line_item->set_quantity(1); |
|
942 | 942 | $child_line_item->maybe_save(); |
943 | 943 | $calculated_total_so_far += $percent_total; |
944 | 944 | $unit_price_for_total += $percent_unit_price; |
945 | 945 | } else { |
946 | 946 | //verify flat sub-line-item quantities match their parent |
947 | - if( $child_line_item->is_sub_line_item() ) { |
|
948 | - $child_line_item->set_quantity( $this->quantity() ); |
|
947 | + if ($child_line_item->is_sub_line_item()) { |
|
948 | + $child_line_item->set_quantity($this->quantity()); |
|
949 | 949 | } |
950 | 950 | $quantity_for_total = $child_line_item->quantity(); |
951 | 951 | $calculated_total_so_far += $child_line_item->recalculate_pre_tax_total(); |
@@ -969,10 +969,10 @@ discard block |
||
969 | 969 | //calculate the pretax total |
970 | 970 | $taxable_total = $this->taxable_total(); |
971 | 971 | $tax_total = 0; |
972 | - foreach ( $taxes as $tax ) { |
|
972 | + foreach ($taxes as $tax) { |
|
973 | 973 | $total_on_this_tax = $taxable_total * $tax->percent() / 100; |
974 | 974 | //remember the total on this line item |
975 | - $tax->set_total( $total_on_this_tax ); |
|
975 | + $tax->set_total($total_on_this_tax); |
|
976 | 976 | $tax_total += $tax->total(); |
977 | 977 | } |
978 | 978 | $this->_recalculate_tax_sub_total(); |
@@ -986,21 +986,21 @@ discard block |
||
986 | 986 | * @return void |
987 | 987 | */ |
988 | 988 | private function _recalculate_tax_sub_total() { |
989 | - if ( $this->is_tax_sub_total() ) { |
|
989 | + if ($this->is_tax_sub_total()) { |
|
990 | 990 | $total = 0; |
991 | 991 | $total_percent = 0; |
992 | 992 | //simply loop through all its children (which should be taxes) and sum their total |
993 | - foreach ( $this->children() as $child_tax ) { |
|
994 | - if ( $child_tax instanceof EE_Line_Item ) { |
|
993 | + foreach ($this->children() as $child_tax) { |
|
994 | + if ($child_tax instanceof EE_Line_Item) { |
|
995 | 995 | $total += $child_tax->total(); |
996 | 996 | $total_percent += $child_tax->percent(); |
997 | 997 | } |
998 | 998 | } |
999 | - $this->set_total( $total ); |
|
1000 | - $this->set_percent( $total_percent ); |
|
1001 | - } elseif ( $this->is_total() ) { |
|
1002 | - foreach ( $this->children() as $maybe_tax_subtotal ) { |
|
1003 | - if ( $maybe_tax_subtotal instanceof EE_Line_Item ) { |
|
999 | + $this->set_total($total); |
|
1000 | + $this->set_percent($total_percent); |
|
1001 | + } elseif ($this->is_total()) { |
|
1002 | + foreach ($this->children() as $maybe_tax_subtotal) { |
|
1003 | + if ($maybe_tax_subtotal instanceof EE_Line_Item) { |
|
1004 | 1004 | $maybe_tax_subtotal->_recalculate_tax_sub_total(); |
1005 | 1005 | } |
1006 | 1006 | } |
@@ -1016,8 +1016,8 @@ discard block |
||
1016 | 1016 | public function get_total_tax() { |
1017 | 1017 | $this->_recalculate_tax_sub_total(); |
1018 | 1018 | $total = 0; |
1019 | - foreach ( $this->tax_descendants() as $tax_line_item ) { |
|
1020 | - if ( $tax_line_item instanceof EE_Line_Item ) { |
|
1019 | + foreach ($this->tax_descendants() as $tax_line_item) { |
|
1020 | + if ($tax_line_item instanceof EE_Line_Item) { |
|
1021 | 1021 | $total += $tax_line_item->total(); |
1022 | 1022 | } |
1023 | 1023 | } |
@@ -1031,8 +1031,8 @@ discard block |
||
1031 | 1031 | */ |
1032 | 1032 | public function get_items_total() { |
1033 | 1033 | $total = 0; |
1034 | - foreach ( $this->get_items() as $item ) { |
|
1035 | - if ( $item instanceof EE_Line_Item ) { |
|
1034 | + foreach ($this->get_items() as $item) { |
|
1035 | + if ($item instanceof EE_Line_Item) { |
|
1036 | 1036 | $total += $item->total(); |
1037 | 1037 | } |
1038 | 1038 | } |
@@ -1047,8 +1047,8 @@ discard block |
||
1047 | 1047 | * @return EE_Line_Item[] |
1048 | 1048 | */ |
1049 | 1049 | function tax_descendants() { |
1050 | - EE_Registry::instance()->load_helper( 'Line_Item' ); |
|
1051 | - return EEH_Line_Item::get_tax_descendants( $this ); |
|
1050 | + EE_Registry::instance()->load_helper('Line_Item'); |
|
1051 | + return EEH_Line_Item::get_tax_descendants($this); |
|
1052 | 1052 | } |
1053 | 1053 | |
1054 | 1054 | |
@@ -1058,8 +1058,8 @@ discard block |
||
1058 | 1058 | * @return EE_Line_Item[] |
1059 | 1059 | */ |
1060 | 1060 | function get_items() { |
1061 | - EE_Registry::instance()->load_helper( 'Line_Item' ); |
|
1062 | - return EEH_Line_Item::get_line_item_descendants( $this ); |
|
1061 | + EE_Registry::instance()->load_helper('Line_Item'); |
|
1062 | + return EEH_Line_Item::get_line_item_descendants($this); |
|
1063 | 1063 | } |
1064 | 1064 | |
1065 | 1065 | |
@@ -1073,22 +1073,22 @@ discard block |
||
1073 | 1073 | */ |
1074 | 1074 | function taxable_total() { |
1075 | 1075 | $total = 0; |
1076 | - if ( $this->children() ) { |
|
1077 | - foreach ( $this->children() as $child_line_item ) { |
|
1078 | - if ( $child_line_item->type() == EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) { |
|
1076 | + if ($this->children()) { |
|
1077 | + foreach ($this->children() as $child_line_item) { |
|
1078 | + if ($child_line_item->type() == EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) { |
|
1079 | 1079 | //if it's a percent item, only take into account the percent |
1080 | 1080 | //that's taxable too (the taxable total so far) |
1081 | - if( $child_line_item->is_percent() ) { |
|
1082 | - $total = $total + ( $total * $child_line_item->percent() / 100 ); |
|
1083 | - }else{ |
|
1081 | + if ($child_line_item->is_percent()) { |
|
1082 | + $total = $total + ($total * $child_line_item->percent() / 100); |
|
1083 | + } else { |
|
1084 | 1084 | $total += $child_line_item->total(); |
1085 | 1085 | } |
1086 | - }elseif( $child_line_item->type() == EEM_Line_Item::type_sub_total ){ |
|
1086 | + }elseif ($child_line_item->type() == EEM_Line_Item::type_sub_total) { |
|
1087 | 1087 | $total += $child_line_item->taxable_total(); |
1088 | 1088 | } |
1089 | 1089 | } |
1090 | 1090 | } |
1091 | - return max( $total, 0 ); |
|
1091 | + return max($total, 0); |
|
1092 | 1092 | } |
1093 | 1093 | |
1094 | 1094 | |
@@ -1098,7 +1098,7 @@ discard block |
||
1098 | 1098 | * @return EE_Transaction |
1099 | 1099 | */ |
1100 | 1100 | public function transaction() { |
1101 | - return $this->get_first_related( 'Transaction' ); |
|
1101 | + return $this->get_first_related('Transaction'); |
|
1102 | 1102 | } |
1103 | 1103 | |
1104 | 1104 | |
@@ -1111,17 +1111,17 @@ discard block |
||
1111 | 1111 | * @param int $txn_id if none is provided, assumes $this->TXN_ID() |
1112 | 1112 | * @return int count of items saved |
1113 | 1113 | */ |
1114 | - public function save_this_and_descendants_to_txn( $txn_id = NULL ) { |
|
1115 | - if ( ! $txn_id ) { |
|
1114 | + public function save_this_and_descendants_to_txn($txn_id = NULL) { |
|
1115 | + if ( ! $txn_id) { |
|
1116 | 1116 | $txn_id = $this->TXN_ID(); |
1117 | 1117 | } |
1118 | - $this->set_TXN_ID( $txn_id ); |
|
1118 | + $this->set_TXN_ID($txn_id); |
|
1119 | 1119 | $children = $this->children(); |
1120 | 1120 | $this->save(); |
1121 | - foreach ( $children as $child_line_item ) { |
|
1122 | - if ( $child_line_item instanceof EE_Line_Item ) { |
|
1123 | - $child_line_item->set_parent_ID( $this->ID() ); |
|
1124 | - $child_line_item->save_this_and_descendants_to_txn( $txn_id ); |
|
1121 | + foreach ($children as $child_line_item) { |
|
1122 | + if ($child_line_item instanceof EE_Line_Item) { |
|
1123 | + $child_line_item->set_parent_ID($this->ID()); |
|
1124 | + $child_line_item->save_this_and_descendants_to_txn($txn_id); |
|
1125 | 1125 | } |
1126 | 1126 | } |
1127 | 1127 | } |
@@ -1133,10 +1133,10 @@ discard block |
||
1133 | 1133 | * @param string $type one of the constants on EEM_Line_Item |
1134 | 1134 | * @return EE_Line_Item[] |
1135 | 1135 | */ |
1136 | - protected function _get_descendants_of_type( $type ) { |
|
1137 | - EE_Error::doing_it_wrong( 'EE_Line_Item::_get_descendants_of_type()', __('Method replaced with EEH_Line_Item::get_descendants_of_type()', 'event_espresso'), '4.6.0' ); |
|
1138 | - EE_Registry::instance()->load_helper( 'Line_Item' ); |
|
1139 | - return EEH_Line_Item::get_descendants_of_type( $this, $type ); |
|
1136 | + protected function _get_descendants_of_type($type) { |
|
1137 | + EE_Error::doing_it_wrong('EE_Line_Item::_get_descendants_of_type()', __('Method replaced with EEH_Line_Item::get_descendants_of_type()', 'event_espresso'), '4.6.0'); |
|
1138 | + EE_Registry::instance()->load_helper('Line_Item'); |
|
1139 | + return EEH_Line_Item::get_descendants_of_type($this, $type); |
|
1140 | 1140 | } |
1141 | 1141 | |
1142 | 1142 | |
@@ -1146,10 +1146,10 @@ discard block |
||
1146 | 1146 | * @param string $type like one of the EEM_Line_Item::type_* |
1147 | 1147 | * @return EE_Line_Item |
1148 | 1148 | */ |
1149 | - public function get_nearest_descendant_of_type( $type ) { |
|
1150 | - EE_Error::doing_it_wrong( 'EE_Line_Item::get_nearest_descendant_of_type()', __('Method replaced with EEH_Line_Item::get_nearest_descendant_of_type()', 'event_espresso'), '4.6.0' ); |
|
1151 | - EE_Registry::instance()->load_helper( 'Line_Item' ); |
|
1152 | - return EEH_Line_Item::get_nearest_descendant_of_type( $this, $type ); |
|
1149 | + public function get_nearest_descendant_of_type($type) { |
|
1150 | + EE_Error::doing_it_wrong('EE_Line_Item::get_nearest_descendant_of_type()', __('Method replaced with EEH_Line_Item::get_nearest_descendant_of_type()', 'event_espresso'), '4.6.0'); |
|
1151 | + EE_Registry::instance()->load_helper('Line_Item'); |
|
1152 | + return EEH_Line_Item::get_nearest_descendant_of_type($this, $type); |
|
1153 | 1153 | } |
1154 | 1154 | |
1155 | 1155 | |
@@ -1160,7 +1160,7 @@ discard block |
||
1160 | 1160 | * @return int count of items saved |
1161 | 1161 | */ |
1162 | 1162 | public function maybe_save() { |
1163 | - if ( $this->ID() ) { |
|
1163 | + if ($this->ID()) { |
|
1164 | 1164 | return $this->save(); |
1165 | 1165 | } |
1166 | 1166 | return false; |
@@ -2,18 +2,18 @@ discard block |
||
2 | 2 | exit( 'No direct script access allowed' ); |
3 | 3 | } |
4 | 4 | /** |
5 | - * Event Espresso |
|
6 | - * |
|
7 | - * Event Registration and Management Plugin for WordPress |
|
8 | - * |
|
9 | - * @ package Event Espresso |
|
10 | - * @ author Event Espresso |
|
11 | - * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
12 | - * @ license {@link http://eventespresso.com/support/terms-conditions/} * see Plugin Licensing * |
|
13 | - * @ link {@link http://www.eventespresso.com} |
|
14 | - * @ since 4.0 |
|
15 | - * |
|
16 | - */ |
|
5 | + * Event Espresso |
|
6 | + * |
|
7 | + * Event Registration and Management Plugin for WordPress |
|
8 | + * |
|
9 | + * @ package Event Espresso |
|
10 | + * @ author Event Espresso |
|
11 | + * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. |
|
12 | + * @ license {@link http://eventespresso.com/support/terms-conditions/} * see Plugin Licensing * |
|
13 | + * @ link {@link http://www.eventespresso.com} |
|
14 | + * @ since 4.0 |
|
15 | + * |
|
16 | + */ |
|
17 | 17 | |
18 | 18 | |
19 | 19 | |
@@ -445,8 +445,8 @@ discard block |
||
445 | 445 | $new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) ); |
446 | 446 | $new_question->set_system_ID( null ); |
447 | 447 | $new_question->set_wp_user( get_current_user_id() ); |
448 | - //if we're duplicating a trashed question, assume we don't want the new one to be trashed |
|
449 | - $new_question->set_deleted( false ); |
|
448 | + //if we're duplicating a trashed question, assume we don't want the new one to be trashed |
|
449 | + $new_question->set_deleted( false ); |
|
450 | 450 | $success = $new_question->save(); |
451 | 451 | if( $success ) { |
452 | 452 | //we don't totally want to duplicate the question options, because we want them to be for the NEW question |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | /** |
185 | 185 | * returns the text for displaying the question to users |
186 | 186 | * @access public |
187 | - * @return string |
|
187 | + * @return boolean |
|
188 | 188 | */ |
189 | 189 | public function display_text() { |
190 | 190 | return $this->get( 'QST_display_text' ); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | /** |
196 | 196 | * returns the text for the administrative label |
197 | 197 | * @access public |
198 | - * @return string |
|
198 | + * @return boolean |
|
199 | 199 | */ |
200 | 200 | public function admin_label() { |
201 | 201 | return $this->get( 'QST_admin_label' ); |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | /** |
207 | 207 | * returns the attendee column name for this question |
208 | 208 | * @access public |
209 | - * @return string |
|
209 | + * @return boolean |
|
210 | 210 | */ |
211 | 211 | public function system_ID() { |
212 | 212 | return $this->get( 'QST_system' ); |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | * returns the text which should be displayed when a user |
230 | 230 | * doesn't answer this question in a form |
231 | 231 | * @access public |
232 | - * @return string |
|
232 | + * @return boolean |
|
233 | 233 | */ |
234 | 234 | public function required_text() { |
235 | 235 | return $this->get( 'QST_required_text' ); |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | /** |
241 | 241 | * returns the type of this question |
242 | 242 | * @access public |
243 | - * @return string |
|
243 | + * @return boolean |
|
244 | 244 | */ |
245 | 245 | public function type() { |
246 | 246 | return $this->get( 'QST_type' ); |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | * returns an integer showing where this question should |
253 | 253 | * be placed in a sequence of questions |
254 | 254 | * @access public |
255 | - * @return int |
|
255 | + * @return boolean |
|
256 | 256 | */ |
257 | 257 | public function order() { |
258 | 258 | return $this->get( 'QST_order' ); |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | /** |
276 | 276 | * returns the id the wordpress user who created this question |
277 | 277 | * @access public |
278 | - * @return int |
|
278 | + * @return boolean |
|
279 | 279 | */ |
280 | 280 | public function wp_user() { |
281 | 281 | return $this->get( 'QST_wp_user' ); |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | * Adds an option for this question. Note: if the option were previously associated with a different |
370 | 370 | * Question, that relationship will be overwritten. |
371 | 371 | * @param EE_Question_Option $option |
372 | - * @return boolean success |
|
372 | + * @return EE_Base_Class success |
|
373 | 373 | */ |
374 | 374 | public function add_option( EE_Question_Option $option ) { |
375 | 375 | return $this->_add_relation_to( $option, 'Question_Option' ); |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | /** |
393 | 393 | * Marks the option as deleted. |
394 | 394 | * @param EE_Question_Option $option |
395 | - * @return boolean success |
|
395 | + * @return EE_Base_Class success |
|
396 | 396 | */ |
397 | 397 | public function remove_option( EE_Question_Option $option ) { |
398 | 398 | return $this->_remove_relation_to( $option, 'Question_Option' ); |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | |
462 | 462 | /** |
463 | 463 | * Returns the question's maximum allowed response size |
464 | - * @return int|float |
|
464 | + * @return boolean |
|
465 | 465 | */ |
466 | 466 | public function max() { |
467 | 467 | return $this->get( 'QST_max' ); |
@@ -1,5 +1,5 @@ discard block |
||
1 | -<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
2 | - exit( 'No direct script access allowed' ); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | 3 | } |
4 | 4 | /** |
5 | 5 | * Event Espresso |
@@ -37,9 +37,9 @@ discard block |
||
37 | 37 | * date_format and the second value is the time format |
38 | 38 | * @return EE_Question |
39 | 39 | */ |
40 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
41 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__ ); |
|
42 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
40 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
41 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__); |
|
42 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -50,8 +50,8 @@ discard block |
||
50 | 50 | * the website will be used. |
51 | 51 | * @return EE_Question |
52 | 52 | */ |
53 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
54 | - return new self( $props_n_values, TRUE, $timezone ); |
|
53 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
54 | + return new self($props_n_values, TRUE, $timezone); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | |
@@ -62,8 +62,8 @@ discard block |
||
62 | 62 | * @access public |
63 | 63 | * @param string $QST_display_text |
64 | 64 | */ |
65 | - public function set_display_text( $QST_display_text = '' ) { |
|
66 | - $this->set( 'QST_display_text', $QST_display_text ); |
|
65 | + public function set_display_text($QST_display_text = '') { |
|
66 | + $this->set('QST_display_text', $QST_display_text); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | |
@@ -74,8 +74,8 @@ discard block |
||
74 | 74 | * @access public |
75 | 75 | * @param string $QST_admin_label |
76 | 76 | */ |
77 | - public function set_admin_label( $QST_admin_label = '' ) { |
|
78 | - $this->set( 'QST_admin_label', $QST_admin_label ); |
|
77 | + public function set_admin_label($QST_admin_label = '') { |
|
78 | + $this->set('QST_admin_label', $QST_admin_label); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | |
@@ -86,8 +86,8 @@ discard block |
||
86 | 86 | * @access public |
87 | 87 | * @param mixed $QST_system |
88 | 88 | */ |
89 | - public function set_system_ID( $QST_system = '' ) { |
|
90 | - $this->set( 'QST_system', $QST_system ); |
|
89 | + public function set_system_ID($QST_system = '') { |
|
90 | + $this->set('QST_system', $QST_system); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | * @access public |
99 | 99 | * @param string $QST_type |
100 | 100 | */ |
101 | - public function set_question_type( $QST_type = '' ) { |
|
102 | - $this->set( 'QST_type', $QST_type ); |
|
101 | + public function set_question_type($QST_type = '') { |
|
102 | + $this->set('QST_type', $QST_type); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | * @access public |
111 | 111 | * @param bool $QST_required |
112 | 112 | */ |
113 | - public function set_required( $QST_required = FALSE ) { |
|
114 | - $this->set( 'QST_required', $QST_required ); |
|
113 | + public function set_required($QST_required = FALSE) { |
|
114 | + $this->set('QST_required', $QST_required); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | |
@@ -122,8 +122,8 @@ discard block |
||
122 | 122 | * @access public |
123 | 123 | * @param string $QST_required_text |
124 | 124 | */ |
125 | - public function set_required_text( $QST_required_text = '' ) { |
|
126 | - $this->set( 'QST_required_text', $QST_required_text ); |
|
125 | + public function set_required_text($QST_required_text = '') { |
|
126 | + $this->set('QST_required_text', $QST_required_text); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | |
@@ -134,8 +134,8 @@ discard block |
||
134 | 134 | * @access public |
135 | 135 | * @param int $QST_order |
136 | 136 | */ |
137 | - public function set_order( $QST_order = 0 ) { |
|
138 | - $this->set( 'QST_order', $QST_order ); |
|
137 | + public function set_order($QST_order = 0) { |
|
138 | + $this->set('QST_order', $QST_order); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | |
@@ -146,8 +146,8 @@ discard block |
||
146 | 146 | * @access public |
147 | 147 | * @param bool $QST_admin_only |
148 | 148 | */ |
149 | - public function set_admin_only( $QST_admin_only = FALSE ) { |
|
150 | - $this->set( 'QST_admin_only', $QST_admin_only ); |
|
149 | + public function set_admin_only($QST_admin_only = FALSE) { |
|
150 | + $this->set('QST_admin_only', $QST_admin_only); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | |
@@ -158,8 +158,8 @@ discard block |
||
158 | 158 | * @access public |
159 | 159 | * @param int $QST_wp_user |
160 | 160 | */ |
161 | - public function set_wp_user( $QST_wp_user = 1 ) { |
|
162 | - $this->set( 'QST_wp_user', $QST_wp_user ); |
|
161 | + public function set_wp_user($QST_wp_user = 1) { |
|
162 | + $this->set('QST_wp_user', $QST_wp_user); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | |
@@ -175,8 +175,8 @@ discard block |
||
175 | 175 | * @access public |
176 | 176 | * @param bool $QST_deleted |
177 | 177 | */ |
178 | - public function set_deleted( $QST_deleted = FALSE ) { |
|
179 | - $this->set( 'QST_deleted', $QST_deleted ); |
|
178 | + public function set_deleted($QST_deleted = FALSE) { |
|
179 | + $this->set('QST_deleted', $QST_deleted); |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | * @return string |
188 | 188 | */ |
189 | 189 | public function display_text() { |
190 | - return $this->get( 'QST_display_text' ); |
|
190 | + return $this->get('QST_display_text'); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | * @return string |
199 | 199 | */ |
200 | 200 | public function admin_label() { |
201 | - return $this->get( 'QST_admin_label' ); |
|
201 | + return $this->get('QST_admin_label'); |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | * @return string |
210 | 210 | */ |
211 | 211 | public function system_ID() { |
212 | - return $this->get( 'QST_system' ); |
|
212 | + return $this->get('QST_system'); |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | * @return boolean |
221 | 221 | */ |
222 | 222 | public function required() { |
223 | - return $this->get( 'QST_required' ); |
|
223 | + return $this->get('QST_required'); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | * @return string |
233 | 233 | */ |
234 | 234 | public function required_text() { |
235 | - return $this->get( 'QST_required_text' ); |
|
235 | + return $this->get('QST_required_text'); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | * @return string |
244 | 244 | */ |
245 | 245 | public function type() { |
246 | - return $this->get( 'QST_type' ); |
|
246 | + return $this->get('QST_type'); |
|
247 | 247 | } |
248 | 248 | |
249 | 249 | |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | * @return int |
256 | 256 | */ |
257 | 257 | public function order() { |
258 | - return $this->get( 'QST_order' ); |
|
258 | + return $this->get('QST_order'); |
|
259 | 259 | } |
260 | 260 | |
261 | 261 | |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | * @return boolean |
268 | 268 | */ |
269 | 269 | public function admin_only() { |
270 | - return $this->get( 'QST_admin_only' ); |
|
270 | + return $this->get('QST_admin_only'); |
|
271 | 271 | } |
272 | 272 | |
273 | 273 | |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | * @return int |
279 | 279 | */ |
280 | 280 | public function wp_user() { |
281 | - return $this->get( 'QST_wp_user' ); |
|
281 | + return $this->get('QST_wp_user'); |
|
282 | 282 | } |
283 | 283 | |
284 | 284 | |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | * @return boolean |
290 | 290 | */ |
291 | 291 | public function deleted() { |
292 | - return $this->get( 'QST_deleted' ); |
|
292 | + return $this->get('QST_deleted'); |
|
293 | 293 | } |
294 | 294 | |
295 | 295 | |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | * @return EE_Answer[] |
300 | 300 | */ |
301 | 301 | public function answers() { |
302 | - return $this->get_many_related( 'Answer' ); |
|
302 | + return $this->get_many_related('Answer'); |
|
303 | 303 | } |
304 | 304 | |
305 | 305 | |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | * @return boolean true = has answers, false = no answers. |
310 | 310 | */ |
311 | 311 | public function has_answers() { |
312 | - return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE; |
|
312 | + return $this->count_related('Answer') > 0 ? TRUE : FALSE; |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | * @return EE_Question_Group[] |
320 | 320 | */ |
321 | 321 | public function question_groups() { |
322 | - return $this->get_many_related( 'Question_Group' ); |
|
322 | + return $this->get_many_related('Question_Group'); |
|
323 | 323 | } |
324 | 324 | |
325 | 325 | |
@@ -333,24 +333,24 @@ discard block |
||
333 | 333 | * whether it was trashed or not. |
334 | 334 | * @return EE_Question_Option[] |
335 | 335 | */ |
336 | - public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) { |
|
337 | - if ( ! $this->ID() ) { |
|
336 | + public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) { |
|
337 | + if ( ! $this->ID()) { |
|
338 | 338 | return array(); |
339 | 339 | } |
340 | 340 | $query_params = array(); |
341 | - if ( $selected_value_to_always_include ) { |
|
342 | - if ( is_array( $selected_value_to_always_include ) ) { |
|
343 | - $query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include ); |
|
341 | + if ($selected_value_to_always_include) { |
|
342 | + if (is_array($selected_value_to_always_include)) { |
|
343 | + $query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include); |
|
344 | 344 | } else { |
345 | - $query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include; |
|
345 | + $query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include; |
|
346 | 346 | } |
347 | 347 | } |
348 | - if ( $notDeletedOptionsOnly ) { |
|
349 | - $query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE; |
|
348 | + if ($notDeletedOptionsOnly) { |
|
349 | + $query_params[0]['OR*options-query']['QSO_deleted'] = FALSE; |
|
350 | 350 | } |
351 | 351 | //order by QSO_order |
352 | - $query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' ); |
|
353 | - return $this->get_many_related( 'Question_Option', $query_params ); |
|
352 | + $query_params['order_by'] = array('QSO_order' => 'ASC'); |
|
353 | + return $this->get_many_related('Question_Option', $query_params); |
|
354 | 354 | } |
355 | 355 | |
356 | 356 | |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | * @return \EE_Question_Option[] |
361 | 361 | */ |
362 | 362 | public function temp_options() { |
363 | - return $this->_model_relations[ 'Question_Option' ]; |
|
363 | + return $this->_model_relations['Question_Option']; |
|
364 | 364 | } |
365 | 365 | |
366 | 366 | |
@@ -371,8 +371,8 @@ discard block |
||
371 | 371 | * @param EE_Question_Option $option |
372 | 372 | * @return boolean success |
373 | 373 | */ |
374 | - public function add_option( EE_Question_Option $option ) { |
|
375 | - return $this->_add_relation_to( $option, 'Question_Option' ); |
|
374 | + public function add_option(EE_Question_Option $option) { |
|
375 | + return $this->_add_relation_to($option, 'Question_Option'); |
|
376 | 376 | } |
377 | 377 | |
378 | 378 | |
@@ -382,8 +382,8 @@ discard block |
||
382 | 382 | * @param EE_Question_Option $option |
383 | 383 | * @return boolean success |
384 | 384 | */ |
385 | - public function add_temp_option( EE_Question_Option $option ) { |
|
386 | - $this->_model_relations[ 'Question_Option' ][ ] = $option; |
|
385 | + public function add_temp_option(EE_Question_Option $option) { |
|
386 | + $this->_model_relations['Question_Option'][] = $option; |
|
387 | 387 | return TRUE; |
388 | 388 | } |
389 | 389 | |
@@ -394,8 +394,8 @@ discard block |
||
394 | 394 | * @param EE_Question_Option $option |
395 | 395 | * @return boolean success |
396 | 396 | */ |
397 | - public function remove_option( EE_Question_Option $option ) { |
|
398 | - return $this->_remove_relation_to( $option, 'Question_Option' ); |
|
397 | + public function remove_option(EE_Question_Option $option) { |
|
398 | + return $this->_remove_relation_to($option, 'Question_Option'); |
|
399 | 399 | } |
400 | 400 | |
401 | 401 | |
@@ -404,8 +404,8 @@ discard block |
||
404 | 404 | * @return bool |
405 | 405 | */ |
406 | 406 | public function is_system_question() { |
407 | - $system_ID = $this->get( 'QST_system' ); |
|
408 | - return ! empty( $system_ID ) ? TRUE : FALSE; |
|
407 | + $system_ID = $this->get('QST_system'); |
|
408 | + return ! empty($system_ID) ? TRUE : FALSE; |
|
409 | 409 | } |
410 | 410 | |
411 | 411 | |
@@ -418,8 +418,8 @@ discard block |
||
418 | 418 | */ |
419 | 419 | public function set_order_to_latest() { |
420 | 420 | $latest_order = $this->get_model()->get_latest_question_order(); |
421 | - $latest_order ++; |
|
422 | - $this->set( 'QST_order', $latest_order ); |
|
421 | + $latest_order++; |
|
422 | + $this->set('QST_order', $latest_order); |
|
423 | 423 | } |
424 | 424 | |
425 | 425 | |
@@ -438,20 +438,20 @@ discard block |
||
438 | 438 | * Duplicates this question and its question options |
439 | 439 | * @return \EE_Question |
440 | 440 | */ |
441 | - public function duplicate( $options = array() ) { |
|
441 | + public function duplicate($options = array()) { |
|
442 | 442 | $new_question = clone $this; |
443 | - $new_question->set( 'QST_ID', null ); |
|
444 | - $new_question->set_display_text( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->display_text() ) ); |
|
445 | - $new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) ); |
|
446 | - $new_question->set_system_ID( null ); |
|
447 | - $new_question->set_wp_user( get_current_user_id() ); |
|
443 | + $new_question->set('QST_ID', null); |
|
444 | + $new_question->set_display_text(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->display_text())); |
|
445 | + $new_question->set_admin_label(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->admin_label())); |
|
446 | + $new_question->set_system_ID(null); |
|
447 | + $new_question->set_wp_user(get_current_user_id()); |
|
448 | 448 | //if we're duplicating a trashed question, assume we don't want the new one to be trashed |
449 | - $new_question->set_deleted( false ); |
|
449 | + $new_question->set_deleted(false); |
|
450 | 450 | $success = $new_question->save(); |
451 | - if( $success ) { |
|
451 | + if ($success) { |
|
452 | 452 | //we don't totally want to duplicate the question options, because we want them to be for the NEW question |
453 | - foreach( $this->options() as $question_option ) { |
|
454 | - $question_option->duplicate( array( 'QST_ID' => $new_question->ID() ) ); |
|
453 | + foreach ($this->options() as $question_option) { |
|
454 | + $question_option->duplicate(array('QST_ID' => $new_question->ID())); |
|
455 | 455 | } |
456 | 456 | return $new_question; |
457 | 457 | } else { |
@@ -464,7 +464,7 @@ discard block |
||
464 | 464 | * @return int|float |
465 | 465 | */ |
466 | 466 | public function max() { |
467 | - return $this->get( 'QST_max' ); |
|
467 | + return $this->get('QST_max'); |
|
468 | 468 | } |
469 | 469 | |
470 | 470 | /** |
@@ -472,8 +472,8 @@ discard block |
||
472 | 472 | * @param int|float $new_max |
473 | 473 | * @return int|float |
474 | 474 | */ |
475 | - public function set_max( $new_max ) { |
|
476 | - return $this->set( 'QST_max', $new_max ); |
|
475 | + public function set_max($new_max) { |
|
476 | + return $this->set('QST_max', $new_max); |
|
477 | 477 | } |
478 | 478 | |
479 | 479 |