@@ -117,9 +117,9 @@ discard block |
||
117 | 117 | * All children of this must call parent::__construct() at the end of their constructor or suffer the consequences! |
118 | 118 | */ |
119 | 119 | public function __construct() { |
120 | - $this->_migration_stages = apply_filters('FHEE__'.get_class($this).'__construct__migration_stages',$this->_migration_stages); |
|
121 | - foreach($this->_migration_stages as $migration_stage){ |
|
122 | - if ( $migration_stage instanceof EE_Data_Migration_Script_Stage ) { |
|
120 | + $this->_migration_stages = apply_filters('FHEE__'.get_class($this).'__construct__migration_stages', $this->_migration_stages); |
|
121 | + foreach ($this->_migration_stages as $migration_stage) { |
|
122 | + if ($migration_stage instanceof EE_Data_Migration_Script_Stage) { |
|
123 | 123 | $migration_stage->_construct_finalize($this); |
124 | 124 | } |
125 | 125 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * Place to add hooks and filters for tweaking the migrations page, in order |
133 | 133 | * to customize it |
134 | 134 | */ |
135 | - public function migration_page_hooks(){ |
|
135 | + public function migration_page_hooks() { |
|
136 | 136 | //by default none are added because we normally like the default look of the migration page |
137 | 137 | } |
138 | 138 | |
@@ -147,9 +147,9 @@ discard block |
||
147 | 147 | * @param int|string $new_pk eg posts.ID |
148 | 148 | * @return void |
149 | 149 | */ |
150 | - public function set_mapping($old_table,$old_pk,$new_table,$new_pk){ |
|
150 | + public function set_mapping($old_table, $old_pk, $new_table, $new_pk) { |
|
151 | 151 | //make sure it has the needed keys |
152 | - if( ! isset($this->_mappings[$old_table]) || ! isset($this->_mappings[$old_table][$new_table])){ |
|
152 | + if ( ! isset($this->_mappings[$old_table]) || ! isset($this->_mappings[$old_table][$new_table])) { |
|
153 | 153 | $this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table); |
154 | 154 | } |
155 | 155 | $this->_mappings[$old_table][$new_table][$old_pk] = $new_pk; |
@@ -165,9 +165,9 @@ discard block |
||
165 | 165 | * @param string $new_table with wpdb prefix (wp_). Eg: wp_posts |
166 | 166 | * @return mixed the primary key on the new table |
167 | 167 | */ |
168 | - public function get_mapping_new_pk($old_table,$old_pk,$new_table){ |
|
169 | - if( ! isset($this->_mappings[$old_table]) || |
|
170 | - ! isset($this->_mappings[$old_table][$new_table])){ |
|
168 | + public function get_mapping_new_pk($old_table, $old_pk, $new_table) { |
|
169 | + if ( ! isset($this->_mappings[$old_table]) || |
|
170 | + ! isset($this->_mappings[$old_table][$new_table])) { |
|
171 | 171 | //try fetching the option |
172 | 172 | $this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table); |
173 | 173 | } |
@@ -184,15 +184,15 @@ discard block |
||
184 | 184 | * @param mixed $new_pk |
185 | 185 | * @return mixed |
186 | 186 | */ |
187 | - public function get_mapping_old_pk($old_table,$new_table,$new_pk){ |
|
188 | - if( ! isset($this->_mappings[$old_table]) || |
|
189 | - ! isset($this->_mappings[$old_table][$new_table])){ |
|
187 | + public function get_mapping_old_pk($old_table, $new_table, $new_pk) { |
|
188 | + if ( ! isset($this->_mappings[$old_table]) || |
|
189 | + ! isset($this->_mappings[$old_table][$new_table])) { |
|
190 | 190 | //try fetching the option |
191 | 191 | $this->_mappings[$old_table][$new_table] = $this->_get_mapping_option($old_table, $new_table); |
192 | 192 | } |
193 | - if(isset($this->_mappings[$old_table][$new_table])){ |
|
193 | + if (isset($this->_mappings[$old_table][$new_table])) { |
|
194 | 194 | $new_pk_to_old_pk = array_flip($this->_mappings[$old_table][$new_table]); |
195 | - if(isset($new_pk_to_old_pk[$new_pk])){ |
|
195 | + if (isset($new_pk_to_old_pk[$new_pk])) { |
|
196 | 196 | return $new_pk_to_old_pk[$new_pk]; |
197 | 197 | } |
198 | 198 | } |
@@ -207,8 +207,8 @@ discard block |
||
207 | 207 | * @param string $new_table_name |
208 | 208 | * @return array |
209 | 209 | */ |
210 | - protected function _get_mapping_option($old_table_name,$new_table_name){ |
|
211 | - $option = get_option($this->_get_mapping_option_name($old_table_name, $new_table_name),array()); |
|
210 | + protected function _get_mapping_option($old_table_name, $new_table_name) { |
|
211 | + $option = get_option($this->_get_mapping_option_name($old_table_name, $new_table_name), array()); |
|
212 | 212 | return $option; |
213 | 213 | } |
214 | 214 | |
@@ -221,9 +221,9 @@ discard block |
||
221 | 221 | * @param array $mapping_array |
222 | 222 | * @return boolean success of updating option |
223 | 223 | */ |
224 | - protected function _set_mapping_option($old_table_name,$new_table_name,$mapping_array){ |
|
224 | + protected function _set_mapping_option($old_table_name, $new_table_name, $mapping_array) { |
|
225 | 225 | // echo "set mapping for $old_table_name $new_table_name".count($mapping_array)."<br>"; |
226 | - $success = update_option($this->_get_mapping_option_name($old_table_name, $new_table_name),$mapping_array); |
|
226 | + $success = update_option($this->_get_mapping_option_name($old_table_name, $new_table_name), $mapping_array); |
|
227 | 227 | return $success; |
228 | 228 | } |
229 | 229 | |
@@ -235,12 +235,12 @@ discard block |
||
235 | 235 | * @param string $new_table_name |
236 | 236 | * @return string |
237 | 237 | */ |
238 | - protected function _get_mapping_option_name($old_table_name,$new_table_name){ |
|
238 | + protected function _get_mapping_option_name($old_table_name, $new_table_name) { |
|
239 | 239 | global $wpdb; |
240 | - $old_table_name_sans_wp = str_replace($wpdb->prefix,"",$old_table_name); |
|
241 | - $new_table_name_sans_wp = str_replace($wpdb->prefix,"",$new_table_name); |
|
240 | + $old_table_name_sans_wp = str_replace($wpdb->prefix, "", $old_table_name); |
|
241 | + $new_table_name_sans_wp = str_replace($wpdb->prefix, "", $new_table_name); |
|
242 | 242 | $migrates_to = EE_Data_Migration_Manager::instance()->script_migrates_to_version(get_class($this)); |
243 | - return substr( EE_Data_Migration_Manager::data_migration_script_mapping_option_prefix . $migrates_to [ 'slug' ] . '_' . $migrates_to[ 'version' ] . '_' . $old_table_name_sans_wp . '_' . $new_table_name_sans_wp, 0, 64 ); |
|
243 | + return substr(EE_Data_Migration_Manager::data_migration_script_mapping_option_prefix.$migrates_to ['slug'].'_'.$migrates_to['version'].'_'.$old_table_name_sans_wp.'_'.$new_table_name_sans_wp, 0, 64); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | |
@@ -257,10 +257,10 @@ discard block |
||
257 | 257 | * 99% until the function "migration_step" returns EE_Data_Migration_Script_Base::status_complete. |
258 | 258 | * @return int |
259 | 259 | */ |
260 | - protected function _count_records_to_migrate(){ |
|
260 | + protected function _count_records_to_migrate() { |
|
261 | 261 | $count = 0; |
262 | - foreach($this->stages() as $stage){ |
|
263 | - $count+= $stage->count_records_to_migrate(); |
|
262 | + foreach ($this->stages() as $stage) { |
|
263 | + $count += $stage->count_records_to_migrate(); |
|
264 | 264 | } |
265 | 265 | return $count; |
266 | 266 | } |
@@ -272,10 +272,10 @@ discard block |
||
272 | 272 | * by just setting a transient and updating it after each migration_step |
273 | 273 | * @return int |
274 | 274 | */ |
275 | - public function count_records_migrated(){ |
|
275 | + public function count_records_migrated() { |
|
276 | 276 | $count = 0; |
277 | - foreach($this->stages() as $stage){ |
|
278 | - $count+= $stage->count_records_migrated(); |
|
277 | + foreach ($this->stages() as $stage) { |
|
278 | + $count += $stage->count_records_migrated(); |
|
279 | 279 | } |
280 | 280 | $this->_records_migrated = $count; |
281 | 281 | return $count; |
@@ -289,24 +289,24 @@ discard block |
||
289 | 289 | * @throws EE_Error |
290 | 290 | * @throws Exception |
291 | 291 | */ |
292 | - public function migration_step($num_records_to_migrate_limit){ |
|
292 | + public function migration_step($num_records_to_migrate_limit) { |
|
293 | 293 | //reset the feedback message |
294 | 294 | $this->_feedback_message = ''; |
295 | 295 | //if we haven't yet done the 1st schema changes, do them now. buffer any output |
296 | 296 | $this->_maybe_do_schema_changes(true); |
297 | 297 | |
298 | - $num_records_actually_migrated =0; |
|
298 | + $num_records_actually_migrated = 0; |
|
299 | 299 | $records_migrated_per_stage = array(); |
300 | 300 | //setup the 'stage' variable, which should hold the last run stage of the migration (or none at all if nothing runs) |
301 | 301 | $stage = null; |
302 | 302 | //get the next stage that isn't complete |
303 | - foreach($this->stages() as $stage){ |
|
304 | - if( $stage->get_status() == EE_Data_Migration_Manager::status_continue){ |
|
305 | - try{ |
|
303 | + foreach ($this->stages() as $stage) { |
|
304 | + if ($stage->get_status() == EE_Data_Migration_Manager::status_continue) { |
|
305 | + try { |
|
306 | 306 | $records_migrated_during_stage = $stage->migration_step($num_records_to_migrate_limit - $num_records_actually_migrated); |
307 | 307 | $num_records_actually_migrated += $records_migrated_during_stage; |
308 | 308 | $records_migrated_per_stage[$stage->pretty_name()] = $records_migrated_during_stage; |
309 | - }catch(Exception $e){ |
|
309 | + } catch (Exception $e) { |
|
310 | 310 | //yes if we catch an exception here, we consider that migration stage borked. |
311 | 311 | $stage->set_status(EE_Data_Migration_Manager::status_fatal_error); |
312 | 312 | $this->set_status(EE_Data_Migration_Manager::status_fatal_error); |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | throw $e; |
315 | 315 | } |
316 | 316 | //check that the migration stage didn't mark itself as having a fatal error |
317 | - if($stage->is_broken()){ |
|
317 | + if ($stage->is_broken()) { |
|
318 | 318 | $this->set_broken(); |
319 | 319 | throw new EE_Error($stage->get_last_error()); |
320 | 320 | } |
@@ -322,24 +322,24 @@ discard block |
||
322 | 322 | //once we've migrated all the number we intended to (possibly from different stages), stop migrating |
323 | 323 | //or if we had a fatal error |
324 | 324 | //or if the current script stopped early- its not done, but it's done all it thinks we should do on this step |
325 | - if ($num_records_actually_migrated >= $num_records_to_migrate_limit || $stage->is_broken() || $stage->has_more_to_do()){ |
|
325 | + if ($num_records_actually_migrated >= $num_records_to_migrate_limit || $stage->is_broken() || $stage->has_more_to_do()) { |
|
326 | 326 | break; |
327 | 327 | } |
328 | 328 | } |
329 | 329 | //check if we're all done this data migration... |
330 | 330 | //which is indicated by being done early AND the last stage claims to be done |
331 | - if($stage == NULL){ |
|
331 | + if ($stage == NULL) { |
|
332 | 332 | //this migration script apparently has NO stages... which is super weird, but whatever |
333 | 333 | $this->set_completed(); |
334 | 334 | $this->_maybe_do_schema_changes(false); |
335 | - }else if( $num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()){ |
|
335 | + } else if ($num_records_actually_migrated < $num_records_to_migrate_limit && ! $stage->has_more_to_do()) { |
|
336 | 336 | //apparently we're done, because we couldn't migrate the number we intended to |
337 | 337 | $this->set_completed(); |
338 | 338 | $this->_update_feedback_message(array_reverse($records_migrated_per_stage)); |
339 | 339 | //do schema changes for after the migration now |
340 | 340 | //first double-check we haven't already done this |
341 | 341 | $this->_maybe_do_schema_changes(false); |
342 | - }else{ |
|
342 | + } else { |
|
343 | 343 | //update feedback message, keeping in mind that we show them with the most recent at the top |
344 | 344 | $this->_update_feedback_message(array_reverse($records_migrated_per_stage)); |
345 | 345 | } |
@@ -353,12 +353,12 @@ discard block |
||
353 | 353 | * @param array $records_migrated_per_stage KEYS are pretty names for each stage; values are the count of records migrated from that stage |
354 | 354 | * @return void |
355 | 355 | */ |
356 | - private function _update_feedback_message($records_migrated_per_stage){ |
|
356 | + private function _update_feedback_message($records_migrated_per_stage) { |
|
357 | 357 | $feedback_message_array = array(); |
358 | - foreach($records_migrated_per_stage as $migration_stage_name => $num_records_migrated){ |
|
359 | - $feedback_message_array[] = sprintf(__("Migrated %d records successfully during %s", "event_espresso"),$num_records_migrated,$migration_stage_name) ; |
|
358 | + foreach ($records_migrated_per_stage as $migration_stage_name => $num_records_migrated) { |
|
359 | + $feedback_message_array[] = sprintf(__("Migrated %d records successfully during %s", "event_espresso"), $num_records_migrated, $migration_stage_name); |
|
360 | 360 | } |
361 | - $this->_feedback_message .= implode("<br>",$feedback_message_array); |
|
361 | + $this->_feedback_message .= implode("<br>", $feedback_message_array); |
|
362 | 362 | } |
363 | 363 | |
364 | 364 | |
@@ -370,27 +370,27 @@ discard block |
||
370 | 370 | * @throws Exception |
371 | 371 | * @return void |
372 | 372 | */ |
373 | - private function _maybe_do_schema_changes($before = true){ |
|
373 | + private function _maybe_do_schema_changes($before = true) { |
|
374 | 374 | //so this property will be either _schema_changes_after_migration_ran or _schema_changes_before_migration_ran |
375 | - $property_name = '_schema_changes_'. ($before ? 'before' : 'after').'_migration_ran'; |
|
376 | - if ( ! $this->{$property_name} ){ |
|
377 | - try{ |
|
375 | + $property_name = '_schema_changes_'.($before ? 'before' : 'after').'_migration_ran'; |
|
376 | + if ( ! $this->{$property_name} ) { |
|
377 | + try { |
|
378 | 378 | ob_start(); |
379 | - if($before){ |
|
379 | + if ($before) { |
|
380 | 380 | $this->schema_changes_before_migration(); |
381 | - }else{ |
|
381 | + } else { |
|
382 | 382 | $this->schema_changes_after_migration(); |
383 | 383 | } |
384 | 384 | $output = ob_get_contents(); |
385 | 385 | ob_end_clean(); |
386 | - }catch(Exception $e){ |
|
386 | + } catch (Exception $e) { |
|
387 | 387 | $this->set_status(EE_Data_Migration_Manager::status_fatal_error); |
388 | 388 | throw $e; |
389 | 389 | } |
390 | 390 | //record that we've done these schema changes |
391 | 391 | $this->{$property_name} = true; |
392 | 392 | //if there were any warnings etc, record them as non-fatal errors |
393 | - if( $output ){ |
|
393 | + if ($output) { |
|
394 | 394 | //there were some warnings |
395 | 395 | $this->_errors[] = $output; |
396 | 396 | } |
@@ -417,9 +417,9 @@ discard block |
||
417 | 417 | * @param string $table_definition_sql |
418 | 418 | * @param string $engine_string |
419 | 419 | */ |
420 | - protected function _table_is_new_in_this_version($table_name,$table_definition_sql,$engine_string='ENGINE=InnoDB '){ |
|
420 | + protected function _table_is_new_in_this_version($table_name, $table_definition_sql, $engine_string = 'ENGINE=InnoDB ') { |
|
421 | 421 | // EEH_Debug_Tools::instance()->start_timer( '_table_is_new_in_this_version_' . $table_name ); |
422 | - $this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped( true ) ); |
|
422 | + $this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(true)); |
|
423 | 423 | // EEH_Debug_Tools::instance()->stop_timer( '_table_is_new_in_this_version_' . $table_name ); |
424 | 424 | } |
425 | 425 | |
@@ -433,9 +433,9 @@ discard block |
||
433 | 433 | * @param string $table_definition_sql |
434 | 434 | * @param string $engine_string |
435 | 435 | */ |
436 | - protected function _table_is_changed_in_this_version($table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){ |
|
436 | + protected function _table_is_changed_in_this_version($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') { |
|
437 | 437 | // EEH_Debug_Tools::instance()->start_timer( '_table_is_changed_in_this_version' . $table_name ); |
438 | - $this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped( false ) ); |
|
438 | + $this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false)); |
|
439 | 439 | // EEH_Debug_Tools::instance()->stop_timer( '_table_is_changed_in_this_version' . $table_name ); |
440 | 440 | } |
441 | 441 | |
@@ -446,9 +446,9 @@ discard block |
||
446 | 446 | * @param string $table_name |
447 | 447 | * @return boolean |
448 | 448 | */ |
449 | - protected function _old_table_exists( $table_name ) { |
|
450 | - EE_Registry::instance()->load_helper( 'Activation' ); |
|
451 | - return EEH_Activation::table_exists( $table_name ); |
|
449 | + protected function _old_table_exists($table_name) { |
|
450 | + EE_Registry::instance()->load_helper('Activation'); |
|
451 | + return EEH_Activation::table_exists($table_name); |
|
452 | 452 | } |
453 | 453 | |
454 | 454 | |
@@ -458,9 +458,9 @@ discard block |
||
458 | 458 | * @param string $table_name |
459 | 459 | * @return boolean |
460 | 460 | */ |
461 | - protected function _delete_table_if_empty( $table_name ) { |
|
462 | - EE_Registry::instance()->load_helper( 'Activation' ); |
|
463 | - return EEH_Activation::delete_db_table_if_empty( $table_name ); |
|
461 | + protected function _delete_table_if_empty($table_name) { |
|
462 | + EE_Registry::instance()->load_helper('Activation'); |
|
463 | + return EEH_Activation::delete_db_table_if_empty($table_name); |
|
464 | 464 | } |
465 | 465 | |
466 | 466 | |
@@ -479,9 +479,9 @@ discard block |
||
479 | 479 | * @param string $table_definition_sql |
480 | 480 | * @param string $engine_string |
481 | 481 | */ |
482 | - protected function _table_should_exist_previously($table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){ |
|
482 | + protected function _table_should_exist_previously($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') { |
|
483 | 483 | // EEH_Debug_Tools::instance()->start_timer( '_table_should_exist_previously' . $table_name ); |
484 | - $this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped( false ) ); |
|
484 | + $this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false)); |
|
485 | 485 | // EEH_Debug_Tools::instance()->stop_timer( '_table_should_exist_previously' . $table_name ); |
486 | 486 | } |
487 | 487 | |
@@ -496,13 +496,13 @@ discard block |
||
496 | 496 | * @param string $table_definition_sql |
497 | 497 | * @param string $engine_string |
498 | 498 | */ |
499 | - protected function _table_has_not_changed_since_previous( $table_name,$table_definition_sql,$engine_string = 'ENGINE=MyISAM'){ |
|
500 | - if( $this->_currently_migrating() ) { |
|
499 | + protected function _table_has_not_changed_since_previous($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM') { |
|
500 | + if ($this->_currently_migrating()) { |
|
501 | 501 | //if we're doing a migration, and this table apparently already exists, then we don't need do anything right? |
502 | 502 | // EEH_Debug_Tools::instance()->stop_timer( '_table_should_exist_previously' . $table_name ); |
503 | 503 | return; |
504 | 504 | } |
505 | - $this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped( false ) ); |
|
505 | + $this->_create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string, $this->_pre_existing_table_should_be_dropped(false)); |
|
506 | 506 | } |
507 | 507 | |
508 | 508 | /** |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | protected function _currently_migrating() { |
513 | 513 | //we want to know if we are currently performing a migration. We could just believe what was set on the _migrating property, but let's double-check (ie the script should apply and we should be in MM) |
514 | 514 | return $this->_migrating && |
515 | - $this->can_migrate_from_version( EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set() ) && |
|
515 | + $this->can_migrate_from_version(EE_Data_Migration_Manager::instance()->ensure_current_database_state_is_set()) && |
|
516 | 516 | EE_Maintenance_Mode::instance()->real_level() == EE_Maintenance_Mode::level_2_complete_maintenance; |
517 | 517 | } |
518 | 518 | |
@@ -523,17 +523,17 @@ discard block |
||
523 | 523 | * @param boolean $table_is_new |
524 | 524 | * @return boolean |
525 | 525 | */ |
526 | - protected function _pre_existing_table_should_be_dropped( $table_is_new ) { |
|
527 | - if( $table_is_new ) { |
|
528 | - if( $this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation || $this->_currently_migrating() ){ |
|
526 | + protected function _pre_existing_table_should_be_dropped($table_is_new) { |
|
527 | + if ($table_is_new) { |
|
528 | + if ($this->_get_req_type_for_plugin_corresponding_to_this_dms() == EE_System::req_type_new_activation || $this->_currently_migrating()) { |
|
529 | 529 | return true; |
530 | - }else{ |
|
530 | + } else { |
|
531 | 531 | return false; |
532 | 532 | } |
533 | - }else{ |
|
534 | - if(in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(),array(EE_System::req_type_new_activation))){ |
|
533 | + } else { |
|
534 | + if (in_array($this->_get_req_type_for_plugin_corresponding_to_this_dms(), array(EE_System::req_type_new_activation))) { |
|
535 | 535 | return true; |
536 | - }else{ |
|
536 | + } else { |
|
537 | 537 | return false; |
538 | 538 | } |
539 | 539 | } |
@@ -546,13 +546,13 @@ discard block |
||
546 | 546 | * @param string $engine_string |
547 | 547 | * @param boolean $drop_pre_existing_tables |
548 | 548 | */ |
549 | - private function _create_table_and_catch_errors( $table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM', $drop_pre_existing_tables = FALSE ){ |
|
549 | + private function _create_table_and_catch_errors($table_name, $table_definition_sql, $engine_string = 'ENGINE=MyISAM', $drop_pre_existing_tables = FALSE) { |
|
550 | 550 | EE_Registry::instance()->load_helper('Activation'); |
551 | - try{ |
|
552 | - EEH_Activation::create_table($table_name,$table_definition_sql, $engine_string, $drop_pre_existing_tables); |
|
553 | - }catch( EE_Error $e ) { |
|
554 | - $message = $e->getMessage() . '<br>Stack Trace:' . $e->getTraceAsString(); |
|
555 | - $this->add_error( $message ); |
|
551 | + try { |
|
552 | + EEH_Activation::create_table($table_name, $table_definition_sql, $engine_string, $drop_pre_existing_tables); |
|
553 | + } catch (EE_Error $e) { |
|
554 | + $message = $e->getMessage().'<br>Stack Trace:'.$e->getTraceAsString(); |
|
555 | + $this->add_error($message); |
|
556 | 556 | $this->_feedback_message .= $message; |
557 | 557 | } |
558 | 558 | } |
@@ -564,15 +564,15 @@ discard block |
||
564 | 564 | * @return int one of EE_System::_req_type_* constants |
565 | 565 | * @throws EE_Error |
566 | 566 | */ |
567 | - private function _get_req_type_for_plugin_corresponding_to_this_dms(){ |
|
568 | - if($this->slug() == 'Core'){ |
|
567 | + private function _get_req_type_for_plugin_corresponding_to_this_dms() { |
|
568 | + if ($this->slug() == 'Core') { |
|
569 | 569 | return EE_System::instance()->detect_req_type(); |
570 | - }else{//it must be for an addon |
|
570 | + } else {//it must be for an addon |
|
571 | 571 | $addon_name = $this->slug(); |
572 | - if( EE_Registry::instance()->get_addon_by_name($addon_name)){ |
|
572 | + if (EE_Registry::instance()->get_addon_by_name($addon_name)) { |
|
573 | 573 | return EE_Registry::instance()->get_addon_by_name($addon_name)->detect_req_type(); |
574 | - }else{ |
|
575 | - throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"),$this->slug(),$addon_name,implode(",",array_keys( EE_Registry::instance()->get_addons_by_name() ) ) ) ) ; |
|
574 | + } else { |
|
575 | + throw new EE_Error(sprintf(__("The DMS slug '%s' should correspond to the addon's name, which should also be '%s', but no such addon was registered. These are the registered addons' names: %s", "event_espresso"), $this->slug(), $addon_name, implode(",", array_keys(EE_Registry::instance()->get_addons_by_name())))); |
|
576 | 576 | } |
577 | 577 | } |
578 | 578 | } |
@@ -583,13 +583,13 @@ discard block |
||
583 | 583 | * returns an array of strings describing errors by all the script's stages |
584 | 584 | * @return array |
585 | 585 | */ |
586 | - public function get_errors(){ |
|
586 | + public function get_errors() { |
|
587 | 587 | $all_errors = $this->_errors; |
588 | - if( ! is_array($all_errors)){ |
|
588 | + if ( ! is_array($all_errors)) { |
|
589 | 589 | $all_errors = array(); |
590 | 590 | } |
591 | - foreach($this->stages() as $stage){ |
|
592 | - $all_errors = array_merge($stage->get_errors(),$all_errors); |
|
591 | + foreach ($this->stages() as $stage) { |
|
592 | + $all_errors = array_merge($stage->get_errors(), $all_errors); |
|
593 | 593 | } |
594 | 594 | return $all_errors; |
595 | 595 | } |
@@ -600,8 +600,8 @@ discard block |
||
600 | 600 | * Indicates whether or not this migration script should continue |
601 | 601 | * @return boolean |
602 | 602 | */ |
603 | - public function can_continue(){ |
|
604 | - return in_array($this->get_status(), EE_Data_Migration_Manager::instance()->stati_that_indicate_to_continue_single_migration_script); |
|
603 | + public function can_continue() { |
|
604 | + return in_array($this->get_status(), EE_Data_Migration_Manager::instance()->stati_that_indicate_to_continue_single_migration_script); |
|
605 | 605 | } |
606 | 606 | |
607 | 607 | |
@@ -613,8 +613,8 @@ discard block |
||
613 | 613 | * get ordered by the indexes |
614 | 614 | * @return EE_Data_Migration_Script_Stage[] |
615 | 615 | */ |
616 | - protected function stages(){ |
|
617 | - $stages = apply_filters( 'FHEE__'.get_class($this).'__stages',$this->_migration_stages ); |
|
616 | + protected function stages() { |
|
617 | + $stages = apply_filters('FHEE__'.get_class($this).'__stages', $this->_migration_stages); |
|
618 | 618 | ksort($stages); |
619 | 619 | return $stages; |
620 | 620 | } |
@@ -626,7 +626,7 @@ discard block |
||
626 | 626 | * can be displayed to the user |
627 | 627 | * @return string |
628 | 628 | */ |
629 | - public function get_feedback_message(){ |
|
629 | + public function get_feedback_message() { |
|
630 | 630 | return $this->_feedback_message; |
631 | 631 | } |
632 | 632 | |
@@ -638,16 +638,16 @@ discard block |
||
638 | 638 | * possible that this class is defined when it goes to sleep, but NOT available when it |
639 | 639 | * awakes (eg, this class is part of an addon that is deactivated at some point). |
640 | 640 | */ |
641 | - public function properties_as_array(){ |
|
641 | + public function properties_as_array() { |
|
642 | 642 | $properties = parent::properties_as_array(); |
643 | 643 | $properties['_migration_stages'] = array(); |
644 | - foreach($this->_migration_stages as $migration_stage_priority => $migration_stage_class){ |
|
644 | + foreach ($this->_migration_stages as $migration_stage_priority => $migration_stage_class) { |
|
645 | 645 | $properties['_migration_stages'][$migration_stage_priority] = $migration_stage_class->properties_as_array(); |
646 | 646 | } |
647 | 647 | unset($properties['_mappings']); |
648 | 648 | |
649 | - foreach($this->_mappings as $old_table_name => $mapping_to_new_table){ |
|
650 | - foreach($mapping_to_new_table as $new_table_name => $mapping){ |
|
649 | + foreach ($this->_mappings as $old_table_name => $mapping_to_new_table) { |
|
650 | + foreach ($mapping_to_new_table as $new_table_name => $mapping) { |
|
651 | 651 | $this->_set_mapping_option($old_table_name, $new_table_name, $mapping); |
652 | 652 | } |
653 | 653 | } |
@@ -662,19 +662,19 @@ discard block |
||
662 | 662 | * @param array $array_of_properties like what's produced from properties_as_array() method |
663 | 663 | * @return void |
664 | 664 | */ |
665 | - public function instantiate_from_array_of_properties($array_of_properties){ |
|
665 | + public function instantiate_from_array_of_properties($array_of_properties) { |
|
666 | 666 | $stages_properties_arrays = $array_of_properties['_migration_stages']; |
667 | 667 | unset($array_of_properties['_migration_stages']); |
668 | 668 | unset($array_of_properties['class']); |
669 | - foreach($array_of_properties as $property_name => $property_value){ |
|
669 | + foreach ($array_of_properties as $property_name => $property_value) { |
|
670 | 670 | $this->{$property_name} = $property_value; |
671 | 671 | } |
672 | 672 | //_migration_stages are already instantiated, but have only default data |
673 | - foreach($this->_migration_stages as $stage){ |
|
674 | - $stage_data = $this->_find_migration_stage_data_with_classname(get_class($stage),$stages_properties_arrays); |
|
673 | + foreach ($this->_migration_stages as $stage) { |
|
674 | + $stage_data = $this->_find_migration_stage_data_with_classname(get_class($stage), $stages_properties_arrays); |
|
675 | 675 | //SO, if we found the stage data that was saved, use it. Otherwise, I guess the stage is new? (maybe added by |
676 | 676 | //an addon? Unlikely... not sure why it wouldn't exist, but if it doesn't just treat it like it was never started yet) |
677 | - if($stage_data){ |
|
677 | + if ($stage_data) { |
|
678 | 678 | $stage->instantiate_from_array_of_properties($stage_data); |
679 | 679 | } |
680 | 680 | } |
@@ -690,9 +690,9 @@ discard block |
||
690 | 690 | * @param array $migration_stage_data_arrays |
691 | 691 | * @return null |
692 | 692 | */ |
693 | - private function _find_migration_stage_data_with_classname($classname,$migration_stage_data_arrays){ |
|
694 | - foreach($migration_stage_data_arrays as $migration_stage_data_array){ |
|
695 | - if(isset($migration_stage_data_array['class']) && $migration_stage_data_array['class'] == $classname){ |
|
693 | + private function _find_migration_stage_data_with_classname($classname, $migration_stage_data_arrays) { |
|
694 | + foreach ($migration_stage_data_arrays as $migration_stage_data_array) { |
|
695 | + if (isset($migration_stage_data_array['class']) && $migration_stage_data_array['class'] == $classname) { |
|
696 | 696 | return $migration_stage_data_array; |
697 | 697 | } |
698 | 698 | } |
@@ -708,8 +708,8 @@ discard block |
||
708 | 708 | * @return array where the first key is the plugin's slug, the 2nd is the version of that plugin |
709 | 709 | * that will be updated to. Eg array('Core','4.1.0') |
710 | 710 | */ |
711 | - public final function migrates_to_version(){ |
|
712 | - return EE_Data_Migration_Manager::instance()->script_migrates_to_version( get_class( $this ) ); |
|
711 | + public final function migrates_to_version() { |
|
712 | + return EE_Data_Migration_Manager::instance()->script_migrates_to_version(get_class($this)); |
|
713 | 713 | } |
714 | 714 | |
715 | 715 | |
@@ -721,10 +721,10 @@ discard block |
||
721 | 721 | * Or 'Core' for core (non-addon). |
722 | 722 | * @return string |
723 | 723 | */ |
724 | - public function slug(){ |
|
724 | + public function slug() { |
|
725 | 725 | $migrates_to_version_info = $this->migrates_to_version(); |
726 | 726 | //the slug is the first part of the array |
727 | - return $migrates_to_version_info[ 'slug' ]; |
|
727 | + return $migrates_to_version_info['slug']; |
|
728 | 728 | } |
729 | 729 | |
730 | 730 | |
@@ -738,7 +738,7 @@ discard block |
||
738 | 738 | * the database up so it can run), then you can set "A" to priority 3 or something. |
739 | 739 | * @return int |
740 | 740 | */ |
741 | - public function priority(){ |
|
741 | + public function priority() { |
|
742 | 742 | return $this->_priority; |
743 | 743 | } |
744 | 744 | |
@@ -751,18 +751,18 @@ discard block |
||
751 | 751 | * @param boolean $migrating |
752 | 752 | * @return void |
753 | 753 | */ |
754 | - public function set_migrating( $migrating = TRUE ){ |
|
754 | + public function set_migrating($migrating = TRUE) { |
|
755 | 755 | $this->_migrating = $migrating; |
756 | 756 | } |
757 | 757 | |
758 | 758 | /** |
759 | 759 | * Marks that we think this migration class can continue to migrate |
760 | 760 | */ |
761 | - public function reattempt(){ |
|
761 | + public function reattempt() { |
|
762 | 762 | parent::reattempt(); |
763 | 763 | //also, we want to reattempt any stages that were marked as borked |
764 | - foreach( $this->stages() as $stage ) { |
|
765 | - if( $stage->is_broken() ) { |
|
764 | + foreach ($this->stages() as $stage) { |
|
765 | + if ($stage->is_broken()) { |
|
766 | 766 | $stage->reattempt(); |
767 | 767 | } |
768 | 768 | } |
@@ -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 |
@@ -33,20 +33,20 @@ discard block |
||
33 | 33 | * @param string $timezone |
34 | 34 | * @param array $date_formats |
35 | 35 | */ |
36 | - protected function __construct( $fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array() ) { |
|
37 | - if ( !isset( $fieldValues[ 'ATT_full_name' ] ) ) { |
|
38 | - $fname = isset( $fieldValues[ 'ATT_fname' ] ) ? $fieldValues[ 'ATT_fname' ] . ' ' : ''; |
|
39 | - $lname = isset( $fieldValues[ 'ATT_lname' ] ) ? $fieldValues[ 'ATT_lname' ] : ''; |
|
40 | - $fieldValues[ 'ATT_full_name' ] = $fname . $lname; |
|
36 | + protected function __construct($fieldValues = NULL, $bydb = FALSE, $timezone = NULL, $date_formats = array()) { |
|
37 | + if ( ! isset($fieldValues['ATT_full_name'])) { |
|
38 | + $fname = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'].' ' : ''; |
|
39 | + $lname = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : ''; |
|
40 | + $fieldValues['ATT_full_name'] = $fname.$lname; |
|
41 | 41 | } |
42 | - if ( !isset( $fieldValues[ 'ATT_slug' ] ) ) { |
|
42 | + if ( ! isset($fieldValues['ATT_slug'])) { |
|
43 | 43 | // $fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20)); |
44 | - $fieldValues[ 'ATT_slug' ] = sanitize_title( $fieldValues[ 'ATT_full_name' ] ); |
|
44 | + $fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']); |
|
45 | 45 | } |
46 | - if ( !isset( $fieldValues[ 'ATT_short_bio' ] ) && isset( $fieldValues[ 'ATT_bio' ] ) ) { |
|
47 | - $fieldValues[ 'ATT_short_bio' ] = substr( $fieldValues[ 'ATT_bio' ], 0, 50 ); |
|
46 | + if ( ! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) { |
|
47 | + $fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50); |
|
48 | 48 | } |
49 | - parent::__construct( $fieldValues, $bydb, $timezone, $date_formats ); |
|
49 | + parent::__construct($fieldValues, $bydb, $timezone, $date_formats); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | * date_format and the second value is the time format |
61 | 61 | * @return EE_Attendee |
62 | 62 | */ |
63 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
64 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats ); |
|
65 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
63 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
64 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats); |
|
65 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | |
@@ -73,8 +73,8 @@ discard block |
||
73 | 73 | * the website will be used. |
74 | 74 | * @return EE_Attendee |
75 | 75 | */ |
76 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
77 | - return new self( $props_n_values, TRUE, $timezone ); |
|
76 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
77 | + return new self($props_n_values, TRUE, $timezone); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | * @access public |
86 | 86 | * @param string $fname |
87 | 87 | */ |
88 | - public function set_fname( $fname = '' ) { |
|
89 | - $this->set( 'ATT_fname', $fname ); |
|
88 | + public function set_fname($fname = '') { |
|
89 | + $this->set('ATT_fname', $fname); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | * @access public |
98 | 98 | * @param string $lname |
99 | 99 | */ |
100 | - public function set_lname( $lname = '' ) { |
|
101 | - $this->set( 'ATT_lname', $lname ); |
|
100 | + public function set_lname($lname = '') { |
|
101 | + $this->set('ATT_lname', $lname); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | |
@@ -109,8 +109,8 @@ discard block |
||
109 | 109 | * @access public |
110 | 110 | * @param string $address |
111 | 111 | */ |
112 | - public function set_address( $address = '' ) { |
|
113 | - $this->set( 'ATT_address', $address ); |
|
112 | + public function set_address($address = '') { |
|
113 | + $this->set('ATT_address', $address); |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | * @access public |
122 | 122 | * @param string $address2 |
123 | 123 | */ |
124 | - public function set_address2( $address2 = '' ) { |
|
125 | - $this->set( 'ATT_address2', $address2 ); |
|
124 | + public function set_address2($address2 = '') { |
|
125 | + $this->set('ATT_address2', $address2); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | |
@@ -133,8 +133,8 @@ discard block |
||
133 | 133 | * @access public |
134 | 134 | * @param string $city |
135 | 135 | */ |
136 | - public function set_city( $city = '' ) { |
|
137 | - $this->set( 'ATT_city', $city ); |
|
136 | + public function set_city($city = '') { |
|
137 | + $this->set('ATT_city', $city); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | |
@@ -145,8 +145,8 @@ discard block |
||
145 | 145 | * @access public |
146 | 146 | * @param int $STA_ID |
147 | 147 | */ |
148 | - public function set_state( $STA_ID = 0 ) { |
|
149 | - $this->set( 'STA_ID', $STA_ID ); |
|
148 | + public function set_state($STA_ID = 0) { |
|
149 | + $this->set('STA_ID', $STA_ID); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | |
@@ -157,8 +157,8 @@ discard block |
||
157 | 157 | * @access public |
158 | 158 | * @param string $CNT_ISO |
159 | 159 | */ |
160 | - public function set_country( $CNT_ISO = '' ) { |
|
161 | - $this->set( 'CNT_ISO', $CNT_ISO ); |
|
160 | + public function set_country($CNT_ISO = '') { |
|
161 | + $this->set('CNT_ISO', $CNT_ISO); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | |
@@ -169,8 +169,8 @@ discard block |
||
169 | 169 | * @access public |
170 | 170 | * @param string $zip |
171 | 171 | */ |
172 | - public function set_zip( $zip = '' ) { |
|
173 | - $this->set( 'ATT_zip', $zip ); |
|
172 | + public function set_zip($zip = '') { |
|
173 | + $this->set('ATT_zip', $zip); |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | |
@@ -181,8 +181,8 @@ discard block |
||
181 | 181 | * @access public |
182 | 182 | * @param string $email |
183 | 183 | */ |
184 | - public function set_email( $email = '' ) { |
|
185 | - $this->set( 'ATT_email', $email ); |
|
184 | + public function set_email($email = '') { |
|
185 | + $this->set('ATT_email', $email); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | |
@@ -193,8 +193,8 @@ discard block |
||
193 | 193 | * @access public |
194 | 194 | * @param string $phone |
195 | 195 | */ |
196 | - public function set_phone( $phone = '' ) { |
|
197 | - $this->set( 'ATT_phone', $phone ); |
|
196 | + public function set_phone($phone = '') { |
|
197 | + $this->set('ATT_phone', $phone); |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | |
@@ -205,8 +205,8 @@ discard block |
||
205 | 205 | * @access public |
206 | 206 | * @param bool $ATT_deleted |
207 | 207 | */ |
208 | - public function set_deleted( $ATT_deleted = FALSE ) { |
|
209 | - $this->set( 'ATT_deleted', $ATT_deleted ); |
|
208 | + public function set_deleted($ATT_deleted = FALSE) { |
|
209 | + $this->set('ATT_deleted', $ATT_deleted); |
|
210 | 210 | } |
211 | 211 | |
212 | 212 | |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | * @return int |
220 | 220 | */ |
221 | 221 | public function wp_user() { |
222 | - return $this->get( 'ATT_author' ); |
|
222 | + return $this->get('ATT_author'); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | * @return string |
231 | 231 | */ |
232 | 232 | public function fname() { |
233 | - return $this->get( 'ATT_fname' ); |
|
233 | + return $this->get('ATT_fname'); |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | |
@@ -250,9 +250,9 @@ discard block |
||
250 | 250 | * @param bool $apply_html_entities |
251 | 251 | * @return string |
252 | 252 | */ |
253 | - public function full_name( $apply_html_entities = FALSE ) { |
|
254 | - $full_name = $this->fname() . ' ' . $this->lname(); |
|
255 | - return $apply_html_entities ? htmlentities( $full_name, ENT_QUOTES, 'UTF-8' ) : $full_name; |
|
253 | + public function full_name($apply_html_entities = FALSE) { |
|
254 | + $full_name = $this->fname().' '.$this->lname(); |
|
255 | + return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name; |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | * @return string |
264 | 264 | */ |
265 | 265 | public function lname() { |
266 | - return $this->get( 'ATT_lname' ); |
|
266 | + return $this->get('ATT_lname'); |
|
267 | 267 | } |
268 | 268 | |
269 | 269 | |
@@ -277,26 +277,26 @@ discard block |
||
277 | 277 | */ |
278 | 278 | public function full_address_as_array() { |
279 | 279 | $full_address_array = array(); |
280 | - $initial_address_fields = array( 'ATT_address', 'ATT_address2', 'ATT_city', ); |
|
281 | - foreach ( $initial_address_fields as $address_field_name ) { |
|
282 | - $address_fields_value = $this->get( $address_field_name ); |
|
283 | - if ( !empty( $address_fields_value ) ) { |
|
284 | - $full_address_array[ ] = $address_fields_value; |
|
280 | + $initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',); |
|
281 | + foreach ($initial_address_fields as $address_field_name) { |
|
282 | + $address_fields_value = $this->get($address_field_name); |
|
283 | + if ( ! empty($address_fields_value)) { |
|
284 | + $full_address_array[] = $address_fields_value; |
|
285 | 285 | } |
286 | 286 | } |
287 | 287 | //now handle state and country |
288 | 288 | $state_obj = $this->state_obj(); |
289 | - if ( !empty( $state_obj ) ) { |
|
290 | - $full_address_array[ ] = $state_obj->name(); |
|
289 | + if ( ! empty($state_obj)) { |
|
290 | + $full_address_array[] = $state_obj->name(); |
|
291 | 291 | } |
292 | 292 | $country_obj = $this->country_obj(); |
293 | - if ( !empty( $country_obj ) ) { |
|
294 | - $full_address_array[ ] = $country_obj->name(); |
|
293 | + if ( ! empty($country_obj)) { |
|
294 | + $full_address_array[] = $country_obj->name(); |
|
295 | 295 | } |
296 | 296 | //lastly get the xip |
297 | 297 | $zip_value = $this->zip(); |
298 | - if ( !empty( $zip_value ) ) { |
|
299 | - $full_address_array[ ] = $zip_value; |
|
298 | + if ( ! empty($zip_value)) { |
|
299 | + $full_address_array[] = $zip_value; |
|
300 | 300 | } |
301 | 301 | return $full_address_array; |
302 | 302 | } |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | * @return string |
309 | 309 | */ |
310 | 310 | public function address() { |
311 | - return $this->get( 'ATT_address' ); |
|
311 | + return $this->get('ATT_address'); |
|
312 | 312 | } |
313 | 313 | |
314 | 314 | |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | * @return string |
319 | 319 | */ |
320 | 320 | public function address2() { |
321 | - return $this->get( 'ATT_address2' ); |
|
321 | + return $this->get('ATT_address2'); |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | * @return string |
329 | 329 | */ |
330 | 330 | public function city() { |
331 | - return $this->get( 'ATT_city' ); |
|
331 | + return $this->get('ATT_city'); |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | * @return string |
339 | 339 | */ |
340 | 340 | public function state_ID() { |
341 | - return $this->get( 'STA_ID' ); |
|
341 | + return $this->get('STA_ID'); |
|
342 | 342 | } |
343 | 343 | |
344 | 344 | |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | * @return string |
348 | 348 | */ |
349 | 349 | public function state_abbrev() { |
350 | - return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __( 'Unknown', 'event_espresso' ); |
|
350 | + return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __('Unknown', 'event_espresso'); |
|
351 | 351 | } |
352 | 352 | |
353 | 353 | |
@@ -357,18 +357,18 @@ discard block |
||
357 | 357 | * @return EE_State |
358 | 358 | */ |
359 | 359 | public function state_obj() { |
360 | - return $this->get_first_related( 'State' ); |
|
360 | + return $this->get_first_related('State'); |
|
361 | 361 | } |
362 | 362 | |
363 | 363 | /** |
364 | 364 | * Returns the state's name, otherwise 'Unknown' |
365 | 365 | * @return string |
366 | 366 | */ |
367 | - public function state_name(){ |
|
368 | - if( $this->state_obj() ){ |
|
367 | + public function state_name() { |
|
368 | + if ($this->state_obj()) { |
|
369 | 369 | return $this->state_obj()->name(); |
370 | - }else{ |
|
371 | - return __( 'Unknown', 'event_espresso' ); |
|
370 | + } else { |
|
371 | + return __('Unknown', 'event_espresso'); |
|
372 | 372 | } |
373 | 373 | } |
374 | 374 | |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | * @return string |
382 | 382 | */ |
383 | 383 | public function state() { |
384 | - if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) { |
|
384 | + if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) { |
|
385 | 385 | return $this->state_abbrev(); |
386 | 386 | } else { |
387 | 387 | return $this->state_name(); |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | * @return string |
396 | 396 | */ |
397 | 397 | public function country_ID() { |
398 | - return $this->get( 'CNT_ISO' ); |
|
398 | + return $this->get('CNT_ISO'); |
|
399 | 399 | } |
400 | 400 | |
401 | 401 | |
@@ -405,18 +405,18 @@ discard block |
||
405 | 405 | * @return EE_Country |
406 | 406 | */ |
407 | 407 | public function country_obj() { |
408 | - return $this->get_first_related( 'Country' ); |
|
408 | + return $this->get_first_related('Country'); |
|
409 | 409 | } |
410 | 410 | |
411 | 411 | /** |
412 | 412 | * Returns the country's name if known, otherwise 'Unknown' |
413 | 413 | * @return string |
414 | 414 | */ |
415 | - public function country_name(){ |
|
416 | - if( $this->country_obj() ){ |
|
415 | + public function country_name() { |
|
416 | + if ($this->country_obj()) { |
|
417 | 417 | return $this->country_obj()->name(); |
418 | - }else{ |
|
419 | - return __( 'Unknown', 'event_espresso' ); |
|
418 | + } else { |
|
419 | + return __('Unknown', 'event_espresso'); |
|
420 | 420 | } |
421 | 421 | } |
422 | 422 | |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | * @return string |
430 | 430 | */ |
431 | 431 | public function country() { |
432 | - if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) { |
|
432 | + if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) { |
|
433 | 433 | return $this->country_ID(); |
434 | 434 | } else { |
435 | 435 | return $this->country_name(); |
@@ -443,7 +443,7 @@ discard block |
||
443 | 443 | * @return string |
444 | 444 | */ |
445 | 445 | public function zip() { |
446 | - return $this->get( 'ATT_zip' ); |
|
446 | + return $this->get('ATT_zip'); |
|
447 | 447 | } |
448 | 448 | |
449 | 449 | |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | * @return string |
454 | 454 | */ |
455 | 455 | public function email() { |
456 | - return $this->get( 'ATT_email' ); |
|
456 | + return $this->get('ATT_email'); |
|
457 | 457 | } |
458 | 458 | |
459 | 459 | |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | * @return string |
464 | 464 | */ |
465 | 465 | public function phone() { |
466 | - return $this->get( 'ATT_phone' ); |
|
466 | + return $this->get('ATT_phone'); |
|
467 | 467 | } |
468 | 468 | |
469 | 469 | |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | * @return bool |
474 | 474 | */ |
475 | 475 | public function deleted() { |
476 | - return $this->get( 'ATT_deleted' ); |
|
476 | + return $this->get('ATT_deleted'); |
|
477 | 477 | } |
478 | 478 | |
479 | 479 | |
@@ -483,8 +483,8 @@ discard block |
||
483 | 483 | * @param array $query_params |
484 | 484 | * @return EE_Registration[] |
485 | 485 | */ |
486 | - public function get_registrations( $query_params = array() ) { |
|
487 | - return $this->get_many_related( 'Registration', $query_params ); |
|
486 | + public function get_registrations($query_params = array()) { |
|
487 | + return $this->get_many_related('Registration', $query_params); |
|
488 | 488 | } |
489 | 489 | |
490 | 490 | |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | * @return EE_Registration |
495 | 495 | */ |
496 | 496 | public function get_most_recent_registration() { |
497 | - return $this->get_first_related( 'Registration', array( 'order_by' => array( 'REG_date' => 'DESC' ) ) ); //null, 'REG_date', 'DESC', '=', 'OBJECT_K'); |
|
497 | + return $this->get_first_related('Registration', array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K'); |
|
498 | 498 | } |
499 | 499 | |
500 | 500 | |
@@ -504,8 +504,8 @@ discard block |
||
504 | 504 | * @param int $event_id |
505 | 505 | * @return EE_Registration |
506 | 506 | */ |
507 | - public function get_most_recent_registration_for_event( $event_id ) { |
|
508 | - return $this->get_first_related( 'Registration', array(array( 'EVT_ID' => $event_id ), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' ); |
|
507 | + public function get_most_recent_registration_for_event($event_id) { |
|
508 | + return $this->get_first_related('Registration', array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC'))); //, '=', 'OBJECT_K' ); |
|
509 | 509 | } |
510 | 510 | |
511 | 511 | |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | * @return array |
516 | 516 | */ |
517 | 517 | public function events() { |
518 | - return $this->get_many_related( 'Event' ); |
|
518 | + return $this->get_many_related('Event'); |
|
519 | 519 | } |
520 | 520 | |
521 | 521 | /** |
@@ -524,17 +524,17 @@ discard block |
||
524 | 524 | * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class |
525 | 525 | * @return EE_Form_Section_Proper |
526 | 526 | */ |
527 | - public function billing_info_for_payment_method($payment_method){ |
|
527 | + public function billing_info_for_payment_method($payment_method) { |
|
528 | 528 | $pm_type = $payment_method->type_obj(); |
529 | - if( ! $pm_type instanceof EE_PMT_Base ){ |
|
529 | + if ( ! $pm_type instanceof EE_PMT_Base) { |
|
530 | 530 | return NULL; |
531 | 531 | } |
532 | - $billing_info = $this->get_post_meta( $this->get_billing_info_postmeta_name( $payment_method ), true ); |
|
533 | - if ( ! $billing_info){ |
|
532 | + $billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true); |
|
533 | + if ( ! $billing_info) { |
|
534 | 534 | return NULL; |
535 | 535 | } |
536 | 536 | $billing_form = $pm_type->billing_form(); |
537 | - $billing_form->receive_form_submission( array( $billing_form->name() => $billing_info ), FALSE ); |
|
537 | + $billing_form->receive_form_submission(array($billing_form->name() => $billing_info), FALSE); |
|
538 | 538 | return $billing_form; |
539 | 539 | } |
540 | 540 | |
@@ -544,10 +544,10 @@ discard block |
||
544 | 544 | * @param EE_Payment_Method $payment_method |
545 | 545 | * @return string |
546 | 546 | */ |
547 | - public function get_billing_info_postmeta_name($payment_method){ |
|
548 | - if( $payment_method->type_obj() instanceof EE_PMT_Base ){ |
|
549 | - return 'billing_info_' . $payment_method->type_obj()->system_name(); |
|
550 | - }else{ |
|
547 | + public function get_billing_info_postmeta_name($payment_method) { |
|
548 | + if ($payment_method->type_obj() instanceof EE_PMT_Base) { |
|
549 | + return 'billing_info_'.$payment_method->type_obj()->system_name(); |
|
550 | + } else { |
|
551 | 551 | return NULL; |
552 | 552 | } |
553 | 553 | } |
@@ -558,13 +558,13 @@ discard block |
||
558 | 558 | * @param EE_Payment_Method $payment_method |
559 | 559 | * @return boolean |
560 | 560 | */ |
561 | - public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method){ |
|
562 | - if( ! $billing_form instanceof EE_Billing_Attendee_Info_Form ){ |
|
563 | - EE_Error::add_error( __( 'Cannot save billing info because there is none.', 'event_espresso' ) ); |
|
561 | + public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method) { |
|
562 | + if ( ! $billing_form instanceof EE_Billing_Attendee_Info_Form) { |
|
563 | + EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso')); |
|
564 | 564 | return false; |
565 | 565 | } |
566 | 566 | $billing_form->clean_sensitive_data(); |
567 | - return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name( $payment_method ), $billing_form->input_values( true ) ); |
|
567 | + return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method), $billing_form->input_values(true)); |
|
568 | 568 | } |
569 | 569 | |
570 | 570 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | |
6 | 6 | /** |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * |
26 | 26 | * ------------------------------------------------------------------------ |
27 | 27 | */ |
28 | -class EE_Change_Log extends EE_Base_Class{ |
|
28 | +class EE_Change_Log extends EE_Base_Class { |
|
29 | 29 | |
30 | 30 | /** |
31 | 31 | * |
@@ -36,9 +36,9 @@ discard block |
||
36 | 36 | * date_format and the second value is the time format |
37 | 37 | * @return EE_Attendee |
38 | 38 | */ |
39 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
40 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats ); |
|
41 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
39 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
40 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats); |
|
41 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | * the website will be used. |
50 | 50 | * @return EE_Attendee |
51 | 51 | */ |
52 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
53 | - return new self( $props_n_values, TRUE, $timezone ); |
|
52 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
53 | + return new self($props_n_values, TRUE, $timezone); |
|
54 | 54 | } |
55 | 55 | /** |
56 | 56 | * Gets message |
@@ -147,12 +147,12 @@ discard block |
||
147 | 147 | * Gets the model object attached to this log |
148 | 148 | * @return EE_Base_Class |
149 | 149 | */ |
150 | - function object(){ |
|
150 | + function object() { |
|
151 | 151 | $model_name_of_related_obj = $this->OBJ_type(); |
152 | 152 | $is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj); |
153 | - if( ! $is_model_name ){ |
|
153 | + if ( ! $is_model_name) { |
|
154 | 154 | return null; |
155 | - }else{ |
|
155 | + } else { |
|
156 | 156 | return $this->get_first_related($model_name_of_related_obj); |
157 | 157 | } |
158 | 158 | } |
@@ -165,17 +165,17 @@ discard block |
||
165 | 165 | * @param boolean $save |
166 | 166 | * @return boolean if $save=true, NULL is $save=false |
167 | 167 | */ |
168 | - function set_object($object, $save = TRUE ) { |
|
169 | - if($object instanceof EE_Base_Class){ |
|
168 | + function set_object($object, $save = TRUE) { |
|
169 | + if ($object instanceof EE_Base_Class) { |
|
170 | 170 | $this->set_OBJ_type($object->get_model()->get_this_model_name()); |
171 | 171 | $this->set_OBJ_ID($object->ID()); |
172 | - }else{ |
|
172 | + } else { |
|
173 | 173 | $this->set_OBJ_type(NULL); |
174 | 174 | $this->set_OBJ_ID(NULL); |
175 | 175 | } |
176 | - if($save){ |
|
176 | + if ($save) { |
|
177 | 177 | return $this->save(); |
178 | - }else{ |
|
178 | + } else { |
|
179 | 179 | return NULL; |
180 | 180 | } |
181 | 181 | } |
@@ -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 | * Event Espresso |
5 | 5 | * |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | * @subpackage includes/classes/EE_Checkin.class.php |
24 | 24 | * @author Darren Ethier |
25 | 25 | */ |
26 | -class EE_Checkin extends EE_Base_Class{ |
|
26 | +class EE_Checkin extends EE_Base_Class { |
|
27 | 27 | |
28 | 28 | /** |
29 | 29 | * |
@@ -34,9 +34,9 @@ discard block |
||
34 | 34 | * date_format and the second value is the time format |
35 | 35 | * @return EE_Checkin |
36 | 36 | */ |
37 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
38 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats ); |
|
39 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
37 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
38 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats); |
|
39 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | * the website will be used. |
48 | 48 | * @return EE_Checkin |
49 | 49 | */ |
50 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
51 | - return new self( $props_n_values, TRUE, $timezone ); |
|
50 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
51 | + return new self($props_n_values, TRUE, $timezone); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | |
6 | 6 | /** |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | * |
26 | 26 | * ------------------------------------------------------------------------ |
27 | 27 | */ |
28 | -class EE_Currency extends EE_Base_Class{ |
|
28 | +class EE_Currency extends EE_Base_Class { |
|
29 | 29 | |
30 | 30 | /** Currency COde @var CUR_code*/ protected $_CUR_code = NULL; |
31 | 31 | /** Currency Name Singular @var CUR_single*/ protected $_CUR_single = NULL; |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * date_format and the second value is the time format |
44 | 44 | * @return EE_Attendee |
45 | 45 | */ |
46 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
47 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats ); |
|
48 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
46 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
47 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats); |
|
48 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | * the website will be used. |
57 | 57 | * @return EE_Attendee |
58 | 58 | */ |
59 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
60 | - return new self( $props_n_values, TRUE, $timezone ); |
|
59 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
60 | + return new self($props_n_values, TRUE, $timezone); |
|
61 | 61 | } |
62 | 62 | /** |
63 | 63 | * Gets code |
@@ -159,8 +159,8 @@ discard block |
||
159 | 159 | * Gets a prettier name |
160 | 160 | * @return string |
161 | 161 | */ |
162 | - function name(){ |
|
163 | - return sprintf(__("%s (%s)", "event_espresso"),$this->code(),$this->plural_name()); |
|
162 | + function name() { |
|
163 | + return sprintf(__("%s (%s)", "event_espresso"), $this->code(), $this->plural_name()); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | |
6 | 6 | /** |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * |
27 | 27 | * ------------------------------------------------------------------------ |
28 | 28 | */ |
29 | -class EE_Currency_Payment_Method extends EE_Base_Class{ |
|
29 | +class EE_Currency_Payment_Method extends EE_Base_Class { |
|
30 | 30 | |
31 | 31 | /** Currency to Payment Method Link ID @var CPM_ID*/ |
32 | 32 | protected $_CPM_ID = NULL; |
@@ -48,9 +48,9 @@ discard block |
||
48 | 48 | * date_format and the second value is the time format |
49 | 49 | * @return EE_Attendee |
50 | 50 | */ |
51 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
52 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats ); |
|
53 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
51 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
52 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats); |
|
53 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | * the website will be used. |
62 | 62 | * @return EE_Attendee |
63 | 63 | */ |
64 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
65 | - return new self( $props_n_values, TRUE, $timezone ); |
|
64 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
65 | + return new self($props_n_values, TRUE, $timezone); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | } |
@@ -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 |
@@ -74,9 +74,9 @@ discard block |
||
74 | 74 | * date_format and the second value is the time format |
75 | 75 | * @return EE_Datetime |
76 | 76 | */ |
77 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
78 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats ); |
|
79 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
77 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
78 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats); |
|
79 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | |
@@ -87,8 +87,8 @@ discard block |
||
87 | 87 | * the website will be used. |
88 | 88 | * @return EE_Datetime |
89 | 89 | */ |
90 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
91 | - return new self( $props_n_values, TRUE, $timezone ); |
|
90 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
91 | + return new self($props_n_values, TRUE, $timezone); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | |
@@ -96,8 +96,8 @@ discard block |
||
96 | 96 | /** |
97 | 97 | * @param $name |
98 | 98 | */ |
99 | - public function set_name( $name ) { |
|
100 | - $this->set( 'DTT_name', $name ); |
|
99 | + public function set_name($name) { |
|
100 | + $this->set('DTT_name', $name); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | |
@@ -105,8 +105,8 @@ discard block |
||
105 | 105 | /** |
106 | 106 | * @param $description |
107 | 107 | */ |
108 | - public function set_description( $description ) { |
|
109 | - $this->set( 'DTT_description', $description ); |
|
108 | + public function set_description($description) { |
|
109 | + $this->set('DTT_description', $description); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | |
@@ -119,8 +119,8 @@ discard block |
||
119 | 119 | * @access public |
120 | 120 | * @param string $date a string representation of the event's date ex: Dec. 25, 2025 or 12-25-2025 |
121 | 121 | */ |
122 | - public function set_start_date( $date ) { |
|
123 | - $this->_set_date_for( $date, 'DTT_EVT_start' ); |
|
122 | + public function set_start_date($date) { |
|
123 | + $this->_set_date_for($date, 'DTT_EVT_start'); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | |
@@ -133,8 +133,8 @@ discard block |
||
133 | 133 | * @access public |
134 | 134 | * @param string $time a string representation of the event time ex: 9am or 7:30 PM |
135 | 135 | */ |
136 | - public function set_start_time( $time ) { |
|
137 | - $this->_set_time_for( $time, 'DTT_EVT_start' ); |
|
136 | + public function set_start_time($time) { |
|
137 | + $this->_set_time_for($time, 'DTT_EVT_start'); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | |
@@ -147,8 +147,8 @@ discard block |
||
147 | 147 | * @access public |
148 | 148 | * @param string $date a string representation of the event's date ex: Dec. 25, 2025 or 12-25-2025 |
149 | 149 | */ |
150 | - public function set_end_date( $date ) { |
|
151 | - $this->_set_date_for( $date, 'DTT_EVT_end' ); |
|
150 | + public function set_end_date($date) { |
|
151 | + $this->_set_date_for($date, 'DTT_EVT_end'); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | |
@@ -161,8 +161,8 @@ discard block |
||
161 | 161 | * @access public |
162 | 162 | * @param string $time a string representation of the event time ex: 9am or 7:30 PM |
163 | 163 | */ |
164 | - public function set_end_time( $time ) { |
|
165 | - $this->_set_time_for( $time, 'DTT_EVT_end' ); |
|
164 | + public function set_end_time($time) { |
|
165 | + $this->_set_time_for($time, 'DTT_EVT_end'); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | |
@@ -175,8 +175,8 @@ discard block |
||
175 | 175 | * @access public |
176 | 176 | * @param int $reg_limit |
177 | 177 | */ |
178 | - public function set_reg_limit( $reg_limit ) { |
|
179 | - $this->set( 'DTT_reg_limit', $reg_limit ); |
|
178 | + public function set_reg_limit($reg_limit) { |
|
179 | + $this->set('DTT_reg_limit', $reg_limit); |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | |
@@ -187,10 +187,10 @@ discard block |
||
187 | 187 | * @access public |
188 | 188 | * @param int $sold |
189 | 189 | */ |
190 | - public function set_sold( $sold ) { |
|
190 | + public function set_sold($sold) { |
|
191 | 191 | // sold can not go below zero |
192 | - $sold = max( 0, $sold ); |
|
193 | - $this->set( 'DTT_sold', $sold ); |
|
192 | + $sold = max(0, $sold); |
|
193 | + $this->set('DTT_sold', $sold); |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | |
@@ -199,9 +199,9 @@ discard block |
||
199 | 199 | * increments sold by amount passed by $qty |
200 | 200 | * @param int $qty |
201 | 201 | */ |
202 | - function increase_sold( $qty = 1 ) { |
|
202 | + function increase_sold($qty = 1) { |
|
203 | 203 | $sold = $this->sold() + $qty; |
204 | - $this->set_sold( $sold ); |
|
204 | + $this->set_sold($sold); |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | |
@@ -210,9 +210,9 @@ discard block |
||
210 | 210 | * decrements (subtracts) sold amount passed by $qty |
211 | 211 | * @param int $qty |
212 | 212 | */ |
213 | - function decrease_sold( $qty = 1 ) { |
|
213 | + function decrease_sold($qty = 1) { |
|
214 | 214 | $sold = $this->sold() - $qty; |
215 | - $this->set_sold( $sold ); |
|
215 | + $this->set_sold($sold); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | * @return string |
223 | 223 | */ |
224 | 224 | public function name() { |
225 | - return $this->get( 'DTT_name' ); |
|
225 | + return $this->get('DTT_name'); |
|
226 | 226 | } |
227 | 227 | |
228 | 228 | |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | * @return string |
233 | 233 | */ |
234 | 234 | public function description() { |
235 | - return $this->get( 'DTT_description' ); |
|
235 | + return $this->get('DTT_description'); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | * @return boolean TRUE if is primary, FALSE if not. |
243 | 243 | */ |
244 | 244 | public function is_primary() { |
245 | - return $this->get( 'DTT_is_primary' ); |
|
245 | + return $this->get('DTT_is_primary'); |
|
246 | 246 | } |
247 | 247 | |
248 | 248 | |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | * @return int The order of the datetime for this event. |
253 | 253 | */ |
254 | 254 | public function order() { |
255 | - return $this->get( 'DTT_order' ); |
|
255 | + return $this->get('DTT_order'); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | * @return int |
263 | 263 | */ |
264 | 264 | public function parent() { |
265 | - return $this->get( 'DTT_parent' ); |
|
265 | + return $this->get('DTT_parent'); |
|
266 | 266 | } |
267 | 267 | |
268 | 268 | |
@@ -278,10 +278,10 @@ discard block |
||
278 | 278 | * @param bool $echo - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats) |
279 | 279 | * @return string|bool|void string on success, FALSE on fail |
280 | 280 | */ |
281 | - private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) { |
|
281 | + private function _show_datetime($date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE) { |
|
282 | 282 | $field_name = "DTT_EVT_{$start_or_end}"; |
283 | - $dtt = $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo ); |
|
284 | - if ( ! $echo ) { |
|
283 | + $dtt = $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo); |
|
284 | + if ( ! $echo) { |
|
285 | 285 | return $dtt; |
286 | 286 | } |
287 | 287 | return ''; |
@@ -297,8 +297,8 @@ discard block |
||
297 | 297 | * @param null $dt_frmt - string representation of date format defaults to 'F j, Y' |
298 | 298 | * @return mixed string on success, FALSE on fail |
299 | 299 | */ |
300 | - public function start_date( $dt_frmt = NULL ) { |
|
301 | - return $this->_show_datetime( 'D', 'start', $dt_frmt ); |
|
300 | + public function start_date($dt_frmt = NULL) { |
|
301 | + return $this->_show_datetime('D', 'start', $dt_frmt); |
|
302 | 302 | } |
303 | 303 | |
304 | 304 | |
@@ -307,8 +307,8 @@ discard block |
||
307 | 307 | * Echoes start_date() |
308 | 308 | * @param string $dt_frmt |
309 | 309 | */ |
310 | - public function e_start_date( $dt_frmt = NULL ) { |
|
311 | - $this->_show_datetime( 'D', 'start', $dt_frmt, NULL, TRUE ); |
|
310 | + public function e_start_date($dt_frmt = NULL) { |
|
311 | + $this->_show_datetime('D', 'start', $dt_frmt, NULL, TRUE); |
|
312 | 312 | } |
313 | 313 | |
314 | 314 | |
@@ -321,8 +321,8 @@ discard block |
||
321 | 321 | * @param null $dt_frmt - string representation of date format defaults to 'F j, Y' |
322 | 322 | * @return mixed string on success, FALSE on fail |
323 | 323 | */ |
324 | - public function end_date( $dt_frmt = NULL ) { |
|
325 | - return $this->_show_datetime( 'D', 'end', $dt_frmt ); |
|
324 | + public function end_date($dt_frmt = NULL) { |
|
325 | + return $this->_show_datetime('D', 'end', $dt_frmt); |
|
326 | 326 | } |
327 | 327 | |
328 | 328 | |
@@ -331,8 +331,8 @@ discard block |
||
331 | 331 | * Echoes the end date. See end_date() |
332 | 332 | * @param string $dt_frmt |
333 | 333 | */ |
334 | - public function e_end_date( $dt_frmt = NULL ) { |
|
335 | - $this->_show_datetime( 'D', 'end', $dt_frmt, NULL, TRUE ); |
|
334 | + public function e_end_date($dt_frmt = NULL) { |
|
335 | + $this->_show_datetime('D', 'end', $dt_frmt, NULL, TRUE); |
|
336 | 336 | } |
337 | 337 | |
338 | 338 | |
@@ -345,11 +345,11 @@ discard block |
||
345 | 345 | * @param string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31 |
346 | 346 | * @return mixed string on success, FALSE on fail |
347 | 347 | */ |
348 | - public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) { |
|
349 | - $dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt; |
|
350 | - $start = str_replace( ' ', ' ', $this->get_i18n_datetime( 'DTT_EVT_start', $dt_frmt ) ); |
|
351 | - $end = str_replace( ' ', ' ', $this->get_i18n_datetime( 'DTT_EVT_end', $dt_frmt ) ); |
|
352 | - return $start != $end ? $start . $conjunction . $end : $start; |
|
348 | + public function date_range($dt_frmt = NULL, $conjunction = ' - ') { |
|
349 | + $dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt; |
|
350 | + $start = str_replace(' ', ' ', $this->get_i18n_datetime('DTT_EVT_start', $dt_frmt)); |
|
351 | + $end = str_replace(' ', ' ', $this->get_i18n_datetime('DTT_EVT_end', $dt_frmt)); |
|
352 | + return $start != $end ? $start.$conjunction.$end : $start; |
|
353 | 353 | } |
354 | 354 | |
355 | 355 | |
@@ -358,8 +358,8 @@ discard block |
||
358 | 358 | * @param null $dt_frmt |
359 | 359 | * @param string $conjunction |
360 | 360 | */ |
361 | - public function e_date_range( $dt_frmt = NULL, $conjunction = ' - ' ) { |
|
362 | - echo $this->date_range( $dt_frmt, $conjunction ); |
|
361 | + public function e_date_range($dt_frmt = NULL, $conjunction = ' - ') { |
|
362 | + echo $this->date_range($dt_frmt, $conjunction); |
|
363 | 363 | } |
364 | 364 | |
365 | 365 | |
@@ -371,8 +371,8 @@ discard block |
||
371 | 371 | * @param string $tm_format - string representation of time format defaults to 'g:i a' |
372 | 372 | * @return mixed string on success, FALSE on fail |
373 | 373 | */ |
374 | - public function start_time( $tm_format = NULL ) { |
|
375 | - return $this->_show_datetime( 'T', 'start', NULL, $tm_format ); |
|
374 | + public function start_time($tm_format = NULL) { |
|
375 | + return $this->_show_datetime('T', 'start', NULL, $tm_format); |
|
376 | 376 | } |
377 | 377 | |
378 | 378 | |
@@ -380,8 +380,8 @@ discard block |
||
380 | 380 | /** |
381 | 381 | * @param null $tm_format |
382 | 382 | */ |
383 | - public function e_start_time( $tm_format = NULL ) { |
|
384 | - $this->_show_datetime( 'T', 'start', NULL, $tm_format, TRUE ); |
|
383 | + public function e_start_time($tm_format = NULL) { |
|
384 | + $this->_show_datetime('T', 'start', NULL, $tm_format, TRUE); |
|
385 | 385 | } |
386 | 386 | |
387 | 387 | |
@@ -393,8 +393,8 @@ discard block |
||
393 | 393 | * @param string $tm_format - string representation of time format defaults to 'g:i a' |
394 | 394 | * @return mixed string on success, FALSE on fail |
395 | 395 | */ |
396 | - public function end_time( $tm_format = NULL ) { |
|
397 | - return $this->_show_datetime( 'T', 'end', NULL, $tm_format ); |
|
396 | + public function end_time($tm_format = NULL) { |
|
397 | + return $this->_show_datetime('T', 'end', NULL, $tm_format); |
|
398 | 398 | } |
399 | 399 | |
400 | 400 | |
@@ -402,8 +402,8 @@ discard block |
||
402 | 402 | /** |
403 | 403 | * @param null $tm_format |
404 | 404 | */ |
405 | - public function e_end_time( $tm_format = NULL ) { |
|
406 | - $this->_show_datetime( 'T', 'end', NULL, $tm_format, TRUE ); |
|
405 | + public function e_end_time($tm_format = NULL) { |
|
406 | + $this->_show_datetime('T', 'end', NULL, $tm_format, TRUE); |
|
407 | 407 | } |
408 | 408 | |
409 | 409 | |
@@ -416,12 +416,12 @@ discard block |
||
416 | 416 | * @param string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31 |
417 | 417 | * @return mixed string on success, FALSE on fail |
418 | 418 | */ |
419 | - public function time_range( $tm_format = NULL, $conjunction = ' - ' ) { |
|
420 | - $tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt; |
|
419 | + public function time_range($tm_format = NULL, $conjunction = ' - ') { |
|
420 | + $tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt; |
|
421 | 421 | |
422 | - $start = str_replace( ' ', ' ', $this->get_i18n_datetime( 'DTT_EVT_start', $tm_format ) ); |
|
423 | - $end = str_replace( ' ', ' ', $this->get_i18n_datetime( 'DTT_EVT_end', $tm_format ) ); |
|
424 | - return $start != $end ? $start . $conjunction . $end : $start; |
|
422 | + $start = str_replace(' ', ' ', $this->get_i18n_datetime('DTT_EVT_start', $tm_format)); |
|
423 | + $end = str_replace(' ', ' ', $this->get_i18n_datetime('DTT_EVT_end', $tm_format)); |
|
424 | + return $start != $end ? $start.$conjunction.$end : $start; |
|
425 | 425 | } |
426 | 426 | |
427 | 427 | |
@@ -430,8 +430,8 @@ discard block |
||
430 | 430 | * @param null $tm_format |
431 | 431 | * @param string $conjunction |
432 | 432 | */ |
433 | - public function e_time_range( $tm_format = NULL, $conjunction = ' - ' ) { |
|
434 | - echo $this->time_range( $tm_format, $conjunction ); |
|
433 | + public function e_time_range($tm_format = NULL, $conjunction = ' - ') { |
|
434 | + echo $this->time_range($tm_format, $conjunction); |
|
435 | 435 | } |
436 | 436 | |
437 | 437 | |
@@ -444,8 +444,8 @@ discard block |
||
444 | 444 | * @param string $tm_format - string representation of time format defaults to 'g:i a' |
445 | 445 | * @return mixed string on success, FALSE on fail |
446 | 446 | */ |
447 | - public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) { |
|
448 | - return $this->_show_datetime( '', 'start', $dt_format, $tm_format ); |
|
447 | + public function start_date_and_time($dt_format = NULL, $tm_format = NULL) { |
|
448 | + return $this->_show_datetime('', 'start', $dt_format, $tm_format); |
|
449 | 449 | } |
450 | 450 | |
451 | 451 | |
@@ -454,8 +454,8 @@ discard block |
||
454 | 454 | * @param null $dt_frmt |
455 | 455 | * @param null $tm_format |
456 | 456 | */ |
457 | - public function e_start_date_and_time( $dt_frmt = NULL, $tm_format = NULL ) { |
|
458 | - $this->_show_datetime( '', 'start', $dt_frmt, $tm_format, TRUE ); |
|
457 | + public function e_start_date_and_time($dt_frmt = NULL, $tm_format = NULL) { |
|
458 | + $this->_show_datetime('', 'start', $dt_frmt, $tm_format, TRUE); |
|
459 | 459 | } |
460 | 460 | |
461 | 461 | |
@@ -469,11 +469,11 @@ discard block |
||
469 | 469 | * @param bool $round_up |
470 | 470 | * @return float|int|mixed |
471 | 471 | */ |
472 | - public function length( $units = 'seconds', $round_up = FALSE ) { |
|
473 | - $start = $this->get_raw( 'DTT_EVT_start' ); |
|
474 | - $end = $this->get_raw( 'DTT_EVT_end' ); |
|
472 | + public function length($units = 'seconds', $round_up = FALSE) { |
|
473 | + $start = $this->get_raw('DTT_EVT_start'); |
|
474 | + $end = $this->get_raw('DTT_EVT_end'); |
|
475 | 475 | $length_in_units = $end - $start; |
476 | - switch ( $units ) { |
|
476 | + switch ($units) { |
|
477 | 477 | //NOTE: We purposefully don't use "break;" in order to chain the divisions |
478 | 478 | /** @noinspection PhpMissingBreakStatementInspection */ |
479 | 479 | case 'days': |
@@ -486,10 +486,10 @@ discard block |
||
486 | 486 | $length_in_units /= 60; |
487 | 487 | case 'seconds': |
488 | 488 | default: |
489 | - $length_in_units = ceil( $length_in_units ); |
|
489 | + $length_in_units = ceil($length_in_units); |
|
490 | 490 | } |
491 | - if ( $round_up ) { |
|
492 | - $length_in_units = max( $length_in_units, 1 ); |
|
491 | + if ($round_up) { |
|
492 | + $length_in_units = max($length_in_units, 1); |
|
493 | 493 | } |
494 | 494 | return $length_in_units; |
495 | 495 | } |
@@ -504,8 +504,8 @@ discard block |
||
504 | 504 | * @param bool | string $tm_format - string representation of time format defaults to 'g:i a' |
505 | 505 | * @return mixed string on success, FALSE on fail |
506 | 506 | */ |
507 | - public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) { |
|
508 | - return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format ); |
|
507 | + public function end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) { |
|
508 | + return $this->_show_datetime('', 'end', $dt_frmt, $tm_format); |
|
509 | 509 | } |
510 | 510 | |
511 | 511 | |
@@ -514,8 +514,8 @@ discard block |
||
514 | 514 | * @param bool $dt_frmt |
515 | 515 | * @param bool $tm_format |
516 | 516 | */ |
517 | - public function e_end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) { |
|
518 | - $this->_show_datetime( '', 'end', $dt_frmt, $tm_format, TRUE ); |
|
517 | + public function e_end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) { |
|
518 | + $this->_show_datetime('', 'end', $dt_frmt, $tm_format, TRUE); |
|
519 | 519 | } |
520 | 520 | |
521 | 521 | |
@@ -527,7 +527,7 @@ discard block |
||
527 | 527 | * @return int |
528 | 528 | */ |
529 | 529 | public function start() { |
530 | - return $this->get_raw( 'DTT_EVT_start' ); |
|
530 | + return $this->get_raw('DTT_EVT_start'); |
|
531 | 531 | } |
532 | 532 | |
533 | 533 | |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | * @return int |
540 | 540 | */ |
541 | 541 | public function end() { |
542 | - return $this->get_raw( 'DTT_EVT_end' ); |
|
542 | + return $this->get_raw('DTT_EVT_end'); |
|
543 | 543 | } |
544 | 544 | |
545 | 545 | |
@@ -551,7 +551,7 @@ discard block |
||
551 | 551 | * @return mixed int on success, FALSE on fail |
552 | 552 | */ |
553 | 553 | public function reg_limit() { |
554 | - return $this->get_raw( 'DTT_reg_limit' ); |
|
554 | + return $this->get_raw('DTT_reg_limit'); |
|
555 | 555 | } |
556 | 556 | |
557 | 557 | |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | * @return mixed int on success, FALSE on fail |
564 | 564 | */ |
565 | 565 | public function sold() { |
566 | - return $this->get_raw( 'DTT_sold' ); |
|
566 | + return $this->get_raw('DTT_sold'); |
|
567 | 567 | } |
568 | 568 | |
569 | 569 | |
@@ -592,15 +592,15 @@ discard block |
||
592 | 592 | * the spaces remaining for this particular datetime, hence the flag. |
593 | 593 | * @return int |
594 | 594 | */ |
595 | - public function spaces_remaining( $consider_tickets = FALSE ) { |
|
595 | + public function spaces_remaining($consider_tickets = FALSE) { |
|
596 | 596 | // tickets remaining available for purchase |
597 | 597 | //no need for special checks for infinite, because if DTT_reg_limit == EE_INF, then EE_INF - x = EE_INF |
598 | 598 | $dtt_remaining = $this->reg_limit() - $this->sold(); |
599 | - if ( ! $consider_tickets ) { |
|
599 | + if ( ! $consider_tickets) { |
|
600 | 600 | return $dtt_remaining; |
601 | 601 | } |
602 | 602 | $tickets_remaining = $this->tickets_remaining(); |
603 | - return min( $dtt_remaining, $tickets_remaining ); |
|
603 | + return min($dtt_remaining, $tickets_remaining); |
|
604 | 604 | } |
605 | 605 | |
606 | 606 | |
@@ -611,19 +611,19 @@ discard block |
||
611 | 611 | * @param array $query_params like EEM_Base::get_all's |
612 | 612 | * @return int |
613 | 613 | */ |
614 | - public function tickets_remaining( $query_params = array() ) { |
|
614 | + public function tickets_remaining($query_params = array()) { |
|
615 | 615 | $sum = 0; |
616 | - $tickets = $this->tickets( $query_params ); |
|
617 | - if ( ! empty( $tickets ) ) { |
|
618 | - foreach ( $tickets as $ticket ) { |
|
619 | - if ( $ticket instanceof EE_Ticket ) { |
|
616 | + $tickets = $this->tickets($query_params); |
|
617 | + if ( ! empty($tickets)) { |
|
618 | + foreach ($tickets as $ticket) { |
|
619 | + if ($ticket instanceof EE_Ticket) { |
|
620 | 620 | // get the actual amount of tickets that can be sold |
621 | - $qty = $ticket->qty( 'saleable' ); |
|
622 | - if ( $qty === EE_INF ) { |
|
621 | + $qty = $ticket->qty('saleable'); |
|
622 | + if ($qty === EE_INF) { |
|
623 | 623 | return EE_INF; |
624 | 624 | } |
625 | 625 | // no negative ticket quantities plz |
626 | - if ( $qty > 0 ) { |
|
626 | + if ($qty > 0) { |
|
627 | 627 | $sum += $qty; |
628 | 628 | } |
629 | 629 | } |
@@ -640,8 +640,8 @@ discard block |
||
640 | 640 | * @param array $query_params like EEM_Base::get_all's |
641 | 641 | * @return int |
642 | 642 | */ |
643 | - public function sum_tickets_initially_available( $query_params = array() ) { |
|
644 | - return $this->sum_related( 'Ticket', $query_params, 'TKT_qty' ); |
|
643 | + public function sum_tickets_initially_available($query_params = array()) { |
|
644 | + return $this->sum_related('Ticket', $query_params, 'TKT_qty'); |
|
645 | 645 | } |
646 | 646 | |
647 | 647 | |
@@ -653,7 +653,7 @@ discard block |
||
653 | 653 | * @return int |
654 | 654 | */ |
655 | 655 | public function total_tickets_available_at_this_datetime() { |
656 | - return $this->spaces_remaining( true ); |
|
656 | + return $this->spaces_remaining(true); |
|
657 | 657 | } |
658 | 658 | |
659 | 659 | |
@@ -664,7 +664,7 @@ discard block |
||
664 | 664 | * @return boolean |
665 | 665 | */ |
666 | 666 | public function is_upcoming() { |
667 | - return ( $this->get_raw( 'DTT_EVT_start' ) > time() ); |
|
667 | + return ($this->get_raw('DTT_EVT_start') > time()); |
|
668 | 668 | } |
669 | 669 | |
670 | 670 | |
@@ -674,7 +674,7 @@ discard block |
||
674 | 674 | * @return boolean |
675 | 675 | */ |
676 | 676 | public function is_active() { |
677 | - return ( $this->get_raw( 'DTT_EVT_start' ) < time() && $this->get_raw( 'DTT_EVT_end' ) > time() ); |
|
677 | + return ($this->get_raw('DTT_EVT_start') < time() && $this->get_raw('DTT_EVT_end') > time()); |
|
678 | 678 | } |
679 | 679 | |
680 | 680 | |
@@ -684,7 +684,7 @@ discard block |
||
684 | 684 | * @return boolean |
685 | 685 | */ |
686 | 686 | public function is_expired() { |
687 | - return ( $this->get_raw( 'DTT_EVT_end' ) < time() ); |
|
687 | + return ($this->get_raw('DTT_EVT_end') < time()); |
|
688 | 688 | } |
689 | 689 | |
690 | 690 | |
@@ -695,16 +695,16 @@ discard block |
||
695 | 695 | */ |
696 | 696 | public function get_active_status() { |
697 | 697 | $total_tickets_for_this_dtt = $this->total_tickets_available_at_this_datetime(); |
698 | - if ( $total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1 ) { |
|
698 | + if ($total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1) { |
|
699 | 699 | return EE_Datetime::sold_out; |
700 | 700 | } |
701 | - if ( $this->is_expired() ) { |
|
701 | + if ($this->is_expired()) { |
|
702 | 702 | return EE_Datetime::expired; |
703 | 703 | } |
704 | - if ( $this->is_upcoming() ) { |
|
704 | + if ($this->is_upcoming()) { |
|
705 | 705 | return EE_Datetime::upcoming; |
706 | 706 | } |
707 | - if ( $this->is_active() ) { |
|
707 | + if ($this->is_active()) { |
|
708 | 708 | return EE_Datetime::active; |
709 | 709 | } |
710 | 710 | return NULL; |
@@ -718,24 +718,24 @@ discard block |
||
718 | 718 | * @param boolean $use_dtt_name if TRUE then we'll use DTT->name() if its not empty. |
719 | 719 | * @return string |
720 | 720 | */ |
721 | - public function get_dtt_display_name( $use_dtt_name = FALSE ) { |
|
722 | - if ( $use_dtt_name ) { |
|
721 | + public function get_dtt_display_name($use_dtt_name = FALSE) { |
|
722 | + if ($use_dtt_name) { |
|
723 | 723 | $dtt_name = $this->name(); |
724 | - if ( !empty( $dtt_name ) ) { |
|
724 | + if ( ! empty($dtt_name)) { |
|
725 | 725 | return $dtt_name; |
726 | 726 | } |
727 | 727 | } |
728 | 728 | //first condition is to see if the months are different |
729 | - if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) { |
|
730 | - $display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' ); |
|
729 | + if (date('m', $this->get_raw('DTT_EVT_start')) != date('m', $this->get_raw('DTT_EVT_end'))) { |
|
730 | + $display_date = $this->start_date('M j\, Y g:i a').' - '.$this->end_date('M j\, Y g:i a'); |
|
731 | 731 | //next condition is if its the same month but different day |
732 | 732 | } |
733 | 733 | else { |
734 | - if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) { |
|
735 | - $display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' ); |
|
734 | + if (date('m', $this->get_raw('DTT_EVT_start')) == date('m', $this->get_raw('DTT_EVT_end')) && date('d', $this->get_raw('DTT_EVT_start')) != date('d', $this->get_raw('DTT_EVT_end'))) { |
|
735 | + $display_date = $this->start_date('M j\, g:i a').' - '.$this->end_date('M j\, g:i a Y'); |
|
736 | 736 | } |
737 | 737 | else { |
738 | - $display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' ); |
|
738 | + $display_date = $this->start_date('F j\, Y').' @ '.$this->start_date('g:i a').' - '.$this->end_date('g:i a'); |
|
739 | 739 | } |
740 | 740 | } |
741 | 741 | return $display_date; |
@@ -749,8 +749,8 @@ discard block |
||
749 | 749 | *@param array $query_params see EEM_Base::get_all() |
750 | 750 | * @return EE_Ticket[] |
751 | 751 | */ |
752 | - public function tickets( $query_params = array() ) { |
|
753 | - return $this->get_many_related( 'Ticket', $query_params ); |
|
752 | + public function tickets($query_params = array()) { |
|
753 | + return $this->get_many_related('Ticket', $query_params); |
|
754 | 754 | } |
755 | 755 | |
756 | 756 | |
@@ -760,21 +760,21 @@ discard block |
||
760 | 760 | * @param array $query_params like EEM_Base::get_all's |
761 | 761 | * @return EE_Ticket[] |
762 | 762 | */ |
763 | - public function ticket_types_available_for_purchase( $query_params = array() ) { |
|
763 | + public function ticket_types_available_for_purchase($query_params = array()) { |
|
764 | 764 | // first check if datetime is valid |
765 | - if ( ! ( $this->is_upcoming() || $this->is_active() ) || $this->sold_out() ) { |
|
765 | + if ( ! ($this->is_upcoming() || $this->is_active()) || $this->sold_out()) { |
|
766 | 766 | return array(); |
767 | 767 | } |
768 | - if ( empty( $query_params ) ) { |
|
768 | + if (empty($query_params)) { |
|
769 | 769 | $query_params = array( |
770 | 770 | array( |
771 | - 'TKT_start_date' => array( '<=', EEM_Ticket::instance()->current_time_for_query( 'TKT_start_date' ) ), |
|
772 | - 'TKT_end_date' => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ), |
|
771 | + 'TKT_start_date' => array('<=', EEM_Ticket::instance()->current_time_for_query('TKT_start_date')), |
|
772 | + 'TKT_end_date' => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')), |
|
773 | 773 | 'TKT_deleted' => false |
774 | 774 | ) |
775 | 775 | ); |
776 | 776 | } |
777 | - return $this->tickets( $query_params ); |
|
777 | + return $this->tickets($query_params); |
|
778 | 778 | } |
779 | 779 | |
780 | 780 | |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | * @return EE_Event |
785 | 785 | */ |
786 | 786 | public function event() { |
787 | - return $this->get_first_related( 'Event' ); |
|
787 | + return $this->get_first_related('Event'); |
|
788 | 788 | } |
789 | 789 | |
790 | 790 | |
@@ -796,13 +796,13 @@ discard block |
||
796 | 796 | */ |
797 | 797 | public function update_sold() { |
798 | 798 | $count_regs_for_this_datetime = EEM_Registration::instance()->count( |
799 | - array( array( |
|
799 | + array(array( |
|
800 | 800 | 'STS_ID' => EEM_Registration::status_id_approved, |
801 | 801 | 'REG_deleted' => 0, |
802 | 802 | 'Ticket.Datetime.DTT_ID' => $this->ID(), |
803 | - ) ) |
|
803 | + )) |
|
804 | 804 | ); |
805 | - $this->set( 'DTT_sold', $count_regs_for_this_datetime ); |
|
805 | + $this->set('DTT_sold', $count_regs_for_this_datetime); |
|
806 | 806 | $this->save(); |
807 | 807 | return $count_regs_for_this_datetime; |
808 | 808 | } |
@@ -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 |
@@ -35,9 +35,9 @@ discard block |
||
35 | 35 | * date_format and the second value is the time format |
36 | 36 | * @return EE_Attendee |
37 | 37 | */ |
38 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
39 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats ); |
|
40 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
38 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
39 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats); |
|
40 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | * the website will be used. |
49 | 49 | * @return EE_Attendee |
50 | 50 | */ |
51 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
52 | - return new self( $props_n_values, TRUE, $timezone ); |
|
51 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
52 | + return new self($props_n_values, TRUE, $timezone); |
|
53 | 53 | } |
54 | 54 | } //end EE_Datetime_Ticket class |
@@ -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 | /** |
@@ -35,9 +35,9 @@ discard block |
||
35 | 35 | * date_format and the second value is the time format |
36 | 36 | * @return EE_Event |
37 | 37 | */ |
38 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
39 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats ); |
|
40 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
38 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
39 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats); |
|
40 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | |
@@ -48,8 +48,8 @@ discard block |
||
48 | 48 | * the website will be used. |
49 | 49 | * @return EE_Event |
50 | 50 | */ |
51 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
52 | - return new self( $props_n_values, TRUE, $timezone ); |
|
51 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
52 | + return new self($props_n_values, TRUE, $timezone); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | * @param mixed $field_value |
62 | 62 | * @param bool $use_default |
63 | 63 | */ |
64 | - public function set( $field_name, $field_value, $use_default = false ) { |
|
65 | - switch ( $field_name ) { |
|
64 | + public function set($field_name, $field_value, $use_default = false) { |
|
65 | + switch ($field_name) { |
|
66 | 66 | case 'status' : |
67 | - $this->set_status( $field_value, $use_default ); |
|
67 | + $this->set_status($field_value, $use_default); |
|
68 | 68 | break; |
69 | 69 | default : |
70 | - parent::set( $field_name, $field_value, $use_default ); |
|
70 | + parent::set($field_name, $field_value, $use_default); |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 | |
@@ -86,29 +86,29 @@ discard block |
||
86 | 86 | * @return bool|void |
87 | 87 | * @throws \EE_Error |
88 | 88 | */ |
89 | - public function set_status( $new_status = null, $use_default = false ) { |
|
89 | + public function set_status($new_status = null, $use_default = false) { |
|
90 | 90 | // get current Event status |
91 | 91 | $old_status = $this->status(); |
92 | 92 | // if status has changed |
93 | - if ( $old_status != $new_status ) { |
|
93 | + if ($old_status != $new_status) { |
|
94 | 94 | // TO sold_out |
95 | - if ( $new_status == EEM_Event::sold_out ) { |
|
95 | + if ($new_status == EEM_Event::sold_out) { |
|
96 | 96 | // save the previous event status so that we can revert if the event is no longer sold out |
97 | - $this->add_post_meta( '_previous_event_status', $old_status ); |
|
98 | - do_action( 'AHEE__EE_Event__set_status__to_sold_out', $this, $old_status, $new_status ); |
|
97 | + $this->add_post_meta('_previous_event_status', $old_status); |
|
98 | + do_action('AHEE__EE_Event__set_status__to_sold_out', $this, $old_status, $new_status); |
|
99 | 99 | // OR FROM sold_out |
100 | - } else if ( $old_status == EEM_Event::sold_out ) { |
|
101 | - $this->delete_post_meta( '_previous_event_status' ); |
|
102 | - do_action( 'AHEE__EE_Event__set_status__from_sold_out', $this, $old_status, $new_status ); |
|
100 | + } else if ($old_status == EEM_Event::sold_out) { |
|
101 | + $this->delete_post_meta('_previous_event_status'); |
|
102 | + do_action('AHEE__EE_Event__set_status__from_sold_out', $this, $old_status, $new_status); |
|
103 | 103 | } |
104 | 104 | // update status |
105 | - parent::set( 'status', $new_status, $use_default ); |
|
106 | - do_action( 'AHEE__EE_Event__set_status__after_update', $this ); |
|
105 | + parent::set('status', $new_status, $use_default); |
|
106 | + do_action('AHEE__EE_Event__set_status__after_update', $this); |
|
107 | 107 | return true; |
108 | 108 | } else { |
109 | 109 | // even though the old value matches the new value, it's still good to |
110 | 110 | // allow the parent set method to have a say |
111 | - parent::set( 'status', $new_status, $use_default ); |
|
111 | + parent::set('status', $new_status, $use_default); |
|
112 | 112 | return true; |
113 | 113 | } |
114 | 114 | } |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | * @param array $query_params like EEM_Base::get_all |
122 | 122 | * @return EE_Datetime[] |
123 | 123 | */ |
124 | - public function datetimes( $query_params = array() ) { |
|
125 | - return $this->get_many_related( 'Datetime', $query_params ); |
|
124 | + public function datetimes($query_params = array()) { |
|
125 | + return $this->get_many_related('Datetime', $query_params); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | * @return EE_Datetime[] |
134 | 134 | */ |
135 | 135 | public function datetimes_in_chronological_order() { |
136 | - return $this->get_many_related( 'Datetime', array( 'order_by' => array( 'DTT_EVT_start' => 'ASC' ) ) ); |
|
136 | + return $this->get_many_related('Datetime', array('order_by' => array('DTT_EVT_start' => 'ASC'))); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | |
@@ -149,8 +149,8 @@ discard block |
||
149 | 149 | * @param null $limit |
150 | 150 | * @return \EE_Datetime[] |
151 | 151 | */ |
152 | - public function datetimes_ordered( $show_expired = true, $show_deleted = false, $limit = null ) { |
|
153 | - return EEM_Datetime::instance( $this->_timezone )->get_datetimes_for_event_ordered_by_DTT_order( $this->ID(), $show_expired, $show_deleted, $limit ); |
|
152 | + public function datetimes_ordered($show_expired = true, $show_deleted = false, $limit = null) { |
|
153 | + return EEM_Datetime::instance($this->_timezone)->get_datetimes_for_event_ordered_by_DTT_order($this->ID(), $show_expired, $show_deleted, $limit); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | * @return EE_Datetime |
161 | 161 | */ |
162 | 162 | public function first_datetime() { |
163 | - return $this->get_first_related( 'Datetime' ); |
|
163 | + return $this->get_first_related('Datetime'); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | |
@@ -171,11 +171,11 @@ discard block |
||
171 | 171 | * @param bool $try_to_exclude_deleted |
172 | 172 | * @return EE_Datetime |
173 | 173 | */ |
174 | - public function primary_datetime( $try_to_exclude_expired = TRUE, $try_to_exclude_deleted = TRUE ) { |
|
175 | - if ( !empty ( $this->_Primary_Datetime ) ) { |
|
174 | + public function primary_datetime($try_to_exclude_expired = TRUE, $try_to_exclude_deleted = TRUE) { |
|
175 | + if ( ! empty ($this->_Primary_Datetime)) { |
|
176 | 176 | return $this->_Primary_Datetime; |
177 | 177 | } |
178 | - $this->_Primary_Datetime = EEM_Datetime::instance( $this->_timezone )->get_primary_datetime_for_event( $this->ID(), $try_to_exclude_expired, $try_to_exclude_deleted ); |
|
178 | + $this->_Primary_Datetime = EEM_Datetime::instance($this->_timezone)->get_primary_datetime_for_event($this->ID(), $try_to_exclude_expired, $try_to_exclude_deleted); |
|
179 | 179 | return $this->_Primary_Datetime; |
180 | 180 | } |
181 | 181 | |
@@ -186,30 +186,30 @@ discard block |
||
186 | 186 | * @param array $query_params like EEM_Base::get_all |
187 | 187 | * @return EE_Ticket[] |
188 | 188 | */ |
189 | - public function tickets( $query_params = array() ) { |
|
189 | + public function tickets($query_params = array()) { |
|
190 | 190 | //first get all datetimes |
191 | 191 | $datetimes = $this->datetimes_ordered(); |
192 | - if ( ! $datetimes ) { |
|
192 | + if ( ! $datetimes) { |
|
193 | 193 | return array(); |
194 | 194 | } |
195 | 195 | |
196 | 196 | $datetime_ids = array(); |
197 | - foreach ( $datetimes as $datetime ) { |
|
197 | + foreach ($datetimes as $datetime) { |
|
198 | 198 | $datetime_ids[] = $datetime->ID(); |
199 | 199 | } |
200 | 200 | |
201 | - $where_params = array( 'Datetime.DTT_ID' => array( 'IN', $datetime_ids ) ); |
|
201 | + $where_params = array('Datetime.DTT_ID' => array('IN', $datetime_ids)); |
|
202 | 202 | |
203 | 203 | //if incoming $query_params has where conditions let's merge but not override existing. |
204 | - if ( is_array( $query_params ) && isset( $query_params[0]) ) { |
|
205 | - $where_params = array_merge( $query_params[0], $where_params ); |
|
206 | - unset( $query_params[0] ); |
|
204 | + if (is_array($query_params) && isset($query_params[0])) { |
|
205 | + $where_params = array_merge($query_params[0], $where_params); |
|
206 | + unset($query_params[0]); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | //now add $where_params to $query_params |
210 | 210 | $query_params[0] = $where_params; |
211 | 211 | |
212 | - return EEM_Ticket::instance()->get_all( $query_params ); |
|
212 | + return EEM_Ticket::instance()->get_all($query_params); |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | * @return bool |
219 | 219 | */ |
220 | 220 | function additional_limit() { |
221 | - return $this->get( 'EVT_additional_limit' ); |
|
221 | + return $this->get('EVT_additional_limit'); |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | * @return bool |
228 | 228 | */ |
229 | 229 | function allow_overflow() { |
230 | - return $this->get( 'EVT_allow_overflow' ); |
|
230 | + return $this->get('EVT_allow_overflow'); |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | * @return bool |
237 | 237 | */ |
238 | 238 | function created() { |
239 | - return $this->get( 'EVT_created' ); |
|
239 | + return $this->get('EVT_created'); |
|
240 | 240 | } |
241 | 241 | |
242 | 242 | |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | * @return bool |
246 | 246 | */ |
247 | 247 | function description() { |
248 | - return $this->get( 'EVT_desc' ); |
|
248 | + return $this->get('EVT_desc'); |
|
249 | 249 | } |
250 | 250 | |
251 | 251 | |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | * @return string of html |
256 | 256 | */ |
257 | 257 | function description_filtered() { |
258 | - return $this->get_pretty( 'EVT_desc' ); |
|
258 | + return $this->get_pretty('EVT_desc'); |
|
259 | 259 | } |
260 | 260 | |
261 | 261 | |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | * @return bool |
265 | 265 | */ |
266 | 266 | function display_description() { |
267 | - return $this->get( 'EVT_display_desc' ); |
|
267 | + return $this->get('EVT_display_desc'); |
|
268 | 268 | } |
269 | 269 | |
270 | 270 | |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | * @return bool |
274 | 274 | */ |
275 | 275 | function display_ticket_selector() { |
276 | - return (bool)$this->get( 'EVT_display_ticket_selector' ); |
|
276 | + return (bool) $this->get('EVT_display_ticket_selector'); |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | * @return bool |
283 | 283 | */ |
284 | 284 | function external_url() { |
285 | - return $this->get( 'EVT_external_URL' ); |
|
285 | + return $this->get('EVT_external_URL'); |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | * @return bool |
292 | 292 | */ |
293 | 293 | function member_only() { |
294 | - return $this->get( 'EVT_member_only' ); |
|
294 | + return $this->get('EVT_member_only'); |
|
295 | 295 | } |
296 | 296 | |
297 | 297 | |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | * @return bool |
301 | 301 | */ |
302 | 302 | function phone() { |
303 | - return $this->get( 'EVT_phone' ); |
|
303 | + return $this->get('EVT_phone'); |
|
304 | 304 | } |
305 | 305 | |
306 | 306 | |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | * @return bool |
310 | 310 | */ |
311 | 311 | function modified() { |
312 | - return $this->get( 'EVT_modified' ); |
|
312 | + return $this->get('EVT_modified'); |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | * @return bool |
319 | 319 | */ |
320 | 320 | function name() { |
321 | - return $this->get( 'EVT_name' ); |
|
321 | + return $this->get('EVT_name'); |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | * @return bool |
328 | 328 | */ |
329 | 329 | function order() { |
330 | - return $this->get( 'EVT_order' ); |
|
330 | + return $this->get('EVT_order'); |
|
331 | 331 | } |
332 | 332 | |
333 | 333 | |
@@ -336,8 +336,8 @@ discard block |
||
336 | 336 | * @return bool|string |
337 | 337 | */ |
338 | 338 | function default_registration_status() { |
339 | - $event_default_registration_status = $this->get( 'EVT_default_registration_status' ); |
|
340 | - return !empty( $event_default_registration_status ) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID; |
|
339 | + $event_default_registration_status = $this->get('EVT_default_registration_status'); |
|
340 | + return ! empty($event_default_registration_status) ? $event_default_registration_status : EE_Registry::instance()->CFG->registration->default_STS_ID; |
|
341 | 341 | } |
342 | 342 | |
343 | 343 | |
@@ -348,14 +348,14 @@ discard block |
||
348 | 348 | * @param bool $not_full_desc |
349 | 349 | * @return bool|string |
350 | 350 | */ |
351 | - function short_description( $num_words = 55, $more = NULL, $not_full_desc = FALSE ) { |
|
352 | - $short_desc = $this->get( 'EVT_short_desc' ); |
|
353 | - if ( !empty( $short_desc ) || $not_full_desc ) { |
|
351 | + function short_description($num_words = 55, $more = NULL, $not_full_desc = FALSE) { |
|
352 | + $short_desc = $this->get('EVT_short_desc'); |
|
353 | + if ( ! empty($short_desc) || $not_full_desc) { |
|
354 | 354 | return $short_desc; |
355 | 355 | } |
356 | 356 | else { |
357 | - $full_desc = $this->get( 'EVT_desc' ); |
|
358 | - return wp_trim_words( $full_desc, $num_words, $more ); |
|
357 | + $full_desc = $this->get('EVT_desc'); |
|
358 | + return wp_trim_words($full_desc, $num_words, $more); |
|
359 | 359 | } |
360 | 360 | } |
361 | 361 | |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | * @return bool |
366 | 366 | */ |
367 | 367 | function slug() { |
368 | - return $this->get( 'EVT_slug' ); |
|
368 | + return $this->get('EVT_slug'); |
|
369 | 369 | } |
370 | 370 | |
371 | 371 | |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | * @return bool |
375 | 375 | */ |
376 | 376 | function timezone_string() { |
377 | - return $this->get( 'EVT_timezone_string' ); |
|
377 | + return $this->get('EVT_timezone_string'); |
|
378 | 378 | } |
379 | 379 | |
380 | 380 | |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | * @return bool |
384 | 384 | */ |
385 | 385 | function visible_on() { |
386 | - return $this->get( 'EVT_visible_on' ); |
|
386 | + return $this->get('EVT_visible_on'); |
|
387 | 387 | } |
388 | 388 | |
389 | 389 | |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | * @return bool |
393 | 393 | */ |
394 | 394 | function wp_user() { |
395 | - return $this->get( 'EVT_wp_user' ); |
|
395 | + return $this->get('EVT_wp_user'); |
|
396 | 396 | } |
397 | 397 | |
398 | 398 | |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | * @return bool |
402 | 402 | */ |
403 | 403 | function donations() { |
404 | - return $this->get( 'EVT_donations' ); |
|
404 | + return $this->get('EVT_donations'); |
|
405 | 405 | } |
406 | 406 | |
407 | 407 | |
@@ -409,8 +409,8 @@ discard block |
||
409 | 409 | /** |
410 | 410 | * @param $limit |
411 | 411 | */ |
412 | - function set_additional_limit( $limit ) { |
|
413 | - $this->set( 'EVT_additional_limit', $limit ); |
|
412 | + function set_additional_limit($limit) { |
|
413 | + $this->set('EVT_additional_limit', $limit); |
|
414 | 414 | } |
415 | 415 | |
416 | 416 | |
@@ -418,8 +418,8 @@ discard block |
||
418 | 418 | /** |
419 | 419 | * @param $created |
420 | 420 | */ |
421 | - function set_created( $created ) { |
|
422 | - $this->set( 'EVT_created', $created ); |
|
421 | + function set_created($created) { |
|
422 | + $this->set('EVT_created', $created); |
|
423 | 423 | } |
424 | 424 | |
425 | 425 | |
@@ -427,8 +427,8 @@ discard block |
||
427 | 427 | /** |
428 | 428 | * @param $desc |
429 | 429 | */ |
430 | - function set_description( $desc ) { |
|
431 | - $this->set( 'EVT_desc', $desc ); |
|
430 | + function set_description($desc) { |
|
431 | + $this->set('EVT_desc', $desc); |
|
432 | 432 | } |
433 | 433 | |
434 | 434 | |
@@ -436,8 +436,8 @@ discard block |
||
436 | 436 | /** |
437 | 437 | * @param $display_desc |
438 | 438 | */ |
439 | - function set_display_description( $display_desc ) { |
|
440 | - $this->set( 'EVT_display_desc', $display_desc ); |
|
439 | + function set_display_description($display_desc) { |
|
440 | + $this->set('EVT_display_desc', $display_desc); |
|
441 | 441 | } |
442 | 442 | |
443 | 443 | |
@@ -445,8 +445,8 @@ discard block |
||
445 | 445 | /** |
446 | 446 | * @param $display_ticket_selector |
447 | 447 | */ |
448 | - function set_display_ticket_selector( $display_ticket_selector ) { |
|
449 | - $this->set( 'EVT_display_ticket_selector', $display_ticket_selector ); |
|
448 | + function set_display_ticket_selector($display_ticket_selector) { |
|
449 | + $this->set('EVT_display_ticket_selector', $display_ticket_selector); |
|
450 | 450 | } |
451 | 451 | |
452 | 452 | |
@@ -454,8 +454,8 @@ discard block |
||
454 | 454 | /** |
455 | 455 | * @param $external_url |
456 | 456 | */ |
457 | - function set_external_url( $external_url ) { |
|
458 | - $this->set( 'EVT_external_URL', $external_url ); |
|
457 | + function set_external_url($external_url) { |
|
458 | + $this->set('EVT_external_URL', $external_url); |
|
459 | 459 | } |
460 | 460 | |
461 | 461 | |
@@ -463,8 +463,8 @@ discard block |
||
463 | 463 | /** |
464 | 464 | * @param $member_only |
465 | 465 | */ |
466 | - function set_member_only( $member_only ) { |
|
467 | - $this->set( 'EVT_member_only', $member_only ); |
|
466 | + function set_member_only($member_only) { |
|
467 | + $this->set('EVT_member_only', $member_only); |
|
468 | 468 | } |
469 | 469 | |
470 | 470 | |
@@ -472,8 +472,8 @@ discard block |
||
472 | 472 | /** |
473 | 473 | * @param $event_phone |
474 | 474 | */ |
475 | - function set_event_phone( $event_phone ) { |
|
476 | - $this->set( 'EVT_phone', $event_phone ); |
|
475 | + function set_event_phone($event_phone) { |
|
476 | + $this->set('EVT_phone', $event_phone); |
|
477 | 477 | } |
478 | 478 | |
479 | 479 | |
@@ -481,8 +481,8 @@ discard block |
||
481 | 481 | /** |
482 | 482 | * @param $modified |
483 | 483 | */ |
484 | - function set_modified( $modified ) { |
|
485 | - $this->set( 'EVT_modified', $modified ); |
|
484 | + function set_modified($modified) { |
|
485 | + $this->set('EVT_modified', $modified); |
|
486 | 486 | } |
487 | 487 | |
488 | 488 | |
@@ -490,8 +490,8 @@ discard block |
||
490 | 490 | /** |
491 | 491 | * @param $name |
492 | 492 | */ |
493 | - function set_name( $name ) { |
|
494 | - $this->set( 'EVT_name', $name ); |
|
493 | + function set_name($name) { |
|
494 | + $this->set('EVT_name', $name); |
|
495 | 495 | } |
496 | 496 | |
497 | 497 | |
@@ -499,8 +499,8 @@ discard block |
||
499 | 499 | /** |
500 | 500 | * @param $order |
501 | 501 | */ |
502 | - function set_order( $order ) { |
|
503 | - $this->set( 'EVT_order', $order ); |
|
502 | + function set_order($order) { |
|
503 | + $this->set('EVT_order', $order); |
|
504 | 504 | } |
505 | 505 | |
506 | 506 | |
@@ -508,8 +508,8 @@ discard block |
||
508 | 508 | /** |
509 | 509 | * @param $short_desc |
510 | 510 | */ |
511 | - function set_short_description( $short_desc ) { |
|
512 | - $this->set( 'EVT_short_desc', $short_desc ); |
|
511 | + function set_short_description($short_desc) { |
|
512 | + $this->set('EVT_short_desc', $short_desc); |
|
513 | 513 | } |
514 | 514 | |
515 | 515 | |
@@ -517,8 +517,8 @@ discard block |
||
517 | 517 | /** |
518 | 518 | * @param $slug |
519 | 519 | */ |
520 | - function set_slug( $slug ) { |
|
521 | - $this->set( 'EVT_slug', $slug ); |
|
520 | + function set_slug($slug) { |
|
521 | + $this->set('EVT_slug', $slug); |
|
522 | 522 | } |
523 | 523 | |
524 | 524 | |
@@ -526,8 +526,8 @@ discard block |
||
526 | 526 | /** |
527 | 527 | * @param $timezone_string |
528 | 528 | */ |
529 | - function set_timezone_string( $timezone_string ) { |
|
530 | - $this->set( 'EVT_timezone_string', $timezone_string ); |
|
529 | + function set_timezone_string($timezone_string) { |
|
530 | + $this->set('EVT_timezone_string', $timezone_string); |
|
531 | 531 | } |
532 | 532 | |
533 | 533 | |
@@ -535,8 +535,8 @@ discard block |
||
535 | 535 | /** |
536 | 536 | * @param $visible_on |
537 | 537 | */ |
538 | - function set_visible_on( $visible_on ) { |
|
539 | - $this->set( 'EVT_visible_on', $visible_on ); |
|
538 | + function set_visible_on($visible_on) { |
|
539 | + $this->set('EVT_visible_on', $visible_on); |
|
540 | 540 | } |
541 | 541 | |
542 | 542 | |
@@ -544,8 +544,8 @@ discard block |
||
544 | 544 | /** |
545 | 545 | * @param $wp_user |
546 | 546 | */ |
547 | - function set_wp_user( $wp_user ) { |
|
548 | - $this->set( 'EVT_wp_user', $wp_user ); |
|
547 | + function set_wp_user($wp_user) { |
|
548 | + $this->set('EVT_wp_user', $wp_user); |
|
549 | 549 | } |
550 | 550 | |
551 | 551 | |
@@ -553,8 +553,8 @@ discard block |
||
553 | 553 | /** |
554 | 554 | * @param $default_registration_status |
555 | 555 | */ |
556 | - function set_default_registration_status( $default_registration_status ) { |
|
557 | - $this->set( 'EVT_default_registration_status', $default_registration_status ); |
|
556 | + function set_default_registration_status($default_registration_status) { |
|
557 | + $this->set('EVT_default_registration_status', $default_registration_status); |
|
558 | 558 | } |
559 | 559 | |
560 | 560 | |
@@ -562,8 +562,8 @@ discard block |
||
562 | 562 | /** |
563 | 563 | * @param $donations |
564 | 564 | */ |
565 | - function set_donations( $donations ) { |
|
566 | - $this->set( 'EVT_donations', $donations ); |
|
565 | + function set_donations($donations) { |
|
566 | + $this->set('EVT_donations', $donations); |
|
567 | 567 | } |
568 | 568 | |
569 | 569 | |
@@ -573,8 +573,8 @@ discard block |
||
573 | 573 | * @param EE_Venue /int $venue_id_or_obj |
574 | 574 | * @return EE_Venue |
575 | 575 | */ |
576 | - function add_venue( $venue_id_or_obj ) { |
|
577 | - return $this->_add_relation_to( $venue_id_or_obj, 'Venue' ); |
|
576 | + function add_venue($venue_id_or_obj) { |
|
577 | + return $this->_add_relation_to($venue_id_or_obj, 'Venue'); |
|
578 | 578 | } |
579 | 579 | |
580 | 580 | |
@@ -584,8 +584,8 @@ discard block |
||
584 | 584 | * @param EE_Venue /int $venue_id_or_obj |
585 | 585 | * @return EE_Venue |
586 | 586 | */ |
587 | - function remove_venue( $venue_id_or_obj ) { |
|
588 | - return $this->_remove_relation_to( $venue_id_or_obj, 'Venue' ); |
|
587 | + function remove_venue($venue_id_or_obj) { |
|
588 | + return $this->_remove_relation_to($venue_id_or_obj, 'Venue'); |
|
589 | 589 | } |
590 | 590 | |
591 | 591 | |
@@ -595,8 +595,8 @@ discard block |
||
595 | 595 | * @param array $query_params like EEM_Base::get_all's $query_params |
596 | 596 | * @return EE_Venue[] |
597 | 597 | */ |
598 | - function venues( $query_params = array() ) { |
|
599 | - return $this->get_many_related( 'Venue', $query_params ); |
|
598 | + function venues($query_params = array()) { |
|
599 | + return $this->get_many_related('Venue', $query_params); |
|
600 | 600 | } |
601 | 601 | |
602 | 602 | |
@@ -608,7 +608,7 @@ discard block |
||
608 | 608 | */ |
609 | 609 | private function _has_ID_and_is_published() { |
610 | 610 | // first check if event id is present and not NULL, then check if this event is published (or any of the equivalent "published" statuses) |
611 | - return ( $this->ID() && $this->ID() !== NULL && ( $this->status() == 'publish' || $this->status() == EEM_Event::sold_out || $this->status() == EEM_Event::postponed || $this->status() == EEM_Event::cancelled ) ) ? TRUE : FALSE; |
|
611 | + return ($this->ID() && $this->ID() !== NULL && ($this->status() == 'publish' || $this->status() == EEM_Event::sold_out || $this->status() == EEM_Event::postponed || $this->status() == EEM_Event::cancelled)) ? TRUE : FALSE; |
|
612 | 612 | } |
613 | 613 | |
614 | 614 | |
@@ -620,21 +620,21 @@ discard block |
||
620 | 620 | */ |
621 | 621 | public function is_upcoming() { |
622 | 622 | // check if event id is present and if this event is published |
623 | - if ( $this->is_inactive() ) { |
|
623 | + if ($this->is_inactive()) { |
|
624 | 624 | return FALSE; |
625 | 625 | } |
626 | 626 | // set initial value |
627 | 627 | $upcoming = FALSE; |
628 | 628 | //next let's get all datetimes and loop through them |
629 | 629 | $datetimes = $this->datetimes_in_chronological_order(); |
630 | - foreach ( $datetimes as $datetime ) { |
|
631 | - if ( $datetime instanceof EE_Datetime ) { |
|
630 | + foreach ($datetimes as $datetime) { |
|
631 | + if ($datetime instanceof EE_Datetime) { |
|
632 | 632 | //if this dtt is expired then we continue cause one of the other datetimes might be upcoming. |
633 | - if ( $datetime->is_expired() ) { |
|
633 | + if ($datetime->is_expired()) { |
|
634 | 634 | continue; |
635 | 635 | } |
636 | 636 | //if this dtt is active then we return false. |
637 | - if ( $datetime->is_active() ) { |
|
637 | + if ($datetime->is_active()) { |
|
638 | 638 | return FALSE; |
639 | 639 | } |
640 | 640 | //otherwise let's check upcoming status |
@@ -651,21 +651,21 @@ discard block |
||
651 | 651 | */ |
652 | 652 | public function is_active() { |
653 | 653 | // check if event id is present and if this event is published |
654 | - if ( $this->is_inactive() ) { |
|
654 | + if ($this->is_inactive()) { |
|
655 | 655 | return FALSE; |
656 | 656 | } |
657 | 657 | // set initial value |
658 | 658 | $active = FALSE; |
659 | 659 | //next let's get all datetimes and loop through them |
660 | 660 | $datetimes = $this->datetimes_in_chronological_order(); |
661 | - foreach ( $datetimes as $datetime ) { |
|
662 | - if ( $datetime instanceof EE_Datetime ) { |
|
661 | + foreach ($datetimes as $datetime) { |
|
662 | + if ($datetime instanceof EE_Datetime) { |
|
663 | 663 | //if this dtt is expired then we continue cause one of the other datetimes might be active. |
664 | - if ( $datetime->is_expired() ) { |
|
664 | + if ($datetime->is_expired()) { |
|
665 | 665 | continue; |
666 | 666 | } |
667 | 667 | //if this dtt is upcoming then we return false. |
668 | - if ( $datetime->is_upcoming() ) { |
|
668 | + if ($datetime->is_upcoming()) { |
|
669 | 669 | return FALSE; |
670 | 670 | } |
671 | 671 | //otherwise let's check active status |
@@ -682,17 +682,17 @@ discard block |
||
682 | 682 | */ |
683 | 683 | public function is_expired() { |
684 | 684 | // check if event id is present and if this event is published |
685 | - if ( $this->is_inactive() ) { |
|
685 | + if ($this->is_inactive()) { |
|
686 | 686 | return FALSE; |
687 | 687 | } |
688 | 688 | // set initial value |
689 | 689 | $expired = FALSE; |
690 | 690 | //first let's get all datetimes and loop through them |
691 | 691 | $datetimes = $this->datetimes_in_chronological_order(); |
692 | - foreach ( $datetimes as $datetime ) { |
|
693 | - if ( $datetime instanceof EE_Datetime ) { |
|
692 | + foreach ($datetimes as $datetime) { |
|
693 | + if ($datetime instanceof EE_Datetime) { |
|
694 | 694 | //if this dtt is upcoming or active then we return false. |
695 | - if ( $datetime->is_upcoming() || $datetime->is_active() ) { |
|
695 | + if ($datetime->is_upcoming() || $datetime->is_active()) { |
|
696 | 696 | return FALSE; |
697 | 697 | } |
698 | 698 | //otherwise let's check active status |
@@ -709,7 +709,7 @@ discard block |
||
709 | 709 | */ |
710 | 710 | public function is_inactive() { |
711 | 711 | // check if event id is present and if this event is published |
712 | - if ( $this->_has_ID_and_is_published() ) { |
|
712 | + if ($this->_has_ID_and_is_published()) { |
|
713 | 713 | return FALSE; |
714 | 714 | } |
715 | 715 | return TRUE; |
@@ -727,37 +727,37 @@ discard block |
||
727 | 727 | */ |
728 | 728 | public function perform_sold_out_status_check() { |
729 | 729 | // get all unexpired untrashed tickets |
730 | - $tickets = $this->tickets( array( |
|
730 | + $tickets = $this->tickets(array( |
|
731 | 731 | array( |
732 | - 'TKT_end_date' => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ), |
|
732 | + 'TKT_end_date' => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')), |
|
733 | 733 | 'TKT_deleted' => false |
734 | 734 | ) |
735 | 735 | )); |
736 | 736 | // if all the tickets are just expired, then don't update the event status to sold out |
737 | - if ( empty( $tickets )) { |
|
737 | + if (empty($tickets)) { |
|
738 | 738 | return true; |
739 | 739 | } |
740 | 740 | // set initial value |
741 | 741 | $spaces_remaining = 0; |
742 | - foreach( $tickets as $ticket ) { |
|
743 | - if ( $ticket instanceof EE_Ticket ) { |
|
744 | - $spaces_remaining += $ticket->qty( 'saleable' ); |
|
742 | + foreach ($tickets as $ticket) { |
|
743 | + if ($ticket instanceof EE_Ticket) { |
|
744 | + $spaces_remaining += $ticket->qty('saleable'); |
|
745 | 745 | } |
746 | 746 | } |
747 | - if ( $spaces_remaining === 0 ) { |
|
748 | - $this->set_status( EEM_Event::sold_out ); |
|
749 | - if ( !is_admin() || ( is_admin() && defined( 'DOING_AJAX' ) ) ) { |
|
747 | + if ($spaces_remaining === 0) { |
|
748 | + $this->set_status(EEM_Event::sold_out); |
|
749 | + if ( ! is_admin() || (is_admin() && defined('DOING_AJAX'))) { |
|
750 | 750 | $this->save(); |
751 | 751 | } |
752 | 752 | $sold_out = TRUE; |
753 | 753 | } else { |
754 | 754 | $sold_out = FALSE; |
755 | 755 | // was event previously marked as sold out ? |
756 | - if ( $this->status() == EEM_Event::sold_out ) { |
|
756 | + if ($this->status() == EEM_Event::sold_out) { |
|
757 | 757 | // revert status to previous value, if it was set |
758 | - $previous_event_status = $this->get_post_meta( '_previous_event_status', true ); |
|
759 | - if ( $previous_event_status ) { |
|
760 | - $this->set_status( $previous_event_status ); |
|
758 | + $previous_event_status = $this->get_post_meta('_previous_event_status', true); |
|
759 | + if ($previous_event_status) { |
|
760 | + $this->set_status($previous_event_status); |
|
761 | 761 | } |
762 | 762 | } |
763 | 763 | } |
@@ -781,15 +781,15 @@ discard block |
||
781 | 781 | */ |
782 | 782 | public function spaces_remaining_for_sale() { |
783 | 783 | //first get total available spaces including consideration for tickets that have already sold. |
784 | - $spaces_available = $this->total_available_spaces( true ); |
|
784 | + $spaces_available = $this->total_available_spaces(true); |
|
785 | 785 | |
786 | 786 | //if total available = 0, then exit right away because that means everything is expired. |
787 | - if ( $spaces_available === 0 ) { |
|
787 | + if ($spaces_available === 0) { |
|
788 | 788 | return 0; |
789 | 789 | } |
790 | 790 | |
791 | 791 | //subtract total approved registrations from spaces available to get how many are remaining. |
792 | - $spots_taken = EEM_Registration::instance()->count( array( array( 'EVT_ID' => $this->ID(), 'STS_ID' => EEM_Registration::status_id_approved ) ), 'REG_ID', true ); |
|
792 | + $spots_taken = EEM_Registration::instance()->count(array(array('EVT_ID' => $this->ID(), 'STS_ID' => EEM_Registration::status_id_approved)), 'REG_ID', true); |
|
793 | 793 | $spaces_remaining = $spaces_available - $spots_taken; |
794 | 794 | |
795 | 795 | return $spaces_remaining > 0 ? $spaces_remaining : 0; |
@@ -822,29 +822,29 @@ discard block |
||
822 | 822 | * |
823 | 823 | * @return int|float (Note: if EE_INF is returned its considered a float by PHP) |
824 | 824 | */ |
825 | - public function total_available_spaces( $current_total_available = false ) { |
|
825 | + public function total_available_spaces($current_total_available = false) { |
|
826 | 826 | $spaces_available = 0; |
827 | 827 | |
828 | 828 | //first get all tickets on the event and include expired tickets |
829 | - $tickets = $this->tickets( array( 'default_where_conditions' => 'none' ) ); |
|
829 | + $tickets = $this->tickets(array('default_where_conditions' => 'none')); |
|
830 | 830 | $ticket_sums = array(); |
831 | 831 | $datetime_limits = array(); |
832 | 832 | |
833 | 833 | //loop through tickets and normalize them |
834 | - foreach ( $tickets as $ticket ) { |
|
835 | - $datetimes = $ticket->datetimes( array( 'order_by' => array( 'DTT_reg_limit' => 'ASC' ) ) ); |
|
834 | + foreach ($tickets as $ticket) { |
|
835 | + $datetimes = $ticket->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC'))); |
|
836 | 836 | |
837 | - if ( empty( $datetimes ) ) { |
|
837 | + if (empty($datetimes)) { |
|
838 | 838 | continue; |
839 | 839 | } |
840 | 840 | |
841 | 841 | //first datetime should be the lowest datetime |
842 | - $least_datetime = reset( $datetimes ); |
|
842 | + $least_datetime = reset($datetimes); |
|
843 | 843 | |
844 | 844 | //lets reset the ticket quantity to be the lower of either the lowest datetime reg limit or the ticket quantity |
845 | 845 | //IF datetimes sold (and we're not doing current live total available, then use spaces remaining for datetime, not reg_limit. |
846 | - if ( $current_total_available ) { |
|
847 | - if ( $ticket->is_remaining() ) { |
|
846 | + if ($current_total_available) { |
|
847 | + if ($ticket->is_remaining()) { |
|
848 | 848 | $remaining = $ticket->remaining(); |
849 | 849 | } else { |
850 | 850 | $spaces_available += $ticket->sold(); |
@@ -852,23 +852,23 @@ discard block |
||
852 | 852 | continue; |
853 | 853 | } |
854 | 854 | } else { |
855 | - $remaining = min( $ticket->qty(), $least_datetime->reg_limit() ); |
|
855 | + $remaining = min($ticket->qty(), $least_datetime->reg_limit()); |
|
856 | 856 | } |
857 | 857 | |
858 | 858 | //if $ticket_limit == infinity then let's drop out right away and just return that because any infinity amount trumps all other "available" amounts. |
859 | - if ( $remaining == EE_INF ) { |
|
859 | + if ($remaining == EE_INF) { |
|
860 | 860 | return EE_INF; |
861 | 861 | } |
862 | 862 | |
863 | 863 | //multiply normalized $tkt quantity by the number of datetimes on the ticket as the "sum" |
864 | 864 | //also include the sum of all the datetime reg limits on the ticket for breaking ties. |
865 | - $ticket_sums[$ticket->ID()]['sum'] = $remaining * count( $datetimes ); |
|
865 | + $ticket_sums[$ticket->ID()]['sum'] = $remaining * count($datetimes); |
|
866 | 866 | $ticket_sums[$ticket->ID()]['datetime_sums'] = 0; |
867 | - foreach ( $datetimes as $datetime ) { |
|
868 | - if ( $datetime->reg_limit() === EE_INF ) { |
|
867 | + foreach ($datetimes as $datetime) { |
|
868 | + if ($datetime->reg_limit() === EE_INF) { |
|
869 | 869 | $ticket_sums[$ticket->ID()]['datetime_sums'] = EE_INF; |
870 | 870 | } else { |
871 | - $ticket_sums[ $ticket->ID() ]['datetime_sums'] += $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit(); |
|
871 | + $ticket_sums[$ticket->ID()]['datetime_sums'] += $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit(); |
|
872 | 872 | } |
873 | 873 | $datetime_limits[$datetime->ID()] = $current_total_available ? $datetime->spaces_remaining() : $datetime->reg_limit(); |
874 | 874 | } |
@@ -879,74 +879,74 @@ discard block |
||
879 | 879 | //ticket quantity by the number of datetimes on the ticket). For tie-breakers, then the next sort is based on the |
880 | 880 | //ticket with the greatest sum of all remaining datetime->spaces_remaining() ( or $datetime->reg_limit() if not |
881 | 881 | //$current_total_available ) for the datetimes on the ticket. |
882 | - usort( $ticket_sums, function( $a, $b ) { |
|
883 | - if ( $a['sum'] == $b['sum'] ) { |
|
884 | - if ( $a['datetime_sums'] == $b['datetime_sums'] ) { |
|
882 | + usort($ticket_sums, function($a, $b) { |
|
883 | + if ($a['sum'] == $b['sum']) { |
|
884 | + if ($a['datetime_sums'] == $b['datetime_sums']) { |
|
885 | 885 | return 0; |
886 | 886 | } |
887 | 887 | |
888 | 888 | return $a['datetime_sums'] < $b['datetime_sums'] ? 1 : -1; |
889 | 889 | } |
890 | - return ( $a['sum'] < $b['sum'] ) ? -1 : 1; |
|
890 | + return ($a['sum'] < $b['sum']) ? -1 : 1; |
|
891 | 891 | }); |
892 | 892 | |
893 | 893 | //now let's loop through the sorted tickets and simulate sellouts |
894 | - foreach ( $ticket_sums as $ticket_info ) { |
|
895 | - if ( $ticket_info['ticket'] instanceof EE_Ticket ) { |
|
894 | + foreach ($ticket_sums as $ticket_info) { |
|
895 | + if ($ticket_info['ticket'] instanceof EE_Ticket) { |
|
896 | 896 | |
897 | - $datetimes = $ticket_info['ticket']->datetimes( array( 'order_by' => array( 'DTT_reg_limit' => 'ASC' ) ) ); |
|
897 | + $datetimes = $ticket_info['ticket']->datetimes(array('order_by' => array('DTT_reg_limit' => 'ASC'))); |
|
898 | 898 | //need to sort these $datetimes by remaining (only if $current_total_available) |
899 | 899 | //setup datetimes for simulation |
900 | 900 | $ticket_datetimes_remaining = array(); |
901 | - foreach( $datetimes as $datetime ) { |
|
901 | + foreach ($datetimes as $datetime) { |
|
902 | 902 | $ticket_datetimes_remaining[$datetime->ID()]['rem'] = $datetime_limits[$datetime->ID()]; |
903 | 903 | $ticket_datetimes_remaining[$datetime->ID()]['datetime'] = $datetime; |
904 | 904 | } |
905 | - usort( $ticket_datetimes_remaining, function( $a, $b ) { |
|
906 | - if ( $a['rem'] == $b['rem'] ) { |
|
905 | + usort($ticket_datetimes_remaining, function($a, $b) { |
|
906 | + if ($a['rem'] == $b['rem']) { |
|
907 | 907 | return 0; |
908 | 908 | } |
909 | - return ( $a['rem'] < $b['rem'] ) ? -1 : 1; |
|
909 | + return ($a['rem'] < $b['rem']) ? -1 : 1; |
|
910 | 910 | }); |
911 | 911 | |
912 | 912 | |
913 | 913 | //get the remaining on the first datetime (which should be the one with the least remaining) and that is |
914 | 914 | //what we add to the spaces_available running total. Then we need to decrease the remaining on our datetime tracker. |
915 | - $lowest_datetime = reset( $ticket_datetimes_remaining ); |
|
915 | + $lowest_datetime = reset($ticket_datetimes_remaining); |
|
916 | 916 | |
917 | 917 | //need to get the lower of; what the remaining is on the lowest datetime, and the remaining on the ticket. |
918 | 918 | // If this ends up being 0 (because of previous tickets in our simulation selling out), then it has already |
919 | 919 | // been tracked on $spaces available and this ticket is now sold out for the simulation, so we can continue |
920 | 920 | // to the next ticket. |
921 | - if ( $current_total_available ) { |
|
922 | - $remaining = min( $lowest_datetime['rem'], $ticket_info['ticket']->remaining() ); |
|
921 | + if ($current_total_available) { |
|
922 | + $remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->remaining()); |
|
923 | 923 | } else { |
924 | - $remaining = min( $lowest_datetime['rem'], $ticket_info['ticket']->qty() ); |
|
924 | + $remaining = min($lowest_datetime['rem'], $ticket_info['ticket']->qty()); |
|
925 | 925 | } |
926 | 926 | |
927 | 927 | //if $remaining is infinite that means that all datetimes on this ticket are infinite but we've made it here because all |
928 | 928 | //tickets have a quantity. So we don't have to track datetimes, we can just use ticket quantities for total |
929 | 929 | //available. |
930 | - if ( $remaining === EE_INF ) { |
|
930 | + if ($remaining === EE_INF) { |
|
931 | 931 | $spaces_available += $ticket_info['ticket']->qty(); |
932 | 932 | continue; |
933 | 933 | } |
934 | 934 | |
935 | 935 | //if ticket has sold amounts then we also need to add that (but only if doing live counts) |
936 | - if ( $current_total_available ) { |
|
936 | + if ($current_total_available) { |
|
937 | 937 | $spaces_available += $ticket_info['ticket']->sold(); |
938 | 938 | } |
939 | 939 | |
940 | - if ( $remaining <= 0 ) { |
|
940 | + if ($remaining <= 0) { |
|
941 | 941 | continue; |
942 | 942 | } else { |
943 | 943 | $spaces_available += $remaining; |
944 | 944 | } |
945 | 945 | |
946 | 946 | //loop through the datetimes and sell them out! |
947 | - foreach ( $ticket_datetimes_remaining as $datetime_info ) { |
|
948 | - if ( $datetime_info['datetime'] instanceof EE_Datetime ) { |
|
949 | - $datetime_limits[ $datetime_info['datetime']->ID() ] += - $remaining; |
|
947 | + foreach ($ticket_datetimes_remaining as $datetime_info) { |
|
948 | + if ($datetime_info['datetime'] instanceof EE_Datetime) { |
|
949 | + $datetime_limits[$datetime_info['datetime']->ID()] += - $remaining; |
|
950 | 950 | } |
951 | 951 | } |
952 | 952 | } |
@@ -962,8 +962,8 @@ discard block |
||
962 | 962 | * @param bool $actual whether or not to perform calculations to not only figure the actual status but also to flip the status if necessary to sold out If false, we just check the existing status of the event |
963 | 963 | * @return boolean |
964 | 964 | */ |
965 | - public function is_sold_out( $actual = FALSE ) { |
|
966 | - if ( ! $actual ) { |
|
965 | + public function is_sold_out($actual = FALSE) { |
|
966 | + if ( ! $actual) { |
|
967 | 967 | return $this->status() == EEM_Event::sold_out; |
968 | 968 | } |
969 | 969 | else { |
@@ -1008,30 +1008,30 @@ discard block |
||
1008 | 1008 | * |
1009 | 1009 | * @return bool | string - based on EE_Datetime active constants or FALSE if error. |
1010 | 1010 | */ |
1011 | - public function get_active_status( $reset = false ) { |
|
1011 | + public function get_active_status($reset = false) { |
|
1012 | 1012 | // if the active status has already been set, then just use that value (unless we are resetting it) |
1013 | - if ( ! empty( $this->_active_status ) && ! $reset ) { |
|
1013 | + if ( ! empty($this->_active_status) && ! $reset) { |
|
1014 | 1014 | return $this->_active_status; |
1015 | 1015 | } |
1016 | 1016 | //first check if event id is present on this object |
1017 | - if ( ! $this->ID() ) { |
|
1017 | + if ( ! $this->ID()) { |
|
1018 | 1018 | return false; |
1019 | 1019 | } |
1020 | 1020 | |
1021 | - $where_params_for_event = array( array( 'EVT_ID' => $this->ID() ) ); |
|
1021 | + $where_params_for_event = array(array('EVT_ID' => $this->ID())); |
|
1022 | 1022 | |
1023 | 1023 | //if event is published: |
1024 | - if ( $this->status() === 'publish' ) { |
|
1024 | + if ($this->status() === 'publish') { |
|
1025 | 1025 | //active? |
1026 | - if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::active, $where_params_for_event ) > 0 ) { |
|
1026 | + if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::active, $where_params_for_event) > 0) { |
|
1027 | 1027 | $this->_active_status = EE_Datetime::active; |
1028 | 1028 | } else { |
1029 | 1029 | //upcoming? |
1030 | - if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::upcoming, $where_params_for_event ) > 0 ) { |
|
1030 | + if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::upcoming, $where_params_for_event) > 0) { |
|
1031 | 1031 | $this->_active_status = EE_Datetime::upcoming; |
1032 | 1032 | } else { |
1033 | 1033 | //expired? |
1034 | - if ( EEM_Datetime::instance()->get_datetime_count_for_status( EE_Datetime::expired, $where_params_for_event ) > 0 ) { |
|
1034 | + if (EEM_Datetime::instance()->get_datetime_count_for_status(EE_Datetime::expired, $where_params_for_event) > 0) { |
|
1035 | 1035 | $this->_active_status = EE_Datetime::expired; |
1036 | 1036 | } else { |
1037 | 1037 | //it would be odd if things make it this far because it basically means there are no datetime's |
@@ -1042,7 +1042,7 @@ discard block |
||
1042 | 1042 | } |
1043 | 1043 | } else { |
1044 | 1044 | //the event is not published, so let's just set it's active status according to its' post status |
1045 | - switch ( $this->status() ) { |
|
1045 | + switch ($this->status()) { |
|
1046 | 1046 | case EEM_Event::sold_out : |
1047 | 1047 | $this->_active_status = EE_Datetime::sold_out; |
1048 | 1048 | break; |
@@ -1068,10 +1068,10 @@ discard block |
||
1068 | 1068 | * @param boolean $echo whether to return (FALSE), or echo out the result (TRUE) |
1069 | 1069 | * @return mixed void|string |
1070 | 1070 | */ |
1071 | - public function pretty_active_status( $echo = TRUE ) { |
|
1071 | + public function pretty_active_status($echo = TRUE) { |
|
1072 | 1072 | $active_status = $this->get_active_status(); |
1073 | - $status = '<span class="ee-status event-active-status-' . $active_status . '">' . EEH_Template::pretty_status( $active_status, FALSE, 'sentence' ) . '</span>'; |
|
1074 | - if ( $echo ) { |
|
1073 | + $status = '<span class="ee-status event-active-status-'.$active_status.'">'.EEH_Template::pretty_status($active_status, FALSE, 'sentence').'</span>'; |
|
1074 | + if ($echo) { |
|
1075 | 1075 | echo $status; |
1076 | 1076 | return ''; |
1077 | 1077 | } |
@@ -1085,12 +1085,12 @@ discard block |
||
1085 | 1085 | */ |
1086 | 1086 | public function get_number_of_tickets_sold() { |
1087 | 1087 | $tkt_sold = 0; |
1088 | - if ( !$this->ID() ) { |
|
1088 | + if ( ! $this->ID()) { |
|
1089 | 1089 | return 0; |
1090 | 1090 | } |
1091 | 1091 | $datetimes = $this->datetimes(); |
1092 | - foreach ( $datetimes as $datetime ) { |
|
1093 | - if ( $datetime instanceof EE_Datetime ) { |
|
1092 | + foreach ($datetimes as $datetime) { |
|
1093 | + if ($datetime instanceof EE_Datetime) { |
|
1094 | 1094 | $tkt_sold += $datetime->sold(); |
1095 | 1095 | } |
1096 | 1096 | } |
@@ -1105,7 +1105,7 @@ discard block |
||
1105 | 1105 | * @return int |
1106 | 1106 | */ |
1107 | 1107 | public function get_count_of_all_registrations() { |
1108 | - return EEM_Event::instance()->count_related( $this, 'Registration' ); |
|
1108 | + return EEM_Event::instance()->count_related($this, 'Registration'); |
|
1109 | 1109 | } |
1110 | 1110 | |
1111 | 1111 | |
@@ -1115,9 +1115,9 @@ discard block |
||
1115 | 1115 | * @return EE_Ticket |
1116 | 1116 | */ |
1117 | 1117 | public function get_ticket_with_earliest_start_time() { |
1118 | - $where[ 'Datetime.EVT_ID' ] = $this->ID(); |
|
1119 | - $query_params = array( $where, 'order_by' => array( 'TKT_start_date' => 'ASC' ) ); |
|
1120 | - return EE_Registry::instance()->load_model( 'Ticket' )->get_one( $query_params ); |
|
1118 | + $where['Datetime.EVT_ID'] = $this->ID(); |
|
1119 | + $query_params = array($where, 'order_by' => array('TKT_start_date' => 'ASC')); |
|
1120 | + return EE_Registry::instance()->load_model('Ticket')->get_one($query_params); |
|
1121 | 1121 | } |
1122 | 1122 | |
1123 | 1123 | |
@@ -1127,9 +1127,9 @@ discard block |
||
1127 | 1127 | * @return EE_Ticket |
1128 | 1128 | */ |
1129 | 1129 | public function get_ticket_with_latest_end_time() { |
1130 | - $where[ 'Datetime.EVT_ID' ] = $this->ID(); |
|
1131 | - $query_params = array( $where, 'order_by' => array( 'TKT_end_date' => 'DESC' ) ); |
|
1132 | - return EE_Registry::instance()->load_model( 'Ticket' )->get_one( $query_params ); |
|
1130 | + $where['Datetime.EVT_ID'] = $this->ID(); |
|
1131 | + $query_params = array($where, 'order_by' => array('TKT_end_date' => 'DESC')); |
|
1132 | + return EE_Registry::instance()->load_model('Ticket')->get_one($query_params); |
|
1133 | 1133 | } |
1134 | 1134 | |
1135 | 1135 | |
@@ -1141,11 +1141,11 @@ discard block |
||
1141 | 1141 | public function tickets_on_sale() { |
1142 | 1142 | $earliest_ticket = $this->get_ticket_with_earliest_start_time(); |
1143 | 1143 | $latest_ticket = $this->get_ticket_with_latest_end_time(); |
1144 | - if ( !$latest_ticket instanceof EE_Ticket && !$earliest_ticket instanceof EE_Ticket ) { |
|
1144 | + if ( ! $latest_ticket instanceof EE_Ticket && ! $earliest_ticket instanceof EE_Ticket) { |
|
1145 | 1145 | return FALSE; |
1146 | 1146 | } |
1147 | 1147 | //check on sale for these two tickets. |
1148 | - if ( $latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale() ) { |
|
1148 | + if ($latest_ticket->is_on_sale() || $earliest_ticket->is_on_sale()) { |
|
1149 | 1149 | return TRUE; |
1150 | 1150 | } |
1151 | 1151 | return FALSE; |
@@ -1159,7 +1159,7 @@ discard block |
||
1159 | 1159 | * @return string |
1160 | 1160 | */ |
1161 | 1161 | public function get_permalink() { |
1162 | - if ( $this->external_url() ) { |
|
1162 | + if ($this->external_url()) { |
|
1163 | 1163 | return $this->external_url(); |
1164 | 1164 | } |
1165 | 1165 | else { |
@@ -1174,10 +1174,10 @@ discard block |
||
1174 | 1174 | * @param array $query_params like EEM_Base::get_all |
1175 | 1175 | * @return EE_Term |
1176 | 1176 | */ |
1177 | - public function first_event_category( $query_params = array() ) { |
|
1178 | - $query_params[ 0 ][ 'Term_Taxonomy.taxonomy' ] = 'espresso_event_categories'; |
|
1179 | - $query_params[ 0 ][ 'Term_Taxonomy.Event.EVT_ID' ] = $this->ID(); |
|
1180 | - return EEM_Term::instance()->get_one( $query_params ); |
|
1177 | + public function first_event_category($query_params = array()) { |
|
1178 | + $query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories'; |
|
1179 | + $query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID(); |
|
1180 | + return EEM_Term::instance()->get_one($query_params); |
|
1181 | 1181 | } |
1182 | 1182 | |
1183 | 1183 | |
@@ -1187,10 +1187,10 @@ discard block |
||
1187 | 1187 | * @param array $query_params |
1188 | 1188 | * @return EE_Term[] |
1189 | 1189 | */ |
1190 | - public function get_all_event_categories( $query_params = array() ) { |
|
1191 | - $query_params[ 0 ][ 'Term_Taxonomy.taxonomy' ] = 'espresso_event_categories'; |
|
1192 | - $query_params[ 0 ][ 'Term_Taxonomy.Event.EVT_ID' ] = $this->ID(); |
|
1193 | - return EEM_Term::instance()->get_all( $query_params ); |
|
1190 | + public function get_all_event_categories($query_params = array()) { |
|
1191 | + $query_params[0]['Term_Taxonomy.taxonomy'] = 'espresso_event_categories'; |
|
1192 | + $query_params[0]['Term_Taxonomy.Event.EVT_ID'] = $this->ID(); |
|
1193 | + return EEM_Term::instance()->get_all($query_params); |
|
1194 | 1194 | } |
1195 | 1195 | |
1196 | 1196 | /** |
@@ -1198,8 +1198,8 @@ discard block |
||
1198 | 1198 | * @param array $query_params @see EEM_Base::get_all |
1199 | 1199 | * @return EE_Question_Group[] |
1200 | 1200 | */ |
1201 | - public function question_groups($query_params = array()){ |
|
1202 | - $query_params = ! empty( $query_params ) ? $query_params : array( 'order_by' => array( 'QSG_order' => 'ASC' )); |
|
1201 | + public function question_groups($query_params = array()) { |
|
1202 | + $query_params = ! empty($query_params) ? $query_params : array('order_by' => array('QSG_order' => 'ASC')); |
|
1203 | 1203 | return $this->get_many_related('Question_Group', $query_params); |
1204 | 1204 | } |
1205 | 1205 | |
@@ -1239,12 +1239,12 @@ discard block |
||
1239 | 1239 | */ |
1240 | 1240 | public function get_admin_edit_link() { |
1241 | 1241 | EE_Registry::instance()->load_helper('URL'); |
1242 | - return EEH_URL::add_query_args_and_nonce( array( |
|
1242 | + return EEH_URL::add_query_args_and_nonce(array( |
|
1243 | 1243 | 'page' => 'espresso_events', |
1244 | 1244 | 'action' => 'edit', |
1245 | 1245 | 'post' => $this->ID() |
1246 | 1246 | ), |
1247 | - admin_url( 'admin.php' ) |
|
1247 | + admin_url('admin.php') |
|
1248 | 1248 | ); |
1249 | 1249 | } |
1250 | 1250 | |
@@ -1257,11 +1257,11 @@ discard block |
||
1257 | 1257 | */ |
1258 | 1258 | public function get_admin_settings_link() { |
1259 | 1259 | EE_Registry::instance()->load_helper('URL'); |
1260 | - return EEH_URL::add_query_args_and_nonce( array( |
|
1260 | + return EEH_URL::add_query_args_and_nonce(array( |
|
1261 | 1261 | 'page' => 'espresso_events', |
1262 | 1262 | 'action' => 'default_event_settings' |
1263 | 1263 | ), |
1264 | - admin_url( 'admin.php' ) |
|
1264 | + admin_url('admin.php') |
|
1265 | 1265 | ); |
1266 | 1266 | } |
1267 | 1267 | |
@@ -1277,11 +1277,11 @@ discard block |
||
1277 | 1277 | public function get_admin_overview_link() { |
1278 | 1278 | |
1279 | 1279 | EE_Registry::instance()->load_helper('URL'); |
1280 | - return EEH_URL::add_query_args_and_nonce( array( |
|
1280 | + return EEH_URL::add_query_args_and_nonce(array( |
|
1281 | 1281 | 'page' => 'espresso_events', |
1282 | 1282 | 'action' => 'default' |
1283 | 1283 | ), |
1284 | - admin_url( 'admin.php' ) |
|
1284 | + admin_url('admin.php') |
|
1285 | 1285 | ); |
1286 | 1286 | } |
1287 | 1287 |