eventespresso /
event-espresso-core
@@ -7,13 +7,13 @@ |
||
| 7 | 7 | <!-- Facebook sharing information tags --> |
| 8 | 8 | <meta property="og:title" content="<?php echo $subject; ?>" /> |
| 9 | 9 | <title><?php echo $subject; ?></title> |
| 10 | - <?php do_action( 'AHEE__EE_Email_Messenger_main_wrapper_template_head', $message_type, $subject, $from, $main_body ); ?> |
|
| 10 | + <?php do_action('AHEE__EE_Email_Messenger_main_wrapper_template_head', $message_type, $subject, $from, $main_body); ?> |
|
| 11 | 11 | </head> |
| 12 | -<?php do_action( 'AHEE__EE_Email_Messenger_main_wrapper_template_header', $message_type, $subject, $from, $main_body ); ?> |
|
| 12 | +<?php do_action('AHEE__EE_Email_Messenger_main_wrapper_template_header', $message_type, $subject, $from, $main_body); ?> |
|
| 13 | 13 | <body bgcolor="#FFFFFF" topmargin="0" leftmargin="0" marginheight="0" marginwidth="0"> |
| 14 | -<?php do_action( 'AHEE__EE_Email_Messenger_main_wrapper_template_before_main_body', $message_type, $subject, $from, $main_body ); ?> |
|
| 14 | +<?php do_action('AHEE__EE_Email_Messenger_main_wrapper_template_before_main_body', $message_type, $subject, $from, $main_body); ?> |
|
| 15 | 15 | <?php echo $main_body; ?> |
| 16 | -<?php do_action( 'AHEE__EE_Email_Messenger_main_wrapper_template_after_main_body', $message_type, $subject, $from, $main_body ); ?> |
|
| 16 | +<?php do_action('AHEE__EE_Email_Messenger_main_wrapper_template_after_main_body', $message_type, $subject, $from, $main_body); ?> |
|
| 17 | 17 | </body> |
| 18 | -<?php do_action( 'AHEE__EE_Email_Messenger_main_wrapper_template_footer', $message_type, $subject, $from, $main_body ); ?> |
|
| 18 | +<?php do_action('AHEE__EE_Email_Messenger_main_wrapper_template_footer', $message_type, $subject, $from, $main_body); ?> |
|
| 19 | 19 | </html> |
| 20 | 20 | \ No newline at end of file |
@@ -27,21 +27,21 @@ |
||
| 27 | 27 | <!-- Primary Style Sheet --> |
| 28 | 28 | <link rel="stylesheet" type="text/css" href="<?php echo $main_css; ?>" /> |
| 29 | 29 | <!-- Make sure the buttons don't print --> |
| 30 | - <?php if ( isset( $extra_css )) : ?> |
|
| 30 | + <?php if (isset($extra_css)) : ?> |
|
| 31 | 31 | <!-- Additional Style Sheet --> |
| 32 | 32 | <link rel="stylesheet" type="text/css" href="<?php echo $extra_css; ?>" /> |
| 33 | 33 | <?php endif; ?> |
| 34 | 34 | <style type="text/css"> |
| 35 | 35 | @media print{ .noPrint{ display:none !important;height:0!important; width:0!important; margin:0!important; padding:0!important; }} |
| 36 | 36 | </style> |
| 37 | - <?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_head', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?> |
|
| 37 | + <?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_head', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?> |
|
| 38 | 38 | </head> |
| 39 | - <?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_header', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?> |
|
| 39 | + <?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_header', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?> |
|
| 40 | 40 | <body> |
| 41 | - <?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_before_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?> |
|
| 41 | + <?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_before_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?> |
|
| 42 | 42 | <?php echo $main_body; ?> |
| 43 | - <?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_after_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?> |
|
| 43 | + <?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_after_main_body', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?> |
|
| 44 | 44 | </body> |
| 45 | - <?php do_action( 'AHEE__EE_Html_Messenger_main_wrapper_template_footer', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?> |
|
| 45 | + <?php do_action('AHEE__EE_Html_Messenger_main_wrapper_template_footer', $message_type, $page_title, $base_css, $print_css, $main_css, $main_body); ?> |
|
| 46 | 46 | <?php wp_footer(); ?> |
| 47 | 47 | </html> |
| 48 | 48 | \ No newline at end of file |
@@ -1345,7 +1345,7 @@ |
||
| 1345 | 1345 | * This just returns whatever is set as the _event object property |
| 1346 | 1346 | * |
| 1347 | 1347 | * //todo this will become obsolete once the models are in place |
| 1348 | - * @return object |
|
| 1348 | + * @return EE_CPT_Base |
|
| 1349 | 1349 | */ |
| 1350 | 1350 | public function get_event_object() { |
| 1351 | 1351 | return $this->_cpt_model_obj; |
@@ -606,9 +606,9 @@ |
||
| 606 | 606 | // first check if event is active. |
| 607 | 607 | if ( |
| 608 | 608 | $orig_status === EEM_Event::cancelled |
| 609 | - || $orig_status === EEM_Event::postponed |
|
| 610 | - || $event->is_expired() |
|
| 611 | - || $event->is_inactive() |
|
| 609 | + || $orig_status === EEM_Event::postponed |
|
| 610 | + || $event->is_expired() |
|
| 611 | + || $event->is_inactive() |
|
| 612 | 612 | ) { |
| 613 | 613 | return; |
| 614 | 614 | } |
@@ -1,6 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION')) { |
|
| 3 | 3 | exit('NO direct script access allowed'); |
| 4 | +} |
|
| 4 | 5 | |
| 5 | 6 | /** |
| 6 | 7 | * Event Espresso |
@@ -1484,10 +1485,11 @@ discard block |
||
| 1484 | 1485 | //get the earliest datetime (if present); |
| 1485 | 1486 | $earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL; |
| 1486 | 1487 | |
| 1487 | - if ( !empty( $earliest_dtt ) ) |
|
| 1488 | - $template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a'); |
|
| 1489 | - else |
|
| 1490 | - $template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) ); |
|
| 1488 | + if ( !empty( $earliest_dtt ) ) { |
|
| 1489 | + $template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a'); |
|
| 1490 | + } else { |
|
| 1491 | + $template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) ); |
|
| 1492 | + } |
|
| 1491 | 1493 | } |
| 1492 | 1494 | |
| 1493 | 1495 | $template_args = array_merge( $template_args, $price_args ); |
@@ -1725,8 +1727,9 @@ discard block |
||
| 1725 | 1727 | } |
| 1726 | 1728 | $action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash'; |
| 1727 | 1729 | |
| 1728 | - if ( $redirect_after ) |
|
| 1729 | - $this->_redirect_after_action($success, 'Event', $action, array('action' => 'default')); |
|
| 1730 | + if ( $redirect_after ) { |
|
| 1731 | + $this->_redirect_after_action($success, 'Event', $action, array('action' => 'default')); |
|
| 1732 | + } |
|
| 1730 | 1733 | } |
| 1731 | 1734 | |
| 1732 | 1735 | /** |
@@ -1853,8 +1856,9 @@ discard block |
||
| 1853 | 1856 | EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
| 1854 | 1857 | } |
| 1855 | 1858 | |
| 1856 | - if ( $redirect_after ) |
|
| 1857 | - $this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash')); |
|
| 1859 | + if ( $redirect_after ) { |
|
| 1860 | + $this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash')); |
|
| 1861 | + } |
|
| 1858 | 1862 | } |
| 1859 | 1863 | |
| 1860 | 1864 | /** |
@@ -2091,8 +2095,10 @@ discard block |
||
| 2091 | 2095 | * @return void |
| 2092 | 2096 | */ |
| 2093 | 2097 | private function _set_category_object() { |
| 2094 | - if ( isset( $this->_category->id ) && !empty( $this->_category->id ) ) |
|
| 2095 | - return; //already have the category object so get out. |
|
| 2098 | + if ( isset( $this->_category->id ) && !empty( $this->_category->id ) ) { |
|
| 2099 | + return; |
|
| 2100 | + } |
|
| 2101 | + //already have the category object so get out. |
|
| 2096 | 2102 | |
| 2097 | 2103 | //set default category object |
| 2098 | 2104 | $this->_set_empty_category_object(); |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
| 3 | 3 | exit('NO direct script access allowed'); |
| 4 | 4 | |
| 5 | 5 | /** |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $this->_cpt_edit_routes = array( |
| 67 | 67 | 'espresso_events' => 'edit' |
| 68 | 68 | ); |
| 69 | - add_action('AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object', array( $this, 'verify_event_edit' ) ); |
|
| 69 | + add_action('AHEE__EE_Admin_Page_CPT__set_model_object__after_set_object', array($this, 'verify_event_edit')); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | protected function _ajax_hooks() { |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | 'edit' => esc_html__('Update Event', 'event_espresso'), |
| 93 | 93 | 'add_category' => esc_html__('Save New Category', 'event_espresso'), |
| 94 | 94 | 'edit_category' => esc_html__('Update Category', 'event_espresso'), |
| 95 | - 'template_settings' => esc_html__( 'Update Settings', 'event_espresso' ) |
|
| 95 | + 'template_settings' => esc_html__('Update Settings', 'event_espresso') |
|
| 96 | 96 | ) |
| 97 | 97 | ); |
| 98 | 98 | } |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | //load field generator helper |
| 103 | 103 | |
| 104 | 104 | //is there a evt_id in the request? |
| 105 | - $evt_id = ! empty( $this->_req_data['EVT_ID'] ) && ! is_array( $this->_req_data['EVT_ID'] ) ? $this->_req_data['EVT_ID'] : 0; |
|
| 106 | - $evt_id = ! empty( $this->_req_data['post'] ) ? $this->_req_data['post'] : $evt_id; |
|
| 105 | + $evt_id = ! empty($this->_req_data['EVT_ID']) && ! is_array($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : 0; |
|
| 106 | + $evt_id = ! empty($this->_req_data['post']) ? $this->_req_data['post'] : $evt_id; |
|
| 107 | 107 | |
| 108 | 108 | |
| 109 | 109 | $this->_page_routes = array( |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | 'help_tour' => array( |
| 318 | 318 | 'Event_Editor_Help_Tour' |
| 319 | 319 | ), |
| 320 | - 'qtips' => array( 'EE_Event_Editor_Decaf_Tips' ), |
|
| 320 | + 'qtips' => array('EE_Event_Editor_Decaf_Tips'), |
|
| 321 | 321 | 'require_nonce' => FALSE |
| 322 | 322 | ), |
| 323 | 323 | 'edit' => array( |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | /*'help_tour' => array( |
| 374 | 374 | 'Event_Edit_Help_Tour' |
| 375 | 375 | ),*/ |
| 376 | - 'qtips' => array( 'EE_Event_Editor_Decaf_Tips' ), |
|
| 376 | + 'qtips' => array('EE_Event_Editor_Decaf_Tips'), |
|
| 377 | 377 | 'require_nonce' => FALSE |
| 378 | 378 | ), |
| 379 | 379 | 'default_event_settings' => array( |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | 'filename' => 'events_default_settings_status' |
| 396 | 396 | ) |
| 397 | 397 | ), |
| 398 | - 'help_tour' => array( 'Event_Default_Settings_Help_Tour'), |
|
| 398 | + 'help_tour' => array('Event_Default_Settings_Help_Tour'), |
|
| 399 | 399 | 'require_nonce' => FALSE |
| 400 | 400 | ), |
| 401 | 401 | //template settings |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | 'filename' => 'general_settings_templates' |
| 412 | 412 | ) |
| 413 | 413 | ), |
| 414 | - 'help_tour' => array( 'Templates_Help_Tour' ), |
|
| 414 | + 'help_tour' => array('Templates_Help_Tour'), |
|
| 415 | 415 | 'require_nonce' => FALSE |
| 416 | 416 | ), |
| 417 | 417 | //event category stuff |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | 'label' => esc_html__('Edit Category', 'event_espresso'), |
| 436 | 436 | 'order' => 15, |
| 437 | 437 | 'persistent' => FALSE, |
| 438 | - 'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID'] ), $this->_current_page_view_url ) : $this->_admin_base_url |
|
| 438 | + 'url' => isset($this->_req_data['EVT_CAT_ID']) ? add_query_arg(array('EVT_CAT_ID' => $this->_req_data['EVT_CAT_ID']), $this->_current_page_view_url) : $this->_admin_base_url |
|
| 439 | 439 | ), |
| 440 | 440 | 'help_tabs' => array( |
| 441 | 441 | 'edit_category_help_tab' => array( |
@@ -505,14 +505,14 @@ discard block |
||
| 505 | 505 | |
| 506 | 506 | public function load_scripts_styles() { |
| 507 | 507 | |
| 508 | - wp_register_style('events-admin-css', EVENTS_ASSETS_URL . 'events-admin-page.css', array(), EVENT_ESPRESSO_VERSION); |
|
| 509 | - wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL . 'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION ); |
|
| 508 | + wp_register_style('events-admin-css', EVENTS_ASSETS_URL.'events-admin-page.css', array(), EVENT_ESPRESSO_VERSION); |
|
| 509 | + wp_register_style('ee-cat-admin', EVENTS_ASSETS_URL.'ee-cat-admin.css', array(), EVENT_ESPRESSO_VERSION); |
|
| 510 | 510 | wp_enqueue_style('events-admin-css'); |
| 511 | 511 | wp_enqueue_style('ee-cat-admin'); |
| 512 | 512 | //todo note: we also need to load_scripts_styles per view (i.e. default/view_report/event_details |
| 513 | 513 | //registers for all views |
| 514 | 514 | //scripts |
| 515 | - wp_register_script('event_editor_js', EVENTS_ASSETS_URL . 'event_editor.js', array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'), EVENT_ESPRESSO_VERSION, TRUE); |
|
| 515 | + wp_register_script('event_editor_js', EVENTS_ASSETS_URL.'event_editor.js', array('ee_admin_js', 'jquery-ui-slider', 'jquery-ui-timepicker-addon'), EVENT_ESPRESSO_VERSION, TRUE); |
|
| 516 | 516 | } |
| 517 | 517 | |
| 518 | 518 | /** |
@@ -530,11 +530,11 @@ discard block |
||
| 530 | 530 | public function load_scripts_styles_edit() { |
| 531 | 531 | //styles |
| 532 | 532 | wp_enqueue_style('espresso-ui-theme'); |
| 533 | - wp_register_style('event-editor-css', EVENTS_ASSETS_URL . 'event-editor.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION ); |
|
| 533 | + wp_register_style('event-editor-css', EVENTS_ASSETS_URL.'event-editor.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION); |
|
| 534 | 534 | wp_enqueue_style('event-editor-css'); |
| 535 | 535 | |
| 536 | 536 | //scripts |
| 537 | - wp_register_script('event-datetime-metabox', EVENTS_ASSETS_URL . 'event-datetime-metabox.js', array('event_editor_js', 'ee-datepicker'), EVENT_ESPRESSO_VERSION ); |
|
| 537 | + wp_register_script('event-datetime-metabox', EVENTS_ASSETS_URL.'event-datetime-metabox.js', array('event_editor_js', 'ee-datepicker'), EVENT_ESPRESSO_VERSION); |
|
| 538 | 538 | wp_enqueue_script('event-datetime-metabox'); |
| 539 | 539 | |
| 540 | 540 | } |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | |
| 570 | 570 | |
| 571 | 571 | public function admin_init() { |
| 572 | - EE_Registry::$i18n_js_strings[ 'image_confirm' ] = esc_html__( 'Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso' ); |
|
| 572 | + EE_Registry::$i18n_js_strings['image_confirm'] = esc_html__('Do you really want to delete this image? Please remember to update your event to complete the removal.', 'event_espresso'); |
|
| 573 | 573 | } |
| 574 | 574 | |
| 575 | 575 | |
@@ -590,12 +590,12 @@ discard block |
||
| 590 | 590 | */ |
| 591 | 591 | public function verify_event_edit($event = NULL) { |
| 592 | 592 | // no event? |
| 593 | - if ( empty( $event )) { |
|
| 593 | + if (empty($event)) { |
|
| 594 | 594 | // set event |
| 595 | 595 | $event = $this->_cpt_model_obj; |
| 596 | 596 | } |
| 597 | 597 | // STILL no event? |
| 598 | - if ( empty ( $event )) { |
|
| 598 | + if (empty ($event)) { |
|
| 599 | 599 | return; |
| 600 | 600 | } |
| 601 | 601 | $orig_status = $event->status(); |
@@ -609,27 +609,27 @@ discard block |
||
| 609 | 609 | return; |
| 610 | 610 | } |
| 611 | 611 | //made it here so it IS active... next check that any of the tickets are sold. |
| 612 | - if ( $event->is_sold_out( true ) ) { |
|
| 613 | - if ( $orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status ) { |
|
| 612 | + if ($event->is_sold_out(true)) { |
|
| 613 | + if ($orig_status !== EEM_Event::sold_out && $event->status() !== $orig_status) { |
|
| 614 | 614 | EE_Error::add_attention( |
| 615 | 615 | sprintf( |
| 616 | - esc_html__( 'Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event. However, this change is not permanent until you update the event. You can change the status back to something else before updating if you wish.', 'event_espresso' ), |
|
| 617 | - EEH_Template::pretty_status( EEM_Event::sold_out, FALSE, 'sentence' ) |
|
| 616 | + esc_html__('Please note that the Event Status has automatically been changed to %s because there are no more spaces available for this event. However, this change is not permanent until you update the event. You can change the status back to something else before updating if you wish.', 'event_espresso'), |
|
| 617 | + EEH_Template::pretty_status(EEM_Event::sold_out, FALSE, 'sentence') |
|
| 618 | 618 | ) |
| 619 | 619 | ); |
| 620 | 620 | } |
| 621 | 621 | return; |
| 622 | - } else if ( $orig_status === EEM_Event::sold_out ) { |
|
| 622 | + } else if ($orig_status === EEM_Event::sold_out) { |
|
| 623 | 623 | EE_Error::add_attention( |
| 624 | 624 | sprintf( |
| 625 | - esc_html__( 'Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets. However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.', |
|
| 626 | - 'event_espresso' ), |
|
| 627 | - EEH_Template::pretty_status( $event->status(), false, 'sentence' ) |
|
| 625 | + esc_html__('Please note that the Event Status has automatically been changed to %s because more spaces have become available for this event, most likely due to abandoned transactions freeing up reserved tickets. However, this change is not permanent until you update the event. If you wish, you can change the status back to something else before updating.', |
|
| 626 | + 'event_espresso'), |
|
| 627 | + EEH_Template::pretty_status($event->status(), false, 'sentence') |
|
| 628 | 628 | ) |
| 629 | 629 | ); |
| 630 | 630 | } |
| 631 | 631 | //now we need to determine if the event has any tickets on sale. If not then we dont' show the error |
| 632 | - if ( ! $event->tickets_on_sale() ) { |
|
| 632 | + if ( ! $event->tickets_on_sale()) { |
|
| 633 | 633 | return; |
| 634 | 634 | } |
| 635 | 635 | //made it here so show warning |
@@ -648,7 +648,7 @@ discard block |
||
| 648 | 648 | */ |
| 649 | 649 | protected function _edit_event_warning() { |
| 650 | 650 | // we don't want to add warnings during these requests |
| 651 | - if ( isset( $this->_req_data['action'] ) && $this->_req_data['action'] === 'editpost' ) { |
|
| 651 | + if (isset($this->_req_data['action']) && $this->_req_data['action'] === 'editpost') { |
|
| 652 | 652 | return; |
| 653 | 653 | } |
| 654 | 654 | EE_Error::add_attention( |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | ), |
| 680 | 680 | ); |
| 681 | 681 | |
| 682 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) { |
|
| 682 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) { |
|
| 683 | 683 | $this->_views['trash'] = array( |
| 684 | 684 | 'slug' => 'trash', |
| 685 | 685 | 'label' => esc_html__('Trash', 'event_espresso'), |
@@ -709,39 +709,39 @@ discard block |
||
| 709 | 709 | 'desc' => esc_html__('View Registrations for Event', 'event_espresso') |
| 710 | 710 | ) |
| 711 | 711 | ); |
| 712 | - $items = apply_filters( 'FHEE__Events_Admin_Page___event_legend_items__items', $items ); |
|
| 712 | + $items = apply_filters('FHEE__Events_Admin_Page___event_legend_items__items', $items); |
|
| 713 | 713 | $statuses = array( |
| 714 | 714 | 'sold_out_status' => array( |
| 715 | - 'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::sold_out, |
|
| 716 | - 'desc' => EEH_Template::pretty_status( EE_Datetime::sold_out, FALSE, 'sentence' ) |
|
| 715 | + 'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::sold_out, |
|
| 716 | + 'desc' => EEH_Template::pretty_status(EE_Datetime::sold_out, FALSE, 'sentence') |
|
| 717 | 717 | ), |
| 718 | 718 | 'active_status' => array( |
| 719 | - 'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::active, |
|
| 720 | - 'desc' => EEH_Template::pretty_status( EE_Datetime::active, FALSE, 'sentence' ) |
|
| 719 | + 'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::active, |
|
| 720 | + 'desc' => EEH_Template::pretty_status(EE_Datetime::active, FALSE, 'sentence') |
|
| 721 | 721 | ), |
| 722 | 722 | 'upcoming_status' => array( |
| 723 | - 'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::upcoming, |
|
| 724 | - 'desc' => EEH_Template::pretty_status( EE_Datetime::upcoming, FALSE, 'sentence' ) |
|
| 723 | + 'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::upcoming, |
|
| 724 | + 'desc' => EEH_Template::pretty_status(EE_Datetime::upcoming, FALSE, 'sentence') |
|
| 725 | 725 | ), |
| 726 | 726 | 'postponed_status' => array( |
| 727 | - 'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::postponed, |
|
| 728 | - 'desc' => EEH_Template::pretty_status( EE_Datetime::postponed, FALSE, 'sentence' ) |
|
| 727 | + 'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::postponed, |
|
| 728 | + 'desc' => EEH_Template::pretty_status(EE_Datetime::postponed, FALSE, 'sentence') |
|
| 729 | 729 | ), |
| 730 | 730 | 'cancelled_status' => array( |
| 731 | - 'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::cancelled, |
|
| 732 | - 'desc' => EEH_Template::pretty_status( EE_Datetime::cancelled, FALSE, 'sentence' ) |
|
| 731 | + 'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::cancelled, |
|
| 732 | + 'desc' => EEH_Template::pretty_status(EE_Datetime::cancelled, FALSE, 'sentence') |
|
| 733 | 733 | ), |
| 734 | 734 | 'expired_status' => array( |
| 735 | - 'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::expired, |
|
| 736 | - 'desc' => EEH_Template::pretty_status( EE_Datetime::expired, FALSE, 'sentence' ) |
|
| 735 | + 'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::expired, |
|
| 736 | + 'desc' => EEH_Template::pretty_status(EE_Datetime::expired, FALSE, 'sentence') |
|
| 737 | 737 | ), |
| 738 | 738 | 'inactive_status' => array( |
| 739 | - 'class' => 'ee-status-legend ee-status-legend-' . EE_Datetime::inactive, |
|
| 740 | - 'desc' => EEH_Template::pretty_status( EE_Datetime::inactive, FALSE, 'sentence' ) |
|
| 739 | + 'class' => 'ee-status-legend ee-status-legend-'.EE_Datetime::inactive, |
|
| 740 | + 'desc' => EEH_Template::pretty_status(EE_Datetime::inactive, FALSE, 'sentence') |
|
| 741 | 741 | ) |
| 742 | 742 | ); |
| 743 | - $statuses = apply_filters( 'FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses ); |
|
| 744 | - return array_merge( $items, $statuses ); |
|
| 743 | + $statuses = apply_filters('FHEE__Events_Admin_Page__event_legend_items__statuses', $statuses); |
|
| 744 | + return array_merge($items, $statuses); |
|
| 745 | 745 | } |
| 746 | 746 | |
| 747 | 747 | |
@@ -753,8 +753,8 @@ discard block |
||
| 753 | 753 | * @return EEM_Event |
| 754 | 754 | */ |
| 755 | 755 | private function _event_model() { |
| 756 | - if ( ! $this->_event_model instanceof EEM_Event ) { |
|
| 757 | - $this->_event_model = EE_Registry::instance()->load_model( 'Event' ); |
|
| 756 | + if ( ! $this->_event_model instanceof EEM_Event) { |
|
| 757 | + $this->_event_model = EE_Registry::instance()->load_model('Event'); |
|
| 758 | 758 | } |
| 759 | 759 | return $this->_event_model; |
| 760 | 760 | } |
@@ -773,12 +773,12 @@ discard block |
||
| 773 | 773 | * @param string $new_slug what the slug is |
| 774 | 774 | * @return string The new html string for the permalink area |
| 775 | 775 | */ |
| 776 | - public function extra_permalink_field_buttons( $return, $id, $new_title, $new_slug ) { |
|
| 776 | + public function extra_permalink_field_buttons($return, $id, $new_title, $new_slug) { |
|
| 777 | 777 | //make sure this is only when editing |
| 778 | - if ( !empty( $id ) ) { |
|
| 779 | - $post = get_post( $id ); |
|
| 780 | - $return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#" tabindex="-1">' . esc_html__('Shortcode', 'event_espresso') . '</a> '; |
|
| 781 | - $return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id=' . $post->ID . ']">'; |
|
| 778 | + if ( ! empty($id)) { |
|
| 779 | + $post = get_post($id); |
|
| 780 | + $return .= '<a class="button button-small" onclick="prompt(\'Shortcode:\', jQuery(\'#shortcode\').val()); return false;" href="#" tabindex="-1">'.esc_html__('Shortcode', 'event_espresso').'</a> '; |
|
| 781 | + $return .= '<input id="shortcode" type="hidden" value="[ESPRESSO_TICKET_SELECTOR event_id='.$post->ID.']">'; |
|
| 782 | 782 | } |
| 783 | 783 | return $return; |
| 784 | 784 | } |
@@ -794,10 +794,10 @@ discard block |
||
| 794 | 794 | * @return string html for generated table |
| 795 | 795 | */ |
| 796 | 796 | protected function _events_overview_list_table() { |
| 797 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
| 798 | - $this->_template_args['after_list_table'] = EEH_Template::get_button_or_link( get_post_type_archive_link('espresso_events'), esc_html__("View Event Archive Page", "event_espresso"), 'button' ) . |
|
| 797 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
| 798 | + $this->_template_args['after_list_table'] = EEH_Template::get_button_or_link(get_post_type_archive_link('espresso_events'), esc_html__("View Event Archive Page", "event_espresso"), 'button'). |
|
| 799 | 799 | $this->_display_legend($this->_event_legend_items()); |
| 800 | - $this->_admin_page_title .= ' ' . $this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2'); |
|
| 800 | + $this->_admin_page_title .= ' '.$this->get_action_link_or_button('create_new', 'add', array(), 'add-new-h2'); |
|
| 801 | 801 | $this->display_admin_list_table_page_with_no_sidebar(); |
| 802 | 802 | } |
| 803 | 803 | |
@@ -813,51 +813,51 @@ discard block |
||
| 813 | 813 | |
| 814 | 814 | |
| 815 | 815 | |
| 816 | - protected function _insert_update_cpt_item( $post_id, $post ) { |
|
| 816 | + protected function _insert_update_cpt_item($post_id, $post) { |
|
| 817 | 817 | |
| 818 | - if ( $post instanceof WP_Post && $post->post_type !== 'espresso_events' ) { |
|
| 818 | + if ($post instanceof WP_Post && $post->post_type !== 'espresso_events') { |
|
| 819 | 819 | //getout we're not processing an event save. |
| 820 | 820 | return; |
| 821 | 821 | } |
| 822 | 822 | |
| 823 | 823 | $event_values = array( |
| 824 | - 'EVT_display_desc' => !empty( $this->_req_data['display_desc'] ) ? 1 : 0, |
|
| 825 | - 'EVT_display_ticket_selector' => !empty( $this->_req_data['display_ticket_selector'] ) ? 1 : 0, |
|
| 824 | + 'EVT_display_desc' => ! empty($this->_req_data['display_desc']) ? 1 : 0, |
|
| 825 | + 'EVT_display_ticket_selector' => ! empty($this->_req_data['display_ticket_selector']) ? 1 : 0, |
|
| 826 | 826 | 'EVT_additional_limit' => min( |
| 827 | - apply_filters( 'FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255 ), |
|
| 828 | - !empty( $this->_req_data['additional_limit'] ) ? $this->_req_data['additional_limit'] : NULL ), |
|
| 829 | - 'EVT_default_registration_status' => !empty( $this->_req_data['EVT_default_registration_status'] ) ? $this->_req_data['EVT_default_registration_status'] : EE_Registry::instance()->CFG->registration->default_STS_ID, |
|
| 830 | - 'EVT_member_only' => !empty( $this->_req_data['member_only'] ) ? 1 : 0, |
|
| 831 | - 'EVT_allow_overflow' => !empty( $this->_req_data['EVT_allow_overflow'] ) ? 1 : 0, |
|
| 832 | - 'EVT_timezone_string' => !empty( $this->_req_data['timezone_string'] ) ? $this->_req_data['timezone_string'] : NULL, |
|
| 833 | - 'EVT_external_URL' => !empty( $this->_req_data['externalURL'] ) ? $this->_req_data['externalURL'] : NULL, |
|
| 834 | - 'EVT_phone' => !empty( $this->_req_data['event_phone'] ) ? $this->_req_data['event_phone'] : NULL |
|
| 827 | + apply_filters('FHEE__EE_Events_Admin__insert_update_cpt_item__EVT_additional_limit_max', 255), |
|
| 828 | + ! empty($this->_req_data['additional_limit']) ? $this->_req_data['additional_limit'] : NULL ), |
|
| 829 | + 'EVT_default_registration_status' => ! empty($this->_req_data['EVT_default_registration_status']) ? $this->_req_data['EVT_default_registration_status'] : EE_Registry::instance()->CFG->registration->default_STS_ID, |
|
| 830 | + 'EVT_member_only' => ! empty($this->_req_data['member_only']) ? 1 : 0, |
|
| 831 | + 'EVT_allow_overflow' => ! empty($this->_req_data['EVT_allow_overflow']) ? 1 : 0, |
|
| 832 | + 'EVT_timezone_string' => ! empty($this->_req_data['timezone_string']) ? $this->_req_data['timezone_string'] : NULL, |
|
| 833 | + 'EVT_external_URL' => ! empty($this->_req_data['externalURL']) ? $this->_req_data['externalURL'] : NULL, |
|
| 834 | + 'EVT_phone' => ! empty($this->_req_data['event_phone']) ? $this->_req_data['event_phone'] : NULL |
|
| 835 | 835 | ); |
| 836 | 836 | |
| 837 | 837 | //update event |
| 838 | - $success = $this->_event_model()->update_by_ID( $event_values, $post_id ); |
|
| 838 | + $success = $this->_event_model()->update_by_ID($event_values, $post_id); |
|
| 839 | 839 | |
| 840 | 840 | |
| 841 | 841 | //get event_object for other metaboxes... though it would seem to make sense to just use $this->_event_model()->get_one_by_ID( $post_id ).. i have to setup where conditions to override the filters in the model that filter out autodraft and inherit statuses so we GET the inherit id! |
| 842 | - $get_one_where = array( $this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status ); |
|
| 843 | - $event = $this->_event_model()->get_one( array($get_one_where) ); |
|
| 842 | + $get_one_where = array($this->_event_model()->primary_key_name() => $post_id, 'status' => $post->post_status); |
|
| 843 | + $event = $this->_event_model()->get_one(array($get_one_where)); |
|
| 844 | 844 | |
| 845 | 845 | |
| 846 | 846 | //the following are default callbacks for event attachment updates that can be overridden by caffeinated functionality and/or addons. |
| 847 | - $event_update_callbacks = apply_filters( 'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( array($this, '_default_venue_update' ), array( $this, '_default_tickets_update') ) ); |
|
| 847 | + $event_update_callbacks = apply_filters('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array(array($this, '_default_venue_update'), array($this, '_default_tickets_update'))); |
|
| 848 | 848 | |
| 849 | 849 | $att_success = TRUE; |
| 850 | 850 | |
| 851 | - foreach ( $event_update_callbacks as $e_callback ) { |
|
| 852 | - $_succ = call_user_func_array( $e_callback, array( $event, $this->_req_data ) ); |
|
| 853 | - $att_success = !$att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message |
|
| 851 | + foreach ($event_update_callbacks as $e_callback) { |
|
| 852 | + $_succ = call_user_func_array($e_callback, array($event, $this->_req_data)); |
|
| 853 | + $att_success = ! $att_success ? $att_success : $_succ; //if ANY of these updates fail then we want the appropriate global error message |
|
| 854 | 854 | } |
| 855 | 855 | |
| 856 | 856 | //any errors? |
| 857 | - if ( $success && FALSE === $att_success ) { |
|
| 858 | - EE_Error::add_error( esc_html__('Event Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
| 859 | - } else if ( $success === FALSE ) { |
|
| 860 | - EE_Error::add_error( esc_html__('Event Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
| 857 | + if ($success && FALSE === $att_success) { |
|
| 858 | + EE_Error::add_error(esc_html__('Event Details saved successfully but something went wrong with saving attachments.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
| 859 | + } else if ($success === FALSE) { |
|
| 860 | + EE_Error::add_error(esc_html__('Event Details did not save successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
| 861 | 861 | } |
| 862 | 862 | } |
| 863 | 863 | |
@@ -867,14 +867,14 @@ discard block |
||
| 867 | 867 | /** |
| 868 | 868 | * @see parent::restore_item() |
| 869 | 869 | */ |
| 870 | - protected function _restore_cpt_item( $post_id, $revision_id ) { |
|
| 870 | + protected function _restore_cpt_item($post_id, $revision_id) { |
|
| 871 | 871 | //copy existing event meta to new post |
| 872 | 872 | $post_evt = $this->_event_model()->get_one_by_ID($post_id); |
| 873 | - if ( $post_evt instanceof EE_Event ) { |
|
| 873 | + if ($post_evt instanceof EE_Event) { |
|
| 874 | 874 | //meta revision restore |
| 875 | - $post_evt->restore_revision( $revision_id ); |
|
| 875 | + $post_evt->restore_revision($revision_id); |
|
| 876 | 876 | //related objs restore |
| 877 | - $post_evt->restore_revision( $revision_id, array( 'Venue', 'Datetime', 'Price' ) ); |
|
| 877 | + $post_evt->restore_revision($revision_id, array('Venue', 'Datetime', 'Price')); |
|
| 878 | 878 | } |
| 879 | 879 | } |
| 880 | 880 | |
@@ -887,52 +887,52 @@ discard block |
||
| 887 | 887 | * @param array $data The request data from the form |
| 888 | 888 | * @return bool Success or fail. |
| 889 | 889 | */ |
| 890 | - protected function _default_venue_update( $evtobj, $data ) { |
|
| 891 | - require_once( EE_MODELS . 'EEM_Venue.model.php' ); |
|
| 890 | + protected function _default_venue_update($evtobj, $data) { |
|
| 891 | + require_once(EE_MODELS.'EEM_Venue.model.php'); |
|
| 892 | 892 | $venue_model = EE_Registry::instance()->load_model('Venue'); |
| 893 | 893 | $rows_affected = NULL; |
| 894 | - $venue_id = !empty( $data['venue_id'] ) ? $data['venue_id'] : NULL; |
|
| 894 | + $venue_id = ! empty($data['venue_id']) ? $data['venue_id'] : NULL; |
|
| 895 | 895 | |
| 896 | 896 | // very important. If we don't have a venue name... |
| 897 | 897 | // then we'll get out because not necessary to create empty venue |
| 898 | - if ( empty( $data['venue_title'] ) ) { |
|
| 898 | + if (empty($data['venue_title'])) { |
|
| 899 | 899 | return false; |
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | $venue_array = array( |
| 903 | 903 | 'VNU_wp_user' => $evtobj->get('EVT_wp_user'), |
| 904 | - 'VNU_name' => !empty( $data['venue_title'] ) ? $data['venue_title'] : NULL, |
|
| 905 | - 'VNU_desc' => !empty( $data['venue_description'] ) ? $data['venue_description'] : NULL, |
|
| 906 | - 'VNU_identifier' => !empty( $data['venue_identifier'] ) ? $data['venue_identifier'] : NULL, |
|
| 907 | - 'VNU_short_desc' => !empty( $data['venue_short_description'] ) ? $data['venue_short_description'] : NULL, |
|
| 908 | - 'VNU_address' => !empty( $data['address'] ) ? $data['address'] : NULL, |
|
| 909 | - 'VNU_address2' => !empty( $data['address2'] ) ? $data['address2'] : NULL, |
|
| 910 | - 'VNU_city' => !empty( $data['city'] ) ? $data['city'] : NULL, |
|
| 911 | - 'STA_ID' => !empty( $data['state'] ) ? $data['state'] : NULL, |
|
| 912 | - 'CNT_ISO' => !empty( $data['countries'] ) ? $data['countries'] : NULL, |
|
| 913 | - 'VNU_zip' => !empty( $data['zip'] ) ? $data['zip'] : NULL, |
|
| 914 | - 'VNU_phone' => !empty( $data['venue_phone'] ) ? $data['venue_phone'] : NULL, |
|
| 915 | - 'VNU_capacity' => !empty( $data['venue_capacity'] ) ? $data['venue_capacity'] : NULL, |
|
| 916 | - 'VNU_url' => !empty($data['venue_url'] ) ? $data['venue_url'] : NULL, |
|
| 917 | - 'VNU_virtual_phone' => !empty($data['virtual_phone']) ? $data['virtual_phone'] : NULL, |
|
| 918 | - 'VNU_virtual_url' => !empty( $data['virtual_url'] ) ? $data['virtual_url'] : NULL, |
|
| 919 | - 'VNU_enable_for_gmap' => isset( $data['enable_for_gmap'] ) ? 1 : 0, |
|
| 904 | + 'VNU_name' => ! empty($data['venue_title']) ? $data['venue_title'] : NULL, |
|
| 905 | + 'VNU_desc' => ! empty($data['venue_description']) ? $data['venue_description'] : NULL, |
|
| 906 | + 'VNU_identifier' => ! empty($data['venue_identifier']) ? $data['venue_identifier'] : NULL, |
|
| 907 | + 'VNU_short_desc' => ! empty($data['venue_short_description']) ? $data['venue_short_description'] : NULL, |
|
| 908 | + 'VNU_address' => ! empty($data['address']) ? $data['address'] : NULL, |
|
| 909 | + 'VNU_address2' => ! empty($data['address2']) ? $data['address2'] : NULL, |
|
| 910 | + 'VNU_city' => ! empty($data['city']) ? $data['city'] : NULL, |
|
| 911 | + 'STA_ID' => ! empty($data['state']) ? $data['state'] : NULL, |
|
| 912 | + 'CNT_ISO' => ! empty($data['countries']) ? $data['countries'] : NULL, |
|
| 913 | + 'VNU_zip' => ! empty($data['zip']) ? $data['zip'] : NULL, |
|
| 914 | + 'VNU_phone' => ! empty($data['venue_phone']) ? $data['venue_phone'] : NULL, |
|
| 915 | + 'VNU_capacity' => ! empty($data['venue_capacity']) ? $data['venue_capacity'] : NULL, |
|
| 916 | + 'VNU_url' => ! empty($data['venue_url']) ? $data['venue_url'] : NULL, |
|
| 917 | + 'VNU_virtual_phone' => ! empty($data['virtual_phone']) ? $data['virtual_phone'] : NULL, |
|
| 918 | + 'VNU_virtual_url' => ! empty($data['virtual_url']) ? $data['virtual_url'] : NULL, |
|
| 919 | + 'VNU_enable_for_gmap' => isset($data['enable_for_gmap']) ? 1 : 0, |
|
| 920 | 920 | 'status' => 'publish' |
| 921 | 921 | ); |
| 922 | 922 | |
| 923 | 923 | |
| 924 | 924 | //if we've got the venue_id then we're just updating the existing venue so let's do that and then get out. |
| 925 | - if ( !empty( $venue_id ) ) { |
|
| 926 | - $update_where = array( $venue_model->primary_key_name() => $venue_id ); |
|
| 927 | - $rows_affected = $venue_model->update( $venue_array, array( $update_where ) ); |
|
| 925 | + if ( ! empty($venue_id)) { |
|
| 926 | + $update_where = array($venue_model->primary_key_name() => $venue_id); |
|
| 927 | + $rows_affected = $venue_model->update($venue_array, array($update_where)); |
|
| 928 | 928 | //we've gotta make sure that the venue is always attached to a revision.. add_relation_to should take care of making sure that the relation is already present. |
| 929 | - $evtobj->_add_relation_to( $venue_id, 'Venue' ); |
|
| 929 | + $evtobj->_add_relation_to($venue_id, 'Venue'); |
|
| 930 | 930 | return $rows_affected > 0 ? TRUE : FALSE; |
| 931 | 931 | } else { |
| 932 | 932 | //we insert the venue |
| 933 | - $venue_id = $venue_model->insert( $venue_array ); |
|
| 934 | - $evtobj->_add_relation_to( $venue_id, 'Venue' ); |
|
| 935 | - return !empty( $venue_id ) ? TRUE : FALSE; |
|
| 933 | + $venue_id = $venue_model->insert($venue_array); |
|
| 934 | + $evtobj->_add_relation_to($venue_id, 'Venue'); |
|
| 935 | + return ! empty($venue_id) ? TRUE : FALSE; |
|
| 936 | 936 | } |
| 937 | 937 | //when we have the ancestor come in it's already been handled by the revision save. |
| 938 | 938 | } |
@@ -946,54 +946,54 @@ discard block |
||
| 946 | 946 | * @param array $data The request data from the form |
| 947 | 947 | * @return bool success or fail |
| 948 | 948 | */ |
| 949 | - protected function _default_tickets_update( EE_Event $evtobj, $data ) { |
|
| 949 | + protected function _default_tickets_update(EE_Event $evtobj, $data) { |
|
| 950 | 950 | $success = true; |
| 951 | 951 | $saved_dtt = null; |
| 952 | 952 | $saved_tickets = array(); |
| 953 | - $incoming_date_formats = array( 'Y-m-d', 'h:i a' ); |
|
| 953 | + $incoming_date_formats = array('Y-m-d', 'h:i a'); |
|
| 954 | 954 | |
| 955 | - foreach ( $data['edit_event_datetimes'] as $row => $dtt ) { |
|
| 955 | + foreach ($data['edit_event_datetimes'] as $row => $dtt) { |
|
| 956 | 956 | //trim all values to ensure any excess whitespace is removed. |
| 957 | - $dtt = array_map( 'trim', $dtt ); |
|
| 958 | - $dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty( $dtt['DTT_EVT_end'] ) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start']; |
|
| 957 | + $dtt = array_map('trim', $dtt); |
|
| 958 | + $dtt['DTT_EVT_end'] = isset($dtt['DTT_EVT_end']) && ! empty($dtt['DTT_EVT_end']) ? $dtt['DTT_EVT_end'] : $dtt['DTT_EVT_start']; |
|
| 959 | 959 | $datetime_values = array( |
| 960 | - 'DTT_ID' => ! empty( $dtt['DTT_ID'] ) ? $dtt['DTT_ID'] : NULL, |
|
| 960 | + 'DTT_ID' => ! empty($dtt['DTT_ID']) ? $dtt['DTT_ID'] : NULL, |
|
| 961 | 961 | 'DTT_EVT_start' => $dtt['DTT_EVT_start'], |
| 962 | 962 | 'DTT_EVT_end' => $dtt['DTT_EVT_end'], |
| 963 | - 'DTT_reg_limit' => empty( $dtt['DTT_reg_limit'] ) ? EE_INF : $dtt['DTT_reg_limit'], |
|
| 963 | + 'DTT_reg_limit' => empty($dtt['DTT_reg_limit']) ? EE_INF : $dtt['DTT_reg_limit'], |
|
| 964 | 964 | 'DTT_order' => $row, |
| 965 | 965 | ); |
| 966 | 966 | |
| 967 | 967 | //if we have an id then let's get existing object first and then set the new values. Otherwise we instantiate a new object for save. |
| 968 | 968 | |
| 969 | - if ( !empty( $dtt['DTT_ID'] ) ) { |
|
| 970 | - $DTM = EE_Registry::instance()->load_model('Datetime', array( $evtobj->get_timezone() ) )->get_one_by_ID($dtt['DTT_ID'] ); |
|
| 971 | - $DTM->set_date_format( $incoming_date_formats[0] ); |
|
| 972 | - $DTM->set_time_format( $incoming_date_formats[1] ); |
|
| 973 | - foreach ( $datetime_values as $field => $value ) { |
|
| 974 | - $DTM->set( $field, $value ); |
|
| 969 | + if ( ! empty($dtt['DTT_ID'])) { |
|
| 970 | + $DTM = EE_Registry::instance()->load_model('Datetime', array($evtobj->get_timezone()))->get_one_by_ID($dtt['DTT_ID']); |
|
| 971 | + $DTM->set_date_format($incoming_date_formats[0]); |
|
| 972 | + $DTM->set_time_format($incoming_date_formats[1]); |
|
| 973 | + foreach ($datetime_values as $field => $value) { |
|
| 974 | + $DTM->set($field, $value); |
|
| 975 | 975 | } |
| 976 | 976 | |
| 977 | 977 | //make sure the $dtt_id here is saved just in case after the add_relation_to() the autosave replaces it. We need to do this so we dont' TRASH the parent DTT. |
| 978 | 978 | $saved_dtts[$DTM->ID()] = $DTM; |
| 979 | 979 | } else { |
| 980 | - $DTM = EE_Registry::instance()->load_class('Datetime', array( $datetime_values ), FALSE, FALSE ); |
|
| 981 | - $DTM->set_date_format( $incoming_date_formats[0] ); |
|
| 982 | - $DTM->set_time_format( $incoming_date_formats[1] ); |
|
| 983 | - $DTM->set_timezone( $evtobj->get_timezone() ); |
|
| 984 | - foreach ( $datetime_values as $field => $value ) { |
|
| 985 | - $DTM->set( $field, $value ); |
|
| 980 | + $DTM = EE_Registry::instance()->load_class('Datetime', array($datetime_values), FALSE, FALSE); |
|
| 981 | + $DTM->set_date_format($incoming_date_formats[0]); |
|
| 982 | + $DTM->set_time_format($incoming_date_formats[1]); |
|
| 983 | + $DTM->set_timezone($evtobj->get_timezone()); |
|
| 984 | + foreach ($datetime_values as $field => $value) { |
|
| 985 | + $DTM->set($field, $value); |
|
| 986 | 986 | } |
| 987 | 987 | } |
| 988 | 988 | $DTM->save(); |
| 989 | 989 | |
| 990 | - $DTT = $evtobj->_add_relation_to( $DTM, 'Datetime' ); |
|
| 990 | + $DTT = $evtobj->_add_relation_to($DTM, 'Datetime'); |
|
| 991 | 991 | |
| 992 | 992 | //load DTT helper |
| 993 | 993 | |
| 994 | 994 | //before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date. |
| 995 | - if( $DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end') ) { |
|
| 996 | - $DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start') ); |
|
| 995 | + if ($DTT->get_raw('DTT_EVT_start') > $DTT->get_raw('DTT_EVT_end')) { |
|
| 996 | + $DTT->set('DTT_EVT_end', $DTT->get('DTT_EVT_start')); |
|
| 997 | 997 | $DTT = EEH_DTT_Helper::date_time_add($DTT, 'DTT_EVT_end', 'days'); |
| 998 | 998 | $DTT->save(); |
| 999 | 999 | } |
@@ -1001,45 +1001,45 @@ discard block |
||
| 1001 | 1001 | //now we got to make sure we add the new DTT_ID to the $saved_dtts array because it is possible there was a new one created for the autosave. |
| 1002 | 1002 | $saved_dtt = $DTT; |
| 1003 | 1003 | |
| 1004 | - $success = !$success ? $success : $DTT; //if ANY of these updates fail then we want the appropriate global error message. //todod this is actually sucky we need a better error message but this is what it is for now. |
|
| 1004 | + $success = ! $success ? $success : $DTT; //if ANY of these updates fail then we want the appropriate global error message. //todod this is actually sucky we need a better error message but this is what it is for now. |
|
| 1005 | 1005 | } |
| 1006 | 1006 | |
| 1007 | 1007 | //no dtts get deleted so we don't do any of that logic here. |
| 1008 | 1008 | //update tickets next |
| 1009 | - $old_tickets = isset( $data['ticket_IDs'] ) ? explode(',', $data['ticket_IDs'] ) : array(); |
|
| 1010 | - foreach ( $data['edit_tickets'] as $row => $tkt ) { |
|
| 1011 | - $incoming_date_formats = array( 'Y-m-d', 'h:i a' ); |
|
| 1009 | + $old_tickets = isset($data['ticket_IDs']) ? explode(',', $data['ticket_IDs']) : array(); |
|
| 1010 | + foreach ($data['edit_tickets'] as $row => $tkt) { |
|
| 1011 | + $incoming_date_formats = array('Y-m-d', 'h:i a'); |
|
| 1012 | 1012 | $update_prices = false; |
| 1013 | - $ticket_price = isset( $data['edit_prices'][$row][1]['PRC_amount'] ) ? $data['edit_prices'][$row][1]['PRC_amount'] : 0; |
|
| 1013 | + $ticket_price = isset($data['edit_prices'][$row][1]['PRC_amount']) ? $data['edit_prices'][$row][1]['PRC_amount'] : 0; |
|
| 1014 | 1014 | |
| 1015 | 1015 | // trim inputs to ensure any excess whitespace is removed. |
| 1016 | - $tkt = array_map( 'trim', $tkt ); |
|
| 1016 | + $tkt = array_map('trim', $tkt); |
|
| 1017 | 1017 | |
| 1018 | - if ( empty( $tkt['TKT_start_date'] ) ) { |
|
| 1018 | + if (empty($tkt['TKT_start_date'])) { |
|
| 1019 | 1019 | //let's use now in the set timezone. |
| 1020 | - $now = new DateTime( 'now', new DateTimeZone( $evtobj->get_timezone() ) ); |
|
| 1021 | - $tkt['TKT_start_date'] = $now->format( $incoming_date_formats[0] . ' ' . $incoming_date_formats[1] ); |
|
| 1020 | + $now = new DateTime('now', new DateTimeZone($evtobj->get_timezone())); |
|
| 1021 | + $tkt['TKT_start_date'] = $now->format($incoming_date_formats[0].' '.$incoming_date_formats[1]); |
|
| 1022 | 1022 | } |
| 1023 | 1023 | |
| 1024 | - if ( empty( $tkt['TKT_end_date'] ) ) { |
|
| 1024 | + if (empty($tkt['TKT_end_date'])) { |
|
| 1025 | 1025 | //use the start date of the first datetime |
| 1026 | 1026 | $dtt = $evtobj->first_datetime(); |
| 1027 | - $tkt['TKT_end_date'] = $dtt->start_date_and_time( $incoming_date_formats[0], $incoming_date_formats[1] ); |
|
| 1027 | + $tkt['TKT_end_date'] = $dtt->start_date_and_time($incoming_date_formats[0], $incoming_date_formats[1]); |
|
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | 1030 | $TKT_values = array( |
| 1031 | - 'TKT_ID' => !empty( $tkt['TKT_ID'] ) ? $tkt['TKT_ID'] : NULL, |
|
| 1032 | - 'TTM_ID' => !empty( $tkt['TTM_ID'] ) ? $tkt['TTM_ID'] : 0, |
|
| 1033 | - 'TKT_name' => !empty( $tkt['TKT_name'] ) ? $tkt['TKT_name'] : '', |
|
| 1034 | - 'TKT_description' => !empty( $tkt['TKT_description'] ) ? $tkt['TKT_description'] : '', |
|
| 1031 | + 'TKT_ID' => ! empty($tkt['TKT_ID']) ? $tkt['TKT_ID'] : NULL, |
|
| 1032 | + 'TTM_ID' => ! empty($tkt['TTM_ID']) ? $tkt['TTM_ID'] : 0, |
|
| 1033 | + 'TKT_name' => ! empty($tkt['TKT_name']) ? $tkt['TKT_name'] : '', |
|
| 1034 | + 'TKT_description' => ! empty($tkt['TKT_description']) ? $tkt['TKT_description'] : '', |
|
| 1035 | 1035 | 'TKT_start_date' => $tkt['TKT_start_date'], |
| 1036 | 1036 | 'TKT_end_date' => $tkt['TKT_end_date'], |
| 1037 | - 'TKT_qty' => ! isset( $tkt[ 'TKT_qty' ] ) || $tkt[ 'TKT_qty' ] === '' ? EE_INF : $tkt['TKT_qty'], |
|
| 1038 | - 'TKT_uses' => ! isset( $tkt[ 'TKT_uses' ] ) || $tkt[ 'TKT_uses' ] === '' ? EE_INF : $tkt[ 'TKT_uses' ], |
|
| 1039 | - 'TKT_min' => empty( $tkt['TKT_min'] ) ? 0 : $tkt['TKT_min'], |
|
| 1040 | - 'TKT_max' => empty( $tkt['TKT_max'] ) ? EE_INF : $tkt['TKT_max'], |
|
| 1037 | + 'TKT_qty' => ! isset($tkt['TKT_qty']) || $tkt['TKT_qty'] === '' ? EE_INF : $tkt['TKT_qty'], |
|
| 1038 | + 'TKT_uses' => ! isset($tkt['TKT_uses']) || $tkt['TKT_uses'] === '' ? EE_INF : $tkt['TKT_uses'], |
|
| 1039 | + 'TKT_min' => empty($tkt['TKT_min']) ? 0 : $tkt['TKT_min'], |
|
| 1040 | + 'TKT_max' => empty($tkt['TKT_max']) ? EE_INF : $tkt['TKT_max'], |
|
| 1041 | 1041 | 'TKT_row' => $row, |
| 1042 | - 'TKT_order' => isset( $tkt['TKT_order'] ) ? $tkt['TKT_order'] : $row, |
|
| 1042 | + 'TKT_order' => isset($tkt['TKT_order']) ? $tkt['TKT_order'] : $row, |
|
| 1043 | 1043 | 'TKT_price' => $ticket_price |
| 1044 | 1044 | ); |
| 1045 | 1045 | |
@@ -1047,7 +1047,7 @@ discard block |
||
| 1047 | 1047 | |
| 1048 | 1048 | |
| 1049 | 1049 | //if this is a default TKT, then we need to set the TKT_ID to 0 and update accordingly, which means in turn that the prices will become new prices as well. |
| 1050 | - if ( isset( $tkt['TKT_is_default'] ) && $tkt['TKT_is_default'] ) { |
|
| 1050 | + if (isset($tkt['TKT_is_default']) && $tkt['TKT_is_default']) { |
|
| 1051 | 1051 | $TKT_values['TKT_ID'] = 0; |
| 1052 | 1052 | $TKT_values['TKT_is_default'] = 0; |
| 1053 | 1053 | $TKT_values['TKT_price'] = $ticket_price; |
@@ -1058,58 +1058,58 @@ discard block |
||
| 1058 | 1058 | //we actually do our saves a head of doing any add_relations to because its entirely possible that this ticket didn't removed or added to any datetime in the session but DID have it's items modified. |
| 1059 | 1059 | //keep in mind that if the TKT has been sold (and we have changed pricing information), then we won't be updating the tkt but instead a new tkt will be created and the old one archived. |
| 1060 | 1060 | |
| 1061 | - if ( !empty( $tkt['TKT_ID'] ) ) { |
|
| 1062 | - $TKT = EE_Registry::instance()->load_model( 'Ticket', array( $evtobj->get_timezone() ) )->get_one_by_ID( $tkt['TKT_ID'] ); |
|
| 1063 | - if ( $TKT instanceof EE_Ticket ) { |
|
| 1064 | - $ticket_sold = $TKT->count_related( 'Registration', array( array( 'STS_ID' => array( 'NOT IN', array( EEM_Registration::status_id_incomplete ) ) ) ) ) > 0 ? true : false; |
|
| 1061 | + if ( ! empty($tkt['TKT_ID'])) { |
|
| 1062 | + $TKT = EE_Registry::instance()->load_model('Ticket', array($evtobj->get_timezone()))->get_one_by_ID($tkt['TKT_ID']); |
|
| 1063 | + if ($TKT instanceof EE_Ticket) { |
|
| 1064 | + $ticket_sold = $TKT->count_related('Registration', array(array('STS_ID' => array('NOT IN', array(EEM_Registration::status_id_incomplete))))) > 0 ? true : false; |
|
| 1065 | 1065 | //let's just check the total price for the existing ticket and determine if it matches the new total price. if they are different then we create a new ticket (if tkts sold) if they aren't different then we go ahead and modify existing ticket. |
| 1066 | - $create_new_TKT = $ticket_sold && $ticket_price != $TKT->get( 'TKT_price' ) && ! $TKT->get( 'TKT_deleted' ) ? true : false; |
|
| 1067 | - $TKT->set_date_format( $incoming_date_formats[ 0 ] ); |
|
| 1068 | - $TKT->set_time_format( $incoming_date_formats[ 1 ] ); |
|
| 1066 | + $create_new_TKT = $ticket_sold && $ticket_price != $TKT->get('TKT_price') && ! $TKT->get('TKT_deleted') ? true : false; |
|
| 1067 | + $TKT->set_date_format($incoming_date_formats[0]); |
|
| 1068 | + $TKT->set_time_format($incoming_date_formats[1]); |
|
| 1069 | 1069 | //set new values |
| 1070 | - foreach ( $TKT_values as $field => $value ) { |
|
| 1071 | - if ( $field == 'TKT_qty' ) { |
|
| 1072 | - $TKT->set_qty( $value ); |
|
| 1070 | + foreach ($TKT_values as $field => $value) { |
|
| 1071 | + if ($field == 'TKT_qty') { |
|
| 1072 | + $TKT->set_qty($value); |
|
| 1073 | 1073 | } else { |
| 1074 | - $TKT->set( $field, $value ); |
|
| 1074 | + $TKT->set($field, $value); |
|
| 1075 | 1075 | } |
| 1076 | 1076 | } |
| 1077 | 1077 | //if $create_new_TKT is false then we can safely update the existing ticket. Otherwise we have to create a new ticket. |
| 1078 | - if ( $create_new_TKT ) { |
|
| 1078 | + if ($create_new_TKT) { |
|
| 1079 | 1079 | //archive the old ticket first |
| 1080 | - $TKT->set( 'TKT_deleted', 1 ); |
|
| 1080 | + $TKT->set('TKT_deleted', 1); |
|
| 1081 | 1081 | $TKT->save(); |
| 1082 | 1082 | //make sure this ticket is still recorded in our saved_tkts so we don't run it through the regular trash routine. |
| 1083 | - $saved_tickets[ $TKT->ID() ] = $TKT; |
|
| 1083 | + $saved_tickets[$TKT->ID()] = $TKT; |
|
| 1084 | 1084 | //create new ticket that's a copy of the existing except a new id of course (and not archived) AND has the new TKT_price associated with it. |
| 1085 | 1085 | $TKT = clone $TKT; |
| 1086 | - $TKT->set( 'TKT_ID', 0 ); |
|
| 1087 | - $TKT->set( 'TKT_deleted', 0 ); |
|
| 1088 | - $TKT->set( 'TKT_price', $ticket_price ); |
|
| 1089 | - $TKT->set( 'TKT_sold', 0 ); |
|
| 1086 | + $TKT->set('TKT_ID', 0); |
|
| 1087 | + $TKT->set('TKT_deleted', 0); |
|
| 1088 | + $TKT->set('TKT_price', $ticket_price); |
|
| 1089 | + $TKT->set('TKT_sold', 0); |
|
| 1090 | 1090 | //now we need to make sure that $new prices are created as well and attached to new ticket. |
| 1091 | 1091 | $update_prices = true; |
| 1092 | 1092 | } |
| 1093 | 1093 | //make sure price is set if it hasn't been already |
| 1094 | - $TKT->set( 'TKT_price', $ticket_price ); |
|
| 1094 | + $TKT->set('TKT_price', $ticket_price); |
|
| 1095 | 1095 | } |
| 1096 | 1096 | |
| 1097 | 1097 | } else { |
| 1098 | 1098 | //no TKT_id so a new TKT |
| 1099 | 1099 | $TKT_values['TKT_price'] = $ticket_price; |
| 1100 | - $TKT = EE_Registry::instance()->load_class('Ticket', array( $TKT_values ), FALSE, FALSE ); |
|
| 1101 | - if ( $TKT instanceof EE_Ticket ) { |
|
| 1100 | + $TKT = EE_Registry::instance()->load_class('Ticket', array($TKT_values), FALSE, FALSE); |
|
| 1101 | + if ($TKT instanceof EE_Ticket) { |
|
| 1102 | 1102 | //need to reset values to properly account for the date formats |
| 1103 | - $TKT->set_date_format( $incoming_date_formats[0] ); |
|
| 1104 | - $TKT->set_time_format( $incoming_date_formats[1] ); |
|
| 1105 | - $TKT->set_timezone( $evtobj->get_timezone() ); |
|
| 1103 | + $TKT->set_date_format($incoming_date_formats[0]); |
|
| 1104 | + $TKT->set_time_format($incoming_date_formats[1]); |
|
| 1105 | + $TKT->set_timezone($evtobj->get_timezone()); |
|
| 1106 | 1106 | |
| 1107 | 1107 | //set new values |
| 1108 | - foreach ( $TKT_values as $field => $value ) { |
|
| 1109 | - if ( $field == 'TKT_qty' ) { |
|
| 1110 | - $TKT->set_qty( $value ); |
|
| 1108 | + foreach ($TKT_values as $field => $value) { |
|
| 1109 | + if ($field == 'TKT_qty') { |
|
| 1110 | + $TKT->set_qty($value); |
|
| 1111 | 1111 | } else { |
| 1112 | - $TKT->set( $field, $value ); |
|
| 1112 | + $TKT->set($field, $value); |
|
| 1113 | 1113 | } |
| 1114 | 1114 | } |
| 1115 | 1115 | |
@@ -1117,31 +1117,31 @@ discard block |
||
| 1117 | 1117 | } |
| 1118 | 1118 | } |
| 1119 | 1119 | // cap ticket qty by datetime reg limits |
| 1120 | - $TKT->set_qty( min( $TKT->qty(), $TKT->qty( 'reg_limit' ) ) ); |
|
| 1120 | + $TKT->set_qty(min($TKT->qty(), $TKT->qty('reg_limit'))); |
|
| 1121 | 1121 | //update ticket. |
| 1122 | 1122 | $TKT->save(); |
| 1123 | 1123 | |
| 1124 | 1124 | //before going any further make sure our dates are setup correctly so that the end date is always equal or greater than the start date. |
| 1125 | - if( $TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date') ) { |
|
| 1126 | - $TKT->set('TKT_end_date', $TKT->get('TKT_start_date') ); |
|
| 1125 | + if ($TKT->get_raw('TKT_start_date') > $TKT->get_raw('TKT_end_date')) { |
|
| 1126 | + $TKT->set('TKT_end_date', $TKT->get('TKT_start_date')); |
|
| 1127 | 1127 | $TKT = EEH_DTT_Helper::date_time_add($TKT, 'TKT_end_date', 'days'); |
| 1128 | 1128 | $TKT->save(); |
| 1129 | 1129 | } |
| 1130 | 1130 | |
| 1131 | 1131 | //initially let's add the ticket to the dtt |
| 1132 | - $saved_dtt->_add_relation_to( $TKT, 'Ticket' ); |
|
| 1132 | + $saved_dtt->_add_relation_to($TKT, 'Ticket'); |
|
| 1133 | 1133 | |
| 1134 | 1134 | $saved_tickets[$TKT->ID()] = $TKT; |
| 1135 | 1135 | |
| 1136 | 1136 | //add prices to ticket |
| 1137 | - $this->_add_prices_to_ticket( $data['edit_prices'][$row], $TKT, $update_prices ); |
|
| 1137 | + $this->_add_prices_to_ticket($data['edit_prices'][$row], $TKT, $update_prices); |
|
| 1138 | 1138 | } |
| 1139 | 1139 | //however now we need to handle permanently deleting tickets via the ui. Keep in mind that the ui does not allow deleting/archiving tickets that have ticket sold. However, it does allow for deleting tickets that have no tickets sold, in which case we want to get rid of permanently because there is no need to save in db. |
| 1140 | - $old_tickets = isset( $old_tickets[0] ) && $old_tickets[0] == '' ? array() : $old_tickets; |
|
| 1141 | - $tickets_removed = array_diff( $old_tickets, array_keys( $saved_tickets ) ); |
|
| 1140 | + $old_tickets = isset($old_tickets[0]) && $old_tickets[0] == '' ? array() : $old_tickets; |
|
| 1141 | + $tickets_removed = array_diff($old_tickets, array_keys($saved_tickets)); |
|
| 1142 | 1142 | |
| 1143 | - foreach ( $tickets_removed as $id ) { |
|
| 1144 | - $id = absint( $id ); |
|
| 1143 | + foreach ($tickets_removed as $id) { |
|
| 1144 | + $id = absint($id); |
|
| 1145 | 1145 | |
| 1146 | 1146 | //get the ticket for this id |
| 1147 | 1147 | $tkt_to_remove = EE_Registry::instance()->load_model('Ticket')->get_one_by_ID($id); |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | //need to get all the related datetimes on this ticket and remove from every single one of them (remember this process can ONLY kick off if there are NO tkts_sold) |
| 1150 | 1150 | $dtts = $tkt_to_remove->get_many_related('Datetime'); |
| 1151 | 1151 | |
| 1152 | - foreach( $dtts as $dtt ) { |
|
| 1152 | + foreach ($dtts as $dtt) { |
|
| 1153 | 1153 | $tkt_to_remove->_remove_relation_to($dtt, 'Datetime'); |
| 1154 | 1154 | } |
| 1155 | 1155 | |
@@ -1160,7 +1160,7 @@ discard block |
||
| 1160 | 1160 | //finally let's delete this ticket (which should not be blocked at this point b/c we've removed all our relationships) |
| 1161 | 1161 | $tkt_to_remove->delete_permanently(); |
| 1162 | 1162 | } |
| 1163 | - return array( $saved_dtt, $saved_tickets ); |
|
| 1163 | + return array($saved_dtt, $saved_tickets); |
|
| 1164 | 1164 | } |
| 1165 | 1165 | |
| 1166 | 1166 | |
@@ -1175,31 +1175,31 @@ discard block |
||
| 1175 | 1175 | * @param bool $new_prices Whether attach existing incoming prices or create new ones. |
| 1176 | 1176 | * @return void |
| 1177 | 1177 | */ |
| 1178 | - private function _add_prices_to_ticket( $prices, EE_Ticket $ticket, $new_prices = FALSE ) { |
|
| 1179 | - foreach ( $prices as $row => $prc ) { |
|
| 1178 | + private function _add_prices_to_ticket($prices, EE_Ticket $ticket, $new_prices = FALSE) { |
|
| 1179 | + foreach ($prices as $row => $prc) { |
|
| 1180 | 1180 | $PRC_values = array( |
| 1181 | - 'PRC_ID' => !empty( $prc['PRC_ID'] ) ? $prc['PRC_ID'] : NULL, |
|
| 1182 | - 'PRT_ID' => !empty( $prc['PRT_ID'] ) ? $prc['PRT_ID'] : NULL, |
|
| 1183 | - 'PRC_amount' => !empty( $prc['PRC_amount'] ) ? $prc['PRC_amount'] : 0, |
|
| 1184 | - 'PRC_name' => !empty( $prc['PRC_name'] ) ? $prc['PRC_name'] : '', |
|
| 1185 | - 'PRC_desc' => !empty( $prc['PRC_desc'] ) ? $prc['PRC_desc'] : '', |
|
| 1181 | + 'PRC_ID' => ! empty($prc['PRC_ID']) ? $prc['PRC_ID'] : NULL, |
|
| 1182 | + 'PRT_ID' => ! empty($prc['PRT_ID']) ? $prc['PRT_ID'] : NULL, |
|
| 1183 | + 'PRC_amount' => ! empty($prc['PRC_amount']) ? $prc['PRC_amount'] : 0, |
|
| 1184 | + 'PRC_name' => ! empty($prc['PRC_name']) ? $prc['PRC_name'] : '', |
|
| 1185 | + 'PRC_desc' => ! empty($prc['PRC_desc']) ? $prc['PRC_desc'] : '', |
|
| 1186 | 1186 | 'PRC_is_default' => 0, //make sure prices are NOT set as default from this context |
| 1187 | 1187 | 'PRC_order' => $row |
| 1188 | 1188 | ); |
| 1189 | 1189 | |
| 1190 | - if ( $new_prices || empty( $PRC_values['PRC_ID'] ) ) { |
|
| 1190 | + if ($new_prices || empty($PRC_values['PRC_ID'])) { |
|
| 1191 | 1191 | $PRC_values['PRC_ID'] = 0; |
| 1192 | - $PRC = EE_Registry::instance()->load_class('Price', array( $PRC_values ), FALSE, FALSE); |
|
| 1192 | + $PRC = EE_Registry::instance()->load_class('Price', array($PRC_values), FALSE, FALSE); |
|
| 1193 | 1193 | } else { |
| 1194 | - $PRC = EE_Registry::instance()->load_model( 'Price' )->get_one_by_ID( $prc['PRC_ID'] ); |
|
| 1194 | + $PRC = EE_Registry::instance()->load_model('Price')->get_one_by_ID($prc['PRC_ID']); |
|
| 1195 | 1195 | //update this price with new values |
| 1196 | - foreach ( $PRC_values as $field => $newprc ) { |
|
| 1197 | - $PRC->set( $field, $newprc ); |
|
| 1196 | + foreach ($PRC_values as $field => $newprc) { |
|
| 1197 | + $PRC->set($field, $newprc); |
|
| 1198 | 1198 | } |
| 1199 | 1199 | $PRC->save(); |
| 1200 | 1200 | } |
| 1201 | 1201 | |
| 1202 | - $ticket->_add_relation_to( $PRC, 'Price' ); |
|
| 1202 | + $ticket->_add_relation_to($PRC, 'Price'); |
|
| 1203 | 1203 | } |
| 1204 | 1204 | } |
| 1205 | 1205 | |
@@ -1237,9 +1237,9 @@ discard block |
||
| 1237 | 1237 | //load formatter helper |
| 1238 | 1238 | |
| 1239 | 1239 | //args for getting related registrations |
| 1240 | - $approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved ) ); |
|
| 1241 | - $not_approved_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_not_approved ) ); |
|
| 1242 | - $pending_payment_query_args = array( array( 'REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_pending_payment ) ); |
|
| 1240 | + $approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_approved)); |
|
| 1241 | + $not_approved_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_not_approved)); |
|
| 1242 | + $pending_payment_query_args = array(array('REG_deleted' => 0, 'STS_ID' => EEM_Registration::status_id_pending_payment)); |
|
| 1243 | 1243 | |
| 1244 | 1244 | |
| 1245 | 1245 | // publish box |
@@ -1268,9 +1268,9 @@ discard block |
||
| 1268 | 1268 | ), |
| 1269 | 1269 | REG_ADMIN_URL |
| 1270 | 1270 | ), |
| 1271 | - 'approved_regs' => $this->_cpt_model_obj->count_related( 'Registration', $approved_query_args ), |
|
| 1272 | - 'not_approved_regs' => $this->_cpt_model_obj->count_related( 'Registration', $not_approved_query_args ), |
|
| 1273 | - 'pending_payment_regs' => $this->_cpt_model_obj->count_related( 'Registration', $pending_payment_query_args ), |
|
| 1271 | + 'approved_regs' => $this->_cpt_model_obj->count_related('Registration', $approved_query_args), |
|
| 1272 | + 'not_approved_regs' => $this->_cpt_model_obj->count_related('Registration', $not_approved_query_args), |
|
| 1273 | + 'pending_payment_regs' => $this->_cpt_model_obj->count_related('Registration', $pending_payment_query_args), |
|
| 1274 | 1274 | 'misc_pub_section_class' => apply_filters( |
| 1275 | 1275 | 'FHEE_Events_Admin_Page___generate_publish_box_extra_content__misc_pub_section_class', |
| 1276 | 1276 | 'misc-pub-section' |
@@ -1289,9 +1289,9 @@ discard block |
||
| 1289 | 1289 | 'AHEE__Events_Admin_Page___generate_publish_box_extra_content__event_editor_overview_add', |
| 1290 | 1290 | $this->_cpt_model_obj |
| 1291 | 1291 | ); |
| 1292 | - $publish_box_extra_args[ 'event_editor_overview_add' ] = ob_get_clean(); |
|
| 1292 | + $publish_box_extra_args['event_editor_overview_add'] = ob_get_clean(); |
|
| 1293 | 1293 | // load template |
| 1294 | - EEH_Template::display_template( EVENTS_TEMPLATE_PATH . 'event_publish_box_extras.template.php', $publish_box_extra_args ); |
|
| 1294 | + EEH_Template::display_template(EVENTS_TEMPLATE_PATH.'event_publish_box_extras.template.php', $publish_box_extra_args); |
|
| 1295 | 1295 | } |
| 1296 | 1296 | |
| 1297 | 1297 | |
@@ -1323,16 +1323,16 @@ discard block |
||
| 1323 | 1323 | $this->verify_cpt_object(); |
| 1324 | 1324 | add_meta_box( |
| 1325 | 1325 | 'espresso_event_editor_tickets', |
| 1326 | - esc_html__( 'Event Datetime & Ticket', 'event_espresso' ), |
|
| 1327 | - array( $this, 'ticket_metabox' ), |
|
| 1326 | + esc_html__('Event Datetime & Ticket', 'event_espresso'), |
|
| 1327 | + array($this, 'ticket_metabox'), |
|
| 1328 | 1328 | $this->page_slug, |
| 1329 | 1329 | 'normal', |
| 1330 | 1330 | 'high' |
| 1331 | 1331 | ); |
| 1332 | 1332 | add_meta_box( |
| 1333 | 1333 | 'espresso_event_editor_event_options', |
| 1334 | - esc_html__( 'Event Registration Options', 'event_espresso' ), |
|
| 1335 | - array( $this, 'registration_options_meta_box' ), |
|
| 1334 | + esc_html__('Event Registration Options', 'event_espresso'), |
|
| 1335 | + array($this, 'registration_options_meta_box'), |
|
| 1336 | 1336 | $this->page_slug, |
| 1337 | 1337 | 'side', |
| 1338 | 1338 | 'default' |
@@ -1362,36 +1362,36 @@ discard block |
||
| 1362 | 1362 | 'disabled' => '' |
| 1363 | 1363 | ); |
| 1364 | 1364 | |
| 1365 | - $event_id = is_object( $this->_cpt_model_obj ) ? $this->_cpt_model_obj->ID() : NULL; |
|
| 1365 | + $event_id = is_object($this->_cpt_model_obj) ? $this->_cpt_model_obj->ID() : NULL; |
|
| 1366 | 1366 | |
| 1367 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
| 1367 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
| 1368 | 1368 | |
| 1369 | 1369 | /** |
| 1370 | 1370 | * 1. Start with retrieving Datetimes |
| 1371 | 1371 | * 2. Fore each datetime get related tickets |
| 1372 | 1372 | * 3. For each ticket get related prices |
| 1373 | 1373 | */ |
| 1374 | - $times = EE_Registry::instance()->load_model('Datetime' )->get_all_event_dates( $event_id ); |
|
| 1374 | + $times = EE_Registry::instance()->load_model('Datetime')->get_all_event_dates($event_id); |
|
| 1375 | 1375 | /** @type EE_Datetime $first_datetime */ |
| 1376 | - $first_datetime = reset( $times ); |
|
| 1376 | + $first_datetime = reset($times); |
|
| 1377 | 1377 | //do we get related tickets? |
| 1378 | - if ( $first_datetime instanceof EE_Datetime |
|
| 1379 | - && $first_datetime->ID() !== 0 ) { |
|
| 1378 | + if ($first_datetime instanceof EE_Datetime |
|
| 1379 | + && $first_datetime->ID() !== 0) { |
|
| 1380 | 1380 | $existing_datetime_ids[] = $first_datetime->get('DTT_ID'); |
| 1381 | 1381 | $template_args['time'] = $first_datetime; |
| 1382 | 1382 | $related_tickets = $first_datetime->tickets( |
| 1383 | 1383 | array( |
| 1384 | - array( 'OR' => array( 'TKT_deleted' => 1, 'TKT_deleted*' => 0 ) ), |
|
| 1384 | + array('OR' => array('TKT_deleted' => 1, 'TKT_deleted*' => 0)), |
|
| 1385 | 1385 | 'default_where_conditions' => 'none' |
| 1386 | 1386 | ) |
| 1387 | 1387 | ); |
| 1388 | 1388 | |
| 1389 | - if ( !empty($related_tickets) ) { |
|
| 1389 | + if ( ! empty($related_tickets)) { |
|
| 1390 | 1390 | $template_args['total_ticket_rows'] = count($related_tickets); |
| 1391 | 1391 | $row = 0; |
| 1392 | - foreach ( $related_tickets as $ticket ) { |
|
| 1392 | + foreach ($related_tickets as $ticket) { |
|
| 1393 | 1393 | $existing_ticket_ids[] = $ticket->get('TKT_ID'); |
| 1394 | - $template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, FALSE, $row ); |
|
| 1394 | + $template_args['ticket_rows'] .= $this->_get_ticket_row($ticket, FALSE, $row); |
|
| 1395 | 1395 | |
| 1396 | 1396 | $row++; |
| 1397 | 1397 | } |
@@ -1399,13 +1399,13 @@ discard block |
||
| 1399 | 1399 | $template_args['total_ticket_rows'] = 1; |
| 1400 | 1400 | /** @type EE_Ticket $ticket */ |
| 1401 | 1401 | $ticket = EE_Registry::instance()->load_model('Ticket')->create_default_object(); |
| 1402 | - $template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket ); |
|
| 1402 | + $template_args['ticket_rows'] .= $this->_get_ticket_row($ticket); |
|
| 1403 | 1403 | } |
| 1404 | 1404 | } else { |
| 1405 | 1405 | $template_args['time'] = $times[0]; |
| 1406 | 1406 | /** @type EE_Ticket $ticket */ |
| 1407 | 1407 | $ticket = EE_Registry::instance()->load_model('Ticket')->get_all_default_tickets(); |
| 1408 | - $template_args['ticket_rows'] .= $this->_get_ticket_row( $ticket[1] ); |
|
| 1408 | + $template_args['ticket_rows'] .= $this->_get_ticket_row($ticket[1]); |
|
| 1409 | 1409 | // NOTE: we're just sending the first default row |
| 1410 | 1410 | // (decaf can't manage default tickets so this should be sufficient); |
| 1411 | 1411 | } |
@@ -1414,8 +1414,8 @@ discard block |
||
| 1414 | 1414 | $template_args['ticket_options_help_link'] = $this->_get_help_tab_link('ticket_options_info'); |
| 1415 | 1415 | $template_args['existing_datetime_ids'] = implode(',', $existing_datetime_ids); |
| 1416 | 1416 | $template_args['existing_ticket_ids'] = implode(',', $existing_ticket_ids); |
| 1417 | - $template_args['ticket_js_structure'] = $this->_get_ticket_row( EE_Registry::instance()->load_model('Ticket')->create_default_object(), TRUE ); |
|
| 1418 | - $template = apply_filters( 'FHEE__Events_Admin_Page__ticket_metabox__template', EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_main.template.php' ); |
|
| 1417 | + $template_args['ticket_js_structure'] = $this->_get_ticket_row(EE_Registry::instance()->load_model('Ticket')->create_default_object(), TRUE); |
|
| 1418 | + $template = apply_filters('FHEE__Events_Admin_Page__ticket_metabox__template', EVENTS_TEMPLATE_PATH.'event_tickets_metabox_main.template.php'); |
|
| 1419 | 1419 | EEH_Template::display_template($template, $template_args); |
| 1420 | 1420 | } |
| 1421 | 1421 | |
@@ -1430,21 +1430,21 @@ discard block |
||
| 1430 | 1430 | * @param int $row |
| 1431 | 1431 | * @return string generated html for the ticket row. |
| 1432 | 1432 | */ |
| 1433 | - private function _get_ticket_row( $ticket, $skeleton = FALSE, $row = 0 ) { |
|
| 1433 | + private function _get_ticket_row($ticket, $skeleton = FALSE, $row = 0) { |
|
| 1434 | 1434 | $template_args = array( |
| 1435 | - 'tkt_status_class' => ' tkt-status-' . $ticket->ticket_status(), |
|
| 1436 | - 'tkt_archive_class' => $ticket->ticket_status() === EE_Ticket::archived && !$skeleton ? ' tkt-archived' : '', |
|
| 1435 | + 'tkt_status_class' => ' tkt-status-'.$ticket->ticket_status(), |
|
| 1436 | + 'tkt_archive_class' => $ticket->ticket_status() === EE_Ticket::archived && ! $skeleton ? ' tkt-archived' : '', |
|
| 1437 | 1437 | 'ticketrow' => $skeleton ? 'TICKETNUM' : $row, |
| 1438 | 1438 | 'TKT_ID' => $ticket->get('TKT_ID'), |
| 1439 | 1439 | 'TKT_name' => $ticket->get('TKT_name'), |
| 1440 | 1440 | 'TKT_start_date' => $skeleton ? '' : $ticket->get_date('TKT_start_date', 'Y-m-d h:i a'), |
| 1441 | 1441 | 'TKT_end_date' => $skeleton ? '' : $ticket->get_date('TKT_end_date', 'Y-m-d h:i a'), |
| 1442 | 1442 | 'TKT_is_default' => $ticket->get('TKT_is_default'), |
| 1443 | - 'TKT_qty' => $ticket->get_pretty('TKT_qty','input'), |
|
| 1443 | + 'TKT_qty' => $ticket->get_pretty('TKT_qty', 'input'), |
|
| 1444 | 1444 | 'edit_ticketrow_name' => $skeleton ? 'TICKETNAMEATTR' : 'edit_tickets', |
| 1445 | 1445 | 'TKT_sold' => $skeleton ? 0 : $ticket->get('TKT_sold'), |
| 1446 | - 'trash_icon' => ( $skeleton || ( !empty( $ticket ) && ! $ticket->get('TKT_deleted') ) ) && ( !empty( $ticket ) && $ticket->get('TKT_sold') === 0 ) ? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon', |
|
| 1447 | - 'disabled' => $skeleton || ( !empty( $ticket ) && ! $ticket->get('TKT_deleted' ) ) ? '' : ' disabled=disabled' |
|
| 1446 | + 'trash_icon' => ($skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted'))) && ( ! empty($ticket) && $ticket->get('TKT_sold') === 0) ? 'trash-icon dashicons dashicons-post-trash clickable' : 'ee-lock-icon', |
|
| 1447 | + 'disabled' => $skeleton || ( ! empty($ticket) && ! $ticket->get('TKT_deleted')) ? '' : ' disabled=disabled' |
|
| 1448 | 1448 | ); |
| 1449 | 1449 | |
| 1450 | 1450 | $price = $ticket->ID() !== 0 ? $ticket->get_first_related('Price', array('default_where_conditions' => 'none')) : EE_Registry::instance()->load_model('Price')->create_default_object(); |
@@ -1460,23 +1460,23 @@ discard block |
||
| 1460 | 1460 | |
| 1461 | 1461 | //make sure we have default start and end dates if skeleton |
| 1462 | 1462 | //handle rows that should NOT be empty |
| 1463 | - if ( empty( $template_args['TKT_start_date'] ) ) { |
|
| 1463 | + if (empty($template_args['TKT_start_date'])) { |
|
| 1464 | 1464 | //if empty then the start date will be now. |
| 1465 | 1465 | $template_args['TKT_start_date'] = date('Y-m-d h:i a', current_time('timestamp')); |
| 1466 | 1466 | } |
| 1467 | 1467 | |
| 1468 | - if ( empty( $template_args['TKT_end_date'] ) ) { |
|
| 1468 | + if (empty($template_args['TKT_end_date'])) { |
|
| 1469 | 1469 | //get the earliest datetime (if present); |
| 1470 | - $earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC' ) ) ) : NULL; |
|
| 1470 | + $earliest_dtt = $this->_cpt_model_obj->ID() > 0 ? $this->_cpt_model_obj->get_first_related('Datetime', array('order_by'=> array('DTT_EVT_start' => 'ASC'))) : NULL; |
|
| 1471 | 1471 | |
| 1472 | - if ( !empty( $earliest_dtt ) ) |
|
| 1472 | + if ( ! empty($earliest_dtt)) |
|
| 1473 | 1473 | $template_args['TKT_end_date'] = $earliest_dtt->get_datetime('DTT_EVT_start', 'Y-m-d', 'h:i a'); |
| 1474 | 1474 | else |
| 1475 | - $template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d")+7, date("Y") ) ); |
|
| 1475 | + $template_args['TKT_end_date'] = date('Y-m-d h:i a', mktime(0, 0, 0, date("m"), date("d") + 7, date("Y"))); |
|
| 1476 | 1476 | } |
| 1477 | 1477 | |
| 1478 | - $template_args = array_merge( $template_args, $price_args ); |
|
| 1479 | - $template = apply_filters( 'FHEE__Events_Admin_Page__get_ticket_row__template', EVENTS_TEMPLATE_PATH . 'event_tickets_metabox_ticket_row.template.php', $ticket); |
|
| 1478 | + $template_args = array_merge($template_args, $price_args); |
|
| 1479 | + $template = apply_filters('FHEE__Events_Admin_Page__get_ticket_row__template', EVENTS_TEMPLATE_PATH.'event_tickets_metabox_ticket_row.template.php', $ticket); |
|
| 1480 | 1480 | return EEH_Template::display_template($template, $template_args, TRUE); |
| 1481 | 1481 | } |
| 1482 | 1482 | |
@@ -1505,8 +1505,8 @@ discard block |
||
| 1505 | 1505 | $template_args['default_registration_status'] = EEH_Form_Fields::select_input('default_reg_status', $default_reg_status_values, $this->_cpt_model_obj->default_registration_status()); |
| 1506 | 1506 | $template_args['display_description'] = EEH_Form_Fields::select_input('display_desc', $yes_no_values, $this->_cpt_model_obj->display_description()); |
| 1507 | 1507 | $template_args['display_ticket_selector'] = EEH_Form_Fields::select_input('display_ticket_selector', $yes_no_values, $this->_cpt_model_obj->display_ticket_selector(), '', '', false); |
| 1508 | - $template_args['additional_registration_options'] = apply_filters( 'FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values ); |
|
| 1509 | - $templatepath = EVENTS_TEMPLATE_PATH . 'event_registration_options.template.php'; |
|
| 1508 | + $template_args['additional_registration_options'] = apply_filters('FHEE__Events_Admin_Page__registration_options_meta_box__additional_registration_options', '', $template_args, $yes_no_values, $default_reg_status_values); |
|
| 1509 | + $templatepath = EVENTS_TEMPLATE_PATH.'event_registration_options.template.php'; |
|
| 1510 | 1510 | EEH_Template::display_template($templatepath, $template_args); |
| 1511 | 1511 | } |
| 1512 | 1512 | |
@@ -1534,21 +1534,21 @@ discard block |
||
| 1534 | 1534 | $EEME = $this->_event_model(); |
| 1535 | 1535 | |
| 1536 | 1536 | $offset = ($current_page - 1) * $per_page; |
| 1537 | - $limit = $count ? NULL : $offset . ',' . $per_page; |
|
| 1537 | + $limit = $count ? NULL : $offset.','.$per_page; |
|
| 1538 | 1538 | $orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'EVT_ID'; |
| 1539 | 1539 | $order = isset($this->_req_data['order']) ? $this->_req_data['order'] : "DESC"; |
| 1540 | 1540 | |
| 1541 | 1541 | if (isset($this->_req_data['month_range'])) { |
| 1542 | 1542 | $pieces = explode(' ', $this->_req_data['month_range'], 3); |
| 1543 | - $month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : ''; |
|
| 1544 | - $year_r = !empty($pieces[1]) ? $pieces[1] : ''; |
|
| 1543 | + $month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : ''; |
|
| 1544 | + $year_r = ! empty($pieces[1]) ? $pieces[1] : ''; |
|
| 1545 | 1545 | } |
| 1546 | 1546 | |
| 1547 | 1547 | $where = array(); |
| 1548 | 1548 | |
| 1549 | - $status = isset( $this->_req_data['status'] ) ? $this->_req_data['status'] : NULL; |
|
| 1549 | + $status = isset($this->_req_data['status']) ? $this->_req_data['status'] : NULL; |
|
| 1550 | 1550 | //determine what post_status our condition will have for the query. |
| 1551 | - switch ( $status ) { |
|
| 1551 | + switch ($status) { |
|
| 1552 | 1552 | case 'month' : |
| 1553 | 1553 | case 'today' : |
| 1554 | 1554 | case NULL : |
@@ -1556,7 +1556,7 @@ discard block |
||
| 1556 | 1556 | break; |
| 1557 | 1557 | |
| 1558 | 1558 | case 'draft' : |
| 1559 | - $where['status'] = array( 'IN', array('draft', 'auto-draft') ); |
|
| 1559 | + $where['status'] = array('IN', array('draft', 'auto-draft')); |
|
| 1560 | 1560 | break; |
| 1561 | 1561 | |
| 1562 | 1562 | default : |
@@ -1564,43 +1564,43 @@ discard block |
||
| 1564 | 1564 | } |
| 1565 | 1565 | |
| 1566 | 1566 | //categories? |
| 1567 | - $category = isset( $this->_req_data['EVT_CAT'] ) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL; |
|
| 1567 | + $category = isset($this->_req_data['EVT_CAT']) && $this->_req_data['EVT_CAT'] > 0 ? $this->_req_data['EVT_CAT'] : NULL; |
|
| 1568 | 1568 | |
| 1569 | - if ( !empty ( $category ) ) { |
|
| 1569 | + if ( ! empty ($category)) { |
|
| 1570 | 1570 | $where['Term_Taxonomy.taxonomy'] = 'espresso_event_categories'; |
| 1571 | 1571 | $where['Term_Taxonomy.term_id'] = $category; |
| 1572 | 1572 | } |
| 1573 | 1573 | |
| 1574 | 1574 | //date where conditions |
| 1575 | - $start_formats = EEM_Datetime::instance()->get_formats_for( 'DTT_EVT_start' ); |
|
| 1575 | + $start_formats = EEM_Datetime::instance()->get_formats_for('DTT_EVT_start'); |
|
| 1576 | 1576 | if (isset($this->_req_data['month_range']) && $this->_req_data['month_range'] != '') { |
| 1577 | - $DateTime = new DateTime( $year_r . '-' . $month_r . '-01 00:00:00', new DateTimeZone( EEM_Datetime::instance()->get_timezone() ) ); |
|
| 1578 | - $start = $DateTime->format( implode( ' ', $start_formats ) ); |
|
| 1579 | - $end = $DateTime->setDate( $year_r, $month_r, $DateTime->format('t') )->setTime(23,59,59)->format( implode( ' ', $start_formats ) ); |
|
| 1580 | - $where['Datetime.DTT_EVT_start'] = array('BETWEEN', array( $start, $end ) ); |
|
| 1577 | + $DateTime = new DateTime($year_r.'-'.$month_r.'-01 00:00:00', new DateTimeZone(EEM_Datetime::instance()->get_timezone())); |
|
| 1578 | + $start = $DateTime->format(implode(' ', $start_formats)); |
|
| 1579 | + $end = $DateTime->setDate($year_r, $month_r, $DateTime->format('t'))->setTime(23, 59, 59)->format(implode(' ', $start_formats)); |
|
| 1580 | + $where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end)); |
|
| 1581 | 1581 | } else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'today') { |
| 1582 | - $DateTime = new DateTime( 'now', new DateTimeZone( EEM_Event::instance()->get_timezone() ) ); |
|
| 1583 | - $start = $DateTime->setTime( 0,0,0 )->format( implode( ' ', $start_formats ) ); |
|
| 1584 | - $end = $DateTime->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) ); |
|
| 1585 | - $where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) ); |
|
| 1586 | - } else if ( isset($this->_req_data['status']) && $this->_req_data['status'] == 'month' ) { |
|
| 1587 | - $now = date( 'Y-m-01' ); |
|
| 1588 | - $DateTime = new DateTime( $now, new DateTimeZone( EEM_Event::instance()->get_timezone() ) ); |
|
| 1589 | - $start = $DateTime->setTime( 0, 0, 0 )->format( implode( ' ', $start_formats ) ); |
|
| 1590 | - $end = $DateTime->setDate( date('Y'), date('m'), $DateTime->format('t' ) )->setTime( 23, 59, 59 )->format( implode( ' ', $start_formats ) ); |
|
| 1591 | - $where['Datetime.DTT_EVT_start'] = array( 'BETWEEN', array( $start, $end ) ); |
|
| 1582 | + $DateTime = new DateTime('now', new DateTimeZone(EEM_Event::instance()->get_timezone())); |
|
| 1583 | + $start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats)); |
|
| 1584 | + $end = $DateTime->setTime(23, 59, 59)->format(implode(' ', $start_formats)); |
|
| 1585 | + $where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end)); |
|
| 1586 | + } else if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'month') { |
|
| 1587 | + $now = date('Y-m-01'); |
|
| 1588 | + $DateTime = new DateTime($now, new DateTimeZone(EEM_Event::instance()->get_timezone())); |
|
| 1589 | + $start = $DateTime->setTime(0, 0, 0)->format(implode(' ', $start_formats)); |
|
| 1590 | + $end = $DateTime->setDate(date('Y'), date('m'), $DateTime->format('t'))->setTime(23, 59, 59)->format(implode(' ', $start_formats)); |
|
| 1591 | + $where['Datetime.DTT_EVT_start'] = array('BETWEEN', array($start, $end)); |
|
| 1592 | 1592 | } |
| 1593 | 1593 | |
| 1594 | 1594 | |
| 1595 | - if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) { |
|
| 1596 | - $where['EVT_wp_user'] = get_current_user_id(); |
|
| 1595 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) { |
|
| 1596 | + $where['EVT_wp_user'] = get_current_user_id(); |
|
| 1597 | 1597 | } else { |
| 1598 | - if ( ! isset( $where['status'] ) ) { |
|
| 1599 | - if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_read_private_events', 'get_events' ) ) { |
|
| 1598 | + if ( ! isset($where['status'])) { |
|
| 1599 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_private_events', 'get_events')) { |
|
| 1600 | 1600 | $where['OR'] = array( |
| 1601 | - 'status*restrict_private' => array( '!=', 'private' ), |
|
| 1601 | + 'status*restrict_private' => array('!=', 'private'), |
|
| 1602 | 1602 | 'AND' => array( |
| 1603 | - 'status*inclusive' => array( '=', 'private' ), |
|
| 1603 | + 'status*inclusive' => array('=', 'private'), |
|
| 1604 | 1604 | 'EVT_wp_user' => get_current_user_id() |
| 1605 | 1605 | ) |
| 1606 | 1606 | ); |
@@ -1608,16 +1608,16 @@ discard block |
||
| 1608 | 1608 | } |
| 1609 | 1609 | } |
| 1610 | 1610 | |
| 1611 | - if ( isset( $this->_req_data['EVT_wp_user'] ) ) { |
|
| 1612 | - if ( $this->_req_data['EVT_wp_user'] != get_current_user_id() && EE_Registry::instance()->CAP->current_user_can( 'ee_read_others_events', 'get_events' ) ) { |
|
| 1611 | + if (isset($this->_req_data['EVT_wp_user'])) { |
|
| 1612 | + if ($this->_req_data['EVT_wp_user'] != get_current_user_id() && EE_Registry::instance()->CAP->current_user_can('ee_read_others_events', 'get_events')) { |
|
| 1613 | 1613 | $where['EVT_wp_user'] = $this->_req_data['EVT_wp_user']; |
| 1614 | 1614 | } |
| 1615 | 1615 | } |
| 1616 | 1616 | |
| 1617 | 1617 | |
| 1618 | 1618 | //search query handling |
| 1619 | - if ( isset( $this->_req_data['s'] ) ) { |
|
| 1620 | - $search_string = '%' . $this->_req_data['s'] . '%'; |
|
| 1619 | + if (isset($this->_req_data['s'])) { |
|
| 1620 | + $search_string = '%'.$this->_req_data['s'].'%'; |
|
| 1621 | 1621 | $where['OR'] = array( |
| 1622 | 1622 | 'EVT_name' => array('LIKE', $search_string), |
| 1623 | 1623 | 'EVT_desc' => array('LIKE', $search_string), |
@@ -1626,32 +1626,32 @@ discard block |
||
| 1626 | 1626 | } |
| 1627 | 1627 | |
| 1628 | 1628 | |
| 1629 | - $where = apply_filters( 'FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data ); |
|
| 1630 | - $query_params = apply_filters( 'FHEE__Events_Admin_Page__get_events__query_params', array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $order, 'group_by' => 'EVT_ID' ), $this->_req_data ); |
|
| 1629 | + $where = apply_filters('FHEE__Events_Admin_Page__get_events__where', $where, $this->_req_data); |
|
| 1630 | + $query_params = apply_filters('FHEE__Events_Admin_Page__get_events__query_params', array($where, 'limit' => $limit, 'order_by' => $orderby, 'order' => $order, 'group_by' => 'EVT_ID'), $this->_req_data); |
|
| 1631 | 1631 | |
| 1632 | 1632 | |
| 1633 | 1633 | //let's first check if we have special requests coming in. |
| 1634 | - if ( isset( $this->_req_data['active_status'] ) ) { |
|
| 1635 | - switch ( $this->_req_data['active_status'] ) { |
|
| 1634 | + if (isset($this->_req_data['active_status'])) { |
|
| 1635 | + switch ($this->_req_data['active_status']) { |
|
| 1636 | 1636 | case 'upcoming' : |
| 1637 | - return $EEME->get_upcoming_events( $query_params, $count ); |
|
| 1637 | + return $EEME->get_upcoming_events($query_params, $count); |
|
| 1638 | 1638 | break; |
| 1639 | 1639 | |
| 1640 | 1640 | case 'expired' : |
| 1641 | - return $EEME->get_expired_events( $query_params, $count ); |
|
| 1641 | + return $EEME->get_expired_events($query_params, $count); |
|
| 1642 | 1642 | break; |
| 1643 | 1643 | |
| 1644 | 1644 | case 'active' : |
| 1645 | - return $EEME->get_active_events( $query_params, $count ); |
|
| 1645 | + return $EEME->get_active_events($query_params, $count); |
|
| 1646 | 1646 | break; |
| 1647 | 1647 | |
| 1648 | 1648 | case 'inactive' : |
| 1649 | - return $EEME->get_inactive_events( $query_params, $count ); |
|
| 1649 | + return $EEME->get_inactive_events($query_params, $count); |
|
| 1650 | 1650 | break; |
| 1651 | 1651 | } |
| 1652 | 1652 | } |
| 1653 | 1653 | |
| 1654 | - $events = $count ? $EEME->count( array( $where ), 'EVT_ID', true ) : $EEME->get_all( $query_params ); |
|
| 1654 | + $events = $count ? $EEME->count(array($where), 'EVT_ID', true) : $EEME->get_all($query_params); |
|
| 1655 | 1655 | |
| 1656 | 1656 | return $events; |
| 1657 | 1657 | } |
@@ -1660,23 +1660,23 @@ discard block |
||
| 1660 | 1660 | |
| 1661 | 1661 | |
| 1662 | 1662 | //handling for WordPress CPT actions (trash, restore, delete) |
| 1663 | - public function trash_cpt_item( $post_id ) { |
|
| 1663 | + public function trash_cpt_item($post_id) { |
|
| 1664 | 1664 | $this->_req_data['EVT_ID'] = $post_id; |
| 1665 | - $this->_trash_or_restore_event( 'trash', FALSE ); |
|
| 1665 | + $this->_trash_or_restore_event('trash', FALSE); |
|
| 1666 | 1666 | } |
| 1667 | 1667 | |
| 1668 | 1668 | |
| 1669 | 1669 | |
| 1670 | 1670 | |
| 1671 | - public function restore_cpt_item( $post_id ) { |
|
| 1671 | + public function restore_cpt_item($post_id) { |
|
| 1672 | 1672 | $this->_req_data['EVT_ID'] = $post_id; |
| 1673 | - $this->_trash_or_restore_event( 'draft', FALSE ); |
|
| 1673 | + $this->_trash_or_restore_event('draft', FALSE); |
|
| 1674 | 1674 | } |
| 1675 | 1675 | |
| 1676 | 1676 | |
| 1677 | - public function delete_cpt_item( $post_id ) { |
|
| 1677 | + public function delete_cpt_item($post_id) { |
|
| 1678 | 1678 | $this->_req_data['EVT_ID'] = $post_id; |
| 1679 | - $this->_delete_event( FALSE ); |
|
| 1679 | + $this->_delete_event(FALSE); |
|
| 1680 | 1680 | } |
| 1681 | 1681 | |
| 1682 | 1682 | |
@@ -1688,7 +1688,7 @@ discard block |
||
| 1688 | 1688 | * @param string $event_status |
| 1689 | 1689 | * @return void |
| 1690 | 1690 | */ |
| 1691 | - protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = TRUE ) { |
|
| 1691 | + protected function _trash_or_restore_event($event_status = 'trash', $redirect_after = TRUE) { |
|
| 1692 | 1692 | //determine the event id and set to array. |
| 1693 | 1693 | $EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : FALSE; |
| 1694 | 1694 | // loop thru events |
@@ -1696,7 +1696,7 @@ discard block |
||
| 1696 | 1696 | // clean status |
| 1697 | 1697 | $event_status = sanitize_key($event_status); |
| 1698 | 1698 | // grab status |
| 1699 | - if (!empty($event_status)) { |
|
| 1699 | + if ( ! empty($event_status)) { |
|
| 1700 | 1700 | $success = $this->_change_event_status($EVT_ID, $event_status); |
| 1701 | 1701 | } else { |
| 1702 | 1702 | $success = FALSE; |
@@ -1710,7 +1710,7 @@ discard block |
||
| 1710 | 1710 | } |
| 1711 | 1711 | $action = $event_status == 'trash' ? 'moved to the trash' : 'restored from the trash'; |
| 1712 | 1712 | |
| 1713 | - if ( $redirect_after ) |
|
| 1713 | + if ($redirect_after) |
|
| 1714 | 1714 | $this->_redirect_after_action($success, 'Event', $action, array('action' => 'default')); |
| 1715 | 1715 | } |
| 1716 | 1716 | |
@@ -1725,7 +1725,7 @@ discard block |
||
| 1725 | 1725 | // clean status |
| 1726 | 1726 | $event_status = sanitize_key($event_status); |
| 1727 | 1727 | // grab status |
| 1728 | - if (!empty($event_status)) { |
|
| 1728 | + if ( ! empty($event_status)) { |
|
| 1729 | 1729 | $success = TRUE; |
| 1730 | 1730 | //determine the event id and set to array. |
| 1731 | 1731 | $EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array(); |
@@ -1735,7 +1735,7 @@ discard block |
||
| 1735 | 1735 | $results = $this->_change_event_status($EVT_ID, $event_status); |
| 1736 | 1736 | $success = $results !== FALSE ? $success : FALSE; |
| 1737 | 1737 | } else { |
| 1738 | - $msg = sprintf( esc_html__('An error occurred. Event #%d could not be moved to the trash because a valid event ID was not not supplied.', 'event_espresso'), $EVT_ID); |
|
| 1738 | + $msg = sprintf(esc_html__('An error occurred. Event #%d could not be moved to the trash because a valid event ID was not not supplied.', 'event_espresso'), $EVT_ID); |
|
| 1739 | 1739 | EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
| 1740 | 1740 | $success = FALSE; |
| 1741 | 1741 | } |
@@ -1760,15 +1760,15 @@ discard block |
||
| 1760 | 1760 | * @param string $event_status |
| 1761 | 1761 | * @return bool |
| 1762 | 1762 | */ |
| 1763 | - private function _change_event_status( $EVT_ID = 0, $event_status = '') { |
|
| 1763 | + private function _change_event_status($EVT_ID = 0, $event_status = '') { |
|
| 1764 | 1764 | // grab event id |
| 1765 | - if (!$EVT_ID) { |
|
| 1765 | + if ( ! $EVT_ID) { |
|
| 1766 | 1766 | $msg = esc_html__('An error occurred. No Event ID or an invalid Event ID was received.', 'event_espresso'); |
| 1767 | 1767 | EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
| 1768 | 1768 | return FALSE; |
| 1769 | 1769 | } |
| 1770 | 1770 | |
| 1771 | - $this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID ); |
|
| 1771 | + $this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID); |
|
| 1772 | 1772 | |
| 1773 | 1773 | // clean status |
| 1774 | 1774 | $event_status = sanitize_key($event_status); |
@@ -1794,11 +1794,11 @@ discard block |
||
| 1794 | 1794 | $hook = FALSE; |
| 1795 | 1795 | } |
| 1796 | 1796 | //use class to change status |
| 1797 | - $this->_cpt_model_obj->set_status( $event_status ); |
|
| 1797 | + $this->_cpt_model_obj->set_status($event_status); |
|
| 1798 | 1798 | $success = $this->_cpt_model_obj->save(); |
| 1799 | 1799 | |
| 1800 | 1800 | if ($success === FALSE) { |
| 1801 | - $msg = sprintf( esc_html__('An error occurred. The event could not be %s.', 'event_espresso'), $action); |
|
| 1801 | + $msg = sprintf(esc_html__('An error occurred. The event could not be %s.', 'event_espresso'), $action); |
|
| 1802 | 1802 | EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
| 1803 | 1803 | return FALSE; |
| 1804 | 1804 | } |
@@ -1816,15 +1816,15 @@ discard block |
||
| 1816 | 1816 | * @access protected |
| 1817 | 1817 | * @param bool $redirect_after |
| 1818 | 1818 | */ |
| 1819 | - protected function _delete_event( $redirect_after = TRUE ) { |
|
| 1819 | + protected function _delete_event($redirect_after = TRUE) { |
|
| 1820 | 1820 | //determine the event id and set to array. |
| 1821 | 1821 | $EVT_ID = isset($this->_req_data['EVT_ID']) ? absint($this->_req_data['EVT_ID']) : NULL; |
| 1822 | - $EVT_ID = isset( $this->_req_data['post'] ) ? absint( $this->_req_data['post'] ) : $EVT_ID; |
|
| 1822 | + $EVT_ID = isset($this->_req_data['post']) ? absint($this->_req_data['post']) : $EVT_ID; |
|
| 1823 | 1823 | |
| 1824 | 1824 | |
| 1825 | 1825 | // loop thru events |
| 1826 | 1826 | if ($EVT_ID) { |
| 1827 | - $success = $this->_permanently_delete_event( $EVT_ID ); |
|
| 1827 | + $success = $this->_permanently_delete_event($EVT_ID); |
|
| 1828 | 1828 | // get list of events with no prices |
| 1829 | 1829 | $espresso_no_ticket_prices = get_option('ee_no_ticket_prices', array()); |
| 1830 | 1830 | // remove this event from the list of events with no prices |
@@ -1838,7 +1838,7 @@ discard block |
||
| 1838 | 1838 | EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
| 1839 | 1839 | } |
| 1840 | 1840 | |
| 1841 | - if ( $redirect_after ) |
|
| 1841 | + if ($redirect_after) |
|
| 1842 | 1842 | $this->_redirect_after_action($success, 'Event', 'deleted', array('action' => 'default', 'status' => 'trash')); |
| 1843 | 1843 | } |
| 1844 | 1844 | |
@@ -1856,12 +1856,12 @@ discard block |
||
| 1856 | 1856 | $EVT_IDs = isset($this->_req_data['EVT_IDs']) ? (array) $this->_req_data['EVT_IDs'] : array(); |
| 1857 | 1857 | // loop thru events |
| 1858 | 1858 | foreach ($EVT_IDs as $EVT_ID) { |
| 1859 | - $EVT_ID = absint( $EVT_ID ); |
|
| 1860 | - if ( $EVT_ID ) { |
|
| 1861 | - $results = $this->_permanently_delete_event( $EVT_ID ); |
|
| 1859 | + $EVT_ID = absint($EVT_ID); |
|
| 1860 | + if ($EVT_ID) { |
|
| 1861 | + $results = $this->_permanently_delete_event($EVT_ID); |
|
| 1862 | 1862 | $success = $results !== FALSE ? $success : FALSE; |
| 1863 | 1863 | // remove this event from the list of events with no prices |
| 1864 | - unset( $espresso_no_ticket_prices[ $EVT_ID ] ); |
|
| 1864 | + unset($espresso_no_ticket_prices[$EVT_ID]); |
|
| 1865 | 1865 | } else { |
| 1866 | 1866 | $success = FALSE; |
| 1867 | 1867 | $msg = esc_html__('An error occurred. An event could not be deleted because a valid event ID was not not supplied.', 'event_espresso'); |
@@ -1881,9 +1881,9 @@ discard block |
||
| 1881 | 1881 | * @param int $EVT_ID |
| 1882 | 1882 | * @return bool |
| 1883 | 1883 | */ |
| 1884 | - private function _permanently_delete_event( $EVT_ID = 0 ) { |
|
| 1884 | + private function _permanently_delete_event($EVT_ID = 0) { |
|
| 1885 | 1885 | // grab event id |
| 1886 | - if ( ! $EVT_ID ) { |
|
| 1886 | + if ( ! $EVT_ID) { |
|
| 1887 | 1887 | $msg = esc_html__('An error occurred. No Event ID or an invalid Event ID was received.', 'event_espresso'); |
| 1888 | 1888 | EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
| 1889 | 1889 | return FALSE; |
@@ -1892,19 +1892,19 @@ discard block |
||
| 1892 | 1892 | ! $this->_cpt_model_obj instanceof EE_Event |
| 1893 | 1893 | || $this->_cpt_model_obj->ID() !== $EVT_ID |
| 1894 | 1894 | ) { |
| 1895 | - $this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID( $EVT_ID ); |
|
| 1895 | + $this->_cpt_model_obj = EEM_Event::instance()->get_one_by_ID($EVT_ID); |
|
| 1896 | 1896 | } |
| 1897 | 1897 | |
| 1898 | - if ( ! $this->_cpt_model_obj instanceof EE_Event ) { |
|
| 1898 | + if ( ! $this->_cpt_model_obj instanceof EE_Event) { |
|
| 1899 | 1899 | return false; |
| 1900 | 1900 | } |
| 1901 | 1901 | |
| 1902 | 1902 | //need to delete related tickets and prices first. |
| 1903 | 1903 | $datetimes = $this->_cpt_model_obj->get_many_related('Datetime'); |
| 1904 | - foreach ( $datetimes as $datetime ) { |
|
| 1904 | + foreach ($datetimes as $datetime) { |
|
| 1905 | 1905 | $this->_cpt_model_obj->_remove_relation_to($datetime, 'Datetime'); |
| 1906 | 1906 | $tickets = $datetime->get_many_related('Ticket'); |
| 1907 | - foreach ( $tickets as $ticket ) { |
|
| 1907 | + foreach ($tickets as $ticket) { |
|
| 1908 | 1908 | $ticket->_remove_relation_to($datetime, 'Datetime'); |
| 1909 | 1909 | $ticket->delete_related_permanently('Price'); |
| 1910 | 1910 | $ticket->delete_permanently(); |
@@ -1914,14 +1914,14 @@ discard block |
||
| 1914 | 1914 | |
| 1915 | 1915 | //what about related venues or terms? |
| 1916 | 1916 | $venues = $this->_cpt_model_obj->get_many_related('Venue'); |
| 1917 | - foreach ( $venues as $venue ) { |
|
| 1917 | + foreach ($venues as $venue) { |
|
| 1918 | 1918 | $this->_cpt_model_obj->_remove_relation_to($venue, 'Venue'); |
| 1919 | 1919 | } |
| 1920 | 1920 | |
| 1921 | 1921 | //any attached question groups? |
| 1922 | 1922 | $question_groups = $this->_cpt_model_obj->get_many_related('Question_Group'); |
| 1923 | - if ( !empty( $question_groups ) ) { |
|
| 1924 | - foreach ( $question_groups as $question_group ) { |
|
| 1923 | + if ( ! empty($question_groups)) { |
|
| 1924 | + foreach ($question_groups as $question_group) { |
|
| 1925 | 1925 | $this->_cpt_model_obj->_remove_relation_to($question_group, 'Question_Group'); |
| 1926 | 1926 | } |
| 1927 | 1927 | } |
@@ -1930,26 +1930,26 @@ discard block |
||
| 1930 | 1930 | |
| 1931 | 1931 | |
| 1932 | 1932 | //Message Template Groups |
| 1933 | - $this->_cpt_model_obj->_remove_relations( 'Message_Template_Group' ); |
|
| 1933 | + $this->_cpt_model_obj->_remove_relations('Message_Template_Group'); |
|
| 1934 | 1934 | |
| 1935 | 1935 | /** @type EE_Term_Taxonomy[] $term_taxonomies */ |
| 1936 | 1936 | $term_taxonomies = $this->_cpt_model_obj->term_taxonomies(); |
| 1937 | 1937 | |
| 1938 | - foreach ( $term_taxonomies as $term_taxonomy ) { |
|
| 1938 | + foreach ($term_taxonomies as $term_taxonomy) { |
|
| 1939 | 1939 | $this->_cpt_model_obj->remove_relation_to_term_taxonomy($term_taxonomy); |
| 1940 | 1940 | } |
| 1941 | 1941 | |
| 1942 | 1942 | $success = $this->_cpt_model_obj->delete_permanently(); |
| 1943 | 1943 | // did it all go as planned ? |
| 1944 | 1944 | if ($success) { |
| 1945 | - $msg = sprintf( esc_html__('Event ID # %d has been deleted.', 'event_espresso'), $EVT_ID); |
|
| 1945 | + $msg = sprintf(esc_html__('Event ID # %d has been deleted.', 'event_espresso'), $EVT_ID); |
|
| 1946 | 1946 | EE_Error::add_success($msg); |
| 1947 | 1947 | } else { |
| 1948 | - $msg = sprintf( esc_html__('An error occurred. Event ID # %d could not be deleted.', 'event_espresso'), $EVT_ID); |
|
| 1948 | + $msg = sprintf(esc_html__('An error occurred. Event ID # %d could not be deleted.', 'event_espresso'), $EVT_ID); |
|
| 1949 | 1949 | EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
| 1950 | 1950 | return FALSE; |
| 1951 | 1951 | } |
| 1952 | - do_action( 'AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID ); |
|
| 1952 | + do_action('AHEE__Events_Admin_Page___permanently_delete_event__after_event_deleted', $EVT_ID); |
|
| 1953 | 1953 | return TRUE; |
| 1954 | 1954 | } |
| 1955 | 1955 | |
@@ -1966,7 +1966,7 @@ discard block |
||
| 1966 | 1966 | */ |
| 1967 | 1967 | public function total_events() { |
| 1968 | 1968 | |
| 1969 | - $count = EEM_Event::instance()->count( array( 'caps' => 'read_admin' ), 'EVT_ID', true ); |
|
| 1969 | + $count = EEM_Event::instance()->count(array('caps' => 'read_admin'), 'EVT_ID', true); |
|
| 1970 | 1970 | return $count; |
| 1971 | 1971 | } |
| 1972 | 1972 | |
@@ -1981,10 +1981,10 @@ discard block |
||
| 1981 | 1981 | */ |
| 1982 | 1982 | public function total_events_draft() { |
| 1983 | 1983 | $where = array( |
| 1984 | - 'status' => array( 'IN', array('draft', 'auto-draft' ) ) |
|
| 1984 | + 'status' => array('IN', array('draft', 'auto-draft')) |
|
| 1985 | 1985 | ); |
| 1986 | 1986 | |
| 1987 | - $count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true ); |
|
| 1987 | + $count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true); |
|
| 1988 | 1988 | return $count; |
| 1989 | 1989 | } |
| 1990 | 1990 | |
@@ -2003,7 +2003,7 @@ discard block |
||
| 2003 | 2003 | 'status' => 'trash' |
| 2004 | 2004 | ); |
| 2005 | 2005 | |
| 2006 | - $count = EEM_Event::instance()->count( array( $where, 'caps' => 'read_admin' ), 'EVT_ID', true ); |
|
| 2006 | + $count = EEM_Event::instance()->count(array($where, 'caps' => 'read_admin'), 'EVT_ID', true); |
|
| 2007 | 2007 | return $count; |
| 2008 | 2008 | } |
| 2009 | 2009 | |
@@ -2031,11 +2031,11 @@ discard block |
||
| 2031 | 2031 | // translated |
| 2032 | 2032 | TRUE |
| 2033 | 2033 | ); |
| 2034 | - $this->_template_args['default_reg_status'] = isset( EE_Registry::instance()->CFG->registration->default_STS_ID ) ? sanitize_text_field( EE_Registry::instance()->CFG->registration->default_STS_ID ) : EEM_Registration::status_id_pending_payment; |
|
| 2034 | + $this->_template_args['default_reg_status'] = isset(EE_Registry::instance()->CFG->registration->default_STS_ID) ? sanitize_text_field(EE_Registry::instance()->CFG->registration->default_STS_ID) : EEM_Registration::status_id_pending_payment; |
|
| 2035 | 2035 | |
| 2036 | 2036 | $this->_set_add_edit_form_tags('update_default_event_settings'); |
| 2037 | 2037 | $this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE); |
| 2038 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_TEMPLATE_PATH . 'event_settings.template.php', $this->_template_args, TRUE); |
|
| 2038 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template(EVENTS_TEMPLATE_PATH.'event_settings.template.php', $this->_template_args, TRUE); |
|
| 2039 | 2039 | $this->display_admin_page_with_sidebar(); |
| 2040 | 2040 | } |
| 2041 | 2041 | |
@@ -2061,9 +2061,9 @@ discard block |
||
| 2061 | 2061 | |
| 2062 | 2062 | protected function _template_settings() { |
| 2063 | 2063 | $this->_admin_page_title = esc_html__('Template Settings (Preview)', 'event_espresso'); |
| 2064 | - $this->_template_args['preview_img'] = '<img src="' . EVENTS_ASSETS_URL . DS . 'images' . DS . 'caffeinated_template_features.jpg" alt="' . esc_attr__( 'Template Settings Preview screenshot', 'event_espresso' ) . '" />'; |
|
| 2065 | - $this->_template_args['preview_text'] = '<strong>'.esc_html__( 'Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.', 'event_espresso' ).'</strong>'; |
|
| 2066 | - $this->display_admin_caf_preview_page( 'template_settings_tab' ); |
|
| 2064 | + $this->_template_args['preview_img'] = '<img src="'.EVENTS_ASSETS_URL.DS.'images'.DS.'caffeinated_template_features.jpg" alt="'.esc_attr__('Template Settings Preview screenshot', 'event_espresso').'" />'; |
|
| 2065 | + $this->_template_args['preview_text'] = '<strong>'.esc_html__('Template Settings is a feature that is only available in the Caffeinated version of Event Espresso. Template Settings allow you to configure some of the appearance options for both the Event List and Event Details pages.', 'event_espresso').'</strong>'; |
|
| 2066 | + $this->display_admin_caf_preview_page('template_settings_tab'); |
|
| 2067 | 2067 | } |
| 2068 | 2068 | |
| 2069 | 2069 | |
@@ -2076,22 +2076,22 @@ discard block |
||
| 2076 | 2076 | * @return void |
| 2077 | 2077 | */ |
| 2078 | 2078 | private function _set_category_object() { |
| 2079 | - if ( isset( $this->_category->id ) && !empty( $this->_category->id ) ) |
|
| 2079 | + if (isset($this->_category->id) && ! empty($this->_category->id)) |
|
| 2080 | 2080 | return; //already have the category object so get out. |
| 2081 | 2081 | |
| 2082 | 2082 | //set default category object |
| 2083 | 2083 | $this->_set_empty_category_object(); |
| 2084 | 2084 | |
| 2085 | 2085 | //only set if we've got an id |
| 2086 | - if ( !isset($this->_req_data['EVT_CAT_ID'] ) ) { |
|
| 2086 | + if ( ! isset($this->_req_data['EVT_CAT_ID'])) { |
|
| 2087 | 2087 | return; |
| 2088 | 2088 | } |
| 2089 | 2089 | |
| 2090 | 2090 | $category_id = absint($this->_req_data['EVT_CAT_ID']); |
| 2091 | 2091 | |
| 2092 | - $term = get_term( $category_id, 'espresso_event_categories' ); |
|
| 2092 | + $term = get_term($category_id, 'espresso_event_categories'); |
|
| 2093 | 2093 | |
| 2094 | - if ( !empty( $term ) ) { |
|
| 2094 | + if ( ! empty($term)) { |
|
| 2095 | 2095 | $this->_category->category_name = $term->name; |
| 2096 | 2096 | $this->_category->category_identifier = $term->slug; |
| 2097 | 2097 | $this->_category->category_desc = $term->description; |
@@ -2105,15 +2105,15 @@ discard block |
||
| 2105 | 2105 | |
| 2106 | 2106 | private function _set_empty_category_object() { |
| 2107 | 2107 | $this->_category = new stdClass(); |
| 2108 | - $this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = ''; |
|
| 2108 | + $this->_category->category_name = $this->_category->category_identifier = $this->_category->category_desc = ''; |
|
| 2109 | 2109 | $this->_category->id = $this->_category->parent = 0; |
| 2110 | 2110 | } |
| 2111 | 2111 | |
| 2112 | 2112 | |
| 2113 | 2113 | protected function _category_list_table() { |
| 2114 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
| 2114 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
| 2115 | 2115 | $this->_search_btn_label = esc_html__('Categories', 'event_espresso'); |
| 2116 | - $this->_admin_page_title .= ' ' . $this->get_action_link_or_button('add_category', 'add_category', array(), 'add-new-h2'); |
|
| 2116 | + $this->_admin_page_title .= ' '.$this->get_action_link_or_button('add_category', 'add_category', array(), 'add-new-h2'); |
|
| 2117 | 2117 | $this->display_admin_list_table_page_with_sidebar(); |
| 2118 | 2118 | } |
| 2119 | 2119 | |
@@ -2127,14 +2127,14 @@ discard block |
||
| 2127 | 2127 | $this->_set_add_edit_form_tags($route); |
| 2128 | 2128 | |
| 2129 | 2129 | $this->_set_category_object(); |
| 2130 | - $id = !empty($this->_category->id) ? $this->_category->id : ''; |
|
| 2130 | + $id = ! empty($this->_category->id) ? $this->_category->id : ''; |
|
| 2131 | 2131 | |
| 2132 | 2132 | $delete_action = 'delete_category'; |
| 2133 | 2133 | |
| 2134 | 2134 | //custom redirect |
| 2135 | - $redirect = EE_Admin_Page::add_query_args_and_nonce( array('action' => 'category_list'), $this->_admin_base_url ); |
|
| 2135 | + $redirect = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'category_list'), $this->_admin_base_url); |
|
| 2136 | 2136 | |
| 2137 | - $this->_set_publish_post_box_vars( 'EVT_CAT_ID', $id, $delete_action, $redirect ); |
|
| 2137 | + $this->_set_publish_post_box_vars('EVT_CAT_ID', $id, $delete_action, $redirect); |
|
| 2138 | 2138 | |
| 2139 | 2139 | //take care of contents |
| 2140 | 2140 | $this->_template_args['admin_page_content'] = $this->_category_details_content(); |
@@ -2148,25 +2148,25 @@ discard block |
||
| 2148 | 2148 | 'type' => 'wp_editor', |
| 2149 | 2149 | 'value' => EEH_Formatter::admin_format_content($this->_category->category_desc), |
| 2150 | 2150 | 'class' => 'my_editor_custom', |
| 2151 | - 'wpeditor_args' => array('media_buttons' => FALSE ) |
|
| 2151 | + 'wpeditor_args' => array('media_buttons' => FALSE) |
|
| 2152 | 2152 | ); |
| 2153 | - $_wp_editor = $this->_generate_admin_form_fields( $editor_args, 'array' ); |
|
| 2153 | + $_wp_editor = $this->_generate_admin_form_fields($editor_args, 'array'); |
|
| 2154 | 2154 | |
| 2155 | - $all_terms = get_terms( array('espresso_event_categories' ), array( 'hide_empty' => 0, 'exclude' => array( $this->_category->id ) ) ); |
|
| 2155 | + $all_terms = get_terms(array('espresso_event_categories'), array('hide_empty' => 0, 'exclude' => array($this->_category->id))); |
|
| 2156 | 2156 | |
| 2157 | 2157 | //setup category select for term parents. |
| 2158 | 2158 | $category_select_values[] = array( |
| 2159 | 2159 | 'text' => esc_html__('No Parent', 'event_espresso'), |
| 2160 | 2160 | 'id' => 0 |
| 2161 | 2161 | ); |
| 2162 | - foreach ( $all_terms as $term ) { |
|
| 2162 | + foreach ($all_terms as $term) { |
|
| 2163 | 2163 | $category_select_values[] = array( |
| 2164 | 2164 | 'text' => $term->name, |
| 2165 | 2165 | 'id' => $term->term_id |
| 2166 | 2166 | ); |
| 2167 | 2167 | } |
| 2168 | 2168 | |
| 2169 | - $category_select = EEH_Form_Fields::select_input( 'category_parent', $category_select_values, $this->_category->parent ); |
|
| 2169 | + $category_select = EEH_Form_Fields::select_input('category_parent', $category_select_values, $this->_category->parent); |
|
| 2170 | 2170 | |
| 2171 | 2171 | $template_args = array( |
| 2172 | 2172 | 'category' => $this->_category, |
@@ -2176,15 +2176,15 @@ discard block |
||
| 2176 | 2176 | 'disable' => '', |
| 2177 | 2177 | 'disabled_message' => FALSE |
| 2178 | 2178 | ); |
| 2179 | - $template = EVENTS_TEMPLATE_PATH . 'event_category_details.template.php'; |
|
| 2180 | - return EEH_Template::display_template($template, $template_args, TRUE ); |
|
| 2179 | + $template = EVENTS_TEMPLATE_PATH.'event_category_details.template.php'; |
|
| 2180 | + return EEH_Template::display_template($template, $template_args, TRUE); |
|
| 2181 | 2181 | } |
| 2182 | 2182 | |
| 2183 | 2183 | |
| 2184 | 2184 | protected function _delete_categories() { |
| 2185 | - $cat_ids = isset( $this->_req_data['EVT_CAT_ID'] ) ? (array) $this->_req_data['EVT_CAT_ID'] : (array) $this->_req_data['category_id']; |
|
| 2185 | + $cat_ids = isset($this->_req_data['EVT_CAT_ID']) ? (array) $this->_req_data['EVT_CAT_ID'] : (array) $this->_req_data['category_id']; |
|
| 2186 | 2186 | |
| 2187 | - foreach ( $cat_ids as $cat_id ) { |
|
| 2187 | + foreach ($cat_ids as $cat_id) { |
|
| 2188 | 2188 | $this->_delete_category($cat_id); |
| 2189 | 2189 | } |
| 2190 | 2190 | |
@@ -2192,7 +2192,7 @@ discard block |
||
| 2192 | 2192 | $query_args = array( |
| 2193 | 2193 | 'action' => 'category_list' |
| 2194 | 2194 | ); |
| 2195 | - $this->_redirect_after_action(0,'','',$query_args); |
|
| 2195 | + $this->_redirect_after_action(0, '', '', $query_args); |
|
| 2196 | 2196 | |
| 2197 | 2197 | } |
| 2198 | 2198 | |
@@ -2202,61 +2202,61 @@ discard block |
||
| 2202 | 2202 | |
| 2203 | 2203 | protected function _delete_category($cat_id) { |
| 2204 | 2204 | global $wpdb; |
| 2205 | - $cat_id = absint( $cat_id ); |
|
| 2206 | - wp_delete_term( $cat_id, 'espresso_event_categories' ); |
|
| 2205 | + $cat_id = absint($cat_id); |
|
| 2206 | + wp_delete_term($cat_id, 'espresso_event_categories'); |
|
| 2207 | 2207 | } |
| 2208 | 2208 | |
| 2209 | 2209 | |
| 2210 | 2210 | |
| 2211 | 2211 | protected function _insert_or_update_category($new_category) { |
| 2212 | 2212 | |
| 2213 | - $cat_id = $new_category ? $this->_insert_category() : $this->_insert_category( TRUE ); |
|
| 2213 | + $cat_id = $new_category ? $this->_insert_category() : $this->_insert_category(TRUE); |
|
| 2214 | 2214 | $success = 0; //we already have a success message so lets not send another. |
| 2215 | 2215 | |
| 2216 | - if ( $cat_id ) { |
|
| 2216 | + if ($cat_id) { |
|
| 2217 | 2217 | $query_args = array( |
| 2218 | 2218 | 'action' => 'edit_category', |
| 2219 | 2219 | 'EVT_CAT_ID' => $cat_id |
| 2220 | 2220 | ); |
| 2221 | 2221 | } else { |
| 2222 | - $query_args = array( 'action' => 'add_category' ); |
|
| 2222 | + $query_args = array('action' => 'add_category'); |
|
| 2223 | 2223 | } |
| 2224 | - $this->_redirect_after_action( $success, '','', $query_args, TRUE ); |
|
| 2224 | + $this->_redirect_after_action($success, '', '', $query_args, TRUE); |
|
| 2225 | 2225 | |
| 2226 | 2226 | } |
| 2227 | 2227 | |
| 2228 | 2228 | |
| 2229 | 2229 | |
| 2230 | - private function _insert_category( $update = FALSE ) { |
|
| 2230 | + private function _insert_category($update = FALSE) { |
|
| 2231 | 2231 | $cat_id = $update ? $this->_req_data['EVT_CAT_ID'] : ''; |
| 2232 | - $category_name= isset( $this->_req_data['category_name'] ) ? $this->_req_data['category_name'] : ''; |
|
| 2233 | - $category_desc= isset( $this->_req_data['category_desc'] ) ? $this->_req_data['category_desc'] : ''; |
|
| 2234 | - $category_parent = isset( $this->_req_data['category_parent'] ) ? $this->_req_data['category_parent'] : 0; |
|
| 2232 | + $category_name = isset($this->_req_data['category_name']) ? $this->_req_data['category_name'] : ''; |
|
| 2233 | + $category_desc = isset($this->_req_data['category_desc']) ? $this->_req_data['category_desc'] : ''; |
|
| 2234 | + $category_parent = isset($this->_req_data['category_parent']) ? $this->_req_data['category_parent'] : 0; |
|
| 2235 | 2235 | |
| 2236 | - if ( empty( $category_name ) ) { |
|
| 2237 | - $msg = esc_html__( 'You must add a name for the category.', 'event_espresso' ); |
|
| 2238 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 2236 | + if (empty($category_name)) { |
|
| 2237 | + $msg = esc_html__('You must add a name for the category.', 'event_espresso'); |
|
| 2238 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
| 2239 | 2239 | return false; |
| 2240 | 2240 | } |
| 2241 | 2241 | |
| 2242 | - $term_args=array( |
|
| 2242 | + $term_args = array( |
|
| 2243 | 2243 | 'name'=>$category_name, |
| 2244 | 2244 | 'description'=>$category_desc, |
| 2245 | 2245 | 'parent'=>$category_parent |
| 2246 | 2246 | ); |
| 2247 | 2247 | //was the category_identifier input disabled? |
| 2248 | - if(isset($this->_req_data['category_identifier'])){ |
|
| 2248 | + if (isset($this->_req_data['category_identifier'])) { |
|
| 2249 | 2249 | $term_args['slug'] = $this->_req_data['category_identifier']; |
| 2250 | 2250 | } |
| 2251 | - $insert_ids = $update ? wp_update_term( $cat_id, 'espresso_event_categories', $term_args ) :wp_insert_term( $category_name, 'espresso_event_categories', $term_args ); |
|
| 2251 | + $insert_ids = $update ? wp_update_term($cat_id, 'espresso_event_categories', $term_args) : wp_insert_term($category_name, 'espresso_event_categories', $term_args); |
|
| 2252 | 2252 | |
| 2253 | - if ( !is_array( $insert_ids ) ) { |
|
| 2254 | - $msg = esc_html__( 'An error occurred and the category has not been saved to the database.', 'event_espresso' ); |
|
| 2255 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
| 2253 | + if ( ! is_array($insert_ids)) { |
|
| 2254 | + $msg = esc_html__('An error occurred and the category has not been saved to the database.', 'event_espresso'); |
|
| 2255 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
| 2256 | 2256 | } else { |
| 2257 | 2257 | $cat_id = $insert_ids['term_id']; |
| 2258 | - $msg = sprintf ( esc_html__('The category %s was successfully saved', 'event_espresso'), $category_name ); |
|
| 2259 | - EE_Error::add_success( $msg ); |
|
| 2258 | + $msg = sprintf(esc_html__('The category %s was successfully saved', 'event_espresso'), $category_name); |
|
| 2259 | + EE_Error::add_success($msg); |
|
| 2260 | 2260 | } |
| 2261 | 2261 | |
| 2262 | 2262 | return $cat_id; |
@@ -2265,32 +2265,32 @@ discard block |
||
| 2265 | 2265 | |
| 2266 | 2266 | |
| 2267 | 2267 | |
| 2268 | - public function get_categories( $per_page = 10, $current_page = 1, $count = FALSE ) { |
|
| 2268 | + public function get_categories($per_page = 10, $current_page = 1, $count = FALSE) { |
|
| 2269 | 2269 | global $wpdb; |
| 2270 | 2270 | |
| 2271 | 2271 | //testing term stuff |
| 2272 | - $orderby = isset( $this->_req_data['orderby'] ) ? $this->_req_data['orderby'] : 'Term.term_id'; |
|
| 2273 | - $order = isset( $this->_req_data['order'] ) ? $this->_req_data['order'] : 'DESC'; |
|
| 2274 | - $limit = ($current_page-1)*$per_page; |
|
| 2272 | + $orderby = isset($this->_req_data['orderby']) ? $this->_req_data['orderby'] : 'Term.term_id'; |
|
| 2273 | + $order = isset($this->_req_data['order']) ? $this->_req_data['order'] : 'DESC'; |
|
| 2274 | + $limit = ($current_page - 1) * $per_page; |
|
| 2275 | 2275 | |
| 2276 | - $where = array( 'taxonomy' => 'espresso_event_categories' ); |
|
| 2276 | + $where = array('taxonomy' => 'espresso_event_categories'); |
|
| 2277 | 2277 | |
| 2278 | - if ( isset( $this->_req_data['s'] ) ) { |
|
| 2279 | - $sstr = '%' . $this->_req_data['s'] . '%'; |
|
| 2278 | + if (isset($this->_req_data['s'])) { |
|
| 2279 | + $sstr = '%'.$this->_req_data['s'].'%'; |
|
| 2280 | 2280 | $where['OR'] = array( |
| 2281 | - 'Term.name' => array( 'LIKE', $sstr), |
|
| 2282 | - 'description' => array( 'LIKE', $sstr ) |
|
| 2281 | + 'Term.name' => array('LIKE', $sstr), |
|
| 2282 | + 'description' => array('LIKE', $sstr) |
|
| 2283 | 2283 | ); |
| 2284 | 2284 | } |
| 2285 | 2285 | |
| 2286 | 2286 | $query_params = array( |
| 2287 | - $where , |
|
| 2288 | - 'order_by' => array( $orderby => $order ), |
|
| 2289 | - 'limit' => $limit . ',' . $per_page, |
|
| 2287 | + $where, |
|
| 2288 | + 'order_by' => array($orderby => $order), |
|
| 2289 | + 'limit' => $limit.','.$per_page, |
|
| 2290 | 2290 | 'force_join' => array('Term') |
| 2291 | 2291 | ); |
| 2292 | 2292 | |
| 2293 | - $categories = $count ? EEM_Term_Taxonomy::instance()->count( $query_params, 'term_id' ) :EEM_Term_Taxonomy::instance()->get_all( $query_params ); |
|
| 2293 | + $categories = $count ? EEM_Term_Taxonomy::instance()->count($query_params, 'term_id') : EEM_Term_Taxonomy::instance()->get_all($query_params); |
|
| 2294 | 2294 | |
| 2295 | 2295 | return $categories; |
| 2296 | 2296 | } |
@@ -225,7 +225,7 @@ |
||
| 225 | 225 | * leave this as TRUE so that the inputs will be properly configured. However, |
| 226 | 226 | * some client code may be ok with construction finalize being called later |
| 227 | 227 | * (realizing that the subsections' html names might not be set yet, etc.) |
| 228 | - * @return EE_Form_Section_Base |
|
| 228 | + * @return EE_Form_Section_Validatable|null |
|
| 229 | 229 | */ |
| 230 | 230 | public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){ |
| 231 | 231 | if( $require_construction_to_be_finalized ){ |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | if(isset($default_data[$subsection_name])){ |
| 300 | 300 | if($subsection instanceof EE_Form_Input_Base){ |
| 301 | 301 | $subsection->set_default($default_data[$subsection_name]); |
| 302 | - }elseif($subsection instanceof EE_Form_Section_Proper){ |
|
| 302 | + } elseif($subsection instanceof EE_Form_Section_Proper){ |
|
| 303 | 303 | $subsection->populate_defaults($default_data[$subsection_name]); |
| 304 | 304 | } |
| 305 | 305 | } |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | foreach($this->subsections() as $subsection){ |
| 626 | 626 | if( $subsection instanceof EE_Form_Input_Base ){ |
| 627 | 627 | $inputs[ $subsection->html_name() ] = $subsection; |
| 628 | - }elseif($subsection instanceof EE_Form_Section_Proper ){ |
|
| 628 | + } elseif($subsection instanceof EE_Form_Section_Proper ){ |
|
| 629 | 629 | $inputs += $subsection->inputs_in_subsections(); |
| 630 | 630 | } |
| 631 | 631 | } |
@@ -1116,7 +1116,7 @@ discard block |
||
| 1116 | 1116 | public function html_name_prefix(){ |
| 1117 | 1117 | if( $this->parent_section() instanceof EE_Form_Section_Proper ){ |
| 1118 | 1118 | return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']'; |
| 1119 | - }else{ |
|
| 1119 | + } else{ |
|
| 1120 | 1120 | return $this->name(); |
| 1121 | 1121 | } |
| 1122 | 1122 | } |
@@ -1178,7 +1178,7 @@ discard block |
||
| 1178 | 1178 | if( $subsection->form_data_present_in( $req_data ) ) { |
| 1179 | 1179 | return TRUE; |
| 1180 | 1180 | } |
| 1181 | - }elseif( $subsection instanceof EE_Form_Section_Proper ) { |
|
| 1181 | + } elseif( $subsection instanceof EE_Form_Section_Proper ) { |
|
| 1182 | 1182 | if( $subsection->form_data_present_in( $req_data ) ) { |
| 1183 | 1183 | return TRUE; |
| 1184 | 1184 | } |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts). |
| 8 | 8 | * However, you may output the form (usually by calling get_html) anywhere you like. |
| 9 | 9 | */ |
| 10 | -class EE_Form_Section_Proper extends EE_Form_Section_Validatable{ |
|
| 10 | +class EE_Form_Section_Proper extends EE_Form_Section_Validatable { |
|
| 11 | 11 | |
| 12 | 12 | const SUBMITTED_FORM_DATA_SSN_KEY = 'submitted_form_data'; |
| 13 | 13 | |
@@ -71,49 +71,49 @@ discard block |
||
| 71 | 71 | * } @see EE_Form_Section_Validatable::__construct() |
| 72 | 72 | * @throws \EE_Error |
| 73 | 73 | */ |
| 74 | - public function __construct( $options_array = array() ){ |
|
| 75 | - $options_array = (array) apply_filters( 'FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this ); |
|
| 74 | + public function __construct($options_array = array()) { |
|
| 75 | + $options_array = (array) apply_filters('FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this); |
|
| 76 | 76 | //call parent first, as it may be setting the name |
| 77 | 77 | parent::__construct($options_array); |
| 78 | 78 | //if they've included subsections in the constructor, add them now |
| 79 | - if( isset( $options_array['include'] )){ |
|
| 79 | + if (isset($options_array['include'])) { |
|
| 80 | 80 | //we are going to make sure we ONLY have those subsections to include |
| 81 | 81 | //AND we are going to make sure they're in that specified order |
| 82 | 82 | $reordered_subsections = array(); |
| 83 | - foreach($options_array['include'] as $input_name){ |
|
| 84 | - if(isset($this->_subsections[$input_name])){ |
|
| 83 | + foreach ($options_array['include'] as $input_name) { |
|
| 84 | + if (isset($this->_subsections[$input_name])) { |
|
| 85 | 85 | $reordered_subsections[$input_name] = $this->_subsections[$input_name]; |
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | $this->_subsections = $reordered_subsections; |
| 89 | 89 | } |
| 90 | - if(isset($options_array['exclude'])){ |
|
| 90 | + if (isset($options_array['exclude'])) { |
|
| 91 | 91 | $exclude = $options_array['exclude']; |
| 92 | 92 | $this->_subsections = array_diff_key($this->_subsections, array_flip($exclude)); |
| 93 | 93 | } |
| 94 | - if(isset($options_array['layout_strategy'])){ |
|
| 94 | + if (isset($options_array['layout_strategy'])) { |
|
| 95 | 95 | $this->_layout_strategy = $options_array['layout_strategy']; |
| 96 | 96 | } |
| 97 | - if( ! $this->_layout_strategy){ |
|
| 97 | + if ( ! $this->_layout_strategy) { |
|
| 98 | 98 | $this->_layout_strategy = is_admin() ? new EE_Admin_Two_Column_Layout() : new EE_Two_Column_Layout(); |
| 99 | 99 | } |
| 100 | 100 | $this->_layout_strategy->_construct_finalize($this); |
| 101 | 101 | |
| 102 | 102 | //ok so we are definitely going to want the forms JS, |
| 103 | 103 | //so enqueue it or remember to enqueue it during wp_enqueue_scripts |
| 104 | - if( did_action( 'wp_enqueue_scripts' ) |
|
| 105 | - || did_action( 'admin_enqueue_scripts' ) ) { |
|
| 104 | + if (did_action('wp_enqueue_scripts') |
|
| 105 | + || did_action('admin_enqueue_scripts')) { |
|
| 106 | 106 | //ok so they've constructed this object after when they should have. |
| 107 | 107 | //just enqueue the generic form scripts and initialize the form immediately in the JS |
| 108 | - \EE_Form_Section_Proper::wp_enqueue_scripts( true ); |
|
| 108 | + \EE_Form_Section_Proper::wp_enqueue_scripts(true); |
|
| 109 | 109 | } else { |
| 110 | - add_action( 'wp_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' )); |
|
| 111 | - add_action( 'admin_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' )); |
|
| 110 | + add_action('wp_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts')); |
|
| 111 | + add_action('admin_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts')); |
|
| 112 | 112 | } |
| 113 | - add_action( 'wp_footer', array( $this, 'ensure_scripts_localized' ), 1 ); |
|
| 113 | + add_action('wp_footer', array($this, 'ensure_scripts_localized'), 1); |
|
| 114 | 114 | |
| 115 | - if( isset( $options_array[ 'name' ] ) ) { |
|
| 116 | - $this->_construct_finalize( null, $options_array[ 'name' ] ); |
|
| 115 | + if (isset($options_array['name'])) { |
|
| 116 | + $this->_construct_finalize(null, $options_array['name']); |
|
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | |
@@ -126,25 +126,25 @@ discard block |
||
| 126 | 126 | * @param string $name |
| 127 | 127 | * @throws \EE_Error |
| 128 | 128 | */ |
| 129 | - public function _construct_finalize( $parent_form_section, $name ) { |
|
| 129 | + public function _construct_finalize($parent_form_section, $name) { |
|
| 130 | 130 | parent::_construct_finalize($parent_form_section, $name); |
| 131 | 131 | $this->_set_default_name_if_empty(); |
| 132 | 132 | $this->_set_default_html_id_if_empty(); |
| 133 | - foreach( $this->_subsections as $subsection_name => $subsection ){ |
|
| 134 | - if ( $subsection instanceof EE_Form_Section_Base ) { |
|
| 135 | - $subsection->_construct_finalize( $this, $subsection_name ); |
|
| 133 | + foreach ($this->_subsections as $subsection_name => $subsection) { |
|
| 134 | + if ($subsection instanceof EE_Form_Section_Base) { |
|
| 135 | + $subsection->_construct_finalize($this, $subsection_name); |
|
| 136 | 136 | } else { |
| 137 | 137 | throw new EE_Error( |
| 138 | 138 | sprintf( |
| 139 | - __( 'Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso' ), |
|
| 139 | + __('Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso'), |
|
| 140 | 140 | $subsection_name, |
| 141 | 141 | get_class($this), |
| 142 | - $subsection ? get_class($subsection) : __( 'NULL', 'event_espresso' ) |
|
| 142 | + $subsection ? get_class($subsection) : __('NULL', 'event_espresso') |
|
| 143 | 143 | ) |
| 144 | 144 | ); |
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | - do_action( 'AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name ); |
|
| 147 | + do_action('AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name); |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | * Gets the layout strategy for this form section |
| 154 | 154 | * @return EE_Form_Section_Layout_Base |
| 155 | 155 | */ |
| 156 | - public function get_layout_strategy(){ |
|
| 156 | + public function get_layout_strategy() { |
|
| 157 | 157 | return $this->_layout_strategy; |
| 158 | 158 | } |
| 159 | 159 | |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | * @param EE_Form_Input_Base $input |
| 166 | 166 | * @return string |
| 167 | 167 | */ |
| 168 | - public function get_html_for_input($input){ |
|
| 168 | + public function get_html_for_input($input) { |
|
| 169 | 169 | return $this->_layout_strategy->layout_input($input); |
| 170 | 170 | } |
| 171 | 171 | |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | * @param null $form_data |
| 179 | 179 | * @return boolean |
| 180 | 180 | */ |
| 181 | - public function was_submitted($form_data = NULL){ |
|
| 181 | + public function was_submitted($form_data = NULL) { |
|
| 182 | 182 | return $this->form_data_present_in($form_data); |
| 183 | 183 | } |
| 184 | 184 | |
@@ -203,21 +203,21 @@ discard block |
||
| 203 | 203 | * (eg you validated the data then stored it in the DB) |
| 204 | 204 | * you may want to skip this step. |
| 205 | 205 | */ |
| 206 | - public function receive_form_submission( $req_data = null, $validate = true ){ |
|
| 207 | - $req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate ); |
|
| 208 | - if( $req_data === null ){ |
|
| 209 | - $req_data = array_merge( $_GET, $_POST ); |
|
| 206 | + public function receive_form_submission($req_data = null, $validate = true) { |
|
| 207 | + $req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate); |
|
| 208 | + if ($req_data === null) { |
|
| 209 | + $req_data = array_merge($_GET, $_POST); |
|
| 210 | 210 | } |
| 211 | - $req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', $req_data, $this ); |
|
| 212 | - $this->_normalize( $req_data ); |
|
| 213 | - if( $validate ){ |
|
| 211 | + $req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', $req_data, $this); |
|
| 212 | + $this->_normalize($req_data); |
|
| 213 | + if ($validate) { |
|
| 214 | 214 | $this->_validate(); |
| 215 | 215 | //if it's invalid, we're going to want to re-display so remember what they submitted |
| 216 | - if ( ! $this->is_valid() ) { |
|
| 216 | + if ( ! $this->is_valid()) { |
|
| 217 | 217 | $this->store_submitted_form_data_in_session(); |
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | - do_action( 'AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate ); |
|
| 220 | + do_action('AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate); |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | protected function store_submitted_form_data_in_session() { |
| 232 | 232 | return EE_Registry::instance()->SSN->set_session_data( |
| 233 | 233 | array( |
| 234 | - \EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY => $this->submitted_values( true ) |
|
| 234 | + \EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY => $this->submitted_values(true) |
|
| 235 | 235 | ) |
| 236 | 236 | ); |
| 237 | 237 | } |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | */ |
| 260 | 260 | protected function flush_submitted_form_data_from_session() { |
| 261 | 261 | return EE_Registry::instance()->SSN->reset_data( |
| 262 | - array( \EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY ) |
|
| 262 | + array(\EE_Form_Section_Proper::SUBMITTED_FORM_DATA_SSN_KEY) |
|
| 263 | 263 | ); |
| 264 | 264 | } |
| 265 | 265 | |
@@ -275,12 +275,12 @@ discard block |
||
| 275 | 275 | */ |
| 276 | 276 | public function populate_from_session() { |
| 277 | 277 | $form_data_in_session = $this->get_submitted_form_data_from_session(); |
| 278 | - if ( empty( $form_data_in_session ) ) { |
|
| 278 | + if (empty($form_data_in_session)) { |
|
| 279 | 279 | return false; |
| 280 | 280 | } |
| 281 | - $this->receive_form_submission( $form_data_in_session ); |
|
| 281 | + $this->receive_form_submission($form_data_in_session); |
|
| 282 | 282 | $this->flush_submitted_form_data_from_session(); |
| 283 | - if ( $this->form_data_present_in( $form_data_in_session ) ) { |
|
| 283 | + if ($this->form_data_present_in($form_data_in_session)) { |
|
| 284 | 284 | return true; |
| 285 | 285 | } else { |
| 286 | 286 | return false; |
@@ -297,12 +297,12 @@ discard block |
||
| 297 | 297 | * the value being an array formatted in teh same way |
| 298 | 298 | * @param array $default_data |
| 299 | 299 | */ |
| 300 | - public function populate_defaults($default_data){ |
|
| 301 | - foreach($this->subsections() as $subsection_name => $subsection){ |
|
| 302 | - if(isset($default_data[$subsection_name])){ |
|
| 303 | - if($subsection instanceof EE_Form_Input_Base){ |
|
| 300 | + public function populate_defaults($default_data) { |
|
| 301 | + foreach ($this->subsections() as $subsection_name => $subsection) { |
|
| 302 | + if (isset($default_data[$subsection_name])) { |
|
| 303 | + if ($subsection instanceof EE_Form_Input_Base) { |
|
| 304 | 304 | $subsection->set_default($default_data[$subsection_name]); |
| 305 | - }elseif($subsection instanceof EE_Form_Section_Proper){ |
|
| 305 | + }elseif ($subsection instanceof EE_Form_Section_Proper) { |
|
| 306 | 306 | $subsection->populate_defaults($default_data[$subsection_name]); |
| 307 | 307 | } |
| 308 | 308 | } |
@@ -317,8 +317,8 @@ discard block |
||
| 317 | 317 | * @param string $name |
| 318 | 318 | * @return boolean |
| 319 | 319 | */ |
| 320 | - public function subsection_exists( $name ){ |
|
| 321 | - return isset( $this->_subsections[ $name ] ) ? true : false; |
|
| 320 | + public function subsection_exists($name) { |
|
| 321 | + return isset($this->_subsections[$name]) ? true : false; |
|
| 322 | 322 | } |
| 323 | 323 | |
| 324 | 324 | |
@@ -336,11 +336,11 @@ discard block |
||
| 336 | 336 | * @return EE_Form_Section_Base |
| 337 | 337 | * @throws \EE_Error |
| 338 | 338 | */ |
| 339 | - public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){ |
|
| 340 | - if( $require_construction_to_be_finalized ){ |
|
| 339 | + public function get_subsection($name, $require_construction_to_be_finalized = TRUE) { |
|
| 340 | + if ($require_construction_to_be_finalized) { |
|
| 341 | 341 | $this->ensure_construct_finalized_called(); |
| 342 | 342 | } |
| 343 | - return $this->subsection_exists( $name ) ? $this->_subsections[$name] : NULL; |
|
| 343 | + return $this->subsection_exists($name) ? $this->_subsections[$name] : NULL; |
|
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | |
@@ -349,10 +349,10 @@ discard block |
||
| 349 | 349 | * Gets all the validatable subsections of this form section |
| 350 | 350 | * @return EE_Form_Section_Validatable[] |
| 351 | 351 | */ |
| 352 | - public function get_validatable_subsections(){ |
|
| 352 | + public function get_validatable_subsections() { |
|
| 353 | 353 | $validatable_subsections = array(); |
| 354 | - foreach($this->subsections() as $name=>$obj){ |
|
| 355 | - if($obj instanceof EE_Form_Section_Validatable){ |
|
| 354 | + foreach ($this->subsections() as $name=>$obj) { |
|
| 355 | + if ($obj instanceof EE_Form_Section_Validatable) { |
|
| 356 | 356 | $validatable_subsections[$name] = $obj; |
| 357 | 357 | } |
| 358 | 358 | } |
@@ -372,9 +372,9 @@ discard block |
||
| 372 | 372 | * @return EE_Form_Input_Base |
| 373 | 373 | * @throws EE_Error |
| 374 | 374 | */ |
| 375 | - public function get_input($name, $require_construction_to_be_finalized = TRUE ){ |
|
| 375 | + public function get_input($name, $require_construction_to_be_finalized = TRUE) { |
|
| 376 | 376 | $subsection = $this->get_subsection($name, $require_construction_to_be_finalized); |
| 377 | - if( ! $subsection instanceof EE_Form_Input_Base){ |
|
| 377 | + if ( ! $subsection instanceof EE_Form_Input_Base) { |
|
| 378 | 378 | throw new EE_Error( |
| 379 | 379 | sprintf( |
| 380 | 380 | __( |
@@ -382,8 +382,8 @@ discard block |
||
| 382 | 382 | 'event_espresso' |
| 383 | 383 | ), |
| 384 | 384 | $name, |
| 385 | - get_class( $this ), |
|
| 386 | - $subsection ? get_class( $subsection ) : __( "NULL", 'event_espresso' ) |
|
| 385 | + get_class($this), |
|
| 386 | + $subsection ? get_class($subsection) : __("NULL", 'event_espresso') |
|
| 387 | 387 | ) |
| 388 | 388 | ); |
| 389 | 389 | } |
@@ -403,14 +403,14 @@ discard block |
||
| 403 | 403 | * @return EE_Form_Section_Proper |
| 404 | 404 | * @throws EE_Error |
| 405 | 405 | */ |
| 406 | - public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE ){ |
|
| 407 | - $subsection = $this->get_subsection( $name, $require_construction_to_be_finalized ); |
|
| 408 | - if( ! $subsection instanceof EE_Form_Section_Proper){ |
|
| 406 | + public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE) { |
|
| 407 | + $subsection = $this->get_subsection($name, $require_construction_to_be_finalized); |
|
| 408 | + if ( ! $subsection instanceof EE_Form_Section_Proper) { |
|
| 409 | 409 | throw new EE_Error( |
| 410 | 410 | sprintf( |
| 411 | - __( "Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso' ), |
|
| 411 | + __("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'), |
|
| 412 | 412 | $name, |
| 413 | - get_class( $this ) |
|
| 413 | + get_class($this) |
|
| 414 | 414 | ) |
| 415 | 415 | ); |
| 416 | 416 | } |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | * @return mixed depending on the input's type and its normalization strategy |
| 428 | 428 | * @throws \EE_Error |
| 429 | 429 | */ |
| 430 | - public function get_input_value($name){ |
|
| 430 | + public function get_input_value($name) { |
|
| 431 | 431 | $input = $this->get_input($name); |
| 432 | 432 | return $input->normalized_value(); |
| 433 | 433 | } |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | * @return boolean |
| 441 | 441 | */ |
| 442 | 442 | public function is_valid() { |
| 443 | - if( ! $this->has_received_submission()){ |
|
| 443 | + if ( ! $this->has_received_submission()) { |
|
| 444 | 444 | throw new EE_Error( |
| 445 | 445 | sprintf( |
| 446 | 446 | __( |
@@ -450,16 +450,16 @@ discard block |
||
| 450 | 450 | ) |
| 451 | 451 | ); |
| 452 | 452 | } |
| 453 | - if( ! parent::is_valid() ) { |
|
| 453 | + if ( ! parent::is_valid()) { |
|
| 454 | 454 | return false; |
| 455 | 455 | } |
| 456 | 456 | // ok so no general errors to this entire form section. |
| 457 | 457 | // so let's check the subsections, but only set errors if that hasn't been done yet |
| 458 | 458 | $set_submission_errors = $this->submission_error_message() === '' ? true : false; |
| 459 | - foreach( $this->get_validatable_subsections() as $subsection ){ |
|
| 460 | - if( ! $subsection->is_valid() || $subsection->get_validation_error_string() !== '' ){ |
|
| 461 | - if ( $set_submission_errors ) { |
|
| 462 | - $this->set_submission_error_message( $subsection->get_validation_error_string() ); |
|
| 459 | + foreach ($this->get_validatable_subsections() as $subsection) { |
|
| 460 | + if ( ! $subsection->is_valid() || $subsection->get_validation_error_string() !== '') { |
|
| 461 | + if ($set_submission_errors) { |
|
| 462 | + $this->set_submission_error_message($subsection->get_validation_error_string()); |
|
| 463 | 463 | } |
| 464 | 464 | return false; |
| 465 | 465 | } |
@@ -473,11 +473,11 @@ discard block |
||
| 473 | 473 | * gets teh default name of this form section if none is specified |
| 474 | 474 | * @return string |
| 475 | 475 | */ |
| 476 | - protected function _set_default_name_if_empty(){ |
|
| 477 | - if( ! $this->_name ){ |
|
| 476 | + protected function _set_default_name_if_empty() { |
|
| 477 | + if ( ! $this->_name) { |
|
| 478 | 478 | $classname = get_class($this); |
| 479 | 479 | $default_name = str_replace("EE_", "", $classname); |
| 480 | - $this->_name = $default_name; |
|
| 480 | + $this->_name = $default_name; |
|
| 481 | 481 | } |
| 482 | 482 | } |
| 483 | 483 | |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | * and get_html when you are about to display the form. |
| 494 | 494 | * @throws \EE_Error |
| 495 | 495 | */ |
| 496 | - public function get_html_and_js(){ |
|
| 496 | + public function get_html_and_js() { |
|
| 497 | 497 | //no doing_it_wrong yet because we ourselves are still doing it wrong... |
| 498 | 498 | //and theoretically this CAN be used properly, provided its used during "wp_enqueue_scripts" |
| 499 | 499 | $this->enqueue_js(); |
@@ -508,9 +508,9 @@ discard block |
||
| 508 | 508 | * @param bool $display_previously_submitted_data |
| 509 | 509 | * @return string |
| 510 | 510 | */ |
| 511 | - public function get_html( $display_previously_submitted_data = true ){ |
|
| 511 | + public function get_html($display_previously_submitted_data = true) { |
|
| 512 | 512 | $this->ensure_construct_finalized_called(); |
| 513 | - if ( $display_previously_submitted_data ) { |
|
| 513 | + if ($display_previously_submitted_data) { |
|
| 514 | 514 | $this->populate_from_session(); |
| 515 | 515 | } |
| 516 | 516 | return $this->_layout_strategy->layout_form(); |
@@ -524,9 +524,9 @@ discard block |
||
| 524 | 524 | * @return string |
| 525 | 525 | * @throws \EE_Error |
| 526 | 526 | */ |
| 527 | - public function enqueue_js(){ |
|
| 527 | + public function enqueue_js() { |
|
| 528 | 528 | $this->_enqueue_and_localize_form_js(); |
| 529 | - foreach( $this->subsections() as $subsection ) { |
|
| 529 | + foreach ($this->subsections() as $subsection) { |
|
| 530 | 530 | $subsection->enqueue_js(); |
| 531 | 531 | } |
| 532 | 532 | } |
@@ -545,19 +545,19 @@ discard block |
||
| 545 | 545 | * to be triggered automatically or not |
| 546 | 546 | * @return void |
| 547 | 547 | */ |
| 548 | - public static function wp_enqueue_scripts( $init_form_validation_automatically = true ){ |
|
| 549 | - add_filter( 'FHEE_load_jquery_validate', '__return_true' ); |
|
| 548 | + public static function wp_enqueue_scripts($init_form_validation_automatically = true) { |
|
| 549 | + add_filter('FHEE_load_jquery_validate', '__return_true'); |
|
| 550 | 550 | wp_register_script( |
| 551 | 551 | 'ee_form_section_validation', |
| 552 | - EE_GLOBAL_ASSETS_URL . 'scripts' . DS . 'form_section_validation.js', |
|
| 553 | - array( 'jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods' ), |
|
| 552 | + EE_GLOBAL_ASSETS_URL.'scripts'.DS.'form_section_validation.js', |
|
| 553 | + array('jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods'), |
|
| 554 | 554 | EVENT_ESPRESSO_VERSION, |
| 555 | 555 | true |
| 556 | 556 | ); |
| 557 | 557 | wp_localize_script( |
| 558 | 558 | 'ee_form_section_validation', |
| 559 | 559 | 'ee_form_section_validation_init', |
| 560 | - array( 'init' => $init_form_validation_automatically ? true : false ) |
|
| 560 | + array('init' => $init_form_validation_automatically ? true : false) |
|
| 561 | 561 | ); |
| 562 | 562 | } |
| 563 | 563 | |
@@ -570,14 +570,14 @@ discard block |
||
| 570 | 570 | * |
| 571 | 571 | * @throws \EE_Error |
| 572 | 572 | */ |
| 573 | - public function _enqueue_and_localize_form_js(){ |
|
| 573 | + public function _enqueue_and_localize_form_js() { |
|
| 574 | 574 | $this->ensure_construct_finalized_called(); |
| 575 | 575 | //actually, we don't want to localize just yet. There may be other forms on the page. |
| 576 | 576 | //so we need to add our form section data to a static variable accessible by all form sections |
| 577 | 577 | //and localize it just before the footer |
| 578 | 578 | $this->localize_validation_rules(); |
| 579 | - add_action( 'wp_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ), 2 ); |
|
| 580 | - add_action( 'admin_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ) ); |
|
| 579 | + add_action('wp_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'), 2); |
|
| 580 | + add_action('admin_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms')); |
|
| 581 | 581 | } |
| 582 | 582 | |
| 583 | 583 | |
@@ -589,12 +589,12 @@ discard block |
||
| 589 | 589 | * @return void |
| 590 | 590 | * @throws \EE_Error |
| 591 | 591 | */ |
| 592 | - public function localize_validation_rules( $return_for_subsection = FALSE ){ |
|
| 592 | + public function localize_validation_rules($return_for_subsection = FALSE) { |
|
| 593 | 593 | // we only want to localize vars ONCE for the entire form, |
| 594 | 594 | // so if the form section doesn't have a parent, then it must be the top dog |
| 595 | - if ( $return_for_subsection || ! $this->parent_section() ) { |
|
| 596 | - EE_Form_Section_Proper::$_js_localization['form_data'][ $this->html_id() ] = array( |
|
| 597 | - 'form_section_id'=> $this->html_id( TRUE ), |
|
| 595 | + if ($return_for_subsection || ! $this->parent_section()) { |
|
| 596 | + EE_Form_Section_Proper::$_js_localization['form_data'][$this->html_id()] = array( |
|
| 597 | + 'form_section_id'=> $this->html_id(TRUE), |
|
| 598 | 598 | 'validation_rules'=> $this->get_jquery_validation_rules(), |
| 599 | 599 | 'other_data' => $this->get_other_js_data(), |
| 600 | 600 | 'errors'=> $this->subsection_validation_errors_by_html_name() |
@@ -610,9 +610,9 @@ discard block |
||
| 610 | 610 | * @param array $form_other_js_data |
| 611 | 611 | * @return array |
| 612 | 612 | */ |
| 613 | - public function get_other_js_data( $form_other_js_data = array() ) { |
|
| 614 | - foreach( $this->subsections() as $subsection ) { |
|
| 615 | - $form_other_js_data = $subsection->get_other_js_data( $form_other_js_data ); |
|
| 613 | + public function get_other_js_data($form_other_js_data = array()) { |
|
| 614 | + foreach ($this->subsections() as $subsection) { |
|
| 615 | + $form_other_js_data = $subsection->get_other_js_data($form_other_js_data); |
|
| 616 | 616 | } |
| 617 | 617 | return $form_other_js_data; |
| 618 | 618 | } |
@@ -623,12 +623,12 @@ discard block |
||
| 623 | 623 | * Keys are their form names, and values are the inputs themselves |
| 624 | 624 | * @return EE_Form_Input_Base |
| 625 | 625 | */ |
| 626 | - public function inputs_in_subsections(){ |
|
| 626 | + public function inputs_in_subsections() { |
|
| 627 | 627 | $inputs = array(); |
| 628 | - foreach($this->subsections() as $subsection){ |
|
| 629 | - if( $subsection instanceof EE_Form_Input_Base ){ |
|
| 630 | - $inputs[ $subsection->html_name() ] = $subsection; |
|
| 631 | - }elseif($subsection instanceof EE_Form_Section_Proper ){ |
|
| 628 | + foreach ($this->subsections() as $subsection) { |
|
| 629 | + if ($subsection instanceof EE_Form_Input_Base) { |
|
| 630 | + $inputs[$subsection->html_name()] = $subsection; |
|
| 631 | + }elseif ($subsection instanceof EE_Form_Section_Proper) { |
|
| 632 | 632 | $inputs += $subsection->inputs_in_subsections(); |
| 633 | 633 | } |
| 634 | 634 | } |
@@ -641,12 +641,12 @@ discard block |
||
| 641 | 641 | * and values are a string of all their validation errors |
| 642 | 642 | * @return string[] |
| 643 | 643 | */ |
| 644 | - public function subsection_validation_errors_by_html_name(){ |
|
| 644 | + public function subsection_validation_errors_by_html_name() { |
|
| 645 | 645 | $inputs = $this->inputs(); |
| 646 | 646 | $errors = array(); |
| 647 | - foreach( $inputs as $form_input ){ |
|
| 648 | - if ( $form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors() ){ |
|
| 649 | - $errors[ $form_input->html_name() ] = $form_input->get_validation_error_string(); |
|
| 647 | + foreach ($inputs as $form_input) { |
|
| 648 | + if ($form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors()) { |
|
| 649 | + $errors[$form_input->html_name()] = $form_input->get_validation_error_string(); |
|
| 650 | 650 | } |
| 651 | 651 | } |
| 652 | 652 | return $errors; |
@@ -658,15 +658,15 @@ discard block |
||
| 658 | 658 | * passes all the form data required by the JS to the JS, and enqueues the few required JS files. |
| 659 | 659 | * Should be setup by each form during the _enqueues_and_localize_form_js |
| 660 | 660 | */ |
| 661 | - public static function localize_script_for_all_forms(){ |
|
| 661 | + public static function localize_script_for_all_forms() { |
|
| 662 | 662 | //allow inputs and stuff to hook in their JS and stuff here |
| 663 | - do_action( 'AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin' ); |
|
| 663 | + do_action('AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin'); |
|
| 664 | 664 | EE_Form_Section_Proper::$_js_localization['localized_error_messages'] = EE_Form_Section_Proper::_get_localized_error_messages(); |
| 665 | - $email_validation_level = isset( EE_Registry::instance()->CFG->registration->email_validation_level ) |
|
| 665 | + $email_validation_level = isset(EE_Registry::instance()->CFG->registration->email_validation_level) |
|
| 666 | 666 | ? EE_Registry::instance()->CFG->registration->email_validation_level |
| 667 | 667 | : 'wp_default'; |
| 668 | 668 | EE_Form_Section_Proper::$_js_localization['email_validation_level'] = $email_validation_level; |
| 669 | - wp_enqueue_script( 'ee_form_section_validation' ); |
|
| 669 | + wp_enqueue_script('ee_form_section_validation'); |
|
| 670 | 670 | wp_localize_script( |
| 671 | 671 | 'ee_form_section_validation', |
| 672 | 672 | 'ee_form_section_vars', |
@@ -679,8 +679,8 @@ discard block |
||
| 679 | 679 | /** |
| 680 | 680 | * ensure_scripts_localized |
| 681 | 681 | */ |
| 682 | - public function ensure_scripts_localized(){ |
|
| 683 | - if ( ! EE_Form_Section_Proper::$_scripts_localized ) { |
|
| 682 | + public function ensure_scripts_localized() { |
|
| 683 | + if ( ! EE_Form_Section_Proper::$_scripts_localized) { |
|
| 684 | 684 | $this->_enqueue_and_localize_form_js(); |
| 685 | 685 | } |
| 686 | 686 | } |
@@ -692,10 +692,10 @@ discard block |
||
| 692 | 692 | * is that the key here should be the same as the custom validation rule put in the JS file |
| 693 | 693 | * @return array keys are custom validation rules, and values are internationalized strings |
| 694 | 694 | */ |
| 695 | - private static function _get_localized_error_messages(){ |
|
| 695 | + private static function _get_localized_error_messages() { |
|
| 696 | 696 | return array( |
| 697 | 697 | 'validUrl'=> __("This is not a valid absolute URL. Eg, http://domain.com/monkey.jpg", "event_espresso"), |
| 698 | - 'regex' => __( 'Please check your input', 'event_espresso' ), |
|
| 698 | + 'regex' => __('Please check your input', 'event_espresso'), |
|
| 699 | 699 | ); |
| 700 | 700 | } |
| 701 | 701 | |
@@ -725,9 +725,9 @@ discard block |
||
| 725 | 725 | * |
| 726 | 726 | * @return array |
| 727 | 727 | */ |
| 728 | - public function get_jquery_validation_rules(){ |
|
| 728 | + public function get_jquery_validation_rules() { |
|
| 729 | 729 | $jquery_validation_rules = array(); |
| 730 | - foreach($this->get_validatable_subsections() as $subsection){ |
|
| 730 | + foreach ($this->get_validatable_subsections() as $subsection) { |
|
| 731 | 731 | $jquery_validation_rules = array_merge( |
| 732 | 732 | $jquery_validation_rules, |
| 733 | 733 | $subsection->get_jquery_validation_rules() |
@@ -744,14 +744,14 @@ discard block |
||
| 744 | 744 | * @param array $req_data like $_POST |
| 745 | 745 | * @return void |
| 746 | 746 | */ |
| 747 | - protected function _normalize( $req_data ) { |
|
| 747 | + protected function _normalize($req_data) { |
|
| 748 | 748 | $this->_received_submission = true; |
| 749 | 749 | $this->_validation_errors = array(); |
| 750 | - foreach ( $this->get_validatable_subsections() as $subsection ) { |
|
| 750 | + foreach ($this->get_validatable_subsections() as $subsection) { |
|
| 751 | 751 | try { |
| 752 | - $subsection->_normalize( $req_data ); |
|
| 753 | - } catch ( EE_Validation_Error $e ) { |
|
| 754 | - $subsection->add_validation_error( $e ); |
|
| 752 | + $subsection->_normalize($req_data); |
|
| 753 | + } catch (EE_Validation_Error $e) { |
|
| 754 | + $subsection->add_validation_error($e); |
|
| 755 | 755 | } |
| 756 | 756 | } |
| 757 | 757 | } |
@@ -768,9 +768,9 @@ discard block |
||
| 768 | 768 | * calling parent::_validate() first. |
| 769 | 769 | */ |
| 770 | 770 | protected function _validate() { |
| 771 | - foreach($this->get_validatable_subsections() as $subsection_name => $subsection){ |
|
| 772 | - if(method_exists($this,'_validate_'.$subsection_name)){ |
|
| 773 | - call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection)); |
|
| 771 | + foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) { |
|
| 772 | + if (method_exists($this, '_validate_'.$subsection_name)) { |
|
| 773 | + call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection)); |
|
| 774 | 774 | } |
| 775 | 775 | $subsection->_validate(); |
| 776 | 776 | } |
@@ -782,13 +782,13 @@ discard block |
||
| 782 | 782 | * Gets all the validated inputs for the form section |
| 783 | 783 | * @return array |
| 784 | 784 | */ |
| 785 | - public function valid_data(){ |
|
| 785 | + public function valid_data() { |
|
| 786 | 786 | $inputs = array(); |
| 787 | - foreach( $this->subsections() as $subsection_name =>$subsection ){ |
|
| 788 | - if ( $subsection instanceof EE_Form_Section_Proper ) { |
|
| 789 | - $inputs[ $subsection_name ] = $subsection->valid_data(); |
|
| 790 | - } else if ( $subsection instanceof EE_Form_Input_Base ){ |
|
| 791 | - $inputs[ $subsection_name ] = $subsection->normalized_value(); |
|
| 787 | + foreach ($this->subsections() as $subsection_name =>$subsection) { |
|
| 788 | + if ($subsection instanceof EE_Form_Section_Proper) { |
|
| 789 | + $inputs[$subsection_name] = $subsection->valid_data(); |
|
| 790 | + } else if ($subsection instanceof EE_Form_Input_Base) { |
|
| 791 | + $inputs[$subsection_name] = $subsection->normalized_value(); |
|
| 792 | 792 | } |
| 793 | 793 | } |
| 794 | 794 | return $inputs; |
@@ -800,11 +800,11 @@ discard block |
||
| 800 | 800 | * Gets all the inputs on this form section |
| 801 | 801 | * @return EE_Form_Input_Base[] |
| 802 | 802 | */ |
| 803 | - public function inputs(){ |
|
| 803 | + public function inputs() { |
|
| 804 | 804 | $inputs = array(); |
| 805 | - foreach( $this->subsections() as $subsection_name =>$subsection ){ |
|
| 806 | - if ( $subsection instanceof EE_Form_Input_Base ){ |
|
| 807 | - $inputs[ $subsection_name ] = $subsection; |
|
| 805 | + foreach ($this->subsections() as $subsection_name =>$subsection) { |
|
| 806 | + if ($subsection instanceof EE_Form_Input_Base) { |
|
| 807 | + $inputs[$subsection_name] = $subsection; |
|
| 808 | 808 | } |
| 809 | 809 | } |
| 810 | 810 | return $inputs; |
@@ -816,10 +816,10 @@ discard block |
||
| 816 | 816 | * Gets all the subsections which are a proper form |
| 817 | 817 | * @return EE_Form_Section_Proper[] |
| 818 | 818 | */ |
| 819 | - public function subforms(){ |
|
| 819 | + public function subforms() { |
|
| 820 | 820 | $form_sections = array(); |
| 821 | - foreach($this->subsections() as $name=>$obj){ |
|
| 822 | - if($obj instanceof EE_Form_Section_Proper){ |
|
| 821 | + foreach ($this->subsections() as $name=>$obj) { |
|
| 822 | + if ($obj instanceof EE_Form_Section_Proper) { |
|
| 823 | 823 | $form_sections[$name] = $obj; |
| 824 | 824 | } |
| 825 | 825 | } |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | * if you only want form inputs or proper form sections. |
| 835 | 835 | * @return EE_Form_Section_Proper[] |
| 836 | 836 | */ |
| 837 | - public function subsections(){ |
|
| 837 | + public function subsections() { |
|
| 838 | 838 | $this->ensure_construct_finalized_called(); |
| 839 | 839 | return $this->_subsections; |
| 840 | 840 | } |
@@ -856,8 +856,8 @@ discard block |
||
| 856 | 856 | * where keys are always subsection names and values are either |
| 857 | 857 | * the input's normalized value, or an array like the top-level array |
| 858 | 858 | */ |
| 859 | - public function input_values( $include_subform_inputs = false, $flatten = false ){ |
|
| 860 | - return $this->_input_values( false, $include_subform_inputs, $flatten ); |
|
| 859 | + public function input_values($include_subform_inputs = false, $flatten = false) { |
|
| 860 | + return $this->_input_values(false, $include_subform_inputs, $flatten); |
|
| 861 | 861 | } |
| 862 | 862 | |
| 863 | 863 | /** |
@@ -877,8 +877,8 @@ discard block |
||
| 877 | 877 | * where keys are always subsection names and values are either |
| 878 | 878 | * the input's normalized value, or an array like the top-level array |
| 879 | 879 | */ |
| 880 | - public function input_pretty_values( $include_subform_inputs = false, $flatten = false ){ |
|
| 881 | - return $this->_input_values( true, $include_subform_inputs, $flatten ); |
|
| 880 | + public function input_pretty_values($include_subform_inputs = false, $flatten = false) { |
|
| 881 | + return $this->_input_values(true, $include_subform_inputs, $flatten); |
|
| 882 | 882 | } |
| 883 | 883 | |
| 884 | 884 | /** |
@@ -896,19 +896,19 @@ discard block |
||
| 896 | 896 | * where keys are always subsection names and values are either |
| 897 | 897 | * the input's normalized value, or an array like the top-level array |
| 898 | 898 | */ |
| 899 | - public function _input_values( $pretty = false, $include_subform_inputs = false, $flatten = false ) { |
|
| 899 | + public function _input_values($pretty = false, $include_subform_inputs = false, $flatten = false) { |
|
| 900 | 900 | $input_values = array(); |
| 901 | - foreach( $this->subsections() as $subsection_name => $subsection ) { |
|
| 902 | - if( $subsection instanceof EE_Form_Input_Base ) { |
|
| 903 | - $input_values[ $subsection_name ] = $pretty |
|
| 901 | + foreach ($this->subsections() as $subsection_name => $subsection) { |
|
| 902 | + if ($subsection instanceof EE_Form_Input_Base) { |
|
| 903 | + $input_values[$subsection_name] = $pretty |
|
| 904 | 904 | ? $subsection->pretty_value() |
| 905 | 905 | : $subsection->normalized_value(); |
| 906 | - } else if( $subsection instanceof EE_Form_Section_Proper && $include_subform_inputs ) { |
|
| 907 | - $subform_input_values = $subsection->_input_values( $pretty, $include_subform_inputs, $flatten ); |
|
| 908 | - if( $flatten ) { |
|
| 909 | - $input_values = array_merge( $input_values, $subform_input_values ); |
|
| 906 | + } else if ($subsection instanceof EE_Form_Section_Proper && $include_subform_inputs) { |
|
| 907 | + $subform_input_values = $subsection->_input_values($pretty, $include_subform_inputs, $flatten); |
|
| 908 | + if ($flatten) { |
|
| 909 | + $input_values = array_merge($input_values, $subform_input_values); |
|
| 910 | 910 | } else { |
| 911 | - $input_values[ $subsection_name ] = $subform_input_values; |
|
| 911 | + $input_values[$subsection_name] = $subform_input_values; |
|
| 912 | 912 | } |
| 913 | 913 | } |
| 914 | 914 | } |
@@ -929,23 +929,23 @@ discard block |
||
| 929 | 929 | * where keys are always subsection names and values are either |
| 930 | 930 | * the input's normalized value, or an array like the top-level array |
| 931 | 931 | */ |
| 932 | - public function submitted_values( $include_subforms = false ) { |
|
| 932 | + public function submitted_values($include_subforms = false) { |
|
| 933 | 933 | $submitted_values = array(); |
| 934 | - foreach( $this->subsections() as $subsection ) { |
|
| 935 | - if( $subsection instanceof EE_Form_Input_Base ) { |
|
| 934 | + foreach ($this->subsections() as $subsection) { |
|
| 935 | + if ($subsection instanceof EE_Form_Input_Base) { |
|
| 936 | 936 | // is this input part of an array of inputs? |
| 937 | - if ( strpos( $subsection->html_name(), '[' ) !== false ) { |
|
| 937 | + if (strpos($subsection->html_name(), '[') !== false) { |
|
| 938 | 938 | $full_input_name = \EEH_Array::convert_array_values_to_keys( |
| 939 | - explode( '[', str_replace( ']', '', $subsection->html_name() ) ), |
|
| 939 | + explode('[', str_replace(']', '', $subsection->html_name())), |
|
| 940 | 940 | $subsection->raw_value() |
| 941 | 941 | ); |
| 942 | - $submitted_values = array_replace_recursive( $submitted_values, $full_input_name ); |
|
| 942 | + $submitted_values = array_replace_recursive($submitted_values, $full_input_name); |
|
| 943 | 943 | } else { |
| 944 | - $submitted_values[ $subsection->html_name() ] = $subsection->raw_value(); |
|
| 944 | + $submitted_values[$subsection->html_name()] = $subsection->raw_value(); |
|
| 945 | 945 | } |
| 946 | - } else if( $subsection instanceof EE_Form_Section_Proper && $include_subforms ) { |
|
| 947 | - $subform_input_values = $subsection->submitted_values( $include_subforms ); |
|
| 948 | - $submitted_values = array_replace_recursive( $submitted_values, $subform_input_values ); |
|
| 946 | + } else if ($subsection instanceof EE_Form_Section_Proper && $include_subforms) { |
|
| 947 | + $subform_input_values = $subsection->submitted_values($include_subforms); |
|
| 948 | + $submitted_values = array_replace_recursive($submitted_values, $subform_input_values); |
|
| 949 | 949 | } |
| 950 | 950 | } |
| 951 | 951 | return $submitted_values; |
@@ -960,7 +960,7 @@ discard block |
||
| 960 | 960 | * @return boolean |
| 961 | 961 | * @throws \EE_Error |
| 962 | 962 | */ |
| 963 | - public function has_received_submission(){ |
|
| 963 | + public function has_received_submission() { |
|
| 964 | 964 | $this->ensure_construct_finalized_called(); |
| 965 | 965 | return $this->_received_submission; |
| 966 | 966 | } |
@@ -973,8 +973,8 @@ discard block |
||
| 973 | 973 | * @param array $inputs_to_exclude values are the input names |
| 974 | 974 | * @return void |
| 975 | 975 | */ |
| 976 | - public function exclude($inputs_to_exclude = array()){ |
|
| 977 | - foreach($inputs_to_exclude as $input_to_exclude_name){ |
|
| 976 | + public function exclude($inputs_to_exclude = array()) { |
|
| 977 | + foreach ($inputs_to_exclude as $input_to_exclude_name) { |
|
| 978 | 978 | unset($this->_subsections[$input_to_exclude_name]); |
| 979 | 979 | } |
| 980 | 980 | } |
@@ -985,8 +985,8 @@ discard block |
||
| 985 | 985 | * @param array $inputs_to_hide |
| 986 | 986 | * @throws \EE_Error |
| 987 | 987 | */ |
| 988 | - public function hide($inputs_to_hide= array()){ |
|
| 989 | - foreach($inputs_to_hide as $input_to_hide){ |
|
| 988 | + public function hide($inputs_to_hide = array()) { |
|
| 989 | + foreach ($inputs_to_hide as $input_to_hide) { |
|
| 990 | 990 | $input = $this->get_input($input_to_hide); |
| 991 | 991 | |
| 992 | 992 | $input->set_display_strategy(new EE_Hidden_Display_Strategy()); |
@@ -1016,21 +1016,21 @@ discard block |
||
| 1016 | 1016 | * @return void |
| 1017 | 1017 | * @throws \EE_Error |
| 1018 | 1018 | */ |
| 1019 | - public function add_subsections( $new_subsections, $subsection_name_to_target = NULL, $add_before = true ){ |
|
| 1020 | - foreach( $new_subsections as $subsection_name => $subsection ){ |
|
| 1021 | - if( ! $subsection instanceof EE_Form_Section_Base ){ |
|
| 1019 | + public function add_subsections($new_subsections, $subsection_name_to_target = NULL, $add_before = true) { |
|
| 1020 | + foreach ($new_subsections as $subsection_name => $subsection) { |
|
| 1021 | + if ( ! $subsection instanceof EE_Form_Section_Base) { |
|
| 1022 | 1022 | EE_Error::add_error( |
| 1023 | 1023 | sprintf( |
| 1024 | 1024 | __( |
| 1025 | 1025 | "Trying to add a %s as a subsection (it was named '%s') to the form section '%s'. It was removed.", |
| 1026 | 1026 | "event_espresso" |
| 1027 | 1027 | ), |
| 1028 | - get_class( $subsection ), |
|
| 1028 | + get_class($subsection), |
|
| 1029 | 1029 | $subsection_name, |
| 1030 | 1030 | $this->name() |
| 1031 | 1031 | ) |
| 1032 | 1032 | ); |
| 1033 | - unset( $new_subsections[ $subsection_name ] ); |
|
| 1033 | + unset($new_subsections[$subsection_name]); |
|
| 1034 | 1034 | } |
| 1035 | 1035 | } |
| 1036 | 1036 | $this->_subsections = EEH_Array::insert_into_array( |
@@ -1041,8 +1041,8 @@ discard block |
||
| 1041 | 1041 | ); |
| 1042 | 1042 | |
| 1043 | 1043 | |
| 1044 | - if( $this->_construction_finalized ){ |
|
| 1045 | - foreach($this->_subsections as $name => $subsection){ |
|
| 1044 | + if ($this->_construction_finalized) { |
|
| 1045 | + foreach ($this->_subsections as $name => $subsection) { |
|
| 1046 | 1046 | $subsection->_construct_finalize($this, $name); |
| 1047 | 1047 | } |
| 1048 | 1048 | } |
@@ -1053,8 +1053,8 @@ discard block |
||
| 1053 | 1053 | /** |
| 1054 | 1054 | * Just gets all validatable subsections to clean their sensitive data |
| 1055 | 1055 | */ |
| 1056 | - public function clean_sensitive_data(){ |
|
| 1057 | - foreach($this->get_validatable_subsections() as $subsection){ |
|
| 1056 | + public function clean_sensitive_data() { |
|
| 1057 | + foreach ($this->get_validatable_subsections() as $subsection) { |
|
| 1058 | 1058 | $subsection->clean_sensitive_data(); |
| 1059 | 1059 | } |
| 1060 | 1060 | } |
@@ -1064,10 +1064,10 @@ discard block |
||
| 1064 | 1064 | /** |
| 1065 | 1065 | * @param string $form_submission_error_message |
| 1066 | 1066 | */ |
| 1067 | - public function set_submission_error_message( $form_submission_error_message = '' ) { |
|
| 1068 | - $this->_form_submission_error_message .= ! empty( $form_submission_error_message ) |
|
| 1067 | + public function set_submission_error_message($form_submission_error_message = '') { |
|
| 1068 | + $this->_form_submission_error_message .= ! empty($form_submission_error_message) |
|
| 1069 | 1069 | ? $form_submission_error_message |
| 1070 | - : __( 'Form submission failed due to errors', 'event_espresso' ); |
|
| 1070 | + : __('Form submission failed due to errors', 'event_espresso'); |
|
| 1071 | 1071 | } |
| 1072 | 1072 | |
| 1073 | 1073 | |
@@ -1084,10 +1084,10 @@ discard block |
||
| 1084 | 1084 | /** |
| 1085 | 1085 | * @param string $form_submission_success_message |
| 1086 | 1086 | */ |
| 1087 | - public function set_submission_success_message( $form_submission_success_message ) { |
|
| 1088 | - $this->_form_submission_success_message .= ! empty( $form_submission_success_message ) |
|
| 1087 | + public function set_submission_success_message($form_submission_success_message) { |
|
| 1088 | + $this->_form_submission_success_message .= ! empty($form_submission_success_message) |
|
| 1089 | 1089 | ? $form_submission_success_message |
| 1090 | - : __( 'Form submitted successfully', 'event_espresso' ); |
|
| 1090 | + : __('Form submitted successfully', 'event_espresso'); |
|
| 1091 | 1091 | } |
| 1092 | 1092 | |
| 1093 | 1093 | |
@@ -1110,10 +1110,10 @@ discard block |
||
| 1110 | 1110 | * @return string |
| 1111 | 1111 | * @throws \EE_Error |
| 1112 | 1112 | */ |
| 1113 | - public function html_name_prefix(){ |
|
| 1114 | - if( $this->parent_section() instanceof EE_Form_Section_Proper ){ |
|
| 1115 | - return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']'; |
|
| 1116 | - }else{ |
|
| 1113 | + public function html_name_prefix() { |
|
| 1114 | + if ($this->parent_section() instanceof EE_Form_Section_Proper) { |
|
| 1115 | + return $this->parent_section()->html_name_prefix().'['.$this->name().']'; |
|
| 1116 | + } else { |
|
| 1117 | 1117 | return $this->name(); |
| 1118 | 1118 | } |
| 1119 | 1119 | } |
@@ -1128,7 +1128,7 @@ discard block |
||
| 1128 | 1128 | * @return string |
| 1129 | 1129 | * @throws \EE_Error |
| 1130 | 1130 | */ |
| 1131 | - public function name(){ |
|
| 1131 | + public function name() { |
|
| 1132 | 1132 | $this->ensure_construct_finalized_called(); |
| 1133 | 1133 | return parent::name(); |
| 1134 | 1134 | } |
@@ -1139,7 +1139,7 @@ discard block |
||
| 1139 | 1139 | * @return EE_Form_Section_Proper |
| 1140 | 1140 | * @throws \EE_Error |
| 1141 | 1141 | */ |
| 1142 | - public function parent_section(){ |
|
| 1142 | + public function parent_section() { |
|
| 1143 | 1143 | $this->ensure_construct_finalized_called(); |
| 1144 | 1144 | return parent::parent_section(); |
| 1145 | 1145 | } |
@@ -1152,9 +1152,9 @@ discard block |
||
| 1152 | 1152 | * @return void |
| 1153 | 1153 | * @throws \EE_Error |
| 1154 | 1154 | */ |
| 1155 | - public function ensure_construct_finalized_called(){ |
|
| 1156 | - if( ! $this->_construction_finalized ){ |
|
| 1157 | - $this->_construct_finalize($this->_parent_section, $this->_name ); |
|
| 1155 | + public function ensure_construct_finalized_called() { |
|
| 1156 | + if ( ! $this->_construction_finalized) { |
|
| 1157 | + $this->_construct_finalize($this->_parent_section, $this->_name); |
|
| 1158 | 1158 | } |
| 1159 | 1159 | } |
| 1160 | 1160 | |
@@ -1166,17 +1166,17 @@ discard block |
||
| 1166 | 1166 | * @param array $req_data |
| 1167 | 1167 | * @return boolean |
| 1168 | 1168 | */ |
| 1169 | - public function form_data_present_in( $req_data = NULL ) { |
|
| 1170 | - if( $req_data === NULL){ |
|
| 1169 | + public function form_data_present_in($req_data = NULL) { |
|
| 1170 | + if ($req_data === NULL) { |
|
| 1171 | 1171 | $req_data = $_POST; |
| 1172 | 1172 | } |
| 1173 | - foreach( $this->subsections() as $subsection ) { |
|
| 1174 | - if($subsection instanceof EE_Form_Input_Base ) { |
|
| 1175 | - if( $subsection->form_data_present_in( $req_data ) ) { |
|
| 1173 | + foreach ($this->subsections() as $subsection) { |
|
| 1174 | + if ($subsection instanceof EE_Form_Input_Base) { |
|
| 1175 | + if ($subsection->form_data_present_in($req_data)) { |
|
| 1176 | 1176 | return TRUE; |
| 1177 | 1177 | } |
| 1178 | - }elseif( $subsection instanceof EE_Form_Section_Proper ) { |
|
| 1179 | - if( $subsection->form_data_present_in( $req_data ) ) { |
|
| 1178 | + }elseif ($subsection instanceof EE_Form_Section_Proper) { |
|
| 1179 | + if ($subsection->form_data_present_in($req_data)) { |
|
| 1180 | 1180 | return TRUE; |
| 1181 | 1181 | } |
| 1182 | 1182 | } |
@@ -1193,14 +1193,14 @@ discard block |
||
| 1193 | 1193 | */ |
| 1194 | 1194 | public function get_validation_errors_accumulated() { |
| 1195 | 1195 | $validation_errors = $this->get_validation_errors(); |
| 1196 | - foreach($this->get_validatable_subsections() as $subsection ) { |
|
| 1197 | - if( $subsection instanceof EE_Form_Section_Proper ) { |
|
| 1196 | + foreach ($this->get_validatable_subsections() as $subsection) { |
|
| 1197 | + if ($subsection instanceof EE_Form_Section_Proper) { |
|
| 1198 | 1198 | $validation_errors_on_this_subsection = $subsection->get_validation_errors_accumulated(); |
| 1199 | 1199 | } else { |
| 1200 | - $validation_errors_on_this_subsection = $subsection->get_validation_errors(); |
|
| 1200 | + $validation_errors_on_this_subsection = $subsection->get_validation_errors(); |
|
| 1201 | 1201 | } |
| 1202 | - if( $validation_errors_on_this_subsection ){ |
|
| 1203 | - $validation_errors = array_merge( $validation_errors, $validation_errors_on_this_subsection ); |
|
| 1202 | + if ($validation_errors_on_this_subsection) { |
|
| 1203 | + $validation_errors = array_merge($validation_errors, $validation_errors_on_this_subsection); |
|
| 1204 | 1204 | } |
| 1205 | 1205 | } |
| 1206 | 1206 | return $validation_errors; |
@@ -1222,24 +1222,24 @@ discard block |
||
| 1222 | 1222 | * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false |
| 1223 | 1223 | * @return EE_Form_Section_Base |
| 1224 | 1224 | */ |
| 1225 | - public function find_section_from_path( $form_section_path ) { |
|
| 1225 | + public function find_section_from_path($form_section_path) { |
|
| 1226 | 1226 | //check if we can find the input from purely going straight up the tree |
| 1227 | - $input = parent::find_section_from_path( $form_section_path ); |
|
| 1228 | - if( $input instanceof EE_Form_Section_Base ) { |
|
| 1227 | + $input = parent::find_section_from_path($form_section_path); |
|
| 1228 | + if ($input instanceof EE_Form_Section_Base) { |
|
| 1229 | 1229 | return $input; |
| 1230 | 1230 | } |
| 1231 | 1231 | |
| 1232 | - $next_slash_pos = strpos( $form_section_path, '/' ); |
|
| 1233 | - if( $next_slash_pos !== false ) { |
|
| 1234 | - $child_section_name = substr( $form_section_path, 0, $next_slash_pos ); |
|
| 1235 | - $subpath = substr( $form_section_path, $next_slash_pos + 1 ); |
|
| 1232 | + $next_slash_pos = strpos($form_section_path, '/'); |
|
| 1233 | + if ($next_slash_pos !== false) { |
|
| 1234 | + $child_section_name = substr($form_section_path, 0, $next_slash_pos); |
|
| 1235 | + $subpath = substr($form_section_path, $next_slash_pos + 1); |
|
| 1236 | 1236 | } else { |
| 1237 | 1237 | $child_section_name = $form_section_path; |
| 1238 | 1238 | $subpath = ''; |
| 1239 | 1239 | } |
| 1240 | - $child_section = $this->get_subsection( $child_section_name ); |
|
| 1241 | - if ( $child_section instanceof EE_Form_Section_Base ) { |
|
| 1242 | - return $child_section->find_section_from_path( $subpath ); |
|
| 1240 | + $child_section = $this->get_subsection($child_section_name); |
|
| 1241 | + if ($child_section instanceof EE_Form_Section_Base) { |
|
| 1242 | + return $child_section->find_section_from_path($subpath); |
|
| 1243 | 1243 | } else { |
| 1244 | 1244 | return null; |
| 1245 | 1245 | } |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | /** |
| 28 | 28 | * Applies all teh individual item validation strategies on each item in the array |
| 29 | 29 | * @param array $normalized_value |
| 30 | - * @return boolean |
|
| 30 | + * @return boolean|null |
|
| 31 | 31 | */ |
| 32 | 32 | function validate($normalized_value) { |
| 33 | 33 | if( is_array($normalized_value)){ |
@@ -112,7 +112,7 @@ |
||
| 112 | 112 | if ( |
| 113 | 113 | ! ( |
| 114 | 114 | $this->checkout->payment_method instanceof EE_Payment_Method |
| 115 | - && $this->checkout->payment_method->is_off_site() |
|
| 115 | + && $this->checkout->payment_method->is_off_site() |
|
| 116 | 116 | ) |
| 117 | 117 | ) { |
| 118 | 118 | // mark this reg step as completed |
@@ -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 | |
@@ -22,9 +22,9 @@ discard block |
||
| 22 | 22 | * @param EE_Checkout $checkout |
| 23 | 23 | * @return \EE_SPCO_Reg_Step_Finalize_Registration |
| 24 | 24 | */ |
| 25 | - public function __construct( EE_Checkout $checkout ) { |
|
| 25 | + public function __construct(EE_Checkout $checkout) { |
|
| 26 | 26 | $this->_slug = 'finalize_registration'; |
| 27 | - $this->_name = __( 'Finalize Registration', 'event_espresso' ); |
|
| 27 | + $this->_name = __('Finalize Registration', 'event_espresso'); |
|
| 28 | 28 | $this->_submit_button_text = $this->_name; |
| 29 | 29 | $this->_template = ''; |
| 30 | 30 | $this->checkout = $checkout; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function initialize_reg_step() { |
| 49 | 49 | // there's actually no reg form to process if this is the final step |
| 50 | - if ( $this->is_current_step() ) { |
|
| 50 | + if ($this->is_current_step()) { |
|
| 51 | 51 | $this->checkout->step = $_REQUEST['step'] = $this->slug(); |
| 52 | 52 | $this->checkout->action = $_REQUEST['action'] = 'process_reg_step'; |
| 53 | 53 | $this->checkout->generate_reg_form = false; |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | public function process_reg_step() { |
| 75 | 75 | // ensure all data gets refreshed from the db |
| 76 | - $this->checkout->refresh_all_entities( true ); |
|
| 76 | + $this->checkout->refresh_all_entities(true); |
|
| 77 | 77 | // ensures that all details and statuses for transaction, registration, and payments are updated |
| 78 | 78 | $txn_update_params = $this->_finalize_transaction(); |
| 79 | 79 | // DEBUG LOG |
@@ -102,13 +102,13 @@ discard block |
||
| 102 | 102 | $txn_update_params |
| 103 | 103 | ); |
| 104 | 104 | // check if transaction has a primary registrant and that it has a related Attendee object |
| 105 | - if ( ! $this->_validate_primary_registrant() ) { |
|
| 105 | + if ( ! $this->_validate_primary_registrant()) { |
|
| 106 | 106 | return false; |
| 107 | 107 | } |
| 108 | 108 | // you don't have to go home but you can't stay here ! |
| 109 | 109 | $this->checkout->redirect = true; |
| 110 | 110 | $this->checkout->continue_reg = true; |
| 111 | - $this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url ); |
|
| 111 | + $this->checkout->json_response->set_redirect_url($this->checkout->redirect_url); |
|
| 112 | 112 | if ( |
| 113 | 113 | ! ( |
| 114 | 114 | $this->checkout->payment_method instanceof EE_Payment_Method |
@@ -133,26 +133,26 @@ discard block |
||
| 133 | 133 | */ |
| 134 | 134 | protected function _finalize_transaction() { |
| 135 | 135 | /** @type EE_Transaction_Processor $transaction_processor */ |
| 136 | - $transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' ); |
|
| 136 | + $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor'); |
|
| 137 | 137 | //set revisit flag in txn processor |
| 138 | - $transaction_processor->set_revisit( $this->checkout->revisit ); |
|
| 138 | + $transaction_processor->set_revisit($this->checkout->revisit); |
|
| 139 | 139 | // at this point we'll consider a TXN to not have been abandoned |
| 140 | - $transaction_processor->toggle_abandoned_transaction_status( $this->checkout->transaction ); |
|
| 141 | - if ( $this->checkout->cart instanceof EE_Cart ) { |
|
| 140 | + $transaction_processor->toggle_abandoned_transaction_status($this->checkout->transaction); |
|
| 141 | + if ($this->checkout->cart instanceof EE_Cart) { |
|
| 142 | 142 | // save TXN data to the cart |
| 143 | 143 | $this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn( |
| 144 | 144 | $this->checkout->transaction->ID() |
| 145 | 145 | ); |
| 146 | 146 | } |
| 147 | 147 | /** @type EE_Transaction_Payments $transaction_payments */ |
| 148 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
| 148 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
| 149 | 149 | // maybe update status, but don't save transaction just yet |
| 150 | - $transaction_payments->update_transaction_status_based_on_total_paid( $this->checkout->transaction, false ); |
|
| 150 | + $transaction_payments->update_transaction_status_based_on_total_paid($this->checkout->transaction, false); |
|
| 151 | 151 | // maybe send messages |
| 152 | 152 | $this->_trigger_notifications(); |
| 153 | 153 | // this will result in the base session properties getting saved to the TXN_Session_data field |
| 154 | 154 | $this->checkout->transaction->set_txn_session_data( |
| 155 | - EE_Registry::instance()->SSN->get_session_data( null, true ) |
|
| 155 | + EE_Registry::instance()->SSN->get_session_data(null, true) |
|
| 156 | 156 | ); |
| 157 | 157 | // update the TXN if payment conditions have changed |
| 158 | 158 | return $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( |
@@ -174,10 +174,10 @@ discard block |
||
| 174 | 174 | * @throws \EE_Error |
| 175 | 175 | */ |
| 176 | 176 | protected function _trigger_notifications() { |
| 177 | - if ( $this->checkout->payment_method instanceof EE_Payment_Method ) { |
|
| 178 | - $is_revisit = filter_var( $this->checkout->revisit, FILTER_VALIDATE_BOOLEAN ); |
|
| 179 | - if ( $this->checkout->payment_method->is_off_site() ) { |
|
| 180 | - $gateway= $this->checkout->payment_method->type_obj()->get_gateway(); |
|
| 177 | + if ($this->checkout->payment_method instanceof EE_Payment_Method) { |
|
| 178 | + $is_revisit = filter_var($this->checkout->revisit, FILTER_VALIDATE_BOOLEAN); |
|
| 179 | + if ($this->checkout->payment_method->is_off_site()) { |
|
| 180 | + $gateway = $this->checkout->payment_method->type_obj()->get_gateway(); |
|
| 181 | 181 | if ( |
| 182 | 182 | ! $is_revisit |
| 183 | 183 | && $gateway instanceof EE_Offsite_Gateway |
@@ -187,10 +187,10 @@ discard block |
||
| 187 | 187 | ) |
| 188 | 188 | ) { |
| 189 | 189 | // first time through SPCO and we are processing the payment notification NOW |
| 190 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 ); |
|
| 190 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10); |
|
| 191 | 191 | } else { |
| 192 | 192 | // do NOT trigger notifications because this is a revisit, OR it was already done during the IPN |
| 193 | - remove_all_filters( 'FHEE__EED_Messages___maybe_registration__deliver_notifications' ); |
|
| 193 | + remove_all_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications'); |
|
| 194 | 194 | add_filter( |
| 195 | 195 | 'FHEE__EED_Messages___maybe_registration__deliver_notifications', |
| 196 | 196 | '__return_false', |
@@ -199,12 +199,12 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | } else if ( |
| 201 | 201 | // if SPCO revisit and TXN status has changed due to a payment |
| 202 | - $is_revisit && ( $this->checkout->txn_status_updated || $this->checkout->any_reg_status_updated() ) |
|
| 202 | + $is_revisit && ($this->checkout->txn_status_updated || $this->checkout->any_reg_status_updated()) |
|
| 203 | 203 | ) { |
| 204 | 204 | // send out notifications |
| 205 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 ); |
|
| 206 | - } else if ( ! $is_revisit ) { |
|
| 207 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 ); |
|
| 205 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10); |
|
| 206 | + } else if ( ! $is_revisit) { |
|
| 207 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10); |
|
| 208 | 208 | } |
| 209 | 209 | } |
| 210 | 210 | } |
@@ -218,9 +218,9 @@ discard block |
||
| 218 | 218 | * @throws \EE_Error |
| 219 | 219 | */ |
| 220 | 220 | protected function _validate_primary_registrant() { |
| 221 | - if ( ! $this->checkout->transaction_has_primary_registrant() ) { |
|
| 221 | + if ( ! $this->checkout->transaction_has_primary_registrant()) { |
|
| 222 | 222 | EE_Error::add_error( |
| 223 | - __( 'A valid Primary Registration for this Transaction could not be found.', 'event_espresso' ), |
|
| 223 | + __('A valid Primary Registration for this Transaction could not be found.', 'event_espresso'), |
|
| 224 | 224 | __FILE__, |
| 225 | 225 | __FUNCTION__, |
| 226 | 226 | __LINE__ |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | } |
| 232 | 232 | // setup URL for redirect |
| 233 | 233 | $this->checkout->redirect_url = add_query_arg( |
| 234 | - array( 'e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link() ), |
|
| 234 | + array('e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link()), |
|
| 235 | 235 | $this->checkout->thank_you_page_url |
| 236 | 236 | ); |
| 237 | 237 | return true; |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | public function update_reg_step() { |
| 246 | 246 | EE_Error::doing_it_wrong( |
| 247 | - __CLASS__ . '::' . __FILE__, |
|
| 247 | + __CLASS__.'::'.__FILE__, |
|
| 248 | 248 | __( |
| 249 | 249 | 'Can not call update_reg_step() on the Finalize Registration reg step.', |
| 250 | 250 | 'event_espresso' |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | protected function _get_billing_values_from_form( $billing_form ){ |
| 443 | 443 | if($billing_form instanceof EE_Form_Section_Proper ){ |
| 444 | 444 | return $billing_form->input_pretty_values( true ); |
| 445 | - }else{ |
|
| 445 | + } else{ |
|
| 446 | 446 | return NULL; |
| 447 | 447 | } |
| 448 | 448 | } |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | public function supports_sending_refunds(){ |
| 551 | 551 | if($this->_gateway && $this->_gateway instanceof EE_Gateway){ |
| 552 | 552 | return $this->_gateway->supports_sending_refunds(); |
| 553 | - }else{ |
|
| 553 | + } else{ |
|
| 554 | 554 | return false; |
| 555 | 555 | } |
| 556 | 556 | } |
@@ -588,11 +588,11 @@ discard block |
||
| 588 | 588 | public function payment_occurs(){ |
| 589 | 589 | if( ! $this->_gateway){ |
| 590 | 590 | return EE_PMT_Base::offline; |
| 591 | - }elseif($this->_gateway instanceof EE_Onsite_Gateway){ |
|
| 591 | + } elseif($this->_gateway instanceof EE_Onsite_Gateway){ |
|
| 592 | 592 | return EE_PMT_Base::onsite; |
| 593 | - }elseif($this->_gateway instanceof EE_Offsite_Gateway){ |
|
| 593 | + } elseif($this->_gateway instanceof EE_Offsite_Gateway){ |
|
| 594 | 594 | return EE_PMT_Base::offsite; |
| 595 | - }else{ |
|
| 595 | + } else{ |
|
| 596 | 596 | throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"),get_class($this))); |
| 597 | 597 | } |
| 598 | 598 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | * @since $VID:$ |
| 15 | 15 | * |
| 16 | 16 | */ |
| 17 | -abstract class EE_PMT_Base{ |
|
| 17 | +abstract class EE_PMT_Base { |
|
| 18 | 18 | |
| 19 | 19 | const onsite = 'on-site'; |
| 20 | 20 | const offsite = 'off-site'; |
@@ -95,31 +95,31 @@ discard block |
||
| 95 | 95 | * @return EE_PMT_Base |
| 96 | 96 | */ |
| 97 | 97 | function __construct($pm_instance = NULL) { |
| 98 | - if ( $pm_instance instanceof EE_Payment_Method ){ |
|
| 98 | + if ($pm_instance instanceof EE_Payment_Method) { |
|
| 99 | 99 | $this->set_instance($pm_instance); |
| 100 | 100 | } |
| 101 | - if($this->_gateway){ |
|
| 102 | - $this->_gateway->set_payment_model( EEM_Payment::instance() ); |
|
| 103 | - $this->_gateway->set_payment_log( EEM_Change_Log::instance() ); |
|
| 104 | - $this->_gateway->set_template_helper( new EEH_Template() ); |
|
| 105 | - $this->_gateway->set_line_item_helper( new EEH_Line_Item() ); |
|
| 106 | - $this->_gateway->set_money_helper( new EEH_Money() ); |
|
| 101 | + if ($this->_gateway) { |
|
| 102 | + $this->_gateway->set_payment_model(EEM_Payment::instance()); |
|
| 103 | + $this->_gateway->set_payment_log(EEM_Change_Log::instance()); |
|
| 104 | + $this->_gateway->set_template_helper(new EEH_Template()); |
|
| 105 | + $this->_gateway->set_line_item_helper(new EEH_Line_Item()); |
|
| 106 | + $this->_gateway->set_money_helper(new EEH_Money()); |
|
| 107 | 107 | } |
| 108 | - if ( ! isset( $this->_has_billing_form ) ) { |
|
| 108 | + if ( ! isset($this->_has_billing_form)) { |
|
| 109 | 109 | // by default, On Site gateways have a billing form |
| 110 | - if ( $this->payment_occurs() == EE_PMT_Base::onsite ) { |
|
| 111 | - $this->set_has_billing_form( true ); |
|
| 110 | + if ($this->payment_occurs() == EE_PMT_Base::onsite) { |
|
| 111 | + $this->set_has_billing_form(true); |
|
| 112 | 112 | } else { |
| 113 | - $this->set_has_billing_form( false ); |
|
| 113 | + $this->set_has_billing_form(false); |
|
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - if( ! $this->_pretty_name){ |
|
| 117 | + if ( ! $this->_pretty_name) { |
|
| 118 | 118 | throw new EE_Error(sprintf(__("You must set the pretty name for the Payment Method Type in the constructor (_pretty_name), and please make it internationalized", "event_espresso"))); |
| 119 | 119 | } |
| 120 | 120 | //if the child didn't specify a default button, use the credit card one |
| 121 | - if( $this->_default_button_url === NULL){ |
|
| 122 | - $this->_default_button_url = EE_PLUGIN_DIR_URL . 'payment_methods' . DS . 'pay-by-credit-card.png'; |
|
| 121 | + if ($this->_default_button_url === NULL) { |
|
| 122 | + $this->_default_button_url = EE_PLUGIN_DIR_URL.'payment_methods'.DS.'pay-by-credit-card.png'; |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
@@ -128,8 +128,8 @@ discard block |
||
| 128 | 128 | /** |
| 129 | 129 | * @param boolean $has_billing_form |
| 130 | 130 | */ |
| 131 | - public function set_has_billing_form( $has_billing_form ) { |
|
| 132 | - $this->_has_billing_form = filter_var( $has_billing_form, FILTER_VALIDATE_BOOLEAN ); |
|
| 131 | + public function set_has_billing_form($has_billing_form) { |
|
| 132 | + $this->_has_billing_form = filter_var($has_billing_form, FILTER_VALIDATE_BOOLEAN); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | |
@@ -137,10 +137,10 @@ discard block |
||
| 137 | 137 | /** |
| 138 | 138 | * sets the file_folder property |
| 139 | 139 | */ |
| 140 | - protected function _set_file_folder(){ |
|
| 140 | + protected function _set_file_folder() { |
|
| 141 | 141 | $reflector = new ReflectionClass(get_class($this)); |
| 142 | 142 | $fn = $reflector->getFileName(); |
| 143 | - $this->_file_folder = dirname($fn).DS; |
|
| 143 | + $this->_file_folder = dirname($fn).DS; |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | |
@@ -148,10 +148,10 @@ discard block |
||
| 148 | 148 | /** |
| 149 | 149 | * sets the file URL with a trailing slash for this PMT |
| 150 | 150 | */ |
| 151 | - protected function _set_file_url(){ |
|
| 152 | - $plugins_dir_fixed = str_replace('\\',DS,WP_PLUGIN_DIR); |
|
| 153 | - $file_folder_fixed = str_replace('\\',DS,$this->file_folder()); |
|
| 154 | - $file_path = str_replace($plugins_dir_fixed,WP_PLUGIN_URL,$file_folder_fixed); |
|
| 151 | + protected function _set_file_url() { |
|
| 152 | + $plugins_dir_fixed = str_replace('\\', DS, WP_PLUGIN_DIR); |
|
| 153 | + $file_folder_fixed = str_replace('\\', DS, $this->file_folder()); |
|
| 154 | + $file_path = str_replace($plugins_dir_fixed, WP_PLUGIN_URL, $file_folder_fixed); |
|
| 155 | 155 | $this->_file_url = $file_path; |
| 156 | 156 | } |
| 157 | 157 | |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | * Gets the default description on all payment methods of this type |
| 160 | 160 | * @return string |
| 161 | 161 | */ |
| 162 | - public function default_description(){ |
|
| 162 | + public function default_description() { |
|
| 163 | 163 | return $this->_default_description; |
| 164 | 164 | } |
| 165 | 165 | |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | * Returns the folder containing the PMT child class, with a trailing slash |
| 170 | 170 | * @return string |
| 171 | 171 | */ |
| 172 | - public function file_folder(){ |
|
| 173 | - if( ! $this->_file_folder ) { |
|
| 172 | + public function file_folder() { |
|
| 173 | + if ( ! $this->_file_folder) { |
|
| 174 | 174 | $this->_set_file_folder(); |
| 175 | 175 | } |
| 176 | 176 | return $this->_file_folder; |
@@ -181,8 +181,8 @@ discard block |
||
| 181 | 181 | /** |
| 182 | 182 | * @return string |
| 183 | 183 | */ |
| 184 | - public function file_url(){ |
|
| 185 | - if( ! $this->_file_url ) { |
|
| 184 | + public function file_url() { |
|
| 185 | + if ( ! $this->_file_url) { |
|
| 186 | 186 | $this->_set_file_url(); |
| 187 | 187 | } |
| 188 | 188 | return $this->_file_url; |
@@ -195,14 +195,14 @@ discard block |
||
| 195 | 195 | * Its important teh payment method instance is set before |
| 196 | 196 | * @param EE_Payment_Method $payment_method_instance |
| 197 | 197 | */ |
| 198 | - function set_instance($payment_method_instance){ |
|
| 198 | + function set_instance($payment_method_instance) { |
|
| 199 | 199 | $this->_pm_instance = $payment_method_instance; |
| 200 | 200 | //if they have already requested the settings form, make sure its |
| 201 | 201 | //data matches this model object |
| 202 | - if($this->_settings_form){ |
|
| 202 | + if ($this->_settings_form) { |
|
| 203 | 203 | $this->settings_form()->populate_model_obj($payment_method_instance); |
| 204 | 204 | } |
| 205 | - if($this->_gateway && $this->_gateway instanceof EE_Gateway){ |
|
| 205 | + if ($this->_gateway && $this->_gateway instanceof EE_Gateway) { |
|
| 206 | 206 | $this->_gateway->set_settings($payment_method_instance->settings_array()); |
| 207 | 207 | } |
| 208 | 208 | } |
@@ -213,14 +213,14 @@ discard block |
||
| 213 | 213 | * Gets teh form for displaying to admins where they setup the payment method |
| 214 | 214 | * @return EE_Payment_Method_Form |
| 215 | 215 | */ |
| 216 | - function settings_form(){ |
|
| 217 | - if( ! $this->_settings_form){ |
|
| 216 | + function settings_form() { |
|
| 217 | + if ( ! $this->_settings_form) { |
|
| 218 | 218 | $this->_settings_form = $this->generate_new_settings_form(); |
| 219 | - $this->_settings_form->set_payment_method_type( $this ); |
|
| 220 | - $this->_settings_form->_construct_finalize(NULL, NULL ); |
|
| 219 | + $this->_settings_form->set_payment_method_type($this); |
|
| 220 | + $this->_settings_form->_construct_finalize(NULL, NULL); |
|
| 221 | 221 | //if we have already assigned a model object to this pmt, make |
| 222 | 222 | //sure its reflected in teh form we just generated |
| 223 | - if($this->_pm_instance){ |
|
| 223 | + if ($this->_pm_instance) { |
|
| 224 | 224 | $this->_settings_form->populate_model_obj($this->_pm_instance); |
| 225 | 225 | } |
| 226 | 226 | } |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | * this payment method type's settings form later in the request |
| 247 | 247 | * @param EE_Payment_Method_Form $form |
| 248 | 248 | */ |
| 249 | - public function set_settings_form($form){ |
|
| 249 | + public function set_settings_form($form) { |
|
| 250 | 250 | $this->_settings_form = $form; |
| 251 | 251 | } |
| 252 | 252 | |
@@ -269,10 +269,10 @@ discard block |
||
| 269 | 269 | * @param array $extra_args |
| 270 | 270 | * @return \EE_Billing_Attendee_Info_Form|\EE_Billing_Info_Form|null |
| 271 | 271 | */ |
| 272 | - public function billing_form( EE_Transaction $transaction = NULL, $extra_args = array() ){ |
|
| 272 | + public function billing_form(EE_Transaction $transaction = NULL, $extra_args = array()) { |
|
| 273 | 273 | // has billing form already been regenerated ? or overwrite cache? |
| 274 | - if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form ){ |
|
| 275 | - $this->_billing_form = $this->generate_new_billing_form( $transaction, $extra_args ); |
|
| 274 | + if ( ! $this->_billing_form instanceof EE_Billing_Info_Form || ! $this->_cache_billing_form) { |
|
| 275 | + $this->_billing_form = $this->generate_new_billing_form($transaction, $extra_args); |
|
| 276 | 276 | } |
| 277 | 277 | //if we know who the attendee is, and this is a billing form |
| 278 | 278 | //that uses attendee info, populate it |
@@ -281,8 +281,8 @@ discard block |
||
| 281 | 281 | $transaction instanceof EE_Transaction && |
| 282 | 282 | $transaction->primary_registration() instanceof EE_Registration && |
| 283 | 283 | $transaction->primary_registration()->attendee() instanceof EE_Attendee |
| 284 | - ){ |
|
| 285 | - $this->_billing_form->populate_from_attendee( $transaction->primary_registration()->attendee() ); |
|
| 284 | + ) { |
|
| 285 | + $this->_billing_form->populate_from_attendee($transaction->primary_registration()->attendee()); |
|
| 286 | 286 | } |
| 287 | 287 | return $this->_billing_form; |
| 288 | 288 | } |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | * @param \EE_Transaction $transaction |
| 294 | 294 | * @return \EE_Billing_Info_Form |
| 295 | 295 | */ |
| 296 | - abstract function generate_new_billing_form( EE_Transaction $transaction = NULL ); |
|
| 296 | + abstract function generate_new_billing_form(EE_Transaction $transaction = NULL); |
|
| 297 | 297 | |
| 298 | 298 | |
| 299 | 299 | |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | * @param \EE_Billing_Info_Form $billing_form |
| 305 | 305 | * @return \EE_Billing_Info_Form |
| 306 | 306 | */ |
| 307 | - public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) { |
|
| 307 | + public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) { |
|
| 308 | 308 | return $billing_form; |
| 309 | 309 | } |
| 310 | 310 | |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | * if you have form |
| 316 | 316 | * @param EE_Payment_Method $form |
| 317 | 317 | */ |
| 318 | - public function set_billing_form($form){ |
|
| 318 | + public function set_billing_form($form) { |
|
| 319 | 319 | $this->_billing_form = $form; |
| 320 | 320 | } |
| 321 | 321 | |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | * Returns whether or not this payment method requires HTTPS to be used |
| 326 | 326 | * @return boolean |
| 327 | 327 | */ |
| 328 | - function requires_https(){ |
|
| 328 | + function requires_https() { |
|
| 329 | 329 | return $this->_requires_https; |
| 330 | 330 | } |
| 331 | 331 | |
@@ -343,9 +343,9 @@ discard block |
||
| 343 | 343 | * @return EE_Payment |
| 344 | 344 | * @throws EE_Error |
| 345 | 345 | */ |
| 346 | - function process_payment( EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null,$fail_url = '', $method = 'CART', $by_admin = false ){ |
|
| 346 | + function process_payment(EE_Transaction $transaction, $amount = null, $billing_info = null, $return_url = null, $fail_url = '', $method = 'CART', $by_admin = false) { |
|
| 347 | 347 | // @todo: add surcharge for the payment method, if any |
| 348 | - if ( $this->_gateway ) { |
|
| 348 | + if ($this->_gateway) { |
|
| 349 | 349 | //there is a gateway, so we're going to make a payment object |
| 350 | 350 | //but wait! do they already have a payment in progress that we thought was failed? |
| 351 | 351 | $duplicate_properties = array( |
@@ -356,10 +356,10 @@ discard block |
||
| 356 | 356 | 'PAY_amount' => $amount !== null ? $amount : $transaction->remaining(), |
| 357 | 357 | 'PAY_gateway_response' => null, |
| 358 | 358 | ); |
| 359 | - $payment = EEM_Payment::instance()->get_one( array( $duplicate_properties )); |
|
| 359 | + $payment = EEM_Payment::instance()->get_one(array($duplicate_properties)); |
|
| 360 | 360 | //if we didn't already have a payment in progress for the same thing, |
| 361 | 361 | //then we actually want to make a new payment |
| 362 | - if ( ! $payment instanceof EE_Payment ){ |
|
| 362 | + if ( ! $payment instanceof EE_Payment) { |
|
| 363 | 363 | $payment = EE_Payment::new_instance( |
| 364 | 364 | array_merge( |
| 365 | 365 | $duplicate_properties, |
@@ -375,10 +375,10 @@ discard block |
||
| 375 | 375 | } |
| 376 | 376 | //make sure the payment has been saved to show we started it, and so it has an ID should the gateway try to log it |
| 377 | 377 | $payment->save(); |
| 378 | - $billing_values = $this->_get_billing_values_from_form( $billing_info ); |
|
| 378 | + $billing_values = $this->_get_billing_values_from_form($billing_info); |
|
| 379 | 379 | |
| 380 | 380 | // Offsite Gateway |
| 381 | - if( $this->_gateway instanceof EE_Offsite_Gateway ){ |
|
| 381 | + if ($this->_gateway instanceof EE_Offsite_Gateway) { |
|
| 382 | 382 | |
| 383 | 383 | $payment = $this->_gateway->set_redirection_info( |
| 384 | 384 | $payment, |
@@ -394,17 +394,17 @@ discard block |
||
| 394 | 394 | ); |
| 395 | 395 | $payment->save(); |
| 396 | 396 | // Onsite Gateway |
| 397 | - } elseif ( $this->_gateway instanceof EE_Onsite_Gateway ) { |
|
| 397 | + } elseif ($this->_gateway instanceof EE_Onsite_Gateway) { |
|
| 398 | 398 | |
| 399 | - $payment = $this->_gateway->do_direct_payment($payment,$billing_values); |
|
| 399 | + $payment = $this->_gateway->do_direct_payment($payment, $billing_values); |
|
| 400 | 400 | $payment->save(); |
| 401 | 401 | |
| 402 | 402 | } else { |
| 403 | 403 | throw new EE_Error( |
| 404 | 404 | sprintf( |
| 405 | - __('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso' ), |
|
| 405 | + __('Gateway for payment method type "%s" is "%s", not a subclass of either EE_Offsite_Gateway or EE_Onsite_Gateway, or null (to indicate NO gateway)', 'event_espresso'), |
|
| 406 | 406 | get_class($this), |
| 407 | - gettype( $this->_gateway ) |
|
| 407 | + gettype($this->_gateway) |
|
| 408 | 408 | ) |
| 409 | 409 | ); |
| 410 | 410 | } |
@@ -426,8 +426,8 @@ discard block |
||
| 426 | 426 | } |
| 427 | 427 | |
| 428 | 428 | // if there is billing info, clean it and save it now |
| 429 | - if( $billing_info instanceof EE_Billing_Attendee_Info_Form ){ |
|
| 430 | - $this->_save_billing_info_to_attendee( $billing_info, $transaction ); |
|
| 429 | + if ($billing_info instanceof EE_Billing_Attendee_Info_Form) { |
|
| 430 | + $this->_save_billing_info_to_attendee($billing_info, $transaction); |
|
| 431 | 431 | } |
| 432 | 432 | |
| 433 | 433 | return $payment; |
@@ -440,10 +440,10 @@ discard block |
||
| 440 | 440 | * @param EE_Billing_Info_Form $billing_form |
| 441 | 441 | * @return array |
| 442 | 442 | */ |
| 443 | - protected function _get_billing_values_from_form( $billing_form ){ |
|
| 444 | - if($billing_form instanceof EE_Form_Section_Proper ){ |
|
| 445 | - return $billing_form->input_pretty_values( true ); |
|
| 446 | - }else{ |
|
| 443 | + protected function _get_billing_values_from_form($billing_form) { |
|
| 444 | + if ($billing_form instanceof EE_Form_Section_Proper) { |
|
| 445 | + return $billing_form->input_pretty_values(true); |
|
| 446 | + } else { |
|
| 447 | 447 | return NULL; |
| 448 | 448 | } |
| 449 | 449 | } |
@@ -457,13 +457,13 @@ discard block |
||
| 457 | 457 | * @return EE_Payment |
| 458 | 458 | * @throws EE_Error |
| 459 | 459 | */ |
| 460 | - public function handle_ipn($req_data,$transaction){ |
|
| 460 | + public function handle_ipn($req_data, $transaction) { |
|
| 461 | 461 | $transaction = EEM_Transaction::instance()->ensure_is_obj($transaction); |
| 462 | - if( ! $this->_gateway instanceof EE_Offsite_Gateway){ |
|
| 463 | - throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r( $this->_gateway, TRUE ))); |
|
| 462 | + if ( ! $this->_gateway instanceof EE_Offsite_Gateway) { |
|
| 463 | + throw new EE_Error(sprintf(__("Could not handle IPN because '%s' is not an offsite gateway", "event_espresso"), print_r($this->_gateway, TRUE))); |
|
| 464 | 464 | |
| 465 | 465 | } |
| 466 | - $payment = $this->_gateway->handle_payment_update( $req_data, $transaction ); |
|
| 466 | + $payment = $this->_gateway->handle_payment_update($req_data, $transaction); |
|
| 467 | 467 | return $payment; |
| 468 | 468 | } |
| 469 | 469 | |
@@ -476,22 +476,22 @@ discard block |
||
| 476 | 476 | * @param EE_Transaction $transaction |
| 477 | 477 | * @return boolean success |
| 478 | 478 | */ |
| 479 | - protected function _save_billing_info_to_attendee($billing_form, $transaction){ |
|
| 480 | - if( ! $transaction || ! $transaction instanceof EE_Transaction){ |
|
| 479 | + protected function _save_billing_info_to_attendee($billing_form, $transaction) { |
|
| 480 | + if ( ! $transaction || ! $transaction instanceof EE_Transaction) { |
|
| 481 | 481 | EE_Error::add_error(__("Cannot save billing info because no transaction was specified", "event_espresso"), __FILE__, __FUNCTION__, __LINE__); |
| 482 | 482 | return false; |
| 483 | 483 | } |
| 484 | 484 | $primary_reg = $transaction->primary_registration(); |
| 485 | - if( ! $primary_reg ){ |
|
| 485 | + if ( ! $primary_reg) { |
|
| 486 | 486 | EE_Error::add_error(__("Cannot save billing info because the transaction has no primary registration", "event_espresso"), __FILE__, __FUNCTION__, __LINE__); |
| 487 | 487 | return false; |
| 488 | 488 | } |
| 489 | 489 | $attendee = $primary_reg->attendee(); |
| 490 | - if( ! $attendee ){ |
|
| 490 | + if ( ! $attendee) { |
|
| 491 | 491 | EE_Error::add_error(__("Cannot save billing info because the transaction's primary registration has no attendee!", "event_espresso"), __FILE__, __FUNCTION__, __LINE__); |
| 492 | 492 | return false; |
| 493 | 493 | } |
| 494 | - return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method() ); |
|
| 494 | + return $attendee->save_and_clean_billing_info_for_payment_method($billing_form, $transaction->payment_method()); |
|
| 495 | 495 | |
| 496 | 496 | } |
| 497 | 497 | |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | * @param array $req_data |
| 505 | 505 | * @return EE_Payment |
| 506 | 506 | */ |
| 507 | - protected function find_payment_for_ipn( EE_Transaction $transaction, $req_data = array() ){ |
|
| 507 | + protected function find_payment_for_ipn(EE_Transaction $transaction, $req_data = array()) { |
|
| 508 | 508 | return $transaction->last_payment(); |
| 509 | 509 | } |
| 510 | 510 | |
@@ -521,8 +521,8 @@ discard block |
||
| 521 | 521 | * and identifies the IPN as being for this payment method (not just fo ra payment method of this type) |
| 522 | 522 | * @throws EE_Error |
| 523 | 523 | */ |
| 524 | - public function handle_unclaimed_ipn( $req_data = array() ){ |
|
| 525 | - throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this) )); |
|
| 524 | + public function handle_unclaimed_ipn($req_data = array()) { |
|
| 525 | + throw new EE_Error(sprintf(__("Payment Method '%s' cannot handle unclaimed IPNs", "event_espresso"), get_class($this))); |
|
| 526 | 526 | } |
| 527 | 527 | |
| 528 | 528 | |
@@ -538,7 +538,7 @@ discard block |
||
| 538 | 538 | * @param EE_Transaction $transaction |
| 539 | 539 | * @return EE_Payment |
| 540 | 540 | */ |
| 541 | - public function finalize_payment_for($transaction){ |
|
| 541 | + public function finalize_payment_for($transaction) { |
|
| 542 | 542 | return $transaction->last_payment(); |
| 543 | 543 | } |
| 544 | 544 | |
@@ -548,10 +548,10 @@ discard block |
||
| 548 | 548 | * Whether or not this payment method's gateway supports sending refund requests |
| 549 | 549 | * @return boolean |
| 550 | 550 | */ |
| 551 | - public function supports_sending_refunds(){ |
|
| 552 | - if($this->_gateway && $this->_gateway instanceof EE_Gateway){ |
|
| 551 | + public function supports_sending_refunds() { |
|
| 552 | + if ($this->_gateway && $this->_gateway instanceof EE_Gateway) { |
|
| 553 | 553 | return $this->_gateway->supports_sending_refunds(); |
| 554 | - }else{ |
|
| 554 | + } else { |
|
| 555 | 555 | return false; |
| 556 | 556 | } |
| 557 | 557 | } |
@@ -565,14 +565,14 @@ discard block |
||
| 565 | 565 | * @throws EE_Error |
| 566 | 566 | * @return EE_Payment |
| 567 | 567 | */ |
| 568 | - public function process_refund( EE_Payment $payment, $refund_info = array()){ |
|
| 569 | - if ( $this->_gateway && $this->_gateway instanceof EE_Gateway ) { |
|
| 570 | - return $this->_gateway->do_direct_refund( $payment, $refund_info ); |
|
| 568 | + public function process_refund(EE_Payment $payment, $refund_info = array()) { |
|
| 569 | + if ($this->_gateway && $this->_gateway instanceof EE_Gateway) { |
|
| 570 | + return $this->_gateway->do_direct_refund($payment, $refund_info); |
|
| 571 | 571 | } else { |
| 572 | 572 | throw new EE_Error( |
| 573 | 573 | sprintf( |
| 574 | - __( 'Payment Method Type "%s" does not support sending refund requests', 'event_espresso' ), |
|
| 575 | - get_class( $this ) |
|
| 574 | + __('Payment Method Type "%s" does not support sending refund requests', 'event_espresso'), |
|
| 575 | + get_class($this) |
|
| 576 | 576 | ) |
| 577 | 577 | ); |
| 578 | 578 | } |
@@ -586,15 +586,15 @@ discard block |
||
| 586 | 586 | * @return string |
| 587 | 587 | * @throws EE_Error |
| 588 | 588 | */ |
| 589 | - public function payment_occurs(){ |
|
| 590 | - if( ! $this->_gateway){ |
|
| 589 | + public function payment_occurs() { |
|
| 590 | + if ( ! $this->_gateway) { |
|
| 591 | 591 | return EE_PMT_Base::offline; |
| 592 | - }elseif($this->_gateway instanceof EE_Onsite_Gateway){ |
|
| 592 | + }elseif ($this->_gateway instanceof EE_Onsite_Gateway) { |
|
| 593 | 593 | return EE_PMT_Base::onsite; |
| 594 | - }elseif($this->_gateway instanceof EE_Offsite_Gateway){ |
|
| 594 | + }elseif ($this->_gateway instanceof EE_Offsite_Gateway) { |
|
| 595 | 595 | return EE_PMT_Base::offsite; |
| 596 | - }else{ |
|
| 597 | - throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"),get_class($this))); |
|
| 596 | + } else { |
|
| 597 | + throw new EE_Error(sprintf(__("Payment method type '%s's gateway isn't an instance of EE_Onsite_Gateway, EE_Offsite_Gateway, or null. It must be one of those", "event_espresso"), get_class($this))); |
|
| 598 | 598 | } |
| 599 | 599 | } |
| 600 | 600 | |
@@ -607,8 +607,8 @@ discard block |
||
| 607 | 607 | * @param EE_Payment $payment |
| 608 | 608 | * @return string |
| 609 | 609 | */ |
| 610 | - public function payment_overview_content(EE_Payment $payment){ |
|
| 611 | - return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance,'payment'=>$payment) , true); |
|
| 610 | + public function payment_overview_content(EE_Payment $payment) { |
|
| 611 | + return EEH_Template::display_template(EE_LIBRARIES.'payment_methods'.DS.'templates'.DS.'payment_details_content.template.php', array('payment_method'=>$this->_pm_instance, 'payment'=>$payment), true); |
|
| 612 | 612 | } |
| 613 | 613 | |
| 614 | 614 | |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | * @type array $template_args any arguments you want passed to the template file while rendering. |
| 622 | 622 | * Keys will be variable names and values with be their values. |
| 623 | 623 | */ |
| 624 | - public function help_tabs_config(){ |
|
| 624 | + public function help_tabs_config() { |
|
| 625 | 625 | return array(); |
| 626 | 626 | } |
| 627 | 627 | |
@@ -632,9 +632,9 @@ discard block |
||
| 632 | 632 | * the payment method's table's PMT_type column) |
| 633 | 633 | * @return string |
| 634 | 634 | */ |
| 635 | - public function system_name(){ |
|
| 635 | + public function system_name() { |
|
| 636 | 636 | $classname = get_class($this); |
| 637 | - return str_replace("EE_PMT_",'',$classname); |
|
| 637 | + return str_replace("EE_PMT_", '', $classname); |
|
| 638 | 638 | } |
| 639 | 639 | |
| 640 | 640 | |
@@ -643,7 +643,7 @@ discard block |
||
| 643 | 643 | * A pretty i18n version of the PMT name |
| 644 | 644 | * @return string |
| 645 | 645 | */ |
| 646 | - public function pretty_name(){ |
|
| 646 | + public function pretty_name() { |
|
| 647 | 647 | return $this->_pretty_name; |
| 648 | 648 | } |
| 649 | 649 | |
@@ -653,7 +653,7 @@ discard block |
||
| 653 | 653 | * Gets the default absolute URL to the payment method type's button |
| 654 | 654 | * @return string |
| 655 | 655 | */ |
| 656 | - public function default_button_url(){ |
|
| 656 | + public function default_button_url() { |
|
| 657 | 657 | return $this->_default_button_url; |
| 658 | 658 | } |
| 659 | 659 | |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | * Gets the gateway used by this payment method (if any) |
| 664 | 664 | * @return EE_Gateway |
| 665 | 665 | */ |
| 666 | - public function get_gateway(){ |
|
| 666 | + public function get_gateway() { |
|
| 667 | 667 | return $this->_gateway; |
| 668 | 668 | } |
| 669 | 669 | |
@@ -672,8 +672,8 @@ discard block |
||
| 672 | 672 | /** |
| 673 | 673 | * @return string html for the link to a help tab |
| 674 | 674 | */ |
| 675 | - public function get_help_tab_link(){ |
|
| 676 | - return EEH_Template::get_help_tab_link( $this->get_help_tab_name() ); |
|
| 675 | + public function get_help_tab_link() { |
|
| 676 | + return EEH_Template::get_help_tab_link($this->get_help_tab_name()); |
|
| 677 | 677 | } |
| 678 | 678 | |
| 679 | 679 | |
@@ -682,8 +682,8 @@ discard block |
||
| 682 | 682 | * Returns the name of the help tab for this PMT |
| 683 | 683 | * @return string |
| 684 | 684 | */ |
| 685 | - public function get_help_tab_name(){ |
|
| 686 | - return 'ee_' . strtolower( $this->system_name() ) . '_help_tab'; |
|
| 685 | + public function get_help_tab_name() { |
|
| 686 | + return 'ee_'.strtolower($this->system_name()).'_help_tab'; |
|
| 687 | 687 | } |
| 688 | 688 | |
| 689 | 689 | /** |
@@ -691,8 +691,8 @@ discard block |
||
| 691 | 691 | * this PMT by an admin |
| 692 | 692 | * @return string |
| 693 | 693 | */ |
| 694 | - public function cap_name(){ |
|
| 695 | - return 'ee_payment_method_' . strtolower( $this->system_name() ); |
|
| 694 | + public function cap_name() { |
|
| 695 | + return 'ee_payment_method_'.strtolower($this->system_name()); |
|
| 696 | 696 | } |
| 697 | 697 | |
| 698 | 698 | /** |
@@ -704,9 +704,9 @@ discard block |
||
| 704 | 704 | * @param EE_Payment $payment |
| 705 | 705 | * @return void |
| 706 | 706 | */ |
| 707 | - public function update_txn_based_on_payment( $payment ){ |
|
| 708 | - if( $this->_gateway instanceof EE_Gateway ){ |
|
| 709 | - $this->_gateway->update_txn_based_on_payment( $payment ); |
|
| 707 | + public function update_txn_based_on_payment($payment) { |
|
| 708 | + if ($this->_gateway instanceof EE_Gateway) { |
|
| 709 | + $this->_gateway->update_txn_based_on_payment($payment); |
|
| 710 | 710 | } |
| 711 | 711 | } |
| 712 | 712 | |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | * @return string |
| 722 | 722 | */ |
| 723 | 723 | public function introductory_html() { |
| 724 | - return EEH_Template::locate_template( $this->file_folder() . 'templates' . DS . strtolower( $this->system_name() ) . '_intro.template.php', array( 'pmt_obj' => $this, 'pm_instance' => $this->_pm_instance ) ); |
|
| 724 | + return EEH_Template::locate_template($this->file_folder().'templates'.DS.strtolower($this->system_name()).'_intro.template.php', array('pmt_obj' => $this, 'pm_instance' => $this->_pm_instance)); |
|
| 725 | 725 | } |
| 726 | 726 | |
| 727 | 727 | |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | //namespace EventEspresso\core\libraries\templates; |
| 3 | 3 | |
| 4 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
| 5 | - exit( 'No direct script access allowed' ); |
|
| 4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 5 | + exit('No direct script access allowed'); |
|
| 6 | 6 | } |
| 7 | 7 | /** |
| 8 | 8 | * Class EE_Template_Part |
@@ -47,11 +47,11 @@ discard block |
||
| 47 | 47 | * @param string $template |
| 48 | 48 | * @param int $priority |
| 49 | 49 | */ |
| 50 | - public function __construct( $name, $label, $template, $priority = 100 ) { |
|
| 51 | - $this->set_name( $name ); |
|
| 52 | - $this->set_label( $label ); |
|
| 53 | - $this->set_template( $template ); |
|
| 54 | - $this->set_priority( $priority ); |
|
| 50 | + public function __construct($name, $label, $template, $priority = 100) { |
|
| 51 | + $this->set_name($name); |
|
| 52 | + $this->set_label($label); |
|
| 53 | + $this->set_template($template); |
|
| 54 | + $this->set_priority($priority); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | /** |
| 69 | 69 | * @param mixed $name |
| 70 | 70 | */ |
| 71 | - public function set_name( $name ) { |
|
| 71 | + public function set_name($name) { |
|
| 72 | 72 | $this->name = $name; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | /** |
| 87 | 87 | * @param string $label |
| 88 | 88 | */ |
| 89 | - public function set_label( $label ) { |
|
| 89 | + public function set_label($label) { |
|
| 90 | 90 | $this->label = $label; |
| 91 | 91 | } |
| 92 | 92 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | /** |
| 105 | 105 | * @param string $template |
| 106 | 106 | */ |
| 107 | - public function set_template( $template ) { |
|
| 107 | + public function set_template($template) { |
|
| 108 | 108 | $this->template = $template; |
| 109 | 109 | } |
| 110 | 110 | |
@@ -122,8 +122,8 @@ discard block |
||
| 122 | 122 | /** |
| 123 | 123 | * @param int $priority |
| 124 | 124 | */ |
| 125 | - public function set_priority( $priority ) { |
|
| 126 | - $this->priority = intval( $priority ); |
|
| 125 | + public function set_priority($priority) { |
|
| 126 | + $this->priority = intval($priority); |
|
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | //namespace EventEspresso\core\libraries\templates; |
| 3 | 3 | |
| 4 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
| 5 | - exit( 'No direct script access allowed' ); |
|
| 4 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 5 | + exit('No direct script access allowed'); |
|
| 6 | 6 | } |
| 7 | 7 | /** |
| 8 | 8 | * Class EE_Template_Part_PriorityQueue |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | * @param int $priority |
| 32 | 32 | * @return bool |
| 33 | 33 | */ |
| 34 | - public function insert( $object, $priority = 100 ) { |
|
| 35 | - if ( $object instanceof EE_Template_Part ) { |
|
| 36 | - parent::insert( $object, $priority ); |
|
| 34 | + public function insert($object, $priority = 100) { |
|
| 35 | + if ($object instanceof EE_Template_Part) { |
|
| 36 | + parent::insert($object, $priority); |
|
| 37 | 37 | return true; |
| 38 | 38 | } else { |
| 39 | 39 | return false; |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | * @param int $priority2 |
| 53 | 53 | * @return bool |
| 54 | 54 | */ |
| 55 | - public function compare( $priority1, $priority2 ) { |
|
| 56 | - if ( $priority1 === $priority2 ) { |
|
| 55 | + public function compare($priority1, $priority2) { |
|
| 56 | + if ($priority1 === $priority2) { |
|
| 57 | 57 | return 0; |
| 58 | 58 | } |
| 59 | 59 | return $priority1 > $priority2 ? -1 : 1; |
@@ -1,4 +1,6 @@ |
||
| 1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
| 1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 2 | + exit('No direct script access allowed'); |
|
| 3 | +} |
|
| 2 | 4 | /** |
| 3 | 5 | * Event Espresso |
| 4 | 6 | * |
@@ -60,15 +60,15 @@ discard block |
||
| 60 | 60 | * @param array $post |
| 61 | 61 | * @param array $cookie |
| 62 | 62 | */ |
| 63 | - public function __construct( $get, $post, $cookie ) { |
|
| 63 | + public function __construct($get, $post, $cookie) { |
|
| 64 | 64 | // grab request vars |
| 65 | 65 | $this->_get = $get; |
| 66 | 66 | $this->_post = $post; |
| 67 | 67 | $this->_cookie = $cookie; |
| 68 | - $this->_params = array_merge( $get, $post ); |
|
| 68 | + $this->_params = array_merge($get, $post); |
|
| 69 | 69 | // AJAX ??? |
| 70 | - $this->ajax = defined( 'DOING_AJAX' ) ? true : false; |
|
| 71 | - $this->front_ajax = $this->is_set( 'ee_front_ajax' ) && $this->get( 'ee_front_ajax' ) == 1 ? true : false; |
|
| 70 | + $this->ajax = defined('DOING_AJAX') ? true : false; |
|
| 71 | + $this->front_ajax = $this->is_set('ee_front_ajax') && $this->get('ee_front_ajax') == 1 ? true : false; |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | |
@@ -119,10 +119,10 @@ discard block |
||
| 119 | 119 | * @param bool $override_ee |
| 120 | 120 | * @return void |
| 121 | 121 | */ |
| 122 | - public function set( $key, $value, $override_ee = FALSE ) { |
|
| 122 | + public function set($key, $value, $override_ee = FALSE) { |
|
| 123 | 123 | // don't allow "ee" to be overwritten unless explicitly instructed to do so |
| 124 | - if ( $key != 'ee' || ( $key == 'ee' && empty( $this->_params['ee'] )) || ( $key == 'ee' && ! empty( $this->_params['ee'] ) && $override_ee )) { |
|
| 125 | - $this->_params[ $key ] = $value; |
|
| 124 | + if ($key != 'ee' || ($key == 'ee' && empty($this->_params['ee'])) || ($key == 'ee' && ! empty($this->_params['ee']) && $override_ee)) { |
|
| 125 | + $this->_params[$key] = $value; |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
@@ -136,8 +136,8 @@ discard block |
||
| 136 | 136 | * @param null $default |
| 137 | 137 | * @return mixed |
| 138 | 138 | */ |
| 139 | - public function get( $key, $default = NULL ) { |
|
| 140 | - return isset( $this->_params[ $key ] ) ? $this->_params[ $key ] : $default; |
|
| 139 | + public function get($key, $default = NULL) { |
|
| 140 | + return isset($this->_params[$key]) ? $this->_params[$key] : $default; |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | |
@@ -149,8 +149,8 @@ discard block |
||
| 149 | 149 | * @param $key |
| 150 | 150 | * @return boolean |
| 151 | 151 | */ |
| 152 | - public function is_set( $key ) { |
|
| 153 | - return isset( $this->_params[ $key ] ) ? TRUE : FALSE; |
|
| 152 | + public function is_set($key) { |
|
| 153 | + return isset($this->_params[$key]) ? TRUE : FALSE; |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | |
@@ -162,10 +162,10 @@ discard block |
||
| 162 | 162 | * @param $key |
| 163 | 163 | * @param bool $unset_from_global_too |
| 164 | 164 | */ |
| 165 | - public function un_set( $key, $unset_from_global_too = false ) { |
|
| 166 | - unset( $this->_params[ $key ] ); |
|
| 167 | - if ( $unset_from_global_too ) { |
|
| 168 | - unset( $_REQUEST[ $key ] ); |
|
| 165 | + public function un_set($key, $unset_from_global_too = false) { |
|
| 166 | + unset($this->_params[$key]); |
|
| 167 | + if ($unset_from_global_too) { |
|
| 168 | + unset($_REQUEST[$key]); |
|
| 169 | 169 | } |
| 170 | 170 | } |
| 171 | 171 | |
