@@ -631,8 +631,6 @@ |
||
631 | 631 | /** |
632 | 632 | * handles toggleing the checkin status for the registration, |
633 | 633 | * @access protected |
634 | - * @param boolean $check_in |
|
635 | - * @return void |
|
636 | 634 | */ |
637 | 635 | protected function _toggle_checkin_status() { |
638 | 636 | //first let's get the query args out of the way for the redirect |
@@ -453,9 +453,9 @@ discard block |
||
453 | 453 | |
454 | 454 | /** |
455 | 455 | * generates Business Reports regarding Registrations |
456 | - * @access protected |
|
457 | - * @return void |
|
458 | - */ |
|
456 | + * @access protected |
|
457 | + * @return void |
|
458 | + */ |
|
459 | 459 | protected function _registration_reports() { |
460 | 460 | $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php'; |
461 | 461 | $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, true ); |
@@ -630,10 +630,10 @@ discard block |
||
630 | 630 | |
631 | 631 | /** |
632 | 632 | * handles toggleing the checkin status for the registration, |
633 | - * @access protected |
|
634 | - * @param boolean $check_in |
|
635 | - * @return void |
|
636 | - */ |
|
633 | + * @access protected |
|
634 | + * @param boolean $check_in |
|
635 | + * @return void |
|
636 | + */ |
|
637 | 637 | protected function _toggle_checkin_status() { |
638 | 638 | //first let's get the query args out of the way for the redirect |
639 | 639 | $query_args = array( |
@@ -754,9 +754,9 @@ discard block |
||
754 | 754 | |
755 | 755 | /** |
756 | 756 | * generates HTML for the Event Registrations List Table |
757 | - * @access protected |
|
758 | - * @return void |
|
759 | - */ |
|
757 | + * @access protected |
|
758 | + * @return void |
|
759 | + */ |
|
760 | 760 | protected function _event_registrations_list_table() { |
761 | 761 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
762 | 762 | $this->_admin_page_title .= isset( $this->_req_data['event_id'] ) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : ''; |
@@ -786,11 +786,11 @@ discard block |
||
786 | 786 | 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved, |
787 | 787 | 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) |
788 | 788 | ), |
789 | - 'cancelled_status' => array( |
|
789 | + 'cancelled_status' => array( |
|
790 | 790 | 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled, |
791 | 791 | 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) |
792 | 792 | ), |
793 | - 'declined_status' => array( |
|
793 | + 'declined_status' => array( |
|
794 | 794 | 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined, |
795 | 795 | 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) |
796 | 796 | ), |
@@ -818,9 +818,9 @@ discard block |
||
818 | 818 | /** |
819 | 819 | * get_attendees |
820 | 820 | * @param bool $count whether to return count or data. |
821 | - * @access public |
|
822 | - * @return array |
|
823 | - */ |
|
821 | + * @access public |
|
822 | + * @return array |
|
823 | + */ |
|
824 | 824 | public function get_event_attendees( $per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '' ) { |
825 | 825 | |
826 | 826 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
@@ -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 | /** |
@@ -37,20 +37,20 @@ discard block |
||
37 | 37 | protected $_reports_template_data = array(); |
38 | 38 | |
39 | 39 | |
40 | - public function __construct( $routing = TRUE ) { |
|
41 | - parent::__construct( $routing ); |
|
42 | - define( 'REG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'registrations/templates/'); |
|
43 | - define( 'REG_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'registrations/assets/'); |
|
44 | - define( 'REG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'registrations/assets/'); |
|
40 | + public function __construct($routing = TRUE) { |
|
41 | + parent::__construct($routing); |
|
42 | + define('REG_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'registrations/templates/'); |
|
43 | + define('REG_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'registrations/assets/'); |
|
44 | + define('REG_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'registrations/assets/'); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | |
48 | 48 | protected function _extend_page_config() { |
49 | - $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'registrations'; |
|
49 | + $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'registrations'; |
|
50 | 50 | |
51 | - $reg_id = ! empty( $this->_req_data['_REG_ID'] ) && ! is_array( $this->_req_data['_REG_ID'] ) ? $this->_req_data['_REG_ID'] : 0; |
|
52 | - $att_id = ! empty( $this->_req_data[ 'ATT_ID' ] ) ? ! is_array( $this->_req_data['ATT_ID'] ) : 0; |
|
53 | - $att_id = ! empty( $this->_req_data['post'] ) && ! is_array( $this->_req_data['post'] ) ? $this->_req_data['post'] : $att_id; |
|
51 | + $reg_id = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : 0; |
|
52 | + $att_id = ! empty($this->_req_data['ATT_ID']) ? ! is_array($this->_req_data['ATT_ID']) : 0; |
|
53 | + $att_id = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post'] : $att_id; |
|
54 | 54 | |
55 | 55 | $new_page_routes = array( |
56 | 56 | 'reports' => array( |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | ) |
90 | 90 | ); |
91 | 91 | |
92 | - $this->_page_routes = array_merge( $this->_page_routes, $new_page_routes ); |
|
92 | + $this->_page_routes = array_merge($this->_page_routes, $new_page_routes); |
|
93 | 93 | |
94 | 94 | $new_page_config = array( |
95 | 95 | 'reports' => array( |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | 'filename' => 'registrations_reports' |
104 | 104 | ) |
105 | 105 | ), |
106 | - 'help_tour' => array( 'Registration_Reports_Help_Tour' ), |
|
106 | + 'help_tour' => array('Registration_Reports_Help_Tour'), |
|
107 | 107 | 'require_nonce' => FALSE |
108 | 108 | ), |
109 | 109 | 'event_registrations' => array( |
@@ -134,8 +134,8 @@ discard block |
||
134 | 134 | 'filename' => 'registrations_event_checkin_other' |
135 | 135 | ) |
136 | 136 | ), |
137 | - 'help_tour' => array( 'Event_Checkin_Help_Tour' ), |
|
138 | - 'qtips' => array('Registration_List_Table_Tips' ), |
|
137 | + 'help_tour' => array('Event_Checkin_Help_Tour'), |
|
138 | + 'qtips' => array('Registration_List_Table_Tips'), |
|
139 | 139 | 'list_table' => 'EE_Event_Registrations_List_Table', |
140 | 140 | 'metaboxes' => array(), |
141 | 141 | 'require_nonce' => FALSE |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | // var_dump($this->_req_data); |
157 | 157 | // exit(); |
158 | 158 | |
159 | - $this->_page_config = array_merge( $this->_page_config, $new_page_config ); |
|
159 | + $this->_page_config = array_merge($this->_page_config, $new_page_config); |
|
160 | 160 | $this->_page_config['contact_list']['list_table'] = 'Extend_EE_Attendee_Contact_List_Table'; |
161 | 161 | $this->_page_config['default']['list_table'] = 'Extend_EE_Registrations_List_Table'; |
162 | 162 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | |
166 | 166 | protected function _ajax_hooks() { |
167 | 167 | parent::_ajax_hooks(); |
168 | - add_action('wp_ajax_get_newsletter_form_content', array( $this, 'get_newsletter_form_content') ); |
|
168 | + add_action('wp_ajax_get_newsletter_form_content', array($this, 'get_newsletter_form_content')); |
|
169 | 169 | } |
170 | 170 | |
171 | 171 | |
@@ -175,20 +175,20 @@ discard block |
||
175 | 175 | |
176 | 176 | //if newsletter message type is active then let's add filter and load js for it. |
177 | 177 | EE_Registry::instance()->load_helper('MSG_Template'); |
178 | - if ( EEH_MSG_Template::is_mt_active('newsletter') ) { |
|
178 | + if (EEH_MSG_Template::is_mt_active('newsletter')) { |
|
179 | 179 | //enqueue newsletter js |
180 | - wp_enqueue_script( 'ee-newsletter-trigger', REG_CAF_ASSETS_URL . 'ee-newsletter-trigger.js', array( 'ee-dialog'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
181 | - wp_enqueue_style( 'ee-newsletter-trigger-css', REG_CAF_ASSETS_URL . 'ee-newsletter-trigger.css', array(), EVENT_ESPRESSO_VERSION ); |
|
180 | + wp_enqueue_script('ee-newsletter-trigger', REG_CAF_ASSETS_URL.'ee-newsletter-trigger.js', array('ee-dialog'), EVENT_ESPRESSO_VERSION, TRUE); |
|
181 | + wp_enqueue_style('ee-newsletter-trigger-css', REG_CAF_ASSETS_URL.'ee-newsletter-trigger.css', array(), EVENT_ESPRESSO_VERSION); |
|
182 | 182 | //hook in buttons for newsletter message type trigger. |
183 | - add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array( $this, 'add_newsletter_action_buttons'), 10 ); |
|
183 | + add_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', array($this, 'add_newsletter_action_buttons'), 10); |
|
184 | 184 | } |
185 | 185 | } |
186 | 186 | |
187 | 187 | |
188 | 188 | |
189 | 189 | public function load_scripts_styles_reports() { |
190 | - wp_register_script( 'ee-reg-reports-js', REG_CAF_ASSETS_URL . 'ee-registration-admin-reports.js', array( 'google-charts' ), EVENT_ESPRESSO_VERSION, true ); |
|
191 | - wp_enqueue_script( 'ee-reg-reports-js' ); |
|
190 | + wp_register_script('ee-reg-reports-js', REG_CAF_ASSETS_URL.'ee-registration-admin-reports.js', array('google-charts'), EVENT_ESPRESSO_VERSION, true); |
|
191 | + wp_enqueue_script('ee-reg-reports-js'); |
|
192 | 192 | $this->_registration_reports_js_setup(); |
193 | 193 | } |
194 | 194 | |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | 'slug' => 'all', |
221 | 221 | 'label' => __('All', 'event_espresso'), |
222 | 222 | 'count' => 0, |
223 | - 'bulk_action' => !isset( $this->_req_data['event_id'] ) ? array() : array( |
|
223 | + 'bulk_action' => ! isset($this->_req_data['event_id']) ? array() : array( |
|
224 | 224 | 'toggle_checkin_status' => __('Toggle Check-In', 'event_espresso'), |
225 | 225 | //'trash_registrations' => __('Trash Registrations', 'event_espresso') |
226 | 226 | ) |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | 'slug' => 'all', |
239 | 239 | 'label' => __('All', 'event_espresso'), |
240 | 240 | 'count' => 0, |
241 | - 'bulk_action' => array( 'delete_checkin_rows' => __('Delete Check-In Rows', 'event_espresso') ) |
|
241 | + 'bulk_action' => array('delete_checkin_rows' => __('Delete Check-In Rows', 'event_espresso')) |
|
242 | 242 | ), |
243 | 243 | ); |
244 | 244 | } |
@@ -254,20 +254,20 @@ discard block |
||
254 | 254 | */ |
255 | 255 | public function get_newsletter_form_content() { |
256 | 256 | //do a nonce check cause we're not coming in from an normal route here. |
257 | - $nonce = isset( $this->_req_data['get_newsletter_form_content_nonce'] ) ? sanitize_text_field( $this->_req_data['get_newsletter_form_content_nonce'] ) : ''; |
|
257 | + $nonce = isset($this->_req_data['get_newsletter_form_content_nonce']) ? sanitize_text_field($this->_req_data['get_newsletter_form_content_nonce']) : ''; |
|
258 | 258 | $nonce_ref = 'get_newsletter_form_content_nonce'; |
259 | 259 | |
260 | - $this->_verify_nonce( $nonce, $nonce_ref ); |
|
260 | + $this->_verify_nonce($nonce, $nonce_ref); |
|
261 | 261 | //let's get the mtp for the incoming MTP_ ID |
262 | - if ( !isset( $this->_req_data['GRP_ID'] ) ) { |
|
263 | - EE_Error::add_error( __('There must be something broken with the js or html structure because the required data for getting a message template group is not present (need an GRP_ID).', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
262 | + if ( ! isset($this->_req_data['GRP_ID'])) { |
|
263 | + EE_Error::add_error(__('There must be something broken with the js or html structure because the required data for getting a message template group is not present (need an GRP_ID).', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
264 | 264 | $this->_template_args['success'] = FALSE; |
265 | 265 | $this->_template_args['error'] = TRUE; |
266 | 266 | $this->_return_json(); |
267 | 267 | } |
268 | - $MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_req_data['GRP_ID'] ); |
|
269 | - if ( ! $MTPG instanceof EE_Message_Template_Group ) { |
|
270 | - EE_Error::add_error( sprintf( __('The GRP_ID given (%d) does not appear to have a corresponding row in the database.', 'event_espresso'), $this->_req_data['GRP_ID'] ), __FILE__, __FUNCTION__, __LINE__ ); |
|
268 | + $MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_req_data['GRP_ID']); |
|
269 | + if ( ! $MTPG instanceof EE_Message_Template_Group) { |
|
270 | + EE_Error::add_error(sprintf(__('The GRP_ID given (%d) does not appear to have a corresponding row in the database.', 'event_espresso'), $this->_req_data['GRP_ID']), __FILE__, __FUNCTION__, __LINE__); |
|
271 | 271 | $this->_template_args['success'] = FALSE; |
272 | 272 | $this->_template_args['error'] = TRUE; |
273 | 273 | $this->_return_json(); |
@@ -276,11 +276,11 @@ discard block |
||
276 | 276 | $MTPs = $MTPG->context_templates(); |
277 | 277 | $MTPs = $MTPs['attendee']; |
278 | 278 | $template_fields = array(); |
279 | - foreach ( $MTPs as $MTP ) { |
|
279 | + foreach ($MTPs as $MTP) { |
|
280 | 280 | $field = $MTP->get('MTP_template_field'); |
281 | - if ( $field == 'content' ) { |
|
281 | + if ($field == 'content') { |
|
282 | 282 | $content = $MTP->get('MTP_content'); |
283 | - if ( !empty( $content['newsletter_content'] ) ) { |
|
283 | + if ( ! empty($content['newsletter_content'])) { |
|
284 | 284 | $template_fields['newsletter_content'] = $content['newsletter_content']; |
285 | 285 | } |
286 | 286 | continue; |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | $this->_template_args['data'] = array( |
294 | 294 | 'batch_message_from' => isset($template_fields['from']) ? $template_fields['from'] : '', |
295 | 295 | 'batch_message_subject' => isset($template_fields['subject']) ? $template_fields['subject'] : '', |
296 | - 'batch_message_content' => isset( $template_fields['newsletter_content'] ) ? $template_fields['newsletter_content'] : '' |
|
296 | + 'batch_message_content' => isset($template_fields['newsletter_content']) ? $template_fields['newsletter_content'] : '' |
|
297 | 297 | ); |
298 | 298 | $this->_return_json(); |
299 | 299 | } |
@@ -309,8 +309,8 @@ discard block |
||
309 | 309 | * @param EE_Admin_List_Table $list_table |
310 | 310 | * @return string html string for extra buttons |
311 | 311 | */ |
312 | - public function add_newsletter_action_buttons( EE_Admin_List_Table $list_table ) { |
|
313 | - if ( ! EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_newsletter_selected_send' ) ) { |
|
312 | + public function add_newsletter_action_buttons(EE_Admin_List_Table $list_table) { |
|
313 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_newsletter_selected_send')) { |
|
314 | 314 | return ''; |
315 | 315 | } |
316 | 316 | |
@@ -319,13 +319,13 @@ discard block |
||
319 | 319 | 'event_registrations', |
320 | 320 | 'default' |
321 | 321 | ); |
322 | - if ( $this->_current_page == 'espresso_registrations' && in_array( $this->_req_action, $routes_to_add_to ) ) { |
|
323 | - if ( ( $this->_req_action == 'event_registrations' && empty( $this->_req_data['event_id'] ) ) || ( isset( $this->_req_data['status'] ) && $this->_req_data['status'] == 'trash' ) ) { |
|
322 | + if ($this->_current_page == 'espresso_registrations' && in_array($this->_req_action, $routes_to_add_to)) { |
|
323 | + if (($this->_req_action == 'event_registrations' && empty($this->_req_data['event_id'])) || (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash')) { |
|
324 | 324 | echo ''; |
325 | 325 | } else { |
326 | - $button_text = sprintf( __('Send Batch Message (%s selected)', 'event_espresso'), '<span class="send-selected-newsletter-count">0</span>' ); |
|
327 | - echo '<button id="selected-batch-send-trigger" class="button secondary-button"><span class="dashicons dashicons-email "></span>' . $button_text . '</button>'; |
|
328 | - add_action('admin_footer', array( $this, 'newsletter_send_form_skeleton') ); |
|
326 | + $button_text = sprintf(__('Send Batch Message (%s selected)', 'event_espresso'), '<span class="send-selected-newsletter-count">0</span>'); |
|
327 | + echo '<button id="selected-batch-send-trigger" class="button secondary-button"><span class="dashicons dashicons-email "></span>'.$button_text.'</button>'; |
|
328 | + add_action('admin_footer', array($this, 'newsletter_send_form_skeleton')); |
|
329 | 329 | } |
330 | 330 | } |
331 | 331 | } |
@@ -337,38 +337,38 @@ discard block |
||
337 | 337 | $list_table = $this->_list_table_object; |
338 | 338 | $codes = array(); |
339 | 339 | //need to templates for the newsletter message type for the template selector. |
340 | - $values[] = array( 'text' => __('Select Template to Use', 'event_espresso'), 'id' => 0 ); |
|
341 | - $mtps = EEM_Message_Template_Group::instance()->get_all( array( array( 'MTP_message_type' => 'newsletter', 'MTP_messenger' => 'email' ) ) ); |
|
342 | - foreach ( $mtps as $mtp ) { |
|
340 | + $values[] = array('text' => __('Select Template to Use', 'event_espresso'), 'id' => 0); |
|
341 | + $mtps = EEM_Message_Template_Group::instance()->get_all(array(array('MTP_message_type' => 'newsletter', 'MTP_messenger' => 'email'))); |
|
342 | + foreach ($mtps as $mtp) { |
|
343 | 343 | $name = $mtp->name(); |
344 | 344 | $values[] = array( |
345 | - 'text' => empty( $name ) ? __('Global', 'event_espresso') : $name, |
|
345 | + 'text' => empty($name) ? __('Global', 'event_espresso') : $name, |
|
346 | 346 | 'id' => $mtp->ID() |
347 | 347 | ); |
348 | 348 | } |
349 | 349 | |
350 | 350 | //need to get a list of shortcodes that are available for the newsletter message type. |
351 | 351 | EE_Registry::instance()->load_helper('MSG_Template'); |
352 | - $shortcodes = EEH_MSG_Template::get_shortcodes( 'newsletter', 'email', array(), 'attendee', FALSE ); |
|
353 | - foreach ( $shortcodes as $field => $shortcode_array ) { |
|
354 | - $codes[$field] = implode(', ', array_keys($shortcode_array ) ); |
|
352 | + $shortcodes = EEH_MSG_Template::get_shortcodes('newsletter', 'email', array(), 'attendee', FALSE); |
|
353 | + foreach ($shortcodes as $field => $shortcode_array) { |
|
354 | + $codes[$field] = implode(', ', array_keys($shortcode_array)); |
|
355 | 355 | } |
356 | 356 | |
357 | 357 | $shortcodes = $codes; |
358 | 358 | |
359 | - $form_template = REG_CAF_TEMPLATE_PATH . 'newsletter-send-form.template.php'; |
|
359 | + $form_template = REG_CAF_TEMPLATE_PATH.'newsletter-send-form.template.php'; |
|
360 | 360 | $form_template_args = array( |
361 | 361 | 'form_action' => admin_url('admin.php?page=espresso_registrations'), |
362 | 362 | 'form_route' => 'newsletter_selected_send', |
363 | 363 | 'form_nonce_name' => 'newsletter_selected_send_nonce', |
364 | - 'form_nonce' => wp_create_nonce( 'newsletter_selected_send_nonce' ), |
|
364 | + 'form_nonce' => wp_create_nonce('newsletter_selected_send_nonce'), |
|
365 | 365 | 'redirect_back_to' => $this->_req_action, |
366 | - 'ajax_nonce' => wp_create_nonce( 'get_newsletter_form_content_nonce'), |
|
367 | - 'template_selector' => EEH_Form_Fields::select_input('newsletter_mtp_selected', $values ), |
|
366 | + 'ajax_nonce' => wp_create_nonce('get_newsletter_form_content_nonce'), |
|
367 | + 'template_selector' => EEH_Form_Fields::select_input('newsletter_mtp_selected', $values), |
|
368 | 368 | 'shortcodes' => $shortcodes, |
369 | 369 | 'id_type' => $list_table instanceof EE_Attendee_Contact_List_Table ? 'contact' : 'registration' |
370 | 370 | ); |
371 | - EEH_Template::display_template( $form_template, $form_template_args ); |
|
371 | + EEH_Template::display_template($form_template, $form_template_args); |
|
372 | 372 | } |
373 | 373 | |
374 | 374 | |
@@ -383,35 +383,35 @@ discard block |
||
383 | 383 | protected function _newsletter_selected_send() { |
384 | 384 | $success = TRUE; |
385 | 385 | //first we need to make sure we have a GRP_ID so we know what template we're sending and updating! |
386 | - if ( empty( $this->_req_data['newsletter_mtp_selected'] ) ) { |
|
387 | - EE_Error::add_error( __('In order to send a message, a Message Template GRP_ID is needed. It was not provided so messages were not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
386 | + if (empty($this->_req_data['newsletter_mtp_selected'])) { |
|
387 | + EE_Error::add_error(__('In order to send a message, a Message Template GRP_ID is needed. It was not provided so messages were not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
388 | 388 | $success = FALSE; |
389 | 389 | } |
390 | 390 | |
391 | - if ( $success ) { |
|
391 | + if ($success) { |
|
392 | 392 | //update Message template in case there are any changes |
393 | - $MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID( $this->_req_data['newsletter_mtp_selected'] ); |
|
393 | + $MTPG = EEM_Message_Template_Group::instance()->get_one_by_ID($this->_req_data['newsletter_mtp_selected']); |
|
394 | 394 | $MTPs = $MTPG instanceof EE_Message_Template_Group ? $MTPG->context_templates() : array(); |
395 | - if ( empty( $MTPs ) ) { |
|
396 | - EE_Error::add_error( __('Unable to retrieve message template fields from the db. Messages not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
395 | + if (empty($MTPs)) { |
|
396 | + EE_Error::add_error(__('Unable to retrieve message template fields from the db. Messages not sent.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
397 | 397 | $success = FALSE; |
398 | 398 | } |
399 | 399 | |
400 | 400 | //let's just update the specific fields |
401 | - foreach ( $MTPs['attendee'] as $MTP ) { |
|
401 | + foreach ($MTPs['attendee'] as $MTP) { |
|
402 | 402 | $field = $MTP->get('MTP_template_field'); |
403 | 403 | $content = $MTP->get('MTP_content'); |
404 | 404 | $new_content = $content; |
405 | - switch( $field ) { |
|
405 | + switch ($field) { |
|
406 | 406 | case 'from' : |
407 | - $new_content = !empty( $this->_req_data['batch_message']['from'] ) ? $this->_req_data['batch_message']['from'] : $content; |
|
407 | + $new_content = ! empty($this->_req_data['batch_message']['from']) ? $this->_req_data['batch_message']['from'] : $content; |
|
408 | 408 | break; |
409 | 409 | case 'subject' : |
410 | - $new_content = !empty( $this->_req_data['batch_message']['subject'] ) ? $this->_req_data['batch_message']['subject'] : $content; |
|
410 | + $new_content = ! empty($this->_req_data['batch_message']['subject']) ? $this->_req_data['batch_message']['subject'] : $content; |
|
411 | 411 | break; |
412 | 412 | case 'content' : |
413 | 413 | $new_content = $content; |
414 | - $new_content['newsletter_content'] = !empty( $this->_req_data['batch_message']['content'] ) ? $this->_req_data['batch_message']['content'] : $content['newsletter_content']; |
|
414 | + $new_content['newsletter_content'] = ! empty($this->_req_data['batch_message']['content']) ? $this->_req_data['batch_message']['content'] : $content['newsletter_content']; |
|
415 | 415 | break; |
416 | 416 | default : |
417 | 417 | continue; |
@@ -422,20 +422,20 @@ discard block |
||
422 | 422 | } |
423 | 423 | |
424 | 424 | //great fields are updated! now let's make sure we just have contact objects (EE_Attendee). |
425 | - $id_type = !empty( $this->_req_data['batch_message']['id_type'] ) ? $this->_req_data['batch_message']['id_type'] : 'registration'; |
|
425 | + $id_type = ! empty($this->_req_data['batch_message']['id_type']) ? $this->_req_data['batch_message']['id_type'] : 'registration'; |
|
426 | 426 | |
427 | 427 | //id_type will affect how we assemble the ids. |
428 | - $ids = !empty( $this->_req_data['batch_message']['ids'] ) ? json_decode( stripslashes($this->_req_data['batch_message']['ids']) ) : array(); |
|
428 | + $ids = ! empty($this->_req_data['batch_message']['ids']) ? json_decode(stripslashes($this->_req_data['batch_message']['ids'])) : array(); |
|
429 | 429 | |
430 | - $contacts = $id_type == 'registration' ? EEM_Attendee::instance()->get_array_of_contacts_from_reg_ids( $ids ) : EEM_Attendee::instance()->get_all( array( array( 'ATT_ID' => array('in', $ids ) ) ) ); |
|
430 | + $contacts = $id_type == 'registration' ? EEM_Attendee::instance()->get_array_of_contacts_from_reg_ids($ids) : EEM_Attendee::instance()->get_all(array(array('ATT_ID' => array('in', $ids)))); |
|
431 | 431 | |
432 | 432 | //we do _action because ALL triggers are handled in EED_Messages. |
433 | - do_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send', $contacts, $MTPG->ID() ); |
|
433 | + do_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send', $contacts, $MTPG->ID()); |
|
434 | 434 | } |
435 | 435 | $query_args = array( |
436 | - 'action' => !empty( $this->_req_data['redirect_back_to'] ) ? $this->_req_data['redirect_back_to'] : 'default' |
|
436 | + 'action' => ! empty($this->_req_data['redirect_back_to']) ? $this->_req_data['redirect_back_to'] : 'default' |
|
437 | 437 | ); |
438 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
438 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
439 | 439 | } |
440 | 440 | |
441 | 441 | |
@@ -457,8 +457,8 @@ discard block |
||
457 | 457 | * @return void |
458 | 458 | */ |
459 | 459 | protected function _registration_reports() { |
460 | - $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php'; |
|
461 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, true ); |
|
460 | + $template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php'; |
|
461 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_reports_template_data, true); |
|
462 | 462 | // the final template wrapper |
463 | 463 | $this->display_admin_page_with_no_sidebar(); |
464 | 464 | |
@@ -471,41 +471,41 @@ discard block |
||
471 | 471 | * |
472 | 472 | * @return string |
473 | 473 | */ |
474 | - private function _registrations_per_day_report( $period = '-1 month' ) { |
|
474 | + private function _registrations_per_day_report($period = '-1 month') { |
|
475 | 475 | $report_ID = 'reg-admin-registrations-per-day-report-dv'; |
476 | 476 | |
477 | 477 | $REG = EEM_Registration::instance(); |
478 | 478 | |
479 | - $results = $REG->get_registrations_per_day_report( $period ); |
|
479 | + $results = $REG->get_registrations_per_day_report($period); |
|
480 | 480 | |
481 | 481 | $results = (array) $results; |
482 | 482 | $regs = array(); |
483 | 483 | $subtitle = ''; |
484 | 484 | |
485 | - if( $results ) { |
|
486 | - $regs[] = array( __( 'Date (only days with registrations are shown)', 'event_espresso' ), __('Total Registrations', 'event_espresso' ) ); |
|
487 | - foreach ( $results as $result ) { |
|
488 | - $regs[] = array( $result->regDate, (int) $result->total ); |
|
485 | + if ($results) { |
|
486 | + $regs[] = array(__('Date (only days with registrations are shown)', 'event_espresso'), __('Total Registrations', 'event_espresso')); |
|
487 | + foreach ($results as $result) { |
|
488 | + $regs[] = array($result->regDate, (int) $result->total); |
|
489 | 489 | } |
490 | 490 | |
491 | 491 | //setup the date range. |
492 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
493 | - $beginning_date = new DateTime( "now " . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
494 | - $ending_date = new DateTime( "now", new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
495 | - $subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) ); |
|
492 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
493 | + $beginning_date = new DateTime("now ".$period, new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
494 | + $ending_date = new DateTime("now", new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
495 | + $subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d')); |
|
496 | 496 | } |
497 | 497 | |
498 | - $report_title = __( 'Total Registrations per Day', 'event_espresso' ); |
|
498 | + $report_title = __('Total Registrations per Day', 'event_espresso'); |
|
499 | 499 | |
500 | 500 | $report_params = array( |
501 | 501 | 'title' => $report_title, |
502 | 502 | 'subtitle' => $subtitle, |
503 | 503 | 'id' => $report_ID, |
504 | 504 | 'regs' => $regs, |
505 | - 'noResults' => empty( $regs ), |
|
506 | - 'noRegsMsg' => sprintf( __('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>' . $report_title . '</h2><p>', '</p>' ), |
|
505 | + 'noResults' => empty($regs), |
|
506 | + 'noRegsMsg' => sprintf(__('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>'), |
|
507 | 507 | ); |
508 | - wp_localize_script( 'ee-reg-reports-js', 'regPerDay', $report_params ); |
|
508 | + wp_localize_script('ee-reg-reports-js', 'regPerDay', $report_params); |
|
509 | 509 | |
510 | 510 | return $report_ID; |
511 | 511 | } |
@@ -517,41 +517,41 @@ discard block |
||
517 | 517 | * |
518 | 518 | * @return string |
519 | 519 | */ |
520 | - private function _registrations_per_event_report( $period = '-1 month' ) { |
|
520 | + private function _registrations_per_event_report($period = '-1 month') { |
|
521 | 521 | |
522 | 522 | $report_ID = 'reg-admin-registrations-per-event-report-dv'; |
523 | 523 | |
524 | 524 | $REG = EEM_Registration::instance(); |
525 | 525 | |
526 | - $results = $REG->get_registrations_per_event_report( $period ); |
|
526 | + $results = $REG->get_registrations_per_event_report($period); |
|
527 | 527 | $results = (array) $results; |
528 | 528 | $regs = array(); |
529 | 529 | $subtitle = ''; |
530 | 530 | |
531 | - if ( $results ) { |
|
532 | - $regs[] = array( __( 'Event', 'event_espresso' ), __('Total Registrations', 'event_espresso' ) ); |
|
533 | - foreach ( $results as $result ) { |
|
534 | - $regs[] = array( wp_trim_words( $result->event_name, 4, '...' ), (int) $result->total ); |
|
531 | + if ($results) { |
|
532 | + $regs[] = array(__('Event', 'event_espresso'), __('Total Registrations', 'event_espresso')); |
|
533 | + foreach ($results as $result) { |
|
534 | + $regs[] = array(wp_trim_words($result->event_name, 4, '...'), (int) $result->total); |
|
535 | 535 | } |
536 | 536 | |
537 | 537 | //setup the date range. |
538 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
539 | - $beginning_date = new DateTime( "now " . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
540 | - $ending_date = new DateTime( "now", new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
541 | - $subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) ); |
|
538 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
539 | + $beginning_date = new DateTime("now ".$period, new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
540 | + $ending_date = new DateTime("now", new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
541 | + $subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d')); |
|
542 | 542 | } |
543 | 543 | |
544 | - $report_title = __( 'Total Registrations per Event', 'event_espresso' ); |
|
544 | + $report_title = __('Total Registrations per Event', 'event_espresso'); |
|
545 | 545 | |
546 | 546 | $report_params = array( |
547 | 547 | 'title' => $report_title, |
548 | 548 | 'subtitle' => $subtitle, |
549 | 549 | 'id' => $report_ID, |
550 | 550 | 'regs' => $regs, |
551 | - 'noResults' => empty( $regs ), |
|
552 | - 'noRegsMsg' => sprintf( __('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>' . $report_title . '</h2><p>', '</p>' ), |
|
551 | + 'noResults' => empty($regs), |
|
552 | + 'noRegsMsg' => sprintf(__('%sThere are currently no registration records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>'), |
|
553 | 553 | ); |
554 | - wp_localize_script( 'ee-reg-reports-js', 'regPerEvent', $report_params ); |
|
554 | + wp_localize_script('ee-reg-reports-js', 'regPerEvent', $report_params); |
|
555 | 555 | |
556 | 556 | return $report_ID; |
557 | 557 | } |
@@ -565,8 +565,8 @@ discard block |
||
565 | 565 | * @return void |
566 | 566 | */ |
567 | 567 | protected function _registration_checkin_list_table() { |
568 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
569 | - $reg_id = isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : null; |
|
568 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
569 | + $reg_id = isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : null; |
|
570 | 570 | $reg = EEM_Registration::instance()->get_one_by_ID($reg_id); |
571 | 571 | $this->_admin_page_title .= $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $reg->event_ID()), 'add-new-h2'); |
572 | 572 | |
@@ -580,15 +580,15 @@ discard block |
||
580 | 580 | 'desc' => __('This indicates the attendee has been checked out', 'event_espresso') |
581 | 581 | ) |
582 | 582 | ); |
583 | - $this->_template_args['after_list_table'] = $this->_display_legend( $legend_items ); |
|
583 | + $this->_template_args['after_list_table'] = $this->_display_legend($legend_items); |
|
584 | 584 | |
585 | 585 | |
586 | - $dtt_id = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL; |
|
587 | - $go_back_url = !empty( $reg_id ) ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'event_registrations', 'event_id' => EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Event')->ID(), 'DTT_ID' => $dtt_id ), $this->_admin_base_url ) : ''; |
|
586 | + $dtt_id = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL; |
|
587 | + $go_back_url = ! empty($reg_id) ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'event_registrations', 'event_id' => EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Event')->ID(), 'DTT_ID' => $dtt_id), $this->_admin_base_url) : ''; |
|
588 | 588 | |
589 | - $this->_template_args['before_list_table'] = !empty( $reg_id ) && !empty( $dtt_id ) ? '<h2>' . sprintf(__("%s's check in records for %s at the event, %s", 'event_espresso'), '<span id="checkin-attendee-name">' . EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Attendee')->full_name() . '</span>', '<span id="checkin-dtt"><a href="' . $go_back_url . '">' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->start_date_and_time() . ' - ' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->end_date_and_time() . '</a></span>', '<span id="checkin-event-name">' . EEM_Datetime::instance()->get_one_by_ID($dtt_id)->get_first_related('Event')->get('EVT_name') . '</span>' ) . '</h2>' : ''; |
|
590 | - $this->_template_args['list_table_hidden_fields'] = !empty( $reg_id ) ? '<input type="hidden" name="_REGID" value="' . $reg_id . '">' : ''; |
|
591 | - $this->_template_args['list_table_hidden_fields'] .= !empty( $dtt_id ) ? '<input type="hidden" name="DTT_ID" value="' . $dtt_id . '">' : ''; |
|
589 | + $this->_template_args['before_list_table'] = ! empty($reg_id) && ! empty($dtt_id) ? '<h2>'.sprintf(__("%s's check in records for %s at the event, %s", 'event_espresso'), '<span id="checkin-attendee-name">'.EEM_Registration::instance()->get_one_by_ID($reg_id)->get_first_related('Attendee')->full_name().'</span>', '<span id="checkin-dtt"><a href="'.$go_back_url.'">'.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->start_date_and_time().' - '.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->end_date_and_time().'</a></span>', '<span id="checkin-event-name">'.EEM_Datetime::instance()->get_one_by_ID($dtt_id)->get_first_related('Event')->get('EVT_name').'</span>').'</h2>' : ''; |
|
590 | + $this->_template_args['list_table_hidden_fields'] = ! empty($reg_id) ? '<input type="hidden" name="_REGID" value="'.$reg_id.'">' : ''; |
|
591 | + $this->_template_args['list_table_hidden_fields'] .= ! empty($dtt_id) ? '<input type="hidden" name="DTT_ID" value="'.$dtt_id.'">' : ''; |
|
592 | 592 | |
593 | 593 | $this->display_admin_list_table_page_with_no_sidebar(); |
594 | 594 | } |
@@ -601,24 +601,24 @@ discard block |
||
601 | 601 | */ |
602 | 602 | public function toggle_checkin_status() { |
603 | 603 | //first make sure we have the necessary data |
604 | - if ( !isset( $this->_req_data['_regid'] ) ) { |
|
605 | - EE_Error::add_error( __('There must be something broken with the html structure because the required data for toggling the Check-in status is not being sent via ajax', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
604 | + if ( ! isset($this->_req_data['_regid'])) { |
|
605 | + EE_Error::add_error(__('There must be something broken with the html structure because the required data for toggling the Check-in status is not being sent via ajax', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
606 | 606 | $this->_template_args['success'] = FALSE; |
607 | 607 | $this->_template_args['error'] = TRUE; |
608 | 608 | $this->_return_json(); |
609 | 609 | }; |
610 | 610 | |
611 | 611 | //do a nonce check cause we're not coming in from an normal route here. |
612 | - $nonce = isset( $this->_req_data['checkinnonce'] ) ? sanitize_text_field( $this->_req_data['checkinnonce'] ) : ''; |
|
612 | + $nonce = isset($this->_req_data['checkinnonce']) ? sanitize_text_field($this->_req_data['checkinnonce']) : ''; |
|
613 | 613 | $nonce_ref = 'checkin_nonce'; |
614 | 614 | |
615 | - $this->_verify_nonce( $nonce, $nonce_ref ); |
|
615 | + $this->_verify_nonce($nonce, $nonce_ref); |
|
616 | 616 | |
617 | 617 | //beautiful! Made it this far so let's get the status. |
618 | 618 | $new_status = $this->_toggle_checkin_status(); |
619 | 619 | |
620 | 620 | //setup new class to return via ajax |
621 | - $this->_template_args['admin_page_content'] = 'clickable trigger-checkin checkin-icons checkedin-status-' . $new_status; |
|
621 | + $this->_template_args['admin_page_content'] = 'clickable trigger-checkin checkin-icons checkedin-status-'.$new_status; |
|
622 | 622 | $this->_template_args['success'] = TRUE; |
623 | 623 | $this->_return_json(); |
624 | 624 | } |
@@ -638,32 +638,32 @@ discard block |
||
638 | 638 | //first let's get the query args out of the way for the redirect |
639 | 639 | $query_args = array( |
640 | 640 | 'action' => 'event_registrations', |
641 | - 'event_id' => isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : NULL, |
|
642 | - 'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL |
|
641 | + 'event_id' => isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : NULL, |
|
642 | + 'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL |
|
643 | 643 | ); |
644 | 644 | $new_status = FALSE; |
645 | 645 | |
646 | 646 | // bulk action check in toggle |
647 | - if ( ! empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] )) { |
|
647 | + if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) { |
|
648 | 648 | // cycle thru checkboxes |
649 | - while ( list( $REG_ID, $value ) = each($this->_req_data['checkbox'])) { |
|
650 | - $DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL; |
|
649 | + while (list($REG_ID, $value) = each($this->_req_data['checkbox'])) { |
|
650 | + $DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL; |
|
651 | 651 | $new_status = $this->_toggle_checkin($REG_ID, $DTT_ID); |
652 | 652 | } |
653 | 653 | |
654 | - } elseif ( isset( $this->_req_data['_regid'] ) ) { |
|
654 | + } elseif (isset($this->_req_data['_regid'])) { |
|
655 | 655 | //coming from ajax request |
656 | - $DTT_ID = isset( $this->_req_data['dttid'] ) ? $this->_req_data['dttid'] : NULL; |
|
656 | + $DTT_ID = isset($this->_req_data['dttid']) ? $this->_req_data['dttid'] : NULL; |
|
657 | 657 | $query_args['DTT_ID'] = $DTT_ID; |
658 | 658 | $new_status = $this->_toggle_checkin($this->_req_data['_regid'], $DTT_ID); |
659 | 659 | } else { |
660 | - EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
660 | + EE_Error::add_error(__('Missing some required data to toggle the Check-in', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
661 | 661 | } |
662 | 662 | |
663 | - if ( defined('DOING_AJAX' ) ) |
|
663 | + if (defined('DOING_AJAX')) |
|
664 | 664 | return $new_status; |
665 | 665 | |
666 | - $this->_redirect_after_action( FALSE,'', '', $query_args, TRUE ); |
|
666 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
667 | 667 | |
668 | 668 | } |
669 | 669 | |
@@ -679,11 +679,11 @@ discard block |
||
679 | 679 | */ |
680 | 680 | private function _toggle_checkin($REG_ID, $DTT_ID) { |
681 | 681 | $REG = EEM_Registration::instance()->get_one_by_ID($REG_ID); |
682 | - $new_status = $REG->toggle_checkin_status( $DTT_ID ); |
|
683 | - if ( $new_status !== FALSE ) { |
|
684 | - EE_Error::add_success($REG->get_checkin_msg($DTT_ID) ); |
|
682 | + $new_status = $REG->toggle_checkin_status($DTT_ID); |
|
683 | + if ($new_status !== FALSE) { |
|
684 | + EE_Error::add_success($REG->get_checkin_msg($DTT_ID)); |
|
685 | 685 | } else { |
686 | - EE_Error::add_error($REG->get_checkin_msg($DTT_ID, TRUE), __FILE__, __FUNCTION__, __LINE__ ); |
|
686 | + EE_Error::add_error($REG->get_checkin_msg($DTT_ID, TRUE), __FILE__, __FUNCTION__, __LINE__); |
|
687 | 687 | $new_status = FALSE; |
688 | 688 | } |
689 | 689 | return $new_status; |
@@ -699,28 +699,28 @@ discard block |
||
699 | 699 | protected function _delete_checkin_rows() { |
700 | 700 | $query_args = array( |
701 | 701 | 'action' => 'registration_checkins', |
702 | - 'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0, |
|
703 | - '_REGID' => isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : 0 |
|
702 | + 'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0, |
|
703 | + '_REGID' => isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : 0 |
|
704 | 704 | ); |
705 | - if ( !empty( $this->_req_data['checkbox'] ) && is_array( $this->_req_data['checkbox'] ) ) { |
|
706 | - while ( list( $CHK_ID, $value ) = each( $this->_req_data['checkbox'] ) ) { |
|
705 | + if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) { |
|
706 | + while (list($CHK_ID, $value) = each($this->_req_data['checkbox'])) { |
|
707 | 707 | $errors = 0; |
708 | - if ( ! EEM_Checkin::instance()->delete_by_ID($CHK_ID ) ) { |
|
708 | + if ( ! EEM_Checkin::instance()->delete_by_ID($CHK_ID)) { |
|
709 | 709 | $errors++; |
710 | 710 | } |
711 | 711 | } |
712 | 712 | } else { |
713 | - EE_Error::add_error(__('So, something went wrong with the bulk delete because there was no data received for instructions on WHAT to delete!', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
714 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
713 | + EE_Error::add_error(__('So, something went wrong with the bulk delete because there was no data received for instructions on WHAT to delete!', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
714 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
715 | 715 | } |
716 | 716 | |
717 | - if ( $errors > 0 ) { |
|
718 | - EE_Error::add_error( sprintf( __('There were %d records that did not delete successfully', 'event_espresso'), $errors ), __FILE__, __FUNCTION__, __LINE__ ); |
|
717 | + if ($errors > 0) { |
|
718 | + EE_Error::add_error(sprintf(__('There were %d records that did not delete successfully', 'event_espresso'), $errors), __FILE__, __FUNCTION__, __LINE__); |
|
719 | 719 | } else { |
720 | - EE_Error::add_success( __('Records were successfully deleted', 'event_espresso') ); |
|
720 | + EE_Error::add_success(__('Records were successfully deleted', 'event_espresso')); |
|
721 | 721 | } |
722 | 722 | |
723 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
723 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
724 | 724 | } |
725 | 725 | |
726 | 726 | |
@@ -732,20 +732,20 @@ discard block |
||
732 | 732 | protected function _delete_checkin_row() { |
733 | 733 | $query_args = array( |
734 | 734 | 'action' => 'registration_checkins', |
735 | - 'DTT_ID' => isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : 0, |
|
736 | - '_REGID' => isset( $this->_req_data['_REGID'] ) ? $this->_req_data['_REGID'] : 0 |
|
735 | + 'DTT_ID' => isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : 0, |
|
736 | + '_REGID' => isset($this->_req_data['_REGID']) ? $this->_req_data['_REGID'] : 0 |
|
737 | 737 | ); |
738 | 738 | |
739 | - if ( !empty( $this->_req_data['CHK_ID'] ) ) { |
|
740 | - if ( ! EEM_Checkin::instance()->delete_by_ID($this->_req_data['CHK_ID'] ) ) { |
|
741 | - EE_Error::add_error(__('Something went wrong and this check-in record was not deleted', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
739 | + if ( ! empty($this->_req_data['CHK_ID'])) { |
|
740 | + if ( ! EEM_Checkin::instance()->delete_by_ID($this->_req_data['CHK_ID'])) { |
|
741 | + EE_Error::add_error(__('Something went wrong and this check-in record was not deleted', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
742 | 742 | } else { |
743 | - EE_Error::add_success( __('Check-In record successfully deleted', 'event_espresso') ); |
|
743 | + EE_Error::add_success(__('Check-In record successfully deleted', 'event_espresso')); |
|
744 | 744 | } |
745 | 745 | } else { |
746 | - EE_Error::add_error(__('In order to delete a Check-in record, there must be a Check-In ID available. There is not. It is not your fault, there is just a gremlin living in the code', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
746 | + EE_Error::add_error(__('In order to delete a Check-in record, there must be a Check-In ID available. There is not. It is not your fault, there is just a gremlin living in the code', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
747 | 747 | } |
748 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
748 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
749 | 749 | } |
750 | 750 | |
751 | 751 | |
@@ -758,8 +758,8 @@ discard block |
||
758 | 758 | * @return void |
759 | 759 | */ |
760 | 760 | protected function _event_registrations_list_table() { |
761 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
762 | - $this->_admin_page_title .= isset( $this->_req_data['event_id'] ) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : ''; |
|
761 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
762 | + $this->_admin_page_title .= isset($this->_req_data['event_id']) ? $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $this->_req_data['event_id']), 'add-new-h2') : ''; |
|
763 | 763 | |
764 | 764 | $legend_items = array( |
765 | 765 | 'star-icon' => array( |
@@ -783,31 +783,31 @@ discard block |
||
783 | 783 | 'desc' => __('View All Check-in Records for this Registrant', 'event_espresso') |
784 | 784 | ), |
785 | 785 | 'approved_status' => array( |
786 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved, |
|
787 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) |
|
786 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved, |
|
787 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence') |
|
788 | 788 | ), |
789 | 789 | 'cancelled_status' => array( |
790 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled, |
|
791 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) |
|
790 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled, |
|
791 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence') |
|
792 | 792 | ), |
793 | 793 | 'declined_status' => array( |
794 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined, |
|
795 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) |
|
794 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined, |
|
795 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence') |
|
796 | 796 | ), |
797 | 797 | 'not_approved' => array( |
798 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved, |
|
799 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ) |
|
798 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved, |
|
799 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence') |
|
800 | 800 | ), |
801 | 801 | 'pending_status' => array( |
802 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment, |
|
803 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ) |
|
802 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment, |
|
803 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence') |
|
804 | 804 | )/**/ |
805 | 805 | ); |
806 | - $this->_template_args['after_list_table'] = $this->_display_legend( $legend_items ); |
|
806 | + $this->_template_args['after_list_table'] = $this->_display_legend($legend_items); |
|
807 | 807 | |
808 | - $event_id = isset( $this->_req_data['event_id'] ) ? $this->_req_data['event_id'] : null; |
|
809 | - $this->_template_args['before_list_table'] = !empty( $event_id ) ? '<h2>' . sprintf(__('Viewing Registrations for Event: %s', 'event_espresso'), EEM_Event::instance()->get_one_by_ID($event_id)->get('EVT_name') ) . '</h2>' : ''; |
|
810 | - $this->_template_args['list_table_hidden_fields'] = !empty( $event_id ) ? '<input type="hidden" name="event_id" value="' . $event_id . '">' : ''; |
|
808 | + $event_id = isset($this->_req_data['event_id']) ? $this->_req_data['event_id'] : null; |
|
809 | + $this->_template_args['before_list_table'] = ! empty($event_id) ? '<h2>'.sprintf(__('Viewing Registrations for Event: %s', 'event_espresso'), EEM_Event::instance()->get_one_by_ID($event_id)->get('EVT_name')).'</h2>' : ''; |
|
810 | + $this->_template_args['list_table_hidden_fields'] = ! empty($event_id) ? '<input type="hidden" name="event_id" value="'.$event_id.'">' : ''; |
|
811 | 811 | |
812 | 812 | $this->display_admin_list_table_page_with_no_sidebar(); |
813 | 813 | } |
@@ -821,15 +821,15 @@ discard block |
||
821 | 821 | * @access public |
822 | 822 | * @return array |
823 | 823 | */ |
824 | - public function get_event_attendees( $per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '' ) { |
|
824 | + public function get_event_attendees($per_page = 10, $count = FALSE, $trash = FALSE, $orderby = '') { |
|
825 | 825 | |
826 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
827 | - require_once(EE_MODELS . 'EEM_Attendee.model.php'); |
|
826 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
827 | + require_once(EE_MODELS.'EEM_Attendee.model.php'); |
|
828 | 828 | //$ATT_MDL = EEM_Attendee::instance(); |
829 | 829 | |
830 | - $EVT_ID = isset($this->_req_data['event_id']) ? absint( $this->_req_data['event_id'] ) : FALSE; |
|
831 | - $CAT_ID = isset($this->_req_data['category_id']) ? absint( $this->_req_data['category_id'] ) : FALSE; |
|
832 | - $DTT_ID = isset( $this->_req_data['DTT_ID'] ) ? $this->_req_data['DTT_ID'] : NULL; |
|
830 | + $EVT_ID = isset($this->_req_data['event_id']) ? absint($this->_req_data['event_id']) : FALSE; |
|
831 | + $CAT_ID = isset($this->_req_data['category_id']) ? absint($this->_req_data['category_id']) : FALSE; |
|
832 | + $DTT_ID = isset($this->_req_data['DTT_ID']) ? $this->_req_data['DTT_ID'] : NULL; |
|
833 | 833 | |
834 | 834 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : $orderby; |
835 | 835 | |
@@ -842,94 +842,94 @@ discard block |
||
842 | 842 | // $orderby = 'reg.REG_final_price'; |
843 | 843 | } |
844 | 844 | |
845 | - $sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC'; |
|
845 | + $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC'; |
|
846 | 846 | |
847 | - $current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1; |
|
848 | - $per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page; |
|
847 | + $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1; |
|
848 | + $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page; |
|
849 | 849 | |
850 | 850 | |
851 | - $offset = ($current_page-1)*$per_page; |
|
852 | - $limit = $count ? NULL : array( $offset, $per_page ); |
|
853 | - $query_params = array(array('Event.status'=>array('IN', array_keys(EEM_Event::instance()->get_status_array())))); |
|
854 | - if ($EVT_ID){ |
|
855 | - $query_params[0]['EVT_ID']=$EVT_ID; |
|
851 | + $offset = ($current_page - 1) * $per_page; |
|
852 | + $limit = $count ? NULL : array($offset, $per_page); |
|
853 | + $query_params = array(array('Event.status'=>array('IN', array_keys(EEM_Event::instance()->get_status_array())))); |
|
854 | + if ($EVT_ID) { |
|
855 | + $query_params[0]['EVT_ID'] = $EVT_ID; |
|
856 | 856 | } |
857 | - if($CAT_ID){ |
|
857 | + if ($CAT_ID) { |
|
858 | 858 | throw new EE_Error("You specified a Category Id for this query. Thats odd because we are now using terms and taxonomies. So did you mean the term taxonomy id o rthe term id?"); |
859 | 859 | } |
860 | 860 | |
861 | 861 | //if DTT is included we do multiple datetimes. |
862 | - if ( $DTT_ID ) { |
|
862 | + if ($DTT_ID) { |
|
863 | 863 | $query_params[0]['Ticket.Datetime.DTT_ID'] = $DTT_ID; |
864 | 864 | } |
865 | 865 | |
866 | 866 | //make sure we only have default where on the current regs |
867 | 867 | $query_params['default_where_conditions'] = 'this_model_only'; |
868 | 868 | |
869 | - $status_ids_array = apply_filters( 'FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array( EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved ) ); |
|
869 | + $status_ids_array = apply_filters('FHEE__Extend_Registrations_Admin_Page__get_event_attendees__status_ids_array', array(EEM_Registration::status_id_pending_payment, EEM_Registration::status_id_approved)); |
|
870 | 870 | |
871 | - $query_params[0]['STS_ID']= array('IN', $status_ids_array ); |
|
871 | + $query_params[0]['STS_ID'] = array('IN', $status_ids_array); |
|
872 | 872 | |
873 | - if($trash){ |
|
874 | - $query_params[0]['Attendee.status']= EEM_CPT_Base::post_status_trashed; |
|
873 | + if ($trash) { |
|
874 | + $query_params[0]['Attendee.status'] = EEM_CPT_Base::post_status_trashed; |
|
875 | 875 | } |
876 | 876 | |
877 | - if ( isset( $this->_req_data['s'] ) ) { |
|
878 | - $sstr = '%' . $this->_req_data['s'] . '%'; |
|
877 | + if (isset($this->_req_data['s'])) { |
|
878 | + $sstr = '%'.$this->_req_data['s'].'%'; |
|
879 | 879 | $query_params[0]['OR'] = array( |
880 | - 'Event.EVT_name' => array( 'LIKE', $sstr), |
|
881 | - 'Event.EVT_desc' => array( 'LIKE', $sstr ), |
|
882 | - 'Event.EVT_short_desc' => array( 'LIKE' , $sstr ), |
|
883 | - 'Attendee.ATT_fname' => array( 'LIKE', $sstr ), |
|
884 | - 'Attendee.ATT_lname' => array( 'LIKE', $sstr ), |
|
885 | - 'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ), |
|
886 | - 'Attendee.ATT_email' => array('LIKE', $sstr ), |
|
887 | - 'Attendee.ATT_address' => array( 'LIKE', $sstr ), |
|
888 | - 'Attendee.ATT_address2' => array( 'LIKE', $sstr ), |
|
889 | - 'Attendee.ATT_city' => array( 'LIKE', $sstr ), |
|
890 | - 'REG_final_price' => array( 'LIKE', $sstr ), |
|
891 | - 'REG_code' => array( 'LIKE', $sstr ), |
|
892 | - 'REG_count' => array( 'LIKE' , $sstr ), |
|
893 | - 'REG_group_size' => array( 'LIKE' , $sstr ), |
|
894 | - 'Ticket.TKT_name' => array( 'LIKE', $sstr ), |
|
895 | - 'Ticket.TKT_description' => array( 'LIKE', $sstr ) |
|
880 | + 'Event.EVT_name' => array('LIKE', $sstr), |
|
881 | + 'Event.EVT_desc' => array('LIKE', $sstr), |
|
882 | + 'Event.EVT_short_desc' => array('LIKE', $sstr), |
|
883 | + 'Attendee.ATT_fname' => array('LIKE', $sstr), |
|
884 | + 'Attendee.ATT_lname' => array('LIKE', $sstr), |
|
885 | + 'Attendee.ATT_short_bio' => array('LIKE', $sstr), |
|
886 | + 'Attendee.ATT_email' => array('LIKE', $sstr), |
|
887 | + 'Attendee.ATT_address' => array('LIKE', $sstr), |
|
888 | + 'Attendee.ATT_address2' => array('LIKE', $sstr), |
|
889 | + 'Attendee.ATT_city' => array('LIKE', $sstr), |
|
890 | + 'REG_final_price' => array('LIKE', $sstr), |
|
891 | + 'REG_code' => array('LIKE', $sstr), |
|
892 | + 'REG_count' => array('LIKE', $sstr), |
|
893 | + 'REG_group_size' => array('LIKE', $sstr), |
|
894 | + 'Ticket.TKT_name' => array('LIKE', $sstr), |
|
895 | + 'Ticket.TKT_description' => array('LIKE', $sstr) |
|
896 | 896 | ); |
897 | 897 | } |
898 | 898 | |
899 | 899 | $query_params['order_by'][$orderby] = $sort; |
900 | 900 | $query_params['limit'] = $limit; |
901 | - $query_params['force_join'] = array('Attendee');//force join to attendee model so that it gets cached, because we're going to need the attendee for each registration |
|
902 | - if($count){ |
|
903 | - $registrations = EEM_Registration::instance()->count(array($query_params[0], 'default_where_conditions' => 'this_model_only' )); |
|
904 | - }else{ |
|
901 | + $query_params['force_join'] = array('Attendee'); //force join to attendee model so that it gets cached, because we're going to need the attendee for each registration |
|
902 | + if ($count) { |
|
903 | + $registrations = EEM_Registration::instance()->count(array($query_params[0], 'default_where_conditions' => 'this_model_only')); |
|
904 | + } else { |
|
905 | 905 | $registrations = EEM_Registration::instance()->get_all($query_params); |
906 | 906 | |
907 | 907 | |
908 | 908 | // $registrations = EEM_Registration::instance(); |
909 | 909 | // $all_attendees = EEM_Attendee::instance()->get_event_attendees( $EVT_ID, $CAT_ID, $reg_status, $trash, $orderby, $sort, $limit, $output ); |
910 | - if ( isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration ) { |
|
910 | + if (isset($registrations[0]) && $registrations[0] instanceof EE_Registration) { |
|
911 | 911 | //EEH_Debug_Tools::printr( $all_attendees[0], '$all_attendees[0] <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
912 | 912 | // name |
913 | 913 | $first_registration = $registrations[0]; |
914 | 914 | $event_obj = $first_registration->event_obj(); |
915 | - if($event_obj){ |
|
915 | + if ($event_obj) { |
|
916 | 916 | $event_name = $first_registration->event_obj()->name(); |
917 | - $event_date = 'TODO: we need to get date from earliest price date or should this be the actual event date?';//$first_registration->date_obj()->reg_start_date_and_time('l F j, Y,', ' g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y, g:i:s a', $registrations[0]->DTT_EVT_start ) : ''; |
|
917 | + $event_date = 'TODO: we need to get date from earliest price date or should this be the actual event date?'; //$first_registration->date_obj()->reg_start_date_and_time('l F j, Y,', ' g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y, g:i:s a', $registrations[0]->DTT_EVT_start ) : ''; |
|
918 | 918 | // edit event link |
919 | - if ( $event_name != '' ) { |
|
920 | - $edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL ); |
|
921 | - $edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>'; |
|
922 | - $event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ; |
|
919 | + if ($event_name != '') { |
|
920 | + $edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL); |
|
921 | + $edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>'; |
|
922 | + $event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>'; |
|
923 | 923 | } |
924 | 924 | |
925 | - $back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL ); |
|
926 | - $back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">« ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>'; |
|
925 | + $back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL); |
|
926 | + $back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">« '.__('Back to All Registrations', 'event_espresso').'</a>'; |
|
927 | 927 | |
928 | 928 | $this->_template_args['before_admin_page_content'] = ' |
929 | 929 | <div id="admin-page-header"> |
930 | - <h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1> |
|
931 | - <h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3> |
|
932 | - <span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span> |
|
930 | + <h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1> |
|
931 | + <h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3> |
|
932 | + <span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span> |
|
933 | 933 | </div> |
934 | 934 | '; |
935 | 935 | } |
@@ -191,7 +191,7 @@ |
||
191 | 191 | * generates Business Report showing total revenue per event. |
192 | 192 | * |
193 | 193 | * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated. |
194 | - * @return int |
|
194 | + * @return string |
|
195 | 195 | */ |
196 | 196 | private function _revenue_per_event_report( $period = '-1 month' ) { |
197 | 197 |
@@ -122,9 +122,9 @@ |
||
122 | 122 | /** |
123 | 123 | * _transaction_reports |
124 | 124 | * generates Business Reports regarding Transactions |
125 | - * |
|
126 | - * @return void |
|
127 | - */ |
|
125 | + * |
|
126 | + * @return void |
|
127 | + */ |
|
128 | 128 | protected function _transaction_reports() { |
129 | 129 | $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php'; |
130 | 130 | $this->_admin_page_title = __('Transactions', 'event_espresso'); |
@@ -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 | /** |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | * @param bool $routing |
43 | 43 | * @return \Extend_Transactions_Admin_Page |
44 | 44 | */ |
45 | - public function __construct( $routing = TRUE ) { |
|
46 | - parent::__construct( $routing ); |
|
47 | - define( 'TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/templates/'); |
|
48 | - define( 'TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND . 'transactions/assets/'); |
|
49 | - define( 'TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL . 'transactions/assets/'); |
|
45 | + public function __construct($routing = TRUE) { |
|
46 | + parent::__construct($routing); |
|
47 | + define('TXN_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'transactions/templates/'); |
|
48 | + define('TXN_CAF_ASSETS', EE_CORE_CAF_ADMIN_EXTEND.'transactions/assets/'); |
|
49 | + define('TXN_CAF_ASSETS_URL', EE_CORE_CAF_ADMIN_EXTEND_URL.'transactions/assets/'); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * @return void |
59 | 59 | */ |
60 | 60 | protected function _extend_page_config() { |
61 | - $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'transactions'; |
|
61 | + $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'transactions'; |
|
62 | 62 | |
63 | 63 | $new_page_routes = array( |
64 | 64 | 'reports' => array( |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ) |
68 | 68 | ); |
69 | 69 | |
70 | - $this->_page_routes = array_merge( $this->_page_routes, $new_page_routes ); |
|
70 | + $this->_page_routes = array_merge($this->_page_routes, $new_page_routes); |
|
71 | 71 | |
72 | 72 | $new_page_config = array( |
73 | 73 | 'reports' => array( |
@@ -81,11 +81,11 @@ discard block |
||
81 | 81 | 'filename' => 'transactions_reports' |
82 | 82 | ) |
83 | 83 | ), |
84 | - 'help_tour' => array( 'Transaction_Reports_Help_Tour' ), |
|
84 | + 'help_tour' => array('Transaction_Reports_Help_Tour'), |
|
85 | 85 | 'require_nonce' => FALSE |
86 | 86 | ) |
87 | 87 | ); |
88 | - $this->_page_config = array_merge( $this->_page_config, $new_page_config ); |
|
88 | + $this->_page_config = array_merge($this->_page_config, $new_page_config); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | * @return void |
98 | 98 | */ |
99 | 99 | public function load_scripts_styles_reports() { |
100 | - wp_register_script( 'ee-txn-reports-js', TXN_CAF_ASSETS_URL . 'ee-transaction-admin-reports.js', array( 'google-charts' ), EVENT_ESPRESSO_VERSION, true ); |
|
101 | - wp_enqueue_script( 'ee-txn-reports-js' ); |
|
100 | + wp_register_script('ee-txn-reports-js', TXN_CAF_ASSETS_URL.'ee-transaction-admin-reports.js', array('google-charts'), EVENT_ESPRESSO_VERSION, true); |
|
101 | + wp_enqueue_script('ee-txn-reports-js'); |
|
102 | 102 | $this->_transaction_reports_js_setup(); |
103 | 103 | EE_Registry::instance()->load_helper('Money'); |
104 | 104 | EE_Registry::$i18n_js_strings['currency_format'] = EEH_Money::get_format_for_google_charts(); |
@@ -126,9 +126,9 @@ discard block |
||
126 | 126 | * @return void |
127 | 127 | */ |
128 | 128 | protected function _transaction_reports() { |
129 | - $template_path = EE_ADMIN_TEMPLATE . 'admin_reports.template.php'; |
|
129 | + $template_path = EE_ADMIN_TEMPLATE.'admin_reports.template.php'; |
|
130 | 130 | $this->_admin_page_title = __('Transactions', 'event_espresso'); |
131 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_reports_template_data, TRUE ); |
|
131 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_reports_template_data, TRUE); |
|
132 | 132 | |
133 | 133 | // the final template wrapper |
134 | 134 | $this->display_admin_page_with_no_sidebar(); |
@@ -143,43 +143,43 @@ discard block |
||
143 | 143 | * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated. |
144 | 144 | * @return string |
145 | 145 | */ |
146 | - private function _revenue_per_day_report( $period = '-1 month' ) { |
|
146 | + private function _revenue_per_day_report($period = '-1 month') { |
|
147 | 147 | |
148 | 148 | $report_ID = 'txn-admin-revenue-per-day-report-dv'; |
149 | 149 | |
150 | 150 | $TXN = EEM_Transaction::instance(); |
151 | 151 | |
152 | - $results = $TXN->get_revenue_per_day_report( $period ); |
|
152 | + $results = $TXN->get_revenue_per_day_report($period); |
|
153 | 153 | $results = (array) $results; |
154 | 154 | $revenue = array(); |
155 | 155 | $subtitle = ''; |
156 | 156 | |
157 | - if ( $results ) { |
|
158 | - $revenue[] = array( __( 'Date (only shows dates that have a revenue greater than 1)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) ); |
|
159 | - foreach ( $results as $result ) { |
|
160 | - if ( $result->revenue > 1 ) { |
|
161 | - $revenue[] = array( $result->txnDate, (float) $result->revenue ); |
|
157 | + if ($results) { |
|
158 | + $revenue[] = array(__('Date (only shows dates that have a revenue greater than 1)', 'event_espresso'), __('Total Revenue', 'event_espresso')); |
|
159 | + foreach ($results as $result) { |
|
160 | + if ($result->revenue > 1) { |
|
161 | + $revenue[] = array($result->txnDate, (float) $result->revenue); |
|
162 | 162 | } |
163 | 163 | } |
164 | 164 | |
165 | 165 | //setup the date range. |
166 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
167 | - $beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
168 | - $ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
169 | - $subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) ); |
|
166 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
167 | + $beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
168 | + $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
169 | + $subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d')); |
|
170 | 170 | } |
171 | 171 | |
172 | - $report_title = __( 'Total Revenue per Day' ); |
|
172 | + $report_title = __('Total Revenue per Day'); |
|
173 | 173 | |
174 | 174 | $report_params = array( |
175 | 175 | 'title' => $report_title, |
176 | 176 | 'subtitle' => $subtitle, |
177 | 177 | 'id' => $report_ID, |
178 | 178 | 'revenue' => $revenue, |
179 | - 'noResults' => empty( $revenue ), |
|
180 | - 'noTxnMsg' => sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' ) |
|
179 | + 'noResults' => empty($revenue), |
|
180 | + 'noTxnMsg' => sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>') |
|
181 | 181 | ); |
182 | - wp_localize_script( 'ee-txn-reports-js', 'txnRevPerDay', $report_params ); |
|
182 | + wp_localize_script('ee-txn-reports-js', 'txnRevPerDay', $report_params); |
|
183 | 183 | |
184 | 184 | return $report_ID; |
185 | 185 | } |
@@ -193,44 +193,44 @@ discard block |
||
193 | 193 | * @param string $period The period (acceptable by PHP Datetime constructor) for which the report is generated. |
194 | 194 | * @return int |
195 | 195 | */ |
196 | - private function _revenue_per_event_report( $period = '-1 month' ) { |
|
196 | + private function _revenue_per_event_report($period = '-1 month') { |
|
197 | 197 | |
198 | 198 | $report_ID = 'txn-admin-revenue-per-event-report-dv'; |
199 | 199 | |
200 | 200 | $TXN = EEM_Transaction::instance(); |
201 | - $results = $TXN->get_revenue_per_event_report( $period ); |
|
201 | + $results = $TXN->get_revenue_per_event_report($period); |
|
202 | 202 | $results = (array) $results; |
203 | 203 | $revenue = array(); |
204 | 204 | $subtitle = ''; |
205 | 205 | |
206 | - if ( $results ) { |
|
207 | - $revenue[] = array( __( 'Event (only events that have a revenue greater than 1 are shown)', 'event_espresso' ), __( 'Total Revenue', 'event_espresso' ) ); |
|
208 | - foreach ( $results as $result ) { |
|
209 | - if ( $result->revenue > 1 ) { |
|
210 | - $event_name = stripslashes( html_entity_decode( $result->event_name, ENT_QUOTES, 'UTF-8' ) ); |
|
211 | - $event_name = wp_trim_words( $event_name, 5, '...' ); |
|
212 | - $revenue[] = array( $event_name, (float) $result->revenue ); |
|
206 | + if ($results) { |
|
207 | + $revenue[] = array(__('Event (only events that have a revenue greater than 1 are shown)', 'event_espresso'), __('Total Revenue', 'event_espresso')); |
|
208 | + foreach ($results as $result) { |
|
209 | + if ($result->revenue > 1) { |
|
210 | + $event_name = stripslashes(html_entity_decode($result->event_name, ENT_QUOTES, 'UTF-8')); |
|
211 | + $event_name = wp_trim_words($event_name, 5, '...'); |
|
212 | + $revenue[] = array($event_name, (float) $result->revenue); |
|
213 | 213 | } |
214 | 214 | } |
215 | 215 | |
216 | 216 | //setup the date range. |
217 | - EE_Registry::instance()->load_helper( 'DTT_Helper' ); |
|
218 | - $beginning_date = new DateTime( 'now' . $period, new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
219 | - $ending_date = new DateTime( 'now', new DateTimeZone( EEH_DTT_Helper::get_timezone() ) ); |
|
220 | - $subtitle = sprintf( _x( 'For the period: %s to %s', 'Used to give date range', 'event_espresso' ), $beginning_date->format( 'Y-m-d' ), $ending_date->format( 'Y-m-d' ) ); |
|
217 | + EE_Registry::instance()->load_helper('DTT_Helper'); |
|
218 | + $beginning_date = new DateTime('now'.$period, new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
219 | + $ending_date = new DateTime('now', new DateTimeZone(EEH_DTT_Helper::get_timezone())); |
|
220 | + $subtitle = sprintf(_x('For the period: %s to %s', 'Used to give date range', 'event_espresso'), $beginning_date->format('Y-m-d'), $ending_date->format('Y-m-d')); |
|
221 | 221 | } |
222 | 222 | |
223 | - $report_title = __( 'Total Revenue per Event' ); |
|
223 | + $report_title = __('Total Revenue per Event'); |
|
224 | 224 | |
225 | 225 | $report_params = array( |
226 | 226 | 'title' => $report_title, |
227 | 227 | 'subtitle' => $subtitle, |
228 | 228 | 'id' => $report_ID, |
229 | 229 | 'revenue' => $revenue, |
230 | - 'noResults' => empty( $revenue ), |
|
231 | - 'noTxnMsg' => sprintf( __( '%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso' ), '<h2>' . $report_title . '</h2><p>', '</p>' ) |
|
230 | + 'noResults' => empty($revenue), |
|
231 | + 'noTxnMsg' => sprintf(__('%sThere are currently no transaction records in the last month for this report.%s', 'event_espresso'), '<h2>'.$report_title.'</h2><p>', '</p>') |
|
232 | 232 | ); |
233 | - wp_localize_script( 'ee-txn-reports-js', 'txnRevPerEvent', $report_params ); |
|
233 | + wp_localize_script('ee-txn-reports-js', 'txnRevPerEvent', $report_params); |
|
234 | 234 | |
235 | 235 | return $report_ID; |
236 | 236 | } |
@@ -144,9 +144,9 @@ discard block |
||
144 | 144 | * @access public |
145 | 145 | * @return void |
146 | 146 | */ |
147 | - public function __construct( $routing = TRUE ) { |
|
147 | + public function __construct($routing = TRUE) { |
|
148 | 148 | |
149 | - if ( strpos( $this->_get_dir(), 'caffeinated' ) !== false ) |
|
149 | + if (strpos($this->_get_dir(), 'caffeinated') !== false) |
|
150 | 150 | $this->_is_caf = TRUE; |
151 | 151 | |
152 | 152 | $this->_yes_no_values = array( |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | |
158 | 158 | |
159 | 159 | //set the _req_data property. |
160 | - $this->_req_data = array_merge( $_GET, $_POST ); |
|
160 | + $this->_req_data = array_merge($_GET, $_POST); |
|
161 | 161 | |
162 | 162 | |
163 | 163 | //routing enabled? |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | $this->_do_other_page_hooks(); |
179 | 179 | |
180 | 180 | //This just allows us to have extending clases do something specific before the parent constructor runs _page_setup. |
181 | - if ( method_exists( $this, '_before_page_setup' ) ) |
|
181 | + if (method_exists($this, '_before_page_setup')) |
|
182 | 182 | $this->_before_page_setup(); |
183 | 183 | |
184 | 184 | //set up page dependencies |
@@ -448,16 +448,16 @@ discard block |
||
448 | 448 | */ |
449 | 449 | protected function _global_ajax_hooks() { |
450 | 450 | //for lazy loading of metabox content |
451 | - add_action( 'wp_ajax_espresso-ajax-content', array( $this, 'ajax_metabox_content'), 10 ); |
|
451 | + add_action('wp_ajax_espresso-ajax-content', array($this, 'ajax_metabox_content'), 10); |
|
452 | 452 | } |
453 | 453 | |
454 | 454 | |
455 | 455 | |
456 | 456 | public function ajax_metabox_content() { |
457 | - $contentid = isset( $this->_req_data['contentid'] ) ? $this->_req_data['contentid'] : ''; |
|
458 | - $url = isset( $this->_req_data['contenturl'] ) ? $this->_req_data['contenturl'] : ''; |
|
457 | + $contentid = isset($this->_req_data['contentid']) ? $this->_req_data['contentid'] : ''; |
|
458 | + $url = isset($this->_req_data['contenturl']) ? $this->_req_data['contenturl'] : ''; |
|
459 | 459 | |
460 | - self::cached_rss_display( $contentid, $url ); |
|
460 | + self::cached_rss_display($contentid, $url); |
|
461 | 461 | wp_die(); |
462 | 462 | } |
463 | 463 | |
@@ -478,87 +478,87 @@ discard block |
||
478 | 478 | |
479 | 479 | |
480 | 480 | //admin_init stuff - global - we're setting this REALLY early so if EE_Admin pages have to hook into other WP pages they can. But keep in mind, not everything is available from the EE_Admin Page object at this point. |
481 | - add_action( 'admin_init', array( $this, 'admin_init_global' ), 5 ); |
|
481 | + add_action('admin_init', array($this, 'admin_init_global'), 5); |
|
482 | 482 | |
483 | 483 | |
484 | 484 | //next verify if we need to load anything... |
485 | - $this->_current_page = !empty( $_GET['page'] ) ? sanitize_key( $_GET['page'] ) : FALSE; |
|
486 | - $this->page_folder = strtolower( str_replace( '_Admin_Page', '', str_replace( 'Extend_', '', get_class($this) ) ) ); |
|
485 | + $this->_current_page = ! empty($_GET['page']) ? sanitize_key($_GET['page']) : FALSE; |
|
486 | + $this->page_folder = strtolower(str_replace('_Admin_Page', '', str_replace('Extend_', '', get_class($this)))); |
|
487 | 487 | |
488 | 488 | global $ee_menu_slugs; |
489 | 489 | $ee_menu_slugs = (array) $ee_menu_slugs; |
490 | 490 | |
491 | - if ( ( !$this->_current_page || ! isset( $ee_menu_slugs[$this->_current_page] ) ) && !defined( 'DOING_AJAX') ) return FALSE; |
|
491 | + if (( ! $this->_current_page || ! isset($ee_menu_slugs[$this->_current_page])) && ! defined('DOING_AJAX')) return FALSE; |
|
492 | 492 | |
493 | 493 | |
494 | 494 | // becuz WP List tables have two duplicate select inputs for choosing bulk actions, we need to copy the action from the second to the first |
495 | - if ( isset( $this->_req_data['action2'] ) && $this->_req_data['action'] == -1 ) { |
|
496 | - $this->_req_data['action'] = ! empty( $this->_req_data['action2'] ) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action']; |
|
495 | + if (isset($this->_req_data['action2']) && $this->_req_data['action'] == -1) { |
|
496 | + $this->_req_data['action'] = ! empty($this->_req_data['action2']) && $this->_req_data['action2'] != -1 ? $this->_req_data['action2'] : $this->_req_data['action']; |
|
497 | 497 | } |
498 | 498 | // then set blank or -1 action values to 'default' |
499 | - $this->_req_action = isset( $this->_req_data['action'] ) && ! empty( $this->_req_data['action'] ) && $this->_req_data['action'] != -1 ? sanitize_key( $this->_req_data['action'] ) : 'default'; |
|
499 | + $this->_req_action = isset($this->_req_data['action']) && ! empty($this->_req_data['action']) && $this->_req_data['action'] != -1 ? sanitize_key($this->_req_data['action']) : 'default'; |
|
500 | 500 | |
501 | 501 | //if action is 'default' after the above BUT we have 'route' var set, then let's use the route as the action. This covers cases where we're coming in from a list table that isn't on the default route. |
502 | - $this->_req_action = $this->_req_action == 'default' && isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : $this->_req_action; |
|
502 | + $this->_req_action = $this->_req_action == 'default' && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action; |
|
503 | 503 | |
504 | 504 | //however if we are doing_ajax and we've got a 'route' set then that's what the req_action will be |
505 | 505 | $this->_req_action = defined('DOING_AJAX') && isset($this->_req_data['route']) ? $this->_req_data['route'] : $this->_req_action; |
506 | 506 | |
507 | 507 | $this->_current_view = $this->_req_action; |
508 | - $this->_req_nonce = $this->_req_action . '_nonce'; |
|
508 | + $this->_req_nonce = $this->_req_action.'_nonce'; |
|
509 | 509 | $this->_define_page_props(); |
510 | 510 | |
511 | - $this->_current_page_view_url = add_query_arg( array( 'page' => $this->_current_page, 'action' => $this->_current_view ), $this->_admin_base_url ); |
|
511 | + $this->_current_page_view_url = add_query_arg(array('page' => $this->_current_page, 'action' => $this->_current_view), $this->_admin_base_url); |
|
512 | 512 | |
513 | 513 | //default things |
514 | - $this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box' ); |
|
514 | + $this->_default_espresso_metaboxes = array('_espresso_news_post_box', '_espresso_links_post_box', '_espresso_ratings_request', '_espresso_sponsors_post_box'); |
|
515 | 515 | |
516 | 516 | //set page configs |
517 | 517 | $this->_set_page_routes(); |
518 | 518 | $this->_set_page_config(); |
519 | 519 | |
520 | 520 | //let's include any referrer data in our default_query_args for this route for "stickiness". |
521 | - if ( isset( $this->_req_data['wp_referer'] ) ) { |
|
521 | + if (isset($this->_req_data['wp_referer'])) { |
|
522 | 522 | $this->_default_route_query_args['wp_referer'] = $this->_req_data['wp_referer']; |
523 | 523 | } |
524 | 524 | |
525 | 525 | //for caffeinated and other extended functionality. If there is a _extend_page_config method then let's run that to modify the all the various page configuration arrays |
526 | - if ( method_exists( $this, '_extend_page_config' ) ) |
|
526 | + if (method_exists($this, '_extend_page_config')) |
|
527 | 527 | $this->_extend_page_config(); |
528 | 528 | |
529 | 529 | //for CPT and other extended functionality. If there is an _extend_page_config_for_cpt then let's run that to modify all the various page configuration arrays. |
530 | - if ( method_exists( $this, '_extend_page_config_for_cpt' ) ) |
|
530 | + if (method_exists($this, '_extend_page_config_for_cpt')) |
|
531 | 531 | $this->_extend_page_config_for_cpt(); |
532 | 532 | |
533 | 533 | //filter routes and page_config so addons can add their stuff. Filtering done per class |
534 | - $this->_page_routes = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_routes', $this->_page_routes, $this ); |
|
535 | - $this->_page_config = apply_filters( 'FHEE__' . get_class($this) . '__page_setup__page_config', $this->_page_config, $this ); |
|
534 | + $this->_page_routes = apply_filters('FHEE__'.get_class($this).'__page_setup__page_routes', $this->_page_routes, $this); |
|
535 | + $this->_page_config = apply_filters('FHEE__'.get_class($this).'__page_setup__page_config', $this->_page_config, $this); |
|
536 | 536 | |
537 | 537 | |
538 | 538 | //if AHEE__EE_Admin_Page__route_admin_request_$this->_current_view method is present then we call it hooked into the AHEE__EE_Admin_Page__route_admin_request action |
539 | - if ( method_exists( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ) ) { |
|
540 | - add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'AHEE__EE_Admin_Page__route_admin_request_' . $this->_current_view ), 10, 2 ); |
|
539 | + if (method_exists($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view)) { |
|
540 | + add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'AHEE__EE_Admin_Page__route_admin_request_'.$this->_current_view), 10, 2); |
|
541 | 541 | } |
542 | 542 | |
543 | 543 | |
544 | 544 | //next route only if routing enabled |
545 | - if ( $this->_routing && !defined('DOING_AJAX') ) { |
|
545 | + if ($this->_routing && ! defined('DOING_AJAX')) { |
|
546 | 546 | |
547 | 547 | $this->_verify_routes(); |
548 | 548 | |
549 | 549 | //next let's just check user_access and kill if no access |
550 | 550 | $this->check_user_access(); |
551 | 551 | |
552 | - if ( $this->_is_UI_request ) { |
|
552 | + if ($this->_is_UI_request) { |
|
553 | 553 | //admin_init stuff - global, all views for this page class, specific view |
554 | - add_action( 'admin_init', array( $this, 'admin_init' ), 10 ); |
|
555 | - if ( method_exists( $this, 'admin_init_' . $this->_current_view )) { |
|
556 | - add_action( 'admin_init', array( $this, 'admin_init_' . $this->_current_view ), 15 ); |
|
554 | + add_action('admin_init', array($this, 'admin_init'), 10); |
|
555 | + if (method_exists($this, 'admin_init_'.$this->_current_view)) { |
|
556 | + add_action('admin_init', array($this, 'admin_init_'.$this->_current_view), 15); |
|
557 | 557 | } |
558 | 558 | |
559 | 559 | } else { |
560 | 560 | //hijack regular WP loading and route admin request immediately |
561 | - @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) ); |
|
561 | + @ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT)); |
|
562 | 562 | $this->route_admin_request(); |
563 | 563 | } |
564 | 564 | } |
@@ -575,18 +575,18 @@ discard block |
||
575 | 575 | * @return void |
576 | 576 | */ |
577 | 577 | private function _do_other_page_hooks() { |
578 | - $registered_pages = apply_filters( 'FHEE_do_other_page_hooks_' . $this->page_slug, array() ); |
|
578 | + $registered_pages = apply_filters('FHEE_do_other_page_hooks_'.$this->page_slug, array()); |
|
579 | 579 | |
580 | - foreach ( $registered_pages as $page ) { |
|
580 | + foreach ($registered_pages as $page) { |
|
581 | 581 | |
582 | 582 | //now let's setup the file name and class that should be present |
583 | 583 | $classname = str_replace('.class.php', '', $page); |
584 | 584 | |
585 | 585 | //autoloaders should take care of loading file |
586 | - if ( !class_exists( $classname ) ) { |
|
587 | - $error_msg[] = sprintf( __('Something went wrong with loading the %s admin hooks page.', 'event_espresso' ), $page); |
|
588 | - $error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname ); |
|
589 | - throw new EE_Error( implode( '||', $error_msg )); |
|
586 | + if ( ! class_exists($classname)) { |
|
587 | + $error_msg[] = sprintf(__('Something went wrong with loading the %s admin hooks page.', 'event_espresso'), $page); |
|
588 | + $error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s admin hooks page.%sMake sure you have <strong>%s</strong> defined. If this is a non-EE-core admin page then you also must have an autoloader in place for your class', 'event_espresso'), $page, '<br />', $classname); |
|
589 | + throw new EE_Error(implode('||', $error_msg)); |
|
590 | 590 | } |
591 | 591 | |
592 | 592 | $a = new ReflectionClass($classname); |
@@ -601,7 +601,7 @@ discard block |
||
601 | 601 | public function load_page_dependencies() { |
602 | 602 | try { |
603 | 603 | $this->_load_page_dependencies(); |
604 | - } catch ( EE_Error $e ) { |
|
604 | + } catch (EE_Error $e) { |
|
605 | 605 | $e->get_error(); |
606 | 606 | } |
607 | 607 | } |
@@ -619,16 +619,16 @@ discard block |
||
619 | 619 | $this->_current_screen = get_current_screen(); |
620 | 620 | |
621 | 621 | //load admin_notices - global, page class, and view specific |
622 | - add_action( 'admin_notices', array( $this, 'admin_notices_global'), 5 ); |
|
623 | - add_action( 'admin_notices', array( $this, 'admin_notices' ), 10 ); |
|
624 | - if ( method_exists( $this, 'admin_notices_' . $this->_current_view ) ) { |
|
625 | - add_action( 'admin_notices', array( $this, 'admin_notices_' . $this->_current_view ), 15 ); |
|
622 | + add_action('admin_notices', array($this, 'admin_notices_global'), 5); |
|
623 | + add_action('admin_notices', array($this, 'admin_notices'), 10); |
|
624 | + if (method_exists($this, 'admin_notices_'.$this->_current_view)) { |
|
625 | + add_action('admin_notices', array($this, 'admin_notices_'.$this->_current_view), 15); |
|
626 | 626 | } |
627 | 627 | |
628 | 628 | //load network admin_notices - global, page class, and view specific |
629 | - add_action( 'network_admin_notices', array( $this, 'network_admin_notices_global'), 5 ); |
|
630 | - if ( method_exists( $this, 'network_admin_notices_' . $this->_current_view ) ) { |
|
631 | - add_action( 'network_admin_notices', array( $this, 'network_admin_notices_' . $this->_current_view ) ); |
|
629 | + add_action('network_admin_notices', array($this, 'network_admin_notices_global'), 5); |
|
630 | + if (method_exists($this, 'network_admin_notices_'.$this->_current_view)) { |
|
631 | + add_action('network_admin_notices', array($this, 'network_admin_notices_'.$this->_current_view)); |
|
632 | 632 | } |
633 | 633 | |
634 | 634 | //this will save any per_page screen options if they are present |
@@ -644,8 +644,8 @@ discard block |
||
644 | 644 | //add screen options - global, page child class, and view specific |
645 | 645 | $this->_add_global_screen_options(); |
646 | 646 | $this->_add_screen_options(); |
647 | - if ( method_exists( $this, '_add_screen_options_' . $this->_current_view ) ) |
|
648 | - call_user_func( array( $this, '_add_screen_options_' . $this->_current_view ) ); |
|
647 | + if (method_exists($this, '_add_screen_options_'.$this->_current_view)) |
|
648 | + call_user_func(array($this, '_add_screen_options_'.$this->_current_view)); |
|
649 | 649 | |
650 | 650 | |
651 | 651 | //add help tab(s) and tours- set via page_config and qtips. |
@@ -656,33 +656,33 @@ discard block |
||
656 | 656 | //add feature_pointers - global, page child class, and view specific |
657 | 657 | $this->_add_feature_pointers(); |
658 | 658 | $this->_add_global_feature_pointers(); |
659 | - if ( method_exists( $this, '_add_feature_pointer_' . $this->_current_view ) ) |
|
660 | - call_user_func( array( $this, '_add_feature_pointer_' . $this->_current_view ) ); |
|
659 | + if (method_exists($this, '_add_feature_pointer_'.$this->_current_view)) |
|
660 | + call_user_func(array($this, '_add_feature_pointer_'.$this->_current_view)); |
|
661 | 661 | |
662 | 662 | //enqueue scripts/styles - global, page class, and view specific |
663 | - add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5 ); |
|
664 | - add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10 ); |
|
665 | - if ( method_exists( $this, 'load_scripts_styles_' . $this->_current_view ) ) |
|
666 | - add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_' . $this->_current_view ), 15 ); |
|
663 | + add_action('admin_enqueue_scripts', array($this, 'load_global_scripts_styles'), 5); |
|
664 | + add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles'), 10); |
|
665 | + if (method_exists($this, 'load_scripts_styles_'.$this->_current_view)) |
|
666 | + add_action('admin_enqueue_scripts', array($this, 'load_scripts_styles_'.$this->_current_view), 15); |
|
667 | 667 | |
668 | - add_action('admin_enqueue_scripts', array( $this, 'admin_footer_scripts_eei18n_js_strings' ), 100 ); |
|
668 | + add_action('admin_enqueue_scripts', array($this, 'admin_footer_scripts_eei18n_js_strings'), 100); |
|
669 | 669 | |
670 | 670 | //admin_print_footer_scripts - global, page child class, and view specific. NOTE, despite the name, whenever possible, scripts should NOT be loaded using this. In most cases that's doing_it_wrong(). But adding hidden container elements etc. is a good use case. Notice the late priority we're giving these |
671 | - add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_global' ), 99 ); |
|
672 | - add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts' ), 100 ); |
|
673 | - if ( method_exists( $this, 'admin_footer_scripts_' . $this->_current_view ) ) |
|
674 | - add_action('admin_print_footer_scripts', array( $this, 'admin_footer_scripts_' . $this->_current_view ), 101 ); |
|
671 | + add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_global'), 99); |
|
672 | + add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts'), 100); |
|
673 | + if (method_exists($this, 'admin_footer_scripts_'.$this->_current_view)) |
|
674 | + add_action('admin_print_footer_scripts', array($this, 'admin_footer_scripts_'.$this->_current_view), 101); |
|
675 | 675 | |
676 | 676 | //admin footer scripts |
677 | - add_action('admin_footer', array( $this, 'admin_footer_global' ), 99 ); |
|
678 | - add_action('admin_footer', array( $this, 'admin_footer'), 100 ); |
|
679 | - if ( method_exists( $this, 'admin_footer_' . $this->_current_view ) ) |
|
680 | - add_action('admin_footer', array( $this, 'admin_footer_' . $this->_current_view ), 101 ); |
|
677 | + add_action('admin_footer', array($this, 'admin_footer_global'), 99); |
|
678 | + add_action('admin_footer', array($this, 'admin_footer'), 100); |
|
679 | + if (method_exists($this, 'admin_footer_'.$this->_current_view)) |
|
680 | + add_action('admin_footer', array($this, 'admin_footer_'.$this->_current_view), 101); |
|
681 | 681 | |
682 | 682 | |
683 | - do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug ); |
|
683 | + do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load', $this->page_slug); |
|
684 | 684 | //targeted hook |
685 | - do_action( 'FHEE__EE_Admin_Page___load_page_dependencies__after_load__' . $this->page_slug . '__' . $this->_req_action ); |
|
685 | + do_action('FHEE__EE_Admin_Page___load_page_dependencies__after_load__'.$this->page_slug.'__'.$this->_req_action); |
|
686 | 686 | |
687 | 687 | } |
688 | 688 | |
@@ -697,7 +697,7 @@ discard block |
||
697 | 697 | private function _set_defaults() { |
698 | 698 | $this->_current_screen = $this->_admin_page_title = $this->_req_action = $this->_req_nonce = $this->_event = $this->_template_path = $this->_column_template_path = NULL; |
699 | 699 | |
700 | - $this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config = $this->_default_route_query_args = array(); |
|
700 | + $this->_nav_tabs = $this_views = $this->_page_routes = $this->_page_config = $this->_default_route_query_args = array(); |
|
701 | 701 | |
702 | 702 | $this->default_nav_tab_name = 'overview'; |
703 | 703 | |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | public function route_admin_request() { |
725 | 725 | try { |
726 | 726 | $this->_route_admin_request(); |
727 | - } catch ( EE_Error $e ) { |
|
727 | + } catch (EE_Error $e) { |
|
728 | 728 | $e->get_error(); |
729 | 729 | } |
730 | 730 | } |
@@ -735,7 +735,7 @@ discard block |
||
735 | 735 | $this->_wp_page_slug = $wp_page_slug; |
736 | 736 | |
737 | 737 | //if in network admin then we need to append "-network" to the page slug. Why? Because that's how WP rolls... |
738 | - if ( is_network_admin() ) { |
|
738 | + if (is_network_admin()) { |
|
739 | 739 | $this->_wp_page_slug .= '-network'; |
740 | 740 | } |
741 | 741 | } |
@@ -748,53 +748,53 @@ discard block |
||
748 | 748 | * @return void |
749 | 749 | */ |
750 | 750 | protected function _verify_routes() { |
751 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
751 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
752 | 752 | |
753 | - if ( !$this->_current_page && !defined( 'DOING_AJAX')) return FALSE; |
|
753 | + if ( ! $this->_current_page && ! defined('DOING_AJAX')) return FALSE; |
|
754 | 754 | |
755 | 755 | $this->_route = FALSE; |
756 | 756 | $func = FALSE; |
757 | 757 | $args = array(); |
758 | 758 | |
759 | 759 | // check that the page_routes array is not empty |
760 | - if ( empty( $this->_page_routes )) { |
|
760 | + if (empty($this->_page_routes)) { |
|
761 | 761 | // user error msg |
762 | - $error_msg = sprintf( __('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title ); |
|
762 | + $error_msg = sprintf(__('No page routes have been set for the %s admin page.', 'event_espresso'), $this->_admin_page_title); |
|
763 | 763 | // developer error msg |
764 | - $error_msg .= '||' . $error_msg . __( ' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso' ); |
|
765 | - throw new EE_Error( $error_msg ); |
|
764 | + $error_msg .= '||'.$error_msg.__(' Make sure the "set_page_routes()" method exists, and is setting the "_page_routes" array properly.', 'event_espresso'); |
|
765 | + throw new EE_Error($error_msg); |
|
766 | 766 | } |
767 | 767 | |
768 | 768 | // and that the requested page route exists |
769 | - if ( array_key_exists( $this->_req_action, $this->_page_routes )) { |
|
770 | - $this->_route = $this->_page_routes[ $this->_req_action ]; |
|
769 | + if (array_key_exists($this->_req_action, $this->_page_routes)) { |
|
770 | + $this->_route = $this->_page_routes[$this->_req_action]; |
|
771 | 771 | $this->_route_config = isset($this->_page_config[$this->_req_action]) ? $this->_page_config[$this->_req_action] : array(); |
772 | 772 | } else { |
773 | 773 | // user error msg |
774 | - $error_msg = sprintf( __( 'The requested page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title ); |
|
774 | + $error_msg = sprintf(__('The requested page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title); |
|
775 | 775 | // developer error msg |
776 | - $error_msg .= '||' . $error_msg . sprintf( __( ' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso' ), $this->_req_action ); |
|
777 | - throw new EE_Error( $error_msg ); |
|
776 | + $error_msg .= '||'.$error_msg.sprintf(__(' Create a key in the "_page_routes" array named "%s" and set its value to the appropriate method.', 'event_espresso'), $this->_req_action); |
|
777 | + throw new EE_Error($error_msg); |
|
778 | 778 | } |
779 | 779 | |
780 | 780 | // and that a default route exists |
781 | - if ( ! array_key_exists( 'default', $this->_page_routes )) { |
|
781 | + if ( ! array_key_exists('default', $this->_page_routes)) { |
|
782 | 782 | // user error msg |
783 | - $error_msg = sprintf( __( 'A default page route has not been set for the % admin page.', 'event_espresso' ), $this->_admin_page_title ); |
|
783 | + $error_msg = sprintf(__('A default page route has not been set for the % admin page.', 'event_espresso'), $this->_admin_page_title); |
|
784 | 784 | // developer error msg |
785 | - $error_msg .= '||' . $error_msg . __( ' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso' ); |
|
786 | - throw new EE_Error( $error_msg ); |
|
785 | + $error_msg .= '||'.$error_msg.__(' Create a key in the "_page_routes" array named "default" and set its value to your default page method.', 'event_espresso'); |
|
786 | + throw new EE_Error($error_msg); |
|
787 | 787 | } |
788 | 788 | |
789 | 789 | |
790 | 790 | //first lets' catch if the UI request has EVER been set. |
791 | - if ( $this->_is_UI_request === NULL ) { |
|
791 | + if ($this->_is_UI_request === NULL) { |
|
792 | 792 | //lets set if this is a UI request or not. |
793 | - $this->_is_UI_request = ( ! isset( $this->_req_data['noheader'] ) || $this->_req_data['noheader'] !== TRUE ) ? TRUE : FALSE; |
|
793 | + $this->_is_UI_request = ( ! isset($this->_req_data['noheader']) || $this->_req_data['noheader'] !== TRUE) ? TRUE : FALSE; |
|
794 | 794 | |
795 | 795 | |
796 | 796 | //wait a minute... we might have a noheader in the route array |
797 | - $this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader'] ) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request; |
|
797 | + $this->_is_UI_request = is_array($this->_route) && isset($this->_route['noheader']) && $this->_route['noheader'] ? FALSE : $this->_is_UI_request; |
|
798 | 798 | } |
799 | 799 | |
800 | 800 | $this->_set_current_labels(); |
@@ -809,15 +809,15 @@ discard block |
||
809 | 809 | * @param string $route the route name we're verifying |
810 | 810 | * @return mixed (bool|Exception) we'll throw an exception if this isn't a valid route. |
811 | 811 | */ |
812 | - protected function _verify_route( $route ) { |
|
813 | - if ( array_key_exists( $this->_req_action, $this->_page_routes )) { |
|
812 | + protected function _verify_route($route) { |
|
813 | + if (array_key_exists($this->_req_action, $this->_page_routes)) { |
|
814 | 814 | return true; |
815 | 815 | } else { |
816 | 816 | // user error msg |
817 | - $error_msg = sprintf( __( 'The given page route does not exist for the %s admin page.', 'event_espresso' ), $this->_admin_page_title ); |
|
817 | + $error_msg = sprintf(__('The given page route does not exist for the %s admin page.', 'event_espresso'), $this->_admin_page_title); |
|
818 | 818 | // developer error msg |
819 | - $error_msg .= '||' . $error_msg . sprintf( __( ' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso' ), $route ); |
|
820 | - throw new EE_Error( $error_msg ); |
|
819 | + $error_msg .= '||'.$error_msg.sprintf(__(' Check the route you are using in your method (%s) and make sure it matches a route set in your "_page_routes" array property', 'event_espresso'), $route); |
|
820 | + throw new EE_Error($error_msg); |
|
821 | 821 | } |
822 | 822 | } |
823 | 823 | |
@@ -831,18 +831,18 @@ discard block |
||
831 | 831 | * @param string $nonce_ref The nonce reference string (name0) |
832 | 832 | * @return mixed (bool|die) |
833 | 833 | */ |
834 | - protected function _verify_nonce( $nonce, $nonce_ref ) { |
|
834 | + protected function _verify_nonce($nonce, $nonce_ref) { |
|
835 | 835 | // verify nonce against expected value |
836 | - if ( ! wp_verify_nonce( $nonce, $nonce_ref) ) { |
|
836 | + if ( ! wp_verify_nonce($nonce, $nonce_ref)) { |
|
837 | 837 | // these are not the droids you are looking for !!! |
838 | - $msg = sprintf(__('%sNonce Fail.%s' , 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>' ); |
|
839 | - if ( WP_DEBUG ) { |
|
840 | - $msg .= "\n " . sprintf( __('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso' ), __CLASS__ ); |
|
838 | + $msg = sprintf(__('%sNonce Fail.%s', 'event_espresso'), '<a href="http://www.youtube.com/watch?v=56_S0WeTkzs">', '</a>'); |
|
839 | + if (WP_DEBUG) { |
|
840 | + $msg .= "\n ".sprintf(__('In order to dynamically generate nonces for your actions, use the %s::add_query_args_and_nonce() method. May the Nonce be with you!', 'event_espresso'), __CLASS__); |
|
841 | 841 | } |
842 | - if ( ! defined( 'DOING_AJAX' )) { |
|
843 | - wp_die( $msg ); |
|
842 | + if ( ! defined('DOING_AJAX')) { |
|
843 | + wp_die($msg); |
|
844 | 844 | } else { |
845 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
845 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
846 | 846 | $this->_return_json(); |
847 | 847 | } |
848 | 848 | } |
@@ -860,63 +860,63 @@ discard block |
||
860 | 860 | * @return void |
861 | 861 | */ |
862 | 862 | protected function _route_admin_request() { |
863 | - if ( ! $this->_is_UI_request ) |
|
863 | + if ( ! $this->_is_UI_request) |
|
864 | 864 | $this->_verify_routes(); |
865 | 865 | |
866 | - $nonce_check = isset( $this->_route_config['require_nonce'] ) ? $this->_route_config['require_nonce'] : TRUE; |
|
866 | + $nonce_check = isset($this->_route_config['require_nonce']) ? $this->_route_config['require_nonce'] : TRUE; |
|
867 | 867 | |
868 | - if ( $this->_req_action != 'default' && $nonce_check ) { |
|
868 | + if ($this->_req_action != 'default' && $nonce_check) { |
|
869 | 869 | // set nonce from post data |
870 | - $nonce = isset($this->_req_data[ $this->_req_nonce ]) ? sanitize_text_field( $this->_req_data[ $this->_req_nonce ] ) : ''; |
|
871 | - $this->_verify_nonce( $nonce, $this->_req_nonce ); |
|
870 | + $nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : ''; |
|
871 | + $this->_verify_nonce($nonce, $this->_req_nonce); |
|
872 | 872 | } |
873 | 873 | //set the nav_tabs array but ONLY if this is UI_request |
874 | - if ( $this->_is_UI_request ) |
|
874 | + if ($this->_is_UI_request) |
|
875 | 875 | $this->_set_nav_tabs(); |
876 | 876 | |
877 | 877 | // grab callback function |
878 | - $func = is_array( $this->_route ) ? $this->_route['func'] : $this->_route; |
|
878 | + $func = is_array($this->_route) ? $this->_route['func'] : $this->_route; |
|
879 | 879 | |
880 | 880 | // check if callback has args |
881 | - $args = is_array( $this->_route ) && isset( $this->_route['args'] ) ? $this->_route['args'] : array(); |
|
881 | + $args = is_array($this->_route) && isset($this->_route['args']) ? $this->_route['args'] : array(); |
|
882 | 882 | |
883 | 883 | $error_msg = ''; |
884 | 884 | |
885 | 885 | //action right before calling route (hook is something like 'AHEE__Registrations_Admin_Page__route_admin_request') |
886 | - if ( !did_action('AHEE__EE_Admin_Page__route_admin_request')) { |
|
887 | - do_action( 'AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this ); |
|
886 | + if ( ! did_action('AHEE__EE_Admin_Page__route_admin_request')) { |
|
887 | + do_action('AHEE__EE_Admin_Page__route_admin_request', $this->_current_view, $this); |
|
888 | 888 | } |
889 | 889 | |
890 | 890 | //right before calling the route, let's remove _wp_http_referer from the $_SERVER[REQUEST_URI] global (its now in _req_data for route processing). |
891 | - $_SERVER['REQUEST_URI'] = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) ); |
|
891 | + $_SERVER['REQUEST_URI'] = remove_query_arg('_wp_http_referer', wp_unslash($_SERVER['REQUEST_URI'])); |
|
892 | 892 | |
893 | - if ( ! empty( $func )) { |
|
893 | + if ( ! empty($func)) { |
|
894 | 894 | $base_call = $addon_call = FALSE; |
895 | 895 | //try to access page route via this class |
896 | - if ( ! is_array( $func ) && method_exists( $this, $func ) && ( $base_call = call_user_func_array( array( $this, &$func ), $args ) ) === FALSE ) { |
|
896 | + if ( ! is_array($func) && method_exists($this, $func) && ($base_call = call_user_func_array(array($this, &$func), $args)) === FALSE) { |
|
897 | 897 | // user error msg |
898 | - $error_msg = __( 'An error occurred. The requested page route could not be found.', 'event_espresso' ); |
|
898 | + $error_msg = __('An error occurred. The requested page route could not be found.', 'event_espresso'); |
|
899 | 899 | // developer error msg |
900 | - $error_msg .= '||' . sprintf( __( 'Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso' ), $func ); |
|
900 | + $error_msg .= '||'.sprintf(__('Page route "%s" could not be called. Check that the spelling for method names and actions in the "_page_routes" array are all correct.', 'event_espresso'), $func); |
|
901 | 901 | } |
902 | 902 | |
903 | 903 | //for pluggability by addons first let's see if just the function exists (this will also work in the case where $func is an array indicating class/method) |
904 | 904 | $args['admin_page_object'] = $this; //send along this admin page object for access by addons. |
905 | 905 | |
906 | - if ( $base_call === FALSE && ( $addon_call = call_user_func_array( $func, $args ) )=== FALSE ) { |
|
907 | - $error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso' ); |
|
908 | - $error_msg .= '||' . sprintf( __('Page route "%s" could not be called. Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func ); |
|
906 | + if ($base_call === FALSE && ($addon_call = call_user_func_array($func, $args)) === FALSE) { |
|
907 | + $error_msg = __('An error occurred. The requested page route could not be found', 'event_espresso'); |
|
908 | + $error_msg .= '||'.sprintf(__('Page route "%s" could not be called. Check that the spelling for the function name and action in the "_page_routes" array filtered by your plugin is correct.', 'event_espresso'), $func); |
|
909 | 909 | } |
910 | 910 | |
911 | 911 | |
912 | - if ( !empty( $error_msg ) && $base_call === FALSE && $addon_call === FALSE ) |
|
913 | - throw new EE_Error( $error_msg ); |
|
912 | + if ( ! empty($error_msg) && $base_call === FALSE && $addon_call === FALSE) |
|
913 | + throw new EE_Error($error_msg); |
|
914 | 914 | } |
915 | 915 | |
916 | 916 | //if we've routed and this route has a no headers route AND a sent_headers_route, then we need to reset the routing properties to the new route. |
917 | 917 | //now if UI request is FALSE and noheader is true AND we have a headers_sent_route in the route array then let's set UI_request to true because the no header route has a second func after headers have been sent. |
918 | - if ( $this->_is_UI_request === FALSE && is_array( $this->_route) && ! empty( $this->_route['headers_sent_route'] ) ) { |
|
919 | - $this->_reset_routing_properties( $this->_route['headers_sent_route'] ); |
|
918 | + if ($this->_is_UI_request === FALSE && is_array($this->_route) && ! empty($this->_route['headers_sent_route'])) { |
|
919 | + $this->_reset_routing_properties($this->_route['headers_sent_route']); |
|
920 | 920 | } |
921 | 921 | } |
922 | 922 | |
@@ -932,7 +932,7 @@ discard block |
||
932 | 932 | * @param string $new_route New (non header) route to redirect to. |
933 | 933 | * @return void |
934 | 934 | */ |
935 | - protected function _reset_routing_properties( $new_route ) { |
|
935 | + protected function _reset_routing_properties($new_route) { |
|
936 | 936 | $this->_is_UI_request = TRUE; |
937 | 937 | //now we set the current route to whatever the headers_sent_route is set at |
938 | 938 | $this->_req_data['action'] = $new_route; |
@@ -978,24 +978,24 @@ discard block |
||
978 | 978 | * @param bool $exclude_nonce If true, the the nonce will be excluded from the generated nonce. |
979 | 979 | * @return string |
980 | 980 | */ |
981 | - public static function add_query_args_and_nonce( $args = array(), $url = false, $sticky = false, $exclude_nonce = false ) { |
|
981 | + public static function add_query_args_and_nonce($args = array(), $url = false, $sticky = false, $exclude_nonce = false) { |
|
982 | 982 | EE_Registry::instance()->load_helper('URL'); |
983 | 983 | |
984 | 984 | //if there is a _wp_http_referer include the values from the request but only if sticky = true |
985 | - if ( $sticky ) { |
|
985 | + if ($sticky) { |
|
986 | 986 | $request = $_REQUEST; |
987 | - unset( $request['_wp_http_referer'] ); |
|
988 | - unset( $request['wp_referer'] ); |
|
989 | - foreach ( $request as $key => $value ) { |
|
987 | + unset($request['_wp_http_referer']); |
|
988 | + unset($request['wp_referer']); |
|
989 | + foreach ($request as $key => $value) { |
|
990 | 990 | //do not add nonces |
991 | - if ( strpos( $key, 'nonce' ) !== false ) { |
|
991 | + if (strpos($key, 'nonce') !== false) { |
|
992 | 992 | continue; |
993 | 993 | } |
994 | - $args['wp_referer[' . $key . ']'] = $value; |
|
994 | + $args['wp_referer['.$key.']'] = $value; |
|
995 | 995 | } |
996 | 996 | } |
997 | 997 | |
998 | - return EEH_URL::add_query_args_and_nonce( $args, $url, $exclude_nonce ); |
|
998 | + return EEH_URL::add_query_args_and_nonce($args, $url, $exclude_nonce); |
|
999 | 999 | } |
1000 | 1000 | |
1001 | 1001 | |
@@ -1011,8 +1011,8 @@ discard block |
||
1011 | 1011 | * @uses EEH_Template::get_help_tab_link() |
1012 | 1012 | * @return string generated link |
1013 | 1013 | */ |
1014 | - protected function _get_help_tab_link( $help_tab_id, $icon_style = FALSE, $help_text = FALSE ) { |
|
1015 | - return EEH_Template::get_help_tab_link( $help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text ); |
|
1014 | + protected function _get_help_tab_link($help_tab_id, $icon_style = FALSE, $help_text = FALSE) { |
|
1015 | + return EEH_Template::get_help_tab_link($help_tab_id, $this->page_slug, $this->_req_action, $icon_style, $help_text); |
|
1016 | 1016 | } |
1017 | 1017 | |
1018 | 1018 | |
@@ -1029,30 +1029,30 @@ discard block |
||
1029 | 1029 | */ |
1030 | 1030 | protected function _add_help_tabs() { |
1031 | 1031 | $tour_buttons = ''; |
1032 | - if ( isset( $this->_page_config[$this->_req_action] ) ) { |
|
1032 | + if (isset($this->_page_config[$this->_req_action])) { |
|
1033 | 1033 | $config = $this->_page_config[$this->_req_action]; |
1034 | 1034 | |
1035 | 1035 | //is there a help tour for the current route? if there is let's setup the tour buttons |
1036 | - if ( isset( $this->_help_tour[$this->_req_action]) ) { |
|
1036 | + if (isset($this->_help_tour[$this->_req_action])) { |
|
1037 | 1037 | $tb = array(); |
1038 | 1038 | $tour_buttons = '<div class="ee-abs-container"><div class="ee-help-tour-restart-buttons">'; |
1039 | - foreach ( $this->_help_tour['tours'] as $tour ) { |
|
1039 | + foreach ($this->_help_tour['tours'] as $tour) { |
|
1040 | 1040 | //if this is the end tour then we don't need to setup a button |
1041 | - if ( $tour instanceof EE_Help_Tour_final_stop ) |
|
1041 | + if ($tour instanceof EE_Help_Tour_final_stop) |
|
1042 | 1042 | continue; |
1043 | - $tb[] = '<button id="trigger-tour-' . $tour->get_slug() . '" class="button-primary trigger-ee-help-tour">' . $tour->get_label() . '</button>'; |
|
1043 | + $tb[] = '<button id="trigger-tour-'.$tour->get_slug().'" class="button-primary trigger-ee-help-tour">'.$tour->get_label().'</button>'; |
|
1044 | 1044 | } |
1045 | 1045 | $tour_buttons .= implode('<br />', $tb); |
1046 | 1046 | $tour_buttons .= '</div></div>'; |
1047 | 1047 | } |
1048 | 1048 | |
1049 | 1049 | // let's see if there is a help_sidebar set for the current route and we'll set that up for usage as well. |
1050 | - if ( is_array( $config ) && isset( $config['help_sidebar'] ) ) { |
|
1050 | + if (is_array($config) && isset($config['help_sidebar'])) { |
|
1051 | 1051 | //check that the callback given is valid |
1052 | - if ( !method_exists($this, $config['help_sidebar'] ) ) |
|
1053 | - throw new EE_Error( sprintf( __('The _page_config array has a callback set for the "help_sidebar" option. However the callback given (%s) is not a valid callback. Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this) ) ); |
|
1052 | + if ( ! method_exists($this, $config['help_sidebar'])) |
|
1053 | + throw new EE_Error(sprintf(__('The _page_config array has a callback set for the "help_sidebar" option. However the callback given (%s) is not a valid callback. Doublecheck the spelling and make sure this method exists for the class %s', 'event_espresso'), $config['help_sidebar'], get_class($this))); |
|
1054 | 1054 | |
1055 | - $content = apply_filters( 'FHEE__' . get_class($this) . '__add_help_tabs__help_sidebar', call_user_func( array( $this, $config['help_sidebar'] ) ) ); |
|
1055 | + $content = apply_filters('FHEE__'.get_class($this).'__add_help_tabs__help_sidebar', call_user_func(array($this, $config['help_sidebar']))); |
|
1056 | 1056 | |
1057 | 1057 | $content .= $tour_buttons; //add help tour buttons. |
1058 | 1058 | |
@@ -1061,49 +1061,49 @@ discard block |
||
1061 | 1061 | } |
1062 | 1062 | |
1063 | 1063 | //if we DON'T have config help sidebar and there ARE toure buttons then we'll just add the tour buttons to the sidebar. |
1064 | - if ( !isset( $config['help_sidebar'] ) && !empty( $tour_buttons ) ) { |
|
1064 | + if ( ! isset($config['help_sidebar']) && ! empty($tour_buttons)) { |
|
1065 | 1065 | $this->_current_screen->set_help_sidebar($tour_buttons); |
1066 | 1066 | } |
1067 | 1067 | |
1068 | 1068 | //handle if no help_tabs are set so the sidebar will still show for the help tour buttons |
1069 | - if ( !isset( $config['help_tabs'] ) && !empty($tour_buttons) ) { |
|
1069 | + if ( ! isset($config['help_tabs']) && ! empty($tour_buttons)) { |
|
1070 | 1070 | $_ht['id'] = $this->page_slug; |
1071 | 1071 | $_ht['title'] = __('Help Tours', 'event_espresso'); |
1072 | - $_ht['content'] = '<p>' . __('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso') . '</p>'; |
|
1072 | + $_ht['content'] = '<p>'.__('The buttons to the right allow you to start/restart any help tours available for this page', 'event_espresso').'</p>'; |
|
1073 | 1073 | $this->_current_screen->add_help_tab($_ht); |
1074 | 1074 | }/**/ |
1075 | 1075 | |
1076 | 1076 | |
1077 | - if ( !isset( $config['help_tabs'] ) ) return; //no help tabs for this route |
|
1077 | + if ( ! isset($config['help_tabs'])) return; //no help tabs for this route |
|
1078 | 1078 | |
1079 | - foreach ( (array) $config['help_tabs'] as $tab_id => $cfg ) { |
|
1079 | + foreach ((array) $config['help_tabs'] as $tab_id => $cfg) { |
|
1080 | 1080 | //we're here so there ARE help tabs! |
1081 | 1081 | |
1082 | 1082 | //make sure we've got what we need |
1083 | - if ( !isset( $cfg['title'] ) ) |
|
1084 | - throw new EE_Error( __('The _page_config array is not set up properly for help tabs. It is missing a title', 'event_espresso') ); |
|
1083 | + if ( ! isset($cfg['title'])) |
|
1084 | + throw new EE_Error(__('The _page_config array is not set up properly for help tabs. It is missing a title', 'event_espresso')); |
|
1085 | 1085 | |
1086 | 1086 | |
1087 | - if ( !isset($cfg['filename']) && !isset( $cfg['callback'] ) && !isset( $cfg['content'] ) ) |
|
1088 | - throw new EE_Error( __('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso') ); |
|
1087 | + if ( ! isset($cfg['filename']) && ! isset($cfg['callback']) && ! isset($cfg['content'])) |
|
1088 | + throw new EE_Error(__('The _page_config array is not setup properly for help tabs. It is missing a either a filename reference, or a callback reference or a content reference so there is no way to know the content for the help tab', 'event_espresso')); |
|
1089 | 1089 | |
1090 | 1090 | |
1091 | 1091 | |
1092 | 1092 | //first priority goes to content. |
1093 | - if ( !empty($cfg['content'] ) ) { |
|
1094 | - $content = !empty($cfg['content']) ? $cfg['content'] : NULL; |
|
1093 | + if ( ! empty($cfg['content'])) { |
|
1094 | + $content = ! empty($cfg['content']) ? $cfg['content'] : NULL; |
|
1095 | 1095 | |
1096 | 1096 | //second priority goes to filename |
1097 | - } else if ( !empty($cfg['filename'] ) ) { |
|
1098 | - $file_path = $this->_get_dir() . '/help_tabs/' . $cfg['filename'] . '.help_tab.php'; |
|
1097 | + } else if ( ! empty($cfg['filename'])) { |
|
1098 | + $file_path = $this->_get_dir().'/help_tabs/'.$cfg['filename'].'.help_tab.php'; |
|
1099 | 1099 | |
1100 | 1100 | |
1101 | 1101 | //it's possible that the file is located on decaf route (and above sets up for caf route, if this is the case then lets check decaf route too) |
1102 | - $file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tabs/' . $cfg['filename'] . '.help_tab.php' : $file_path; |
|
1102 | + $file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES.basename($this->_get_dir()).'/help_tabs/'.$cfg['filename'].'.help_tab.php' : $file_path; |
|
1103 | 1103 | |
1104 | 1104 | //if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error. |
1105 | - if ( !is_readable($file_path) && !isset($cfg['callback']) ) { |
|
1106 | - EE_Error::add_error( sprintf( __('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content. Please check that the string you set for the help tab on this route (%s) is the correct spelling. The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1105 | + if ( ! is_readable($file_path) && ! isset($cfg['callback'])) { |
|
1106 | + EE_Error::add_error(sprintf(__('The filename given for the help tab %s is not a valid file and there is no other configuration for the tab content. Please check that the string you set for the help tab on this route (%s) is the correct spelling. The file should be in %s', 'event_espresso'), $tab_id, key($config), $file_path), __FILE__, __FUNCTION__, __LINE__); |
|
1107 | 1107 | return; |
1108 | 1108 | } |
1109 | 1109 | $template_args['admin_page_obj'] = $this; |
@@ -1114,21 +1114,21 @@ discard block |
||
1114 | 1114 | |
1115 | 1115 | |
1116 | 1116 | //check if callback is valid |
1117 | - if ( empty($content) && ( !isset($cfg['callback']) || !method_exists( $this, $cfg['callback'] ) ) ) { |
|
1118 | - EE_Error::add_error( sprintf( __('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content. Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title'] ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1117 | + if (empty($content) && ( ! isset($cfg['callback']) || ! method_exists($this, $cfg['callback']))) { |
|
1118 | + EE_Error::add_error(sprintf(__('The callback given for a %s help tab on this page does not content OR a corresponding method for generating the content. Check the spelling or make sure the method is present.', 'event_espresso'), $cfg['title']), __FILE__, __FUNCTION__, __LINE__); |
|
1119 | 1119 | return; |
1120 | 1120 | } |
1121 | 1121 | |
1122 | 1122 | //setup config array for help tab method |
1123 | - $id = $this->page_slug . '-' . $this->_req_action . '-' . $tab_id; |
|
1123 | + $id = $this->page_slug.'-'.$this->_req_action.'-'.$tab_id; |
|
1124 | 1124 | $_ht = array( |
1125 | 1125 | 'id' => $id, |
1126 | 1126 | 'title' => $cfg['title'], |
1127 | - 'callback' => isset( $cfg['callback'] ) && empty($content) ? array( $this, $cfg['callback'] ) : NULL, |
|
1127 | + 'callback' => isset($cfg['callback']) && empty($content) ? array($this, $cfg['callback']) : NULL, |
|
1128 | 1128 | 'content' => $content |
1129 | 1129 | ); |
1130 | 1130 | |
1131 | - $this->_current_screen->add_help_tab( $_ht ); |
|
1131 | + $this->_current_screen->add_help_tab($_ht); |
|
1132 | 1132 | } |
1133 | 1133 | } |
1134 | 1134 | } |
@@ -1148,49 +1148,49 @@ discard block |
||
1148 | 1148 | $this->_help_tour = array(); |
1149 | 1149 | |
1150 | 1150 | //exit early if help tours are turned off globally |
1151 | - if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || ( defined( 'EE_DISABLE_HELP_TOURS' ) && EE_DISABLE_HELP_TOURS ) ) |
|
1151 | + if ( ! EE_Registry::instance()->CFG->admin->help_tour_activation || (defined('EE_DISABLE_HELP_TOURS') && EE_DISABLE_HELP_TOURS)) |
|
1152 | 1152 | return; |
1153 | 1153 | |
1154 | 1154 | //loop through _page_config to find any help_tour defined |
1155 | - foreach ( $this->_page_config as $route => $config ) { |
|
1155 | + foreach ($this->_page_config as $route => $config) { |
|
1156 | 1156 | //we're only going to set things up for this route |
1157 | - if ( $route !== $this->_req_action ) |
|
1157 | + if ($route !== $this->_req_action) |
|
1158 | 1158 | continue; |
1159 | 1159 | |
1160 | - if ( isset( $config['help_tour'] ) ) { |
|
1160 | + if (isset($config['help_tour'])) { |
|
1161 | 1161 | |
1162 | - foreach( $config['help_tour'] as $tour ) { |
|
1163 | - $file_path = $this->_get_dir() . '/help_tours/' . $tour . '.class.php'; |
|
1162 | + foreach ($config['help_tour'] as $tour) { |
|
1163 | + $file_path = $this->_get_dir().'/help_tours/'.$tour.'.class.php'; |
|
1164 | 1164 | //let's see if we can get that file... if not its possible this is a decaf route not set in caffienated so lets try and get the caffeinated equivalent |
1165 | - $file_path = !is_readable($file_path) ? EE_ADMIN_PAGES . basename($this->_get_dir()) . '/help_tours/' . $tour . '.class.php' : $file_path; |
|
1165 | + $file_path = ! is_readable($file_path) ? EE_ADMIN_PAGES.basename($this->_get_dir()).'/help_tours/'.$tour.'.class.php' : $file_path; |
|
1166 | 1166 | |
1167 | 1167 | //if file is STILL not readable then let's do a EE_Error so its more graceful than a fatal error. |
1168 | - if ( !is_readable($file_path) ) { |
|
1169 | - EE_Error::add_error( sprintf( __('The file path given for the help tour (%s) is not a valid path. Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1168 | + if ( ! is_readable($file_path)) { |
|
1169 | + EE_Error::add_error(sprintf(__('The file path given for the help tour (%s) is not a valid path. Please check that the string you set for the help tour on this route (%s) is the correct spelling', 'event_espresso'), $file_path, $tour), __FILE__, __FUNCTION__, __LINE__); |
|
1170 | 1170 | return; |
1171 | 1171 | } |
1172 | 1172 | |
1173 | 1173 | require_once $file_path; |
1174 | - if ( !class_exists( $tour ) ) { |
|
1175 | - $error_msg[] = sprintf( __('Something went wrong with loading the %s Help Tour Class.', 'event_espresso' ), $tour); |
|
1176 | - $error_msg[] = $error_msg[0] . "\r\n" . sprintf( __( 'There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this) ); |
|
1177 | - throw new EE_Error( implode( '||', $error_msg )); |
|
1174 | + if ( ! class_exists($tour)) { |
|
1175 | + $error_msg[] = sprintf(__('Something went wrong with loading the %s Help Tour Class.', 'event_espresso'), $tour); |
|
1176 | + $error_msg[] = $error_msg[0]."\r\n".sprintf(__('There is no class in place for the %s help tour.%s Make sure you have <strong>%s</strong> defined in the "help_tour" array for the %s route of the % admin page.', 'event_espresso'), $tour, '<br />', $tour, $this->_req_action, get_class($this)); |
|
1177 | + throw new EE_Error(implode('||', $error_msg)); |
|
1178 | 1178 | } |
1179 | 1179 | $a = new ReflectionClass($tour); |
1180 | 1180 | $tour_obj = $a->newInstance($this->_is_caf); |
1181 | 1181 | |
1182 | 1182 | $tours[] = $tour_obj; |
1183 | - $this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $tour_obj ); |
|
1183 | + $this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($tour_obj); |
|
1184 | 1184 | } |
1185 | 1185 | |
1186 | 1186 | //let's inject the end tour stop element common to all pages... this will only get seen once per machine. |
1187 | 1187 | $end_stop_tour = new EE_Help_Tour_final_stop($this->_is_caf); |
1188 | 1188 | $tours[] = $end_stop_tour; |
1189 | - $this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator( $end_stop_tour ); |
|
1189 | + $this->_help_tour[$route][] = EEH_Template::help_tour_stops_generator($end_stop_tour); |
|
1190 | 1190 | } |
1191 | 1191 | } |
1192 | 1192 | |
1193 | - if ( !empty( $tours ) ) |
|
1193 | + if ( ! empty($tours)) |
|
1194 | 1194 | $this->_help_tour['tours'] = $tours; |
1195 | 1195 | |
1196 | 1196 | //thats it! Now that the $_help_tours property is set (or not) the scripts and html should be taken care of automatically. |
@@ -1206,13 +1206,13 @@ discard block |
||
1206 | 1206 | * @return void |
1207 | 1207 | */ |
1208 | 1208 | protected function _add_qtips() { |
1209 | - if ( isset( $this->_route_config['qtips'] ) ) { |
|
1209 | + if (isset($this->_route_config['qtips'])) { |
|
1210 | 1210 | $qtips = (array) $this->_route_config['qtips']; |
1211 | 1211 | //load qtip loader |
1212 | 1212 | EE_Registry::instance()->load_helper('Qtip_Loader', array(), TRUE); |
1213 | 1213 | $path = array( |
1214 | - $this->_get_dir() . '/qtips/', |
|
1215 | - EE_ADMIN_PAGES . basename($this->_get_dir()) . '/qtips/' |
|
1214 | + $this->_get_dir().'/qtips/', |
|
1215 | + EE_ADMIN_PAGES.basename($this->_get_dir()).'/qtips/' |
|
1216 | 1216 | ); |
1217 | 1217 | EEH_Qtip_Loader::instance()->register($qtips, $path); |
1218 | 1218 | } |
@@ -1229,41 +1229,41 @@ discard block |
||
1229 | 1229 | * @return void |
1230 | 1230 | */ |
1231 | 1231 | protected function _set_nav_tabs() { |
1232 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
1232 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
1233 | 1233 | $i = 0; |
1234 | - foreach ( $this->_page_config as $slug => $config ) { |
|
1235 | - if ( !is_array( $config ) || ( is_array($config) && (isset($config['nav']) && !$config['nav'] ) || !isset($config['nav'] ) ) ) |
|
1234 | + foreach ($this->_page_config as $slug => $config) { |
|
1235 | + if ( ! is_array($config) || (is_array($config) && (isset($config['nav']) && ! $config['nav']) || ! isset($config['nav']))) |
|
1236 | 1236 | continue; //no nav tab for this config |
1237 | 1237 | |
1238 | 1238 | //check for persistent flag |
1239 | - if ( isset( $config['nav']['persistent']) && !$config['nav']['persistent'] && $slug !== $this->_req_action ) |
|
1239 | + if (isset($config['nav']['persistent']) && ! $config['nav']['persistent'] && $slug !== $this->_req_action) |
|
1240 | 1240 | continue; //nav tab is only to appear when route requested. |
1241 | 1241 | |
1242 | - if ( ! $this->check_user_access( $slug, TRUE ) ) |
|
1242 | + if ( ! $this->check_user_access($slug, TRUE)) |
|
1243 | 1243 | continue; //no nav tab becasue current user does not have access. |
1244 | 1244 | |
1245 | - $css_class = isset( $config['css_class'] ) ? $config['css_class'] . ' ' : ''; |
|
1245 | + $css_class = isset($config['css_class']) ? $config['css_class'].' ' : ''; |
|
1246 | 1246 | $this->_nav_tabs[$slug] = array( |
1247 | - 'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce( array( 'action'=>$slug ), $this->_admin_base_url ), |
|
1248 | - 'link_text' => isset( $config['nav']['label'] ) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug ) ), |
|
1249 | - 'css_class' => $this->_req_action == $slug ? $css_class . 'nav-tab-active' : $css_class, |
|
1250 | - 'order' => isset( $config['nav']['order'] ) ? $config['nav']['order'] : $i |
|
1247 | + 'url' => isset($config['nav']['url']) ? $config['nav']['url'] : self::add_query_args_and_nonce(array('action'=>$slug), $this->_admin_base_url), |
|
1248 | + 'link_text' => isset($config['nav']['label']) ? $config['nav']['label'] : ucwords(str_replace('_', ' ', $slug)), |
|
1249 | + 'css_class' => $this->_req_action == $slug ? $css_class.'nav-tab-active' : $css_class, |
|
1250 | + 'order' => isset($config['nav']['order']) ? $config['nav']['order'] : $i |
|
1251 | 1251 | ); |
1252 | 1252 | $i++; |
1253 | 1253 | } |
1254 | 1254 | |
1255 | 1255 | //if $this->_nav_tabs is empty then lets set the default |
1256 | - if ( empty( $this->_nav_tabs ) ) { |
|
1256 | + if (empty($this->_nav_tabs)) { |
|
1257 | 1257 | $this->_nav_tabs[$this->default_nav_tab_name] = array( |
1258 | 1258 | 'url' => $this->admin_base_url, |
1259 | - 'link_text' => ucwords( str_replace( '_', ' ', $this->default_nav_tab_name ) ), |
|
1259 | + 'link_text' => ucwords(str_replace('_', ' ', $this->default_nav_tab_name)), |
|
1260 | 1260 | 'css_class' => 'nav-tab-active', |
1261 | 1261 | 'order' => 10 |
1262 | 1262 | ); |
1263 | 1263 | } |
1264 | 1264 | |
1265 | 1265 | //now let's sort the tabs according to order |
1266 | - usort( $this->_nav_tabs, array($this, '_sort_nav_tabs' )); |
|
1266 | + usort($this->_nav_tabs, array($this, '_sort_nav_tabs')); |
|
1267 | 1267 | |
1268 | 1268 | } |
1269 | 1269 | |
@@ -1279,10 +1279,10 @@ discard block |
||
1279 | 1279 | * @return void |
1280 | 1280 | */ |
1281 | 1281 | private function _set_current_labels() { |
1282 | - if ( is_array($this->_route_config) && isset($this->_route_config['labels']) ) { |
|
1283 | - foreach ( $this->_route_config['labels'] as $label => $text ) { |
|
1284 | - if ( is_array($text) ) { |
|
1285 | - foreach ( $text as $sublabel => $subtext ) { |
|
1282 | + if (is_array($this->_route_config) && isset($this->_route_config['labels'])) { |
|
1283 | + foreach ($this->_route_config['labels'] as $label => $text) { |
|
1284 | + if (is_array($text)) { |
|
1285 | + foreach ($text as $sublabel => $subtext) { |
|
1286 | 1286 | $this->_labels[$label][$sublabel] = $subtext; |
1287 | 1287 | } |
1288 | 1288 | } else { |
@@ -1303,24 +1303,24 @@ discard block |
||
1303 | 1303 | * @param bool $verify_only Default is FALSE which means if user check fails then wp_die(). Otherwise just return false if verify fail. |
1304 | 1304 | * @return BOOL|wp_die() |
1305 | 1305 | */ |
1306 | - public function check_user_access( $route_to_check = '', $verify_only = FALSE ) { |
|
1307 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
1308 | - $route_to_check = empty( $route_to_check ) ? $this->_req_action : $route_to_check; |
|
1309 | - $capability = ! empty( $route_to_check ) && isset( $this->_page_routes[$route_to_check] ) && is_array( $this->_page_routes[$route_to_check] ) && ! empty( $this->_page_routes[$route_to_check]['capability'] ) ? $this->_page_routes[$route_to_check]['capability'] : NULL; |
|
1306 | + public function check_user_access($route_to_check = '', $verify_only = FALSE) { |
|
1307 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
1308 | + $route_to_check = empty($route_to_check) ? $this->_req_action : $route_to_check; |
|
1309 | + $capability = ! empty($route_to_check) && isset($this->_page_routes[$route_to_check]) && is_array($this->_page_routes[$route_to_check]) && ! empty($this->_page_routes[$route_to_check]['capability']) ? $this->_page_routes[$route_to_check]['capability'] : NULL; |
|
1310 | 1310 | |
1311 | - if ( empty( $capability ) && empty( $route_to_check ) ) { |
|
1312 | - $capability = is_array( $this->_route ) && empty( $this->_route['capability'] ) ? 'manage_options' : $this->_route['capability']; |
|
1311 | + if (empty($capability) && empty($route_to_check)) { |
|
1312 | + $capability = is_array($this->_route) && empty($this->_route['capability']) ? 'manage_options' : $this->_route['capability']; |
|
1313 | 1313 | } else { |
1314 | - $capability = empty( $capability ) ? 'manage_options' : $capability; |
|
1314 | + $capability = empty($capability) ? 'manage_options' : $capability; |
|
1315 | 1315 | } |
1316 | 1316 | |
1317 | - $id = is_array( $this->_route ) && ! empty( $this->_route['obj_id'] ) ? $this->_route['obj_id'] : 0; |
|
1317 | + $id = is_array($this->_route) && ! empty($this->_route['obj_id']) ? $this->_route['obj_id'] : 0; |
|
1318 | 1318 | |
1319 | - if (( ! function_exists( 'is_admin' ) || ! EE_Registry::instance()->CAP->current_user_can( $capability, $this->page_slug . '_' . $route_to_check, $id ) ) && ! defined( 'DOING_AJAX')) { |
|
1320 | - if ( $verify_only ) { |
|
1319 | + if (( ! function_exists('is_admin') || ! EE_Registry::instance()->CAP->current_user_can($capability, $this->page_slug.'_'.$route_to_check, $id)) && ! defined('DOING_AJAX')) { |
|
1320 | + if ($verify_only) { |
|
1321 | 1321 | return FALSE; |
1322 | 1322 | } else { |
1323 | - wp_die( __('You do not have access to this route.', 'event_espresso' ) ); |
|
1323 | + wp_die(__('You do not have access to this route.', 'event_espresso')); |
|
1324 | 1324 | } |
1325 | 1325 | } |
1326 | 1326 | return TRUE; |
@@ -1397,7 +1397,7 @@ discard block |
||
1397 | 1397 | $this->_add_admin_page_overlay(); |
1398 | 1398 | |
1399 | 1399 | //if metaboxes are present we need to add the nonce field |
1400 | - if ( ( isset($this->_route_config['metaboxes']) || ( isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes'] ) || isset($this->_route_config['list_table']) ) ) { |
|
1400 | + if ((isset($this->_route_config['metaboxes']) || (isset($this->_route_config['has_metaboxes']) && $this->_route_config['has_metaboxes']) || isset($this->_route_config['list_table']))) { |
|
1401 | 1401 | wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false); |
1402 | 1402 | wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false); |
1403 | 1403 | } |
@@ -1416,20 +1416,20 @@ discard block |
||
1416 | 1416 | */ |
1417 | 1417 | public function admin_footer_global() { |
1418 | 1418 | //dialog container for dialog helper |
1419 | - $d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">' . "\n"; |
|
1419 | + $d_cont = '<div class="ee-admin-dialog-container auto-hide hidden">'."\n"; |
|
1420 | 1420 | $d_cont .= '<div class="ee-notices"></div>'; |
1421 | 1421 | $d_cont .= '<div class="ee-admin-dialog-container-inner-content"></div>'; |
1422 | 1422 | $d_cont .= '</div>'; |
1423 | 1423 | echo $d_cont; |
1424 | 1424 | |
1425 | 1425 | //help tour stuff? |
1426 | - if ( isset( $this->_help_tour[$this->_req_action] ) ) { |
|
1426 | + if (isset($this->_help_tour[$this->_req_action])) { |
|
1427 | 1427 | echo implode('<br />', $this->_help_tour[$this->_req_action]); |
1428 | 1428 | } |
1429 | 1429 | |
1430 | 1430 | //current set timezone for timezone js |
1431 | 1431 | EE_Registry::instance()->load_helper('DTT_Helper'); |
1432 | - echo '<span id="current_timezone" class="hidden">' . EEH_DTT_Helper::get_timezone() . '</span>'; |
|
1432 | + echo '<span id="current_timezone" class="hidden">'.EEH_DTT_Helper::get_timezone().'</span>'; |
|
1433 | 1433 | } |
1434 | 1434 | |
1435 | 1435 | |
@@ -1453,18 +1453,18 @@ discard block |
||
1453 | 1453 | * @access protected |
1454 | 1454 | * @return string content |
1455 | 1455 | */ |
1456 | - protected function _set_help_popup_content( $help_array = array(), $display = FALSE ) { |
|
1456 | + protected function _set_help_popup_content($help_array = array(), $display = FALSE) { |
|
1457 | 1457 | $content = ''; |
1458 | 1458 | |
1459 | - $help_array = empty( $help_array ) ? $this->_get_help_content() : $help_array; |
|
1460 | - $template_path = EE_ADMIN_TEMPLATE . 'admin_help_popup.template.php'; |
|
1459 | + $help_array = empty($help_array) ? $this->_get_help_content() : $help_array; |
|
1460 | + $template_path = EE_ADMIN_TEMPLATE.'admin_help_popup.template.php'; |
|
1461 | 1461 | |
1462 | 1462 | |
1463 | 1463 | //loop through the array and setup content |
1464 | - foreach ( $help_array as $trigger => $help ) { |
|
1464 | + foreach ($help_array as $trigger => $help) { |
|
1465 | 1465 | //make sure the array is setup properly |
1466 | - if ( !isset($help['title']) || !isset($help['content'] ) ) { |
|
1467 | - throw new EE_Error( __('Does not look like the popup content array has been setup correctly. Might want to double check that. Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso') ); |
|
1466 | + if ( ! isset($help['title']) || ! isset($help['content'])) { |
|
1467 | + throw new EE_Error(__('Does not look like the popup content array has been setup correctly. Might want to double check that. Read the comments for the _get_help_popup_content method found in "EE_Admin_Page" class', 'event_espresso')); |
|
1468 | 1468 | } |
1469 | 1469 | |
1470 | 1470 | //we're good so let'd setup the template vars and then assign parsed template content to our content. |
@@ -1474,10 +1474,10 @@ discard block |
||
1474 | 1474 | 'help_popup_content' => $help['content'] |
1475 | 1475 | ); |
1476 | 1476 | |
1477 | - $content .= EEH_Template::display_template( $template_path, $template_args, TRUE ); |
|
1477 | + $content .= EEH_Template::display_template($template_path, $template_args, TRUE); |
|
1478 | 1478 | } |
1479 | 1479 | |
1480 | - if ( $display ) |
|
1480 | + if ($display) |
|
1481 | 1481 | echo $content; |
1482 | 1482 | else |
1483 | 1483 | return $content; |
@@ -1494,18 +1494,18 @@ discard block |
||
1494 | 1494 | */ |
1495 | 1495 | private function _get_help_content() { |
1496 | 1496 | //what is the method we're looking for? |
1497 | - $method_name = '_help_popup_content_' . $this->_req_action; |
|
1497 | + $method_name = '_help_popup_content_'.$this->_req_action; |
|
1498 | 1498 | |
1499 | 1499 | //if method doesn't exist let's get out. |
1500 | - if ( !method_exists( $this, $method_name ) ) |
|
1500 | + if ( ! method_exists($this, $method_name)) |
|
1501 | 1501 | return array(); |
1502 | 1502 | |
1503 | 1503 | //k we're good to go let's retrieve the help array |
1504 | - $help_array = call_user_func( array( $this, $method_name ) ); |
|
1504 | + $help_array = call_user_func(array($this, $method_name)); |
|
1505 | 1505 | |
1506 | 1506 | //make sure we've got an array! |
1507 | - if ( !is_array($help_array) ) { |
|
1508 | - throw new EE_Error( __('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso' ) ); |
|
1507 | + if ( ! is_array($help_array)) { |
|
1508 | + throw new EE_Error(__('Something went wrong with help popup content generation. Expecting an array and well, this ain\'t no array bub.', 'event_espresso')); |
|
1509 | 1509 | } |
1510 | 1510 | |
1511 | 1511 | return $help_array; |
@@ -1527,27 +1527,27 @@ discard block |
||
1527 | 1527 | * @param array $dimensions an array of dimensions for the box (array(h,w)) |
1528 | 1528 | * @return string |
1529 | 1529 | */ |
1530 | - protected function _set_help_trigger( $trigger_id, $display = TRUE, $dimensions = array( '400', '640') ) { |
|
1530 | + protected function _set_help_trigger($trigger_id, $display = TRUE, $dimensions = array('400', '640')) { |
|
1531 | 1531 | |
1532 | - if ( defined('DOING_AJAX') ) return; |
|
1532 | + if (defined('DOING_AJAX')) return; |
|
1533 | 1533 | |
1534 | 1534 | //let's check and see if there is any content set for this popup. If there isn't then we'll include a default title and content so that developers know something needs to be corrected |
1535 | 1535 | $help_array = $this->_get_help_content(); |
1536 | 1536 | $help_content = ''; |
1537 | 1537 | |
1538 | - if ( empty( $help_array ) || !isset( $help_array[$trigger_id] ) ) { |
|
1538 | + if (empty($help_array) || ! isset($help_array[$trigger_id])) { |
|
1539 | 1539 | $help_array[$trigger_id] = array( |
1540 | 1540 | 'title' => __('Missing Content', 'event_espresso'), |
1541 | 1541 | 'content' => __('A trigger has been set that doesn\'t have any corresponding content. Make sure you have set the help content. (see the "_set_help_popup_content" method in the EE_Admin_Page for instructions.)', 'event_espresso') |
1542 | 1542 | ); |
1543 | - $help_content = $this->_set_help_popup_content( $help_array, FALSE ); |
|
1543 | + $help_content = $this->_set_help_popup_content($help_array, FALSE); |
|
1544 | 1544 | } |
1545 | 1545 | |
1546 | 1546 | //let's setup the trigger |
1547 | - $content = '<a class="ee-dialog" href="?height='. $dimensions[0] . '&width=' . $dimensions[1] . '&inlineId=' . $trigger_id . '" target="_blank"><span class="question ee-help-popup-question"></span></a>'; |
|
1548 | - $content = $content . $help_content; |
|
1547 | + $content = '<a class="ee-dialog" href="?height='.$dimensions[0].'&width='.$dimensions[1].'&inlineId='.$trigger_id.'" target="_blank"><span class="question ee-help-popup-question"></span></a>'; |
|
1548 | + $content = $content.$help_content; |
|
1549 | 1549 | |
1550 | - if ( $display ) |
|
1550 | + if ($display) |
|
1551 | 1551 | echo $content; |
1552 | 1552 | else |
1553 | 1553 | return $content; |
@@ -1604,15 +1604,15 @@ discard block |
||
1604 | 1604 | public function load_global_scripts_styles() { |
1605 | 1605 | /** STYLES **/ |
1606 | 1606 | // add debugging styles |
1607 | - if ( WP_DEBUG ) { |
|
1608 | - add_action('admin_head', array( $this, 'add_xdebug_style' )); |
|
1607 | + if (WP_DEBUG) { |
|
1608 | + add_action('admin_head', array($this, 'add_xdebug_style')); |
|
1609 | 1609 | } |
1610 | 1610 | |
1611 | 1611 | //register all styles |
1612 | - wp_register_style( 'espresso-ui-theme', EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(),EVENT_ESPRESSO_VERSION ); |
|
1613 | - wp_register_style('ee-admin-css', EE_ADMIN_URL . 'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION); |
|
1612 | + wp_register_style('espresso-ui-theme', EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css', array(), EVENT_ESPRESSO_VERSION); |
|
1613 | + wp_register_style('ee-admin-css', EE_ADMIN_URL.'assets/ee-admin-page.css', array(), EVENT_ESPRESSO_VERSION); |
|
1614 | 1614 | //helpers styles |
1615 | - wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION ); |
|
1615 | + wp_register_style('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.css', array(), EVENT_ESPRESSO_VERSION); |
|
1616 | 1616 | //enqueue global styles |
1617 | 1617 | wp_enqueue_style('ee-admin-css'); |
1618 | 1618 | |
@@ -1620,66 +1620,66 @@ discard block |
||
1620 | 1620 | /** SCRIPTS **/ |
1621 | 1621 | |
1622 | 1622 | //register all scripts |
1623 | - wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
1624 | - wp_register_script('ee-dialog', EE_ADMIN_URL . 'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
1625 | - wp_register_script('ee_admin_js', EE_ADMIN_URL . 'assets/ee-admin-page.js', array( 'espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true ); |
|
1623 | + wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
1624 | + wp_register_script('ee-dialog', EE_ADMIN_URL.'assets/ee-dialog-helper.js', array('jquery', 'jquery-ui-draggable'), EVENT_ESPRESSO_VERSION, TRUE); |
|
1625 | + wp_register_script('ee_admin_js', EE_ADMIN_URL.'assets/ee-admin-page.js', array('espresso_core', 'ee-parse-uri', 'ee-dialog'), EVENT_ESPRESSO_VERSION, true); |
|
1626 | 1626 | |
1627 | - wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL . 'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true ); |
|
1627 | + wp_register_script('jquery-ui-timepicker-addon', EE_GLOBAL_ASSETS_URL.'scripts/jquery-ui-timepicker-addon.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), EVENT_ESPRESSO_VERSION, true); |
|
1628 | 1628 | // register jQuery Validate - see /includes/functions/wp_hooks.php |
1629 | - add_filter( 'FHEE_load_jquery_validate', '__return_true' ); |
|
1629 | + add_filter('FHEE_load_jquery_validate', '__return_true'); |
|
1630 | 1630 | add_filter('FHEE_load_joyride', '__return_true'); |
1631 | 1631 | |
1632 | 1632 | //script for sorting tables |
1633 | - wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL . "assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE); |
|
1633 | + wp_register_script('espresso_ajax_table_sorting', EE_ADMIN_URL."assets/espresso_ajax_table_sorting.js", array('ee_admin_js', 'jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE); |
|
1634 | 1634 | //script for parsing uri's |
1635 | - wp_register_script( 'ee-parse-uri', EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE ); |
|
1635 | + wp_register_script('ee-parse-uri', EE_GLOBAL_ASSETS_URL.'scripts/parseuri.js', array(), EVENT_ESPRESSO_VERSION, TRUE); |
|
1636 | 1636 | //and parsing associative serialized form elements |
1637 | - wp_register_script( 'ee-serialize-full-array', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
1637 | + wp_register_script('ee-serialize-full-array', EE_GLOBAL_ASSETS_URL.'scripts/jquery.serializefullarray.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
1638 | 1638 | //helpers scripts |
1639 | - wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
1640 | - wp_register_script( 'ee-moment-core', EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE ); |
|
1641 | - wp_register_script( 'ee-moment', EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
1642 | - wp_register_script( 'ee-datepicker', EE_ADMIN_URL . 'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon','ee-moment'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
1639 | + wp_register_script('ee-text-links', EE_PLUGIN_DIR_URL.'core/helpers/assets/ee_text_list_helper.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
1640 | + wp_register_script('ee-moment-core', EE_THIRD_PARTY_URL.'moment/moment-with-locales.min.js', array(), EVENT_ESPRESSO_VERSION, TRUE); |
|
1641 | + wp_register_script('ee-moment', EE_THIRD_PARTY_URL.'moment/moment-timezone-with-data.min.js', array('ee-moment-core'), EVENT_ESPRESSO_VERSION, TRUE); |
|
1642 | + wp_register_script('ee-datepicker', EE_ADMIN_URL.'assets/ee-datepicker.js', array('jquery-ui-timepicker-addon', 'ee-moment'), EVENT_ESPRESSO_VERSION, TRUE); |
|
1643 | 1643 | |
1644 | 1644 | //google charts |
1645 | - wp_register_script( 'google-charts', 'https://www.gstatic.com/charts/loader.js', array(), EVENT_ESPRESSO_VERSION, false ); |
|
1645 | + wp_register_script('google-charts', 'https://www.gstatic.com/charts/loader.js', array(), EVENT_ESPRESSO_VERSION, false); |
|
1646 | 1646 | |
1647 | 1647 | //enqueue global scripts |
1648 | 1648 | |
1649 | 1649 | //taking care of metaboxes |
1650 | - if ( ( isset($this->_route_config['metaboxes'] ) || isset($this->_route_config['has_metaboxes']) ) && empty( $this->_cpt_route) ) { |
|
1650 | + if ((isset($this->_route_config['metaboxes']) || isset($this->_route_config['has_metaboxes'])) && empty($this->_cpt_route)) { |
|
1651 | 1651 | wp_enqueue_script('dashboard'); |
1652 | 1652 | } |
1653 | 1653 | |
1654 | 1654 | //enqueue thickbox for ee help popups. default is to enqueue unless its explicitly set to false since we're assuming all EE pages will have popups |
1655 | - if ( ! isset( $this->_route_config['has_help_popups']) || ( isset( $this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'] ) ) { |
|
1655 | + if ( ! isset($this->_route_config['has_help_popups']) || (isset($this->_route_config['has_help_popups']) && $this->_route_config['has_help_popups'])) { |
|
1656 | 1656 | wp_enqueue_script('ee_admin_js'); |
1657 | 1657 | wp_enqueue_style('ee-admin-css'); |
1658 | 1658 | } |
1659 | 1659 | |
1660 | 1660 | |
1661 | 1661 | //localize script for ajax lazy loading |
1662 | - $lazy_loader_container_ids = apply_filters( 'FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content') ); |
|
1663 | - wp_localize_script( 'ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids); |
|
1662 | + $lazy_loader_container_ids = apply_filters('FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers', array('espresso_news_post_box_content')); |
|
1663 | + wp_localize_script('ee_admin_js', 'eeLazyLoadingContainers', $lazy_loader_container_ids); |
|
1664 | 1664 | |
1665 | 1665 | |
1666 | 1666 | /** |
1667 | 1667 | * help tour stuff |
1668 | 1668 | */ |
1669 | - if ( !empty( $this->_help_tour ) ) { |
|
1669 | + if ( ! empty($this->_help_tour)) { |
|
1670 | 1670 | |
1671 | 1671 | //register the js for kicking things off |
1672 | - wp_enqueue_script('ee-help-tour', EE_ADMIN_URL . 'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
1672 | + wp_enqueue_script('ee-help-tour', EE_ADMIN_URL.'assets/ee-help-tour.js', array('jquery-joyride'), EVENT_ESPRESSO_VERSION, TRUE); |
|
1673 | 1673 | |
1674 | 1674 | //setup tours for the js tour object |
1675 | - foreach ( $this->_help_tour['tours'] as $tour ) { |
|
1675 | + foreach ($this->_help_tour['tours'] as $tour) { |
|
1676 | 1676 | $tours[] = array( |
1677 | 1677 | 'id' => $tour->get_slug(), |
1678 | 1678 | 'options' => $tour->get_options() |
1679 | 1679 | ); |
1680 | 1680 | } |
1681 | 1681 | |
1682 | - wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours ) ); |
|
1682 | + wp_localize_script('ee-help-tour', 'EE_HELP_TOUR', array('tours' => $tours)); |
|
1683 | 1683 | |
1684 | 1684 | //admin_footer_global will take care of making sure our help_tour skeleton gets printed via the info stored in $this->_help_tour |
1685 | 1685 | } |
@@ -1697,52 +1697,52 @@ discard block |
||
1697 | 1697 | public function admin_footer_scripts_eei18n_js_strings() { |
1698 | 1698 | |
1699 | 1699 | EE_Registry::$i18n_js_strings['ajax_url'] = WP_AJAX_URL; |
1700 | - EE_Registry::$i18n_js_strings['confirm_delete'] = __( 'Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA associated with this item!!!\nThis can NOT be undone!!!', 'event_espresso' ); |
|
1701 | - |
|
1702 | - EE_Registry::$i18n_js_strings['January'] = __( 'January', 'event_espresso' ); |
|
1703 | - EE_Registry::$i18n_js_strings['February'] = __( 'February', 'event_espresso' ); |
|
1704 | - EE_Registry::$i18n_js_strings['March'] = __( 'March', 'event_espresso' ); |
|
1705 | - EE_Registry::$i18n_js_strings['April'] = __( 'April', 'event_espresso' ); |
|
1706 | - EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' ); |
|
1707 | - EE_Registry::$i18n_js_strings['June'] = __( 'June', 'event_espresso' ); |
|
1708 | - EE_Registry::$i18n_js_strings['July'] = __( 'July', 'event_espresso' ); |
|
1709 | - EE_Registry::$i18n_js_strings['August'] = __( 'August', 'event_espresso' ); |
|
1710 | - EE_Registry::$i18n_js_strings['September'] = __( 'September', 'event_espresso' ); |
|
1711 | - EE_Registry::$i18n_js_strings['October'] = __( 'October', 'event_espresso' ); |
|
1712 | - EE_Registry::$i18n_js_strings['November'] = __( 'November', 'event_espresso' ); |
|
1713 | - EE_Registry::$i18n_js_strings['December'] = __( 'December', 'event_espresso' ); |
|
1714 | - EE_Registry::$i18n_js_strings['Jan'] = __( 'Jan', 'event_espresso' ); |
|
1715 | - EE_Registry::$i18n_js_strings['Feb'] = __( 'Feb', 'event_espresso' ); |
|
1716 | - EE_Registry::$i18n_js_strings['Mar'] = __( 'Mar', 'event_espresso' ); |
|
1717 | - EE_Registry::$i18n_js_strings['Apr'] = __( 'Apr', 'event_espresso' ); |
|
1718 | - EE_Registry::$i18n_js_strings['May'] = __( 'May', 'event_espresso' ); |
|
1719 | - EE_Registry::$i18n_js_strings['Jun'] = __( 'Jun', 'event_espresso' ); |
|
1720 | - EE_Registry::$i18n_js_strings['Jul'] = __( 'Jul', 'event_espresso' ); |
|
1721 | - EE_Registry::$i18n_js_strings['Aug'] = __( 'Aug', 'event_espresso' ); |
|
1722 | - EE_Registry::$i18n_js_strings['Sep'] = __( 'Sep', 'event_espresso' ); |
|
1723 | - EE_Registry::$i18n_js_strings['Oct'] = __( 'Oct', 'event_espresso' ); |
|
1724 | - EE_Registry::$i18n_js_strings['Nov'] = __( 'Nov', 'event_espresso' ); |
|
1725 | - EE_Registry::$i18n_js_strings['Dec'] = __( 'Dec', 'event_espresso' ); |
|
1726 | - |
|
1727 | - EE_Registry::$i18n_js_strings['Sunday'] = __( 'Sunday', 'event_espresso' ); |
|
1728 | - EE_Registry::$i18n_js_strings['Monday'] = __( 'Monday', 'event_espresso' ); |
|
1729 | - EE_Registry::$i18n_js_strings['Tuesday'] = __( 'Tuesday', 'event_espresso' ); |
|
1730 | - EE_Registry::$i18n_js_strings['Wednesday'] = __( 'Wednesday', 'event_espresso' ); |
|
1731 | - EE_Registry::$i18n_js_strings['Thursday'] = __( 'Thursday', 'event_espresso' ); |
|
1732 | - EE_Registry::$i18n_js_strings['Friday'] = __( 'Friday', 'event_espresso' ); |
|
1733 | - EE_Registry::$i18n_js_strings['Saturday'] = __( 'Saturday', 'event_espresso' ); |
|
1734 | - EE_Registry::$i18n_js_strings['Sun'] = __( 'Sun', 'event_espresso' ); |
|
1735 | - EE_Registry::$i18n_js_strings['Mon'] = __( 'Mon', 'event_espresso' ); |
|
1736 | - EE_Registry::$i18n_js_strings['Tue'] = __( 'Tue', 'event_espresso' ); |
|
1737 | - EE_Registry::$i18n_js_strings['Wed'] = __( 'Wed', 'event_espresso' ); |
|
1738 | - EE_Registry::$i18n_js_strings['Thu'] = __( 'Thu', 'event_espresso' ); |
|
1739 | - EE_Registry::$i18n_js_strings['Fri'] = __( 'Fri', 'event_espresso' ); |
|
1740 | - EE_Registry::$i18n_js_strings['Sat'] = __( 'Sat', 'event_espresso' ); |
|
1700 | + EE_Registry::$i18n_js_strings['confirm_delete'] = __('Are you absolutely sure you want to delete this item?\nThis action will delete ALL DATA associated with this item!!!\nThis can NOT be undone!!!', 'event_espresso'); |
|
1701 | + |
|
1702 | + EE_Registry::$i18n_js_strings['January'] = __('January', 'event_espresso'); |
|
1703 | + EE_Registry::$i18n_js_strings['February'] = __('February', 'event_espresso'); |
|
1704 | + EE_Registry::$i18n_js_strings['March'] = __('March', 'event_espresso'); |
|
1705 | + EE_Registry::$i18n_js_strings['April'] = __('April', 'event_espresso'); |
|
1706 | + EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso'); |
|
1707 | + EE_Registry::$i18n_js_strings['June'] = __('June', 'event_espresso'); |
|
1708 | + EE_Registry::$i18n_js_strings['July'] = __('July', 'event_espresso'); |
|
1709 | + EE_Registry::$i18n_js_strings['August'] = __('August', 'event_espresso'); |
|
1710 | + EE_Registry::$i18n_js_strings['September'] = __('September', 'event_espresso'); |
|
1711 | + EE_Registry::$i18n_js_strings['October'] = __('October', 'event_espresso'); |
|
1712 | + EE_Registry::$i18n_js_strings['November'] = __('November', 'event_espresso'); |
|
1713 | + EE_Registry::$i18n_js_strings['December'] = __('December', 'event_espresso'); |
|
1714 | + EE_Registry::$i18n_js_strings['Jan'] = __('Jan', 'event_espresso'); |
|
1715 | + EE_Registry::$i18n_js_strings['Feb'] = __('Feb', 'event_espresso'); |
|
1716 | + EE_Registry::$i18n_js_strings['Mar'] = __('Mar', 'event_espresso'); |
|
1717 | + EE_Registry::$i18n_js_strings['Apr'] = __('Apr', 'event_espresso'); |
|
1718 | + EE_Registry::$i18n_js_strings['May'] = __('May', 'event_espresso'); |
|
1719 | + EE_Registry::$i18n_js_strings['Jun'] = __('Jun', 'event_espresso'); |
|
1720 | + EE_Registry::$i18n_js_strings['Jul'] = __('Jul', 'event_espresso'); |
|
1721 | + EE_Registry::$i18n_js_strings['Aug'] = __('Aug', 'event_espresso'); |
|
1722 | + EE_Registry::$i18n_js_strings['Sep'] = __('Sep', 'event_espresso'); |
|
1723 | + EE_Registry::$i18n_js_strings['Oct'] = __('Oct', 'event_espresso'); |
|
1724 | + EE_Registry::$i18n_js_strings['Nov'] = __('Nov', 'event_espresso'); |
|
1725 | + EE_Registry::$i18n_js_strings['Dec'] = __('Dec', 'event_espresso'); |
|
1726 | + |
|
1727 | + EE_Registry::$i18n_js_strings['Sunday'] = __('Sunday', 'event_espresso'); |
|
1728 | + EE_Registry::$i18n_js_strings['Monday'] = __('Monday', 'event_espresso'); |
|
1729 | + EE_Registry::$i18n_js_strings['Tuesday'] = __('Tuesday', 'event_espresso'); |
|
1730 | + EE_Registry::$i18n_js_strings['Wednesday'] = __('Wednesday', 'event_espresso'); |
|
1731 | + EE_Registry::$i18n_js_strings['Thursday'] = __('Thursday', 'event_espresso'); |
|
1732 | + EE_Registry::$i18n_js_strings['Friday'] = __('Friday', 'event_espresso'); |
|
1733 | + EE_Registry::$i18n_js_strings['Saturday'] = __('Saturday', 'event_espresso'); |
|
1734 | + EE_Registry::$i18n_js_strings['Sun'] = __('Sun', 'event_espresso'); |
|
1735 | + EE_Registry::$i18n_js_strings['Mon'] = __('Mon', 'event_espresso'); |
|
1736 | + EE_Registry::$i18n_js_strings['Tue'] = __('Tue', 'event_espresso'); |
|
1737 | + EE_Registry::$i18n_js_strings['Wed'] = __('Wed', 'event_espresso'); |
|
1738 | + EE_Registry::$i18n_js_strings['Thu'] = __('Thu', 'event_espresso'); |
|
1739 | + EE_Registry::$i18n_js_strings['Fri'] = __('Fri', 'event_espresso'); |
|
1740 | + EE_Registry::$i18n_js_strings['Sat'] = __('Sat', 'event_espresso'); |
|
1741 | 1741 | |
1742 | 1742 | //setting on espresso_core instead of ee_admin_js because espresso_core is enqueued by the maintenance |
1743 | 1743 | //admin page when in maintenance mode and ee_admin_js is not loaded then. This works everywhere else because |
1744 | 1744 | //espresso_core is listed as a dependency of ee_admin_js. |
1745 | - wp_localize_script( 'espresso_core', 'eei18n', EE_Registry::$i18n_js_strings ); |
|
1745 | + wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings); |
|
1746 | 1746 | |
1747 | 1747 | } |
1748 | 1748 | |
@@ -1776,23 +1776,23 @@ discard block |
||
1776 | 1776 | protected function _set_list_table() { |
1777 | 1777 | |
1778 | 1778 | //first is this a list_table view? |
1779 | - if ( !isset($this->_route_config['list_table']) ) |
|
1779 | + if ( ! isset($this->_route_config['list_table'])) |
|
1780 | 1780 | return; //not a list_table view so get out. |
1781 | 1781 | |
1782 | 1782 | //list table functions are per view specific (because some admin pages might have more than one listtable!) |
1783 | 1783 | |
1784 | - if ( call_user_func( array( $this, '_set_list_table_views_' . $this->_req_action ) ) === FALSE ) { |
|
1784 | + if (call_user_func(array($this, '_set_list_table_views_'.$this->_req_action)) === FALSE) { |
|
1785 | 1785 | //user error msg |
1786 | - $error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso' ); |
|
1786 | + $error_msg = __('An error occurred. The requested list table views could not be found.', 'event_espresso'); |
|
1787 | 1787 | //developer error msg |
1788 | - $error_msg .= '||' . sprintf( __('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso' ), $this->_req_action, '_set_list_table_views_' . $this->_req_action ); |
|
1789 | - throw new EE_Error( $error_msg ); |
|
1788 | + $error_msg .= '||'.sprintf(__('List table views for "%s" route could not be setup. Check that you have the corresponding method, "%s" set up for defining list_table_views for this route.', 'event_espresso'), $this->_req_action, '_set_list_table_views_'.$this->_req_action); |
|
1789 | + throw new EE_Error($error_msg); |
|
1790 | 1790 | } |
1791 | 1791 | |
1792 | 1792 | //let's provide the ability to filter the views per PAGE AND ROUTE, per PAGE, and globally |
1793 | - $this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug . '_' . $this->_req_action, $this->_views ); |
|
1794 | - $this->_views = apply_filters( 'FHEE_list_table_views_' . $this->page_slug, $this->_views ); |
|
1795 | - $this->_views = apply_filters( 'FHEE_list_table_views', $this->_views ); |
|
1793 | + $this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug.'_'.$this->_req_action, $this->_views); |
|
1794 | + $this->_views = apply_filters('FHEE_list_table_views_'.$this->page_slug, $this->_views); |
|
1795 | + $this->_views = apply_filters('FHEE_list_table_views', $this->_views); |
|
1796 | 1796 | |
1797 | 1797 | $this->_set_list_table_view(); |
1798 | 1798 | $this->_set_list_table_object(); |
@@ -1814,14 +1814,14 @@ discard block |
||
1814 | 1814 | * @return array |
1815 | 1815 | */ |
1816 | 1816 | protected function _set_list_table_view() { |
1817 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
1817 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
1818 | 1818 | |
1819 | 1819 | |
1820 | 1820 | // looking at active items or dumpster diving ? |
1821 | - if ( ! isset( $this->_req_data['status'] ) || ! array_key_exists( $this->_req_data['status'], $this->_views )) { |
|
1822 | - $this->_view = isset( $this->_views['in_use'] ) ? 'in_use' : 'all'; |
|
1821 | + if ( ! isset($this->_req_data['status']) || ! array_key_exists($this->_req_data['status'], $this->_views)) { |
|
1822 | + $this->_view = isset($this->_views['in_use']) ? 'in_use' : 'all'; |
|
1823 | 1823 | } else { |
1824 | - $this->_view = sanitize_key( $this->_req_data['status'] ); |
|
1824 | + $this->_view = sanitize_key($this->_req_data['status']); |
|
1825 | 1825 | } |
1826 | 1826 | } |
1827 | 1827 | |
@@ -1832,9 +1832,9 @@ discard block |
||
1832 | 1832 | * WP_List_Table objects need to be loaded fairly early so automatic stuff WP does is taken care of. |
1833 | 1833 | */ |
1834 | 1834 | protected function _set_list_table_object() { |
1835 | - if ( isset($this->_route_config['list_table'] ) ) { |
|
1836 | - if ( !class_exists( $this->_route_config['list_table'] ) ) |
|
1837 | - throw new EE_Error( sprintf( __('The %s class defined for the list table does not exist. Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this) ) ); |
|
1835 | + if (isset($this->_route_config['list_table'])) { |
|
1836 | + if ( ! class_exists($this->_route_config['list_table'])) |
|
1837 | + throw new EE_Error(sprintf(__('The %s class defined for the list table does not exist. Please check the spelling of the class ref in the $_page_config property on %s.', 'event_espresso'), $this->_route_config['list_table'], get_class($this))); |
|
1838 | 1838 | $a = new ReflectionClass($this->_route_config['list_table']); |
1839 | 1839 | $this->_list_table_object = $a->newInstance($this); |
1840 | 1840 | } |
@@ -1853,27 +1853,27 @@ discard block |
||
1853 | 1853 | * |
1854 | 1854 | * @return array |
1855 | 1855 | */ |
1856 | - public function get_list_table_view_RLs( $extra_query_args = array() ) { |
|
1856 | + public function get_list_table_view_RLs($extra_query_args = array()) { |
|
1857 | 1857 | |
1858 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
1858 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
1859 | 1859 | |
1860 | - if ( empty( $this->_views )) { |
|
1860 | + if (empty($this->_views)) { |
|
1861 | 1861 | $this->_views = array(); |
1862 | 1862 | } |
1863 | 1863 | |
1864 | 1864 | // cycle thru views |
1865 | - foreach ( $this->_views as $key => $view ) { |
|
1865 | + foreach ($this->_views as $key => $view) { |
|
1866 | 1866 | $query_args = array(); |
1867 | 1867 | // check for current view |
1868 | - $this->_views[ $key ]['class'] = $this->_view == $view['slug'] ? 'current' : ''; |
|
1868 | + $this->_views[$key]['class'] = $this->_view == $view['slug'] ? 'current' : ''; |
|
1869 | 1869 | $query_args['action'] = $this->_req_action; |
1870 | - $query_args[$this->_req_action.'_nonce'] = wp_create_nonce( $query_args['action'] . '_nonce' ); |
|
1870 | + $query_args[$this->_req_action.'_nonce'] = wp_create_nonce($query_args['action'].'_nonce'); |
|
1871 | 1871 | $query_args['status'] = $view['slug']; |
1872 | 1872 | //merge any other arguments sent in. |
1873 | - if ( isset( $extra_query_args[$view['slug']] ) ) { |
|
1874 | - $query_args = array_merge( $query_args, $extra_query_args[$view['slug']] ); |
|
1873 | + if (isset($extra_query_args[$view['slug']])) { |
|
1874 | + $query_args = array_merge($query_args, $extra_query_args[$view['slug']]); |
|
1875 | 1875 | } |
1876 | - $this->_views[ $key ]['url'] = EE_Admin_Page::add_query_args_and_nonce( $query_args, $this->_admin_base_url ); |
|
1876 | + $this->_views[$key]['url'] = EE_Admin_Page::add_query_args_and_nonce($query_args, $this->_admin_base_url); |
|
1877 | 1877 | } |
1878 | 1878 | |
1879 | 1879 | return $this->_views; |
@@ -1890,15 +1890,15 @@ discard block |
||
1890 | 1890 | * @param int $max_entries total number of rows in the table |
1891 | 1891 | * @return string |
1892 | 1892 | */ |
1893 | - protected function _entries_per_page_dropdown( $max_entries = FALSE ) { |
|
1893 | + protected function _entries_per_page_dropdown($max_entries = FALSE) { |
|
1894 | 1894 | |
1895 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
1896 | - $values = array( 10, 25, 50, 100 ); |
|
1897 | - $per_page = ( ! empty( $this->_req_data['per_page'] )) ? absint( $this->_req_data['per_page'] ) : 10; |
|
1895 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
1896 | + $values = array(10, 25, 50, 100); |
|
1897 | + $per_page = ( ! empty($this->_req_data['per_page'])) ? absint($this->_req_data['per_page']) : 10; |
|
1898 | 1898 | |
1899 | - if ( $max_entries ) { |
|
1899 | + if ($max_entries) { |
|
1900 | 1900 | $values[] = $max_entries; |
1901 | - sort( $values ); |
|
1901 | + sort($values); |
|
1902 | 1902 | } |
1903 | 1903 | |
1904 | 1904 | $entries_per_page_dropdown = ' |
@@ -1907,15 +1907,15 @@ discard block |
||
1907 | 1907 | Show |
1908 | 1908 | <select id="entries-per-page-slct" name="entries-per-page-slct">'; |
1909 | 1909 | |
1910 | - foreach ( $values as $value ) { |
|
1911 | - if ( $value < $max_entries ) { |
|
1912 | - $selected = $value == $per_page ? ' selected="' . $per_page . '"' : ''; |
|
1910 | + foreach ($values as $value) { |
|
1911 | + if ($value < $max_entries) { |
|
1912 | + $selected = $value == $per_page ? ' selected="'.$per_page.'"' : ''; |
|
1913 | 1913 | $entries_per_page_dropdown .= ' |
1914 | 1914 | <option value="'.$value.'"'.$selected.'>'.$value.' </option>'; |
1915 | 1915 | } |
1916 | 1916 | } |
1917 | 1917 | |
1918 | - $selected = $max_entries == $per_page ? ' selected="' . $per_page . '"' : ''; |
|
1918 | + $selected = $max_entries == $per_page ? ' selected="'.$per_page.'"' : ''; |
|
1919 | 1919 | $entries_per_page_dropdown .= ' |
1920 | 1920 | <option value="'.$max_entries.'"'.$selected.'>All </option>'; |
1921 | 1921 | |
@@ -1938,8 +1938,8 @@ discard block |
||
1938 | 1938 | * @return void |
1939 | 1939 | */ |
1940 | 1940 | public function _set_search_attributes() { |
1941 | - $this->_template_args['search']['btn_label'] = sprintf( __( 'Search %s', 'event_espresso' ), empty( $this->_search_btn_label ) ? $this->page_label : $this->_search_btn_label ); |
|
1942 | - $this->_template_args['search']['callback'] = 'search_' . $this->page_slug; |
|
1941 | + $this->_template_args['search']['btn_label'] = sprintf(__('Search %s', 'event_espresso'), empty($this->_search_btn_label) ? $this->page_label : $this->_search_btn_label); |
|
1942 | + $this->_template_args['search']['callback'] = 'search_'.$this->page_slug; |
|
1943 | 1943 | } |
1944 | 1944 | |
1945 | 1945 | /*** END LIST TABLE METHODS **/ |
@@ -1958,20 +1958,20 @@ discard block |
||
1958 | 1958 | * @return void |
1959 | 1959 | */ |
1960 | 1960 | private function _add_registered_meta_boxes() { |
1961 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
1961 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
1962 | 1962 | |
1963 | 1963 | //we only add meta boxes if the page_route calls for it |
1964 | - if ( is_array($this->_route_config) && isset( $this->_route_config['metaboxes'] ) && is_array($this->_route_config['metaboxes']) ) { |
|
1964 | + if (is_array($this->_route_config) && isset($this->_route_config['metaboxes']) && is_array($this->_route_config['metaboxes'])) { |
|
1965 | 1965 | |
1966 | 1966 | |
1967 | 1967 | //this simply loops through the callbacks provided and checks if there is a corresponding callback registered by the child - if there is then we go ahead and process the metabox loader. |
1968 | - foreach ( $this->_route_config['metaboxes'] as $metabox_callback ) { |
|
1969 | - if ( call_user_func( array($this, &$metabox_callback) ) === FALSE ) { |
|
1968 | + foreach ($this->_route_config['metaboxes'] as $metabox_callback) { |
|
1969 | + if (call_user_func(array($this, &$metabox_callback)) === FALSE) { |
|
1970 | 1970 | // user error msg |
1971 | - $error_msg = __( 'An error occurred. The requested metabox could not be found.', 'event_espresso' ); |
|
1971 | + $error_msg = __('An error occurred. The requested metabox could not be found.', 'event_espresso'); |
|
1972 | 1972 | // developer error msg |
1973 | - $error_msg .= '||' . sprintf( __( 'The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.', 'event_espresso' ), $metabox_callback ); |
|
1974 | - throw new EE_Error( $error_msg ); |
|
1973 | + $error_msg .= '||'.sprintf(__('The metabox with the string "%s" could not be called. Check that the spelling for method names and actions in the "_page_config[\'metaboxes\']" array are all correct.', 'event_espresso'), $metabox_callback); |
|
1974 | + throw new EE_Error($error_msg); |
|
1975 | 1975 | } |
1976 | 1976 | } |
1977 | 1977 | } |
@@ -1988,17 +1988,17 @@ discard block |
||
1988 | 1988 | * @return void |
1989 | 1989 | */ |
1990 | 1990 | private function _add_screen_columns() { |
1991 | - if ( is_array($this->_route_config) && isset( $this->_route_config['columns'] ) && is_array($this->_route_config['columns']) && count( $this->_route_config['columns'] == 2 ) ) { |
|
1991 | + if (is_array($this->_route_config) && isset($this->_route_config['columns']) && is_array($this->_route_config['columns']) && count($this->_route_config['columns'] == 2)) { |
|
1992 | 1992 | |
1993 | - add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1] ) ); |
|
1993 | + add_screen_option('layout_columns', array('max' => (int) $this->_route_config['columns'][0], 'default' => (int) $this->_route_config['columns'][1])); |
|
1994 | 1994 | $this->_template_args['num_columns'] = $this->_route_config['columns'][0]; |
1995 | 1995 | $screen_id = $this->_current_screen->id; |
1996 | 1996 | $screen_columns = (int) get_user_option("screen_layout_$screen_id"); |
1997 | - $total_columns = !empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1]; |
|
1998 | - $this->_template_args['current_screen_widget_class'] = 'columns-' . $total_columns; |
|
1997 | + $total_columns = ! empty($screen_columns) ? $screen_columns : $this->_route_config['columns'][1]; |
|
1998 | + $this->_template_args['current_screen_widget_class'] = 'columns-'.$total_columns; |
|
1999 | 1999 | $this->_template_args['current_page'] = $this->_wp_page_slug; |
2000 | 2000 | $this->_template_args['screen'] = $this->_current_screen; |
2001 | - $this->_column_template_path = EE_ADMIN_TEMPLATE . 'admin_details_metabox_column_wrapper.template.php'; |
|
2001 | + $this->_column_template_path = EE_ADMIN_TEMPLATE.'admin_details_metabox_column_wrapper.template.php'; |
|
2002 | 2002 | |
2003 | 2003 | //finally if we don't have has_metaboxes set in the route config let's make sure it IS set other wise the necessary hidden fields for this won't be loaded. |
2004 | 2004 | $this->_route_config['has_metaboxes'] = TRUE; |
@@ -2015,11 +2015,11 @@ discard block |
||
2015 | 2015 | */ |
2016 | 2016 | |
2017 | 2017 | private function _espresso_news_post_box() { |
2018 | - $news_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __( 'New @ Event Espresso', 'event_espresso' ) ); |
|
2019 | - add_meta_box( 'espresso_news_post_box', $news_box_title, array( |
|
2018 | + $news_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('New @ Event Espresso', 'event_espresso')); |
|
2019 | + add_meta_box('espresso_news_post_box', $news_box_title, array( |
|
2020 | 2020 | $this, |
2021 | 2021 | 'espresso_news_post_box' |
2022 | - ), $this->_wp_page_slug, 'side' ); |
|
2022 | + ), $this->_wp_page_slug, 'side'); |
|
2023 | 2023 | } |
2024 | 2024 | |
2025 | 2025 | |
@@ -2027,14 +2027,14 @@ discard block |
||
2027 | 2027 | * Code for setting up espresso ratings request metabox. |
2028 | 2028 | */ |
2029 | 2029 | protected function _espresso_ratings_request() { |
2030 | - if ( ! apply_filters( 'FHEE_show_ratings_request_meta_box', true ) ) { |
|
2030 | + if ( ! apply_filters('FHEE_show_ratings_request_meta_box', true)) { |
|
2031 | 2031 | return ''; |
2032 | 2032 | } |
2033 | - $ratings_box_title = apply_filters( 'FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso') ); |
|
2034 | - add_meta_box( 'espresso_ratings_request', $ratings_box_title, array( |
|
2033 | + $ratings_box_title = apply_filters('FHEE__EE_Admin_Page___espresso_news_post_box__news_box_title', __('Keep Event Espresso Decaf Free', 'event_espresso')); |
|
2034 | + add_meta_box('espresso_ratings_request', $ratings_box_title, array( |
|
2035 | 2035 | $this, |
2036 | 2036 | 'espresso_ratings_request' |
2037 | - ), $this->_wp_page_slug, 'side' ); |
|
2037 | + ), $this->_wp_page_slug, 'side'); |
|
2038 | 2038 | } |
2039 | 2039 | |
2040 | 2040 | |
@@ -2042,35 +2042,35 @@ discard block |
||
2042 | 2042 | * Code for setting up espresso ratings request metabox content. |
2043 | 2043 | */ |
2044 | 2044 | public function espresso_ratings_request() { |
2045 | - $template_path = EE_ADMIN_TEMPLATE . 'espresso_ratings_request_content.template.php'; |
|
2046 | - EE_Registry::instance()->load_helper( 'Template' ); |
|
2047 | - EEH_Template::display_template( $template_path, array() ); |
|
2045 | + $template_path = EE_ADMIN_TEMPLATE.'espresso_ratings_request_content.template.php'; |
|
2046 | + EE_Registry::instance()->load_helper('Template'); |
|
2047 | + EEH_Template::display_template($template_path, array()); |
|
2048 | 2048 | } |
2049 | 2049 | |
2050 | 2050 | |
2051 | 2051 | |
2052 | 2052 | |
2053 | - public static function cached_rss_display( $rss_id, $url ) { |
|
2054 | - $loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading…' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>'; |
|
2055 | - $doing_ajax = ( defined( 'DOING_AJAX' ) && DOING_AJAX ); |
|
2056 | - $pre = '<div class="espresso-rss-display">' . "\n\t"; |
|
2057 | - $pre .= '<span id="' . $rss_id . '_url" class="hidden">' . $url . '</span>'; |
|
2058 | - $post = '</div>' . "\n"; |
|
2053 | + public static function cached_rss_display($rss_id, $url) { |
|
2054 | + $loading = '<p class="widget-loading hide-if-no-js">'.__('Loading…').'</p><p class="hide-if-js">'.__('This widget requires JavaScript.').'</p>'; |
|
2055 | + $doing_ajax = (defined('DOING_AJAX') && DOING_AJAX); |
|
2056 | + $pre = '<div class="espresso-rss-display">'."\n\t"; |
|
2057 | + $pre .= '<span id="'.$rss_id.'_url" class="hidden">'.$url.'</span>'; |
|
2058 | + $post = '</div>'."\n"; |
|
2059 | 2059 | |
2060 | - $cache_key = 'ee_rss_' . md5( $rss_id ); |
|
2061 | - if ( FALSE != ( $output = get_transient( $cache_key ) ) ) { |
|
2062 | - echo $pre . $output . $post; |
|
2060 | + $cache_key = 'ee_rss_'.md5($rss_id); |
|
2061 | + if (FALSE != ($output = get_transient($cache_key))) { |
|
2062 | + echo $pre.$output.$post; |
|
2063 | 2063 | return TRUE; |
2064 | 2064 | } |
2065 | 2065 | |
2066 | - if ( ! $doing_ajax ) { |
|
2067 | - echo $pre . $loading . $post; |
|
2066 | + if ( ! $doing_ajax) { |
|
2067 | + echo $pre.$loading.$post; |
|
2068 | 2068 | return FALSE; |
2069 | 2069 | } |
2070 | 2070 | |
2071 | 2071 | ob_start(); |
2072 | - wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5) ); |
|
2073 | - set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS ); |
|
2072 | + wp_widget_rss_output($url, array('show_date' => 0, 'items' => 5)); |
|
2073 | + set_transient($cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS); |
|
2074 | 2074 | return TRUE; |
2075 | 2075 | |
2076 | 2076 | } |
@@ -2082,13 +2082,13 @@ discard block |
||
2082 | 2082 | <div id="espresso_news_post_box_content" class="infolinks"> |
2083 | 2083 | <?php |
2084 | 2084 | // Get RSS Feed(s) |
2085 | - $feed_url = apply_filters( 'FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/' ); |
|
2085 | + $feed_url = apply_filters('FHEE__EE_Admin_Page__espresso_news_post_box__feed_url', 'http://eventespresso.com/feed/'); |
|
2086 | 2086 | $url = urlencode($feed_url); |
2087 | - self::cached_rss_display( 'espresso_news_post_box_content', $url ); |
|
2087 | + self::cached_rss_display('espresso_news_post_box_content', $url); |
|
2088 | 2088 | |
2089 | 2089 | ?> |
2090 | 2090 | </div> |
2091 | - <?php do_action( 'AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?> |
|
2091 | + <?php do_action('AHEE__EE_Admin_Page__espresso_news_post_box__after_content'); ?> |
|
2092 | 2092 | </div> |
2093 | 2093 | <?php |
2094 | 2094 | } |
@@ -2109,32 +2109,32 @@ discard block |
||
2109 | 2109 | |
2110 | 2110 | protected function _espresso_sponsors_post_box() { |
2111 | 2111 | |
2112 | - $show_sponsors = apply_filters( 'FHEE_show_sponsors_meta_box', TRUE ); |
|
2113 | - if ( $show_sponsors ) |
|
2114 | - add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array( $this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side'); |
|
2112 | + $show_sponsors = apply_filters('FHEE_show_sponsors_meta_box', TRUE); |
|
2113 | + if ($show_sponsors) |
|
2114 | + add_meta_box('espresso_sponsors_post_box', __('Event Espresso Highlights', 'event_espresso'), array($this, 'espresso_sponsors_post_box'), $this->_wp_page_slug, 'side'); |
|
2115 | 2115 | } |
2116 | 2116 | |
2117 | 2117 | |
2118 | 2118 | public function espresso_sponsors_post_box() { |
2119 | - $templatepath = EE_ADMIN_TEMPLATE . 'admin_general_metabox_contents_espresso_sponsors.template.php'; |
|
2120 | - EEH_Template::display_template( $templatepath ); |
|
2119 | + $templatepath = EE_ADMIN_TEMPLATE.'admin_general_metabox_contents_espresso_sponsors.template.php'; |
|
2120 | + EEH_Template::display_template($templatepath); |
|
2121 | 2121 | } |
2122 | 2122 | |
2123 | 2123 | |
2124 | 2124 | |
2125 | 2125 | private function _publish_post_box() { |
2126 | - $meta_box_ref = 'espresso_' . $this->page_slug . '_editor_overview'; |
|
2126 | + $meta_box_ref = 'espresso_'.$this->page_slug.'_editor_overview'; |
|
2127 | 2127 | |
2128 | 2128 | //if there is a array('label' => array('publishbox' => 'some title') ) present in the _page_config array then we'll use that for the metabox label. Otherwise we'll just use publish (publishbox itself could be an array of labels indexed by routes) |
2129 | - if ( !empty( $this->_labels['publishbox'] ) ) { |
|
2130 | - $box_label = is_array( $this->_labels['publishbox'] ) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox']; |
|
2129 | + if ( ! empty($this->_labels['publishbox'])) { |
|
2130 | + $box_label = is_array($this->_labels['publishbox']) ? $this->_labels['publishbox'][$this->_req_action] : $this->_labels['publishbox']; |
|
2131 | 2131 | } else { |
2132 | 2132 | $box_label = __('Publish', 'event_espresso'); |
2133 | 2133 | } |
2134 | 2134 | |
2135 | - $box_label = apply_filters( 'FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this ); |
|
2135 | + $box_label = apply_filters('FHEE__EE_Admin_Page___publish_post_box__box_label', $box_label, $this->_req_action, $this); |
|
2136 | 2136 | |
2137 | - add_meta_box( $meta_box_ref, $box_label, array( $this, 'editor_overview' ), $this->_current_screen->id, 'side', 'high' ); |
|
2137 | + add_meta_box($meta_box_ref, $box_label, array($this, 'editor_overview'), $this->_current_screen->id, 'side', 'high'); |
|
2138 | 2138 | |
2139 | 2139 | } |
2140 | 2140 | |
@@ -2142,9 +2142,9 @@ discard block |
||
2142 | 2142 | |
2143 | 2143 | public function editor_overview() { |
2144 | 2144 | //if we have extra content set let's add it in if not make sure its empty |
2145 | - $this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : ''; |
|
2146 | - $template_path = EE_ADMIN_TEMPLATE . 'admin_details_publish_metabox.template.php'; |
|
2147 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
2145 | + $this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : ''; |
|
2146 | + $template_path = EE_ADMIN_TEMPLATE.'admin_details_publish_metabox.template.php'; |
|
2147 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
2148 | 2148 | } |
2149 | 2149 | |
2150 | 2150 | |
@@ -2160,8 +2160,8 @@ discard block |
||
2160 | 2160 | * @see $this->_set_publish_post_box_vars for param details |
2161 | 2161 | * @since 4.6.0 |
2162 | 2162 | */ |
2163 | - public function set_publish_post_box_vars( $name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true ) { |
|
2164 | - $this->_set_publish_post_box_vars( $name, $id, $delete, $save_close_redirect_URL, $both_btns ); |
|
2163 | + public function set_publish_post_box_vars($name = null, $id = false, $delete = false, $save_close_redirect_URL = null, $both_btns = true) { |
|
2164 | + $this->_set_publish_post_box_vars($name, $id, $delete, $save_close_redirect_URL, $both_btns); |
|
2165 | 2165 | } |
2166 | 2166 | |
2167 | 2167 | |
@@ -2180,24 +2180,24 @@ discard block |
||
2180 | 2180 | * @param string $post_save_redirect_URL custom URL to redirect to after Save & Close has been completed |
2181 | 2181 | * @param boolean $both_btns whether to display BOTH the "Save & Close" and "Save" buttons or just the Save button |
2182 | 2182 | */ |
2183 | - protected function _set_publish_post_box_vars( $name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE ) { |
|
2183 | + protected function _set_publish_post_box_vars($name = NULL, $id = FALSE, $delete = FALSE, $save_close_redirect_URL = NULL, $both_btns = TRUE) { |
|
2184 | 2184 | |
2185 | 2185 | // if Save & Close, use a custom redirect URL or default to the main page? |
2186 | - $save_close_redirect_URL = ! empty( $save_close_redirect_URL ) ? $save_close_redirect_URL : $this->_admin_base_url; |
|
2186 | + $save_close_redirect_URL = ! empty($save_close_redirect_URL) ? $save_close_redirect_URL : $this->_admin_base_url; |
|
2187 | 2187 | // create the Save & Close and Save buttons |
2188 | - $this->_set_save_buttons( $both_btns, array(), array(), $save_close_redirect_URL ); |
|
2188 | + $this->_set_save_buttons($both_btns, array(), array(), $save_close_redirect_URL); |
|
2189 | 2189 | //if we have extra content set let's add it in if not make sure its empty |
2190 | - $this->_template_args['publish_box_extra_content'] = isset( $this->_template_args['publish_box_extra_content'] ) ? $this->_template_args['publish_box_extra_content'] : ''; |
|
2190 | + $this->_template_args['publish_box_extra_content'] = isset($this->_template_args['publish_box_extra_content']) ? $this->_template_args['publish_box_extra_content'] : ''; |
|
2191 | 2191 | |
2192 | 2192 | |
2193 | - if ( $delete && ! empty( $id ) ) { |
|
2193 | + if ($delete && ! empty($id)) { |
|
2194 | 2194 | $delete = is_bool($delete) ? 'delete' : $delete; //make sure we have a default if just true is sent. |
2195 | - $delete_link_args = array( $name => $id ); |
|
2196 | - $delete = $this->get_action_link_or_button( $delete, $delete, $delete_link_args, 'submitdelete deletion'); |
|
2195 | + $delete_link_args = array($name => $id); |
|
2196 | + $delete = $this->get_action_link_or_button($delete, $delete, $delete_link_args, 'submitdelete deletion'); |
|
2197 | 2197 | } |
2198 | 2198 | |
2199 | - $this->_template_args['publish_delete_link'] = !empty( $id ) ? $delete : ''; |
|
2200 | - if ( ! empty( $name ) && ! empty( $id ) ) { |
|
2199 | + $this->_template_args['publish_delete_link'] = ! empty($id) ? $delete : ''; |
|
2200 | + if ( ! empty($name) && ! empty($id)) { |
|
2201 | 2201 | $hidden_field_arr[$name] = array( |
2202 | 2202 | 'type' => 'hidden', |
2203 | 2203 | 'value' => $id |
@@ -2207,7 +2207,7 @@ discard block |
||
2207 | 2207 | $hf = ''; |
2208 | 2208 | } |
2209 | 2209 | // add hidden field |
2210 | - $this->_template_args['publish_hidden_fields'] = ! empty( $hf ) ? $hf[$name]['field'] : $hf; |
|
2210 | + $this->_template_args['publish_hidden_fields'] = ! empty($hf) ? $hf[$name]['field'] : $hf; |
|
2211 | 2211 | |
2212 | 2212 | } |
2213 | 2213 | |
@@ -2224,8 +2224,8 @@ discard block |
||
2224 | 2224 | <noscript> |
2225 | 2225 | <div id="no-js-message" class="error"> |
2226 | 2226 | <p style="font-size:1.3em;"> |
2227 | - <span style="color:red;"><?php _e( 'Warning!', 'event_espresso' ); ?></span> |
|
2228 | - <?php _e( 'Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso' ); ?> |
|
2227 | + <span style="color:red;"><?php _e('Warning!', 'event_espresso'); ?></span> |
|
2228 | + <?php _e('Javascript is currently turned off for your browser. Javascript must be enabled in order for all of the features on this page to function properly. Please turn your javascript back on.', 'event_espresso'); ?> |
|
2229 | 2229 | </p> |
2230 | 2230 | </div> |
2231 | 2231 | </noscript> |
@@ -2245,7 +2245,7 @@ discard block |
||
2245 | 2245 | * @return string |
2246 | 2246 | */ |
2247 | 2247 | private function _display_espresso_notices() { |
2248 | - $notices = $this->_get_transient( TRUE ); |
|
2248 | + $notices = $this->_get_transient(TRUE); |
|
2249 | 2249 | echo stripslashes($notices); |
2250 | 2250 | } |
2251 | 2251 | |
@@ -2297,11 +2297,11 @@ discard block |
||
2297 | 2297 | * @param string $priority give this metabox a priority (using accepted priorities for wp meta boxes) |
2298 | 2298 | * @param boolean $create_func default is true. Basically we can say we don't WANT to have the runtime function created but just set our own callback for wp's add_meta_box. |
2299 | 2299 | */ |
2300 | - public function _add_admin_page_meta_box( $action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true ) { |
|
2301 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, $callback ); |
|
2300 | + public function _add_admin_page_meta_box($action, $title, $callback, $callback_args, $column = 'normal', $priority = 'high', $create_func = true) { |
|
2301 | + do_action('AHEE_log', __FILE__, __FUNCTION__, $callback); |
|
2302 | 2302 | |
2303 | 2303 | //if we have empty callback args and we want to automatically create the metabox callback then we need to make sure the callback args are generated. |
2304 | - if ( empty( $callback_args ) && $create_func ) { |
|
2304 | + if (empty($callback_args) && $create_func) { |
|
2305 | 2305 | $callback_args = array( |
2306 | 2306 | 'template_path' => $this->_template_path, |
2307 | 2307 | 'template_args' => $this->_template_args, |
@@ -2311,7 +2311,7 @@ discard block |
||
2311 | 2311 | //if $create_func is true (default) then we automatically create the function for displaying the actual meta box. If false then we take the $callback reference passed through and use it instead (so callers can define their own callback function/method if they wish) |
2312 | 2312 | $call_back_func = $create_func ? create_function('$post, $metabox', 'do_action( "AHEE_log", __FILE__, __FUNCTION__, ""); echo EEH_Template::display_template( $metabox["args"]["template_path"], $metabox["args"]["template_args"], TRUE );') : $callback; |
2313 | 2313 | |
2314 | - add_meta_box( str_replace( '_', '-', $action ) . '-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args ); |
|
2314 | + add_meta_box(str_replace('_', '-', $action).'-mbox', $title, $call_back_func, $this->_wp_page_slug, $column, $priority, $callback_args); |
|
2315 | 2315 | } |
2316 | 2316 | |
2317 | 2317 | |
@@ -2324,7 +2324,7 @@ discard block |
||
2324 | 2324 | */ |
2325 | 2325 | public function display_admin_page_with_metabox_columns() { |
2326 | 2326 | $this->_template_args['post_body_content'] = $this->_template_args['admin_page_content']; |
2327 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $this->_column_template_path, $this->_template_args, TRUE); |
|
2327 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($this->_column_template_path, $this->_template_args, TRUE); |
|
2328 | 2328 | |
2329 | 2329 | //the final wrapper |
2330 | 2330 | $this->admin_page_wrapper(); |
@@ -2367,7 +2367,7 @@ discard block |
||
2367 | 2367 | * @return void |
2368 | 2368 | */ |
2369 | 2369 | public function display_about_admin_page() { |
2370 | - $this->_display_admin_page( FALSE, TRUE ); |
|
2370 | + $this->_display_admin_page(FALSE, TRUE); |
|
2371 | 2371 | } |
2372 | 2372 | |
2373 | 2373 | |
@@ -2383,26 +2383,26 @@ discard block |
||
2383 | 2383 | * @return html admin_page |
2384 | 2384 | */ |
2385 | 2385 | private function _display_admin_page($sidebar = false, $about = FALSE) { |
2386 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
2386 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
2387 | 2387 | |
2388 | 2388 | //custom remove metaboxes hook to add or remove any metaboxes to/from Admin pages. |
2389 | - do_action( 'AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes' ); |
|
2389 | + do_action('AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes'); |
|
2390 | 2390 | |
2391 | 2391 | // set current wp page slug - looks like: event-espresso_page_event_categories |
2392 | 2392 | // keep in mind "event-espresso" COULD be something else if the top level menu label has been translated. |
2393 | 2393 | $this->_template_args['current_page'] = $this->_wp_page_slug; |
2394 | 2394 | |
2395 | - $template_path = $sidebar ? EE_ADMIN_TEMPLATE . 'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar.template.php'; |
|
2395 | + $template_path = $sidebar ? EE_ADMIN_TEMPLATE.'admin_details_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar.template.php'; |
|
2396 | 2396 | |
2397 | - if ( defined('DOING_AJAX' ) ) |
|
2398 | - $template_path = EE_ADMIN_TEMPLATE . 'admin_details_wrapper_no_sidebar_ajax.template.php'; |
|
2397 | + if (defined('DOING_AJAX')) |
|
2398 | + $template_path = EE_ADMIN_TEMPLATE.'admin_details_wrapper_no_sidebar_ajax.template.php'; |
|
2399 | 2399 | |
2400 | - $template_path = !empty($this->_column_template_path) ? $this->_column_template_path : $template_path; |
|
2400 | + $template_path = ! empty($this->_column_template_path) ? $this->_column_template_path : $template_path; |
|
2401 | 2401 | |
2402 | - $this->_template_args['post_body_content'] = isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : ''; |
|
2402 | + $this->_template_args['post_body_content'] = isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : ''; |
|
2403 | 2403 | $this->_template_args['before_admin_page_content'] = isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : ''; |
2404 | 2404 | $this->_template_args['after_admin_page_content'] = isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : ''; |
2405 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
2405 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
2406 | 2406 | |
2407 | 2407 | |
2408 | 2408 | // the final template wrapper |
@@ -2422,7 +2422,7 @@ discard block |
||
2422 | 2422 | * @param bool $display_sidebar whether to use the sidebar template or the full template for the page. TRUE = SHOW sidebar, FALSE = no sidebar. Default no sidebar. |
2423 | 2423 | * @return void |
2424 | 2424 | */ |
2425 | - public function display_admin_caf_preview_page( $utm_campaign_source = '', $display_sidebar = TRUE ) { |
|
2425 | + public function display_admin_caf_preview_page($utm_campaign_source = '', $display_sidebar = TRUE) { |
|
2426 | 2426 | //let's generate a default preview action button if there isn't one already present. |
2427 | 2427 | $this->_labels['buttons']['buy_now'] = __('Upgrade Now', 'event_espresso'); |
2428 | 2428 | $buy_now_url = add_query_arg( |
@@ -2435,10 +2435,10 @@ discard block |
||
2435 | 2435 | ), |
2436 | 2436 | 'http://eventespresso.com/pricing/' |
2437 | 2437 | ); |
2438 | - $this->_template_args['preview_action_button'] = ! isset( $this->_template_args['preview_action_button'] ) ? $this->get_action_link_or_button( '', 'buy_now', array(), 'button-primary button-large', $buy_now_url, true ) : $this->_template_args['preview_action_button']; |
|
2439 | - $template_path = EE_ADMIN_TEMPLATE . 'admin_caf_full_page_preview.template.php'; |
|
2440 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
2441 | - $this->_display_admin_page( $display_sidebar ); |
|
2438 | + $this->_template_args['preview_action_button'] = ! isset($this->_template_args['preview_action_button']) ? $this->get_action_link_or_button('', 'buy_now', array(), 'button-primary button-large', $buy_now_url, true) : $this->_template_args['preview_action_button']; |
|
2439 | + $template_path = EE_ADMIN_TEMPLATE.'admin_caf_full_page_preview.template.php'; |
|
2440 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
2441 | + $this->_display_admin_page($display_sidebar); |
|
2442 | 2442 | } |
2443 | 2443 | |
2444 | 2444 | |
@@ -2472,41 +2472,41 @@ discard block |
||
2472 | 2472 | * @param boolean $sidebar whether to display with sidebar or not. |
2473 | 2473 | * @return html |
2474 | 2474 | */ |
2475 | - private function _display_admin_list_table_page( $sidebar = false ) { |
|
2475 | + private function _display_admin_list_table_page($sidebar = false) { |
|
2476 | 2476 | //setup search attributes |
2477 | 2477 | $this->_set_search_attributes(); |
2478 | 2478 | $this->_template_args['current_page'] = $this->_wp_page_slug; |
2479 | - $template_path = EE_ADMIN_TEMPLATE . 'admin_list_wrapper.template.php'; |
|
2479 | + $template_path = EE_ADMIN_TEMPLATE.'admin_list_wrapper.template.php'; |
|
2480 | 2480 | |
2481 | - $this->_template_args['table_url'] = defined( 'DOING_AJAX') ? add_query_arg( array( 'noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url ) : add_query_arg( array( 'route' => $this->_req_action), $this->_admin_base_url); |
|
2481 | + $this->_template_args['table_url'] = defined('DOING_AJAX') ? add_query_arg(array('noheader' => 'true', 'route' => $this->_req_action), $this->_admin_base_url) : add_query_arg(array('route' => $this->_req_action), $this->_admin_base_url); |
|
2482 | 2482 | $this->_template_args['list_table'] = $this->_list_table_object; |
2483 | 2483 | $this->_template_args['current_route'] = $this->_req_action; |
2484 | - $this->_template_args['list_table_class'] = get_class( $this->_list_table_object ); |
|
2484 | + $this->_template_args['list_table_class'] = get_class($this->_list_table_object); |
|
2485 | 2485 | |
2486 | 2486 | $ajax_sorting_callback = $this->_list_table_object->get_ajax_sorting_callback(); |
2487 | - if( ! empty( $ajax_sorting_callback )) { |
|
2488 | - $sortable_list_table_form_fields = wp_nonce_field( $ajax_sorting_callback . '_nonce', $ajax_sorting_callback . '_nonce', FALSE, FALSE ); |
|
2487 | + if ( ! empty($ajax_sorting_callback)) { |
|
2488 | + $sortable_list_table_form_fields = wp_nonce_field($ajax_sorting_callback.'_nonce', $ajax_sorting_callback.'_nonce', FALSE, FALSE); |
|
2489 | 2489 | // $reorder_action = 'espresso_' . $ajax_sorting_callback . '_nonce'; |
2490 | 2490 | // $sortable_list_table_form_fields = wp_nonce_field( $reorder_action, 'ajax_table_sort_nonce', FALSE, FALSE ); |
2491 | - $sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="' . $this->page_slug .'" />'; |
|
2492 | - $sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="' . $ajax_sorting_callback . '" />'; |
|
2491 | + $sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_page" name="ajax_table_sort_page" value="'.$this->page_slug.'" />'; |
|
2492 | + $sortable_list_table_form_fields .= '<input type="hidden" id="ajax_table_sort_action" name="ajax_table_sort_action" value="'.$ajax_sorting_callback.'" />'; |
|
2493 | 2493 | } else { |
2494 | 2494 | $sortable_list_table_form_fields = ''; |
2495 | 2495 | } |
2496 | 2496 | |
2497 | 2497 | $this->_template_args['sortable_list_table_form_fields'] = $sortable_list_table_form_fields; |
2498 | - $hidden_form_fields = isset( $this->_template_args['list_table_hidden_fields'] ) ? $this->_template_args['list_table_hidden_fields'] : ''; |
|
2499 | - $nonce_ref = $this->_req_action . '_nonce'; |
|
2500 | - $hidden_form_fields .= '<input type="hidden" name="' . $nonce_ref . '" value="' . wp_create_nonce( $nonce_ref ) . '">'; |
|
2498 | + $hidden_form_fields = isset($this->_template_args['list_table_hidden_fields']) ? $this->_template_args['list_table_hidden_fields'] : ''; |
|
2499 | + $nonce_ref = $this->_req_action.'_nonce'; |
|
2500 | + $hidden_form_fields .= '<input type="hidden" name="'.$nonce_ref.'" value="'.wp_create_nonce($nonce_ref).'">'; |
|
2501 | 2501 | $this->_template_args['list_table_hidden_fields'] = $hidden_form_fields; |
2502 | 2502 | |
2503 | 2503 | //display message about search results? |
2504 | - $this->_template_args['before_list_table'] .= apply_filters( 'FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg', !empty( $this->_req_data['s'] ) ? '<p class="ee-search-results">' . sprintf( __('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'), trim($this->_req_data['s'], '%') ) . '</p>' : '', $this->page_slug, $this->_req_data, $this->_req_action ); |
|
2504 | + $this->_template_args['before_list_table'] .= apply_filters('FHEE__EE_Admin_Page___display_admin_list_table_page__before_list_table__template_arg', ! empty($this->_req_data['s']) ? '<p class="ee-search-results">'.sprintf(__('Displaying search results for the search string: <strong><em>%s</em></strong>', 'event_espresso'), trim($this->_req_data['s'], '%')).'</p>' : '', $this->page_slug, $this->_req_data, $this->_req_action); |
|
2505 | 2505 | |
2506 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
2506 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
2507 | 2507 | |
2508 | 2508 | // the final template wrapper |
2509 | - if ( $sidebar ) |
|
2509 | + if ($sidebar) |
|
2510 | 2510 | $this->display_admin_page_with_sidebar(); |
2511 | 2511 | else |
2512 | 2512 | $this->display_admin_page_with_no_sidebar(); |
@@ -2529,9 +2529,9 @@ discard block |
||
2529 | 2529 | * @param array $items see above for format of array |
2530 | 2530 | * @return string html string of legend |
2531 | 2531 | */ |
2532 | - protected function _display_legend( $items ) { |
|
2533 | - $template_args['items'] = apply_filters( 'FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this ); |
|
2534 | - $legend_template = EE_ADMIN_TEMPLATE . 'admin_details_legend.template.php'; |
|
2532 | + protected function _display_legend($items) { |
|
2533 | + $template_args['items'] = apply_filters('FHEE__EE_Admin_Page___display_legend__items', (array) $items, $this); |
|
2534 | + $legend_template = EE_ADMIN_TEMPLATE.'admin_details_legend.template.php'; |
|
2535 | 2535 | return EEH_Template::display_template($legend_template, $template_args, TRUE); |
2536 | 2536 | } |
2537 | 2537 | |
@@ -2556,31 +2556,31 @@ discard block |
||
2556 | 2556 | * |
2557 | 2557 | * @return json object |
2558 | 2558 | */ |
2559 | - protected function _return_json( $sticky_notices = FALSE ) { |
|
2559 | + protected function _return_json($sticky_notices = FALSE) { |
|
2560 | 2560 | |
2561 | 2561 | //make sure any EE_Error notices have been handled. |
2562 | - $this->_process_notices( array(), TRUE, $sticky_notices ); |
|
2562 | + $this->_process_notices(array(), TRUE, $sticky_notices); |
|
2563 | 2563 | |
2564 | 2564 | |
2565 | - $data = isset( $this->_template_args['data'] ) ? $this->_template_args['data'] : array(); |
|
2565 | + $data = isset($this->_template_args['data']) ? $this->_template_args['data'] : array(); |
|
2566 | 2566 | unset($this->_template_args['data']); |
2567 | 2567 | $json = array( |
2568 | - 'error' => isset( $this->_template_args['error'] ) ? $this->_template_args['error'] : FALSE, |
|
2569 | - 'success' => isset( $this->_template_args['success'] ) ? $this->_template_args['success'] : FALSE, |
|
2568 | + 'error' => isset($this->_template_args['error']) ? $this->_template_args['error'] : FALSE, |
|
2569 | + 'success' => isset($this->_template_args['success']) ? $this->_template_args['success'] : FALSE, |
|
2570 | 2570 | 'notices' => EE_Error::get_notices(), |
2571 | - 'content' => isset( $this->_template_args['admin_page_content'] ) ? $this->_template_args['admin_page_content'] : '', |
|
2572 | - 'data' => array_merge( $data, array('template_args' => $this->_template_args ) ), |
|
2571 | + 'content' => isset($this->_template_args['admin_page_content']) ? $this->_template_args['admin_page_content'] : '', |
|
2572 | + 'data' => array_merge($data, array('template_args' => $this->_template_args)), |
|
2573 | 2573 | 'isEEajax' => TRUE //special flag so any ajax.Success methods in js can identify this return package as a EEajax package. |
2574 | 2574 | ); |
2575 | 2575 | |
2576 | 2576 | |
2577 | 2577 | // make sure there are no php errors or headers_sent. Then we can set correct json header. |
2578 | - if ( NULL === error_get_last() || ! headers_sent() ) |
|
2578 | + if (NULL === error_get_last() || ! headers_sent()) |
|
2579 | 2579 | header('Content-Type: application/json; charset=UTF-8'); |
2580 | - if( function_exists( 'wp_json_encode' ) ) { |
|
2581 | - echo wp_json_encode( $json ); |
|
2580 | + if (function_exists('wp_json_encode')) { |
|
2581 | + echo wp_json_encode($json); |
|
2582 | 2582 | } else { |
2583 | - echo json_encode( $json ); |
|
2583 | + echo json_encode($json); |
|
2584 | 2584 | } |
2585 | 2585 | exit(); |
2586 | 2586 | } |
@@ -2592,11 +2592,11 @@ discard block |
||
2592 | 2592 | * @return json_obj|EE_Error |
2593 | 2593 | */ |
2594 | 2594 | public function return_json() { |
2595 | - if ( defined('DOING_AJAX') && DOING_AJAX ) |
|
2595 | + if (defined('DOING_AJAX') && DOING_AJAX) |
|
2596 | 2596 | $this->_return_json(); |
2597 | 2597 | |
2598 | 2598 | else { |
2599 | - throw new EE_Error( sprintf( __('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__ ) ); |
|
2599 | + throw new EE_Error(sprintf(__('The public %s method can only be called when DOING_AJAX = TRUE', 'event_espresso'), __FUNCTION__)); |
|
2600 | 2600 | } |
2601 | 2601 | } |
2602 | 2602 | |
@@ -2611,7 +2611,7 @@ discard block |
||
2611 | 2611 | * @access public |
2612 | 2612 | * @return void |
2613 | 2613 | */ |
2614 | - public function set_hook_object( EE_Admin_Hooks $hook_obj ) { |
|
2614 | + public function set_hook_object(EE_Admin_Hooks $hook_obj) { |
|
2615 | 2615 | $this->_hook_obj = $hook_obj; |
2616 | 2616 | } |
2617 | 2617 | |
@@ -2627,33 +2627,33 @@ discard block |
||
2627 | 2627 | */ |
2628 | 2628 | public function admin_page_wrapper($about = FALSE) { |
2629 | 2629 | |
2630 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
2630 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
2631 | 2631 | |
2632 | 2632 | $this->_nav_tabs = $this->_get_main_nav_tabs(); |
2633 | 2633 | |
2634 | 2634 | $this->_template_args['nav_tabs'] = $this->_nav_tabs; |
2635 | 2635 | $this->_template_args['admin_page_title'] = $this->_admin_page_title; |
2636 | 2636 | |
2637 | - $this->_template_args['before_admin_page_content'] = apply_filters( 'FHEE_before_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['before_admin_page_content'] ) ? $this->_template_args['before_admin_page_content'] : ''); |
|
2638 | - $this->_template_args['after_admin_page_content'] = apply_filters( 'FHEE_after_admin_page_content' . $this->_current_page . $this->_current_view, isset( $this->_template_args['after_admin_page_content'] ) ? $this->_template_args['after_admin_page_content'] : ''); |
|
2637 | + $this->_template_args['before_admin_page_content'] = apply_filters('FHEE_before_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['before_admin_page_content']) ? $this->_template_args['before_admin_page_content'] : ''); |
|
2638 | + $this->_template_args['after_admin_page_content'] = apply_filters('FHEE_after_admin_page_content'.$this->_current_page.$this->_current_view, isset($this->_template_args['after_admin_page_content']) ? $this->_template_args['after_admin_page_content'] : ''); |
|
2639 | 2639 | |
2640 | 2640 | $this->_template_args['after_admin_page_content'] .= $this->_set_help_popup_content(); |
2641 | 2641 | |
2642 | 2642 | |
2643 | 2643 | |
2644 | 2644 | // load settings page wrapper template |
2645 | - $template_path = !defined( 'DOING_AJAX' ) ? EE_ADMIN_TEMPLATE . 'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE . 'admin_wrapper_ajax.template.php'; |
|
2645 | + $template_path = ! defined('DOING_AJAX') ? EE_ADMIN_TEMPLATE.'admin_wrapper.template.php' : EE_ADMIN_TEMPLATE.'admin_wrapper_ajax.template.php'; |
|
2646 | 2646 | |
2647 | 2647 | //about page? |
2648 | - $template_path = $about ? EE_ADMIN_TEMPLATE . 'about_admin_wrapper.template.php' : $template_path; |
|
2648 | + $template_path = $about ? EE_ADMIN_TEMPLATE.'about_admin_wrapper.template.php' : $template_path; |
|
2649 | 2649 | |
2650 | 2650 | |
2651 | - if ( defined( 'DOING_AJAX' ) ) { |
|
2652 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
2651 | + if (defined('DOING_AJAX')) { |
|
2652 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
2653 | 2653 | |
2654 | 2654 | $this->_return_json(); |
2655 | 2655 | } else { |
2656 | - EEH_Template::display_template( $template_path, $this->_template_args ); |
|
2656 | + EEH_Template::display_template($template_path, $this->_template_args); |
|
2657 | 2657 | } |
2658 | 2658 | |
2659 | 2659 | } |
@@ -2666,7 +2666,7 @@ discard block |
||
2666 | 2666 | */ |
2667 | 2667 | protected function _get_main_nav_tabs() { |
2668 | 2668 | //let's generate the html using the EEH_Tabbed_Content helper. We do this here so that it's possible for child classes to add in nav tabs dynamically at the last minute (rather than setting in the page_routes array) |
2669 | - EE_Registry::instance()->load_helper( 'Tabbed_Content' ); |
|
2669 | + EE_Registry::instance()->load_helper('Tabbed_Content'); |
|
2670 | 2670 | return EEH_Tabbed_Content::display_admin_nav_tabs($this->_nav_tabs); |
2671 | 2671 | } |
2672 | 2672 | |
@@ -2682,7 +2682,7 @@ discard block |
||
2682 | 2682 | * @access public |
2683 | 2683 | * @return void |
2684 | 2684 | */ |
2685 | - private function _sort_nav_tabs( $a, $b ) { |
|
2685 | + private function _sort_nav_tabs($a, $b) { |
|
2686 | 2686 | if ($a['order'] == $b['order']) { |
2687 | 2687 | return 0; |
2688 | 2688 | } |
@@ -2703,8 +2703,8 @@ discard block |
||
2703 | 2703 | * @uses EEH_Form_Fields::get_form_fields (/helper/EEH_Form_Fields.helper.php) |
2704 | 2704 | * @uses EEH_Form_Fields::get_form_fields_array (/helper/EEH_Form_Fields.helper.php) |
2705 | 2705 | */ |
2706 | - protected function _generate_admin_form_fields( $input_vars = array(), $generator = 'string', $id = FALSE ) { |
|
2707 | - EE_Registry::instance()->load_helper( 'Form_Fields' ); |
|
2706 | + protected function _generate_admin_form_fields($input_vars = array(), $generator = 'string', $id = FALSE) { |
|
2707 | + EE_Registry::instance()->load_helper('Form_Fields'); |
|
2708 | 2708 | $content = $generator == 'string' ? EEH_Form_Fields::get_form_fields($input_vars, $id) : EEH_Form_Fields::get_form_fields_array($input_vars); |
2709 | 2709 | return $content; |
2710 | 2710 | } |
@@ -2726,25 +2726,25 @@ discard block |
||
2726 | 2726 | * @param array $actions if included allows us to set the actions that each button will carry out (i.e. via the "name" value in the button). We can also use this to just dump default actions by submitting some other value. |
2727 | 2727 | * @param bool|string|null $referrer if false then we just do the default action on save and close. Other wise it will use the $referrer string. IF null, then we don't do ANYTHING on save and close (normal form handling). |
2728 | 2728 | */ |
2729 | - protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL ) { |
|
2729 | + protected function _set_save_buttons($both = TRUE, $text = array(), $actions = array(), $referrer = NULL) { |
|
2730 | 2730 | //make sure $text and $actions are in an array |
2731 | 2731 | $text = (array) $text; |
2732 | 2732 | $actions = (array) $actions; |
2733 | 2733 | $referrer_url = empty($referrer) ? '' : $referrer; |
2734 | - $referrer_url = !$referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $_SERVER['REQUEST_URI'] .'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="' . $referrer .'" />'; |
|
2734 | + $referrer_url = ! $referrer ? '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$_SERVER['REQUEST_URI'].'" />' : '<input type="hidden" id="save_and_close_referrer" name="save_and_close_referrer" value="'.$referrer.'" />'; |
|
2735 | 2735 | |
2736 | - $button_text = !empty($text) ? $text : array( __('Save', 'event_espresso'), __('Save and Close', 'event_espresso') ); |
|
2737 | - $default_names = array( 'save', 'save_and_close' ); |
|
2736 | + $button_text = ! empty($text) ? $text : array(__('Save', 'event_espresso'), __('Save and Close', 'event_espresso')); |
|
2737 | + $default_names = array('save', 'save_and_close'); |
|
2738 | 2738 | |
2739 | 2739 | //add in a hidden index for the current page (so save and close redirects properly) |
2740 | 2740 | $this->_template_args['save_buttons'] = $referrer_url; |
2741 | 2741 | |
2742 | - foreach ( $button_text as $key => $button ) { |
|
2742 | + foreach ($button_text as $key => $button) { |
|
2743 | 2743 | $ref = $default_names[$key]; |
2744 | - $id = $this->_current_view . '_' . $ref; |
|
2745 | - $name = !empty($actions) ? $actions[$key] : $ref; |
|
2746 | - $this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary ' . $ref . '" value="' . $button . '" name="' . $name . '" id="' . $id . '" />'; |
|
2747 | - if ( !$both ) break; |
|
2744 | + $id = $this->_current_view.'_'.$ref; |
|
2745 | + $name = ! empty($actions) ? $actions[$key] : $ref; |
|
2746 | + $this->_template_args['save_buttons'] .= '<input type="submit" class="button-primary '.$ref.'" value="'.$button.'" name="'.$name.'" id="'.$id.'" />'; |
|
2747 | + if ( ! $both) break; |
|
2748 | 2748 | } |
2749 | 2749 | |
2750 | 2750 | } |
@@ -2757,8 +2757,8 @@ discard block |
||
2757 | 2757 | * @since 4.6.0 |
2758 | 2758 | * |
2759 | 2759 | */ |
2760 | - public function set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) { |
|
2761 | - $this->_set_add_edit_form_tags( $route, $additional_hidden_fields ); |
|
2760 | + public function set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) { |
|
2761 | + $this->_set_add_edit_form_tags($route, $additional_hidden_fields); |
|
2762 | 2762 | } |
2763 | 2763 | |
2764 | 2764 | |
@@ -2771,30 +2771,30 @@ discard block |
||
2771 | 2771 | * @param array $additional_hidden_fields any additional hidden fields required in the form header |
2772 | 2772 | * @return void |
2773 | 2773 | */ |
2774 | - protected function _set_add_edit_form_tags( $route = '', $additional_hidden_fields = array() ) { |
|
2774 | + protected function _set_add_edit_form_tags($route = '', $additional_hidden_fields = array()) { |
|
2775 | 2775 | |
2776 | - if ( empty( $route )) { |
|
2776 | + if (empty($route)) { |
|
2777 | 2777 | $user_msg = __('An error occurred. No action was set for this page\'s form.', 'event_espresso'); |
2778 | - $dev_msg = $user_msg . "\n" . sprintf( __('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__ ); |
|
2779 | - EE_Error::add_error( $user_msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
2778 | + $dev_msg = $user_msg."\n".sprintf(__('The $route argument is required for the %s->%s method.', 'event_espresso'), __FUNCTION__, __CLASS__); |
|
2779 | + EE_Error::add_error($user_msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__); |
|
2780 | 2780 | } |
2781 | 2781 | // open form |
2782 | - $this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="' . $this->_admin_base_url . '" id="' . $route . '_event_form" >'; |
|
2782 | + $this->_template_args['before_admin_page_content'] = '<form name="form" method="post" action="'.$this->_admin_base_url.'" id="'.$route.'_event_form" >'; |
|
2783 | 2783 | // add nonce |
2784 | - $nonce = wp_nonce_field( $route . '_nonce', $route . '_nonce', FALSE, FALSE ); |
|
2784 | + $nonce = wp_nonce_field($route.'_nonce', $route.'_nonce', FALSE, FALSE); |
|
2785 | 2785 | // $nonce = wp_nonce_field( $route . '_nonce', '_wpnonce', FALSE, FALSE ); |
2786 | - $this->_template_args['before_admin_page_content'] .= "\n\t" . $nonce; |
|
2786 | + $this->_template_args['before_admin_page_content'] .= "\n\t".$nonce; |
|
2787 | 2787 | // add REQUIRED form action |
2788 | 2788 | $hidden_fields = array( |
2789 | - 'action' => array( 'type' => 'hidden', 'value' => $route ), |
|
2789 | + 'action' => array('type' => 'hidden', 'value' => $route), |
|
2790 | 2790 | ); |
2791 | 2791 | // merge arrays |
2792 | - $hidden_fields = is_array( $additional_hidden_fields) ? array_merge( $hidden_fields, $additional_hidden_fields ) : $hidden_fields; |
|
2792 | + $hidden_fields = is_array($additional_hidden_fields) ? array_merge($hidden_fields, $additional_hidden_fields) : $hidden_fields; |
|
2793 | 2793 | // generate form fields |
2794 | - $form_fields = $this->_generate_admin_form_fields( $hidden_fields, 'array' ); |
|
2794 | + $form_fields = $this->_generate_admin_form_fields($hidden_fields, 'array'); |
|
2795 | 2795 | // add fields to form |
2796 | - foreach ( $form_fields as $field_name => $form_field ) { |
|
2797 | - $this->_template_args['before_admin_page_content'] .= "\n\t" . $form_field['field']; |
|
2796 | + foreach ($form_fields as $field_name => $form_field) { |
|
2797 | + $this->_template_args['before_admin_page_content'] .= "\n\t".$form_field['field']; |
|
2798 | 2798 | } |
2799 | 2799 | |
2800 | 2800 | // close form |
@@ -2811,8 +2811,8 @@ discard block |
||
2811 | 2811 | * @see EE_Admin_Page::_redirect_after_action() for params. |
2812 | 2812 | * @since 4.5.0 |
2813 | 2813 | */ |
2814 | - public function redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) { |
|
2815 | - $this->_redirect_after_action( $success, $what, $action_desc, $query_args, $override_overwrite ); |
|
2814 | + public function redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) { |
|
2815 | + $this->_redirect_after_action($success, $what, $action_desc, $query_args, $override_overwrite); |
|
2816 | 2816 | } |
2817 | 2817 | |
2818 | 2818 | |
@@ -2827,32 +2827,32 @@ discard block |
||
2827 | 2827 | * @access protected |
2828 | 2828 | * @return void |
2829 | 2829 | */ |
2830 | - protected function _redirect_after_action( $success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE ) { |
|
2830 | + protected function _redirect_after_action($success = FALSE, $what = 'item', $action_desc = 'processed', $query_args = array(), $override_overwrite = FALSE) { |
|
2831 | 2831 | |
2832 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
2832 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
2833 | 2833 | |
2834 | 2834 | //class name for actions/filters. |
2835 | 2835 | $classname = get_class($this); |
2836 | 2836 | |
2837 | 2837 | //set redirect url. Note if there is a "page" index in the $query_args then we go with vanilla admin.php route, otherwise we go with whatever is set as the _admin_base_url |
2838 | - $redirect_url = isset( $query_args['page'] ) ? admin_url('admin.php') : $this->_admin_base_url; |
|
2839 | - $notices = EE_Error::get_notices( FALSE ); |
|
2838 | + $redirect_url = isset($query_args['page']) ? admin_url('admin.php') : $this->_admin_base_url; |
|
2839 | + $notices = EE_Error::get_notices(FALSE); |
|
2840 | 2840 | |
2841 | 2841 | // overwrite default success messages //BUT ONLY if overwrite not overridden |
2842 | - if ( ! $override_overwrite || ! empty( $notices['errors'] )) { |
|
2842 | + if ( ! $override_overwrite || ! empty($notices['errors'])) { |
|
2843 | 2843 | EE_Error::overwrite_success(); |
2844 | 2844 | } |
2845 | 2845 | // how many records affected ? more than one record ? or just one ? |
2846 | - if ( $success > 1 && empty( $notices['errors'] )) { |
|
2846 | + if ($success > 1 && empty($notices['errors'])) { |
|
2847 | 2847 | // set plural msg |
2848 | - EE_Error::add_success( sprintf( __('The "%s" have been successfully %s.', 'event_espresso'), $what, $action_desc ), __FILE__, __FUNCTION__, __LINE__); |
|
2849 | - } else if ( $success == 1 && empty( $notices['errors'] )) { |
|
2848 | + EE_Error::add_success(sprintf(__('The "%s" have been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__); |
|
2849 | + } else if ($success == 1 && empty($notices['errors'])) { |
|
2850 | 2850 | // set singular msg |
2851 | - EE_Error::add_success( sprintf( __('The "%s" has been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__ ); |
|
2851 | + EE_Error::add_success(sprintf(__('The "%s" has been successfully %s.', 'event_espresso'), $what, $action_desc), __FILE__, __FUNCTION__, __LINE__); |
|
2852 | 2852 | } |
2853 | 2853 | |
2854 | 2854 | // check that $query_args isn't something crazy |
2855 | - if ( ! is_array( $query_args )) { |
|
2855 | + if ( ! is_array($query_args)) { |
|
2856 | 2856 | $query_args = array(); |
2857 | 2857 | } |
2858 | 2858 | |
@@ -2865,36 +2865,36 @@ discard block |
||
2865 | 2865 | * @param array $query_args The original query_args array coming into the |
2866 | 2866 | * method. |
2867 | 2867 | */ |
2868 | - do_action( 'AHEE__' . $classname . '___redirect_after_action__before_redirect_modification_' . $this->_req_action, $query_args ); |
|
2868 | + do_action('AHEE__'.$classname.'___redirect_after_action__before_redirect_modification_'.$this->_req_action, $query_args); |
|
2869 | 2869 | |
2870 | 2870 | //calculate where we're going (if we have a "save and close" button pushed) |
2871 | - if ( isset($this->_req_data['save_and_close'] ) && isset($this->_req_data['save_and_close_referrer'] ) ) { |
|
2871 | + if (isset($this->_req_data['save_and_close']) && isset($this->_req_data['save_and_close_referrer'])) { |
|
2872 | 2872 | // even though we have the save_and_close referrer, we need to parse the url for the action in order to generate a nonce |
2873 | - $parsed_url = parse_url( $this->_req_data['save_and_close_referrer'] ); |
|
2873 | + $parsed_url = parse_url($this->_req_data['save_and_close_referrer']); |
|
2874 | 2874 | // regenerate query args array from refferer URL |
2875 | - parse_str( $parsed_url['query'], $query_args ); |
|
2875 | + parse_str($parsed_url['query'], $query_args); |
|
2876 | 2876 | // correct page and action will be in the query args now |
2877 | - $redirect_url = admin_url( 'admin.php' ); |
|
2877 | + $redirect_url = admin_url('admin.php'); |
|
2878 | 2878 | } |
2879 | 2879 | |
2880 | 2880 | //merge any default query_args set in _default_route_query_args property |
2881 | - if ( ! empty( $this->_default_route_query_args ) && ! $this->_is_UI_request ) { |
|
2881 | + if ( ! empty($this->_default_route_query_args) && ! $this->_is_UI_request) { |
|
2882 | 2882 | $args_to_merge = array(); |
2883 | - foreach ( $this->_default_route_query_args as $query_param => $query_value ) { |
|
2883 | + foreach ($this->_default_route_query_args as $query_param => $query_value) { |
|
2884 | 2884 | //is there a wp_referer array in our _default_route_query_args property? |
2885 | - if ( $query_param == 'wp_referer' ) { |
|
2885 | + if ($query_param == 'wp_referer') { |
|
2886 | 2886 | $query_value = (array) $query_value; |
2887 | - foreach ( $query_value as $reference => $value ) { |
|
2888 | - if ( strpos( $reference, 'nonce' ) !== false ) { |
|
2887 | + foreach ($query_value as $reference => $value) { |
|
2888 | + if (strpos($reference, 'nonce') !== false) { |
|
2889 | 2889 | continue; |
2890 | 2890 | } |
2891 | 2891 | |
2892 | 2892 | //finally we will override any arguments in the referer with |
2893 | 2893 | //what might be set on the _default_route_query_args array. |
2894 | - if ( isset( $this->_default_route_query_args[$reference] ) ) { |
|
2895 | - $args_to_merge[$reference] = urlencode( $this->_default_route_query_args[$reference] ); |
|
2894 | + if (isset($this->_default_route_query_args[$reference])) { |
|
2895 | + $args_to_merge[$reference] = urlencode($this->_default_route_query_args[$reference]); |
|
2896 | 2896 | } else { |
2897 | - $args_to_merge[$reference] = urlencode( $value ); |
|
2897 | + $args_to_merge[$reference] = urlencode($value); |
|
2898 | 2898 | } |
2899 | 2899 | } |
2900 | 2900 | continue; |
@@ -2905,7 +2905,7 @@ discard block |
||
2905 | 2905 | |
2906 | 2906 | //now let's merge these arguments but override with what was specifically sent in to the |
2907 | 2907 | //redirect. |
2908 | - $query_args = array_merge( $args_to_merge, $query_args ); |
|
2908 | + $query_args = array_merge($args_to_merge, $query_args); |
|
2909 | 2909 | } |
2910 | 2910 | |
2911 | 2911 | $this->_process_notices($query_args); |
@@ -2914,19 +2914,19 @@ discard block |
||
2914 | 2914 | // generate redirect url |
2915 | 2915 | |
2916 | 2916 | // if redirecting to anything other than the main page, add a nonce |
2917 | - if ( isset( $query_args['action'] )) { |
|
2917 | + if (isset($query_args['action'])) { |
|
2918 | 2918 | // manually generate wp_nonce and merge that with the query vars becuz the wp_nonce_url function wrecks havoc on some vars |
2919 | - $query_args['_wpnonce'] = wp_create_nonce( $query_args['action'] . '_nonce' ); |
|
2919 | + $query_args['_wpnonce'] = wp_create_nonce($query_args['action'].'_nonce'); |
|
2920 | 2920 | } |
2921 | 2921 | |
2922 | 2922 | //we're adding some hooks and filters in here for processing any things just before redirects (example: an admin page has done an insert or update and we want to run something after that). |
2923 | - do_action( 'AHEE_redirect_' . $classname . $this->_req_action, $query_args ); |
|
2923 | + do_action('AHEE_redirect_'.$classname.$this->_req_action, $query_args); |
|
2924 | 2924 | |
2925 | - $redirect_url = apply_filters( 'FHEE_redirect_' . $classname . $this->_req_action, self::add_query_args_and_nonce( $query_args, $redirect_url ), $query_args ); |
|
2925 | + $redirect_url = apply_filters('FHEE_redirect_'.$classname.$this->_req_action, self::add_query_args_and_nonce($query_args, $redirect_url), $query_args); |
|
2926 | 2926 | |
2927 | 2927 | |
2928 | 2928 | // check if we're doing ajax. If we are then lets just return the results and js can handle how it wants. |
2929 | - if ( defined('DOING_AJAX' ) ) { |
|
2929 | + if (defined('DOING_AJAX')) { |
|
2930 | 2930 | $default_data = array( |
2931 | 2931 | 'close' => TRUE, |
2932 | 2932 | 'redirect_url' => $redirect_url, |
@@ -2935,11 +2935,11 @@ discard block |
||
2935 | 2935 | ); |
2936 | 2936 | |
2937 | 2937 | $this->_template_args['success'] = $success; |
2938 | - $this->_template_args['data'] = !empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data'] ): $default_data; |
|
2938 | + $this->_template_args['data'] = ! empty($this->_template_args['data']) ? array_merge($default_data, $this->_template_args['data']) : $default_data; |
|
2939 | 2939 | $this->_return_json(); |
2940 | 2940 | } |
2941 | 2941 | |
2942 | - wp_safe_redirect( $redirect_url ); |
|
2942 | + wp_safe_redirect($redirect_url); |
|
2943 | 2943 | exit(); |
2944 | 2944 | } |
2945 | 2945 | |
@@ -2955,14 +2955,14 @@ discard block |
||
2955 | 2955 | * @param bool $sticky_notices This is used to flag that regardless of whether this is doing_ajax or not, we still save a transient for the notice. |
2956 | 2956 | * @return void |
2957 | 2957 | */ |
2958 | - protected function _process_notices( $query_args = array(), $skip_route_verify = FALSE , $sticky_notices = TRUE ) { |
|
2958 | + protected function _process_notices($query_args = array(), $skip_route_verify = FALSE, $sticky_notices = TRUE) { |
|
2959 | 2959 | |
2960 | 2960 | $this->_template_args['notices'] = EE_Error::get_notices(); |
2961 | 2961 | |
2962 | 2962 | //IF this isn't ajax we need to create a transient for the notices using the route (however, overridden if $sticky_notices == true) |
2963 | - if ( ! defined( 'DOING_AJAX' ) || $sticky_notices ) { |
|
2964 | - $route = isset( $query_args['action'] ) ? $query_args['action'] : 'default'; |
|
2965 | - $this->_add_transient( $route, $this->_template_args['notices'], TRUE, $skip_route_verify ); |
|
2963 | + if ( ! defined('DOING_AJAX') || $sticky_notices) { |
|
2964 | + $route = isset($query_args['action']) ? $query_args['action'] : 'default'; |
|
2965 | + $this->_add_transient($route, $this->_template_args['notices'], TRUE, $skip_route_verify); |
|
2966 | 2966 | } |
2967 | 2967 | } |
2968 | 2968 | |
@@ -2984,32 +2984,32 @@ discard block |
||
2984 | 2984 | * |
2985 | 2985 | * @return string html for button |
2986 | 2986 | */ |
2987 | - public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE, $exclude_nonce = false ) { |
|
2987 | + public function get_action_link_or_button($action, $type = 'add', $extra_request = array(), $class = 'button-primary', $base_url = FALSE, $exclude_nonce = false) { |
|
2988 | 2988 | //first let's validate the action (if $base_url is FALSE otherwise validation will happen further along) |
2989 | - if ( !isset($this->_page_routes[$action]) && !$base_url ) |
|
2990 | - throw new EE_Error( sprintf( __('There is no page route for given action for the button. This action was given: %s', 'event_espresso'), $action) ); |
|
2989 | + if ( ! isset($this->_page_routes[$action]) && ! $base_url) |
|
2990 | + throw new EE_Error(sprintf(__('There is no page route for given action for the button. This action was given: %s', 'event_espresso'), $action)); |
|
2991 | 2991 | |
2992 | - if ( !isset( $this->_labels['buttons'][$type] ) ) |
|
2993 | - throw new EE_Error( sprintf( __('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type) ); |
|
2992 | + if ( ! isset($this->_labels['buttons'][$type])) |
|
2993 | + throw new EE_Error(sprintf(__('There is no label for the given button type (%s). Labels are set in the <code>_page_config</code> property.', 'event_espresso'), $type)); |
|
2994 | 2994 | |
2995 | 2995 | //finally check user access for this button. |
2996 | - $has_access = $this->check_user_access( $action, TRUE ); |
|
2997 | - if ( ! $has_access ) { |
|
2996 | + $has_access = $this->check_user_access($action, TRUE); |
|
2997 | + if ( ! $has_access) { |
|
2998 | 2998 | return ''; |
2999 | 2999 | } |
3000 | 3000 | |
3001 | - $_base_url = !$base_url ? $this->_admin_base_url : $base_url; |
|
3001 | + $_base_url = ! $base_url ? $this->_admin_base_url : $base_url; |
|
3002 | 3002 | |
3003 | 3003 | $query_args = array( |
3004 | 3004 | 'action' => $action ); |
3005 | 3005 | |
3006 | 3006 | //merge extra_request args but make sure our original action takes precedence and doesn't get overwritten. |
3007 | - if ( !empty($extra_request) ) |
|
3008 | - $query_args = array_merge( $extra_request, $query_args ); |
|
3007 | + if ( ! empty($extra_request)) |
|
3008 | + $query_args = array_merge($extra_request, $query_args); |
|
3009 | 3009 | |
3010 | - $url = self::add_query_args_and_nonce( $query_args, $_base_url, false, $exclude_nonce ); |
|
3010 | + $url = self::add_query_args_and_nonce($query_args, $_base_url, false, $exclude_nonce); |
|
3011 | 3011 | |
3012 | - $button = EEH_Template::get_button_or_link( $url, $this->_labels['buttons'][$type], $class ); |
|
3012 | + $button = EEH_Template::get_button_or_link($url, $this->_labels['buttons'][$type], $class); |
|
3013 | 3013 | |
3014 | 3014 | return $button; |
3015 | 3015 | } |
@@ -3029,11 +3029,11 @@ discard block |
||
3029 | 3029 | $args = array( |
3030 | 3030 | 'label' => $this->_admin_page_title, |
3031 | 3031 | 'default' => 10, |
3032 | - 'option' => $this->_current_page . '_' . $this->_current_view . '_per_page' |
|
3032 | + 'option' => $this->_current_page.'_'.$this->_current_view.'_per_page' |
|
3033 | 3033 | ); |
3034 | 3034 | //ONLY add the screen option if the user has access to it. |
3035 | - if ( $this->check_user_access( $this->_current_view, true ) ) { |
|
3036 | - add_screen_option( $option, $args ); |
|
3035 | + if ($this->check_user_access($this->_current_view, true)) { |
|
3036 | + add_screen_option($option, $args); |
|
3037 | 3037 | } |
3038 | 3038 | } |
3039 | 3039 | |
@@ -3049,36 +3049,36 @@ discard block |
||
3049 | 3049 | * @return void |
3050 | 3050 | */ |
3051 | 3051 | private function _set_per_page_screen_options() { |
3052 | - if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) { |
|
3053 | - check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' ); |
|
3052 | + if (isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options'])) { |
|
3053 | + check_admin_referer('screen-options-nonce', 'screenoptionnonce'); |
|
3054 | 3054 | |
3055 | - if ( !$user = wp_get_current_user() ) |
|
3055 | + if ( ! $user = wp_get_current_user()) |
|
3056 | 3056 | return; |
3057 | 3057 | $option = $_POST['wp_screen_options']['option']; |
3058 | 3058 | $value = $_POST['wp_screen_options']['value']; |
3059 | 3059 | |
3060 | - if ( $option != sanitize_key( $option ) ) |
|
3060 | + if ($option != sanitize_key($option)) |
|
3061 | 3061 | return; |
3062 | 3062 | |
3063 | 3063 | $map_option = $option; |
3064 | 3064 | |
3065 | 3065 | $option = str_replace('-', '_', $option); |
3066 | 3066 | |
3067 | - switch ( $map_option ) { |
|
3068 | - case $this->_current_page . '_' . $this->_current_view . '_per_page': |
|
3067 | + switch ($map_option) { |
|
3068 | + case $this->_current_page.'_'.$this->_current_view.'_per_page': |
|
3069 | 3069 | $value = (int) $value; |
3070 | - if ( $value < 1 || $value > 999 ) |
|
3070 | + if ($value < 1 || $value > 999) |
|
3071 | 3071 | return; |
3072 | 3072 | break; |
3073 | 3073 | default: |
3074 | - $value = apply_filters( 'FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value ); |
|
3075 | - if ( false === $value ) |
|
3074 | + $value = apply_filters('FHEE__EE_Admin_Page___set_per_page_screen_options__value', false, $option, $value); |
|
3075 | + if (false === $value) |
|
3076 | 3076 | return; |
3077 | 3077 | break; |
3078 | 3078 | } |
3079 | 3079 | |
3080 | 3080 | update_user_meta($user->ID, $option, $value); |
3081 | - wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) ); |
|
3081 | + wp_safe_redirect(remove_query_arg(array('pagenum', 'apage', 'paged'), wp_get_referer())); |
|
3082 | 3082 | exit; |
3083 | 3083 | } |
3084 | 3084 | } |
@@ -3089,8 +3089,8 @@ discard block |
||
3089 | 3089 | * This just allows for setting the $_template_args property if it needs to be set outside the object |
3090 | 3090 | * @param array $data array that will be assigned to template args. |
3091 | 3091 | */ |
3092 | - public function set_template_args( $data ) { |
|
3093 | - $this->_template_args = array_merge( $this->_template_args, (array) $data ); |
|
3092 | + public function set_template_args($data) { |
|
3093 | + $this->_template_args = array_merge($this->_template_args, (array) $data); |
|
3094 | 3094 | } |
3095 | 3095 | |
3096 | 3096 | |
@@ -3106,26 +3106,26 @@ discard block |
||
3106 | 3106 | * @param bool $skip_route_verify Used to indicate we want to skip route verification. This is usually ONLY used when we are adding a transient before page_routes have been defined. |
3107 | 3107 | * @return void |
3108 | 3108 | */ |
3109 | - protected function _add_transient( $route, $data, $notices = FALSE, $skip_route_verify = FALSE ) { |
|
3109 | + protected function _add_transient($route, $data, $notices = FALSE, $skip_route_verify = FALSE) { |
|
3110 | 3110 | $user_id = get_current_user_id(); |
3111 | 3111 | |
3112 | - if ( !$skip_route_verify ) |
|
3112 | + if ( ! $skip_route_verify) |
|
3113 | 3113 | $this->_verify_route($route); |
3114 | 3114 | |
3115 | 3115 | |
3116 | 3116 | //now let's set the string for what kind of transient we're setting |
3117 | - $transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id; |
|
3118 | - $data = $notices ? array( 'notices' => $data ) : $data; |
|
3117 | + $transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id; |
|
3118 | + $data = $notices ? array('notices' => $data) : $data; |
|
3119 | 3119 | //is there already a transient for this route? If there is then let's ADD to that transient |
3120 | - $existing = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient ); |
|
3121 | - if ( $existing ) { |
|
3122 | - $data = array_merge( (array) $data, (array) $existing ); |
|
3120 | + $existing = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient); |
|
3121 | + if ($existing) { |
|
3122 | + $data = array_merge((array) $data, (array) $existing); |
|
3123 | 3123 | } |
3124 | 3124 | |
3125 | - if ( is_multisite() && is_network_admin() ) { |
|
3126 | - set_site_transient( $transient, $data, 8 ); |
|
3125 | + if (is_multisite() && is_network_admin()) { |
|
3126 | + set_site_transient($transient, $data, 8); |
|
3127 | 3127 | } else { |
3128 | - set_transient( $transient, $data, 8 ); |
|
3128 | + set_transient($transient, $data, 8); |
|
3129 | 3129 | } |
3130 | 3130 | } |
3131 | 3131 | |
@@ -3137,18 +3137,18 @@ discard block |
||
3137 | 3137 | * @param bool $notices true we get notices transient. False we just return normal route transient |
3138 | 3138 | * @return mixed data |
3139 | 3139 | */ |
3140 | - protected function _get_transient( $notices = FALSE, $route = FALSE ) { |
|
3140 | + protected function _get_transient($notices = FALSE, $route = FALSE) { |
|
3141 | 3141 | $user_id = get_current_user_id(); |
3142 | - $route = !$route ? $this->_req_action : $route; |
|
3143 | - $transient = $notices ? 'ee_rte_n_tx_' . $route . '_' . $user_id : 'rte_tx_' . $route . '_' . $user_id; |
|
3144 | - $data = is_multisite() && is_network_admin() ? get_site_transient( $transient ) : get_transient( $transient ); |
|
3142 | + $route = ! $route ? $this->_req_action : $route; |
|
3143 | + $transient = $notices ? 'ee_rte_n_tx_'.$route.'_'.$user_id : 'rte_tx_'.$route.'_'.$user_id; |
|
3144 | + $data = is_multisite() && is_network_admin() ? get_site_transient($transient) : get_transient($transient); |
|
3145 | 3145 | //delete transient after retrieval (just in case it hasn't expired); |
3146 | - if ( is_multisite() && is_network_admin() ) { |
|
3147 | - delete_site_transient( $transient ); |
|
3146 | + if (is_multisite() && is_network_admin()) { |
|
3147 | + delete_site_transient($transient); |
|
3148 | 3148 | } else { |
3149 | - delete_transient( $transient ); |
|
3149 | + delete_transient($transient); |
|
3150 | 3150 | } |
3151 | - return $notices && isset( $data['notices'] ) ? $data['notices'] : $data; |
|
3151 | + return $notices && isset($data['notices']) ? $data['notices'] : $data; |
|
3152 | 3152 | } |
3153 | 3153 | |
3154 | 3154 | |
@@ -3165,12 +3165,12 @@ discard block |
||
3165 | 3165 | |
3166 | 3166 | //retrieve all existing transients |
3167 | 3167 | $query = "SELECT option_name FROM $wpdb->options WHERE option_name LIKE '%rte_tx_%' OR option_name LIKE '%rte_n_tx_%'"; |
3168 | - if ( $results = $wpdb->get_results( $query ) ) { |
|
3169 | - foreach ( $results as $result ) { |
|
3170 | - $transient = str_replace( '_transient_', '', $result->option_name ); |
|
3171 | - get_transient( $transient ); |
|
3172 | - if ( is_multisite() && is_network_admin() ) { |
|
3173 | - get_site_transient( $transient ); |
|
3168 | + if ($results = $wpdb->get_results($query)) { |
|
3169 | + foreach ($results as $result) { |
|
3170 | + $transient = str_replace('_transient_', '', $result->option_name); |
|
3171 | + get_transient($transient); |
|
3172 | + if (is_multisite() && is_network_admin()) { |
|
3173 | + get_site_transient($transient); |
|
3174 | 3174 | } |
3175 | 3175 | } |
3176 | 3176 | } |
@@ -3294,23 +3294,23 @@ discard block |
||
3294 | 3294 | * @param string $line line no where error occurred |
3295 | 3295 | * @return boolean |
3296 | 3296 | */ |
3297 | - protected function _update_espresso_configuration( $tab, $config, $file = '', $func = '', $line = '' ) { |
|
3297 | + protected function _update_espresso_configuration($tab, $config, $file = '', $func = '', $line = '') { |
|
3298 | 3298 | |
3299 | 3299 | //remove any options that are NOT going to be saved with the config settings. |
3300 | - if ( isset( $config->core->ee_ueip_optin ) ) { |
|
3300 | + if (isset($config->core->ee_ueip_optin)) { |
|
3301 | 3301 | $config->core->ee_ueip_has_notified = TRUE; |
3302 | 3302 | // TODO: remove the following two lines and make sure values are migrated from 3.1 |
3303 | - update_option( 'ee_ueip_optin', $config->core->ee_ueip_optin); |
|
3304 | - update_option( 'ee_ueip_has_notified', TRUE ); |
|
3303 | + update_option('ee_ueip_optin', $config->core->ee_ueip_optin); |
|
3304 | + update_option('ee_ueip_has_notified', TRUE); |
|
3305 | 3305 | } |
3306 | 3306 | // and save it (note we're also doing the network save here) |
3307 | - $net_saved = is_main_site() ? EE_Network_Config::instance()->update_config( FALSE, FALSE ) : TRUE; |
|
3308 | - $config_saved = EE_Config::instance()->update_espresso_config( FALSE, FALSE ); |
|
3309 | - if ( $config_saved && $net_saved ) { |
|
3310 | - EE_Error::add_success( sprintf( __('"%s" have been successfully updated.', 'event_espresso'), $tab )); |
|
3307 | + $net_saved = is_main_site() ? EE_Network_Config::instance()->update_config(FALSE, FALSE) : TRUE; |
|
3308 | + $config_saved = EE_Config::instance()->update_espresso_config(FALSE, FALSE); |
|
3309 | + if ($config_saved && $net_saved) { |
|
3310 | + EE_Error::add_success(sprintf(__('"%s" have been successfully updated.', 'event_espresso'), $tab)); |
|
3311 | 3311 | return TRUE; |
3312 | 3312 | } else { |
3313 | - EE_Error::add_error( sprintf( __('The "%s" were not updated.', 'event_espresso'), $tab ), $file, $func, $line ); |
|
3313 | + EE_Error::add_error(sprintf(__('The "%s" were not updated.', 'event_espresso'), $tab), $file, $func, $line); |
|
3314 | 3314 | return FALSE; |
3315 | 3315 | } |
3316 | 3316 | } |
@@ -3323,7 +3323,7 @@ discard block |
||
3323 | 3323 | * Returns an array to be used for EE_FOrm_Fields.helper.php's select_input as the $values argument. |
3324 | 3324 | * @return array |
3325 | 3325 | */ |
3326 | - public function get_yes_no_values(){ |
|
3326 | + public function get_yes_no_values() { |
|
3327 | 3327 | return $this->_yes_no_values; |
3328 | 3328 | } |
3329 | 3329 | |
@@ -3345,8 +3345,8 @@ discard block |
||
3345 | 3345 | * |
3346 | 3346 | * @return string |
3347 | 3347 | */ |
3348 | - protected function _next_link( $url, $class = 'dashicons dashicons-arrow-right' ) { |
|
3349 | - return '<a class="' . $class . '" href="' . $url . '"></a>'; |
|
3348 | + protected function _next_link($url, $class = 'dashicons dashicons-arrow-right') { |
|
3349 | + return '<a class="'.$class.'" href="'.$url.'"></a>'; |
|
3350 | 3350 | } |
3351 | 3351 | |
3352 | 3352 | |
@@ -3360,8 +3360,8 @@ discard block |
||
3360 | 3360 | * |
3361 | 3361 | * @return string |
3362 | 3362 | */ |
3363 | - protected function _previous_link( $url, $class = 'dashicons dashicons-arrow-left' ) { |
|
3364 | - return '<a class="' . $class . '" href="' . $url . '"></a>'; |
|
3363 | + protected function _previous_link($url, $class = 'dashicons dashicons-arrow-left') { |
|
3364 | + return '<a class="'.$class.'" href="'.$url.'"></a>'; |
|
3365 | 3365 | } |
3366 | 3366 | |
3367 | 3367 | |
@@ -3380,8 +3380,8 @@ discard block |
||
3380 | 3380 | * @return bool success/fail |
3381 | 3381 | */ |
3382 | 3382 | protected function _process_resend_registration() { |
3383 | - $this->_template_args['success'] = EED_Messages::process_resend( $this->_req_data ); |
|
3384 | - do_action( 'AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data ); |
|
3383 | + $this->_template_args['success'] = EED_Messages::process_resend($this->_req_data); |
|
3384 | + do_action('AHEE__EE_Admin_Page___process_resend_registration', $this->_template_args['success'], $this->_req_data); |
|
3385 | 3385 | return $this->_template_args['success']; |
3386 | 3386 | } |
3387 | 3387 | |
@@ -3394,9 +3394,9 @@ discard block |
||
3394 | 3394 | * @param \EE_Payment $payment |
3395 | 3395 | * @return bool success/fail |
3396 | 3396 | */ |
3397 | - protected function _process_payment_notification( EE_Payment $payment ) { |
|
3398 | - add_filter( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', '__return_true' ); |
|
3399 | - $success = apply_filters( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', FALSE, $payment ); |
|
3397 | + protected function _process_payment_notification(EE_Payment $payment) { |
|
3398 | + add_filter('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', '__return_true'); |
|
3399 | + $success = apply_filters('FHEE__EE_Admin_Page___process_admin_payment_notification__success', FALSE, $payment); |
|
3400 | 3400 | $this->_template_args['success'] = $success; |
3401 | 3401 | return $success; |
3402 | 3402 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | /** |
6 | 6 | * Event Espresso |
@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <tr> |
29 | - <th><h3><?php _e("Invoice Gateway Settings", 'event_espresso');?></h3></th> |
|
29 | + <th><h3><?php _e("Invoice Gateway Settings", 'event_espresso'); ?></h3></th> |
|
30 | 30 | <td> |
31 | - <span class="description"><?php _e("The following settings affect the functioning of the Invoice gateway.", 'event_espresso');?></span> |
|
31 | + <span class="description"><?php _e("The following settings affect the functioning of the Invoice gateway.", 'event_espresso'); ?></span> |
|
32 | 32 | </td> |
33 | 33 | </tr> |
34 | 34 | <?php |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (!defined('EVENT_ESPRESSO_VERSION')) |
|
3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
4 | 4 | exit('No direct script access allowed'); |
5 | 5 | /** |
6 | 6 | * Event Espresso |
@@ -26,9 +26,9 @@ discard block |
||
26 | 26 | */ |
27 | 27 | ?> |
28 | 28 | <tr> |
29 | - <th><h3><?php _e("Invoice Display Settings", 'event_espresso');?></h3></th> |
|
29 | + <th><h3><?php _e("Invoice Display Settings", 'event_espresso'); ?></h3></th> |
|
30 | 30 | <td> |
31 | - <span class="description"><?php _e("The following settings affect the content and/or appearance of the downloadable PDF invoice.", 'event_espresso');?></span> |
|
31 | + <span class="description"><?php _e("The following settings affect the content and/or appearance of the downloadable PDF invoice.", 'event_espresso'); ?></span> |
|
32 | 32 | </td> |
33 | 33 | </tr> |
34 | 34 | <?php |
@@ -15,9 +15,9 @@ discard block |
||
15 | 15 | * @return boolean |
16 | 16 | */ |
17 | 17 | function ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() { |
18 | - $in_use = has_filter( 'FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns' ) |
|
19 | - || has_action( 'AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save' ); |
|
20 | - if( $in_use ) { |
|
18 | + $in_use = has_filter('FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns') |
|
19 | + || has_action('AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save'); |
|
20 | + if ($in_use) { |
|
21 | 21 | $msg = __( |
22 | 22 | 'We detected you are using the filter FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns or AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save.' |
23 | 23 | . 'Both of these have been deprecated and should not be used anymore. You should instead use FHEE__EE_Form_Section_Proper___construct__options_array to customize the contents of the form,' |
@@ -26,18 +26,18 @@ discard block |
||
26 | 26 | 'event_espresso' ) |
27 | 27 | ; |
28 | 28 | EE_Error::doing_it_wrong( |
29 | - __CLASS__ . '::' . __FUNCTION__, |
|
29 | + __CLASS__.'::'.__FUNCTION__, |
|
30 | 30 | $msg, |
31 | 31 | '4.8.32.rc.000' |
32 | 32 | ); |
33 | 33 | //it seems the doing_it_wrong messages get output during some hidden html tags, so add an error to make sure this gets noticed |
34 | - if ( is_admin() && ! defined( 'DOING_AJAX' ) ) { |
|
35 | - EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
34 | + if (is_admin() && ! defined('DOING_AJAX')) { |
|
35 | + EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__); |
|
36 | 36 | } |
37 | 37 | } |
38 | 38 | return $in_use; |
39 | 39 | } |
40 | -add_action( 'AHEE__Registrations_Admin_Page___registration_details_metabox__start', 'ee_deprecated_using_old_registration_admin_custom_questions_form_hooks' ); |
|
40 | +add_action('AHEE__Registrations_Admin_Page___registration_details_metabox__start', 'ee_deprecated_using_old_registration_admin_custom_questions_form_hooks'); |
|
41 | 41 | |
42 | 42 | /** |
43 | 43 | * @deprecated since 4.8.32.rc.000 because it has issues on https://events.codebasehq.com/projects/event-espresso/tickets/9165 |
@@ -46,34 +46,34 @@ discard block |
||
46 | 46 | * @param EE_Admin_Page $admin_page |
47 | 47 | * @return void |
48 | 48 | */ |
49 | -function ee_deprecated_update_attendee_registration_form_old( $admin_page ) { |
|
49 | +function ee_deprecated_update_attendee_registration_form_old($admin_page) { |
|
50 | 50 | //check if the old hooks are in use. If not, do the default |
51 | - if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
52 | - || ! $admin_page instanceof EE_Admin_Page ) { |
|
51 | + if ( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
52 | + || ! $admin_page instanceof EE_Admin_Page) { |
|
53 | 53 | return; |
54 | 54 | } |
55 | 55 | $req_data = $admin_page->get_request_data(); |
56 | - $qstns = isset( $req_data['qstn'] ) ? $req_data['qstn'] : FALSE; |
|
57 | - $REG_ID = isset( $req_data['_REG_ID'] ) ? absint( $req_data['_REG_ID'] ) : FALSE; |
|
58 | - $qstns = apply_filters( 'FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns', $qstns ); |
|
59 | - if ( ! $REG_ID || ! $qstns ) { |
|
60 | - EE_Error::add_error( __('An error occurred. No registration ID and/or registration questions were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
56 | + $qstns = isset($req_data['qstn']) ? $req_data['qstn'] : FALSE; |
|
57 | + $REG_ID = isset($req_data['_REG_ID']) ? absint($req_data['_REG_ID']) : FALSE; |
|
58 | + $qstns = apply_filters('FHEE__Registrations_Admin_Page___update_attendee_registration_form__qstns', $qstns); |
|
59 | + if ( ! $REG_ID || ! $qstns) { |
|
60 | + EE_Error::add_error(__('An error occurred. No registration ID and/or registration questions were received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
61 | 61 | } |
62 | 62 | $success = TRUE; |
63 | 63 | |
64 | 64 | // allow others to get in on this awesome fun :D |
65 | - do_action( 'AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save', $REG_ID, $qstns ); |
|
65 | + do_action('AHEE__Registrations_Admin_Page___save_attendee_registration_form__after_reg_and_attendee_save', $REG_ID, $qstns); |
|
66 | 66 | // loop thru questions... FINALLY!!! |
67 | 67 | |
68 | - foreach ( $qstns as $QST_ID => $qstn ) { |
|
68 | + foreach ($qstns as $QST_ID => $qstn) { |
|
69 | 69 | //if $qstn isn't an array then it doesn't already have an answer, so let's create the answer |
70 | - if ( !is_array($qstn) ) { |
|
71 | - $success = $this->_save_new_answer( $REG_ID, $QST_ID, $qstn); |
|
70 | + if ( ! is_array($qstn)) { |
|
71 | + $success = $this->_save_new_answer($REG_ID, $QST_ID, $qstn); |
|
72 | 72 | continue; |
73 | 73 | } |
74 | 74 | |
75 | 75 | |
76 | - foreach ( $qstn as $ANS_ID => $ANS_value ) { |
|
76 | + foreach ($qstn as $ANS_ID => $ANS_value) { |
|
77 | 77 | //get answer |
78 | 78 | $query_params = array( |
79 | 79 | 0 => array( |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | ); |
85 | 85 | $answer = EEM_Answer::instance()->get_one($query_params); |
86 | 86 | //this MAY be an array but NOT have an answer because its multi select. If so then we need to create the answer |
87 | - if ( ! $answer instanceof EE_Answer ) { |
|
87 | + if ( ! $answer instanceof EE_Answer) { |
|
88 | 88 | $set_values = array( |
89 | 89 | 'QST_ID' => $QST_ID, |
90 | 90 | 'REG_ID' => $REG_ID, |
@@ -99,11 +99,11 @@ discard block |
||
99 | 99 | } |
100 | 100 | } |
101 | 101 | $what = __('Registration Form', 'event_espresso'); |
102 | - $route = $REG_ID ? array( 'action' => 'view_registration', '_REG_ID' => $REG_ID ) : array( 'action' => 'default' ); |
|
103 | - $admin_page->redirect_after_action( $success, $what, __('updated', 'event_espresso'), $route ); |
|
102 | + $route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID) : array('action' => 'default'); |
|
103 | + $admin_page->redirect_after_action($success, $what, __('updated', 'event_espresso'), $route); |
|
104 | 104 | exit; |
105 | 105 | } |
106 | -add_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1 ); |
|
106 | +add_action('AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1); |
|
107 | 107 | /** |
108 | 108 | * Render the registration admin page's custom questions area in the old fashion |
109 | 109 | * and firing the old hooks. When this method is removed, we can probably also |
@@ -116,31 +116,31 @@ discard block |
||
116 | 116 | * @return bool |
117 | 117 | * @throws \EE_Error |
118 | 118 | */ |
119 | -function ee_deprecated_reg_questions_meta_box_old( $do_default_action, $admin_page, $registration ) { |
|
119 | +function ee_deprecated_reg_questions_meta_box_old($do_default_action, $admin_page, $registration) { |
|
120 | 120 | //check if the old hooks are in use. If not, do the default |
121 | - if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
122 | - || ! $admin_page instanceof EE_Admin_Page ) { |
|
121 | + if ( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
|
122 | + || ! $admin_page instanceof EE_Admin_Page) { |
|
123 | 123 | return $do_default_action; |
124 | 124 | } |
125 | - add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array( $admin_page, 'form_before_question_group' ), 10, 1 ); |
|
126 | - add_filter( 'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', array( $admin_page, 'form_after_question_group' ), 10, 1 ); |
|
127 | - add_filter( 'FHEE__EEH_Form_Fields__label_html', array( $admin_page, 'form_form_field_label_wrap' ), 10, 1 ); |
|
128 | - add_filter( 'FHEE__EEH_Form_Fields__input_html', array( $admin_page, 'form_form_field_input__wrap' ), 10, 1 ); |
|
125 | + add_filter('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', array($admin_page, 'form_before_question_group'), 10, 1); |
|
126 | + add_filter('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', array($admin_page, 'form_after_question_group'), 10, 1); |
|
127 | + add_filter('FHEE__EEH_Form_Fields__label_html', array($admin_page, 'form_form_field_label_wrap'), 10, 1); |
|
128 | + add_filter('FHEE__EEH_Form_Fields__input_html', array($admin_page, 'form_form_field_input__wrap'), 10, 1); |
|
129 | 129 | |
130 | - $question_groups = EEM_Event::instance()->assemble_array_of_groups_questions_and_options( $registration, $registration->get('EVT_ID') ); |
|
130 | + $question_groups = EEM_Event::instance()->assemble_array_of_groups_questions_and_options($registration, $registration->get('EVT_ID')); |
|
131 | 131 | |
132 | - EE_Registry::instance()->load_helper( 'Form_Fields' ); |
|
132 | + EE_Registry::instance()->load_helper('Form_Fields'); |
|
133 | 133 | $template_args = array( |
134 | - 'att_questions' => EEH_Form_Fields::generate_question_groups_html( $question_groups ), |
|
134 | + 'att_questions' => EEH_Form_Fields::generate_question_groups_html($question_groups), |
|
135 | 135 | 'reg_questions_form_action' => 'edit_registration', |
136 | 136 | 'REG_ID' => $registration->ID() |
137 | 137 | ); |
138 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php'; |
|
139 | - echo EEH_Template::display_template( $template_path, $template_args, TRUE ); |
|
138 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_questions.template.php'; |
|
139 | + echo EEH_Template::display_template($template_path, $template_args, TRUE); |
|
140 | 140 | //indicate that we should not do the default admin page code |
141 | 141 | return false; |
142 | 142 | } |
143 | -add_action( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', 'ee_deprecated_reg_questions_meta_box_old', 10, 3 ); |
|
143 | +add_action('FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', 'ee_deprecated_reg_questions_meta_box_old', 10, 3); |
|
144 | 144 | |
145 | 145 | /** |
146 | 146 | * ee_deprecated__registration_checkout__button_text |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * @param \EE_Checkout $checkout |
150 | 150 | * @return string |
151 | 151 | */ |
152 | -function ee_deprecated__registration_checkout__button_text( $submit_button_text, EE_Checkout $checkout ) { |
|
152 | +function ee_deprecated__registration_checkout__button_text($submit_button_text, EE_Checkout $checkout) { |
|
153 | 153 | // list of old filters |
154 | 154 | $deprecated_filters = array( |
155 | 155 | 'update_registration_details' => true, |
@@ -159,16 +159,16 @@ discard block |
||
159 | 159 | 'proceed_to' => true, |
160 | 160 | ); |
161 | 161 | // loop thru and call doing_it_wrong() or remove any that aren't being used |
162 | - foreach ( $deprecated_filters as $deprecated_filter => $on ) { |
|
162 | + foreach ($deprecated_filters as $deprecated_filter => $on) { |
|
163 | 163 | // was this filter called ? |
164 | - if ( has_action( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter )) { |
|
164 | + if (has_action('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter)) { |
|
165 | 165 | // only display doing_it_wrong() notice to Event Admins during non-AJAX requests |
166 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter' ) && ! defined( 'DOING_AJAX' ) ) { |
|
166 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_ee', 'hide_doing_it_wrong_for_deprecated_SPCO_filter') && ! defined('DOING_AJAX')) { |
|
167 | 167 | EE_Error::doing_it_wrong( |
168 | - 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter, |
|
168 | + 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter, |
|
169 | 169 | sprintf( |
170 | - __( 'The %1$s filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso' ), |
|
171 | - 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__' . $deprecated_filter, |
|
170 | + __('The %1$s filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new filter: %2$s"%3$s" found in "%4$s"', 'event_espresso'), |
|
171 | + 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__'.$deprecated_filter, |
|
172 | 172 | '<br />', |
173 | 173 | 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', |
174 | 174 | '/modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php' |
@@ -178,24 +178,24 @@ discard block |
||
178 | 178 | ); |
179 | 179 | } |
180 | 180 | } else { |
181 | - unset( $deprecated_filters[ $deprecated_filter ] ); |
|
181 | + unset($deprecated_filters[$deprecated_filter]); |
|
182 | 182 | } |
183 | 183 | } |
184 | - if ( ! empty( $deprecated_filters )) { |
|
185 | - |
|
186 | - if ( $checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset( $deprecated_filters[ 'update_registration_details' ] )) { |
|
187 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text ); |
|
188 | - } else if ( $checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset( $deprecated_filters[ 'process_payment' ] ) ) { |
|
189 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text ); |
|
190 | - } else if ( $checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset( $deprecated_filters[ 'finalize_registration' ] ) ) { |
|
191 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text ); |
|
184 | + if ( ! empty($deprecated_filters)) { |
|
185 | + |
|
186 | + if ($checkout->current_step->slug() == 'attendee_information' && $checkout->revisit && isset($deprecated_filters['update_registration_details'])) { |
|
187 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__update_registration_details', $submit_button_text); |
|
188 | + } else if ($checkout->current_step->slug() == 'payment_options' && $checkout->revisit && isset($deprecated_filters['process_payment'])) { |
|
189 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__process_payment', $submit_button_text); |
|
190 | + } else if ($checkout->next_step instanceof EE_SPCO_Reg_Step && $checkout->next_step->slug() == 'finalize_registration' && isset($deprecated_filters['finalize_registration'])) { |
|
191 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__finalize_registration', $submit_button_text); |
|
192 | 192 | } |
193 | - if ( $checkout->next_step instanceof EE_SPCO_Reg_Step ) { |
|
194 | - if ( $checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset( $deprecated_filters[ 'and_proceed_to_payment' ] ) ) { |
|
195 | - $submit_button_text .= apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text ); |
|
193 | + if ($checkout->next_step instanceof EE_SPCO_Reg_Step) { |
|
194 | + if ($checkout->payment_required() && $checkout->next_step->slug() == 'payment_options' && isset($deprecated_filters['and_proceed_to_payment'])) { |
|
195 | + $submit_button_text .= apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__and_proceed_to_payment', $submit_button_text); |
|
196 | 196 | } |
197 | - if ( $checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset( $deprecated_filters[ 'proceed_to' ] ) ) { |
|
198 | - $submit_button_text = apply_filters( 'FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text ) . $checkout->next_step->name(); |
|
197 | + if ($checkout->next_step->slug() != 'finalize_registration' && ! $checkout->revisit && isset($deprecated_filters['proceed_to'])) { |
|
198 | + $submit_button_text = apply_filters('FHEE__EED_Single_Page_Checkout__registration_checkout__button_text__proceed_to', $submit_button_text).$checkout->next_step->name(); |
|
199 | 199 | } |
200 | 200 | } |
201 | 201 | |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | return $submit_button_text; |
204 | 204 | |
205 | 205 | } |
206 | -add_filter( 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2 ); |
|
206 | +add_filter('FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', 'ee_deprecated__registration_checkout__button_text', 10, 2); |
|
207 | 207 | |
208 | 208 | |
209 | 209 | |
@@ -214,16 +214,16 @@ discard block |
||
214 | 214 | * @param \EE_Checkout $checkout |
215 | 215 | * @param boolean $status_updates |
216 | 216 | */ |
217 | -function ee_deprecated_finalize_transaction( EE_Checkout $checkout, $status_updates ) { |
|
217 | +function ee_deprecated_finalize_transaction(EE_Checkout $checkout, $status_updates) { |
|
218 | 218 | $action_ref = NULL; |
219 | - $action_ref = has_action( 'AHEE__EE_Transaction__finalize__new_transaction' ) ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref; |
|
220 | - $action_ref = has_action( 'AHEE__EE_Transaction__finalize__all_transaction' ) ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref; |
|
221 | - if ( $action_ref ) { |
|
219 | + $action_ref = has_action('AHEE__EE_Transaction__finalize__new_transaction') ? 'AHEE__EE_Transaction__finalize__new_transaction' : $action_ref; |
|
220 | + $action_ref = has_action('AHEE__EE_Transaction__finalize__all_transaction') ? 'AHEE__EE_Transaction__finalize__all_transaction' : $action_ref; |
|
221 | + if ($action_ref) { |
|
222 | 222 | |
223 | 223 | EE_Error::doing_it_wrong( |
224 | 224 | $action_ref, |
225 | 225 | sprintf( |
226 | - __( 'This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso' ), |
|
226 | + __('This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use one of the following new actions: %1$s"%3$s" found in "%2$s" %1$s"%4$s" found in "%2$s" %1$s"%5$s" found in "%2$s" %1$s"%6$s" found in "%2$s"', 'event_espresso'), |
|
227 | 227 | '<br />', |
228 | 228 | '/core/business/EE_Transaction_Processor.class.php', |
229 | 229 | 'AHEE__EE_Transaction_Processor__finalize', |
@@ -234,29 +234,29 @@ discard block |
||
234 | 234 | '4.6.0', |
235 | 235 | E_USER_DEPRECATED |
236 | 236 | ); |
237 | - switch ( $action_ref ) { |
|
237 | + switch ($action_ref) { |
|
238 | 238 | case 'AHEE__EE_Transaction__finalize__new_transaction' : |
239 | - do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request ); |
|
239 | + do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, $checkout->admin_request); |
|
240 | 240 | break; |
241 | 241 | case 'AHEE__EE_Transaction__finalize__all_transaction' : |
242 | - do_action( 'AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array( 'new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates ), $checkout->admin_request ); |
|
242 | + do_action('AHEE__EE_Transaction__finalize__new_transaction', $checkout->transaction, array('new_reg' => ! $checkout->revisit, 'to_approved' => $status_updates), $checkout->admin_request); |
|
243 | 243 | break; |
244 | 244 | } |
245 | 245 | } |
246 | 246 | } |
247 | -add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 ); |
|
247 | +add_action('AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2); |
|
248 | 248 | /** |
249 | 249 | * ee_deprecated_finalize_registration |
250 | 250 | * |
251 | 251 | * @param EE_Registration $registration |
252 | 252 | */ |
253 | -function ee_deprecated_finalize_registration( EE_Registration $registration ) { |
|
254 | - $action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
|
255 | - if ( $action_ref ) { |
|
253 | +function ee_deprecated_finalize_registration(EE_Registration $registration) { |
|
254 | + $action_ref = has_action('AHEE__EE_Registration__finalize__update_and_new_reg') ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
|
255 | + if ($action_ref) { |
|
256 | 256 | EE_Error::doing_it_wrong( |
257 | 257 | $action_ref, |
258 | 258 | sprintf( |
259 | - __( 'This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso' ), |
|
259 | + __('This action is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the following new action: %1$s"%3$s" found in "%2$s"', 'event_espresso'), |
|
260 | 260 | '<br />', |
261 | 261 | '/core/business/EE_Registration_Processor.class.php', |
262 | 262 | 'AHEE__EE_Registration_Processor__trigger_registration_status_changed_hook' |
@@ -264,10 +264,10 @@ discard block |
||
264 | 264 | '4.6.0', |
265 | 265 | E_USER_DEPRECATED |
266 | 266 | ); |
267 | - do_action( 'AHEE__EE_Registration__finalize__update_and_new_reg', $registration, ( is_admin() && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ))); |
|
267 | + do_action('AHEE__EE_Registration__finalize__update_and_new_reg', $registration, (is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX))); |
|
268 | 268 | } |
269 | 269 | } |
270 | -add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1 ); |
|
270 | +add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', 'ee_deprecated_finalize_registration', 10, 1); |
|
271 | 271 | |
272 | 272 | |
273 | 273 | |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | * |
289 | 289 | * @return array |
290 | 290 | */ |
291 | -function ee_deprecated_get_templates( $templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack ) { |
|
291 | +function ee_deprecated_get_templates($templates, EE_messenger $messenger, EE_message_type $message_type, EE_Messages_Template_Pack $template_pack) { |
|
292 | 292 | $old_default_classnames = array( |
293 | 293 | 'EE_Messages_Email_Cancelled_Registration_Defaults', |
294 | 294 | 'EE_Messages_Email_Declined_Registration_Defaults', |
@@ -304,23 +304,23 @@ discard block |
||
304 | 304 | |
305 | 305 | $old_class_instance = new stdClass(); |
306 | 306 | |
307 | - foreach ( $old_default_classnames as $classname ) { |
|
308 | - $filter_ref = 'FHEE__' . $classname . '___create_new_templates___templates'; |
|
309 | - if ( has_filter( $filter_ref ) ) { |
|
310 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
307 | + foreach ($old_default_classnames as $classname) { |
|
308 | + $filter_ref = 'FHEE__'.$classname.'___create_new_templates___templates'; |
|
309 | + if (has_filter($filter_ref)) { |
|
310 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Template_Pack___get_templates__templates" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
311 | 311 | } |
312 | - $templates = apply_filters( $filter_ref, $templates, $old_class_instance ); |
|
312 | + $templates = apply_filters($filter_ref, $templates, $old_class_instance); |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | return $templates; |
316 | 316 | } |
317 | -add_filter( 'FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4 ); |
|
317 | +add_filter('FHEE__EE_Template_Pack___get_templates__templates', 'ee_deprecated_get_templates', 10, 4); |
|
318 | 318 | |
319 | 319 | /** |
320 | 320 | * Called after EED_Module::set_hooks() and EED_Module::set_admin_hooks() was called. |
321 | 321 | * Checks if any deprecated hooks were hooked-into and provide doing_it_wrong messages appropriately. |
322 | 322 | */ |
323 | -function ee_deprecated_hooks(){ |
|
323 | +function ee_deprecated_hooks() { |
|
324 | 324 | /** |
325 | 325 | * @var $hooks array where keys are hook names, and their values are array{ |
326 | 326 | * @type string $version when deprecated |
@@ -331,26 +331,26 @@ discard block |
||
331 | 331 | $hooks = array( |
332 | 332 | 'AHEE__EE_System___do_setup_validations' => array( |
333 | 333 | 'version' => '4.6.0', |
334 | - 'alternative' => __( 'Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso' ), |
|
334 | + 'alternative' => __('Instead use "AHEE__EEH_Activation__validate_messages_system" which is called after validating messages (done on every new install, upgrade, reactivation, and downgrade)', 'event_espresso'), |
|
335 | 335 | 'still_works' => FALSE |
336 | 336 | ) |
337 | 337 | ); |
338 | - foreach( $hooks as $name => $deprecation_info ){ |
|
339 | - if( has_action( $name ) ){ |
|
338 | + foreach ($hooks as $name => $deprecation_info) { |
|
339 | + if (has_action($name)) { |
|
340 | 340 | EE_Error::doing_it_wrong( |
341 | 341 | $name, |
342 | 342 | sprintf( |
343 | - __('This filter is deprecated. %1$s%2$s','event_espresso'), |
|
344 | - $deprecation_info[ 'still_works' ] ? __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __( 'It has been completely removed.', 'event_espresso' ), |
|
345 | - isset( $deprecation_info[ 'alternative' ] ) ? $deprecation_info[ 'alternative' ] : __( 'Please read the current EE4 documentation further or contact Support.', 'event_espresso' ) |
|
343 | + __('This filter is deprecated. %1$s%2$s', 'event_espresso'), |
|
344 | + $deprecation_info['still_works'] ? __('It *may* work as an attempt to build in backwards compatibility.', 'event_espresso') : __('It has been completely removed.', 'event_espresso'), |
|
345 | + isset($deprecation_info['alternative']) ? $deprecation_info['alternative'] : __('Please read the current EE4 documentation further or contact Support.', 'event_espresso') |
|
346 | 346 | ), |
347 | - isset( $deprecation_info[ 'version' ] ) ? $deprecation_info[ 'version' ] : __( 'recently', 'event_espresso' ), |
|
347 | + isset($deprecation_info['version']) ? $deprecation_info['version'] : __('recently', 'event_espresso'), |
|
348 | 348 | E_USER_DEPRECATED |
349 | 349 | ); |
350 | 350 | } |
351 | 351 | } |
352 | 352 | } |
353 | -add_action( 'AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks' ); |
|
353 | +add_action('AHEE__EE_System__set_hooks_for_shortcodes_modules_and_addons', 'ee_deprecated_hooks'); |
|
354 | 354 | |
355 | 355 | |
356 | 356 | |
@@ -373,25 +373,25 @@ discard block |
||
373 | 373 | * |
374 | 374 | * @return string The default contents for the messenger, message type, context and field. |
375 | 375 | */ |
376 | -function ee_deprecated_get_default_field_content( $contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack ) { |
|
376 | +function ee_deprecated_get_default_field_content($contents, $actual_path, EE_messenger $messenger, EE_message_type $message_type, $field, $context, EE_Messages_Template_Pack $template_pack) { |
|
377 | 377 | |
378 | 378 | $classnames_to_try = array( |
379 | - get_class( $messenger ) => $messenger, |
|
380 | - get_class( $message_type ) => $message_type, |
|
379 | + get_class($messenger) => $messenger, |
|
380 | + get_class($message_type) => $message_type, |
|
381 | 381 | 'EE_Messages_Base' => $message_type |
382 | 382 | ); |
383 | 383 | |
384 | - foreach ( $classnames_to_try as $classname => $obj ) { |
|
385 | - $filter_ref = 'FHEE__' . $classname . '__get_default_field_content'; |
|
386 | - if ( has_filter( $filter_ref ) ) { |
|
387 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
384 | + foreach ($classnames_to_try as $classname => $obj) { |
|
385 | + $filter_ref = 'FHEE__'.$classname.'__get_default_field_content'; |
|
386 | + if (has_filter($filter_ref)) { |
|
387 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It *may* work as an attempt to build in backwards compatibility. However, it is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_specific_template__contents" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
388 | 388 | } |
389 | - $contents = apply_filters( $filter_ref, $contents, $obj ); |
|
389 | + $contents = apply_filters($filter_ref, $contents, $obj); |
|
390 | 390 | } |
391 | 391 | |
392 | 392 | return $contents; |
393 | 393 | } |
394 | -add_filter( 'FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7 ); |
|
394 | +add_filter('FHEE__EE_Messages_Template_Pack__get_specific_template__contents', 'ee_deprecated_get_default_field_content', 10, 7); |
|
395 | 395 | |
396 | 396 | |
397 | 397 | |
@@ -419,23 +419,23 @@ discard block |
||
419 | 419 | * |
420 | 420 | * @return string The path to the file being used. |
421 | 421 | */ |
422 | -function ee_deprecated_get_inline_css_template_filters( $variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack ) { |
|
422 | +function ee_deprecated_get_inline_css_template_filters($variation_path, $messenger, $message_type, $type, $variation, $file_extension, $url, EE_Messages_Template_Pack $template_pack) { |
|
423 | 423 | |
424 | - if ( $messenger == 'email' ) { |
|
424 | + if ($messenger == 'email') { |
|
425 | 425 | $filter_ref = $url ? 'FHEE__EE_Email_Messenger__get_inline_css_template__css_url' : 'FHEE__EE_Email_Messenger__get_inline_css_template__css_path'; |
426 | - } elseif ( $messenger == 'html' ) { |
|
426 | + } elseif ($messenger == 'html') { |
|
427 | 427 | $filter_ref = $url ? 'FHEE__EE_Html_messenger__get_inline_css_template__css_url' : 'FHEE__EE_Html_messenger__get_inline_css_template__css_path'; |
428 | 428 | } else { |
429 | 429 | return $variation_path; |
430 | 430 | } |
431 | 431 | |
432 | - if ( has_filter( $filter_ref ) ) { |
|
433 | - EE_Error::doing_it_wrong( $filter_ref, __('This filter is deprecated. It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
432 | + if (has_filter($filter_ref)) { |
|
433 | + EE_Error::doing_it_wrong($filter_ref, __('This filter is deprecated. It is recommended to use the new filter provided which is "FHEE__EE_Messages_Template_Pack__get_variation" found in the EE_Messages_Template_Pack class.', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
434 | 434 | } |
435 | 435 | |
436 | - return apply_filters( $filter_ref, $variation_path, $url, $type ); |
|
436 | + return apply_filters($filter_ref, $variation_path, $url, $type); |
|
437 | 437 | } |
438 | -add_filter( 'FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8 ); |
|
438 | +add_filter('FHEE__EE_Messages_Template_Pack__get_variation', 'ee_deprecated_get_inline_css_template_filters', 10, 8); |
|
439 | 439 | |
440 | 440 | |
441 | 441 | |
@@ -451,78 +451,78 @@ discard block |
||
451 | 451 | class EE_Messages_Init extends EE_Base { |
452 | 452 | |
453 | 453 | public function __construct() { |
454 | - self::doing_it_wrong_call( __METHOD__ ); |
|
454 | + self::doing_it_wrong_call(__METHOD__); |
|
455 | 455 | } |
456 | 456 | |
457 | 457 | /** |
458 | 458 | * @param $method_name |
459 | 459 | */ |
460 | - public static function doing_it_wrong_call( $method_name ) { |
|
461 | - EE_Error::doing_it_wrong( __CLASS__, sprintf( __('The %s in this class is deprecated as of EE4.5.0. All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name ), '4.5.0', E_USER_DEPRECATED ); |
|
460 | + public static function doing_it_wrong_call($method_name) { |
|
461 | + EE_Error::doing_it_wrong(__CLASS__, sprintf(__('The %s in this class is deprecated as of EE4.5.0. All functionality formerly in this class is now in the EED_Messages module.', 'event_espresso'), $method_name), '4.5.0', E_USER_DEPRECATED); |
|
462 | 462 | } |
463 | 463 | |
464 | 464 | /** |
465 | 465 | * @deprecated 4.5.0 |
466 | 466 | */ |
467 | 467 | public static function set_autoloaders() { |
468 | - self::doing_it_wrong_call( __METHOD__ ); |
|
468 | + self::doing_it_wrong_call(__METHOD__); |
|
469 | 469 | EED_Messages::set_autoloaders(); |
470 | 470 | } |
471 | 471 | |
472 | 472 | /** |
473 | 473 | * @deprecated 4.5.0 |
474 | 474 | */ |
475 | - public function payment_reminder( $transaction ) { |
|
476 | - self::doing_it_wrong_call( __METHOD__ ); |
|
477 | - EED_Messages::payment_reminder( $transaction ); |
|
475 | + public function payment_reminder($transaction) { |
|
476 | + self::doing_it_wrong_call(__METHOD__); |
|
477 | + EED_Messages::payment_reminder($transaction); |
|
478 | 478 | } |
479 | 479 | |
480 | 480 | /** |
481 | 481 | * @deprecated 4.5.0 |
482 | 482 | */ |
483 | - public function payment( $transaction, $payment ) { |
|
484 | - self::doing_it_wrong_call( __METHOD__ ); |
|
485 | - EED_Messages::payment( $transaction, $payment ); |
|
483 | + public function payment($transaction, $payment) { |
|
484 | + self::doing_it_wrong_call(__METHOD__); |
|
485 | + EED_Messages::payment($transaction, $payment); |
|
486 | 486 | } |
487 | 487 | |
488 | 488 | /** |
489 | 489 | * @deprecated 4.5.0 |
490 | 490 | */ |
491 | - public function cancelled_registration( $transaction ) { |
|
492 | - self::doing_it_wrong_call( __METHOD__ ); |
|
493 | - EED_Messages::cancelled_registration( $transaction ); |
|
491 | + public function cancelled_registration($transaction) { |
|
492 | + self::doing_it_wrong_call(__METHOD__); |
|
493 | + EED_Messages::cancelled_registration($transaction); |
|
494 | 494 | } |
495 | 495 | |
496 | 496 | /** |
497 | 497 | * @deprecated 4.5.0 |
498 | 498 | */ |
499 | - public function maybe_registration( $transaction, $reg_msg, $from_admin ) { |
|
500 | - self::doing_it_wrong_call( __METHOD__ ); |
|
501 | - EED_Messages::maybe_registration( $transaction, $reg_msg, $from_admin ); |
|
499 | + public function maybe_registration($transaction, $reg_msg, $from_admin) { |
|
500 | + self::doing_it_wrong_call(__METHOD__); |
|
501 | + EED_Messages::maybe_registration($transaction, $reg_msg, $from_admin); |
|
502 | 502 | } |
503 | 503 | |
504 | 504 | /** |
505 | 505 | * @deprecated 4.5.0 |
506 | 506 | */ |
507 | - public function process_resend( $success, $req_data ) { |
|
508 | - self::doing_it_wrong_call( __METHOD__ ); |
|
509 | - EED_Messages::process_resend( $req_data ); |
|
507 | + public function process_resend($success, $req_data) { |
|
508 | + self::doing_it_wrong_call(__METHOD__); |
|
509 | + EED_Messages::process_resend($req_data); |
|
510 | 510 | } |
511 | 511 | |
512 | 512 | /** |
513 | 513 | * @deprecated 4.5.0 |
514 | 514 | */ |
515 | - public function process_admin_payment( $success, $payment ) { |
|
516 | - self::doing_it_wrong_call( __METHOD__ ); |
|
517 | - EED_Messages::process_admin_payment( $success, $payment ); |
|
515 | + public function process_admin_payment($success, $payment) { |
|
516 | + self::doing_it_wrong_call(__METHOD__); |
|
517 | + EED_Messages::process_admin_payment($success, $payment); |
|
518 | 518 | } |
519 | 519 | |
520 | 520 | /** |
521 | 521 | * @deprecated 4.5.0 |
522 | 522 | */ |
523 | - public function send_newsletter_message( $contacts, $grp_id ) { |
|
524 | - self::doing_it_wrong_call( __METHOD__ ); |
|
525 | - EED_Messages::send_newsletter_message( $contacts, $grp_id ); |
|
523 | + public function send_newsletter_message($contacts, $grp_id) { |
|
524 | + self::doing_it_wrong_call(__METHOD__); |
|
525 | + EED_Messages::send_newsletter_message($contacts, $grp_id); |
|
526 | 526 | } |
527 | 527 | |
528 | 528 | |
@@ -543,13 +543,13 @@ discard block |
||
543 | 543 | * |
544 | 544 | * @return array additional cpts. |
545 | 545 | */ |
546 | -function ee_deprecated_get_cpts( $cpts ) { |
|
547 | - if ( has_filter( 'FHEE__EE_Register_CPTs__construct__CPTs' ) ) { |
|
548 | - EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
546 | +function ee_deprecated_get_cpts($cpts) { |
|
547 | + if (has_filter('FHEE__EE_Register_CPTs__construct__CPTs')) { |
|
548 | + EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__CPTs', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_CPTs__cpts" found in EE_Register_CPTs::get_CPTs()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
549 | 549 | } |
550 | - return apply_filters( 'FHEE__EE_Register_CPTs__construct__CPTs', $cpts ); |
|
550 | + return apply_filters('FHEE__EE_Register_CPTs__construct__CPTs', $cpts); |
|
551 | 551 | } |
552 | -add_filter( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10 ); |
|
552 | +add_filter('FHEE__EE_Register_CPTs__get_CPTs__cpts', 'ee_deprecated_get_cpts', 10); |
|
553 | 553 | |
554 | 554 | |
555 | 555 | |
@@ -563,10 +563,10 @@ discard block |
||
563 | 563 | * |
564 | 564 | * @return array additional custom taxonomies. |
565 | 565 | */ |
566 | -function ee_deprecated_get_taxonomies( $cts ) { |
|
567 | - if ( has_filter( 'FHEE__EE_Register_CPTs__construct__taxonomies' ) ) { |
|
568 | - EE_Error::doing_it_wrong( 'FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED ); |
|
566 | +function ee_deprecated_get_taxonomies($cts) { |
|
567 | + if (has_filter('FHEE__EE_Register_CPTs__construct__taxonomies')) { |
|
568 | + EE_Error::doing_it_wrong('FHEE__EE_Register_CPTs__construct__taxonomies', __('This filter is deprecated. It will still work for the time being. However, it is recommended to use the new filter provided which is "FHEE__EE_Register_CPTs__get_taxonomies__taxonomies" found in EE_Register_CPTs::get_taxonomies()', 'event_espresso'), '4.5.0', E_USER_DEPRECATED); |
|
569 | 569 | } |
570 | - return apply_filters( 'FHEE__EE_Register_CPTs__construct__taxonomies', $cts ); |
|
570 | + return apply_filters('FHEE__EE_Register_CPTs__construct__taxonomies', $cts); |
|
571 | 571 | } |
572 | -add_filter( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10 ); |
|
572 | +add_filter('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', 'ee_deprecated_get_taxonomies', 10); |
@@ -1,10 +1,10 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * This file contains all deprecated actions, filters, and functions in EE. |
|
4 | - * @package Event Espresso |
|
5 | - * @subpackage helpers |
|
6 | - * @since 4.5.0 |
|
7 | - */ |
|
3 | + * This file contains all deprecated actions, filters, and functions in EE. |
|
4 | + * @package Event Espresso |
|
5 | + * @subpackage helpers |
|
6 | + * @since 4.5.0 |
|
7 | + */ |
|
8 | 8 | if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
9 | 9 | |
10 | 10 | |
@@ -105,17 +105,17 @@ discard block |
||
105 | 105 | } |
106 | 106 | add_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', 'ee_deprecated_update_attendee_registration_form_old', 10, 1 ); |
107 | 107 | /** |
108 | - * Render the registration admin page's custom questions area in the old fashion |
|
109 | - * and firing the old hooks. When this method is removed, we can probably also |
|
110 | - * remove the deprecated methods form_before_question_group, form_after_question_group, |
|
111 | - * form_form_field_label_wrap and form_form_field_input__wrap in Registrations_Admin_Page |
|
112 | - * |
|
113 | - * @param boolean $do_default_action |
|
114 | - * @param EE_Admin_Page $admin_page |
|
115 | - * @param EE_Registration $registration |
|
116 | - * @return bool |
|
117 | - * @throws \EE_Error |
|
118 | - */ |
|
108 | + * Render the registration admin page's custom questions area in the old fashion |
|
109 | + * and firing the old hooks. When this method is removed, we can probably also |
|
110 | + * remove the deprecated methods form_before_question_group, form_after_question_group, |
|
111 | + * form_form_field_label_wrap and form_form_field_input__wrap in Registrations_Admin_Page |
|
112 | + * |
|
113 | + * @param boolean $do_default_action |
|
114 | + * @param EE_Admin_Page $admin_page |
|
115 | + * @param EE_Registration $registration |
|
116 | + * @return bool |
|
117 | + * @throws \EE_Error |
|
118 | + */ |
|
119 | 119 | function ee_deprecated_reg_questions_meta_box_old( $do_default_action, $admin_page, $registration ) { |
120 | 120 | //check if the old hooks are in use. If not, do the default |
121 | 121 | if( ! ee_deprecated_using_old_registration_admin_custom_questions_form_hooks() |
@@ -246,10 +246,10 @@ discard block |
||
246 | 246 | } |
247 | 247 | add_action( 'AHEE__EE_SPCO_Reg_Step_Finalize_Registration__process_reg_step__completed', 'ee_deprecated_finalize_transaction', 10, 2 ); |
248 | 248 | /** |
249 | - * ee_deprecated_finalize_registration |
|
250 | - * |
|
251 | - * @param EE_Registration $registration |
|
252 | - */ |
|
249 | + * ee_deprecated_finalize_registration |
|
250 | + * |
|
251 | + * @param EE_Registration $registration |
|
252 | + */ |
|
253 | 253 | function ee_deprecated_finalize_registration( EE_Registration $registration ) { |
254 | 254 | $action_ref = has_action( 'AHEE__EE_Registration__finalize__update_and_new_reg' ) ? 'AHEE__EE_Registration__finalize__update_and_new_reg' : NULL; |
255 | 255 | if ( $action_ref ) { |
@@ -136,9 +136,9 @@ discard block |
||
136 | 136 | |
137 | 137 | /** |
138 | 138 | * grab url requests and route them |
139 | - * @access private |
|
140 | - * @return void |
|
141 | - */ |
|
139 | + * @access private |
|
140 | + * @return void |
|
141 | + */ |
|
142 | 142 | public function _set_page_routes() { |
143 | 143 | |
144 | 144 | $this->_get_registration_status_array(); |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | 'title' => __('Registrations Other', 'event_espresso'), |
405 | 405 | 'filename' => 'registrations_overview_other' |
406 | 406 | ) |
407 | - ), |
|
407 | + ), |
|
408 | 408 | 'help_tour' => array( 'Registration_Overview_Help_Tour' ), |
409 | 409 | 'qtips' => array('Registration_List_Table_Tips'), |
410 | 410 | 'list_table' => 'EE_Registrations_List_Table', |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | 'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID'] ), $this->_current_page_view_url ) : $this->_admin_base_url, |
419 | 419 | 'persistent' => FALSE |
420 | 420 | ), |
421 | - 'help_tabs' => array( |
|
421 | + 'help_tabs' => array( |
|
422 | 422 | 'registrations_details_help_tab' => array( |
423 | 423 | 'title' => __('Registration Details', 'event_espresso'), |
424 | 424 | 'filename' => 'registrations_details' |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | 'order' => 20 |
483 | 483 | ), |
484 | 484 | 'list_table' => 'EE_Attendee_Contact_List_Table', |
485 | - 'help_tabs' => array( |
|
485 | + 'help_tabs' => array( |
|
486 | 486 | 'registrations_contact_list_help_tab' => array( |
487 | 487 | 'title' => __('Registrations Contact List', 'event_espresso'), |
488 | 488 | 'filename' => 'registrations_contact_list' |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | 'title' => __('Contact List Other', 'event_espresso'), |
500 | 500 | 'filename' => 'registrations_contact_list_other' |
501 | 501 | ) |
502 | - ), |
|
502 | + ), |
|
503 | 503 | 'help_tour' => array( 'Contact_List_Help_Tour' ), |
504 | 504 | 'metaboxes' => array(), |
505 | 505 | 'require_nonce' => FALSE |
@@ -533,9 +533,9 @@ discard block |
||
533 | 533 | |
534 | 534 | /** |
535 | 535 | * get list of registration statuses |
536 | - * @access private |
|
537 | - * @return void |
|
538 | - */ |
|
536 | + * @access private |
|
537 | + * @return void |
|
538 | + */ |
|
539 | 539 | private function _get_registration_status_array() { |
540 | 540 | self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE); |
541 | 541 | } |
@@ -842,7 +842,7 @@ discard block |
||
842 | 842 | return TRUE; |
843 | 843 | } |
844 | 844 | |
845 | - $REG = EEM_Registration::instance(); |
|
845 | + $REG = EEM_Registration::instance(); |
|
846 | 846 | |
847 | 847 | $REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE; |
848 | 848 | |
@@ -1065,9 +1065,9 @@ discard block |
||
1065 | 1065 | |
1066 | 1066 | /** |
1067 | 1067 | * generates HTML for the View Registration Details Admin page |
1068 | - * @access protected |
|
1069 | - * @return void |
|
1070 | - */ |
|
1068 | + * @access protected |
|
1069 | + * @return void |
|
1070 | + */ |
|
1071 | 1071 | protected function _registration_details() { |
1072 | 1072 | |
1073 | 1073 | $this->_template_args = array(); |
@@ -1145,9 +1145,9 @@ discard block |
||
1145 | 1145 | |
1146 | 1146 | /** |
1147 | 1147 | * _set_approve_or_decline_reg_status_buttons |
1148 | - * @access protected |
|
1149 | - * @return string |
|
1150 | - */ |
|
1148 | + * @access protected |
|
1149 | + * @return string |
|
1150 | + */ |
|
1151 | 1151 | public function set_reg_status_buttons_metabox() { |
1152 | 1152 | |
1153 | 1153 | //is registration for free event OR for a completed transaction? This will determine whether the set to pending option is shown. |
@@ -1337,10 +1337,10 @@ discard block |
||
1337 | 1337 | |
1338 | 1338 | /** |
1339 | 1339 | * approve_registration |
1340 | - * @access protected |
|
1341 | - * @param bool $notify whether or not to notify the registrant about their approval. |
|
1342 | - * @return void |
|
1343 | - */ |
|
1340 | + * @access protected |
|
1341 | + * @param bool $notify whether or not to notify the registrant about their approval. |
|
1342 | + * @return void |
|
1343 | + */ |
|
1344 | 1344 | protected function approve_registration( $notify = false ) { |
1345 | 1345 | $this->_reg_status_change_return( EEM_Registration::status_id_approved, $notify ); |
1346 | 1346 | } |
@@ -1350,10 +1350,10 @@ discard block |
||
1350 | 1350 | |
1351 | 1351 | /** |
1352 | 1352 | * decline_registration |
1353 | - * @access protected |
|
1354 | - * @param bool $notify whether or not to notify the registrant about their approval. |
|
1355 | - * @return void |
|
1356 | - */ |
|
1353 | + * @access protected |
|
1354 | + * @param bool $notify whether or not to notify the registrant about their approval. |
|
1355 | + * @return void |
|
1356 | + */ |
|
1357 | 1357 | protected function decline_registration( $notify = false ) { |
1358 | 1358 | $this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify ); |
1359 | 1359 | } |
@@ -1363,10 +1363,10 @@ discard block |
||
1363 | 1363 | |
1364 | 1364 | /** |
1365 | 1365 | * cancel_registration |
1366 | - * @access protected |
|
1367 | - * @param bool $notify whether or not to notify the registrant about their approval. |
|
1368 | - * @return void |
|
1369 | - */ |
|
1366 | + * @access protected |
|
1367 | + * @param bool $notify whether or not to notify the registrant about their approval. |
|
1368 | + * @return void |
|
1369 | + */ |
|
1370 | 1370 | protected function cancel_registration( $notify = false ) { |
1371 | 1371 | $this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify ); |
1372 | 1372 | } |
@@ -1377,10 +1377,10 @@ discard block |
||
1377 | 1377 | |
1378 | 1378 | /** |
1379 | 1379 | * not_approve_registration |
1380 | - * @access protected |
|
1381 | - * @param bool $notify whether or not to notify the registrant about their approval. |
|
1382 | - * @return void |
|
1383 | - */ |
|
1380 | + * @access protected |
|
1381 | + * @param bool $notify whether or not to notify the registrant about their approval. |
|
1382 | + * @return void |
|
1383 | + */ |
|
1384 | 1384 | protected function not_approve_registration( $notify = false ) { |
1385 | 1385 | $this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify ); |
1386 | 1386 | } |
@@ -1389,10 +1389,10 @@ discard block |
||
1389 | 1389 | |
1390 | 1390 | /** |
1391 | 1391 | * decline_registration |
1392 | - * @access protected |
|
1393 | - * @param bool $notify whether or not to notify the registrant about their approval. |
|
1394 | - * @return void |
|
1395 | - */ |
|
1392 | + * @access protected |
|
1393 | + * @param bool $notify whether or not to notify the registrant about their approval. |
|
1394 | + * @return void |
|
1395 | + */ |
|
1396 | 1396 | protected function pending_registration( $notify = false ) { |
1397 | 1397 | $this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify ); |
1398 | 1398 | } |
@@ -1402,9 +1402,9 @@ discard block |
||
1402 | 1402 | |
1403 | 1403 | /** |
1404 | 1404 | * generates HTML for the Registration main meta box |
1405 | - * @access public |
|
1406 | - * @return void |
|
1407 | - */ |
|
1405 | + * @access public |
|
1406 | + * @return void |
|
1407 | + */ |
|
1408 | 1408 | public function _reg_details_meta_box() { |
1409 | 1409 | EEH_Autoloader::register_line_item_display_autoloaders(); |
1410 | 1410 | EEH_Autoloader::register_line_item_filter_autoloaders(); |
@@ -1487,7 +1487,7 @@ discard block |
||
1487 | 1487 | * |
1488 | 1488 | * @access public |
1489 | 1489 | * @return void |
1490 | - */ |
|
1490 | + */ |
|
1491 | 1491 | public function _reg_questions_meta_box() { |
1492 | 1492 | //allow someone to override this method entirely |
1493 | 1493 | if( apply_filters( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration ) ) { |
@@ -1689,12 +1689,12 @@ discard block |
||
1689 | 1689 | |
1690 | 1690 | /** |
1691 | 1691 | * generates HTML for the Registration main meta box |
1692 | - * @access public |
|
1693 | - * @return void |
|
1694 | - */ |
|
1692 | + * @access public |
|
1693 | + * @return void |
|
1694 | + */ |
|
1695 | 1695 | public function _reg_attendees_meta_box() { |
1696 | 1696 | |
1697 | - $REG = EEM_Registration::instance(); |
|
1697 | + $REG = EEM_Registration::instance(); |
|
1698 | 1698 | //get all other registrations on this transaction, and cache |
1699 | 1699 | //the attendees for them so we don't have to run another query using force_join |
1700 | 1700 | $registrations = $REG->get_all(array( |
@@ -1747,9 +1747,9 @@ discard block |
||
1747 | 1747 | |
1748 | 1748 | /** |
1749 | 1749 | * generates HTML for the Edit Registration side meta box |
1750 | - * @access public |
|
1751 | - * @return void |
|
1752 | - */ |
|
1750 | + * @access public |
|
1751 | + * @return void |
|
1752 | + */ |
|
1753 | 1753 | public function _reg_registrant_side_meta_box() { |
1754 | 1754 | |
1755 | 1755 | /*@var $attendee EE_Attendee */ |
@@ -2095,9 +2095,9 @@ discard block |
||
2095 | 2095 | |
2096 | 2096 | /** |
2097 | 2097 | * set_reg_event |
2098 | - * @access private |
|
2099 | - * @return boolean |
|
2100 | - */ |
|
2098 | + * @access private |
|
2099 | + * @return boolean |
|
2100 | + */ |
|
2101 | 2101 | private function _set_reg_event() { |
2102 | 2102 | if ( is_object( $this->_reg_event )) { |
2103 | 2103 | return TRUE; |
@@ -2204,9 +2204,9 @@ discard block |
||
2204 | 2204 | |
2205 | 2205 | /** |
2206 | 2206 | * generates HTML for the Attendee Contact List |
2207 | - * @access protected |
|
2208 | - * @return void |
|
2209 | - */ |
|
2207 | + * @access protected |
|
2208 | + * @return void |
|
2209 | + */ |
|
2210 | 2210 | protected function _attendee_contact_list_table() { |
2211 | 2211 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
2212 | 2212 | $this->_search_btn_label = __('Contacts', 'event_espresso'); |
@@ -2220,9 +2220,9 @@ discard block |
||
2220 | 2220 | /** |
2221 | 2221 | * get_attendees |
2222 | 2222 | * @param bool $count whether to return count or data. |
2223 | - * @access public |
|
2224 | - * @return array |
|
2225 | - */ |
|
2223 | + * @access public |
|
2224 | + * @return array |
|
2225 | + */ |
|
2226 | 2226 | public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) { |
2227 | 2227 | |
2228 | 2228 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
@@ -2558,9 +2558,9 @@ discard block |
||
2558 | 2558 | |
2559 | 2559 | /** |
2560 | 2560 | * _attendee_details |
2561 | - * @access protected |
|
2562 | - * @return void |
|
2563 | - */ |
|
2561 | + * @access protected |
|
2562 | + * @return void |
|
2563 | + */ |
|
2564 | 2564 | public function attendee_registrations_meta_box( $post ) { |
2565 | 2565 | |
2566 | 2566 | $this->_template_args['attendee'] = $this->_cpt_model_obj; |
@@ -2593,10 +2593,10 @@ discard block |
||
2593 | 2593 | |
2594 | 2594 | /** |
2595 | 2595 | * _trash_or_restore_attendee |
2596 | - * @param boolean $trash - whether to move item to trash (TRUE) or restore it (FALSE) |
|
2597 | - * @access protected |
|
2598 | - * @return void |
|
2599 | - */ |
|
2596 | + * @param boolean $trash - whether to move item to trash (TRUE) or restore it (FALSE) |
|
2597 | + * @access protected |
|
2598 | + * @return void |
|
2599 | + */ |
|
2600 | 2600 | protected function _trash_or_restore_attendees( $trash = TRUE ) { |
2601 | 2601 | |
2602 | 2602 | do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | * @param bool $routing |
50 | 50 | * @return Registrations_Admin_Page |
51 | 51 | */ |
52 | - public function __construct( $routing = TRUE ) { |
|
53 | - parent::__construct( $routing ); |
|
52 | + public function __construct($routing = TRUE) { |
|
53 | + parent::__construct($routing); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | |
@@ -82,16 +82,16 @@ discard block |
||
82 | 82 | 'trash' => 'post.php' |
83 | 83 | ); |
84 | 84 | |
85 | - add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10 ); |
|
85 | + add_action('edit_form_after_title', array($this, 'after_title_form_fields'), 10); |
|
86 | 86 | //add filters so that the comment urls don't take users to a confusing 404 page |
87 | - add_filter('get_comment_link', array( $this, 'clear_comment_link' ), 10, 3 ); |
|
87 | + add_filter('get_comment_link', array($this, 'clear_comment_link'), 10, 3); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | - public function clear_comment_link( $link, $comment, $args ) { |
|
91 | + public function clear_comment_link($link, $comment, $args) { |
|
92 | 92 | //gotta make sure this only happens on this route |
93 | - $post_type = get_post_type( $comment->comment_post_ID); |
|
94 | - if ( $post_type == 'espresso_attendees' ) |
|
93 | + $post_type = get_post_type($comment->comment_post_ID); |
|
94 | + if ($post_type == 'espresso_attendees') |
|
95 | 95 | return '#commentsdiv'; |
96 | 96 | return $link; |
97 | 97 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | protected function _ajax_hooks() { |
101 | 101 | //todo: all hooks for registrations ajax goes in here |
102 | - add_action( 'wp_ajax_toggle_checkin_status', array( $this, 'toggle_checkin_status' )); |
|
102 | + add_action('wp_ajax_toggle_checkin_status', array($this, 'toggle_checkin_status')); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | |
@@ -114,8 +114,8 @@ discard block |
||
114 | 114 | 'add-attendee' => __('Add Contact', 'event_espresso'), |
115 | 115 | 'edit' => __('Edit Contact', 'event_espresso'), |
116 | 116 | 'report'=> __("Event Registrations CSV Report", "event_espresso"), |
117 | - 'report_all' => __( 'All Registrations CSV Report', 'event_espresso' ), |
|
118 | - 'contact_list_report' => __( 'Contact List Report', 'event_espresso' ), |
|
117 | + 'report_all' => __('All Registrations CSV Report', 'event_espresso'), |
|
118 | + 'contact_list_report' => __('Contact List Report', 'event_espresso'), |
|
119 | 119 | 'contact_list_export'=> __("Export Data", "event_espresso"), |
120 | 120 | ), |
121 | 121 | 'publishbox' => array( |
@@ -143,9 +143,9 @@ discard block |
||
143 | 143 | |
144 | 144 | $this->_get_registration_status_array(); |
145 | 145 | |
146 | - $reg_id = ! empty( $this->_req_data['_REG_ID'] ) && ! is_array( $this->_req_data['_REG_ID'] ) ? $this->_req_data['_REG_ID'] : 0; |
|
147 | - $att_id = ! empty( $this->_req_data[ 'ATT_ID' ] ) && ! is_array( $this->_req_data['ATT_ID'] ) ? $this->_req_data['ATT_ID'] : 0; |
|
148 | - $att_id = ! empty( $this->_req_data['post'] ) && ! is_array( $this->_req_data['post'] ) ? $this->_req_data['post'] : $att_id; |
|
146 | + $reg_id = ! empty($this->_req_data['_REG_ID']) && ! is_array($this->_req_data['_REG_ID']) ? $this->_req_data['_REG_ID'] : 0; |
|
147 | + $att_id = ! empty($this->_req_data['ATT_ID']) && ! is_array($this->_req_data['ATT_ID']) ? $this->_req_data['ATT_ID'] : 0; |
|
148 | + $att_id = ! empty($this->_req_data['post']) && ! is_array($this->_req_data['post']) ? $this->_req_data['post'] : $att_id; |
|
149 | 149 | |
150 | 150 | $this->_page_routes = array( |
151 | 151 | |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | |
179 | 179 | 'restore_registrations' => array( |
180 | 180 | 'func' => '_trash_or_restore_registrations', |
181 | - 'args' => array( 'trash' => FALSE ), |
|
181 | + 'args' => array('trash' => FALSE), |
|
182 | 182 | 'noheader' => TRUE, |
183 | 183 | 'capability' => 'ee_delete_registrations' |
184 | 184 | ), |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | 'filename' => 'registrations_overview_other' |
406 | 406 | ) |
407 | 407 | ), |
408 | - 'help_tour' => array( 'Registration_Overview_Help_Tour' ), |
|
408 | + 'help_tour' => array('Registration_Overview_Help_Tour'), |
|
409 | 409 | 'qtips' => array('Registration_List_Table_Tips'), |
410 | 410 | 'list_table' => 'EE_Registrations_List_Table', |
411 | 411 | 'require_nonce' => FALSE |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | 'nav' => array( |
416 | 416 | 'label' => __('REG Details', 'event_espresso'), |
417 | 417 | 'order' => 15, |
418 | - 'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID'] ), $this->_current_page_view_url ) : $this->_admin_base_url, |
|
418 | + 'url' => isset($this->_req_data['_REG_ID']) ? add_query_arg(array('_REG_ID' => $this->_req_data['_REG_ID']), $this->_current_page_view_url) : $this->_admin_base_url, |
|
419 | 419 | 'persistent' => FALSE |
420 | 420 | ), |
421 | 421 | 'help_tabs' => array( |
@@ -436,8 +436,8 @@ discard block |
||
436 | 436 | 'filename' => 'registrations_details_registrant_details' |
437 | 437 | ) |
438 | 438 | ), |
439 | - 'help_tour' => array( 'Registration_Details_Help_Tour' ), |
|
440 | - 'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_registration_details_metaboxes' ) ), |
|
439 | + 'help_tour' => array('Registration_Details_Help_Tour'), |
|
440 | + 'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_registration_details_metaboxes')), |
|
441 | 441 | 'require_nonce' => FALSE |
442 | 442 | ), |
443 | 443 | |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | 'order' => 15, |
462 | 462 | 'persistent' => FALSE |
463 | 463 | ), |
464 | - 'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes' ) ), |
|
464 | + 'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box', 'attendee_editor_metaboxes')), |
|
465 | 465 | 'require_nonce' => FALSE |
466 | 466 | ), |
467 | 467 | |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | 'label' => __('Edit Contact', 'event_espresso'), |
471 | 471 | 'order' => 15, |
472 | 472 | 'persistent' => FALSE, |
473 | - 'url' => isset($this->_req_data['ATT_ID']) ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID'] ), $this->_current_page_view_url ) : $this->_admin_base_url |
|
473 | + 'url' => isset($this->_req_data['ATT_ID']) ? add_query_arg(array('ATT_ID' => $this->_req_data['ATT_ID']), $this->_current_page_view_url) : $this->_admin_base_url |
|
474 | 474 | ), |
475 | 475 | 'metaboxes' => array('attendee_editor_metaboxes'), |
476 | 476 | 'require_nonce' => FALSE |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | 'filename' => 'registrations_contact_list_other' |
501 | 501 | ) |
502 | 502 | ), |
503 | - 'help_tour' => array( 'Contact_List_Help_Tour' ), |
|
503 | + 'help_tour' => array('Contact_List_Help_Tour'), |
|
504 | 504 | 'metaboxes' => array(), |
505 | 505 | 'require_nonce' => FALSE |
506 | 506 | ), |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | protected function _add_screen_options() {} |
520 | 520 | protected function _add_feature_pointers() {} |
521 | 521 | public function admin_init() { |
522 | - EE_Registry::$i18n_js_strings[ 'update_att_qstns' ] = __( 'click "Update Registration Questions" to save your changes', 'event_espresso' ); |
|
522 | + EE_Registry::$i18n_js_strings['update_att_qstns'] = __('click "Update Registration Questions" to save your changes', 'event_espresso'); |
|
523 | 523 | } |
524 | 524 | public function admin_notices() {} |
525 | 525 | public function admin_footer_scripts() {} |
@@ -537,7 +537,7 @@ discard block |
||
537 | 537 | * @return void |
538 | 538 | */ |
539 | 539 | private function _get_registration_status_array() { |
540 | - self::$_reg_status = EEM_Registration::reg_status_array( array(), TRUE); |
|
540 | + self::$_reg_status = EEM_Registration::reg_status_array(array(), TRUE); |
|
541 | 541 | } |
542 | 542 | |
543 | 543 | |
@@ -560,11 +560,11 @@ discard block |
||
560 | 560 | public function load_scripts_styles() { |
561 | 561 | //style |
562 | 562 | //wp_register_style('espresso_attendees', ATT_ASSETS_URL . 'espresso_attendees_admin.css', array(), EVENT_ESPRESSO_VERSION ); |
563 | - wp_register_style('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION ); |
|
563 | + wp_register_style('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION); |
|
564 | 564 | wp_enqueue_style('espresso_reg'); |
565 | 565 | |
566 | 566 | //script |
567 | - wp_register_script('espresso_reg', REG_ASSETS_URL . 'espresso_registrations_admin.js', array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE); |
|
567 | + wp_register_script('espresso_reg', REG_ASSETS_URL.'espresso_registrations_admin.js', array('jquery-ui-datepicker', 'jquery-ui-draggable', 'ee_admin_js'), EVENT_ESPRESSO_VERSION, TRUE); |
|
568 | 568 | wp_enqueue_script('espresso_reg'); |
569 | 569 | } |
570 | 570 | |
@@ -573,9 +573,9 @@ discard block |
||
573 | 573 | public function load_scripts_styles_edit_attendee() { |
574 | 574 | //stuff to only show up on our attendee edit details page. |
575 | 575 | $attendee_details_translations = array( |
576 | - 'att_publish_text' => sprintf( __('Created on: <b>%1$s</b>', 'event_espresso'), $this->_cpt_model_obj->get_datetime('ATT_created') ) |
|
576 | + 'att_publish_text' => sprintf(__('Created on: <b>%1$s</b>', 'event_espresso'), $this->_cpt_model_obj->get_datetime('ATT_created')) |
|
577 | 577 | ); |
578 | - wp_localize_script( 'espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations ); |
|
578 | + wp_localize_script('espresso_reg', 'ATTENDEE_DETAILS', $attendee_details_translations); |
|
579 | 579 | wp_enqueue_script('jquery-validate'); |
580 | 580 | } |
581 | 581 | |
@@ -584,8 +584,8 @@ discard block |
||
584 | 584 | //styles |
585 | 585 | wp_enqueue_style('espresso-ui-theme'); |
586 | 586 | //scripts |
587 | - $this->_get_reg_custom_questions_form( $this->_registration->ID() ); |
|
588 | - $this->_reg_custom_questions_form->wp_enqueue_scripts( true ); |
|
587 | + $this->_get_reg_custom_questions_form($this->_registration->ID()); |
|
588 | + $this->_reg_custom_questions_form->wp_enqueue_scripts(true); |
|
589 | 589 | } |
590 | 590 | |
591 | 591 | |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | |
596 | 596 | public function load_scripts_styles_contact_list() { |
597 | 597 | wp_deregister_style('espresso_reg'); |
598 | - wp_register_style('espresso_att', REG_ASSETS_URL . 'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION ); |
|
598 | + wp_register_style('espresso_att', REG_ASSETS_URL.'espresso_attendees_admin.css', array('ee-admin-css'), EVENT_ESPRESSO_VERSION); |
|
599 | 599 | wp_enqueue_style('espresso_att'); |
600 | 600 | } |
601 | 601 | |
@@ -604,9 +604,9 @@ discard block |
||
604 | 604 | |
605 | 605 | |
606 | 606 | public function load_scripts_styles_new_registration() { |
607 | - wp_register_script( 'ee-spco-for-admin', REG_ASSETS_URL . 'spco_for_admin.js', array('underscore', 'jquery'), EVENT_ESPRESSO_VERSION, TRUE ); |
|
607 | + wp_register_script('ee-spco-for-admin', REG_ASSETS_URL.'spco_for_admin.js', array('underscore', 'jquery'), EVENT_ESPRESSO_VERSION, TRUE); |
|
608 | 608 | wp_enqueue_script('ee-spco-for-admin'); |
609 | - add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true' ); |
|
609 | + add_filter('FHEE__EED_Ticket_Selector__load_tckt_slctr_assets', '__return_true'); |
|
610 | 610 | EE_Form_Section_Proper::wp_enqueue_scripts(); |
611 | 611 | EED_Ticket_Selector::load_tckt_slctr_assets(); |
612 | 612 | EE_Datepicker_Input::enqueue_styles_and_scripts(); |
@@ -645,23 +645,23 @@ discard block |
||
645 | 645 | |
646 | 646 | /** setup reg status bulk actions **/ |
647 | 647 | $def_reg_status_actions['approve_registration'] = __('Approve Registrations', 'event_espresso'); |
648 | - if ( in_array( $match_array['approve_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) { |
|
648 | + if (in_array($match_array['approve_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) { |
|
649 | 649 | $def_reg_status_actions['approve_and_notify_registration'] = __('Approve and Notify Registrations', 'event_espresso'); |
650 | 650 | } |
651 | 651 | $def_reg_status_actions['decline_registration'] = __('Decline Registrations', 'event_espresso'); |
652 | - if ( in_array( $match_array['decline_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) { |
|
652 | + if (in_array($match_array['decline_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) { |
|
653 | 653 | $def_reg_status_actions['decline_and_notify_registration'] = __('Decline and Notify Registrations', 'event_espresso'); |
654 | 654 | } |
655 | 655 | $def_reg_status_actions['pending_registration'] = __('Set Registrations to Pending Payment', 'event_espresso'); |
656 | - if ( in_array( $match_array['pending_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) { |
|
656 | + if (in_array($match_array['pending_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) { |
|
657 | 657 | $def_reg_status_actions['pending_and_notify_registration'] = __('Set Registrations to Pending Payment and Notify', 'event_espresso'); |
658 | 658 | } |
659 | 659 | $def_reg_status_actions['no_approve_registration'] = __('Set Registrations to Not Approved', 'event_espresso'); |
660 | - if ( in_array( $match_array['no_approve_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) { |
|
660 | + if (in_array($match_array['no_approve_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) { |
|
661 | 661 | $def_reg_status_actions['no_approve_and_notify_registration'] = __('Set Registrations to Not Approved and Notify', 'event_espresso'); |
662 | 662 | } |
663 | 663 | $def_reg_status_actions['cancel_registration'] = __('Cancel Registrations', 'event_espresso'); |
664 | - if ( in_array( $match_array['cancel_registration'], $active_mts ) && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'batch_send_messages' ) ) { |
|
664 | + if (in_array($match_array['cancel_registration'], $active_mts) && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'batch_send_messages')) { |
|
665 | 665 | $def_reg_status_actions['cancel_and_notify_registration'] = __('Cancel Registrations and Notify', 'event_espresso'); |
666 | 666 | } |
667 | 667 | |
@@ -670,29 +670,29 @@ discard block |
||
670 | 670 | 'slug' => 'all', |
671 | 671 | 'label' => __('View All Registrations', 'event_espresso'), |
672 | 672 | 'count' => 0, |
673 | - 'bulk_action' => array_merge( $def_reg_status_actions, array( |
|
673 | + 'bulk_action' => array_merge($def_reg_status_actions, array( |
|
674 | 674 | 'trash_registrations' => __('Trash Registrations', 'event_espresso') |
675 | - ) ) |
|
675 | + )) |
|
676 | 676 | ), |
677 | 677 | 'month' => array( |
678 | 678 | 'slug' => 'month', |
679 | 679 | 'label' => __('This Month', 'event_espresso'), |
680 | 680 | 'count' => 0, |
681 | - 'bulk_action' => array_merge( $def_reg_status_actions, array( |
|
681 | + 'bulk_action' => array_merge($def_reg_status_actions, array( |
|
682 | 682 | 'trash_registrations' => __('Trash Registrations', 'event_espresso') |
683 | 683 | )) |
684 | 684 | ), |
685 | 685 | 'today' => array( |
686 | 686 | 'slug' => 'today', |
687 | - 'label' => sprintf( __('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp' ) ) ), |
|
687 | + 'label' => sprintf(__('Today - %s', 'event_espresso'), date('M d, Y', current_time('timestamp'))), |
|
688 | 688 | 'count' => 0, |
689 | - 'bulk_action' => array_merge( $def_reg_status_actions, array( |
|
689 | + 'bulk_action' => array_merge($def_reg_status_actions, array( |
|
690 | 690 | 'trash_registrations' => __('Trash Registrations', 'event_espresso') |
691 | 691 | )) |
692 | 692 | ) |
693 | 693 | ); |
694 | 694 | |
695 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_registrations', 'espresso_registrations_delete_registration' ) ) { |
|
695 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_registrations', 'espresso_registrations_delete_registration')) { |
|
696 | 696 | $this->_views['incomplete'] = array( |
697 | 697 | 'slug' => 'incomplete', |
698 | 698 | 'label' => __('Incomplete', 'event_espresso'), |
@@ -728,7 +728,7 @@ discard block |
||
728 | 728 | ) |
729 | 729 | ); |
730 | 730 | |
731 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_contacts', 'espresso_registrations_trash_attendees' ) ) { |
|
731 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_contacts', 'espresso_registrations_trash_attendees')) { |
|
732 | 732 | $this->_views['trash'] = array( |
733 | 733 | 'slug' => 'trash', |
734 | 734 | 'label' => __('Trash', 'event_espresso'), |
@@ -767,42 +767,42 @@ discard block |
||
767 | 767 | 'desc' => __('View Transaction Invoice', 'event_espresso') |
768 | 768 | ), |
769 | 769 | ); |
770 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) { |
|
770 | + if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) { |
|
771 | 771 | $fc_items['resend_registration'] = array( |
772 | 772 | 'class' => 'dashicons dashicons-email-alt', |
773 | 773 | 'desc' => __('Resend Registration Details', 'event_espresso') |
774 | 774 | ); |
775 | 775 | } else { |
776 | - $fc_items['blank'] = array( 'class' => 'blank', 'desc' => '' ); |
|
776 | + $fc_items['blank'] = array('class' => 'blank', 'desc' => ''); |
|
777 | 777 | } |
778 | 778 | |
779 | 779 | $sc_items = array( |
780 | 780 | 'approved_status' => array( |
781 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_approved, |
|
782 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) |
|
781 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_approved, |
|
782 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence') |
|
783 | 783 | ), |
784 | 784 | 'pending_status' => array( |
785 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_pending_payment, |
|
786 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ) |
|
785 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_pending_payment, |
|
786 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence') |
|
787 | 787 | ), |
788 | 788 | 'incomplete_status' => array( |
789 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_incomplete, |
|
790 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_incomplete, FALSE, 'sentence' ) |
|
789 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_incomplete, |
|
790 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_incomplete, FALSE, 'sentence') |
|
791 | 791 | ), |
792 | 792 | 'not_approved' => array( |
793 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_not_approved, |
|
794 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ) |
|
793 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_not_approved, |
|
794 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence') |
|
795 | 795 | ), |
796 | 796 | 'declined_status' => array( |
797 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_declined, |
|
798 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) |
|
797 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_declined, |
|
798 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence') |
|
799 | 799 | ), |
800 | 800 | 'cancelled_status' => array( |
801 | - 'class' => 'ee-status-legend ee-status-legend-' . EEM_Registration::status_id_cancelled, |
|
802 | - 'desc' => EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) |
|
801 | + 'class' => 'ee-status-legend ee-status-legend-'.EEM_Registration::status_id_cancelled, |
|
802 | + 'desc' => EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence') |
|
803 | 803 | ) |
804 | 804 | ); |
805 | - return array_merge( $fc_items, $sc_items ); |
|
805 | + return array_merge($fc_items, $sc_items); |
|
806 | 806 | } |
807 | 807 | |
808 | 808 | |
@@ -815,15 +815,15 @@ discard block |
||
815 | 815 | |
816 | 816 | |
817 | 817 | protected function _registrations_overview_list_table() { |
818 | - $EVT_ID = ( ! empty( $this->_req_data['event_id'] )) ? absint( $this->_req_data['event_id'] ) : FALSE; |
|
819 | - if ( $EVT_ID ) { |
|
820 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_registrations', 'espresso_registrations_new_registration', $EVT_ID ) ) { |
|
821 | - $this->_admin_page_title .= $this->get_action_link_or_button( 'new_registration', 'add-registrant', array( 'event_id' => $EVT_ID ), 'add-new-h2' ); |
|
818 | + $EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE; |
|
819 | + if ($EVT_ID) { |
|
820 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_registrations', 'espresso_registrations_new_registration', $EVT_ID)) { |
|
821 | + $this->_admin_page_title .= $this->get_action_link_or_button('new_registration', 'add-registrant', array('event_id' => $EVT_ID), 'add-new-h2'); |
|
822 | 822 | } |
823 | - $event = EEM_Event::instance()->get_one_by_ID( $EVT_ID ); |
|
824 | - $this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( __('%s Viewing registrations for the event: %s%s', 'event_espresso'), '<h2>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce( array('action' => 'edit', 'post' => $event->ID() ), EVENTS_ADMIN_URL ) . '">' . $event->get('EVT_name') . '</a>', '</h2>' ) : ''; |
|
823 | + $event = EEM_Event::instance()->get_one_by_ID($EVT_ID); |
|
824 | + $this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(__('%s Viewing registrations for the event: %s%s', 'event_espresso'), '<h2>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'">'.$event->get('EVT_name').'</a>', '</h2>') : ''; |
|
825 | 825 | } |
826 | - $this->_template_args['after_list_table'] = $this->_display_legend( $this->_registration_legend_items() ); |
|
826 | + $this->_template_args['after_list_table'] = $this->_display_legend($this->_registration_legend_items()); |
|
827 | 827 | $this->display_admin_list_table_page_with_no_sidebar(); |
828 | 828 | } |
829 | 829 | |
@@ -838,19 +838,19 @@ discard block |
||
838 | 838 | */ |
839 | 839 | private function _set_registration_object() { |
840 | 840 | //get out if we've already set the object |
841 | - if ( is_object( $this->_registration )) { |
|
841 | + if (is_object($this->_registration)) { |
|
842 | 842 | return TRUE; |
843 | 843 | } |
844 | 844 | |
845 | 845 | $REG = EEM_Registration::instance(); |
846 | 846 | |
847 | - $REG_ID = ( ! empty( $this->_req_data['_REG_ID'] )) ? absint( $this->_req_data['_REG_ID'] ) : FALSE; |
|
847 | + $REG_ID = ( ! empty($this->_req_data['_REG_ID'])) ? absint($this->_req_data['_REG_ID']) : FALSE; |
|
848 | 848 | |
849 | - if ( $this->_registration = $REG->get_one_by_ID( $REG_ID )) |
|
849 | + if ($this->_registration = $REG->get_one_by_ID($REG_ID)) |
|
850 | 850 | return TRUE; |
851 | 851 | else { |
852 | - $error_msg = sprintf( __('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID ); |
|
853 | - EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ ); |
|
852 | + $error_msg = sprintf(__('An error occurred and the details for Registration ID #%s could not be retrieved.', 'event_espresso'), $REG_ID); |
|
853 | + EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__); |
|
854 | 854 | $this->_registration = NULL; |
855 | 855 | return FALSE; |
856 | 856 | } |
@@ -869,25 +869,25 @@ discard block |
||
869 | 869 | * @internal param bool $all whether to ignore all query params and just return ALL registrations (or count if count is set) |
870 | 870 | * @return mixed (int|array) int = count || array of registration objects |
871 | 871 | */ |
872 | - public function get_registrations( $per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE ) { |
|
873 | - |
|
874 | - $EVT_ID = ! empty( $this->_req_data['event_id'] ) && $this->_req_data['event_id'] > 0 ? absint( $this->_req_data['event_id'] ) : FALSE; |
|
875 | - $CAT_ID = ! empty( $this->_req_data['EVT_CAT'] ) && (int) $this->_req_data['EVT_CAT'] > 0? absint( $this->_req_data['EVT_CAT'] ) : FALSE; |
|
876 | - $reg_status = ! empty( $this->_req_data['_reg_status'] ) ? sanitize_text_field( $this->_req_data['_reg_status'] ) : FALSE; |
|
877 | - $month_range = ! empty( $this->_req_data['month_range'] ) ? sanitize_text_field( $this->_req_data['month_range'] ) : FALSE;//should be like 2013-april |
|
878 | - $today_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'today' ? TRUE : FALSE; |
|
879 | - $this_month_a = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'month' ? TRUE : FALSE; |
|
872 | + public function get_registrations($per_page = 10, $count = FALSE, $this_month = FALSE, $today = FALSE) { |
|
873 | + |
|
874 | + $EVT_ID = ! empty($this->_req_data['event_id']) && $this->_req_data['event_id'] > 0 ? absint($this->_req_data['event_id']) : FALSE; |
|
875 | + $CAT_ID = ! empty($this->_req_data['EVT_CAT']) && (int) $this->_req_data['EVT_CAT'] > 0 ? absint($this->_req_data['EVT_CAT']) : FALSE; |
|
876 | + $reg_status = ! empty($this->_req_data['_reg_status']) ? sanitize_text_field($this->_req_data['_reg_status']) : FALSE; |
|
877 | + $month_range = ! empty($this->_req_data['month_range']) ? sanitize_text_field($this->_req_data['month_range']) : FALSE; //should be like 2013-april |
|
878 | + $today_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'today' ? TRUE : FALSE; |
|
879 | + $this_month_a = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'month' ? TRUE : FALSE; |
|
880 | 880 | $start_date = FALSE; |
881 | 881 | $end_date = FALSE; |
882 | 882 | $_where = array(); |
883 | - $trash = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'trash' ? TRUE : FALSE; |
|
884 | - $incomplete = ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'incomplete' ? TRUE : FALSE; |
|
883 | + $trash = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'trash' ? TRUE : FALSE; |
|
884 | + $incomplete = ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'incomplete' ? TRUE : FALSE; |
|
885 | 885 | |
886 | 886 | //set orderby |
887 | 887 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
888 | 888 | |
889 | 889 | |
890 | - switch ( $this->_req_data['orderby'] ) { |
|
890 | + switch ($this->_req_data['orderby']) { |
|
891 | 891 | case '_REG_ID': |
892 | 892 | $orderby = 'REG_ID'; |
893 | 893 | break; |
@@ -907,26 +907,26 @@ discard block |
||
907 | 907 | $orderby = 'REG_date'; |
908 | 908 | } |
909 | 909 | |
910 | - $sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC'; |
|
911 | - $current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1; |
|
912 | - $per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page; |
|
910 | + $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC'; |
|
911 | + $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1; |
|
912 | + $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page; |
|
913 | 913 | |
914 | 914 | |
915 | - $offset = ($current_page-1)*$per_page; |
|
916 | - $limit = $count ? NULL : array( $offset, $per_page ); |
|
915 | + $offset = ($current_page - 1) * $per_page; |
|
916 | + $limit = $count ? NULL : array($offset, $per_page); |
|
917 | 917 | |
918 | - if($EVT_ID){ |
|
919 | - $_where['EVT_ID']=$EVT_ID; |
|
918 | + if ($EVT_ID) { |
|
919 | + $_where['EVT_ID'] = $EVT_ID; |
|
920 | 920 | } |
921 | - if($CAT_ID){ |
|
921 | + if ($CAT_ID) { |
|
922 | 922 | $_where['Event.Term_Taxonomy.term_id'] = $CAT_ID; |
923 | 923 | } |
924 | - if ( $incomplete ) { |
|
924 | + if ($incomplete) { |
|
925 | 925 | $_where['STS_ID'] = EEM_Registration::status_id_incomplete; |
926 | 926 | } else if ( ! $trash) { |
927 | - $_where['STS_ID'] = array( '!=', EEM_Registration::status_id_incomplete ); |
|
927 | + $_where['STS_ID'] = array('!=', EEM_Registration::status_id_incomplete); |
|
928 | 928 | } |
929 | - if($reg_status){ |
|
929 | + if ($reg_status) { |
|
930 | 930 | $_where['STS_ID'] = $reg_status; |
931 | 931 | } |
932 | 932 | |
@@ -938,105 +938,105 @@ discard block |
||
938 | 938 | $time_start = ' 00:00:00'; |
939 | 939 | $time_end = ' 23:59:59'; |
940 | 940 | |
941 | - if($today_a || $today ){ |
|
941 | + if ($today_a || $today) { |
|
942 | 942 | $curdate = date('Y-m-d', current_time('timestamp')); |
943 | - $_where['REG_date']= array('BETWEEN', |
|
943 | + $_where['REG_date'] = array('BETWEEN', |
|
944 | 944 | array( |
945 | - EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_start, 'Y-m-d H:i:s' ), |
|
946 | - EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $curdate . $time_end, 'Y-m-d H:i:s' ), |
|
945 | + EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_start, 'Y-m-d H:i:s'), |
|
946 | + EEM_Registration::instance()->convert_datetime_for_query('REG_date', $curdate.$time_end, 'Y-m-d H:i:s'), |
|
947 | 947 | )); |
948 | - }elseif($this_month_a || $this_month){ |
|
948 | + }elseif ($this_month_a || $this_month) { |
|
949 | 949 | $this_month_r = date('m', current_time('timestamp')); |
950 | - $days_this_month = date( 't', current_time('timestamp') ); |
|
951 | - $_where['REG_date']= array('BETWEEN', |
|
950 | + $days_this_month = date('t', current_time('timestamp')); |
|
951 | + $_where['REG_date'] = array('BETWEEN', |
|
952 | 952 | array( |
953 | - EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-01' . ' ' . $time_start, 'Y-m-d H:i:s' ), |
|
954 | - EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $this_year_r . '-' . $this_month_r . '-' . $days_this_month . ' ' . $time_end, 'Y-m-d H:i:s' ) |
|
953 | + EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-01'.' '.$time_start, 'Y-m-d H:i:s'), |
|
954 | + EEM_Registration::instance()->convert_datetime_for_query('REG_date', $this_year_r.'-'.$this_month_r.'-'.$days_this_month.' '.$time_end, 'Y-m-d H:i:s') |
|
955 | 955 | )); |
956 | - }elseif($month_range){ |
|
956 | + }elseif ($month_range) { |
|
957 | 957 | $pieces = explode(' ', $this->_req_data['month_range'], 3); |
958 | - $month_r = !empty($pieces[0]) ? date('m', strtotime($pieces[0])) : ''; |
|
959 | - $year_r = !empty($pieces[1]) ? $pieces[1] : ''; |
|
960 | - $days_in_month = date('t', strtotime($year_r . '-' . $month_r . '-' . '01') ); |
|
961 | - $_where['REG_date']= array('BETWEEN', |
|
962 | - array( EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query( 'REG_date', $year_r . '-' . $month_r . '-' . $days_in_month . ' 23:59:59', 'Y-m-d H:i:s' ) ) ); |
|
963 | - }elseif($start_date && $end_date){ |
|
958 | + $month_r = ! empty($pieces[0]) ? date('m', strtotime($pieces[0])) : ''; |
|
959 | + $year_r = ! empty($pieces[1]) ? $pieces[1] : ''; |
|
960 | + $days_in_month = date('t', strtotime($year_r.'-'.$month_r.'-'.'01')); |
|
961 | + $_where['REG_date'] = array('BETWEEN', |
|
962 | + array(EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-01 00:00:00', 'Y-m-d H:i:s'), EEM_Registration::instance()->convert_datetime_for_query('REG_date', $year_r.'-'.$month_r.'-'.$days_in_month.' 23:59:59', 'Y-m-d H:i:s'))); |
|
963 | + }elseif ($start_date && $end_date) { |
|
964 | 964 | throw new EE_Error("not yet supported"); |
965 | - }elseif($start_date){ |
|
965 | + }elseif ($start_date) { |
|
966 | 966 | throw new EE_Error("not yet supported"); |
967 | - }elseif($end_date){ |
|
967 | + }elseif ($end_date) { |
|
968 | 968 | throw new EE_Error("not yet supported"); |
969 | 969 | } |
970 | 970 | |
971 | - if ( ! empty( $this->_req_data['s'] ) ) { |
|
972 | - $sstr = '%' . $this->_req_data['s'] . '%'; |
|
971 | + if ( ! empty($this->_req_data['s'])) { |
|
972 | + $sstr = '%'.$this->_req_data['s'].'%'; |
|
973 | 973 | $_where['OR'] = array( |
974 | - 'Event.EVT_name' => array( 'LIKE', $sstr), |
|
975 | - 'Event.EVT_desc' => array( 'LIKE', $sstr ), |
|
976 | - 'Event.EVT_short_desc' => array( 'LIKE' , $sstr ), |
|
977 | - 'Attendee.ATT_full_name' => array( 'LIKE', $sstr ), |
|
978 | - 'Attendee.ATT_fname' => array( 'LIKE', $sstr ), |
|
979 | - 'Attendee.ATT_lname' => array( 'LIKE', $sstr ), |
|
980 | - 'Attendee.ATT_short_bio' => array( 'LIKE', $sstr ), |
|
981 | - 'Attendee.ATT_email' => array('LIKE', $sstr ), |
|
982 | - 'Attendee.ATT_address' => array( 'LIKE', $sstr ), |
|
983 | - 'Attendee.ATT_address2' => array( 'LIKE', $sstr ), |
|
984 | - 'Attendee.ATT_city' => array( 'LIKE', $sstr ), |
|
985 | - 'REG_final_price' => array( 'LIKE', $sstr ), |
|
986 | - 'REG_code' => array( 'LIKE', $sstr ), |
|
987 | - 'REG_count' => array( 'LIKE' , $sstr ), |
|
988 | - 'REG_group_size' => array( 'LIKE' , $sstr ), |
|
989 | - 'Ticket.TKT_name' => array( 'LIKE', $sstr ), |
|
990 | - 'Ticket.TKT_description' => array( 'LIKE', $sstr ), |
|
991 | - 'Transaction.Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $sstr ) |
|
974 | + 'Event.EVT_name' => array('LIKE', $sstr), |
|
975 | + 'Event.EVT_desc' => array('LIKE', $sstr), |
|
976 | + 'Event.EVT_short_desc' => array('LIKE', $sstr), |
|
977 | + 'Attendee.ATT_full_name' => array('LIKE', $sstr), |
|
978 | + 'Attendee.ATT_fname' => array('LIKE', $sstr), |
|
979 | + 'Attendee.ATT_lname' => array('LIKE', $sstr), |
|
980 | + 'Attendee.ATT_short_bio' => array('LIKE', $sstr), |
|
981 | + 'Attendee.ATT_email' => array('LIKE', $sstr), |
|
982 | + 'Attendee.ATT_address' => array('LIKE', $sstr), |
|
983 | + 'Attendee.ATT_address2' => array('LIKE', $sstr), |
|
984 | + 'Attendee.ATT_city' => array('LIKE', $sstr), |
|
985 | + 'REG_final_price' => array('LIKE', $sstr), |
|
986 | + 'REG_code' => array('LIKE', $sstr), |
|
987 | + 'REG_count' => array('LIKE', $sstr), |
|
988 | + 'REG_group_size' => array('LIKE', $sstr), |
|
989 | + 'Ticket.TKT_name' => array('LIKE', $sstr), |
|
990 | + 'Ticket.TKT_description' => array('LIKE', $sstr), |
|
991 | + 'Transaction.Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $sstr) |
|
992 | 992 | ); |
993 | 993 | } |
994 | 994 | |
995 | 995 | //capability checks |
996 | - if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations' ) ) { |
|
996 | + if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'get_registrations')) { |
|
997 | 997 | $_where['AND'] = array( |
998 | 998 | 'Event.EVT_wp_user' => get_current_user_id() |
999 | 999 | ); |
1000 | 1000 | } |
1001 | 1001 | |
1002 | 1002 | |
1003 | - if( $count ){ |
|
1004 | - if ( $trash ) { |
|
1005 | - return EEM_Registration::instance()->count_deleted( array( $_where )); |
|
1006 | - } else if ( $incomplete ) { |
|
1007 | - return EEM_Registration::instance()->count( array( $_where )); |
|
1003 | + if ($count) { |
|
1004 | + if ($trash) { |
|
1005 | + return EEM_Registration::instance()->count_deleted(array($_where)); |
|
1006 | + } else if ($incomplete) { |
|
1007 | + return EEM_Registration::instance()->count(array($_where)); |
|
1008 | 1008 | } else { |
1009 | - return EEM_Registration::instance()->count( array( $_where, 'default_where_conditions' => 'this_model_only' )); |
|
1009 | + return EEM_Registration::instance()->count(array($_where, 'default_where_conditions' => 'this_model_only')); |
|
1010 | 1010 | } |
1011 | 1011 | } else { |
1012 | 1012 | //make sure we remove default where conditions cause all registrations matching query are returned |
1013 | - $query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'default_where_conditions' => 'this_model_only' ); |
|
1014 | - if ( $per_page !== -1 ) { |
|
1013 | + $query_params = array($_where, 'order_by' => array($orderby => $sort), 'default_where_conditions' => 'this_model_only'); |
|
1014 | + if ($per_page !== -1) { |
|
1015 | 1015 | $query_params['limit'] = $limit; |
1016 | 1016 | } |
1017 | - $registrations = $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params); |
|
1017 | + $registrations = $trash ? EEM_Registration::instance()->get_all_deleted($query_params) : EEM_Registration::instance()->get_all($query_params); |
|
1018 | 1018 | |
1019 | 1019 | |
1020 | - if ( $EVT_ID && isset( $registrations[0] ) && $registrations[0] instanceof EE_Registration && $registrations[0]->event_obj()) { |
|
1020 | + if ($EVT_ID && isset($registrations[0]) && $registrations[0] instanceof EE_Registration && $registrations[0]->event_obj()) { |
|
1021 | 1021 | $first_registration = $registrations[0]; |
1022 | 1022 | //EEH_Debug_Tools::printr( $registrations[0], '$registrations <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); |
1023 | 1023 | $event_name = $first_registration->event_obj()->name(); |
1024 | - $event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a');// isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y, g:i:s a', $registrations[0]->DTT_EVT_start ) : ''; |
|
1024 | + $event_date = $first_registration->date_obj()->start_date_and_time('l F j, Y,', 'g:i:s a'); // isset( $registrations[0]->DTT_EVT_start ) ? date( 'l F j, Y, g:i:s a', $registrations[0]->DTT_EVT_start ) : ''; |
|
1025 | 1025 | // edit event link |
1026 | - if ( $event_name != '' ) { |
|
1027 | - $edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit_event', 'EVT_ID'=>$EVT_ID ), EVENTS_ADMIN_URL ); |
|
1028 | - $edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $event_name . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>'; |
|
1029 | - $event_name .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ; |
|
1026 | + if ($event_name != '') { |
|
1027 | + $edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit_event', 'EVT_ID'=>$EVT_ID), EVENTS_ADMIN_URL); |
|
1028 | + $edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$event_name.'">'.__('Edit Event', 'event_espresso').'</a>'; |
|
1029 | + $event_name .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>'; |
|
1030 | 1030 | } |
1031 | 1031 | |
1032 | - $back_2_reg_url = self::add_query_args_and_nonce( array( 'action'=>'default' ), REG_ADMIN_URL ); |
|
1033 | - $back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="' . esc_attr__( 'click to return to viewing all registrations ', 'event_espresso' ) . '">« ' . __( 'Back to All Registrations', 'event_espresso' ) . '</a>'; |
|
1032 | + $back_2_reg_url = self::add_query_args_and_nonce(array('action'=>'default'), REG_ADMIN_URL); |
|
1033 | + $back_2_reg_lnk = '<a href="'.$back_2_reg_url.'" title="'.esc_attr__('click to return to viewing all registrations ', 'event_espresso').'">« '.__('Back to All Registrations', 'event_espresso').'</a>'; |
|
1034 | 1034 | |
1035 | 1035 | $this->_template_args['before_admin_page_content'] = ' |
1036 | 1036 | <div id="admin-page-header"> |
1037 | - <h1><span class="small-text not-bold">'.__( 'Event: ', 'event_espresso' ).'</span>'. $event_name .'</h1> |
|
1038 | - <h3><span class="small-text not-bold">'.__( 'Date: ', 'event_espresso' ). '</span>'. $event_date .'</h3> |
|
1039 | - <span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk . '</span> |
|
1037 | + <h1><span class="small-text not-bold">'.__('Event: ', 'event_espresso').'</span>'.$event_name.'</h1> |
|
1038 | + <h3><span class="small-text not-bold">'.__('Date: ', 'event_espresso').'</span>'.$event_date.'</h3> |
|
1039 | + <span class="admin-page-header-go-back-lnk not-bold">' . $back_2_reg_lnk.'</span> |
|
1040 | 1040 | </div> |
1041 | 1041 | '; |
1042 | 1042 | |
@@ -1074,7 +1074,7 @@ discard block |
||
1074 | 1074 | |
1075 | 1075 | $this->_set_registration_object(); |
1076 | 1076 | |
1077 | - if ( is_object( $this->_registration )) { |
|
1077 | + if (is_object($this->_registration)) { |
|
1078 | 1078 | $transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance(); |
1079 | 1079 | $this->_session = $transaction->session_data(); |
1080 | 1080 | |
@@ -1082,10 +1082,10 @@ discard block |
||
1082 | 1082 | |
1083 | 1083 | |
1084 | 1084 | $this->_template_args['reg_nmbr']['value'] = $this->_registration->ID(); |
1085 | - $this->_template_args['reg_nmbr']['label'] = __( 'Registration Number', 'event_espresso' ); |
|
1085 | + $this->_template_args['reg_nmbr']['label'] = __('Registration Number', 'event_espresso'); |
|
1086 | 1086 | |
1087 | - $this->_template_args['reg_datetime']['value'] = $this->_registration->pretty_date('l F j, Y','g:i:s a') ; |
|
1088 | - $this->_template_args['reg_datetime']['label'] = __( 'Date', 'event_espresso' ); |
|
1087 | + $this->_template_args['reg_datetime']['value'] = $this->_registration->pretty_date('l F j, Y', 'g:i:s a'); |
|
1088 | + $this->_template_args['reg_datetime']['label'] = __('Date', 'event_espresso'); |
|
1089 | 1089 | |
1090 | 1090 | $this->_template_args['grand_total'] = $transaction->total(); |
1091 | 1091 | |
@@ -1093,19 +1093,19 @@ discard block |
||
1093 | 1093 | // link back to overview |
1094 | 1094 | $this->_template_args['reg_overview_url'] = REG_ADMIN_URL; |
1095 | 1095 | $this->_template_args['registration'] = $this->_registration; |
1096 | - $this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'event_id' => $event_id ), REG_ADMIN_URL ); |
|
1097 | - $this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'EVT_ID' => $event_id, 'page' => 'espresso_transactions' ), admin_url( 'admin.php' ) ); |
|
1098 | - $this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'page' => 'espresso_events', 'action' => 'edit', 'post' => $event_id ), admin_url( 'admin.php' ) ); |
|
1096 | + $this->_template_args['filtered_registrations_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $event_id), REG_ADMIN_URL); |
|
1097 | + $this->_template_args['filtered_transactions_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'EVT_ID' => $event_id, 'page' => 'espresso_transactions'), admin_url('admin.php')); |
|
1098 | + $this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events', 'action' => 'edit', 'post' => $event_id), admin_url('admin.php')); |
|
1099 | 1099 | |
1100 | 1100 | //next and previous links |
1101 | - $next_reg = $this->_registration->next(null, array(), 'REG_ID' ); |
|
1102 | - $this->_template_args['next_registration'] = $next_reg ? $this->_next_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $next_reg['REG_ID'] ), REG_ADMIN_URL ), 'dashicons dashicons-arrow-right ee-icon-size-22' ) : ''; |
|
1103 | - $previous_reg = $this->_registration->previous( null, array(), 'REG_ID' ); |
|
1104 | - $this->_template_args['previous_registration'] = $previous_reg ? $this->_previous_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'view_registration', '_REG_ID' => $previous_reg['REG_ID'] ), REG_ADMIN_URL ), 'dashicons dashicons-arrow-left ee-icon-size-22' ) : ''; |
|
1101 | + $next_reg = $this->_registration->next(null, array(), 'REG_ID'); |
|
1102 | + $this->_template_args['next_registration'] = $next_reg ? $this->_next_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $next_reg['REG_ID']), REG_ADMIN_URL), 'dashicons dashicons-arrow-right ee-icon-size-22') : ''; |
|
1103 | + $previous_reg = $this->_registration->previous(null, array(), 'REG_ID'); |
|
1104 | + $this->_template_args['previous_registration'] = $previous_reg ? $this->_previous_link(EE_Admin_Page::add_query_args_and_nonce(array('action' => 'view_registration', '_REG_ID' => $previous_reg['REG_ID']), REG_ADMIN_URL), 'dashicons dashicons-arrow-left ee-icon-size-22') : ''; |
|
1105 | 1105 | |
1106 | 1106 | // grab header |
1107 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_header.template.php'; |
|
1108 | - $this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
1107 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_header.template.php'; |
|
1108 | + $this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
1109 | 1109 | |
1110 | 1110 | } else { |
1111 | 1111 | |
@@ -1124,17 +1124,17 @@ discard block |
||
1124 | 1124 | |
1125 | 1125 | |
1126 | 1126 | protected function _registration_details_metaboxes() { |
1127 | - do_action( 'AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this ); |
|
1127 | + do_action('AHEE__Registrations_Admin_Page___registration_details_metabox__start', $this); |
|
1128 | 1128 | $this->_set_registration_object(); |
1129 | 1129 | $attendee = $this->_registration instanceof EE_Registration ? $this->_registration->attendee() : null; |
1130 | - add_meta_box( 'edit-reg-status-mbox', __( 'Registration Status', 'event_espresso' ), array( $this, 'set_reg_status_buttons_metabox' ), $this->wp_page_slug, 'normal', 'high' ); |
|
1131 | - add_meta_box( 'edit-reg-details-mbox', __( 'Registration Details', 'event_espresso' ), array( $this, '_reg_details_meta_box' ), $this->wp_page_slug, 'normal', 'high' ); |
|
1132 | - if ( $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox' ) ) { |
|
1133 | - add_meta_box( 'edit-reg-questions-mbox', __( 'Registration Form Answers', 'event_espresso' ), array( $this, '_reg_questions_meta_box' ), $this->wp_page_slug, 'normal', 'high' ); |
|
1130 | + add_meta_box('edit-reg-status-mbox', __('Registration Status', 'event_espresso'), array($this, 'set_reg_status_buttons_metabox'), $this->wp_page_slug, 'normal', 'high'); |
|
1131 | + add_meta_box('edit-reg-details-mbox', __('Registration Details', 'event_espresso'), array($this, '_reg_details_meta_box'), $this->wp_page_slug, 'normal', 'high'); |
|
1132 | + if ($attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_edit_registration', 'edit-reg-questions-mbox')) { |
|
1133 | + add_meta_box('edit-reg-questions-mbox', __('Registration Form Answers', 'event_espresso'), array($this, '_reg_questions_meta_box'), $this->wp_page_slug, 'normal', 'high'); |
|
1134 | 1134 | } |
1135 | - add_meta_box( 'edit-reg-registrant-mbox', __( 'Contact Details', 'event_espresso' ), array( $this, '_reg_registrant_side_meta_box' ), $this->wp_page_slug, 'side', 'high' ); |
|
1136 | - if ( $this->_registration->group_size() > 1 ) { |
|
1137 | - add_meta_box( 'edit-reg-attendees-mbox', __( 'Other Registrations in this Transaction', 'event_espresso' ), array( $this, '_reg_attendees_meta_box' ), $this->wp_page_slug, 'normal', 'high' ); |
|
1135 | + add_meta_box('edit-reg-registrant-mbox', __('Contact Details', 'event_espresso'), array($this, '_reg_registrant_side_meta_box'), $this->wp_page_slug, 'side', 'high'); |
|
1136 | + if ($this->_registration->group_size() > 1) { |
|
1137 | + add_meta_box('edit-reg-attendees-mbox', __('Other Registrations in this Transaction', 'event_espresso'), array($this, '_reg_attendees_meta_box'), $this->wp_page_slug, 'normal', 'high'); |
|
1138 | 1138 | } |
1139 | 1139 | } |
1140 | 1140 | |
@@ -1155,23 +1155,23 @@ discard block |
||
1155 | 1155 | |
1156 | 1156 | //let's get an array of all possible buttons that we can just reference |
1157 | 1157 | $status_buttons = $this->_get_reg_status_buttons(); |
1158 | - $template_args[ 'reg_status_value' ] = $this->_registration->pretty_status(); |
|
1159 | - $template_args[ 'reg_status_class' ] = 'status-' . $this->_registration->status_ID(); |
|
1158 | + $template_args['reg_status_value'] = $this->_registration->pretty_status(); |
|
1159 | + $template_args['reg_status_class'] = 'status-'.$this->_registration->status_ID(); |
|
1160 | 1160 | $template_args['attendee'] = $this->_registration->attendee(); |
1161 | - $template = REG_TEMPLATE_PATH . 'reg_status_change_buttons.template.php'; |
|
1162 | - if ( $this->_set_registration_object() ) { |
|
1161 | + $template = REG_TEMPLATE_PATH.'reg_status_change_buttons.template.php'; |
|
1162 | + if ($this->_set_registration_object()) { |
|
1163 | 1163 | $current_status = $this->_registration->status_ID(); |
1164 | - unset( $status_buttons[$current_status] ); |
|
1165 | - if ( $current_status != EEM_Registration::status_id_pending_payment && $is_complete ) { |
|
1166 | - unset( $status_buttons[EEM_Registration::status_id_pending_payment] ); |
|
1164 | + unset($status_buttons[$current_status]); |
|
1165 | + if ($current_status != EEM_Registration::status_id_pending_payment && $is_complete) { |
|
1166 | + unset($status_buttons[EEM_Registration::status_id_pending_payment]); |
|
1167 | 1167 | } |
1168 | - $template_args['status_buttons'] = implode( "\n", $status_buttons ); |
|
1168 | + $template_args['status_buttons'] = implode("\n", $status_buttons); |
|
1169 | 1169 | } |
1170 | 1170 | $template_args['form_url'] = REG_ADMIN_URL; |
1171 | 1171 | $template_args['REG_ID'] = $this->_registration->ID(); |
1172 | - $template_args['nonce'] = wp_nonce_field( 'change_reg_status_nonce', 'change_reg_status_nonce', FALSE, FALSE ); |
|
1172 | + $template_args['nonce'] = wp_nonce_field('change_reg_status_nonce', 'change_reg_status_nonce', FALSE, FALSE); |
|
1173 | 1173 | |
1174 | - EEH_Template::display_template( $template, $template_args ); |
|
1174 | + EEH_Template::display_template($template, $template_args); |
|
1175 | 1175 | |
1176 | 1176 | } |
1177 | 1177 | |
@@ -1185,11 +1185,11 @@ discard block |
||
1185 | 1185 | private function _get_reg_status_buttons() { |
1186 | 1186 | |
1187 | 1187 | $buttons = array( |
1188 | - EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_approved, FALSE, 'sentence' ) . '">', |
|
1189 | - EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_pending_payment . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, FALSE, 'sentence' ) . '">', |
|
1190 | - EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_not_approved . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, FALSE, 'sentence' ) . '">', |
|
1191 | - EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_declined . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_declined, FALSE, 'sentence' ) . '">', |
|
1192 | - EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-' . EEM_Registration::status_id_cancelled . '" value="' . EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, FALSE, 'sentence' ) . '">', |
|
1188 | + EEM_Registration::status_id_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence').'">', |
|
1189 | + EEM_Registration::status_id_pending_payment => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_pending_payment.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence').'">', |
|
1190 | + EEM_Registration::status_id_not_approved => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_not_approved.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence').'">', |
|
1191 | + EEM_Registration::status_id_declined => '<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_declined.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_declined, FALSE, 'sentence').'">', |
|
1192 | + EEM_Registration::status_id_cancelled =>'<input type="submit" name="_reg_status_id" class="button-secondary ee-status-strip reg-status-'.EEM_Registration::status_id_cancelled.'" value="'.EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, FALSE, 'sentence').'">', |
|
1193 | 1193 | ); |
1194 | 1194 | return $buttons; |
1195 | 1195 | } |
@@ -1203,13 +1203,13 @@ discard block |
||
1203 | 1203 | * |
1204 | 1204 | * @return array (array with reg_id(s) updated and whether update was successful. |
1205 | 1205 | */ |
1206 | - protected function _set_registration_status_from_request( $status = false, $notify = false ) { |
|
1207 | - $REG_ID = isset( $this->_req_data['_REG_ID'] ) ? (array) $this->_req_data['_REG_ID'] : array(); |
|
1206 | + protected function _set_registration_status_from_request($status = false, $notify = false) { |
|
1207 | + $REG_ID = isset($this->_req_data['_REG_ID']) ? (array) $this->_req_data['_REG_ID'] : array(); |
|
1208 | 1208 | |
1209 | - $success = $this->_set_registration_status( $REG_ID, $status ); |
|
1209 | + $success = $this->_set_registration_status($REG_ID, $status); |
|
1210 | 1210 | |
1211 | 1211 | //notify? |
1212 | - if ( $success && $notify && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ) { |
|
1212 | + if ($success && $notify && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration')) { |
|
1213 | 1213 | $this->_process_resend_registration(); |
1214 | 1214 | } |
1215 | 1215 | |
@@ -1227,19 +1227,19 @@ discard block |
||
1227 | 1227 | * @param bool $status |
1228 | 1228 | * @return array (an array with 'success' key representing whether status change was successful, and 'REG_ID' as the array of updated registrations). |
1229 | 1229 | */ |
1230 | - protected function _set_registration_status( $REG_ID, $status = false ) { |
|
1230 | + protected function _set_registration_status($REG_ID, $status = false) { |
|
1231 | 1231 | $success = true; |
1232 | 1232 | // set default status if none is passed |
1233 | 1233 | $status = $status ? $status : EEM_Registration::status_id_pending_payment; |
1234 | 1234 | |
1235 | 1235 | //typecast and sanitize reg_id |
1236 | - $reg_ids = array_filter( (array) $REG_ID, 'absint' ); |
|
1236 | + $reg_ids = array_filter((array) $REG_ID, 'absint'); |
|
1237 | 1237 | |
1238 | 1238 | //loop through REG_ID's and change status |
1239 | - foreach ( $reg_ids as $r_id ) { |
|
1240 | - $registration = EEM_Registration::instance()->get_one_by_ID( $r_id ); |
|
1241 | - if ( $registration instanceof EE_Registration ) { |
|
1242 | - $registration->set_status( $status ); |
|
1239 | + foreach ($reg_ids as $r_id) { |
|
1240 | + $registration = EEM_Registration::instance()->get_one_by_ID($r_id); |
|
1241 | + if ($registration instanceof EE_Registration) { |
|
1242 | + $registration->set_status($status); |
|
1243 | 1243 | $result = $registration->save(); |
1244 | 1244 | |
1245 | 1245 | //verifying explicit fails because update *may* just return 0 for 0 rows affected |
@@ -1251,7 +1251,7 @@ discard block |
||
1251 | 1251 | $this->_req_data['_REG_ID'] = $reg_ids; |
1252 | 1252 | |
1253 | 1253 | //return $success and processed registrations |
1254 | - return array( 'REG_ID' => $reg_ids, 'success' => $success ); |
|
1254 | + return array('REG_ID' => $reg_ids, 'success' => $success); |
|
1255 | 1255 | } |
1256 | 1256 | |
1257 | 1257 | |
@@ -1263,37 +1263,37 @@ discard block |
||
1263 | 1263 | * @param bool $notify indicates whether the _set_registration_status_from_request does notifications or not. |
1264 | 1264 | * @return void |
1265 | 1265 | */ |
1266 | - protected function _reg_status_change_return( $STS_ID, $notify = false ) { |
|
1266 | + protected function _reg_status_change_return($STS_ID, $notify = false) { |
|
1267 | 1267 | |
1268 | - $result = ! empty( $STS_ID ) ? $this->_set_registration_status_from_request( $STS_ID, $notify ) : array( 'success' => false ); |
|
1268 | + $result = ! empty($STS_ID) ? $this->_set_registration_status_from_request($STS_ID, $notify) : array('success' => false); |
|
1269 | 1269 | |
1270 | 1270 | |
1271 | - $success = isset( $result['success'] ) && $result['success']; |
|
1271 | + $success = isset($result['success']) && $result['success']; |
|
1272 | 1272 | |
1273 | 1273 | //setup success message |
1274 | - if ( $success ) { |
|
1275 | - $msg = is_array( $result['REG_ID'] ) && count( $result['REG_ID'] ) > 1 ? sprintf( __('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) : sprintf( __('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower' ) ) ; |
|
1276 | - EE_Error::add_success( $msg ); |
|
1274 | + if ($success) { |
|
1275 | + $msg = is_array($result['REG_ID']) && count($result['REG_ID']) > 1 ? sprintf(__('Registration status has been set to %s', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower')) : sprintf(__('Registrations have been set to %s.', 'event_espresso'), EEH_Template::pretty_status($STS_ID, false, 'lower')); |
|
1276 | + EE_Error::add_success($msg); |
|
1277 | 1277 | } else { |
1278 | - EE_Error::add_error( __('Something went wrong, and the status was not changed', 'event_espresso' ), __FILE__, __LINE__, __FUNCTION__ ); |
|
1278 | + EE_Error::add_error(__('Something went wrong, and the status was not changed', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__); |
|
1279 | 1279 | } |
1280 | 1280 | |
1281 | - $route = isset( $this->_req_data['return'] ) && $this->_req_data['return'] == 'view_registration' ? array( 'action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0] ) : array( 'action' => 'default' ); |
|
1281 | + $route = isset($this->_req_data['return']) && $this->_req_data['return'] == 'view_registration' ? array('action' => 'view_registration', '_REG_ID' => $result['REG_ID'][0]) : array('action' => 'default'); |
|
1282 | 1282 | //unset nonces |
1283 | - foreach ( $this->_req_data as $ref => $value ) { |
|
1284 | - if ( strpos( $ref, 'nonce' ) !== false ) { |
|
1285 | - unset( $this->_req_data[$ref] ); |
|
1283 | + foreach ($this->_req_data as $ref => $value) { |
|
1284 | + if (strpos($ref, 'nonce') !== false) { |
|
1285 | + unset($this->_req_data[$ref]); |
|
1286 | 1286 | continue; |
1287 | 1287 | } |
1288 | 1288 | |
1289 | - $value = is_array( $value ) ? array_map( 'urlencode', $value ) : urlencode( $value ); |
|
1289 | + $value = is_array($value) ? array_map('urlencode', $value) : urlencode($value); |
|
1290 | 1290 | $this->_req_data[$ref] = $value; |
1291 | 1291 | } |
1292 | 1292 | |
1293 | 1293 | //merge request vars so that the reloaded list table contains any existing filter query params |
1294 | - $route = array_merge( $this->_req_data, $route ); |
|
1294 | + $route = array_merge($this->_req_data, $route); |
|
1295 | 1295 | |
1296 | - $this->_redirect_after_action( false, '', '', $route, true ); |
|
1296 | + $this->_redirect_after_action(false, '', '', $route, true); |
|
1297 | 1297 | } |
1298 | 1298 | |
1299 | 1299 | |
@@ -1305,29 +1305,29 @@ discard block |
||
1305 | 1305 | protected function _change_reg_status() { |
1306 | 1306 | $this->_req_data['return'] = 'view_registration'; |
1307 | 1307 | //set notify based on whether the send notifications toggle is set or not |
1308 | - $notify = ! empty( $this->_req_data['txn_reg_status_change']['send_notifications'] ); |
|
1309 | - $this->_req_data[ '_reg_status_id' ] = isset( $this->_req_data[ '_reg_status_id' ] ) ? $this->_req_data[ '_reg_status_id' ] : ''; |
|
1308 | + $notify = ! empty($this->_req_data['txn_reg_status_change']['send_notifications']); |
|
1309 | + $this->_req_data['_reg_status_id'] = isset($this->_req_data['_reg_status_id']) ? $this->_req_data['_reg_status_id'] : ''; |
|
1310 | 1310 | |
1311 | - switch ( $this->_req_data['_reg_status_id'] ) { |
|
1312 | - case EEH_Template::pretty_status( EEM_Registration::status_id_approved, false, 'sentence' ) : |
|
1313 | - $this->approve_registration( $notify ); |
|
1311 | + switch ($this->_req_data['_reg_status_id']) { |
|
1312 | + case EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence') : |
|
1313 | + $this->approve_registration($notify); |
|
1314 | 1314 | break; |
1315 | - case EEH_Template::pretty_status( EEM_Registration::status_id_pending_payment, false, 'sentence' ) : |
|
1316 | - $this->pending_registration( $notify ); |
|
1315 | + case EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence') : |
|
1316 | + $this->pending_registration($notify); |
|
1317 | 1317 | break; |
1318 | - case EEH_Template::pretty_status( EEM_Registration::status_id_not_approved, false, 'sentence' ) : |
|
1319 | - $this->not_approve_registration( $notify ); |
|
1318 | + case EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence') : |
|
1319 | + $this->not_approve_registration($notify); |
|
1320 | 1320 | break; |
1321 | - case EEH_Template::pretty_status( EEM_Registration::status_id_declined, false, 'sentence' ) : |
|
1322 | - $this->decline_registration( $notify ); |
|
1321 | + case EEH_Template::pretty_status(EEM_Registration::status_id_declined, false, 'sentence') : |
|
1322 | + $this->decline_registration($notify); |
|
1323 | 1323 | break; |
1324 | - case EEH_Template::pretty_status( EEM_Registration::status_id_cancelled, false, 'sentence' ) : |
|
1325 | - $this->cancel_registration( $notify ); |
|
1324 | + case EEH_Template::pretty_status(EEM_Registration::status_id_cancelled, false, 'sentence') : |
|
1325 | + $this->cancel_registration($notify); |
|
1326 | 1326 | break; |
1327 | 1327 | default : |
1328 | 1328 | $result['success'] = false; |
1329 | - unset( $this->_req_data['return'] ); |
|
1330 | - $this->_reg_status_change_return( '', false ); |
|
1329 | + unset($this->_req_data['return']); |
|
1330 | + $this->_reg_status_change_return('', false); |
|
1331 | 1331 | break; |
1332 | 1332 | } |
1333 | 1333 | } |
@@ -1340,8 +1340,8 @@ discard block |
||
1340 | 1340 | * @param bool $notify whether or not to notify the registrant about their approval. |
1341 | 1341 | * @return void |
1342 | 1342 | */ |
1343 | - protected function approve_registration( $notify = false ) { |
|
1344 | - $this->_reg_status_change_return( EEM_Registration::status_id_approved, $notify ); |
|
1343 | + protected function approve_registration($notify = false) { |
|
1344 | + $this->_reg_status_change_return(EEM_Registration::status_id_approved, $notify); |
|
1345 | 1345 | } |
1346 | 1346 | |
1347 | 1347 | |
@@ -1353,8 +1353,8 @@ discard block |
||
1353 | 1353 | * @param bool $notify whether or not to notify the registrant about their approval. |
1354 | 1354 | * @return void |
1355 | 1355 | */ |
1356 | - protected function decline_registration( $notify = false ) { |
|
1357 | - $this->_reg_status_change_return( EEM_Registration::status_id_declined, $notify ); |
|
1356 | + protected function decline_registration($notify = false) { |
|
1357 | + $this->_reg_status_change_return(EEM_Registration::status_id_declined, $notify); |
|
1358 | 1358 | } |
1359 | 1359 | |
1360 | 1360 | |
@@ -1366,8 +1366,8 @@ discard block |
||
1366 | 1366 | * @param bool $notify whether or not to notify the registrant about their approval. |
1367 | 1367 | * @return void |
1368 | 1368 | */ |
1369 | - protected function cancel_registration( $notify = false ) { |
|
1370 | - $this->_reg_status_change_return( EEM_Registration::status_id_cancelled, $notify ); |
|
1369 | + protected function cancel_registration($notify = false) { |
|
1370 | + $this->_reg_status_change_return(EEM_Registration::status_id_cancelled, $notify); |
|
1371 | 1371 | } |
1372 | 1372 | |
1373 | 1373 | |
@@ -1380,8 +1380,8 @@ discard block |
||
1380 | 1380 | * @param bool $notify whether or not to notify the registrant about their approval. |
1381 | 1381 | * @return void |
1382 | 1382 | */ |
1383 | - protected function not_approve_registration( $notify = false ) { |
|
1384 | - $this->_reg_status_change_return( EEM_Registration::status_id_not_approved, $notify ); |
|
1383 | + protected function not_approve_registration($notify = false) { |
|
1384 | + $this->_reg_status_change_return(EEM_Registration::status_id_not_approved, $notify); |
|
1385 | 1385 | } |
1386 | 1386 | |
1387 | 1387 | |
@@ -1392,8 +1392,8 @@ discard block |
||
1392 | 1392 | * @param bool $notify whether or not to notify the registrant about their approval. |
1393 | 1393 | * @return void |
1394 | 1394 | */ |
1395 | - protected function pending_registration( $notify = false ) { |
|
1396 | - $this->_reg_status_change_return( EEM_Registration::status_id_pending_payment, $notify ); |
|
1395 | + protected function pending_registration($notify = false) { |
|
1396 | + $this->_reg_status_change_return(EEM_Registration::status_id_pending_payment, $notify); |
|
1397 | 1397 | } |
1398 | 1398 | |
1399 | 1399 | |
@@ -1407,75 +1407,75 @@ discard block |
||
1407 | 1407 | public function _reg_details_meta_box() { |
1408 | 1408 | EEH_Autoloader::register_line_item_display_autoloaders(); |
1409 | 1409 | EEH_Autoloader::register_line_item_filter_autoloaders(); |
1410 | - EE_Registry::instance()->load_Helper( 'Line_Item' ); |
|
1410 | + EE_Registry::instance()->load_Helper('Line_Item'); |
|
1411 | 1411 | $transaction = $this->_registration->transaction() ? $this->_registration->transaction() : EE_Transaction::new_instance(); |
1412 | 1412 | $this->_session = $transaction->session_data(); |
1413 | 1413 | |
1414 | 1414 | $filters = new EE_Line_Item_Filter_Collection(); |
1415 | - $filters->add( new EE_Single_Registration_Line_Item_Filter( $this->_registration ) ); |
|
1416 | - $filters->add( new EE_Non_Zero_Line_Item_Filter() ); |
|
1417 | - $line_item_filter_processor = new EE_Line_Item_Filter_Processor( $filters, $transaction->total_line_item() ); |
|
1415 | + $filters->add(new EE_Single_Registration_Line_Item_Filter($this->_registration)); |
|
1416 | + $filters->add(new EE_Non_Zero_Line_Item_Filter()); |
|
1417 | + $line_item_filter_processor = new EE_Line_Item_Filter_Processor($filters, $transaction->total_line_item()); |
|
1418 | 1418 | $filtered_line_item_tree = $line_item_filter_processor->process(); |
1419 | 1419 | |
1420 | 1420 | $this->_template_args['REG_ID'] = $this->_registration->ID(); |
1421 | - $line_item_display = new EE_Line_Item_Display( 'reg_admin_table', 'EE_Admin_Table_Registration_Line_Item_Display_Strategy' ); |
|
1422 | - $this->_template_args['line_item_table'] = $line_item_display->display_line_item( $filtered_line_item_tree, array( 'EE_Registration' => $this->_registration ) ); |
|
1421 | + $line_item_display = new EE_Line_Item_Display('reg_admin_table', 'EE_Admin_Table_Registration_Line_Item_Display_Strategy'); |
|
1422 | + $this->_template_args['line_item_table'] = $line_item_display->display_line_item($filtered_line_item_tree, array('EE_Registration' => $this->_registration)); |
|
1423 | 1423 | |
1424 | 1424 | |
1425 | 1425 | $attendee = $this->_registration->attendee(); |
1426 | 1426 | |
1427 | 1427 | |
1428 | - $this->_template_args['view_transaction_button'] = EE_Registry::instance()->CAP->current_user_can( 'ee_read_transaction', 'espresso_transactions_view_transaction' ) ?EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array('action'=> 'view_transaction', 'TXN_ID' => $transaction->ID() ), TXN_ADMIN_URL ), __(' View Transaction'), 'button secondary-button right', 'dashicons dashicons-cart' ) : ''; |
|
1429 | - $this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_registrations_resend_registration' ) ?EEH_Template::get_button_or_link( EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'resend_registration', '_REG_ID'=>$this->_registration->ID(), 'redirect_to' => 'view_registration' ), REG_ADMIN_URL ), __(' Resend Registration'), 'button secondary-button right', 'dashicons dashicons-email-alt' ) : ''; |
|
1428 | + $this->_template_args['view_transaction_button'] = EE_Registry::instance()->CAP->current_user_can('ee_read_transaction', 'espresso_transactions_view_transaction') ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=> 'view_transaction', 'TXN_ID' => $transaction->ID()), TXN_ADMIN_URL), __(' View Transaction'), 'button secondary-button right', 'dashicons dashicons-cart') : ''; |
|
1429 | + $this->_template_args['resend_registration_button'] = $attendee instanceof EE_Attendee && EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_registrations_resend_registration') ? EEH_Template::get_button_or_link(EE_Admin_Page::add_query_args_and_nonce(array('action'=>'resend_registration', '_REG_ID'=>$this->_registration->ID(), 'redirect_to' => 'view_registration'), REG_ADMIN_URL), __(' Resend Registration'), 'button secondary-button right', 'dashicons dashicons-email-alt') : ''; |
|
1430 | 1430 | |
1431 | 1431 | |
1432 | 1432 | $this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign; |
1433 | - $payment = $transaction->get_first_related( 'Payment' ); |
|
1433 | + $payment = $transaction->get_first_related('Payment'); |
|
1434 | 1434 | $payment = ! $payment instanceof EE_Payment ? EE_Payment::new_instance() : $payment; |
1435 | - $payment_method = $payment->get_first_related( 'Payment_Method' ); |
|
1435 | + $payment_method = $payment->get_first_related('Payment_Method'); |
|
1436 | 1436 | $payment_method = ! $payment_method instanceof EE_Payment_Method ? EE_Payment_Method::new_instance() : $payment_method; |
1437 | - $reg_status_class = 'status-' . $this->_registration->status_ID(); |
|
1437 | + $reg_status_class = 'status-'.$this->_registration->status_ID(); |
|
1438 | 1438 | $reg_details = array( |
1439 | 1439 | 'payment_method' => $payment_method->name(), |
1440 | 1440 | 'response_msg' => $payment->gateway_response(), |
1441 | - 'registration_id' => $this->_registration->get( 'REG_code' ), |
|
1441 | + 'registration_id' => $this->_registration->get('REG_code'), |
|
1442 | 1442 | 'registration_session' => $this->_registration->session_ID(), |
1443 | - 'ip_address' => isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : '', |
|
1444 | - 'user_agent' => isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : '', |
|
1443 | + 'ip_address' => isset($this->_session['ip_address']) ? $this->_session['ip_address'] : '', |
|
1444 | + 'user_agent' => isset($this->_session['user_agent']) ? $this->_session['user_agent'] : '', |
|
1445 | 1445 | ); |
1446 | 1446 | |
1447 | 1447 | |
1448 | - if ( isset( $reg_details['registration_id'] )) { |
|
1448 | + if (isset($reg_details['registration_id'])) { |
|
1449 | 1449 | $this->_template_args['reg_details']['registration_id']['value'] = $reg_details['registration_id']; |
1450 | - $this->_template_args['reg_details']['registration_id']['label'] = __( 'Registration ID', 'event_espresso' ); |
|
1450 | + $this->_template_args['reg_details']['registration_id']['label'] = __('Registration ID', 'event_espresso'); |
|
1451 | 1451 | $this->_template_args['reg_details']['registration_id']['class'] = 'regular-text'; |
1452 | 1452 | } |
1453 | 1453 | |
1454 | - if ( isset( $reg_details['payment_method'] ) ) { |
|
1454 | + if (isset($reg_details['payment_method'])) { |
|
1455 | 1455 | $this->_template_args['reg_details']['payment_method']['value'] = $reg_details['payment_method']; |
1456 | - $this->_template_args['reg_details']['payment_method']['label'] = __( 'Most Recent Payment Method', 'event_espresso' ); |
|
1456 | + $this->_template_args['reg_details']['payment_method']['label'] = __('Most Recent Payment Method', 'event_espresso'); |
|
1457 | 1457 | $this->_template_args['reg_details']['payment_method']['class'] = 'regular-text'; |
1458 | 1458 | $this->_template_args['reg_details']['response_msg']['value'] = $reg_details['response_msg']; |
1459 | - $this->_template_args['reg_details']['response_msg']['label'] = __( 'Payment method response', 'event_espresso' ); |
|
1459 | + $this->_template_args['reg_details']['response_msg']['label'] = __('Payment method response', 'event_espresso'); |
|
1460 | 1460 | $this->_template_args['reg_details']['response_msg']['class'] = 'regular-text'; |
1461 | 1461 | } |
1462 | 1462 | |
1463 | 1463 | $this->_template_args['reg_details']['registration_session']['value'] = $reg_details['registration_session']; |
1464 | - $this->_template_args['reg_details']['registration_session']['label'] = __( 'Registration Session', 'event_espresso' ); |
|
1464 | + $this->_template_args['reg_details']['registration_session']['label'] = __('Registration Session', 'event_espresso'); |
|
1465 | 1465 | $this->_template_args['reg_details']['registration_session']['class'] = 'regular-text'; |
1466 | 1466 | |
1467 | 1467 | $this->_template_args['reg_details']['ip_address']['value'] = $reg_details['ip_address']; |
1468 | - $this->_template_args['reg_details']['ip_address']['label'] = __( 'Registration placed from IP', 'event_espresso' ); |
|
1468 | + $this->_template_args['reg_details']['ip_address']['label'] = __('Registration placed from IP', 'event_espresso'); |
|
1469 | 1469 | $this->_template_args['reg_details']['ip_address']['class'] = 'regular-text'; |
1470 | 1470 | |
1471 | 1471 | $this->_template_args['reg_details']['user_agent']['value'] = $reg_details['user_agent']; |
1472 | - $this->_template_args['reg_details']['user_agent']['label'] = __( 'Registrant User Agent', 'event_espresso' ); |
|
1472 | + $this->_template_args['reg_details']['user_agent']['label'] = __('Registrant User Agent', 'event_espresso'); |
|
1473 | 1473 | $this->_template_args['reg_details']['user_agent']['class'] = 'large-text'; |
1474 | 1474 | |
1475 | - $this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL ); |
|
1475 | + $this->_template_args['event_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'default', 'event_id' => $this->_registration->event_ID()), REG_ADMIN_URL); |
|
1476 | 1476 | |
1477 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_details.template.php'; |
|
1478 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
1477 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_details.template.php'; |
|
1478 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
1479 | 1479 | |
1480 | 1480 | } |
1481 | 1481 | |
@@ -1489,14 +1489,14 @@ discard block |
||
1489 | 1489 | */ |
1490 | 1490 | public function _reg_questions_meta_box() { |
1491 | 1491 | //allow someone to override this method entirely |
1492 | - if( apply_filters( 'FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration ) ) { |
|
1493 | - $form = $this->_get_reg_custom_questions_form( $this->_registration->ID() ); |
|
1494 | - $this->_template_args[ 'att_questions' ] = count( $form->subforms() ) > 0 ? $form->get_html_and_js() : ''; |
|
1492 | + if (apply_filters('FHEE__Registrations_Admin_Page___reg_questions_meta_box__do_default', true, $this, $this->_registration)) { |
|
1493 | + $form = $this->_get_reg_custom_questions_form($this->_registration->ID()); |
|
1494 | + $this->_template_args['att_questions'] = count($form->subforms()) > 0 ? $form->get_html_and_js() : ''; |
|
1495 | 1495 | $this->_template_args['reg_questions_form_action'] = 'edit_registration'; |
1496 | 1496 | $this->_template_args['REG_ID'] = $this->_registration->ID(); |
1497 | 1497 | |
1498 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_reg_questions.template.php'; |
|
1499 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
1498 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_reg_questions.template.php'; |
|
1499 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
1500 | 1500 | } |
1501 | 1501 | } |
1502 | 1502 | |
@@ -1510,12 +1510,12 @@ discard block |
||
1510 | 1510 | * @param string $output |
1511 | 1511 | * @return string |
1512 | 1512 | */ |
1513 | - public function form_before_question_group( $output ) { |
|
1513 | + public function form_before_question_group($output) { |
|
1514 | 1514 | EE_Error::doing_it_wrong( |
1515 | - __CLASS__ . '::' . __FUNCTION__, |
|
1516 | - __( 'This method would have been protected but was used on a filter callback' |
|
1515 | + __CLASS__.'::'.__FUNCTION__, |
|
1516 | + __('This method would have been protected but was used on a filter callback' |
|
1517 | 1517 | . 'so needed to be public. Please discontinue usage as it will be removed soon.', |
1518 | - 'event_espresso' ), |
|
1518 | + 'event_espresso'), |
|
1519 | 1519 | '4.8.32.rc.000' |
1520 | 1520 | ); |
1521 | 1521 | return ' |
@@ -1534,20 +1534,20 @@ discard block |
||
1534 | 1534 | * @param string $output |
1535 | 1535 | * @return string |
1536 | 1536 | */ |
1537 | - public function form_after_question_group( $output ) { |
|
1537 | + public function form_after_question_group($output) { |
|
1538 | 1538 | EE_Error::doing_it_wrong( |
1539 | - __CLASS__ . '::' . __FUNCTION__, |
|
1540 | - __( 'This method would have been protected but was used on a filter callback' |
|
1539 | + __CLASS__.'::'.__FUNCTION__, |
|
1540 | + __('This method would have been protected but was used on a filter callback' |
|
1541 | 1541 | . 'so needed to be public. Please discontinue usage as it will be removed soon.', |
1542 | - 'event_espresso' ), |
|
1542 | + 'event_espresso'), |
|
1543 | 1543 | '4.8.32.rc.000' |
1544 | 1544 | ); |
1545 | 1545 | return ' |
1546 | 1546 | <tr class="hide-if-no-js"> |
1547 | 1547 | <th> </th> |
1548 | 1548 | <td class="reg-admin-edit-attendee-question-td"> |
1549 | - <a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__( 'click to edit question', 'event_espresso' ) . '"> |
|
1550 | - <span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __( 'edit the above question group', 'event_espresso' ) . '</span> |
|
1549 | + <a class="reg-admin-edit-attendee-question-lnk" href="#" title="' . esc_attr__('click to edit question', 'event_espresso').'"> |
|
1550 | + <span class="reg-admin-edit-question-group-spn lt-grey-txt">' . __('edit the above question group', 'event_espresso').'</span> |
|
1551 | 1551 | <div class="dashicons dashicons-edit"></div> |
1552 | 1552 | </a> |
1553 | 1553 | </td> |
@@ -1567,18 +1567,18 @@ discard block |
||
1567 | 1567 | * @param string $label |
1568 | 1568 | * @return string |
1569 | 1569 | */ |
1570 | - public function form_form_field_label_wrap( $label ) { |
|
1570 | + public function form_form_field_label_wrap($label) { |
|
1571 | 1571 | EE_Error::doing_it_wrong( |
1572 | - __CLASS__ . '::' . __FUNCTION__, |
|
1573 | - __( 'This method would have been protected but was used on a filter callback' |
|
1572 | + __CLASS__.'::'.__FUNCTION__, |
|
1573 | + __('This method would have been protected but was used on a filter callback' |
|
1574 | 1574 | . 'so needed to be public. Please discontinue usage as it will be removed soon.', |
1575 | - 'event_espresso' ), |
|
1575 | + 'event_espresso'), |
|
1576 | 1576 | '4.8.32.rc.000' |
1577 | 1577 | ); |
1578 | 1578 | return ' |
1579 | 1579 | <tr> |
1580 | 1580 | <th> |
1581 | - ' . $label . ' |
|
1581 | + ' . $label.' |
|
1582 | 1582 | </th>'; |
1583 | 1583 | } |
1584 | 1584 | |
@@ -1592,17 +1592,17 @@ discard block |
||
1592 | 1592 | * @param string $input |
1593 | 1593 | * @return string |
1594 | 1594 | */ |
1595 | - public function form_form_field_input__wrap( $input ) { |
|
1595 | + public function form_form_field_input__wrap($input) { |
|
1596 | 1596 | EE_Error::doing_it_wrong( |
1597 | - __CLASS__ . '::' . __FUNCTION__, |
|
1598 | - __( 'This method would have been protected but was used on a filter callback' |
|
1597 | + __CLASS__.'::'.__FUNCTION__, |
|
1598 | + __('This method would have been protected but was used on a filter callback' |
|
1599 | 1599 | . 'so needed to be public. Please discontinue usage as it will be removed soon.', |
1600 | - 'event_espresso' ), |
|
1600 | + 'event_espresso'), |
|
1601 | 1601 | '4.8.32.rc.000' |
1602 | 1602 | ); |
1603 | 1603 | return ' |
1604 | 1604 | <td class="reg-admin-attendee-questions-input-td disabled-input"> |
1605 | - ' . $input . ' |
|
1605 | + ' . $input.' |
|
1606 | 1606 | </td> |
1607 | 1607 | </tr>'; |
1608 | 1608 | } |
@@ -1616,14 +1616,14 @@ discard block |
||
1616 | 1616 | * @return void |
1617 | 1617 | */ |
1618 | 1618 | protected function _update_attendee_registration_form() { |
1619 | - do_action( 'AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', $this ); |
|
1620 | - if( $_SERVER['REQUEST_METHOD'] == 'POST'){ |
|
1621 | - $REG_ID = isset( $this->_req_data['_REG_ID'] ) ? absint( $this->_req_data['_REG_ID'] ) : FALSE; |
|
1622 | - $success = $this->_save_reg_custom_questions_form( $REG_ID ); |
|
1623 | - if( $success ) { |
|
1619 | + do_action('AHEE__Registrations_Admin_Page___update_attendee_registration_form__start', $this); |
|
1620 | + if ($_SERVER['REQUEST_METHOD'] == 'POST') { |
|
1621 | + $REG_ID = isset($this->_req_data['_REG_ID']) ? absint($this->_req_data['_REG_ID']) : FALSE; |
|
1622 | + $success = $this->_save_reg_custom_questions_form($REG_ID); |
|
1623 | + if ($success) { |
|
1624 | 1624 | $what = __('Registration Form', 'event_espresso'); |
1625 | - $route = $REG_ID ? array( 'action' => 'view_registration', '_REG_ID' => $REG_ID ) : array( 'action' => 'default' ); |
|
1626 | - $this->_redirect_after_action( $success, $what, __('updated', 'event_espresso'), $route ); |
|
1625 | + $route = $REG_ID ? array('action' => 'view_registration', '_REG_ID' => $REG_ID) : array('action' => 'default'); |
|
1626 | + $this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), $route); |
|
1627 | 1627 | } |
1628 | 1628 | } |
1629 | 1629 | } |
@@ -1634,11 +1634,11 @@ discard block |
||
1634 | 1634 | * @param int $REG_ID |
1635 | 1635 | * @return EE_Registration_Custom_Questions_Form |
1636 | 1636 | */ |
1637 | - protected function _get_reg_custom_questions_form( $REG_ID ) { |
|
1638 | - if( ! $this->_reg_custom_questions_form ) { |
|
1639 | - require_once( REG_ADMIN . 'form_sections' . DS . 'EE_Registration_Custom_Questions_Form.form.php' ); |
|
1640 | - $this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form( EEM_Registration::instance()->get_one_by_ID( $REG_ID ) ); |
|
1641 | - $this->_reg_custom_questions_form->_construct_finalize( null, null ); |
|
1637 | + protected function _get_reg_custom_questions_form($REG_ID) { |
|
1638 | + if ( ! $this->_reg_custom_questions_form) { |
|
1639 | + require_once(REG_ADMIN.'form_sections'.DS.'EE_Registration_Custom_Questions_Form.form.php'); |
|
1640 | + $this->_reg_custom_questions_form = new EE_Registration_Custom_Questions_Form(EEM_Registration::instance()->get_one_by_ID($REG_ID)); |
|
1641 | + $this->_reg_custom_questions_form->_construct_finalize(null, null); |
|
1642 | 1642 | } |
1643 | 1643 | return $this->_reg_custom_questions_form; |
1644 | 1644 | } |
@@ -1651,17 +1651,17 @@ discard block |
||
1651 | 1651 | * @param bool $REG_ID |
1652 | 1652 | * @return bool |
1653 | 1653 | */ |
1654 | - private function _save_reg_custom_questions_form( $REG_ID = FALSE ) { |
|
1654 | + private function _save_reg_custom_questions_form($REG_ID = FALSE) { |
|
1655 | 1655 | |
1656 | 1656 | if ( ! $REG_ID) { |
1657 | - EE_Error::add_error( __('An error occurred. No registration ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
1657 | + EE_Error::add_error(__('An error occurred. No registration ID was received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1658 | 1658 | } |
1659 | - $form = $this->_get_reg_custom_questions_form( $REG_ID ); |
|
1660 | - $form->receive_form_submission( $this->_req_data ); |
|
1659 | + $form = $this->_get_reg_custom_questions_form($REG_ID); |
|
1660 | + $form->receive_form_submission($this->_req_data); |
|
1661 | 1661 | $success = false; |
1662 | - if( $form->is_valid() ) { |
|
1663 | - foreach( $form->subforms() as $question_group_id => $question_group_form ) { |
|
1664 | - foreach( $question_group_form->inputs() as $question_id => $input ) { |
|
1662 | + if ($form->is_valid()) { |
|
1663 | + foreach ($form->subforms() as $question_group_id => $question_group_form) { |
|
1664 | + foreach ($question_group_form->inputs() as $question_id => $input) { |
|
1665 | 1665 | $where_conditions = array( |
1666 | 1666 | 'QST_ID' => $question_id, |
1667 | 1667 | 'REG_ID' => $REG_ID |
@@ -1669,19 +1669,19 @@ discard block |
||
1669 | 1669 | $possibly_new_values = array( |
1670 | 1670 | 'ANS_value' => $input->normalized_value() |
1671 | 1671 | ); |
1672 | - $answer = EEM_Answer::instance()->get_one( array( $where_conditions ) ); |
|
1673 | - if( $answer instanceof EE_Answer ) { |
|
1674 | - $success = $answer->save( $possibly_new_values ); |
|
1672 | + $answer = EEM_Answer::instance()->get_one(array($where_conditions)); |
|
1673 | + if ($answer instanceof EE_Answer) { |
|
1674 | + $success = $answer->save($possibly_new_values); |
|
1675 | 1675 | } else { |
1676 | 1676 | //insert it then |
1677 | - $cols_n_vals = array_merge( $where_conditions, $possibly_new_values ); |
|
1678 | - $answer = EE_Answer::new_instance( $cols_n_vals ); |
|
1677 | + $cols_n_vals = array_merge($where_conditions, $possibly_new_values); |
|
1678 | + $answer = EE_Answer::new_instance($cols_n_vals); |
|
1679 | 1679 | $success = $answer->save(); |
1680 | 1680 | } |
1681 | 1681 | } |
1682 | 1682 | } |
1683 | 1683 | } else { |
1684 | - EE_Error::add_error( $form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__ ); |
|
1684 | + EE_Error::add_error($form->get_validation_error_string(), __FILE__, __FUNCTION__, __LINE__); |
|
1685 | 1685 | } |
1686 | 1686 | return $success; |
1687 | 1687 | } |
@@ -1699,30 +1699,30 @@ discard block |
||
1699 | 1699 | $registrations = $REG->get_all(array( |
1700 | 1700 | array( |
1701 | 1701 | 'TXN_ID'=>$this->_registration->transaction_ID(), |
1702 | - 'REG_ID'=>array('!=',$this->_registration->ID()) |
|
1702 | + 'REG_ID'=>array('!=', $this->_registration->ID()) |
|
1703 | 1703 | ), |
1704 | 1704 | 'force_join'=>array('Attendee'))); |
1705 | 1705 | |
1706 | 1706 | $this->_template_args['attendees'] = array(); |
1707 | 1707 | $this->_template_args['attendee_notice'] = ''; |
1708 | 1708 | EE_Registry::instance()->load_helper('Array'); |
1709 | - if ( empty( $registrations) || ( is_array($registrations) && ! EEH_Array::get_one_item_from_array($registrations) ) ) { |
|
1710 | - EE_Error::add_error( __('There are no records attached to this registration. Something may have gone wrong with the registration', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
1709 | + if (empty($registrations) || (is_array($registrations) && ! EEH_Array::get_one_item_from_array($registrations))) { |
|
1710 | + EE_Error::add_error(__('There are no records attached to this registration. Something may have gone wrong with the registration', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1711 | 1711 | $this->_template_args['attendee_notice'] = EE_Error::get_notices(); |
1712 | 1712 | } else { |
1713 | 1713 | |
1714 | 1714 | $att_nmbr = 1; |
1715 | - foreach ( $registrations as $registration ) { |
|
1715 | + foreach ($registrations as $registration) { |
|
1716 | 1716 | /* @var $registration EE_Registration */ |
1717 | 1717 | $attendee = $registration->attendee() ? $registration->attendee() : EEM_Attendee::instance()->create_default_object(); |
1718 | - $this->_template_args['attendees'][ $att_nmbr ]['fname'] = $attendee->fname();//( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : ''; |
|
1719 | - $this->_template_args['attendees'][ $att_nmbr ]['lname'] = $attendee->lname();//( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : ''; |
|
1720 | - $this->_template_args['attendees'][ $att_nmbr ]['email'] = $attendee->email();//( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : ''; |
|
1721 | - $this->_template_args['attendees'][ $att_nmbr ]['final_price'] = $registration->final_price();//( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : ''; |
|
1718 | + $this->_template_args['attendees'][$att_nmbr]['fname'] = $attendee->fname(); //( isset( $registration->ATT_fname ) & ! empty( $registration->ATT_fname ) ) ? $registration->ATT_fname : ''; |
|
1719 | + $this->_template_args['attendees'][$att_nmbr]['lname'] = $attendee->lname(); //( isset( $registration->ATT_lname ) & ! empty( $registration->ATT_lname ) ) ? $registration->ATT_lname : ''; |
|
1720 | + $this->_template_args['attendees'][$att_nmbr]['email'] = $attendee->email(); //( isset( $registration->ATT_email ) & ! empty( $registration->ATT_email ) ) ? $registration->ATT_email : ''; |
|
1721 | + $this->_template_args['attendees'][$att_nmbr]['final_price'] = $registration->final_price(); //( isset( $registration->REG_final_price ) & ! empty( $registration->REG_final_price ) ) ? $registration->REG_final_price : ''; |
|
1722 | 1722 | |
1723 | - $this->_template_args['attendees'][ $att_nmbr ]['address'] = implode( ', ', $attendee->full_address_as_array() ); |
|
1723 | + $this->_template_args['attendees'][$att_nmbr]['address'] = implode(', ', $attendee->full_address_as_array()); |
|
1724 | 1724 | |
1725 | - $this->_template_args['attendees'][ $att_nmbr ]['att_link'] = self::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$attendee->ID() ), REG_ADMIN_URL ); |
|
1725 | + $this->_template_args['attendees'][$att_nmbr]['att_link'] = self::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL); |
|
1726 | 1726 | |
1727 | 1727 | $att_nmbr++; |
1728 | 1728 | } |
@@ -1734,8 +1734,8 @@ discard block |
||
1734 | 1734 | |
1735 | 1735 | // $this->_template_args['registration_form_url'] = add_query_arg( array( 'action' => 'edit_registration', 'process' => 'attendees' ), REG_ADMIN_URL ); |
1736 | 1736 | } |
1737 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_main_meta_box_attendees.template.php'; |
|
1738 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
1737 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_main_meta_box_attendees.template.php'; |
|
1738 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
1739 | 1739 | |
1740 | 1740 | } |
1741 | 1741 | |
@@ -1756,11 +1756,11 @@ discard block |
||
1756 | 1756 | $attendee = $att_check instanceof EE_Attendee ? $att_check : EEM_Attendee::instance()->create_default_object(); |
1757 | 1757 | |
1758 | 1758 | //now let's determine if this is not the primary registration. If it isn't then we set the primary_registration object for reference BUT ONLY if the Attendee object loaded is not the same as the primary registration object (that way we know if we need to show cereate button or not) |
1759 | - if ( ! $this->_registration->is_primary_registrant() ) { |
|
1759 | + if ( ! $this->_registration->is_primary_registrant()) { |
|
1760 | 1760 | $primary_registration = $this->_registration->get_primary_registration(); |
1761 | 1761 | $primary_attendee = $primary_registration->attendee(); |
1762 | 1762 | |
1763 | - if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID() ) { |
|
1763 | + if ( ! $primary_attendee instanceof EE_Attendee || $attendee->ID() !== $primary_attendee->ID()) { |
|
1764 | 1764 | //in here? This means the displayed registration is not the primary registrant but ALREADY HAS its own custom attendee object so let's not worry about the primary reg. |
1765 | 1765 | $primary_registration = NULL; |
1766 | 1766 | } |
@@ -1769,28 +1769,28 @@ discard block |
||
1769 | 1769 | } |
1770 | 1770 | |
1771 | 1771 | $this->_template_args['ATT_ID'] = $attendee->ID(); |
1772 | - $this->_template_args['fname'] = $attendee->fname();//$this->_registration->ATT_fname; |
|
1773 | - $this->_template_args['lname'] = $attendee->lname();//$this->_registration->ATT_lname; |
|
1774 | - $this->_template_args['email'] = $attendee->email();//$this->_registration->ATT_email; |
|
1772 | + $this->_template_args['fname'] = $attendee->fname(); //$this->_registration->ATT_fname; |
|
1773 | + $this->_template_args['lname'] = $attendee->lname(); //$this->_registration->ATT_lname; |
|
1774 | + $this->_template_args['email'] = $attendee->email(); //$this->_registration->ATT_email; |
|
1775 | 1775 | $this->_template_args['phone'] = $attendee->phone(); |
1776 | 1776 | |
1777 | - EE_Registry::instance()->load_helper( 'Formatter' ); |
|
1778 | - $this->_template_args[ 'formatted_address' ] = EEH_Address::format( $attendee ); |
|
1777 | + EE_Registry::instance()->load_helper('Formatter'); |
|
1778 | + $this->_template_args['formatted_address'] = EEH_Address::format($attendee); |
|
1779 | 1779 | |
1780 | 1780 | |
1781 | 1781 | //edit link |
1782 | - $this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_attendee', 'post'=>$attendee->ID() ), REG_ADMIN_URL ); |
|
1783 | - $this->_template_args['att_edit_label'] = __('View/Edit Contact' ); |
|
1782 | + $this->_template_args['att_edit_link'] = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_attendee', 'post'=>$attendee->ID()), REG_ADMIN_URL); |
|
1783 | + $this->_template_args['att_edit_label'] = __('View/Edit Contact'); |
|
1784 | 1784 | |
1785 | 1785 | //create link |
1786 | - $this->_template_args['create_link'] = $primary_registration instanceof EE_Registration ? EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'duplicate_attendee', '_REG_ID' => $this->_registration->ID() ), REG_ADMIN_URL ): ''; |
|
1786 | + $this->_template_args['create_link'] = $primary_registration instanceof EE_Registration ? EE_Admin_Page::add_query_args_and_nonce(array('action' => 'duplicate_attendee', '_REG_ID' => $this->_registration->ID()), REG_ADMIN_URL) : ''; |
|
1787 | 1787 | $this->_template_args['create_label'] = __('Create Contact', 'event_espresso'); |
1788 | 1788 | |
1789 | 1789 | $this->_template_args['att_check'] = $att_check; |
1790 | 1790 | |
1791 | 1791 | |
1792 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_details_side_meta_box_registrant.template.php'; |
|
1793 | - echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
1792 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_details_side_meta_box_registrant.template.php'; |
|
1793 | + echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
1794 | 1794 | } |
1795 | 1795 | |
1796 | 1796 | |
@@ -1803,7 +1803,7 @@ discard block |
||
1803 | 1803 | * @access protected |
1804 | 1804 | * @return void |
1805 | 1805 | */ |
1806 | - protected function _trash_or_restore_registrations( $trash = TRUE ) { |
|
1806 | + protected function _trash_or_restore_registrations($trash = TRUE) { |
|
1807 | 1807 | $REGM = EEM_Registration::instance(); |
1808 | 1808 | |
1809 | 1809 | $success = 1; |
@@ -1813,26 +1813,26 @@ discard block |
||
1813 | 1813 | $dtts = array(); |
1814 | 1814 | |
1815 | 1815 | //if empty _REG_ID then get out because there's nothing to do |
1816 | - if ( empty( $this->_req_data['_REG_ID'] ) ) { |
|
1816 | + if (empty($this->_req_data['_REG_ID'])) { |
|
1817 | 1817 | $msg = $trash ? __('In order to trash registrations you must select which ones you wish to trash by clicking the checkboxes.', 'event_espresso') : __('In order to restore registrations you must select which ones you wish to restore by clicking the checkboxes.', 'event_espresso'); |
1818 | - EE_Error::add_error( $msg, __FILE__, __LINE__, __FUNCTION__ ); |
|
1819 | - $this->_redirect_after_action(FALSE, '', '', array(), TRUE ); |
|
1818 | + EE_Error::add_error($msg, __FILE__, __LINE__, __FUNCTION__); |
|
1819 | + $this->_redirect_after_action(FALSE, '', '', array(), TRUE); |
|
1820 | 1820 | } |
1821 | 1821 | |
1822 | 1822 | //Checkboxes |
1823 | - if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) { |
|
1823 | + if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) { |
|
1824 | 1824 | // if array has more than one element than success message should be plural |
1825 | - $success = count( $this->_req_data['_REG_ID'] ) > 1 ? 2 : 1; |
|
1825 | + $success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1; |
|
1826 | 1826 | // cycle thru checkboxes |
1827 | - while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) { |
|
1827 | + while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) { |
|
1828 | 1828 | |
1829 | 1829 | $REG = $REGM->get_one_by_ID($REG_ID); |
1830 | 1830 | $payment_count = $REG->get_first_related('Transaction')->count_related('Payment'); |
1831 | - if ( $payment_count > 0 ) { |
|
1832 | - $name = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name() : __( 'Unknown Attendee', 'event_espresso' ); |
|
1831 | + if ($payment_count > 0) { |
|
1832 | + $name = $REG->attendee() instanceof EE_Attendee ? $REG->attendee()->full_name() : __('Unknown Attendee', 'event_espresso'); |
|
1833 | 1833 | $error = 1; |
1834 | 1834 | $success = 0; |
1835 | - EE_Error::add_error( sprintf( __('The registration for %s could not be trashed because it has payments attached to the related transaction. If you wish to trash this registration you must first delete the payments on the related transaction.', 'event_espresso'), $name ), __FILE__, __FUNCTION__, __LINE__ ); |
|
1835 | + EE_Error::add_error(sprintf(__('The registration for %s could not be trashed because it has payments attached to the related transaction. If you wish to trash this registration you must first delete the payments on the related transaction.', 'event_espresso'), $name), __FILE__, __FUNCTION__, __LINE__); |
|
1836 | 1836 | continue; //can't trash this registration because it has payments. |
1837 | 1837 | } |
1838 | 1838 | $ticket = $REG->get_first_related('Ticket'); |
@@ -1841,7 +1841,7 @@ discard block |
||
1841 | 1841 | $dtts = array_merge($dtts, $dtt); |
1842 | 1842 | |
1843 | 1843 | $updated = $trash ? $REG->delete() : $REG->restore(); |
1844 | - if ( !$updated ) { |
|
1844 | + if ( ! $updated) { |
|
1845 | 1845 | $success = 0; |
1846 | 1846 | } else { |
1847 | 1847 | $success = 2; |
@@ -1856,7 +1856,7 @@ discard block |
||
1856 | 1856 | $tickets[$ticket->ID()] = $ticket; |
1857 | 1857 | $dtts = $ticket->get_many_related('Datetime'); |
1858 | 1858 | $updated = $trash ? $REG->delete() : $REG->restore(); |
1859 | - if ( ! $updated ) { |
|
1859 | + if ( ! $updated) { |
|
1860 | 1860 | $success = 0; |
1861 | 1861 | } |
1862 | 1862 | |
@@ -1866,10 +1866,10 @@ discard block |
||
1866 | 1866 | EEM_Ticket::instance()->update_tickets_sold($tickets); |
1867 | 1867 | EEM_Datetime::instance()->update_sold($dtts); |
1868 | 1868 | |
1869 | - $what = $success > 1 ? __( 'Registrations', 'event_espresso' ) : __( 'Registration', 'event_espresso' ); |
|
1870 | - $action_desc = $trash ? __( 'moved to the trash', 'event_espresso' ) : __( 'restored', 'event_espresso' ); |
|
1869 | + $what = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso'); |
|
1870 | + $action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso'); |
|
1871 | 1871 | $overwrite_msgs = $error ? TRUE : FALSE; |
1872 | - $this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'default' ), $overwrite_msgs ); |
|
1872 | + $this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), $overwrite_msgs); |
|
1873 | 1873 | } |
1874 | 1874 | |
1875 | 1875 | |
@@ -1893,16 +1893,16 @@ discard block |
||
1893 | 1893 | $success = 1; |
1894 | 1894 | |
1895 | 1895 | //Checkboxes |
1896 | - if (!empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) { |
|
1896 | + if ( ! empty($this->_req_data['_REG_ID']) && is_array($this->_req_data['_REG_ID'])) { |
|
1897 | 1897 | // if array has more than one element than success message should be plural |
1898 | - $success = count( $this->_req_data['_REG_ID'] ) > 1 ? 2 : 1; |
|
1898 | + $success = count($this->_req_data['_REG_ID']) > 1 ? 2 : 1; |
|
1899 | 1899 | // cycle thru checkboxes |
1900 | - while (list( $ind, $REG_ID ) = each($this->_req_data['_REG_ID'])) { |
|
1900 | + while (list($ind, $REG_ID) = each($this->_req_data['_REG_ID'])) { |
|
1901 | 1901 | $REG = $REG_MDL->get_one_by_ID($REG_ID); |
1902 | - if ( ! $REG instanceof EE_Registration ) |
|
1902 | + if ( ! $REG instanceof EE_Registration) |
|
1903 | 1903 | continue; |
1904 | 1904 | $deleted = $this->_delete_registration($REG); |
1905 | - if ( !$deleted ) { |
|
1905 | + if ( ! $deleted) { |
|
1906 | 1906 | $success = 0; |
1907 | 1907 | } |
1908 | 1908 | } |
@@ -1912,15 +1912,15 @@ discard block |
||
1912 | 1912 | $REG_ID = $this->_req_data['_REG_ID']; |
1913 | 1913 | $REG = $REG_MDL->get_one_by_ID($REG_ID); |
1914 | 1914 | $deleted = $this->_delete_registration($REG); |
1915 | - if ( ! $deleted ) { |
|
1915 | + if ( ! $deleted) { |
|
1916 | 1916 | $success = 0; |
1917 | 1917 | } |
1918 | 1918 | |
1919 | 1919 | } |
1920 | 1920 | |
1921 | - $what = $success > 1 ? __( 'Registrations', 'event_espresso' ) : __( 'Registration', 'event_espresso' ); |
|
1922 | - $action_desc = __( 'permanently deleted.', 'event_espresso' ); |
|
1923 | - $this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'default' ), TRUE ); |
|
1921 | + $what = $success > 1 ? __('Registrations', 'event_espresso') : __('Registration', 'event_espresso'); |
|
1922 | + $action_desc = __('permanently deleted.', 'event_espresso'); |
|
1923 | + $this->_redirect_after_action($success, $what, $action_desc, array('action' => 'default'), TRUE); |
|
1924 | 1924 | } |
1925 | 1925 | |
1926 | 1926 | |
@@ -1932,31 +1932,31 @@ discard block |
||
1932 | 1932 | * @param EE_Registration $REG registration to be deleted permenantly |
1933 | 1933 | * @return boolean true = successful deletion, false = fail. |
1934 | 1934 | */ |
1935 | - protected function _delete_registration( EE_Registration $REG ) { |
|
1935 | + protected function _delete_registration(EE_Registration $REG) { |
|
1936 | 1936 | //first we start with the transaction... ultimately, we WILL not delete permanently if there are any related registrations on the transaction that are NOT trashed. |
1937 | 1937 | $TXN = $REG->get_first_related('Transaction'); |
1938 | 1938 | $REGS = $TXN->get_many_related('Registration'); |
1939 | 1939 | |
1940 | 1940 | $all_trashed = TRUE; |
1941 | - foreach ( $REGS as $registration ) { |
|
1942 | - if ( ! $registration->get('REG_deleted') ) |
|
1941 | + foreach ($REGS as $registration) { |
|
1942 | + if ( ! $registration->get('REG_deleted')) |
|
1943 | 1943 | $all_trashed = FALSE; |
1944 | 1944 | } |
1945 | 1945 | |
1946 | - if ( ! $all_trashed ) { |
|
1947 | - EE_Error::add_error( __('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well. These registrations will be permanently deleted in the same action.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
1946 | + if ( ! $all_trashed) { |
|
1947 | + EE_Error::add_error(__('Unable to permanently delete this registration. Before this registration can be permanently deleted, all registrations made in the same transaction must be trashed as well. These registrations will be permanently deleted in the same action.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
1948 | 1948 | return false; |
1949 | 1949 | } |
1950 | 1950 | |
1951 | 1951 | //k made it here so that means we can delete all the related transactions and their answers (but let's do them separately from THIS one). |
1952 | - foreach ( $REGS as $registration ) { |
|
1952 | + foreach ($REGS as $registration) { |
|
1953 | 1953 | |
1954 | 1954 | //delete related answers |
1955 | 1955 | $registration->delete_related_permanently('Answer'); |
1956 | 1956 | |
1957 | 1957 | //remove relationship to EE_Attendee (but we ALWAYS leave the contact record intact) |
1958 | 1958 | $attendee = $registration->get_first_related('Attendee'); |
1959 | - if ( $attendee instanceof EE_Attendee ) { |
|
1959 | + if ($attendee instanceof EE_Attendee) { |
|
1960 | 1960 | $registration->_remove_relation_to($attendee, 'Attendee'); |
1961 | 1961 | } |
1962 | 1962 | |
@@ -1966,7 +1966,7 @@ discard block |
||
1966 | 1966 | //now delete permanently the checkins related to this registration. |
1967 | 1967 | $registration->delete_related_permanently('Checkin'); |
1968 | 1968 | |
1969 | - if ( $registration->ID() === $REG->ID() ) |
|
1969 | + if ($registration->ID() === $REG->ID()) |
|
1970 | 1970 | continue; //we don't want to delete permanently the existing registration just yet. |
1971 | 1971 | |
1972 | 1972 | //remove relation to transaction for these registrations if NOT the existing registrations |
@@ -1999,34 +1999,34 @@ discard block |
||
1999 | 1999 | * @return void |
2000 | 2000 | */ |
2001 | 2001 | public function new_registration() { |
2002 | - if ( ! $this->_set_reg_event() ) { |
|
2003 | - throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request', 'event_espresso') ); |
|
2002 | + if ( ! $this->_set_reg_event()) { |
|
2003 | + throw new EE_Error(__('Unable to continue with registering because there is no Event ID in the request', 'event_espresso')); |
|
2004 | 2004 | } |
2005 | - EE_Registry::instance()->REQ->set_espresso_page( TRUE ); |
|
2005 | + EE_Registry::instance()->REQ->set_espresso_page(TRUE); |
|
2006 | 2006 | |
2007 | 2007 | // gotta start with a clean slate if we're not coming here via ajax |
2008 | - if ( ! defined('DOING_AJAX' ) && ( ! isset( $this->_req_data['processing_registration'] ) || isset( $this->_req_data['step_error'] ))) { |
|
2009 | - EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ ); |
|
2008 | + if ( ! defined('DOING_AJAX') && ( ! isset($this->_req_data['processing_registration']) || isset($this->_req_data['step_error']))) { |
|
2009 | + EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__); |
|
2010 | 2010 | } |
2011 | 2011 | |
2012 | - $this->_template_args['event_name'] = '' ; |
|
2012 | + $this->_template_args['event_name'] = ''; |
|
2013 | 2013 | // event name |
2014 | - if ( $this->_reg_event ) { |
|
2014 | + if ($this->_reg_event) { |
|
2015 | 2015 | $this->_template_args['event_name'] = $this->_reg_event->name(); |
2016 | - $edit_event_url = self::add_query_args_and_nonce( array( 'action'=>'edit', 'post'=>$this->_reg_event->ID() ), EVENTS_ADMIN_URL ); |
|
2017 | - $edit_event_lnk = '<a href="'.$edit_event_url.'" title="' . esc_attr__( 'Edit ', 'event_espresso' ) . $this->_reg_event->name() . '">' . __( 'Edit Event', 'event_espresso' ) . '</a>'; |
|
2018 | - $this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">' . $edit_event_lnk . '</span>' ; |
|
2016 | + $edit_event_url = self::add_query_args_and_nonce(array('action'=>'edit', 'post'=>$this->_reg_event->ID()), EVENTS_ADMIN_URL); |
|
2017 | + $edit_event_lnk = '<a href="'.$edit_event_url.'" title="'.esc_attr__('Edit ', 'event_espresso').$this->_reg_event->name().'">'.__('Edit Event', 'event_espresso').'</a>'; |
|
2018 | + $this->_template_args['event_name'] .= ' <span class="admin-page-header-edit-lnk not-bold">'.$edit_event_lnk.'</span>'; |
|
2019 | 2019 | } |
2020 | 2020 | |
2021 | 2021 | $this->_template_args['step_content'] = $this->_get_registration_step_content(); |
2022 | 2022 | |
2023 | - if ( defined('DOING_AJAX' ) ) |
|
2023 | + if (defined('DOING_AJAX')) |
|
2024 | 2024 | $this->_return_json(); |
2025 | 2025 | |
2026 | 2026 | |
2027 | 2027 | // grab header |
2028 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee.template.php'; |
|
2029 | - $this->_template_args['admin_page_content'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE ); |
|
2028 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_register_new_attendee.template.php'; |
|
2029 | + $this->_template_args['admin_page_content'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE); |
|
2030 | 2030 | |
2031 | 2031 | //$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE ); |
2032 | 2032 | // the details template wrapper |
@@ -2044,7 +2044,7 @@ discard block |
||
2044 | 2044 | */ |
2045 | 2045 | protected function _get_registration_step_content() { |
2046 | 2046 | |
2047 | - $template_path = REG_TEMPLATE_PATH . 'reg_admin_register_new_attendee_step_content.template.php'; |
|
2047 | + $template_path = REG_TEMPLATE_PATH.'reg_admin_register_new_attendee_step_content.template.php'; |
|
2048 | 2048 | $template_args = array( |
2049 | 2049 | 'title' => '', |
2050 | 2050 | 'content' => '', |
@@ -2065,11 +2065,11 @@ discard block |
||
2065 | 2065 | |
2066 | 2066 | //if the cart is empty then we know we're at step one so we'll display ticket selector |
2067 | 2067 | $cart = EE_Registry::instance()->SSN->get_session_data('cart'); |
2068 | - $step = empty( $cart ) ? 'ticket' : 'questions'; |
|
2069 | - switch ( $step ) { |
|
2068 | + $step = empty($cart) ? 'ticket' : 'questions'; |
|
2069 | + switch ($step) { |
|
2070 | 2070 | case 'ticket' : |
2071 | 2071 | $template_args['title'] = __('Step One: Select the Ticket for this registration', 'event_espresso'); |
2072 | - $template_args['content'] = EED_Ticket_Selector::instance()->display_ticket_selector( $this->_reg_event ); |
|
2072 | + $template_args['content'] = EED_Ticket_Selector::instance()->display_ticket_selector($this->_reg_event); |
|
2073 | 2073 | $template_args['step_button_text'] = __('Add Tickets and Continue to Registrant Details', 'event_espresso'); |
2074 | 2074 | $template_args['show_notification_toggle'] = FALSE; |
2075 | 2075 | break; |
@@ -2082,9 +2082,9 @@ discard block |
||
2082 | 2082 | break; |
2083 | 2083 | } |
2084 | 2084 | |
2085 | - $this->_set_add_edit_form_tags( 'process_reg_step', $hidden_fields ); //we come back to the process_registration_step route. |
|
2085 | + $this->_set_add_edit_form_tags('process_reg_step', $hidden_fields); //we come back to the process_registration_step route. |
|
2086 | 2086 | |
2087 | - return EEH_Template::display_template( $template_path, $template_args, TRUE ); |
|
2087 | + return EEH_Template::display_template($template_path, $template_args, TRUE); |
|
2088 | 2088 | } |
2089 | 2089 | |
2090 | 2090 | |
@@ -2098,11 +2098,11 @@ discard block |
||
2098 | 2098 | * @return boolean |
2099 | 2099 | */ |
2100 | 2100 | private function _set_reg_event() { |
2101 | - if ( is_object( $this->_reg_event )) { |
|
2101 | + if (is_object($this->_reg_event)) { |
|
2102 | 2102 | return TRUE; |
2103 | 2103 | } |
2104 | - $EVT_ID = ( ! empty( $this->_req_data['event_id'] )) ? absint( $this->_req_data['event_id'] ) : FALSE; |
|
2105 | - if ( ! $EVT_ID ) { |
|
2104 | + $EVT_ID = ( ! empty($this->_req_data['event_id'])) ? absint($this->_req_data['event_id']) : FALSE; |
|
2105 | + if ( ! $EVT_ID) { |
|
2106 | 2106 | return FALSE; |
2107 | 2107 | } |
2108 | 2108 | |
@@ -2123,62 +2123,62 @@ discard block |
||
2123 | 2123 | public function process_reg_step() { |
2124 | 2124 | |
2125 | 2125 | $this->_set_reg_event(); |
2126 | - EE_Registry::instance()->REQ->set_espresso_page( TRUE ); |
|
2126 | + EE_Registry::instance()->REQ->set_espresso_page(TRUE); |
|
2127 | 2127 | |
2128 | 2128 | //what step are we on? |
2129 | - $cart = EE_Registry::instance()->SSN->get_session_data( 'cart' ); |
|
2130 | - $step = empty( $cart ) ? 'ticket' : 'questions'; |
|
2129 | + $cart = EE_Registry::instance()->SSN->get_session_data('cart'); |
|
2130 | + $step = empty($cart) ? 'ticket' : 'questions'; |
|
2131 | 2131 | |
2132 | 2132 | //if doing ajax then we need to verify the nonce |
2133 | - if ( 'DOING_AJAX' ) { |
|
2134 | - $nonce = isset( $this->_req_data[$this->_req_nonce] ) ? sanitize_text_field( $this->_req_data[$this->_req_nonce] ) : ''; |
|
2135 | - $this->_verify_nonce( $nonce, $this->_req_nonce ); |
|
2133 | + if ('DOING_AJAX') { |
|
2134 | + $nonce = isset($this->_req_data[$this->_req_nonce]) ? sanitize_text_field($this->_req_data[$this->_req_nonce]) : ''; |
|
2135 | + $this->_verify_nonce($nonce, $this->_req_nonce); |
|
2136 | 2136 | } |
2137 | 2137 | |
2138 | - switch ( $step ) { |
|
2138 | + switch ($step) { |
|
2139 | 2139 | case 'ticket' : |
2140 | 2140 | //process ticket selection |
2141 | 2141 | $success = EED_Ticket_Selector::instance()->process_ticket_selections(); |
2142 | - if ( $success ) { |
|
2143 | - EE_Error::add_success( __('Tickets Selected. Now complete the registration.'), 'event_espresso'); |
|
2142 | + if ($success) { |
|
2143 | + EE_Error::add_success(__('Tickets Selected. Now complete the registration.'), 'event_espresso'); |
|
2144 | 2144 | } else { |
2145 | 2145 | $query_args['step_error'] = $this->_req_data['step_error'] = TRUE; |
2146 | 2146 | } |
2147 | - if ( defined('DOING_AJAX') ) { |
|
2147 | + if (defined('DOING_AJAX')) { |
|
2148 | 2148 | $this->new_registration(); //display next step |
2149 | 2149 | } else { |
2150 | 2150 | $query_args['action'] = 'new_registration'; |
2151 | 2151 | $query_args['processing_registration'] = true; |
2152 | 2152 | $query_args['event_id'] = $this->_reg_event->ID(); |
2153 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
2153 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
2154 | 2154 | } |
2155 | 2155 | break; |
2156 | 2156 | case 'questions' : |
2157 | - if( ! isset( $this->_req_data[ 'txn_reg_status_change' ], $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ] ) ) { |
|
2158 | - add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15 ); |
|
2157 | + if ( ! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['send_notifications'])) { |
|
2158 | + add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_false', 15); |
|
2159 | 2159 | } |
2160 | 2160 | //process registration |
2161 | 2161 | $transaction = EED_Single_Page_Checkout::instance()->process_registration_from_admin(); |
2162 | - if ( ! $transaction instanceof EE_Transaction ) { |
|
2162 | + if ( ! $transaction instanceof EE_Transaction) { |
|
2163 | 2163 | $query_args = array( |
2164 | 2164 | 'action' => 'new_registration', |
2165 | 2165 | 'processing_registration' => true, |
2166 | 2166 | 'event_id' => $this->_reg_event->ID() |
2167 | 2167 | ); |
2168 | 2168 | |
2169 | - if ( defined('DOING_AJAX' )) { |
|
2169 | + if (defined('DOING_AJAX')) { |
|
2170 | 2170 | //display registration form again because there are errors (maybe validation?) |
2171 | 2171 | $this->new_registration(); |
2172 | 2172 | return; |
2173 | 2173 | } else { |
2174 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
2174 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
2175 | 2175 | return; |
2176 | 2176 | } |
2177 | 2177 | } |
2178 | 2178 | /** @type EE_Transaction_Payments $transaction_payments */ |
2179 | - $transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' ); |
|
2179 | + $transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments'); |
|
2180 | 2180 | // maybe update status, and make sure to save transaction if not done already |
2181 | - if ( ! $transaction_payments->update_transaction_status_based_on_total_paid( $transaction )) { |
|
2181 | + if ( ! $transaction_payments->update_transaction_status_based_on_total_paid($transaction)) { |
|
2182 | 2182 | $transaction->save(); |
2183 | 2183 | } |
2184 | 2184 | $query_args = array( |
@@ -2186,8 +2186,8 @@ discard block |
||
2186 | 2186 | 'TXN_ID' => $transaction->ID(), |
2187 | 2187 | 'page' => 'espresso_transactions' |
2188 | 2188 | ); |
2189 | - EE_Error::add_success( __('Registration Created. Please review the transaction and add any payments as necessary', 'event_espresso') ); |
|
2190 | - $this->_redirect_after_action( FALSE, '', '', $query_args, TRUE ); |
|
2189 | + EE_Error::add_success(__('Registration Created. Please review the transaction and add any payments as necessary', 'event_espresso')); |
|
2190 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
2191 | 2191 | break; |
2192 | 2192 | } |
2193 | 2193 | |
@@ -2207,7 +2207,7 @@ discard block |
||
2207 | 2207 | * @return void |
2208 | 2208 | */ |
2209 | 2209 | protected function _attendee_contact_list_table() { |
2210 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
2210 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
2211 | 2211 | $this->_search_btn_label = __('Contacts', 'event_espresso'); |
2212 | 2212 | $this->display_admin_list_table_page_with_no_sidebar(); |
2213 | 2213 | } |
@@ -2222,10 +2222,10 @@ discard block |
||
2222 | 2222 | * @access public |
2223 | 2223 | * @return array |
2224 | 2224 | */ |
2225 | - public function get_attendees( $per_page, $count = FALSE, $trash = FALSE ) { |
|
2225 | + public function get_attendees($per_page, $count = FALSE, $trash = FALSE) { |
|
2226 | 2226 | |
2227 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
2228 | - require_once( REG_ADMIN . 'EE_Attendee_Contact_List_Table.class.php' ); |
|
2227 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
2228 | + require_once(REG_ADMIN.'EE_Attendee_Contact_List_Table.class.php'); |
|
2229 | 2229 | $ATT_MDL = EEM_Attendee::instance(); |
2230 | 2230 | |
2231 | 2231 | $this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : ''; |
@@ -2253,47 +2253,47 @@ discard block |
||
2253 | 2253 | $orderby = 'ATT_lname'; |
2254 | 2254 | } |
2255 | 2255 | |
2256 | - $sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC'; |
|
2256 | + $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC'; |
|
2257 | 2257 | |
2258 | - $current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1; |
|
2259 | - $per_page = isset( $per_page ) && !empty( $per_page ) ? $per_page : 10; |
|
2260 | - $per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page; |
|
2258 | + $current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1; |
|
2259 | + $per_page = isset($per_page) && ! empty($per_page) ? $per_page : 10; |
|
2260 | + $per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page; |
|
2261 | 2261 | |
2262 | 2262 | $_where = array(); |
2263 | 2263 | |
2264 | - if ( isset( $this->_req_data['s'] ) ) { |
|
2265 | - $sstr = '%' . $this->_req_data['s'] . '%'; |
|
2264 | + if (isset($this->_req_data['s'])) { |
|
2265 | + $sstr = '%'.$this->_req_data['s'].'%'; |
|
2266 | 2266 | $_where['OR'] = array( |
2267 | - 'Registration.Event.EVT_name' => array( 'LIKE', $sstr), |
|
2268 | - 'Registration.Event.EVT_desc' => array( 'LIKE', $sstr ), |
|
2269 | - 'Registration.Event.EVT_short_desc' => array( 'LIKE' , $sstr ), |
|
2270 | - 'ATT_fname' => array( 'LIKE', $sstr ), |
|
2271 | - 'ATT_lname' => array( 'LIKE', $sstr ), |
|
2272 | - 'ATT_short_bio' => array( 'LIKE', $sstr ), |
|
2273 | - 'ATT_email' => array('LIKE', $sstr ), |
|
2274 | - 'ATT_address' => array( 'LIKE', $sstr ), |
|
2275 | - 'ATT_address2' => array( 'LIKE', $sstr ), |
|
2276 | - 'ATT_city' => array( 'LIKE', $sstr ), |
|
2277 | - 'Country.CNT_name' => array( 'LIKE', $sstr ), |
|
2278 | - 'State.STA_name' => array('LIKE', $sstr ), |
|
2279 | - 'ATT_phone' => array( 'LIKE', $sstr ), |
|
2280 | - 'Registration.REG_final_price' => array( 'LIKE', $sstr ), |
|
2281 | - 'Registration.REG_code' => array( 'LIKE', $sstr ), |
|
2282 | - 'Registration.REG_count' => array( 'LIKE' , $sstr ), |
|
2283 | - 'Registration.REG_group_size' => array( 'LIKE' , $sstr ) |
|
2267 | + 'Registration.Event.EVT_name' => array('LIKE', $sstr), |
|
2268 | + 'Registration.Event.EVT_desc' => array('LIKE', $sstr), |
|
2269 | + 'Registration.Event.EVT_short_desc' => array('LIKE', $sstr), |
|
2270 | + 'ATT_fname' => array('LIKE', $sstr), |
|
2271 | + 'ATT_lname' => array('LIKE', $sstr), |
|
2272 | + 'ATT_short_bio' => array('LIKE', $sstr), |
|
2273 | + 'ATT_email' => array('LIKE', $sstr), |
|
2274 | + 'ATT_address' => array('LIKE', $sstr), |
|
2275 | + 'ATT_address2' => array('LIKE', $sstr), |
|
2276 | + 'ATT_city' => array('LIKE', $sstr), |
|
2277 | + 'Country.CNT_name' => array('LIKE', $sstr), |
|
2278 | + 'State.STA_name' => array('LIKE', $sstr), |
|
2279 | + 'ATT_phone' => array('LIKE', $sstr), |
|
2280 | + 'Registration.REG_final_price' => array('LIKE', $sstr), |
|
2281 | + 'Registration.REG_code' => array('LIKE', $sstr), |
|
2282 | + 'Registration.REG_count' => array('LIKE', $sstr), |
|
2283 | + 'Registration.REG_group_size' => array('LIKE', $sstr) |
|
2284 | 2284 | ); |
2285 | 2285 | } |
2286 | 2286 | |
2287 | 2287 | |
2288 | - $offset = ($current_page-1)*$per_page; |
|
2289 | - $limit = $count ? NULL : array( $offset, $per_page ); |
|
2288 | + $offset = ($current_page - 1) * $per_page; |
|
2289 | + $limit = $count ? NULL : array($offset, $per_page); |
|
2290 | 2290 | |
2291 | - if ( $trash ) { |
|
2292 | - $_where['status'] = array( '!=', 'publish' ); |
|
2293 | - $all_attendees = $count ? $ATT_MDL->count( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit)): $ATT_MDL->get_all( array($_where,'order_by'=>array($orderby=>$sort), 'limit'=>$limit)); |
|
2291 | + if ($trash) { |
|
2292 | + $_where['status'] = array('!=', 'publish'); |
|
2293 | + $all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)); |
|
2294 | 2294 | } else { |
2295 | - $_where['status'] = array( 'IN', array( 'publish' ) ); |
|
2296 | - $all_attendees = $count ? $ATT_MDL->count( array($_where, 'order_by'=>array($orderby=>$sort),'limit'=>$limit)) : $ATT_MDL->get_all( array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit) ); |
|
2295 | + $_where['status'] = array('IN', array('publish')); |
|
2296 | + $all_attendees = $count ? $ATT_MDL->count(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)) : $ATT_MDL->get_all(array($_where, 'order_by'=>array($orderby=>$sort), 'limit'=>$limit)); |
|
2297 | 2297 | } |
2298 | 2298 | |
2299 | 2299 | return $all_attendees; |
@@ -2310,10 +2310,10 @@ discard block |
||
2310 | 2310 | */ |
2311 | 2311 | protected function _resend_registration() { |
2312 | 2312 | $this->_process_resend_registration(); |
2313 | - $query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID'] ) : array( |
|
2313 | + $query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], '_REG_ID' => $this->_req_data['_REG_ID']) : array( |
|
2314 | 2314 | 'action' => 'default' |
2315 | 2315 | ); |
2316 | - $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE ); |
|
2316 | + $this->_redirect_after_action(FALSE, '', '', $query_args, TRUE); |
|
2317 | 2317 | } |
2318 | 2318 | |
2319 | 2319 | |
@@ -2321,27 +2321,27 @@ discard block |
||
2321 | 2321 | |
2322 | 2322 | |
2323 | 2323 | |
2324 | - public function _registrations_report(){ |
|
2325 | - if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) { |
|
2326 | - wp_redirect( EE_Admin_Page::add_query_args_and_nonce( |
|
2324 | + public function _registrations_report() { |
|
2325 | + if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) { |
|
2326 | + wp_redirect(EE_Admin_Page::add_query_args_and_nonce( |
|
2327 | 2327 | array( |
2328 | 2328 | 'page' => 'espresso_batch', |
2329 | 2329 | 'batch' => 'file', |
2330 | - 'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL, |
|
2331 | - 'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport' ), |
|
2332 | - 'return_url' => urlencode( $this->_req_data[ 'return_url' ] ), |
|
2333 | - )) ); |
|
2330 | + 'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL, |
|
2331 | + 'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\RegistrationsReport'), |
|
2332 | + 'return_url' => urlencode($this->_req_data['return_url']), |
|
2333 | + ))); |
|
2334 | 2334 | } else { |
2335 | - EE_Registry::instance()->load_helper( 'File' ); |
|
2335 | + EE_Registry::instance()->load_helper('File'); |
|
2336 | 2336 | $new_request_args = array( |
2337 | 2337 | 'export' => 'report', |
2338 | 2338 | 'action' => 'registrations_report_for_event', |
2339 | - 'EVT_ID' => isset( $this->_req_data[ 'EVT_ID'] ) ? $this->_req_data[ 'EVT_ID' ] : NULL, |
|
2339 | + 'EVT_ID' => isset($this->_req_data['EVT_ID']) ? $this->_req_data['EVT_ID'] : NULL, |
|
2340 | 2340 | ); |
2341 | 2341 | $this->_req_data = array_merge($this->_req_data, $new_request_args); |
2342 | 2342 | |
2343 | - if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) { |
|
2344 | - require_once(EE_CLASSES . 'EE_Export.class.php'); |
|
2343 | + if (is_readable(EE_CLASSES.'EE_Export.class.php')) { |
|
2344 | + require_once(EE_CLASSES.'EE_Export.class.php'); |
|
2345 | 2345 | $EE_Export = EE_Export::instance($this->_req_data); |
2346 | 2346 | $EE_Export->export(); |
2347 | 2347 | } |
@@ -2350,28 +2350,28 @@ discard block |
||
2350 | 2350 | |
2351 | 2351 | |
2352 | 2352 | |
2353 | - public function _contact_list_export(){ |
|
2354 | - EE_Registry::instance()->load_helper( 'File' ); |
|
2355 | - if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) { |
|
2356 | - require_once(EE_CLASSES . 'EE_Export.class.php'); |
|
2353 | + public function _contact_list_export() { |
|
2354 | + EE_Registry::instance()->load_helper('File'); |
|
2355 | + if (is_readable(EE_CLASSES.'EE_Export.class.php')) { |
|
2356 | + require_once(EE_CLASSES.'EE_Export.class.php'); |
|
2357 | 2357 | $EE_Export = EE_Export::instance($this->_req_data); |
2358 | 2358 | $EE_Export->export_attendees(); |
2359 | 2359 | } |
2360 | 2360 | } |
2361 | 2361 | |
2362 | - public function _contact_list_report(){ |
|
2363 | - if( ! defined( 'EE_USE_OLD_CSV_REPORT_CLASS' ) ) { |
|
2364 | - wp_redirect( EE_Admin_Page::add_query_args_and_nonce( |
|
2362 | + public function _contact_list_report() { |
|
2363 | + if ( ! defined('EE_USE_OLD_CSV_REPORT_CLASS')) { |
|
2364 | + wp_redirect(EE_Admin_Page::add_query_args_and_nonce( |
|
2365 | 2365 | array( |
2366 | 2366 | 'page' => 'espresso_batch', |
2367 | 2367 | 'batch' => 'file', |
2368 | - 'job_handler' => urlencode( 'EventEspressoBatchRequest\JobHandlers\AttendeesReport' ), |
|
2369 | - 'return_url' => urlencode( $this->_req_data[ 'return_url' ] ), |
|
2370 | - )) ); |
|
2368 | + 'job_handler' => urlencode('EventEspressoBatchRequest\JobHandlers\AttendeesReport'), |
|
2369 | + 'return_url' => urlencode($this->_req_data['return_url']), |
|
2370 | + ))); |
|
2371 | 2371 | } else { |
2372 | - EE_Registry::instance()->load_helper( 'File' ); |
|
2373 | - if ( is_readable(EE_CLASSES . 'EE_Export.class.php')) { |
|
2374 | - require_once(EE_CLASSES . 'EE_Export.class.php'); |
|
2372 | + EE_Registry::instance()->load_helper('File'); |
|
2373 | + if (is_readable(EE_CLASSES.'EE_Export.class.php')) { |
|
2374 | + require_once(EE_CLASSES.'EE_Export.class.php'); |
|
2375 | 2375 | $EE_Export = EE_Export::instance($this->_req_data); |
2376 | 2376 | $EE_Export->report_attendees(); |
2377 | 2377 | } |
@@ -2391,73 +2391,73 @@ discard block |
||
2391 | 2391 | * @return void |
2392 | 2392 | */ |
2393 | 2393 | protected function _duplicate_attendee() { |
2394 | - $action = !empty( $this->_req_data['return'] ) ? $this->_req_data['return'] : 'default'; |
|
2394 | + $action = ! empty($this->_req_data['return']) ? $this->_req_data['return'] : 'default'; |
|
2395 | 2395 | //verify we have necessary info |
2396 | - if ( empty($this->_req_data['_REG_ID'] ) ) { |
|
2397 | - EE_Error::add_error( __('Unable to create the contact for the registration because the required paramaters are not present (_REG_ID )', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__ ); |
|
2398 | - $query_args = array( 'action' => $action ); |
|
2396 | + if (empty($this->_req_data['_REG_ID'])) { |
|
2397 | + EE_Error::add_error(__('Unable to create the contact for the registration because the required paramaters are not present (_REG_ID )', 'event_espresso'), __FILE__, __LINE__, __FUNCTION__); |
|
2398 | + $query_args = array('action' => $action); |
|
2399 | 2399 | $this->_redirect_after_action('', '', '', $query_args, TRUE); |
2400 | 2400 | } |
2401 | 2401 | |
2402 | 2402 | //okay necessary deets present... let's dupe the incoming attendee and attach to incoming registration. |
2403 | - $registration = EEM_Registration::instance()->get_one_by_ID( $this->_req_data['_REG_ID'] ); |
|
2403 | + $registration = EEM_Registration::instance()->get_one_by_ID($this->_req_data['_REG_ID']); |
|
2404 | 2404 | $attendee = $registration->attendee(); |
2405 | 2405 | |
2406 | 2406 | //remove relation of existing attendee on registration |
2407 | - $registration->_remove_relation_to($attendee, 'Attendee' ); |
|
2407 | + $registration->_remove_relation_to($attendee, 'Attendee'); |
|
2408 | 2408 | //new attendee |
2409 | 2409 | $new_attendee = clone $attendee; |
2410 | - $new_attendee->set( 'ATT_ID', 0 ); |
|
2410 | + $new_attendee->set('ATT_ID', 0); |
|
2411 | 2411 | $new_attendee->save(); |
2412 | 2412 | |
2413 | 2413 | //add new attendee to reg |
2414 | - $registration->_add_relation_to( $new_attendee, 'Attendee'); |
|
2414 | + $registration->_add_relation_to($new_attendee, 'Attendee'); |
|
2415 | 2415 | |
2416 | - EE_Error::add_success( __('New Contact record created. Now make any edits you wish to make for this contact.', 'event_espresso') ); |
|
2416 | + EE_Error::add_success(__('New Contact record created. Now make any edits you wish to make for this contact.', 'event_espresso')); |
|
2417 | 2417 | |
2418 | 2418 | //redirect to edit page for attendee |
2419 | - $query_args = array( 'post' => $new_attendee->ID(), 'action' => 'edit_attendee' ); |
|
2419 | + $query_args = array('post' => $new_attendee->ID(), 'action' => 'edit_attendee'); |
|
2420 | 2420 | |
2421 | - $this->_redirect_after_action( '', '', '', $query_args, TRUE ); |
|
2421 | + $this->_redirect_after_action('', '', '', $query_args, TRUE); |
|
2422 | 2422 | } |
2423 | 2423 | |
2424 | 2424 | |
2425 | 2425 | //related to cpt routes |
2426 | 2426 | protected function _insert_update_cpt_item($post_id, $post) { |
2427 | 2427 | $success = true; |
2428 | - $attendee = EEM_Attendee::instance()->get_one_by_ID( $post_id ); |
|
2428 | + $attendee = EEM_Attendee::instance()->get_one_by_ID($post_id); |
|
2429 | 2429 | //for attendee updates |
2430 | - if ( $post->post_type = 'espresso_attendees' && !empty( $attendee ) ) { |
|
2430 | + if ($post->post_type = 'espresso_attendees' && ! empty($attendee)) { |
|
2431 | 2431 | //note we should only be UPDATING attendees at this point. |
2432 | 2432 | $updated_fields = array( |
2433 | 2433 | 'ATT_fname' => $this->_req_data['ATT_fname'], |
2434 | 2434 | 'ATT_lname' => $this->_req_data['ATT_lname'], |
2435 | - 'ATT_full_name'=> $this->_req_data['ATT_fname'] . ' ' . $this->_req_data['ATT_lname'], |
|
2435 | + 'ATT_full_name'=> $this->_req_data['ATT_fname'].' '.$this->_req_data['ATT_lname'], |
|
2436 | 2436 | 'ATT_address' => isset($this->_req_data['ATT_address']) ? $this->_req_data['ATT_address'] : '', |
2437 | 2437 | 'ATT_address2' => isset($this->_req_data['ATT_address2']) ? $this->_req_data['ATT_address2'] : '', |
2438 | - 'ATT_city' => isset( $this->_req_data['ATT_city'] ) ? $this->_req_data['ATT_city'] : '', |
|
2439 | - 'STA_ID' => isset( $this->_req_data['STA_ID'] ) ? $this->_req_data['STA_ID'] : '', |
|
2440 | - 'CNT_ISO' => isset( $this->_req_data['CNT_ISO'] ) ? $this->_req_data['CNT_ISO'] : '', |
|
2441 | - 'ATT_zip' => isset( $this->_req_data['ATT_zip'] ) ? $this->_req_data['ATT_zip'] : '', |
|
2442 | - 'ATT_email' => isset( $this->_req_data['ATT_email'] ) ? $this->_req_data['ATT_email'] : '', |
|
2443 | - 'ATT_phone' => isset( $this->_req_data['ATT_phone'] ) ? $this->_req_data['ATT_phone'] : '' |
|
2438 | + 'ATT_city' => isset($this->_req_data['ATT_city']) ? $this->_req_data['ATT_city'] : '', |
|
2439 | + 'STA_ID' => isset($this->_req_data['STA_ID']) ? $this->_req_data['STA_ID'] : '', |
|
2440 | + 'CNT_ISO' => isset($this->_req_data['CNT_ISO']) ? $this->_req_data['CNT_ISO'] : '', |
|
2441 | + 'ATT_zip' => isset($this->_req_data['ATT_zip']) ? $this->_req_data['ATT_zip'] : '', |
|
2442 | + 'ATT_email' => isset($this->_req_data['ATT_email']) ? $this->_req_data['ATT_email'] : '', |
|
2443 | + 'ATT_phone' => isset($this->_req_data['ATT_phone']) ? $this->_req_data['ATT_phone'] : '' |
|
2444 | 2444 | ); |
2445 | - foreach ( $updated_fields as $field => $value ) { |
|
2445 | + foreach ($updated_fields as $field => $value) { |
|
2446 | 2446 | $attendee->set($field, $value); |
2447 | 2447 | } |
2448 | 2448 | |
2449 | 2449 | $success = $attendee->save(); |
2450 | 2450 | |
2451 | - $attendee_update_callbacks = apply_filters( 'FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update', array() ); |
|
2452 | - foreach ( $attendee_update_callbacks as $a_callback ) { |
|
2453 | - if ( FALSE === call_user_func_array( $a_callback, array($attendee, $this->_req_data ) ) ) { |
|
2454 | - throw new EE_Error( sprintf( __('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback. Please check the spelling.', 'event_espresso'), $a_callback ) ); |
|
2451 | + $attendee_update_callbacks = apply_filters('FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update', array()); |
|
2452 | + foreach ($attendee_update_callbacks as $a_callback) { |
|
2453 | + if (FALSE === call_user_func_array($a_callback, array($attendee, $this->_req_data))) { |
|
2454 | + throw new EE_Error(sprintf(__('The %s callback given for the "FHEE__Registrations_Admin_Page__insert_update_cpt_item__attendee_update" filter is not a valid callback. Please check the spelling.', 'event_espresso'), $a_callback)); |
|
2455 | 2455 | } |
2456 | 2456 | } |
2457 | 2457 | } |
2458 | 2458 | |
2459 | - if ( $success === FALSE ) |
|
2460 | - EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ ); |
|
2459 | + if ($success === FALSE) |
|
2460 | + EE_Error::add_error(__('Something went wrong with updating the meta table data for the registration.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__); |
|
2461 | 2461 | |
2462 | 2462 | } |
2463 | 2463 | |
@@ -2477,17 +2477,17 @@ discard block |
||
2477 | 2477 | remove_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal', 'core'); |
2478 | 2478 | remove_meta_box('commentstatusdiv', $this->_cpt_routes[$this->_req_action], 'normal', 'core'); |
2479 | 2479 | |
2480 | - if ( post_type_supports( 'espresso_attendees', 'excerpt') ) { |
|
2481 | - add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal' ); |
|
2480 | + if (post_type_supports('espresso_attendees', 'excerpt')) { |
|
2481 | + add_meta_box('postexcerpt', __('Short Biography', 'event_espresso'), 'post_excerpt_meta_box', $this->_cpt_routes[$this->_req_action], 'normal'); |
|
2482 | 2482 | } |
2483 | 2483 | |
2484 | - if ( post_type_supports( 'espresso_attendees', 'comments') ) { |
|
2484 | + if (post_type_supports('espresso_attendees', 'comments')) { |
|
2485 | 2485 | add_meta_box('commentsdiv', __('Notes on the Contact', 'event_espresso'), 'post_comment_meta_box', $this->_cpt_routes[$this->_req_action], 'normal', 'core'); |
2486 | 2486 | } |
2487 | 2487 | |
2488 | - add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'), array( $this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core' ); |
|
2489 | - add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'), array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core' ); |
|
2490 | - add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'), array( $this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high'); |
|
2488 | + add_meta_box('attendee_contact_info', __('Contact Info', 'event_espresso'), array($this, 'attendee_contact_info'), $this->_cpt_routes[$this->_req_action], 'side', 'core'); |
|
2489 | + add_meta_box('attendee_details_address', __('Address Details', 'event_espresso'), array($this, 'attendee_address_details'), $this->_cpt_routes[$this->_req_action], 'normal', 'core'); |
|
2490 | + add_meta_box('attendee_registrations', __('Registrations for this Contact', 'event_espresso'), array($this, 'attendee_registrations_meta_box'), $this->_cpt_routes[$this->_req_action], 'normal', 'high'); |
|
2491 | 2491 | } |
2492 | 2492 | |
2493 | 2493 | |
@@ -2496,10 +2496,10 @@ discard block |
||
2496 | 2496 | * @param WP_Post $post wp post object |
2497 | 2497 | * @return string attendee contact info ( and form ) |
2498 | 2498 | */ |
2499 | - public function attendee_contact_info( $post ) { |
|
2499 | + public function attendee_contact_info($post) { |
|
2500 | 2500 | //get attendee object ( should already have it ) |
2501 | 2501 | $this->_template_args['attendee'] = $this->_cpt_model_obj; |
2502 | - $template = REG_TEMPLATE_PATH . 'attendee_contact_info_metabox_content.template.php'; |
|
2502 | + $template = REG_TEMPLATE_PATH.'attendee_contact_info_metabox_content.template.php'; |
|
2503 | 2503 | EEH_Template::display_template($template, $this->_template_args); |
2504 | 2504 | } |
2505 | 2505 | |
@@ -2515,12 +2515,12 @@ discard block |
||
2515 | 2515 | $this->_template_args['attendee'] = $this->_cpt_model_obj; |
2516 | 2516 | $this->_template_args['state_html'] = EEH_Form_Fields::generate_form_input( |
2517 | 2517 | new EE_Question_Form_Input( |
2518 | - EE_Question::new_instance( array( |
|
2518 | + EE_Question::new_instance(array( |
|
2519 | 2519 | 'QST_ID' => 0, |
2520 | 2520 | 'QST_display_text' => __('State/Province', 'event_espresso'), |
2521 | 2521 | 'QST_system' => 'admin-state' |
2522 | 2522 | )), |
2523 | - EE_Answer::new_instance( array( |
|
2523 | + EE_Answer::new_instance(array( |
|
2524 | 2524 | 'ANS_ID' => 0, |
2525 | 2525 | 'ANS_value' => $this->_cpt_model_obj->state_ID() |
2526 | 2526 | )), |
@@ -2533,12 +2533,12 @@ discard block |
||
2533 | 2533 | )); |
2534 | 2534 | $this->_template_args['country_html'] = EEH_Form_Fields::generate_form_input( |
2535 | 2535 | new EE_Question_Form_Input( |
2536 | - EE_Question::new_instance( array( |
|
2536 | + EE_Question::new_instance(array( |
|
2537 | 2537 | 'QST_ID' => 0, |
2538 | 2538 | 'QST_display_text' => __('Country', 'event_espresso'), |
2539 | 2539 | 'QST_system' => 'admin-country' |
2540 | 2540 | )), |
2541 | - EE_Answer::new_instance( array( |
|
2541 | + EE_Answer::new_instance(array( |
|
2542 | 2542 | 'ANS_ID' => 0, |
2543 | 2543 | 'ANS_value' => $this->_cpt_model_obj->country_ID() |
2544 | 2544 | )), |
@@ -2549,8 +2549,8 @@ discard block |
||
2549 | 2549 | 'append_qstn_id' => FALSE |
2550 | 2550 | ) |
2551 | 2551 | )); |
2552 | - $template = REG_TEMPLATE_PATH . 'attendee_address_details_metabox_content.template.php'; |
|
2553 | - EEH_Template::display_template($template, $this->_template_args ); |
|
2552 | + $template = REG_TEMPLATE_PATH.'attendee_address_details_metabox_content.template.php'; |
|
2553 | + EEH_Template::display_template($template, $this->_template_args); |
|
2554 | 2554 | |
2555 | 2555 | } |
2556 | 2556 | |
@@ -2560,11 +2560,11 @@ discard block |
||
2560 | 2560 | * @access protected |
2561 | 2561 | * @return void |
2562 | 2562 | */ |
2563 | - public function attendee_registrations_meta_box( $post ) { |
|
2563 | + public function attendee_registrations_meta_box($post) { |
|
2564 | 2564 | |
2565 | 2565 | $this->_template_args['attendee'] = $this->_cpt_model_obj; |
2566 | 2566 | $this->_template_args['registrations'] = $this->_cpt_model_obj->get_many_related('Registration'); |
2567 | - $template = REG_TEMPLATE_PATH . 'attendee_registrations_main_meta_box.template.php'; |
|
2567 | + $template = REG_TEMPLATE_PATH.'attendee_registrations_main_meta_box.template.php'; |
|
2568 | 2568 | EEH_Template::display_template($template, $this->_template_args); |
2569 | 2569 | |
2570 | 2570 | } |
@@ -2578,8 +2578,8 @@ discard block |
||
2578 | 2578 | * @return string html for new form. |
2579 | 2579 | */ |
2580 | 2580 | public function after_title_form_fields($post) { |
2581 | - if ( $post->post_type == 'espresso_attendees' ) { |
|
2582 | - $template = REG_TEMPLATE_PATH . 'attendee_details_after_title_form_fields.template.php'; |
|
2581 | + if ($post->post_type == 'espresso_attendees') { |
|
2582 | + $template = REG_TEMPLATE_PATH.'attendee_details_after_title_form_fields.template.php'; |
|
2583 | 2583 | $template_args['attendee'] = $this->_cpt_model_obj; |
2584 | 2584 | EEH_Template::display_template($template, $template_args); |
2585 | 2585 | } |
@@ -2596,21 +2596,21 @@ discard block |
||
2596 | 2596 | * @access protected |
2597 | 2597 | * @return void |
2598 | 2598 | */ |
2599 | - protected function _trash_or_restore_attendees( $trash = TRUE ) { |
|
2599 | + protected function _trash_or_restore_attendees($trash = TRUE) { |
|
2600 | 2600 | |
2601 | - do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' ); |
|
2601 | + do_action('AHEE_log', __FILE__, __FUNCTION__, ''); |
|
2602 | 2602 | |
2603 | 2603 | $ATT_MDL = EEM_Attendee::instance(); |
2604 | 2604 | |
2605 | 2605 | $success = 1; |
2606 | 2606 | //Checkboxes |
2607 | - if (!empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) { |
|
2607 | + if ( ! empty($this->_req_data['checkbox']) && is_array($this->_req_data['checkbox'])) { |
|
2608 | 2608 | // if array has more than one element than success message should be plural |
2609 | - $success = count( $this->_req_data['checkbox'] ) > 1 ? 2 : 1; |
|
2609 | + $success = count($this->_req_data['checkbox']) > 1 ? 2 : 1; |
|
2610 | 2610 | // cycle thru checkboxes |
2611 | - while (list( $ATT_ID, $value ) = each($this->_req_data['checkbox'])) { |
|
2612 | - $updated = $trash ? $ATT_MDL->update_by_ID(array( 'status' => 'trash' ), $ATT_ID) : $ATT_MDL->update_by_ID( array('status' => 'publish' ), $ATT_ID); |
|
2613 | - if ( !$updated ) { |
|
2611 | + while (list($ATT_ID, $value) = each($this->_req_data['checkbox'])) { |
|
2612 | + $updated = $trash ? $ATT_MDL->update_by_ID(array('status' => 'trash'), $ATT_ID) : $ATT_MDL->update_by_ID(array('status' => 'publish'), $ATT_ID); |
|
2613 | + if ( ! $updated) { |
|
2614 | 2614 | $success = 0; |
2615 | 2615 | } |
2616 | 2616 | } |
@@ -2619,18 +2619,18 @@ discard block |
||
2619 | 2619 | // grab single id and delete |
2620 | 2620 | $ATT_ID = absint($this->_req_data['ATT_ID']); |
2621 | 2621 | //get attendee |
2622 | - $att = $ATT_MDL->get_one_by_ID( $ATT_ID ); |
|
2622 | + $att = $ATT_MDL->get_one_by_ID($ATT_ID); |
|
2623 | 2623 | $updated = $trash ? $att->set_status('trash') : $att->set_status('publish'); |
2624 | 2624 | $updated = $att->save(); |
2625 | - if ( ! $updated ) { |
|
2625 | + if ( ! $updated) { |
|
2626 | 2626 | $success = 0; |
2627 | 2627 | } |
2628 | 2628 | |
2629 | 2629 | } |
2630 | 2630 | |
2631 | - $what = $success > 1 ? __( 'Contacts', 'event_espresso' ) : __( 'Contact', 'event_espresso' ); |
|
2632 | - $action_desc = $trash ? __( 'moved to the trash', 'event_espresso' ) : __( 'restored', 'event_espresso' ); |
|
2633 | - $this->_redirect_after_action( $success, $what, $action_desc, array( 'action' => 'contact_list' ) ); |
|
2631 | + $what = $success > 1 ? __('Contacts', 'event_espresso') : __('Contact', 'event_espresso'); |
|
2632 | + $action_desc = $trash ? __('moved to the trash', 'event_espresso') : __('restored', 'event_espresso'); |
|
2633 | + $this->_redirect_after_action($success, $what, $action_desc, array('action' => 'contact_list')); |
|
2634 | 2634 | |
2635 | 2635 | } |
2636 | 2636 |
@@ -503,7 +503,7 @@ |
||
503 | 503 | /** |
504 | 504 | * @param $message_types |
505 | 505 | * @param array $extra |
506 | - * @return mixed|string |
|
506 | + * @return string |
|
507 | 507 | */ |
508 | 508 | protected function _get_admin_content_events_edit( $message_types, $extra ) { |
509 | 509 | //defaults |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) |
|
2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) |
|
3 | 3 | exit('NO direct script access allowed'); |
4 | 4 | |
5 | 5 | /** |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * |
44 | 44 | * @param EE_Admin_Page $admin_page |
45 | 45 | */ |
46 | - public function __construct( $admin_page ) { |
|
46 | + public function __construct($admin_page) { |
|
47 | 47 | parent::__construct($admin_page); |
48 | - require_once( EE_HELPERS . 'EEH_DTT_Helper.helper.php' ); |
|
48 | + require_once(EE_HELPERS.'EEH_DTT_Helper.helper.php'); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | protected function _setup_data() { |
56 | 56 | $this->_data = $this->_admin_page->get_events($this->_per_page, $this->_current_page); |
57 | - $this->_all_data_count = $this->_admin_page->get_events(0,0, TRUE); |
|
57 | + $this->_all_data_count = $this->_admin_page->get_events(0, 0, TRUE); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | |
@@ -85,17 +85,17 @@ discard block |
||
85 | 85 | |
86 | 86 | |
87 | 87 | $this->_sortable_columns = array( |
88 | - 'id' => array( 'EVT_ID' => true ), |
|
89 | - 'name' => array( 'EVT_name' => false ), |
|
90 | - 'author' => array( 'EVT_wp_user' => false ), |
|
91 | - 'venue' => array( 'Venue.VNU_name' => false ), |
|
88 | + 'id' => array('EVT_ID' => true), |
|
89 | + 'name' => array('EVT_name' => false), |
|
90 | + 'author' => array('EVT_wp_user' => false), |
|
91 | + 'venue' => array('Venue.VNU_name' => false), |
|
92 | 92 | 'start_date_time' => array('Datetime.DTT_EVT_start' => false), |
93 | 93 | 'reg_begins' => array('Datetime.Ticket.TKT_start_date' => false), |
94 | 94 | ); |
95 | 95 | |
96 | 96 | $this->_primary_column = 'id'; |
97 | 97 | |
98 | - $this->_hidden_columns = array( 'author' ); |
|
98 | + $this->_hidden_columns = array('author'); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | protected function _add_view_counts() { |
114 | 114 | $this->_views['all']['count'] = $this->_admin_page->total_events(); |
115 | 115 | $this->_views['draft']['count'] = $this->_admin_page->total_events_draft(); |
116 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_events', 'espresso_events_trash_events' ) ) { |
|
116 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_events', 'espresso_events_trash_events')) { |
|
117 | 117 | $this->_views['trash']['count'] = $this->_admin_page->total_trashed_events(); |
118 | 118 | } |
119 | 119 | } |
@@ -124,11 +124,11 @@ discard block |
||
124 | 124 | * |
125 | 125 | * @return string |
126 | 126 | */ |
127 | - protected function _get_row_class( $item ) { |
|
128 | - $class = parent::_get_row_class( $item ); |
|
127 | + protected function _get_row_class($item) { |
|
128 | + $class = parent::_get_row_class($item); |
|
129 | 129 | //add status class |
130 | - $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-' . $item->get_active_status() : ''; |
|
131 | - if ( $this->_has_checkbox_column ) { |
|
130 | + $class .= $item instanceof EE_Event ? ' ee-status-strip event-status-'.$item->get_active_status() : ''; |
|
131 | + if ($this->_has_checkbox_column) { |
|
132 | 132 | $class .= ' has-checkbox-column'; |
133 | 133 | } |
134 | 134 | return $class; |
@@ -140,8 +140,8 @@ discard block |
||
140 | 140 | * |
141 | 141 | * @return string |
142 | 142 | */ |
143 | - public function column_status( EE_Event $item ) { |
|
144 | - return '<span class="ee-status-strip ee-status-strip-td event-status-' . $item->get_active_status() . '"></span>'; |
|
143 | + public function column_status(EE_Event $item) { |
|
144 | + return '<span class="ee-status-strip ee-status-strip-td event-status-'.$item->get_active_status().'"></span>'; |
|
145 | 145 | }/**/ |
146 | 146 | |
147 | 147 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | * |
151 | 151 | * @return string |
152 | 152 | */ |
153 | - public function column_cb( $item ) { |
|
153 | + public function column_cb($item) { |
|
154 | 154 | $this->_dtt = $item->primary_datetime(); //set this for use in other columns |
155 | 155 | |
156 | 156 | //does event have any attached registrations? |
@@ -166,9 +166,9 @@ discard block |
||
166 | 166 | * |
167 | 167 | * @return mixed|string |
168 | 168 | */ |
169 | - public function column_id( EE_Event $item ) { |
|
169 | + public function column_id(EE_Event $item) { |
|
170 | 170 | $content = $item->ID(); |
171 | - $content .= ' <span class="show-on-mobile-view-only">' . $item->name() . '</span>'; |
|
171 | + $content .= ' <span class="show-on-mobile-view-only">'.$item->name().'</span>'; |
|
172 | 172 | return $content; |
173 | 173 | } |
174 | 174 | |
@@ -178,16 +178,16 @@ discard block |
||
178 | 178 | * |
179 | 179 | * @return string |
180 | 180 | */ |
181 | - public function column_name( EE_Event $item ) { |
|
181 | + public function column_name(EE_Event $item) { |
|
182 | 182 | $edit_query_args = array( |
183 | 183 | 'action' => 'edit', |
184 | 184 | 'post' => $item->ID() |
185 | 185 | ); |
186 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
187 | - $actions = $this->_column_name_action_setup( $item ); |
|
186 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
187 | + $actions = $this->_column_name_action_setup($item); |
|
188 | 188 | $status = ''; //$item->status() !== 'publish' ? ' (' . $item->status() . ')' : ''; |
189 | - $content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->name() . '</a></strong>' . $status; |
|
190 | - $content .= '<br><span class="ee-status-text-small">' . EEH_Template::pretty_status( $item->get_active_status(), false, 'sentence' ) . '</span>'; |
|
189 | + $content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->name().'</a></strong>'.$status; |
|
190 | + $content .= '<br><span class="ee-status-text-small">'.EEH_Template::pretty_status($item->get_active_status(), false, 'sentence').'</span>'; |
|
191 | 191 | $content .= $this->row_actions($actions); |
192 | 192 | return $content; |
193 | 193 | |
@@ -204,72 +204,72 @@ discard block |
||
204 | 204 | * |
205 | 205 | * @return array array of actions |
206 | 206 | */ |
207 | - protected function _column_name_action_setup( EE_Event $item ) { |
|
207 | + protected function _column_name_action_setup(EE_Event $item) { |
|
208 | 208 | //todo: remove when attendees is active |
209 | - if ( !defined('REG_ADMIN_URL') ) |
|
209 | + if ( ! defined('REG_ADMIN_URL')) |
|
210 | 210 | define('REG_ADMIN_URL', EVENTS_ADMIN_URL); |
211 | 211 | |
212 | 212 | $actions = array(); |
213 | 213 | |
214 | - if ( EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID() ) ) { |
|
214 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) { |
|
215 | 215 | $edit_query_args = array( |
216 | 216 | 'action' => 'edit', |
217 | 217 | 'post' => $item->ID() |
218 | 218 | ); |
219 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
220 | - $actions['edit'] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'; |
|
219 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
220 | + $actions['edit'] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'; |
|
221 | 221 | |
222 | 222 | } |
223 | 223 | |
224 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) { |
|
224 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) { |
|
225 | 225 | $attendees_query_args = array( |
226 | 226 | 'action' => 'default', |
227 | 227 | 'event_id' => $item->ID() |
228 | 228 | ); |
229 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
230 | - $actions['attendees'] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrations', 'event_espresso') . '">' . __('Registrations', 'event_espresso') . '</a>'; |
|
229 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
230 | + $actions['attendees'] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrations', 'event_espresso').'">'.__('Registrations', 'event_espresso').'</a>'; |
|
231 | 231 | } |
232 | 232 | |
233 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) { |
|
233 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) { |
|
234 | 234 | $trash_event_query_args = array( |
235 | 235 | 'action' => 'trash_event', |
236 | 236 | 'EVT_ID' => $item->ID() |
237 | 237 | ); |
238 | - $trash_event_link = EE_Admin_Page::add_query_args_and_nonce( $trash_event_query_args, EVENTS_ADMIN_URL ); |
|
238 | + $trash_event_link = EE_Admin_Page::add_query_args_and_nonce($trash_event_query_args, EVENTS_ADMIN_URL); |
|
239 | 239 | } |
240 | 240 | |
241 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) { |
|
241 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) { |
|
242 | 242 | $restore_event_query_args = array( |
243 | 243 | 'action' => 'restore_event', |
244 | 244 | 'EVT_ID' => $item->ID() |
245 | 245 | ); |
246 | - $restore_event_link = EE_Admin_Page::add_query_args_and_nonce( $restore_event_query_args, EVENTS_ADMIN_URL ); |
|
246 | + $restore_event_link = EE_Admin_Page::add_query_args_and_nonce($restore_event_query_args, EVENTS_ADMIN_URL); |
|
247 | 247 | } |
248 | 248 | |
249 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) { |
|
249 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) { |
|
250 | 250 | $delete_event_query_args = array( |
251 | 251 | 'action' => 'delete_event', |
252 | 252 | 'EVT_ID' => $item->ID() |
253 | 253 | ); |
254 | - $delete_event_link = EE_Admin_Page::add_query_args_and_nonce( $delete_event_query_args, EVENTS_ADMIN_URL ); |
|
254 | + $delete_event_link = EE_Admin_Page::add_query_args_and_nonce($delete_event_query_args, EVENTS_ADMIN_URL); |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | $view_link = get_permalink($item->ID()); |
258 | 258 | |
259 | - $actions['view'] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '">' . __('View', 'event_espresso') . '</a>'; |
|
259 | + $actions['view'] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'">'.__('View', 'event_espresso').'</a>'; |
|
260 | 260 | |
261 | - switch ( $item->get( 'status' ) ) { |
|
261 | + switch ($item->get('status')) { |
|
262 | 262 | case 'trash' : |
263 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_restore_event', $item->ID() ) ) { |
|
264 | - $actions['restore_from_trash'] = '<a href="' . $restore_event_link . '" title="' . esc_attr__('Restore from Trash', 'event_espresso') . '">' . __('Restore from Trash', 'event_espresso') . '</a>'; |
|
263 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_restore_event', $item->ID())) { |
|
264 | + $actions['restore_from_trash'] = '<a href="'.$restore_event_link.'" title="'.esc_attr__('Restore from Trash', 'event_espresso').'">'.__('Restore from Trash', 'event_espresso').'</a>'; |
|
265 | 265 | } |
266 | - if ( $item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_delete_event', $item->ID() ) ) { |
|
267 | - $actions['delete'] = '<a href="' . $delete_event_link . '" title="' . esc_attr__('Delete Permanently', 'event_espresso') . '">' . __('Delete Permanently', 'event_espresso') . '</a>'; |
|
266 | + if ($item->count_related('Registration') === 0 && EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_delete_event', $item->ID())) { |
|
267 | + $actions['delete'] = '<a href="'.$delete_event_link.'" title="'.esc_attr__('Delete Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>'; |
|
268 | 268 | } |
269 | 269 | break; |
270 | 270 | default : |
271 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_event', 'espresso_events_trash_event', $item->ID() ) ) { |
|
272 | - $actions['move to trash'] = '<a href="' . $trash_event_link . '" title="' . esc_attr__('Trash Event', 'event_espresso') . '">' . __('Trash', 'event_espresso') . '</a>'; |
|
271 | + if (EE_Registry::instance()->CAP->current_user_can('ee_delete_event', 'espresso_events_trash_event', $item->ID())) { |
|
272 | + $actions['move to trash'] = '<a href="'.$trash_event_link.'" title="'.esc_attr__('Trash Event', 'event_espresso').'">'.__('Trash', 'event_espresso').'</a>'; |
|
273 | 273 | } |
274 | 274 | } |
275 | 275 | return $actions; |
@@ -281,17 +281,17 @@ discard block |
||
281 | 281 | * |
282 | 282 | * @return string |
283 | 283 | */ |
284 | - public function column_author( EE_Event $item ) { |
|
284 | + public function column_author(EE_Event $item) { |
|
285 | 285 | //user author info |
286 | - $event_author = get_userdata( $item->wp_user() ); |
|
287 | - $gravatar = get_avatar( $item->wp_user(), '15' ); |
|
286 | + $event_author = get_userdata($item->wp_user()); |
|
287 | + $gravatar = get_avatar($item->wp_user(), '15'); |
|
288 | 288 | //filter link |
289 | 289 | $query_args = array( |
290 | 290 | 'action' => 'default', |
291 | 291 | 'EVT_wp_user' => $item->wp_user() |
292 | 292 | ); |
293 | - $filter_url = EE_Admin_Page::add_query_args_and_nonce( $query_args, EVENTS_ADMIN_URL ); |
|
294 | - return $gravatar . ' <a href="' . $filter_url . '" title="' . esc_attr__('Click to filter events by this author.', 'event_espresso') . '">' . $event_author->display_name . '</a>'; |
|
293 | + $filter_url = EE_Admin_Page::add_query_args_and_nonce($query_args, EVENTS_ADMIN_URL); |
|
294 | + return $gravatar.' <a href="'.$filter_url.'" title="'.esc_attr__('Click to filter events by this author.', 'event_espresso').'">'.$event_author->display_name.'</a>'; |
|
295 | 295 | } |
296 | 296 | |
297 | 297 | |
@@ -300,9 +300,9 @@ discard block |
||
300 | 300 | * |
301 | 301 | * @return string |
302 | 302 | */ |
303 | - public function column_venue( EE_Event $item ) { |
|
304 | - $venue = $item->get_first_related( 'Venue' ); |
|
305 | - return !empty( $venue ) ? $venue->name() : ''; |
|
303 | + public function column_venue(EE_Event $item) { |
|
304 | + $venue = $item->get_first_related('Venue'); |
|
305 | + return ! empty($venue) ? $venue->name() : ''; |
|
306 | 306 | } |
307 | 307 | |
308 | 308 | |
@@ -311,10 +311,10 @@ discard block |
||
311 | 311 | * |
312 | 312 | * @throws EE_Error |
313 | 313 | */ |
314 | - public function column_start_date_time( EE_Event $item ) { |
|
315 | - echo !empty( $this->_dtt ) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso'); |
|
314 | + public function column_start_date_time(EE_Event $item) { |
|
315 | + echo ! empty($this->_dtt) ? $this->_dtt->get_i18n_datetime('DTT_EVT_start') : __('No Date was saved for this Event', 'event_espresso'); |
|
316 | 316 | //display in user's timezone? |
317 | - echo !empty( $this->_dtt ) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ' ) : ''; |
|
317 | + echo ! empty($this->_dtt) ? $this->_dtt->display_in_my_timezone('DTT_EVT_start', 'get_i18n_datetime', '', 'My Timezone: ') : ''; |
|
318 | 318 | |
319 | 319 | } |
320 | 320 | |
@@ -324,11 +324,11 @@ discard block |
||
324 | 324 | * |
325 | 325 | * @throws EE_Error |
326 | 326 | */ |
327 | - public function column_reg_begins( EE_Event $item ) { |
|
327 | + public function column_reg_begins(EE_Event $item) { |
|
328 | 328 | $reg_start = $item->get_ticket_with_earliest_start_time(); |
329 | - echo !empty( $reg_start ) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso'); |
|
329 | + echo ! empty($reg_start) ? $reg_start->get_i18n_datetime('TKT_start_date') : __('No Tickets have been setup for this Event', 'event_espresso'); |
|
330 | 330 | //display in user's timezone? |
331 | - echo !empty( $reg_start ) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ' ) : '';/**/ |
|
331 | + echo ! empty($reg_start) ? $reg_start->display_in_my_timezone('TKT_start_date', 'get_i18n_datetime', '', 'My Timezone: ') : ''; /**/ |
|
332 | 332 | } |
333 | 333 | |
334 | 334 | |
@@ -337,14 +337,14 @@ discard block |
||
337 | 337 | * |
338 | 338 | * @return int|string |
339 | 339 | */ |
340 | - public function column_attendees( EE_Event $item ) { |
|
340 | + public function column_attendees(EE_Event $item) { |
|
341 | 341 | $attendees_query_args = array( |
342 | 342 | 'action' => 'default', |
343 | 343 | 'event_id' => $item->ID() |
344 | 344 | ); |
345 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
346 | - $registered_attendees = EEM_Registration::instance()->get_event_registration_count( $item->ID() ); |
|
347 | - return EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ? '<a href="' . $attendees_link . '">' . $registered_attendees . '</a>' : $registered_attendees; |
|
345 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
346 | + $registered_attendees = EEM_Registration::instance()->get_event_registration_count($item->ID()); |
|
347 | + return EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID()) ? '<a href="'.$attendees_link.'">'.$registered_attendees.'</a>' : $registered_attendees; |
|
348 | 348 | } |
349 | 349 | |
350 | 350 | |
@@ -353,8 +353,8 @@ discard block |
||
353 | 353 | * |
354 | 354 | * @return float |
355 | 355 | */ |
356 | - public function column_tkts_sold( EE_Event $item ) { |
|
357 | - return EEM_Ticket::instance()->sum(array( array('Datetime.EVT_ID' => $item->ID() )), 'TKT_sold' ); |
|
356 | + public function column_tkts_sold(EE_Event $item) { |
|
357 | + return EEM_Ticket::instance()->sum(array(array('Datetime.EVT_ID' => $item->ID())), 'TKT_sold'); |
|
358 | 358 | } |
359 | 359 | |
360 | 360 | |
@@ -363,38 +363,38 @@ discard block |
||
363 | 363 | * |
364 | 364 | * @return string |
365 | 365 | */ |
366 | - public function column_actions( EE_Event $item ) { |
|
366 | + public function column_actions(EE_Event $item) { |
|
367 | 367 | //todo: remove when attendees is active |
368 | - if ( !defined('REG_ADMIN_URL') ) |
|
368 | + if ( ! defined('REG_ADMIN_URL')) |
|
369 | 369 | define('REG_ADMIN_URL', EVENTS_ADMIN_URL); |
370 | 370 | $actionlinks = array(); |
371 | 371 | |
372 | 372 | $view_link = get_permalink($item->ID()); |
373 | 373 | |
374 | - $actionlinks[] = '<a href="' . $view_link . '" title="' . esc_attr__('View Event', 'event_espresso') . '" target="_blank">'; |
|
374 | + $actionlinks[] = '<a href="'.$view_link.'" title="'.esc_attr__('View Event', 'event_espresso').'" target="_blank">'; |
|
375 | 375 | $actionlinks[] = '<div class="dashicons dashicons-search"></div></a>'; |
376 | 376 | |
377 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_event', 'espresso_events_edit', $item->ID() ) ) { |
|
377 | + if (EE_Registry::instance()->CAP->current_user_can('ee_edit_event', 'espresso_events_edit', $item->ID())) { |
|
378 | 378 | $edit_query_args = array( |
379 | 379 | 'action' => 'edit', |
380 | 380 | 'post' => $item->ID() |
381 | 381 | ); |
382 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL ); |
|
383 | - $actionlinks[] = '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '"><div class="ee-icon ee-icon-calendar-edit"></div></a>'; |
|
382 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL); |
|
383 | + $actionlinks[] = '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'"><div class="ee-icon ee-icon-calendar-edit"></div></a>'; |
|
384 | 384 | } |
385 | 385 | |
386 | - if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_registration', 'espresso_registrations_view_registration', $item->ID() ) ) { |
|
386 | + if (EE_Registry::instance()->CAP->current_user_can('ee_read_registration', 'espresso_registrations_view_registration', $item->ID())) { |
|
387 | 387 | $attendees_query_args = array( |
388 | 388 | 'action' => 'default', |
389 | 389 | 'event_id' => $item->ID() |
390 | 390 | ); |
391 | - $attendees_link = EE_Admin_Page::add_query_args_and_nonce( $attendees_query_args, REG_ADMIN_URL ); |
|
392 | - $actionlinks[] = '<a href="' . $attendees_link . '" title="' . esc_attr__('View Registrants', 'event_espresso') . '"><div class="dashicons dashicons-groups"></div></a>'; |
|
391 | + $attendees_link = EE_Admin_Page::add_query_args_and_nonce($attendees_query_args, REG_ADMIN_URL); |
|
392 | + $actionlinks[] = '<a href="'.$attendees_link.'" title="'.esc_attr__('View Registrants', 'event_espresso').'"><div class="dashicons dashicons-groups"></div></a>'; |
|
393 | 393 | } |
394 | 394 | |
395 | - $actionlinks = apply_filters( 'FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item ); |
|
395 | + $actionlinks = apply_filters('FHEE__Events_Admin_List_Table__column_actions__action_links', $actionlinks, $item); |
|
396 | 396 | |
397 | - return $this->_action_string( implode( "\n\t", $actionlinks ), $item, 'div' ); |
|
397 | + return $this->_action_string(implode("\n\t", $actionlinks), $item, 'div'); |
|
398 | 398 | } |
399 | 399 | |
400 | 400 |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * @param array $props_n_values incoming values |
30 | 30 | * @param string $timezone incoming timezone (if not set the timezone set for the website will be |
31 | 31 | * used.) |
32 | - * @param array $date_formats incoming date_formats in an array where the first value is the |
|
32 | + * @param string[] $date_formats incoming date_formats in an array where the first value is the |
|
33 | 33 | * date_format and the second value is the time format |
34 | 34 | * @return EE_Payment |
35 | 35 | */ |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | /** |
291 | 291 | * get Payment Amount |
292 | 292 | * @access public |
293 | - * @return float |
|
293 | + * @return boolean |
|
294 | 294 | */ |
295 | 295 | public function amount() { |
296 | 296 | return $this->get( 'PAY_amount' ); |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | |
369 | 369 | /** |
370 | 370 | * Gets redirect_url |
371 | - * @return string |
|
371 | + * @return boolean |
|
372 | 372 | */ |
373 | 373 | function redirect_url() { |
374 | 374 | return $this->get('PAY_redirect_url'); |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | |
379 | 379 | /** |
380 | 380 | * Gets redirect_args |
381 | - * @return array |
|
381 | + * @return boolean |
|
382 | 382 | */ |
383 | 383 | function redirect_args() { |
384 | 384 | return $this->get('PAY_redirect_args'); |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | /** |
516 | 516 | * Gets all the extra meta info on this payment |
517 | 517 | * @param array $query_params like EEM_Base::get_all |
518 | - * @return EE_Extra_Meta |
|
518 | + * @return EE_Base_Class[] |
|
519 | 519 | */ |
520 | 520 | public function extra_meta( $query_params = array() ) { |
521 | 521 | return $this->get_many_related( 'Extra_Meta', $query_params ); |
@@ -1,5 +1,5 @@ discard block |
||
1 | -<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
2 | - exit( 'No direct script access allowed' ); |
|
1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
2 | + exit('No direct script access allowed'); |
|
3 | 3 | } |
4 | 4 | /** |
5 | 5 | * Event Espresso |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | * @subpackage includes/classes/EE_Payment.class.php |
23 | 23 | * @author Brent Christensen |
24 | 24 | */ |
25 | -class EE_Payment extends EE_Base_Class implements EEI_Payment{ |
|
25 | +class EE_Payment extends EE_Base_Class implements EEI_Payment { |
|
26 | 26 | |
27 | 27 | /** |
28 | 28 | * |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | * date_format and the second value is the time format |
34 | 34 | * @return EE_Payment |
35 | 35 | */ |
36 | - public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) { |
|
37 | - $has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats ); |
|
38 | - return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats ); |
|
36 | + public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) { |
|
37 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats); |
|
38 | + return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | * the website will be used. |
47 | 47 | * @return EE_Payment |
48 | 48 | */ |
49 | - public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) { |
|
50 | - return new self( $props_n_values, TRUE, $timezone ); |
|
49 | + public static function new_instance_from_db($props_n_values = array(), $timezone = null) { |
|
50 | + return new self($props_n_values, TRUE, $timezone); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | * @access public |
59 | 59 | * @param int $TXN_ID |
60 | 60 | */ |
61 | - public function set_transaction_id( $TXN_ID = 0 ) { |
|
62 | - $this->set( 'TXN_ID', $TXN_ID ); |
|
61 | + public function set_transaction_id($TXN_ID = 0) { |
|
62 | + $this->set('TXN_ID', $TXN_ID); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | * @return EE_Transaction |
70 | 70 | */ |
71 | 71 | public function transaction() { |
72 | - return $this->get_first_related( 'Transaction' ); |
|
72 | + return $this->get_first_related('Transaction'); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | |
@@ -80,8 +80,8 @@ discard block |
||
80 | 80 | * @access public |
81 | 81 | * @param string $STS_ID |
82 | 82 | */ |
83 | - public function set_status( $STS_ID = '' ) { |
|
84 | - $this->set( 'STS_ID', $STS_ID ); |
|
83 | + public function set_status($STS_ID = '') { |
|
84 | + $this->set('STS_ID', $STS_ID); |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | * @access public |
93 | 93 | * @param int $timestamp |
94 | 94 | */ |
95 | - public function set_timestamp( $timestamp = 0 ) { |
|
96 | - $this->set( 'PAY_timestamp', $timestamp ); |
|
95 | + public function set_timestamp($timestamp = 0) { |
|
96 | + $this->set('PAY_timestamp', $timestamp); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | |
@@ -104,8 +104,8 @@ discard block |
||
104 | 104 | * @access public |
105 | 105 | * @param string $PAY_source |
106 | 106 | */ |
107 | - public function set_source( $PAY_source = '' ) { |
|
108 | - $this->set('PAY_source',$PAY_source); |
|
107 | + public function set_source($PAY_source = '') { |
|
108 | + $this->set('PAY_source', $PAY_source); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | |
@@ -116,8 +116,8 @@ discard block |
||
116 | 116 | * @access public |
117 | 117 | * @param float $amount |
118 | 118 | */ |
119 | - public function set_amount( $amount = 0.00 ) { |
|
120 | - $this->set( 'PAY_amount', $amount ); |
|
119 | + public function set_amount($amount = 0.00) { |
|
120 | + $this->set('PAY_amount', $amount); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | |
@@ -128,8 +128,8 @@ discard block |
||
128 | 128 | * @access public |
129 | 129 | * @param string $gateway_response |
130 | 130 | */ |
131 | - public function set_gateway_response( $gateway_response = '' ) { |
|
132 | - $this->set( 'PAY_gateway_response', $gateway_response ); |
|
131 | + public function set_gateway_response($gateway_response = '') { |
|
132 | + $this->set('PAY_gateway_response', $gateway_response); |
|
133 | 133 | } |
134 | 134 | /** |
135 | 135 | * Returns the name of the paymetn method used on this payment (previously known merely as 'gateway') |
@@ -138,12 +138,12 @@ discard block |
||
138 | 138 | * @deprecated |
139 | 139 | * @return string |
140 | 140 | */ |
141 | - public function gateway(){ |
|
142 | - EE_Error::doing_it_wrong('EE_Payment::gateway', __( 'The method EE_Payment::gateway() has been deprecated. Consider instead using EE_Payment::payment_method()->name()', 'event_espresso' ), '4.6.0' ); |
|
143 | - if( $this->payment_method() ){ |
|
141 | + public function gateway() { |
|
142 | + EE_Error::doing_it_wrong('EE_Payment::gateway', __('The method EE_Payment::gateway() has been deprecated. Consider instead using EE_Payment::payment_method()->name()', 'event_espresso'), '4.6.0'); |
|
143 | + if ($this->payment_method()) { |
|
144 | 144 | return $this->payment_method()->name(); |
145 | - }else{ |
|
146 | - return __( 'Unknown', 'event_espresso' ); |
|
145 | + } else { |
|
146 | + return __('Unknown', 'event_espresso'); |
|
147 | 147 | } |
148 | 148 | } |
149 | 149 | |
@@ -155,8 +155,8 @@ discard block |
||
155 | 155 | * @access public |
156 | 156 | * @param string $txn_id_chq_nmbr |
157 | 157 | */ |
158 | - public function set_txn_id_chq_nmbr( $txn_id_chq_nmbr = '' ) { |
|
159 | - $this->set( 'PAY_txn_id_chq_nmbr', $txn_id_chq_nmbr ); |
|
158 | + public function set_txn_id_chq_nmbr($txn_id_chq_nmbr = '') { |
|
159 | + $this->set('PAY_txn_id_chq_nmbr', $txn_id_chq_nmbr); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | |
@@ -167,8 +167,8 @@ discard block |
||
167 | 167 | * @access public |
168 | 168 | * @param string $po_number |
169 | 169 | */ |
170 | - public function set_po_number( $po_number = '' ) { |
|
171 | - $this->set( 'PAY_po_number', $po_number ); |
|
170 | + public function set_po_number($po_number = '') { |
|
171 | + $this->set('PAY_po_number', $po_number); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | |
@@ -179,8 +179,8 @@ discard block |
||
179 | 179 | * @access public |
180 | 180 | * @param string $extra_accntng |
181 | 181 | */ |
182 | - public function set_extra_accntng( $extra_accntng = '' ) { |
|
183 | - $this->set( 'PAY_extra_accntng', $extra_accntng ); |
|
182 | + public function set_extra_accntng($extra_accntng = '') { |
|
183 | + $this->set('PAY_extra_accntng', $extra_accntng); |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | |
@@ -191,10 +191,10 @@ discard block |
||
191 | 191 | * @access public |
192 | 192 | * @param bool $via_admin |
193 | 193 | */ |
194 | - public function set_payment_made_via_admin( $via_admin = FALSE ) { |
|
195 | - if($via_admin){ |
|
196 | - $this->set('PAY_source', EEM_Payment_Method::scope_admin); |
|
197 | - }else{ |
|
194 | + public function set_payment_made_via_admin($via_admin = FALSE) { |
|
195 | + if ($via_admin) { |
|
196 | + $this->set('PAY_source', EEM_Payment_Method::scope_admin); |
|
197 | + } else { |
|
198 | 198 | $this->set('PAY_source', EEM_Payment_Method::scope_cart); |
199 | 199 | } |
200 | 200 | |
@@ -208,13 +208,13 @@ discard block |
||
208 | 208 | * @access public |
209 | 209 | * @param string $details |
210 | 210 | */ |
211 | - public function set_details( $details = '' ) { |
|
212 | - if ( is_array( $details ) ) { |
|
213 | - array_walk_recursive( $details, array( $this, '_strip_all_tags_within_array' )); |
|
211 | + public function set_details($details = '') { |
|
212 | + if (is_array($details)) { |
|
213 | + array_walk_recursive($details, array($this, '_strip_all_tags_within_array')); |
|
214 | 214 | } else { |
215 | - $details = wp_strip_all_tags( $details ); |
|
215 | + $details = wp_strip_all_tags($details); |
|
216 | 216 | } |
217 | - $this->set( 'PAY_details', $details ); |
|
217 | + $this->set('PAY_details', $details); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | /** |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | * @access public |
241 | 241 | */ |
242 | 242 | public function TXN_ID() { |
243 | - return $this->get( 'TXN_ID' ); |
|
243 | + return $this->get('TXN_ID'); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | |
@@ -271,8 +271,8 @@ discard block |
||
271 | 271 | * @param null $date_or_time |
272 | 272 | * @return string |
273 | 273 | */ |
274 | - public function timestamp( $dt_frmt = '', $tm_frmt = '', $date_or_time = NULL ) { |
|
275 | - return $this->get_datetime('PAY_timestamp', $dt_frmt, $tm_frmt, $date_or_time ); |
|
274 | + public function timestamp($dt_frmt = '', $tm_frmt = '', $date_or_time = NULL) { |
|
275 | + return $this->get_datetime('PAY_timestamp', $dt_frmt, $tm_frmt, $date_or_time); |
|
276 | 276 | } |
277 | 277 | |
278 | 278 | |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | * @return float |
294 | 294 | */ |
295 | 295 | public function amount() { |
296 | - return $this->get( 'PAY_amount' ); |
|
296 | + return $this->get('PAY_amount'); |
|
297 | 297 | } |
298 | 298 | |
299 | 299 | |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | * @return mixed |
303 | 303 | */ |
304 | 304 | public function amount_no_code() { |
305 | - return $this->get_pretty( 'PAY_amount', 'no_currency_code' ); |
|
305 | + return $this->get_pretty('PAY_amount', 'no_currency_code'); |
|
306 | 306 | } |
307 | 307 | |
308 | 308 | |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | * @access public |
313 | 313 | */ |
314 | 314 | public function gateway_response() { |
315 | - return $this->get( 'PAY_gateway_response' ); |
|
315 | + return $this->get('PAY_gateway_response'); |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | * @access public |
323 | 323 | */ |
324 | 324 | public function txn_id_chq_nmbr() { |
325 | - return $this->get( 'PAY_txn_id_chq_nmbr' ); |
|
325 | + return $this->get('PAY_txn_id_chq_nmbr'); |
|
326 | 326 | } |
327 | 327 | |
328 | 328 | |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | * @access public |
333 | 333 | */ |
334 | 334 | public function po_number() { |
335 | - return $this->get( 'PAY_po_number' ); |
|
335 | + return $this->get('PAY_po_number'); |
|
336 | 336 | } |
337 | 337 | |
338 | 338 | |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | * @access public |
343 | 343 | */ |
344 | 344 | public function extra_accntng() { |
345 | - return $this->get( 'PAY_extra_accntng' ); |
|
345 | + return $this->get('PAY_extra_accntng'); |
|
346 | 346 | } |
347 | 347 | |
348 | 348 | |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | * @access public |
363 | 363 | */ |
364 | 364 | public function details() { |
365 | - return $this->get( 'PAY_details' ); |
|
365 | + return $this->get('PAY_details'); |
|
366 | 366 | } |
367 | 367 | |
368 | 368 | |
@@ -391,8 +391,8 @@ discard block |
||
391 | 391 | * @param bool $show_icons |
392 | 392 | * @return void |
393 | 393 | */ |
394 | - public function e_pretty_status( $show_icons = FALSE ) { |
|
395 | - echo $this->pretty_status( $show_icons ); |
|
394 | + public function e_pretty_status($show_icons = FALSE) { |
|
395 | + echo $this->pretty_status($show_icons); |
|
396 | 396 | } |
397 | 397 | |
398 | 398 | |
@@ -402,10 +402,10 @@ discard block |
||
402 | 402 | * @param bool $show_icons |
403 | 403 | * @return string |
404 | 404 | */ |
405 | - public function pretty_status( $show_icons = FALSE ) { |
|
406 | - $status = EEM_Status::instance()->localized_status( array( $this->STS_ID() => __( 'unknown', 'event_espresso' ) ), FALSE, 'sentence' ); |
|
405 | + public function pretty_status($show_icons = FALSE) { |
|
406 | + $status = EEM_Status::instance()->localized_status(array($this->STS_ID() => __('unknown', 'event_espresso')), FALSE, 'sentence'); |
|
407 | 407 | $icon = ''; |
408 | - switch ( $this->STS_ID() ) { |
|
408 | + switch ($this->STS_ID()) { |
|
409 | 409 | case EEM_Payment::status_id_approved: |
410 | 410 | $icon = $show_icons ? '<span class="dashicons dashicons-yes ee-icon-size-24 green-text"></span>' : ''; |
411 | 411 | break; |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | $icon = $show_icons ? '<span class="dashicons dashicons-no ee-icon-size-16 red-text"></span>' : ''; |
420 | 420 | break; |
421 | 421 | } |
422 | - return $icon . $status[ $this->STS_ID() ]; |
|
422 | + return $icon.$status[$this->STS_ID()]; |
|
423 | 423 | } |
424 | 424 | |
425 | 425 | |
@@ -430,7 +430,7 @@ discard block |
||
430 | 430 | * @return boolean whether the payment is approved or not |
431 | 431 | */ |
432 | 432 | public function is_approved() { |
433 | - return $this->status_is( EEM_Payment::status_id_approved ); |
|
433 | + return $this->status_is(EEM_Payment::status_id_approved); |
|
434 | 434 | } |
435 | 435 | |
436 | 436 | |
@@ -442,8 +442,8 @@ discard block |
||
442 | 442 | * one of the status_id_* on the EEM_Payment model |
443 | 443 | * @return boolean whether the status of this payment equals the status id |
444 | 444 | */ |
445 | - protected function status_is( $STS_ID ) { |
|
446 | - if ( $STS_ID == $this->STS_ID() ) { |
|
445 | + protected function status_is($STS_ID) { |
|
446 | + if ($STS_ID == $this->STS_ID()) { |
|
447 | 447 | return TRUE; |
448 | 448 | } else { |
449 | 449 | return FALSE; |
@@ -457,7 +457,7 @@ discard block |
||
457 | 457 | * @return boolean whether the payment is pending or not |
458 | 458 | */ |
459 | 459 | public function is_pending() { |
460 | - return $this->status_is( EEM_Payment::status_id_pending ); |
|
460 | + return $this->status_is(EEM_Payment::status_id_pending); |
|
461 | 461 | } |
462 | 462 | |
463 | 463 | |
@@ -467,7 +467,7 @@ discard block |
||
467 | 467 | * @return boolean |
468 | 468 | */ |
469 | 469 | public function is_cancelled() { |
470 | - return $this->status_is( EEM_Payment::status_id_cancelled ); |
|
470 | + return $this->status_is(EEM_Payment::status_id_cancelled); |
|
471 | 471 | } |
472 | 472 | |
473 | 473 | |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | * @return boolean |
478 | 478 | */ |
479 | 479 | public function is_declined() { |
480 | - return $this->status_is( EEM_Payment::status_id_declined ); |
|
480 | + return $this->status_is(EEM_Payment::status_id_declined); |
|
481 | 481 | } |
482 | 482 | |
483 | 483 | |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | * @return boolean |
488 | 488 | */ |
489 | 489 | public function is_failed() { |
490 | - return $this->status_is( EEM_Payment::status_id_failed ); |
|
490 | + return $this->status_is(EEM_Payment::status_id_failed); |
|
491 | 491 | } |
492 | 492 | |
493 | 493 | |
@@ -507,7 +507,7 @@ discard block |
||
507 | 507 | * @return EE_Status |
508 | 508 | */ |
509 | 509 | public function status_obj() { |
510 | - return $this->get_first_related( 'Status' ); |
|
510 | + return $this->get_first_related('Status'); |
|
511 | 511 | } |
512 | 512 | |
513 | 513 | |
@@ -517,8 +517,8 @@ discard block |
||
517 | 517 | * @param array $query_params like EEM_Base::get_all |
518 | 518 | * @return EE_Extra_Meta |
519 | 519 | */ |
520 | - public function extra_meta( $query_params = array() ) { |
|
521 | - return $this->get_many_related( 'Extra_Meta', $query_params ); |
|
520 | + public function extra_meta($query_params = array()) { |
|
521 | + return $this->get_many_related('Extra_Meta', $query_params); |
|
522 | 522 | } |
523 | 523 | |
524 | 524 | |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | * offline ones, dont' create payments) |
530 | 530 | * @return EE_Payment_Method |
531 | 531 | */ |
532 | - function payment_method(){ |
|
532 | + function payment_method() { |
|
533 | 533 | return $this->get_first_related('Payment_Method'); |
534 | 534 | } |
535 | 535 | |
@@ -546,12 +546,12 @@ discard block |
||
546 | 546 | * @param string $inside_form_html |
547 | 547 | * @return string html |
548 | 548 | */ |
549 | - function redirect_form( $inside_form_html = NULL ) { |
|
549 | + function redirect_form($inside_form_html = NULL) { |
|
550 | 550 | $redirect_url = $this->redirect_url(); |
551 | - if ( ! empty( $redirect_url )) { |
|
551 | + if ( ! empty($redirect_url)) { |
|
552 | 552 | EE_Registry::instance()->load_helper('HTML'); |
553 | 553 | // what ? no inner form content? |
554 | - if( $inside_form_html === NULL ) { |
|
554 | + if ($inside_form_html === NULL) { |
|
555 | 555 | $inside_form_html = EEH_HTML::p( |
556 | 556 | sprintf( |
557 | 557 | __('If you are not automatically redirected to the payment website within 10 seconds... %1$s %2$s Click Here %3$s', 'event_espresso'), |
@@ -569,17 +569,17 @@ discard block |
||
569 | 569 | ); |
570 | 570 | //if it's a GET request, we need to remove all the GET params in the querystring |
571 | 571 | //and put them into the form instead |
572 | - if( $method == 'GET' ) { |
|
573 | - $querystring = parse_url( $redirect_url, PHP_URL_QUERY ); |
|
572 | + if ($method == 'GET') { |
|
573 | + $querystring = parse_url($redirect_url, PHP_URL_QUERY); |
|
574 | 574 | $get_params = null; |
575 | - parse_str( $querystring, $get_params ); |
|
576 | - $inside_form_html .= $this->_args_as_inputs( $get_params ); |
|
577 | - $redirect_url = str_replace( '?' . $querystring, '', $redirect_url ); |
|
575 | + parse_str($querystring, $get_params); |
|
576 | + $inside_form_html .= $this->_args_as_inputs($get_params); |
|
577 | + $redirect_url = str_replace('?'.$querystring, '', $redirect_url); |
|
578 | 578 | } |
579 | - $form = EEH_HTML::nl(1) . '<form method="' . $method . '" name="gateway_form" action="' . $redirect_url . '">'; |
|
580 | - $form .= EEH_HTML::nl(1) . $this->redirect_args_as_inputs(); |
|
579 | + $form = EEH_HTML::nl(1).'<form method="'.$method.'" name="gateway_form" action="'.$redirect_url.'">'; |
|
580 | + $form .= EEH_HTML::nl(1).$this->redirect_args_as_inputs(); |
|
581 | 581 | $form .= $inside_form_html; |
582 | - $form .= EEH_HTML::nl(-1) . '</form>' . EEH_HTML::nl(-1); |
|
582 | + $form .= EEH_HTML::nl(-1).'</form>'.EEH_HTML::nl(-1); |
|
583 | 583 | return $form; |
584 | 584 | } else { |
585 | 585 | return NULL; |
@@ -594,8 +594,8 @@ discard block |
||
594 | 594 | * and returns the html as a string |
595 | 595 | * @return string |
596 | 596 | */ |
597 | - function redirect_args_as_inputs(){ |
|
598 | - return $this->_args_as_inputs( $this->redirect_args() ); |
|
597 | + function redirect_args_as_inputs() { |
|
598 | + return $this->_args_as_inputs($this->redirect_args()); |
|
599 | 599 | } |
600 | 600 | |
601 | 601 | /** |
@@ -604,12 +604,12 @@ discard block |
||
604 | 604 | * @param array $args key-value pairs |
605 | 605 | * @return string |
606 | 606 | */ |
607 | - protected function _args_as_inputs( $args ) { |
|
607 | + protected function _args_as_inputs($args) { |
|
608 | 608 | $html = ''; |
609 | - if( $args !== NULL && is_array( $args )) { |
|
609 | + if ($args !== NULL && is_array($args)) { |
|
610 | 610 | EE_Registry::instance()->load_helper('HTML'); |
611 | - foreach( $args as $name => $value){ |
|
612 | - $html .= EEH_HTML::nl(0) . '<input type="hidden" name="' . $name . '" value="' . esc_attr( $value ) . '"/>'; |
|
611 | + foreach ($args as $name => $value) { |
|
612 | + $html .= EEH_HTML::nl(0).'<input type="hidden" name="'.$name.'" value="'.esc_attr($value).'"/>'; |
|
613 | 613 | } |
614 | 614 | } |
615 | 615 | return $html; |
@@ -624,7 +624,7 @@ discard block |
||
624 | 624 | * object itself) |
625 | 625 | * @return string for the currency code |
626 | 626 | */ |
627 | - public function currency_code(){ |
|
627 | + public function currency_code() { |
|
628 | 628 | return EE_Config::instance()->currency->code; |
629 | 629 | } |
630 | 630 | |
@@ -638,14 +638,14 @@ discard block |
||
638 | 638 | * @access private |
639 | 639 | * @param mixed $item |
640 | 640 | */ |
641 | - private function _strip_all_tags_within_array( &$item ) { |
|
642 | - if( is_object( $item ) ) { |
|
641 | + private function _strip_all_tags_within_array(&$item) { |
|
642 | + if (is_object($item)) { |
|
643 | 643 | $item = (array) $item; |
644 | 644 | } |
645 | - if( is_array( $item ) ){ |
|
646 | - array_walk_recursive( $item, array( $this, '_strip_all_tags_within_array' ) ); |
|
647 | - }else{ |
|
648 | - $item = wp_strip_all_tags( $item ); |
|
645 | + if (is_array($item)) { |
|
646 | + array_walk_recursive($item, array($this, '_strip_all_tags_within_array')); |
|
647 | + } else { |
|
648 | + $item = wp_strip_all_tags($item); |
|
649 | 649 | } |
650 | 650 | } |
651 | 651 | |
@@ -654,13 +654,13 @@ discard block |
||
654 | 654 | * is approved and was created during this request). False otherwise. |
655 | 655 | * @return boolean |
656 | 656 | */ |
657 | - public function just_approved(){ |
|
658 | - EE_Registry::instance()->load_helper( 'Array' ); |
|
659 | - $original_status =EEH_Array::is_set( $this->_props_n_values_provided_in_constructor, 'STS_ID', $this->get_model()->field_settings_for( 'STS_ID' )->get_default_value() ); |
|
657 | + public function just_approved() { |
|
658 | + EE_Registry::instance()->load_helper('Array'); |
|
659 | + $original_status = EEH_Array::is_set($this->_props_n_values_provided_in_constructor, 'STS_ID', $this->get_model()->field_settings_for('STS_ID')->get_default_value()); |
|
660 | 660 | $current_status = $this->status(); |
661 | - if( $original_status !== EEM_Payment::status_id_approved && $current_status === EEM_Payment::status_id_approved ){ |
|
661 | + if ($original_status !== EEM_Payment::status_id_approved && $current_status === EEM_Payment::status_id_approved) { |
|
662 | 662 | return TRUE; |
663 | - }else{ |
|
663 | + } else { |
|
664 | 664 | return FALSE; |
665 | 665 | } |
666 | 666 | } |
@@ -672,11 +672,11 @@ discard block |
||
672 | 672 | * @param string $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.) |
673 | 673 | * @return mixed |
674 | 674 | */ |
675 | - public function get_pretty($field_name, $extra_cache_ref = NULL){ |
|
676 | - if( $field_name == 'PAY_gateway' ){ |
|
675 | + public function get_pretty($field_name, $extra_cache_ref = NULL) { |
|
676 | + if ($field_name == 'PAY_gateway') { |
|
677 | 677 | return $this->gateway(); |
678 | 678 | } |
679 | - return $this->_get_cached_property( $field_name, TRUE, $extra_cache_ref ); |
|
679 | + return $this->_get_cached_property($field_name, TRUE, $extra_cache_ref); |
|
680 | 680 | } |
681 | 681 | |
682 | 682 | |
@@ -686,8 +686,8 @@ discard block |
||
686 | 686 | * @param array $query_params like EEM_Base::get_all |
687 | 687 | * @return EE_Registration_Payment[] |
688 | 688 | */ |
689 | - public function registration_payments( $query_params = array() ) { |
|
690 | - return $this->get_many_related( 'Registration_Payment', $query_params ); |
|
689 | + public function registration_payments($query_params = array()) { |
|
690 | + return $this->get_many_related('Registration_Payment', $query_params); |
|
691 | 691 | } |
692 | 692 | |
693 | 693 |