eventespresso / event-espresso-core

admin_pages/payments/Payments_Admin_Page.core.php

Spacing +173 added lines, -173 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -44,8 +44,8 @@ 
 	 * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
 	 * @return \Payments_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -130,19 +130,19 @@ 
 	protected function _set_page_config() {
 		$payment_method_list_config = array(
 			'nav'           => array(
-				'label' => __( 'Payment Methods', 'event_espresso' ),
+				'label' => __('Payment Methods', 'event_espresso'),
 				'order' => 10
 			),
 			'metaboxes'     => $this->_default_espresso_metaboxes,
 			'help_tabs'     => array_merge(
 				array(
 					'payment_methods_overview_help_tab' => array(
-						'title'    => __( 'Payment Methods Overview', 'event_espresso' ),
+						'title'    => __('Payment Methods Overview', 'event_espresso'),
 						'filename' => 'payment_methods_overview'
 					)
 				),
 				$this->_add_payment_method_help_tabs() ),
-			'help_tour'     => array( 'Payment_Methods_Selection_Help_Tour' ),
+			'help_tour'     => array('Payment_Methods_Selection_Help_Tour'),
 			'require_nonce' => false
 		);
 
@@ -160,7 +160,7 @@ 
 					)
 				),
 				//'help_tour' => array( 'Payment_Methods_Settings_Help_Tour' ),
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array( '_publish_post_box' ) ),
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
 				'require_nonce' => FALSE
 			),
 			'payment_log'=>array(
@@ -179,17 +179,17 @@ 
 	/**
 	 * @return array
 	 */
-	protected function _add_payment_method_help_tabs(){
+	protected function _add_payment_method_help_tabs() {
 		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		$payment_method_types = EE_Payment_Method_Manager::instance()->payment_method_types();
 		$all_pmt_help_tabs_config = array();
-		foreach( $payment_method_types as $payment_method_type ){
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $payment_method_type->cap_name(), 'specific_payment_method_type_access' ) ) {
+		foreach ($payment_method_types as $payment_method_type) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($payment_method_type->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
-			foreach( $payment_method_type->help_tabs_config() as $help_tab_name => $config ){
-				$template_args = isset( $config[ 'template_args' ] ) ? $config[ 'template_args' ] : array();
-				$template_args[ 'admin_page_obj' ] = $this;
+			foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
+				$template_args = isset($config['template_args']) ? $config['template_args'] : array();
+				$template_args['admin_page_obj'] = $this;
 				$all_pmt_help_tabs_config[$help_tab_name] = array(
 					'title'=>$config['title'],
 					'content'=>EEH_Template::display_template(
@@ -216,9 +216,9 @@ 
 
 
 	public function load_scripts_styles() {
-		wp_enqueue_script( 'ee_admin_js' );
-		wp_enqueue_script( 'ee-text-links' );
-		wp_enqueue_script( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js', array( 'espresso-ui-theme', 'ee-datepicker' ), EVENT_ESPRESSO_VERSION, TRUE );
+		wp_enqueue_script('ee_admin_js');
+		wp_enqueue_script('ee-text-links');
+		wp_enqueue_script('espresso_payments', EE_PAYMENTS_ASSETS_URL.'espresso_payments_admin.js', array('espresso-ui-theme', 'ee-datepicker'), EVENT_ESPRESSO_VERSION, TRUE);
 	}
 
 
@@ -227,9 +227,9 @@ 
 
 	public function load_scripts_styles_default() {
 		//styles
-		wp_register_style( 'espresso_payments', EE_PAYMENTS_ASSETS_URL . 'ee-payments.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'espresso_payments' );
-		wp_enqueue_style( 'ee-text-links' );
+		wp_register_style('espresso_payments', EE_PAYMENTS_ASSETS_URL.'ee-payments.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('espresso_payments');
+		wp_enqueue_style('ee-text-links');
 		//scripts
 	}
 
@@ -243,44 +243,44 @@ 
 		 * to the loading process.  However, people MUST setup the details for the payment method so its safe to do a
 		 * recheck here.
 		 */
-		EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
 		EEM_Payment_Method::instance()->verify_button_urls();
 		//setup tabs, one for each payment method type
 		$tabs = array();
 		$payment_methods = array();
-		foreach( EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj ) {
+		foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
 			// we don't want to show admin-only PMTs for now
-			if ( $pmt_obj instanceof EE_PMT_Admin_Only ) {
+			if ($pmt_obj instanceof EE_PMT_Admin_Only) {
 				continue;
 			}
 			//check access
-			if ( ! EE_Registry::instance()->CAP->current_user_can( $pmt_obj->cap_name(), 'specific_payment_method_type_access' ) ) {
+			if ( ! EE_Registry::instance()->CAP->current_user_can($pmt_obj->cap_name(), 'specific_payment_method_type_access')) {
 				continue;
 			}
 			//check for any active pms of that type
-			$payment_method = EEM_Payment_Method::instance()->get_one_of_type( $pmt_obj->system_name() );
-			if ( ! $payment_method instanceof EE_Payment_Method ) {
+			$payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
+			if ( ! $payment_method instanceof EE_Payment_Method) {
 				$payment_method = EE_Payment_Method::new_instance(
 					array(
-						'PMD_slug'					=>sanitize_key( $pmt_obj->system_name() ),
+						'PMD_slug'					=>sanitize_key($pmt_obj->system_name()),
 						'PMD_type'					=>$pmt_obj->system_name(),
 						'PMD_name'				=>$pmt_obj->pretty_name(),
 						'PMD_admin_name'	=>$pmt_obj->pretty_name()
 					)
 				);
 			}
-			$payment_methods[ $payment_method->slug() ] = $payment_method;
+			$payment_methods[$payment_method->slug()] = $payment_method;
 		}
-		$payment_methods = apply_filters( 'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods );
-		foreach( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
+		$payment_methods = apply_filters('FHEE__Payments_Admin_Page___payment_methods_list__payment_methods', $payment_methods);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				add_meta_box(
 					//html id
-					'espresso_' . $payment_method->slug() . '_payment_settings',
+					'espresso_'.$payment_method->slug().'_payment_settings',
 					//title
-					sprintf( __( '%s Settings', 'event_espresso' ), $payment_method->admin_name() ),
+					sprintf(__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
 					//callback
-					array( $this, 'payment_method_settings_meta_box' ),
+					array($this, 'payment_method_settings_meta_box'),
 					//post type
 					null,
 					//context
@@ -288,19 +288,19 @@ 
 					//priority
 					'default',
 					//callback args
-					array( 'payment_method' => $payment_method )
+					array('payment_method' => $payment_method)
 				);
 				//setup for tabbed content
-				$tabs[ $payment_method->slug() ] = array(
+				$tabs[$payment_method->slug()] = array(
 					'label' => $payment_method->admin_name(),
 					'class' => $payment_method->active() ? 'gateway-active' : '',
-					'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
-					'title' => __( 'Modify this Payment Method', 'event_espresso' ),
+					'href'  => 'espresso_'.$payment_method->slug().'_payment_settings',
+					'title' => __('Modify this Payment Method', 'event_espresso'),
 					'slug'  => $payment_method->slug()
 				);
 			}
 		}
-		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links( $tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug() );
+		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links($tabs, 'payment_method_links', '|', $this->_get_active_payment_method_slug());
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -311,20 +311,20 @@ 
 	 *   _get_active_payment_method_slug
 	 * 	@return string
 	 */
-	protected function _get_active_payment_method_slug(){
+	protected function _get_active_payment_method_slug() {
 		$payment_method_slug = FALSE;
 		//decide which payment method tab to open first, as dictated by the request's 'payment_method'
-		if ( isset( $this->_req_data['payment_method'] )) {
+		if (isset($this->_req_data['payment_method'])) {
 			// if they provided the current payment method, use it
-			$payment_method_slug = sanitize_key( $this->_req_data['payment_method'] );
+			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 		}
-		$payment_method = EEM_Payment_Method::instance()->get_one( array( array( 'PMD_slug' => $payment_method_slug )));
+		$payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
 		// if that didn't work or wasn't provided, find another way to select the current pm
-		if ( ! $this->_verify_payment_method( $payment_method )) {
+		if ( ! $this->_verify_payment_method($payment_method)) {
 			// like, looking for an active one
-			$payment_method = EEM_Payment_Method::instance()->get_one_active( 'CART' );
+			$payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
 			// test that one as well
-			if ( $this->_verify_payment_method( $payment_method )) {
+			if ($this->_verify_payment_method($payment_method)) {
 				$payment_method_slug = $payment_method->slug();
 			} else {
 				$payment_method_slug = 'paypal_standard';
@@ -342,11 +342,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	protected function _verify_payment_method( $payment_method ){
+	protected function _verify_payment_method($payment_method) {
 		if (
 			$payment_method instanceof EE_Payment_Method &&
 			$payment_method->type_obj() instanceof EE_PMT_Base &&
-			EE_Registry::instance()->CAP->current_user_can( $payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access' )
+			EE_Registry::instance()->CAP->current_user_can($payment_method->type_obj()->cap_name(), 'specific_payment_method_type_access')
 		) {
 			return TRUE;
 		}
@@ -363,21 +363,21 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function payment_method_settings_meta_box( $post_obj_which_is_null, $metabox ){
-		$payment_method = isset( $metabox['args'], $metabox['args']['payment_method'] ) ? $metabox['args']['payment_method'] : NULL;
-		if ( ! $payment_method instanceof EE_Payment_Method ){
-			throw new EE_Error( sprintf( __( 'Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso' )));
+	public function payment_method_settings_meta_box($post_obj_which_is_null, $metabox) {
+		$payment_method = isset($metabox['args'], $metabox['args']['payment_method']) ? $metabox['args']['payment_method'] : NULL;
+		if ( ! $payment_method instanceof EE_Payment_Method) {
+			throw new EE_Error(sprintf(__('Payment method metabox setup incorrectly. No Payment method object was supplied', 'event_espresso')));
 		}
 		$payment_method_scopes = $payment_method->active();
 		// if the payment method really exists show its form, otherwise the activation template
-		if ( $payment_method->ID() && ! empty( $payment_method_scopes )) {
-				$form = $this->_generate_payment_method_settings_form( $payment_method );
-				if ( $form->form_data_present_in( $this->_req_data )) {
-					$form->receive_form_submission( $this->_req_data );
+		if ($payment_method->ID() && ! empty($payment_method_scopes)) {
+				$form = $this->_generate_payment_method_settings_form($payment_method);
+				if ($form->form_data_present_in($this->_req_data)) {
+					$form->receive_form_submission($this->_req_data);
 				}
-				echo $form->form_open() . $form->get_html_and_js() . $form->form_close();
+				echo $form->form_open().$form->get_html_and_js().$form->form_close();
 		} else {
-			echo $this->_activate_payment_method_button( $payment_method )->get_html_and_js();
+			echo $this->_activate_payment_method_button($payment_method)->get_html_and_js();
 		}
 	}
 
@@ -390,14 +390,14 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _generate_payment_method_settings_form( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method instanceof EE_Payment_Method ){
+	protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			return new EE_Form_Section_Proper();
 		}
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> $payment_method->slug() . '_settings_form',
-				'html_id' 	=> $payment_method->slug() . '_settings_form',
+				'name' 	=> $payment_method->slug().'_settings_form',
+				'html_id' 	=> $payment_method->slug().'_settings_form',
 				'action' 	=> EE_Admin_Page::add_query_args_and_nonce(
 					array(
 						'action' 						=> 'update_payment_method',
@@ -409,12 +409,12 @@ 
 				'subsections' 			=> apply_filters(
 					'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
 					array(
-						'pci_dss_compliance_' . $payment_method->slug() 				=> $this->_pci_dss_compliance( $payment_method ),
-						'currency_support_' . $payment_method->slug()					=> $this->_currency_support( $payment_method ),
-						'payment_method_settings_' . $payment_method->slug() 	=> $this->_payment_method_settings( $payment_method ),
-						'update_' . $payment_method->slug()										=> $this->_update_payment_method_button( $payment_method ),
-						'deactivate_' . $payment_method->slug()								=> $this->_deactivate_payment_method_button( $payment_method ),
-						'fine_print_' . $payment_method->slug()									=> $this->_fine_print()
+						'pci_dss_compliance_'.$payment_method->slug() 				=> $this->_pci_dss_compliance($payment_method),
+						'currency_support_'.$payment_method->slug()					=> $this->_currency_support($payment_method),
+						'payment_method_settings_'.$payment_method->slug() 	=> $this->_payment_method_settings($payment_method),
+						'update_'.$payment_method->slug()										=> $this->_update_payment_method_button($payment_method),
+						'deactivate_'.$payment_method->slug()								=> $this->_deactivate_payment_method_button($payment_method),
+						'fine_print_'.$payment_method->slug()									=> $this->_fine_print()
 					),
 					$payment_method
 				)
@@ -431,19 +431,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _pci_dss_compliance( EE_Payment_Method $payment_method ) {
-		if ( $payment_method->type_obj()->requires_https() ) {
+	protected function _pci_dss_compliance(EE_Payment_Method $payment_method) {
+		if ($payment_method->type_obj()->requires_https()) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
-						EEH_HTML::strong( __( 'You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso' )) .
-						EEH_HTML::br() .
-						__( 'Learn more about ', 'event_espresso' ) . EEH_HTML::link( 'https://www.pcisecuritystandards.org/merchants/index.php', __( 'PCI DSS compliance', 'event_espresso' ))
+						EEH_HTML::strong(__('You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.', 'event_espresso')).
+						EEH_HTML::br().
+						__('Learn more about ', 'event_espresso').EEH_HTML::link('https://www.pcisecuritystandards.org/merchants/index.php', __('PCI DSS compliance', 'event_espresso'))
 					)
 				)
 			);
@@ -461,19 +461,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _currency_support( EE_Payment_Method $payment_method ) {
-		if ( ! $payment_method->usable_for_currency( EE_Config::instance()->currency->code )) {
+	protected function _currency_support(EE_Payment_Method $payment_method) {
+		if ( ! $payment_method->usable_for_currency(EE_Config::instance()->currency->code)) {
 			return new EE_Form_Section_HTML(
 				EEH_HTML::tr(
 					EEH_HTML::th(
 						EEH_HTML::label(
-							EEH_HTML::strong( __( 'IMPORTANT', 'event_espresso' ), '', 'important-notice' )
+							EEH_HTML::strong(__('IMPORTANT', 'event_espresso'), '', 'important-notice')
 						)
-					) .
+					).
 					EEH_HTML::td(
 						EEH_HTML::strong(
 							sprintf(
-								__( 'This payment method does not support the currency set on your site (%1$s). Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
+								__('This payment method does not support the currency set on your site (%1$s). Please activate a different payment method or change your site\'s country and associated currency.', 'event_espresso'),
 								EE_Config::instance()->currency->code
 							)
 						)
@@ -493,9 +493,9 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _payment_method_settings( EE_Payment_Method $payment_method ) {
+	protected function _payment_method_settings(EE_Payment_Method $payment_method) {
 		//modify the form so we only have/show fields that will be implemented for this version
-		return $this->_simplify_form( $payment_method->type_obj()->settings_form(), $payment_method->name() );
+		return $this->_simplify_form($payment_method->type_obj()->settings_form(), $payment_method->name());
 	}
 
 
@@ -508,8 +508,8 @@ 
 	 * @return \EE_Payment_Method_Form
 	 * @throws \EE_Error
 	 */
-	protected function _simplify_form( $form_section, $payment_method_name = '' ){
-		if ( $form_section instanceof EE_Payment_Method_Form ) {
+	protected function _simplify_form($form_section, $payment_method_name = '') {
+		if ($form_section instanceof EE_Payment_Method_Form) {
 			$form_section->exclude(
 				array(
 					'PMD_type', //dont want them changing the type
@@ -520,7 +520,7 @@ 
 			);
 			return $form_section;
 		} else {
-			throw new EE_Error( sprintf( __( 'The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso' ), $payment_method_name ));
+			throw new EE_Error(sprintf(__('The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.', 'event_espresso'), $payment_method_name));
 		}
 	}
 
@@ -533,19 +533,19 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_HTML
 	 */
-	protected function _update_payment_method_button( EE_Payment_Method $payment_method ) {
+	protected function _update_payment_method_button(EE_Payment_Method $payment_method) {
 		$update_button = new EE_Submit_Input(
 			array(
 				'name' => 'submit',
-				'html_id' 		=> 'save_' . $payment_method->slug() . '_settings',
-				'default' 		=> sprintf( __( 'Update %s Payment Settings', 'event_espresso' ), $payment_method->admin_name() ),
+				'html_id' 		=> 'save_'.$payment_method->slug().'_settings',
+				'default' 		=> sprintf(__('Update %s Payment Settings', 'event_espresso'), $payment_method->admin_name()),
 				'html_label' => EEH_HTML::nbsp()
 			)
 		);
 		return new EE_Form_Section_HTML(
-			EEH_HTML::no_row( EEH_HTML::br(2) ) .
+			EEH_HTML::no_row(EEH_HTML::br(2)).
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Update Settings', 'event_espresso') ) .
+				EEH_HTML::th(__('Update Settings', 'event_espresso')).
 				EEH_HTML::td(
 					$update_button->get_html_for_input()
 				)
@@ -562,11 +562,11 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _deactivate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _deactivate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Deactivate %1$s Payments?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th( __( 'Deactivate Payment Method', 'event_espresso') ) .
+				EEH_HTML::th(__('Deactivate Payment Method', 'event_espresso')).
 				EEH_HTML::td(
 					EEH_HTML::link(
 						EE_Admin_Page::add_query_args_and_nonce(
@@ -578,7 +578,7 @@ 
 						),
 						$link_text_and_title,
 						$link_text_and_title,
-						'deactivate_' . $payment_method->slug(),
+						'deactivate_'.$payment_method->slug(),
 						'espresso-button button-secondary'
 					)
 				)
@@ -594,12 +594,12 @@ 
 	 * @param \EE_Payment_Method $payment_method
 	 * @return \EE_Form_Section_Proper
 	 */
-	protected function _activate_payment_method_button( EE_Payment_Method $payment_method ) {
-		$link_text_and_title = sprintf( __( 'Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name() );
+	protected function _activate_payment_method_button(EE_Payment_Method $payment_method) {
+		$link_text_and_title = sprintf(__('Activate %1$s Payment Method?', 'event_espresso'), $payment_method->admin_name());
 		return new EE_Form_Section_Proper(
 			array(
-				'name' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
-				'html_id' 	=> 'activate_' . $payment_method->slug() . '_settings_form',
+				'name' 	=> 'activate_'.$payment_method->slug().'_settings_form',
+				'html_id' 	=> 'activate_'.$payment_method->slug().'_settings_form',
 				'action' 	=> '#',
 				'layout_strategy'		=> new EE_Admin_Two_Column_Layout(),
 				'subsections' 			=> apply_filters(
@@ -607,17 +607,17 @@ 
 					array(
 						new EE_Form_Section_HTML(
 							EEH_HTML::tr(
-								EEH_HTML::td( $payment_method->type_obj()->introductory_html(),
+								EEH_HTML::td($payment_method->type_obj()->introductory_html(),
 									'',
 									'',
 									'',
 									'colspan="2"' 
 								)
-							) . 
+							). 
 							EEH_HTML::tr(
 								EEH_HTML::th(
-									EEH_HTML::label( __( 'Click to Activate ', 'event_espresso' ))
-								) .
+									EEH_HTML::label(__('Click to Activate ', 'event_espresso'))
+								).
 								EEH_HTML::td(
 									EEH_HTML::link(
 										EE_Admin_Page::add_query_args_and_nonce(
@@ -629,7 +629,7 @@ 
 										),
 										$link_text_and_title,
 										$link_text_and_title,
-										'activate_' . $payment_method->slug(),
+										'activate_'.$payment_method->slug(),
 										'espresso-button-green button-primary'
 									)
 								)
@@ -651,9 +651,9 @@ 
 	protected function _fine_print() {
 		return new EE_Form_Section_HTML(
 			EEH_HTML::tr(
-				EEH_HTML::th() .
+				EEH_HTML::th().
 				EEH_HTML::td(
-					EEH_HTML::p( __( 'All fields marked with a * are required fields', 'event_espresso' ), '', 'grey-text' )
+					EEH_HTML::p(__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
 				)
 			)
 		);
@@ -665,15 +665,15 @@ 
 	 * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
 	 * @global WP_User $current_user
 	 */
-	protected function _activate_payment_method(){
-		if(isset($this->_req_data['payment_method_type'])){
+	protected function _activate_payment_method() {
+		if (isset($this->_req_data['payment_method_type'])) {
 			$payment_method_type = sanitize_text_field($this->_req_data['payment_method_type']);
 			//see if one exists
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type( $payment_method_type );
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$payment_method = EE_Payment_Method_Manager::instance()->activate_a_payment_method_of_type($payment_method_type);
 
-			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-		}else{
+			$this->_redirect_after_action(1, 'Payment Method', 'activated', array('action' => 'default', 'payment_method'=>$payment_method->slug()));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 		}
 	}
@@ -681,14 +681,14 @@ 
 	/**
 	 * Deactivates the payment method with the specified slug, and redirects.
 	 */
-	protected function _deactivate_payment_method(){
-		if(isset($this->_req_data['payment_method'])){
+	protected function _deactivate_payment_method() {
+		if (isset($this->_req_data['payment_method'])) {
 			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
 			//deactivate it
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
-			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method( $payment_method_slug );
-			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default','payment_method'=>$payment_method_slug));
-		}else{
+			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method($payment_method_slug);
+			$this->_redirect_after_action($count_updated, 'Payment Method', 'deactivated', array('action' => 'default', 'payment_method'=>$payment_method_slug));
+		} else {
 			$this->_redirect_after_action(FALSE, 'Payment Method', 'deactivated', array('action' => 'default'));
 		}
 	}
@@ -702,46 +702,46 @@ 
 	 * subsequently called 'headers_sent_func' which is _payment_methods_list)
 	 * @return void
 	 */
-	protected function _update_payment_method(){
-		if( $_SERVER['REQUEST_METHOD'] == 'POST'){
+	protected function _update_payment_method() {
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			//ok let's find which gateway form to use based on the form input
 			EE_Registry::instance()->load_lib('Payment_Method_Manager');
 			/** @var $correct_pmt_form_to_use EE_Payment_Method_Form */
 			$correct_pmt_form_to_use = NULL;
 			$payment_method = NULL;
-			foreach( EEM_Payment_Method::instance()->get_all() as $payment_method){
+			foreach (EEM_Payment_Method::instance()->get_all() as $payment_method) {
 				//get the form and simplify it, like what we do when we display it
-				$pmt_form = $this->_generate_payment_method_settings_form( $payment_method );
-				if($pmt_form->form_data_present_in($this->_req_data)){
+				$pmt_form = $this->_generate_payment_method_settings_form($payment_method);
+				if ($pmt_form->form_data_present_in($this->_req_data)) {
 					$correct_pmt_form_to_use = $pmt_form;
 					break;
 				}
 			}
 			//if we couldn't find the correct payment method type...
-			if( ! $correct_pmt_form_to_use ){
+			if ( ! $correct_pmt_form_to_use) {
 				EE_Error::add_error(__("We could not find which payment method type your form submission related to. Please contact support", 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				$this->_redirect_after_action(FALSE, 'Payment Method', 'activated', array('action' => 'default'));
 			}
 			$correct_pmt_form_to_use->receive_form_submission($this->_req_data);
-			if($correct_pmt_form_to_use->is_valid()){
-				$subsection_name = 'payment_method_settings_' . $payment_method->slug();
-				$payment_settings_subform = $correct_pmt_form_to_use->get_subsection( $subsection_name );
-				if( ! $payment_settings_subform instanceof EE_Payment_Method_Form ) {
+			if ($correct_pmt_form_to_use->is_valid()) {
+				$subsection_name = 'payment_method_settings_'.$payment_method->slug();
+				$payment_settings_subform = $correct_pmt_form_to_use->get_subsection($subsection_name);
+				if ( ! $payment_settings_subform instanceof EE_Payment_Method_Form) {
 					throw new EE_Error( 
 						sprintf(
-							__( 'The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.','event_espresso' ),
+							__('The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.', 'event_espresso'),
 							$subsection_name
 						)
 					);
 				}
 				$payment_settings_subform->save();
 				/** @var $pm EE_Payment_Method */
-				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default','payment_method'=>$payment_method->slug()));
-			}else{
+				$this->_redirect_after_action(TRUE, 'Payment Method', 'updated', array('action' => 'default', 'payment_method'=>$payment_method->slug()));
+			} else {
 				EE_Error::add_error(
 					sprintf(
 						__('Payment method of type %s was not saved because there were validation errors. They have been marked in the form', 'event_espresso'),
-						$payment_method instanceof EE_PMT_Base ? $payment_method->pretty_name() : __( '"(unknown)"', 'event_espresso' )
+						$payment_method instanceof EE_PMT_Base ? $payment_method->pretty_name() : __('"(unknown)"', 'event_espresso')
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -758,11 +758,11 @@ 
 	protected function _payment_settings() {
 
 		$this->_template_args['values'] = $this->_yes_no_values;
-		$this->_template_args['show_pending_payment_options'] = isset( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) ? absint( EE_Registry::instance()->CFG->registration->show_pending_payment_options ) : FALSE;
+		$this->_template_args['show_pending_payment_options'] = isset(EE_Registry::instance()->CFG->registration->show_pending_payment_options) ? absint(EE_Registry::instance()->CFG->registration->show_pending_payment_options) : FALSE;
 
-		$this->_set_add_edit_form_tags( 'update_payment_settings' );
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( EE_PAYMENTS_TEMPLATE_PATH . 'payment_settings.template.php', $this->_template_args, TRUE );
+		$this->_set_add_edit_form_tags('update_payment_settings');
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(EE_PAYMENTS_TEMPLATE_PATH.'payment_settings.template.php', $this->_template_args, TRUE);
 		$this->display_admin_page_with_sidebar();
 
 	}
@@ -776,8 +776,8 @@ 
 	*		@return array
 	*/
 	protected function _update_payment_settings() {
-		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset( $this->_req_data['show_pending_payment_options'] ) ? $this->_req_data['show_pending_payment_options'] : FALSE;
-		EE_Registry::instance()->CFG = apply_filters( 'FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG );
+		EE_Registry::instance()->CFG->registration->show_pending_payment_options = isset($this->_req_data['show_pending_payment_options']) ? $this->_req_data['show_pending_payment_options'] : FALSE;
+		EE_Registry::instance()->CFG = apply_filters('FHEE__Payments_Admin_Page___update_payment_settings__CFG', EE_Registry::instance()->CFG);
 
 //		 $superform = new EE_Form_Section_Proper(
 //		 	array(
@@ -797,9 +797,9 @@ 
 //		 	$this->_redirect_after_action( 0, 'settings', 'updated', array( 'action' => 'payment_settings' ) );
 //		 }
 
-		$what = __('Payment Settings','event_espresso');
-		$success = $this->_update_espresso_configuration( $what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__ );
-		$this->_redirect_after_action( $success, $what, __('updated','event_espresso'), array( 'action' => 'payment_settings' ) );
+		$what = __('Payment Settings', 'event_espresso');
+		$success = $this->_update_espresso_configuration($what, EE_Registry::instance()->CFG, __FILE__, __FUNCTION__, __LINE__);
+		$this->_redirect_after_action($success, $what, __('updated', 'event_espresso'), array('action' => 'payment_settings'));
 
 	}
 	protected function _payment_log_overview_list_table() {
@@ -825,18 +825,18 @@ 
 	 * @param bool $count
 	 * @return array
 	 */
-	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false){
-		EE_Registry::instance()->load_model( 'Change_Log' );
+	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false) {
+		EE_Registry::instance()->load_model('Change_Log');
 		//we may need to do multiple queries (joining differently), so we actually wan tan array of query params
-		$query_params =  array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
+		$query_params = array(array('LOG_type'=>  EEM_Change_Log::type_gateway));
 		//check if they've selected a specific payment method
-		if( isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all'){
+		if (isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all') {
 			$query_params[0]['OR*pm_or_pay_pm'] = array('Payment.Payment_Method.PMD_ID'=>$this->_req_data['_payment_method'],
 				'Payment_Method.PMD_ID'=>$this->_req_data['_payment_method']);
 		}
 		//take into account search
-		if(isset($this->_req_data['s']) && $this->_req_data['s']){
-			$similarity_string = array('LIKE','%'.str_replace("","%",$this->_req_data['s']) .'%');
+		if (isset($this->_req_data['s']) && $this->_req_data['s']) {
+			$similarity_string = array('LIKE', '%'.str_replace("", "%", $this->_req_data['s']).'%');
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
 			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
@@ -851,48 +851,48 @@ 
 			$query_params[0]['OR*s']['LOG_message'] = $similarity_string;
 
 		}
-		if(isset( $this->_req_data['payment-filter-start-date'] ) && isset( $this->_req_data['payment-filter-end-date'] )){
+		if (isset($this->_req_data['payment-filter-start-date']) && isset($this->_req_data['payment-filter-end-date'])) {
 			//add date
-			$start_date =wp_strip_all_tags( $this->_req_data['payment-filter-start-date'] );
-			$end_date = wp_strip_all_tags( $this->_req_data['payment-filter-end-date'] );
+			$start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
+			$end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
 			//make sure our timestamps start and end right at the boundaries for each day
-			$start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00';
-			$end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59';
+			$start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00';
+			$end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59';
 
 			//convert to timestamps
-			$start_date = strtotime( $start_date );
-			$end_date = strtotime( $end_date );
+			$start_date = strtotime($start_date);
+			$end_date = strtotime($end_date);
 
 			//makes sure start date is the lowest value and vice versa
-			$start_date = min( $start_date, $end_date );
-			$end_date = max( $start_date, $end_date );
+			$start_date = min($start_date, $end_date);
+			$end_date = max($start_date, $end_date);
 
 			//convert for query
-			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
-			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query( 'LOG_time', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
+			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s');
+			$end_date = EEM_Change_Log::instance()->convert_datetime_for_query('LOG_time', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s');
 
-			$query_params[0]['LOG_time'] = array('BETWEEN',array($start_date,$end_date));
+			$query_params[0]['LOG_time'] = array('BETWEEN', array($start_date, $end_date));
 
 		}
-		if($count){
+		if ($count) {
 			return EEM_Change_Log::instance()->count($query_params);
 		}
-		if(isset($this->_req_data['order'])){
-			$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
+		if (isset($this->_req_data['order'])) {
+			$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
 			$query_params['order_by'] = array('LOG_time' => $sort);
-		}else{
+		} else {
 				$query_params['order_by'] = array('LOG_time' => 'DESC');
 		}
-		$offset = ($current_page-1)*$per_page;
+		$offset = ($current_page - 1) * $per_page;
 
-		if( ! isset($this->_req_data['download_results'])){
-			$query_params['limit'] = array( $offset, $per_page );
+		if ( ! isset($this->_req_data['download_results'])) {
+			$query_params['limit'] = array($offset, $per_page);
 		}
 
 
 
 		//now they've requested to instead just download the file instead of viewing it.
-		if(isset($this->_req_data['download_results'])){
+		if (isset($this->_req_data['download_results'])) {
 			$wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
 			header('Content-Disposition: attachment');
 			header("Content-Disposition: attachment; filename=ee_payment_logs_for_".sanitize_key(site_url()));
@@ -914,36 +914,36 @@ 
 	 * @param EE_Change_Log $logB
 	 * @return int
 	 */
-	protected function _sort_logs_again($logA,$logB){
+	protected function _sort_logs_again($logA, $logB) {
 		$timeA = $logA->get_raw('LOG_time');
 		$timeB = $logB->get_raw('LOG_time');
-		if($timeA == $timeB){
+		if ($timeA == $timeB) {
 			return 0;
 		}
 		$comparison = $timeA < $timeB ? -1 : 1;
-		if(strtoupper($this->_sort_logs_again_direction) == 'DESC'){
+		if (strtoupper($this->_sort_logs_again_direction) == 'DESC') {
 			return $comparison * -1;
-		}else{
+		} else {
 			return $comparison;
 		}
 	}
 
 	protected function _payment_log_details() {
-		EE_Registry::instance()->load_model( 'Change_Log' );
+		EE_Registry::instance()->load_model('Change_Log');
 		/** @var $payment_log EE_Change_Log */
 		$payment_log = EEM_Change_Log::instance()->get_one_by_ID($this->_req_data['ID']);
 		$payment_method = NULL;
 		$transaction = NULL;
-		if( $payment_log instanceof EE_Change_Log ){
-			if( $payment_log->object() instanceof EE_Payment ){
+		if ($payment_log instanceof EE_Change_Log) {
+			if ($payment_log->object() instanceof EE_Payment) {
 				$payment_method = $payment_log->object()->payment_method();
 				$transaction = $payment_log->object()->transaction();
-			}elseif($payment_log->object() instanceof EE_Payment_Method){
+			}elseif ($payment_log->object() instanceof EE_Payment_Method) {
 				$payment_method = $payment_log->object();
 			}
 		}
 		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
-			EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
+			EE_PAYMENTS_TEMPLATE_PATH.'payment_log_details.template.php',
 			array(
 				'payment_log'=>$payment_log,
 				'payment_method'=>$payment_method,

modules/batch/EED_Batch.module.php

Indentation +9 added lines, -9 removed lines

@@ -155,14 +155,14 @@ 
 		wp_enqueue_script( 'batch_runner', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js', array( 'progress_bar' ));
 		//just copy the bits of EE admin's eei18n that we need in the JS
 		wp_localize_script(
-		    'batch_runner',
-            'eei18n',
-            array(
-                'ajax_url' => WP_AJAX_URL,
-                'is_admin' => (bool)is_admin(),
-                'error_message' => esc_html__('An error occurred and the job has been stopped.', 'event_espresso')
-            )
-        );
+			'batch_runner',
+			'eei18n',
+			array(
+				'ajax_url' => WP_AJAX_URL,
+				'is_admin' => (bool)is_admin(),
+				'error_message' => esc_html__('An error occurred and the job has been stopped.', 'event_espresso')
+			)
+		);
 		$job_handler_classname = stripslashes( $_GET[ 'job_handler' ] );
 		$request_data = array_diff_key( 
 				$_REQUEST, 
@@ -258,7 +258,7 @@ 
 		if ( NULL === error_get_last() || ! headers_sent() ) {
 			header('Content-Type: application/json; charset=UTF-8');
 		}
-        echo wp_json_encode( $json );
+		echo wp_json_encode( $json );
 		exit();
 	}
 	

Spacing +55 added lines, -55 removed lines

@@ -17,13 +17,13 @@ 
  * @since		 	   4.8.30.rc.007
  *
  */
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
-define( 'BATCH_URL', plugin_dir_url( __FILE__ ) );
+define('BATCH_URL', plugin_dir_url(__FILE__));
 
-class EED_Batch extends EED_Module{
+class EED_Batch extends EED_Module {
 	
 	/**
 	 * Possibly value for $_REQUEST[ 'batch' ]. Indicates to run a job that
@@ -70,9 +70,9 @@ 
 	public static function set_hooks() {
 		//because this is a possibel attack vector, let's have this disabled until 
 		//we at least have a real use for it on the frontend
-		if( apply_filters( 'FHEE__EED_Batch__set_hooks__enable_frontend_batch', false ) ) {
-			add_action( 'wp_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) );
-			add_filter( 'template_include', array( self::instance(), 'override_template' ), 99 );
+		if (apply_filters('FHEE__EED_Batch__set_hooks__enable_frontend_batch', false)) {
+			add_action('wp_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
+			add_filter('template_include', array(self::instance(), 'override_template'), 99);
 		}
 	}
 	
@@ -80,28 +80,28 @@ 
 	 * Initializes some hooks for the admin in order to run batch jobs
 	 */
 	public static function set_hooks_admin() {
-		add_action( 'admin_menu', array( self::instance(), 'register_admin_pages' ) );
-		add_action( 'admin_enqueue_scripts', array( self::instance(), 'enqueue_scripts' ) );
+		add_action('admin_menu', array(self::instance(), 'register_admin_pages'));
+		add_action('admin_enqueue_scripts', array(self::instance(), 'enqueue_scripts'));
 		
 		//ajax
-		add_action('wp_ajax_espresso_batch_continue',array(self::instance(),'batch_continue'));
-		add_action('wp_ajax_espresso_batch_cleanup',array(self::instance(),'batch_cleanup'));
-		add_action('wp_ajax_nopriv_espresso_batch_continue',array(self::instance(),'batch_continue'));
-		add_action('wp_ajax_nopriv_espresso_batch_cleanup',array(self::instance(),'batch_cleanup'));
+		add_action('wp_ajax_espresso_batch_continue', array(self::instance(), 'batch_continue'));
+		add_action('wp_ajax_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
+		add_action('wp_ajax_nopriv_espresso_batch_continue', array(self::instance(), 'batch_continue'));
+		add_action('wp_ajax_nopriv_espresso_batch_cleanup', array(self::instance(), 'batch_cleanup'));
 	}
 	
 	/**
 	 * Enqueues batch scripts on the frontend or admin, and creates a job
 	 */
 	public function enqueue_scripts() { 
-		if( isset( $_REQUEST[ 'espresso_batch' ] ) 
+		if (isset($_REQUEST['espresso_batch']) 
 			|| 
 			( 
-				isset( $_REQUEST[ 'page' ] )
-				&& $_REQUEST[ 'page' ] == 'espresso_batch'
+				isset($_REQUEST['page'])
+				&& $_REQUEST['page'] == 'espresso_batch'
 			) 
 		) { 
-			switch( $this->batch_request_type() ) {
+			switch ($this->batch_request_type()) {
 				case self::batch_job:
 					$this->enqueue_scripts_styles_batch_create();
 					break;
@@ -117,11 +117,11 @@ 
 	 */
 	public function enqueue_scripts_styles_batch_create() {	
 		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-		wp_enqueue_script( 'batch_runner_init', BATCH_URL . 'assets/batch_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'batch_runner_init', 'ee_job_response', $job_response->to_array() );
-		wp_localize_script( 'batch_runner_init', 'ee_job_i18n', 
+		wp_enqueue_script('batch_runner_init', BATCH_URL.'assets/batch_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('batch_runner_init', 'ee_job_response', $job_response->to_array());
+		wp_localize_script('batch_runner_init', 'ee_job_i18n', 
 			array(
-				'return_url' => $_REQUEST['return_url' ],
+				'return_url' => $_REQUEST['return_url'],
 			));
 	}
 	
@@ -131,15 +131,15 @@ 
 	public function enqueue_scripts_styles_batch_file_create() {
 		//creates a job based on the request variable
 		$job_response = $this->_enqueue_batch_job_scripts_and_styles_and_start_job();
-		wp_enqueue_script( 'batch_file_runner_init', BATCH_URL . 'assets/batch_file_runner_init.js', array( 'batch_runner' ), EVENT_ESPRESSO_VERSION, true );
-		wp_localize_script( 'batch_file_runner_init', 'ee_job_response', $job_response->to_array() );
-		wp_localize_script( 'batch_file_runner_init', 'ee_job_i18n', 
+		wp_enqueue_script('batch_file_runner_init', BATCH_URL.'assets/batch_file_runner_init.js', array('batch_runner'), EVENT_ESPRESSO_VERSION, true);
+		wp_localize_script('batch_file_runner_init', 'ee_job_response', $job_response->to_array());
+		wp_localize_script('batch_file_runner_init', 'ee_job_i18n', 
 				array(
 					'download_and_redirecting' => sprintf( 
 							__('File Generation complete. Downloading, and %1$sredirecting%2$s...', 'event_espresso'),
-							'<a href="' . $_REQUEST['return_url' ] .'">',
+							'<a href="'.$_REQUEST['return_url'].'">',
 							'</a>' ),
-					'return_url' => $_REQUEST['return_url' ],
+					'return_url' => $_REQUEST['return_url'],
 				));
 	}
 	
@@ -150,26 +150,26 @@ 
 	 * @return \EventEspressoBatchRequest\Helpers\JobStepResponse
 	 */
 	protected function _enqueue_batch_job_scripts_and_styles_and_start_job() {
-		wp_register_script( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.js', array( 'jquery' ) );
-		wp_enqueue_style( 'progress_bar', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_script( 'batch_runner', EE_PLUGIN_DIR_URL . 'core/libraries/batch/Assets/batch_runner.js', array( 'progress_bar' ));
+		wp_register_script('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.js', array('jquery'));
+		wp_enqueue_style('progress_bar', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/progress_bar.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('batch_runner', EE_PLUGIN_DIR_URL.'core/libraries/batch/Assets/batch_runner.js', array('progress_bar'));
 		//just copy the bits of EE admin's eei18n that we need in the JS
 		wp_localize_script(
 		    'batch_runner',
             'eei18n',
             array(
                 'ajax_url' => WP_AJAX_URL,
-                'is_admin' => (bool)is_admin(),
+                'is_admin' => (bool) is_admin(),
                 'error_message' => esc_html__('An error occurred and the job has been stopped.', 'event_espresso')
             )
         );
-		$job_handler_classname = stripslashes( $_GET[ 'job_handler' ] );
+		$job_handler_classname = stripslashes($_GET['job_handler']);
 		$request_data = array_diff_key( 
 				$_REQUEST, 
-				array_flip( array( 'action',  'page', 'ee', 'batch' ) ) );
+				array_flip(array('action', 'page', 'ee', 'batch')) );
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
 		//eg 'EventEspressoBatchRequest\JobHandlers\RegistrationsReport'
-		$job_response = $batch_runner->create_job( $job_handler_classname, $request_data );
+		$job_response = $batch_runner->create_job($job_handler_classname, $request_data);
 		//remember the response for later. We need it to display the page body
 		$this->_job_step_response = $job_response;
 		return $job_response;
@@ -180,9 +180,9 @@ 
 	 * @param string $template
 	 * @return string
 	 */
-	public function override_template( $template ) {
-		if( isset( $_REQUEST[ 'espresso_batch' ] ) && isset( $_REQUEST[ 'batch' ] ) ) {
-			return EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_frontend_wrapper.template.html';
+	public function override_template($template) {
+		if (isset($_REQUEST['espresso_batch']) && isset($_REQUEST['batch'])) {
+			return EE_MODULES.'batch'.DS.'templates'.DS.'batch_frontend_wrapper.template.html';
 		}
 		return $template;
 	}
@@ -193,11 +193,11 @@ 
 	public function register_admin_pages() {
 		add_submenu_page( 
 			'', //parent slug. we don't want this to actually appear in the menu
-			__( 'Batch Job', 'event_espresso' ), //page title
+			__('Batch Job', 'event_espresso'), //page title
 			'n/a', //menu title
 			'read', //we want this page to actually be accessible to anyone,  
 			'espresso_batch', //menu slug
-			array( self::instance(), 'show_admin_page' )
+			array(self::instance(), 'show_admin_page')
 		);
 	}
 	
@@ -207,8 +207,8 @@ 
 	 */
 	public function show_admin_page() { 
 		echo EEH_Template::locate_template( 
-			EE_MODULES . 'batch' . DS . 'templates' . DS . 'batch_wrapper.template.html', 
-			array( 'batch_request_type' => $this->batch_request_type() )
+			EE_MODULES.'batch'.DS.'templates'.DS.'batch_wrapper.template.html', 
+			array('batch_request_type' => $this->batch_request_type())
 		);
 	}
 	
@@ -216,10 +216,10 @@ 
 	 * Receives ajax calls for continuing a job
 	 */
 	public function batch_continue() {
-		$job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] );
+		$job_id = sanitize_text_field($_REQUEST['job_id']);
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-		$response_obj = $batch_runner->continue_job( $job_id);
-		$this->_return_json( $response_obj->to_array() );
+		$response_obj = $batch_runner->continue_job($job_id);
+		$this->_return_json($response_obj->to_array());
 	}
 	
 	/**
@@ -227,10 +227,10 @@ 
 	 * @return type
 	 */
 	public function batch_cleanup() {
-		$job_id = sanitize_text_field( $_REQUEST[ 'job_id' ] );
+		$job_id = sanitize_text_field($_REQUEST['job_id']);
 		$batch_runner = new EventEspressoBatchRequest\BatchRequestProcessor();
-		$response_obj = $batch_runner->cleanup_job( $job_id );
-		$this->_return_json( $response_obj->to_array() );
+		$response_obj = $batch_runner->cleanup_job($job_id);
+		$this->_return_json($response_obj->to_array());
 	}
 	
 	
@@ -246,7 +246,7 @@ 
 	 *	'isEEajax' => true,//indicates this is a response from EE
 	 * )
 	 */
-	protected function _return_json( $data ) {
+	protected function _return_json($data) {
 		$json = array(
 			'notices' => EE_Error::get_notices(),
 			'data' => $data,
@@ -255,10 +255,10 @@ 
 
 
 		// make sure there are no php errors or headers_sent.  Then we can set correct json header.
-		if ( NULL === error_get_last() || ! headers_sent() ) {
+		if (NULL === error_get_last() || ! headers_sent()) {
 			header('Content-Type: application/json; charset=UTF-8');
 		}
-        echo wp_json_encode( $json );
+        echo wp_json_encode($json);
 		exit();
 	}
 	
@@ -274,16 +274,16 @@ 
 	 * @return string: EED_Batch::batch_job, EED_Batch::batch_file_job, EED_Batch::batch_not_job
 	 */
 	public function batch_request_type() {
-		if( $this->_batch_request_type === null ) {
-			if( isset( $_GET[ 'batch' ] ) ) {
-				if( $_GET[ 'batch' ] == self::batch_job ) {
+		if ($this->_batch_request_type === null) {
+			if (isset($_GET['batch'])) {
+				if ($_GET['batch'] == self::batch_job) {
 					$this->_batch_request_type = self::batch_job;
-				} elseif( $_GET[ 'batch' ] == self::batch_file_job ) {
+				} elseif ($_GET['batch'] == self::batch_file_job) {
 					$this->_batch_request_type = self::batch_file_job;
 				}
 			}
 			//if we didn't find that it was a batch request, indicate it wasn't
-			if( $this->_batch_request_type === null ) {
+			if ($this->_batch_request_type === null) {
 				$this->_batch_request_type = self::batch_not_job;
 			}
 		}
@@ -294,7 +294,7 @@ 
 	 * Unnecessary
 	 * @param type $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		
 	}
 

modules/ticket_selector/templates/ticket_details.template.php

Indentation +123 added lines, -123 removed lines

@@ -22,38 +22,38 @@ 
                 <p><?php echo $ticket->description(); ?></p>
 
                 <?php
-                do_action(
-                    'AHEE__ticket_selector_chart_template__ticket_details__after_description',
-                    $ticket,
-                    $ticket_price,
-                    $display_ticket_price
-                );
-                ?>
+				do_action(
+					'AHEE__ticket_selector_chart_template__ticket_details__after_description',
+					$ticket,
+					$ticket_price,
+					$display_ticket_price
+				);
+				?>
 
                 <section class="tckt-slctr-tkt-sale-dates-sctn">
                     <h5><?php echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading',
-                        esc_html__( 'Sale Dates', 'event_espresso' )
-                        ); ?>
+						'FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading',
+						esc_html__( 'Sale Dates', 'event_espresso' )
+						); ?>
                     </h5>
                     <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__ticket_details_dates_available_message',
-                        esc_html__( 'The dates when this option is available for purchase.', 'event_espresso' )
-                        ); ?></span>
+						'FHEE__ticket_selector_chart_template__ticket_details_dates_available_message',
+						esc_html__( 'The dates when this option is available for purchase.', 'event_espresso' )
+						); ?></span>
                     <br/>
                     <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale',
-                        esc_html__( 'Goes On Sale:', 'event_espresso' )
-                        ); ?></span>
+						'FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale',
+						esc_html__( 'Goes On Sale:', 'event_espresso' )
+						); ?></span>
                     <span class="dashicons dashicons-calendar"></span>
                     <?php echo $ticket->get_i18n_datetime('TKT_start_date', $date_format) . ' &nbsp; '; ?>
                     <span  class="dashicons dashicons-clock"></span>
                     <?php echo $ticket->get_i18n_datetime('TKT_start_date',$time_format); ?>
                     <br/>
                     <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__ticket_details_sales_end',
-                        esc_html__( 'Sales End:', 'event_espresso' )
-                        ); ?></span>
+						'FHEE__ticket_selector_chart_template__ticket_details_sales_end',
+						esc_html__( 'Sales End:', 'event_espresso' )
+						); ?></span>
                     <span class="dashicons dashicons-calendar"></span>
                     <?php echo $ticket->get_i18n_datetime('TKT_end_date', $date_format) . ' &nbsp; '; ?>
                     <span class="dashicons dashicons-clock"></span>
@@ -67,34 +67,34 @@ 
                 <?php if ( $ticket->min() && $ticket->max() ) { ?>
                     <section class="tckt-slctr-tkt-quantities-sctn">
                         <h5><?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading',
-                            esc_html__( 'Purchasable Quantities', 'event_espresso' )
-                            ); ?></h5>
+							'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading',
+							esc_html__( 'Purchasable Quantities', 'event_espresso' )
+							); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message',
-                            esc_html__(
-                            'The number of tickets that can be purchased per transaction (if available).',
-                            'event_espresso'
-                            )
-                            ); ?></span><br/>
+							'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message',
+							esc_html__(
+							'The number of tickets that can be purchased per transaction (if available).',
+							'event_espresso'
+							)
+							); ?></span><br/>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty',
-                            esc_html__( 'Minimum Qty:', 'event_espresso' )
-                            ); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
+							'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty',
+							esc_html__( 'Minimum Qty:', 'event_espresso' )
+							); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
                         <?php if ( $ticket->min() > $remaining ) { ?> &nbsp; <span
                         class="important-notice small-text"><?php echo apply_filters(
-                        'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message',
-                        esc_html__(
-                        'The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining',
-                        'event_espresso'
-                        )
-                        ); ?></span><?php } ?><br/>
+						'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message',
+						esc_html__(
+						'The Minimum Quantity purchasable for this ticket exceeds the number of spaces remaining',
+						'event_espresso'
+						)
+						); ?></span><?php } ?><br/>
                         <?php //$max = min( $max, $max_atndz );?>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty',
-                            esc_html__( 'Maximum Qty:', 'event_espresso' )
-                            ); ?></span><?php echo $ticket->max() === EE_INF ? esc_html__( 'no limit', 'event_espresso' )
-                        : max( $ticket->max(), 1 ); ?><br/>
+							'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty',
+							esc_html__( 'Maximum Qty:', 'event_espresso' )
+							); ?></span><?php echo $ticket->max() === EE_INF ? esc_html__( 'no limit', 'event_espresso' )
+						: max( $ticket->max(), 1 ); ?><br/>
                     </section>
                     <br/>
                 <?php } ?>
@@ -102,43 +102,43 @@ 
                 <?php if ( ( ! defined( 'EE_DECAF' ) || EE_DECAF !== true ) && $ticket->uses() !== EE_INF ) { ?>
                     <section class="tckt-slctr-tkt-uses-sctn">
                         <h5><?php echo apply_filters(
-                                'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading',
-                                esc_html__( 'Event Date Ticket Uses', 'event_espresso' )
-                            ); ?></h5>
+								'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading',
+								esc_html__( 'Event Date Ticket Uses', 'event_espresso' )
+							); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php
-                            echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_message',
-                            sprintf(
-                                esc_html__(
-                                    'The number of separate event datetimes (see table below) that this ticket can be used to gain admittance to.%1$s%2$sAdmission is always one person per ticket.%3$s',
-                                    'event_espresso'
-                                ),
-                                '<br/>',
-                                '<strong>',
-                                '</strong>'
-                                )
-                            );
-                            ?></span><br/>
+							echo apply_filters(
+							'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_message',
+							sprintf(
+								esc_html__(
+									'The number of separate event datetimes (see table below) that this ticket can be used to gain admittance to.%1$s%2$sAdmission is always one person per ticket.%3$s',
+									'event_espresso'
+								),
+								'<br/>',
+								'<strong>',
+								'</strong>'
+								)
+							);
+							?></span><br/>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes',
-                            esc_html__( '# Datetimes:', 'event_espresso' )
-                            ); ?></span><?php echo $ticket->uses(); ?><br/>
+							'FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes',
+							esc_html__( '# Datetimes:', 'event_espresso' )
+							); ?></span><?php echo $ticket->uses(); ?><br/>
                     </section>
                 <?php } ?>
 
                 <?php
-                $datetimes = $ticket->datetimes_ordered( $event_is_expired, false );
-                $chart_column_width = $show_ticket_sale_columns ? ' ee-fourth-width' : ' ee-half-width';
-                if ( ! empty( $datetimes ) ) { ?>
+				$datetimes = $ticket->datetimes_ordered( $event_is_expired, false );
+				$chart_column_width = $show_ticket_sale_columns ? ' ee-fourth-width' : ' ee-half-width';
+				if ( ! empty( $datetimes ) ) { ?>
                     <section class="tckt-slctr-tkt-datetimes-sctn">
                         <h5><?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_event_access_heading',
-                            esc_html__( 'Access', 'event_espresso' )
-                            ); ?></h5>
+							'FHEE__ticket_selector_chart_template__ticket_details_event_access_heading',
+							esc_html__( 'Access', 'event_espresso' )
+							); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_details_event_access_message',
-                            esc_html__( 'This option allows access to the following dates and times.', 'event_espresso' )
-                            ); ?></span>
+							'FHEE__ticket_selector_chart_template__ticket_details_event_access_message',
+							esc_html__( 'This option allows access to the following dates and times.', 'event_espresso' )
+							); ?></span>
                         <div class="tckt-slctr-tkt-details-tbl-wrap-dv">
                             <table class="tckt-slctr-tkt-details-tbl">
                                 <thead>
@@ -146,9 +146,9 @@ 
                                     <th class="tckt-slctr-tkt-details-date-th">
                                         <span class="dashicons dashicons-calendar"></span><span
                                         class="small-text"><?php echo apply_filters(
-                                            'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
-                                            esc_html__( 'Date ', 'event_espresso' )
-                                            ); ?></span>
+											'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
+											esc_html__( 'Date ', 'event_espresso' )
+											); ?></span>
                                     </th>
                                     <th class="tckt-slctr-tkt-details-time-th <?php echo $chart_column_width; ?>">
                                         <span class="dashicons dashicons-clock"></span><span
@@ -157,98 +157,98 @@ 
                                     <?php if ( $show_ticket_sale_columns ) : ?>
                                         <th class="tckt-slctr-tkt-details-this-ticket-sold-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
-                                                sprintf( esc_html__( 'Sold', 'event_espresso' ), '<br/>' )
-                                                ); ?></span>
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
+												sprintf( esc_html__( 'Sold', 'event_espresso' ), '<br/>' )
+												); ?></span>
                                         </th>
                                         <th class="tckt-slctr-tkt-details-this-ticket-left-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
-                                                sprintf( esc_html__( 'Remaining', 'event_espresso' ), '<br/>' )
-                                                ); ?></span>
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
+												sprintf( esc_html__( 'Remaining', 'event_espresso' ), '<br/>' )
+												); ?></span>
                                         </th>
                                         <th
                                         class="tckt-slctr-tkt-details-total-tickets-sold-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
-                                                sprintf( esc_html__( 'Total%sSold', 'event_espresso' ), '<br/>' )
-                                                ); ?></span>
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
+												sprintf( esc_html__( 'Total%sSold', 'event_espresso' ), '<br/>' )
+												); ?></span>
                                         </th>
                                         <th
                                         class="tckt-slctr-tkt-details-total-tickets-left-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
-                                                sprintf( esc_html__( 'Total Spaces%sLeft', 'event_espresso' ), '<br/>' )
-                                                ); ?></span>
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
+												sprintf( esc_html__( 'Total Spaces%sLeft', 'event_espresso' ), '<br/>' )
+												); ?></span>
                                         </th>
                                     <?php endif; //end $show_ticket_sale_columns conditional ?>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 <?php
-                                foreach ( $datetimes as $datetime ) {
-                                    if ( $datetime instanceof EE_Datetime ) {
-                                        ?>
+								foreach ( $datetimes as $datetime ) {
+									if ( $datetime instanceof EE_Datetime ) {
+										?>
 
                                         <tr>
                                             <td data-th="<?php echo apply_filters(
-                                            'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
-                                            esc_html__( 'Event Date ', 'event_espresso' )
-                                            ); ?>" class="small-text">
+											'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
+											esc_html__( 'Event Date ', 'event_espresso' )
+											); ?>" class="small-text">
                                                 <?php $datetime_name = $datetime->name(); ?>
                                                 <?php echo ! empty( $datetime_name ) ? '<b>'
-                                                                                       . $datetime_name
-                                                                                       . '</b><br/>' : ''; ?>
+																					   . $datetime_name
+																					   . '</b><br/>' : ''; ?>
                                                 <?php echo $datetime->date_range(
-                                                $date_format,
-                                                esc_html__( ' to  ', 'event_espresso' )
-                                                ); ?>
+												$date_format,
+												esc_html__( ' to  ', 'event_espresso' )
+												); ?>
                                             </td>
                                             <td data-th="<?php esc_html_e( 'Time ', 'event_espresso' ); ?>"
                                                 class="cntr small-text">
                                                 <?php echo $datetime->time_range(
-                                                $time_format,
-                                                esc_html__( ' to  ', 'event_espresso' )
-                                                ); ?>
+												$time_format,
+												esc_html__( ' to  ', 'event_espresso' )
+												); ?>
                                             </td>
                                             <?php if ( $show_ticket_sale_columns ) : ?>
                                                 <td data-th="<?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
-                                                esc_html__( 'Sold', 'event_espresso' )
-                                                ); ?>" class="cntr small-text">
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
+												esc_html__( 'Sold', 'event_espresso' )
+												); ?>" class="cntr small-text">
                                                     <?php echo $ticket->sold(); ?>
                                                 </td>
                                                 <td data-th="<?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
-                                                esc_html__( 'Remaining', 'event_espresso' )
-                                                ); ?>" class="cntr small-text">
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
+												esc_html__( 'Remaining', 'event_espresso' )
+												); ?>" class="cntr small-text">
                                                     <?php echo $remaining === EE_INF
-                                                    ? '<span class="smaller-text">' . esc_html__(
-                                                    'unlimited ',
-                                                    'event_espresso'
-                                                    ) . '</span>' : $remaining; ?>
+													? '<span class="smaller-text">' . esc_html__(
+													'unlimited ',
+													'event_espresso'
+													) . '</span>' : $remaining; ?>
                                                 </td>
                                                 <td data-th="<?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
-                                                esc_html__( 'Total Sold', 'event_espresso' )
-                                                ); ?>" class="cntr small-text">
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
+												esc_html__( 'Total Sold', 'event_espresso' )
+												); ?>" class="cntr small-text">
                                                     <?php echo $datetime->sold(); ?>
                                                 </td>
                                                 <?php $tkts_left = $datetime->sold_out()
-                                                ? '<span class="sold-out smaller-text">' . esc_html__(
-                                                'Sold&nbsp;Out',
-                                                'event_espresso'
-                                                ) . '</span>' : $datetime->spaces_remaining(); ?>
+												? '<span class="sold-out smaller-text">' . esc_html__(
+												'Sold&nbsp;Out',
+												'event_espresso'
+												) . '</span>' : $datetime->spaces_remaining(); ?>
                                                 <td data-th="<?php echo apply_filters(
-                                                'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
-                                                esc_html__( 'Total Spaces Left', 'event_espresso' )
-                                                ); ?>" class="cntr small-text">
+												'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
+												esc_html__( 'Total Spaces Left', 'event_espresso' )
+												); ?>" class="cntr small-text">
                                                     <?php echo $tkts_left === EE_INF ? '<span class="smaller-text">'
-                                                                                       . esc_html__(
-                                                                                       'unlimited ',
-                                                                                       'event_espresso'
-                                                                                       )
-                                                                                       . '</span>' : $tkts_left; ?>
+																					   . esc_html__(
+																					   'unlimited ',
+																					   'event_espresso'
+																					   )
+																					   . '</span>' : $tkts_left; ?>
                                                 </td>
                                             <?php endif; //end $show_ticket_sale_columns conditional ?>
                                         </tr>

Spacing +48 added lines, -48 removed lines

@@ -12,13 +12,13 @@ 
 /** @var string $price_breakdown_heading */
 /** @var \EventEspresso\modules\ticket_selector\TicketDetails $ticket_details */
 ?>
-<?php if ( $show_ticket_details ) : ?>
+<?php if ($show_ticket_details) : ?>
 <tr class="tckt-slctr-tkt-details-tr <?php echo $ticket_details_row_class; ?>">
     <td class="tckt-slctr-tkt-details-td" colspan="<?php echo $cols; ?>">
         <div id="<?php echo $ticket_details_css_id; ?>-dv" class="tckt-slctr-tkt-details-dv" style="display: none;">
 
             <section class="tckt-slctr-tkt-details-sctn">
-                <h3><?php echo esc_html__( 'Details', 'event_espresso' ); ?></h3>
+                <h3><?php echo esc_html__('Details', 'event_espresso'); ?></h3>
                 <p><?php echo $ticket->description(); ?></p>
 
                 <?php
@@ -33,42 +33,42 @@ 
                 <section class="tckt-slctr-tkt-sale-dates-sctn">
                     <h5><?php echo apply_filters(
                         'FHEE__ticket_selector_chart_template__ticket_details_sales_date_heading',
-                        esc_html__( 'Sale Dates', 'event_espresso' )
+                        esc_html__('Sale Dates', 'event_espresso')
                         ); ?>
                     </h5>
                     <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
                         'FHEE__ticket_selector_chart_template__ticket_details_dates_available_message',
-                        esc_html__( 'The dates when this option is available for purchase.', 'event_espresso' )
+                        esc_html__('The dates when this option is available for purchase.', 'event_espresso')
                         ); ?></span>
                     <br/>
                     <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
                         'FHEE__ticket_selector_chart_template__ticket_details_goes_on_sale',
-                        esc_html__( 'Goes On Sale:', 'event_espresso' )
+                        esc_html__('Goes On Sale:', 'event_espresso')
                         ); ?></span>
                     <span class="dashicons dashicons-calendar"></span>
-                    <?php echo $ticket->get_i18n_datetime('TKT_start_date', $date_format) . ' &nbsp; '; ?>
+                    <?php echo $ticket->get_i18n_datetime('TKT_start_date', $date_format).' &nbsp; '; ?>
                     <span  class="dashicons dashicons-clock"></span>
-                    <?php echo $ticket->get_i18n_datetime('TKT_start_date',$time_format); ?>
+                    <?php echo $ticket->get_i18n_datetime('TKT_start_date', $time_format); ?>
                     <br/>
                     <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
                         'FHEE__ticket_selector_chart_template__ticket_details_sales_end',
-                        esc_html__( 'Sales End:', 'event_espresso' )
+                        esc_html__('Sales End:', 'event_espresso')
                         ); ?></span>
                     <span class="dashicons dashicons-calendar"></span>
-                    <?php echo $ticket->get_i18n_datetime('TKT_end_date', $date_format) . ' &nbsp; '; ?>
+                    <?php echo $ticket->get_i18n_datetime('TKT_end_date', $date_format).' &nbsp; '; ?>
                     <span class="dashicons dashicons-clock"></span>
                     <?php echo $ticket->get_i18n_datetime('TKT_end_date', $time_format); ?>
                     <br/>
                 </section>
                 <br/>
 
-                <?php do_action( 'AHEE__ticket_selector_chart_template__after_ticket_date', $ticket ); ?>
+                <?php do_action('AHEE__ticket_selector_chart_template__after_ticket_date', $ticket); ?>
 
-                <?php if ( $ticket->min() && $ticket->max() ) { ?>
+                <?php if ($ticket->min() && $ticket->max()) { ?>
                     <section class="tckt-slctr-tkt-quantities-sctn">
                         <h5><?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_heading',
-                            esc_html__( 'Purchasable Quantities', 'event_espresso' )
+                            esc_html__('Purchasable Quantities', 'event_espresso')
                             ); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_message',
@@ -79,9 +79,9 @@ 
                             ); ?></span><br/>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty',
-                            esc_html__( 'Minimum Qty:', 'event_espresso' )
+                            esc_html__('Minimum Qty:', 'event_espresso')
                             ); ?></span><?php echo $ticket->min() > 0 ? $ticket->min() : 0; ?>
-                        <?php if ( $ticket->min() > $remaining ) { ?> &nbsp; <span
+                        <?php if ($ticket->min() > $remaining) { ?> &nbsp; <span
                         class="important-notice small-text"><?php echo apply_filters(
                         'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_min_qty_message',
                         esc_html__(
@@ -92,18 +92,18 @@ 
                         <?php //$max = min( $max, $max_atndz );?>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_purchasable_quantities_max_qty',
-                            esc_html__( 'Maximum Qty:', 'event_espresso' )
-                            ); ?></span><?php echo $ticket->max() === EE_INF ? esc_html__( 'no limit', 'event_espresso' )
-                        : max( $ticket->max(), 1 ); ?><br/>
+                            esc_html__('Maximum Qty:', 'event_espresso')
+                            ); ?></span><?php echo $ticket->max() === EE_INF ? esc_html__('no limit', 'event_espresso')
+                        : max($ticket->max(), 1); ?><br/>
                     </section>
                     <br/>
                 <?php } ?>
 
-                <?php if ( ( ! defined( 'EE_DECAF' ) || EE_DECAF !== true ) && $ticket->uses() !== EE_INF ) { ?>
+                <?php if (( ! defined('EE_DECAF') || EE_DECAF !== true) && $ticket->uses() !== EE_INF) { ?>
                     <section class="tckt-slctr-tkt-uses-sctn">
                         <h5><?php echo apply_filters(
                                 'FHEE__ticket_selector_chart_template__ticket_details_event_date_ticket_uses_heading',
-                                esc_html__( 'Event Date Ticket Uses', 'event_espresso' )
+                                esc_html__('Event Date Ticket Uses', 'event_espresso')
                             ); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php
                             echo apply_filters(
@@ -121,23 +121,23 @@ 
                             ?></span><br/>
                         <span class="ticket-details-label-spn drk-grey-text"><?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_event_date_number_datetimes',
-                            esc_html__( '# Datetimes:', 'event_espresso' )
+                            esc_html__('# Datetimes:', 'event_espresso')
                             ); ?></span><?php echo $ticket->uses(); ?><br/>
                     </section>
                 <?php } ?>
 
                 <?php
-                $datetimes = $ticket->datetimes_ordered( $event_is_expired, false );
+                $datetimes = $ticket->datetimes_ordered($event_is_expired, false);
                 $chart_column_width = $show_ticket_sale_columns ? ' ee-fourth-width' : ' ee-half-width';
-                if ( ! empty( $datetimes ) ) { ?>
+                if ( ! empty($datetimes)) { ?>
                     <section class="tckt-slctr-tkt-datetimes-sctn">
                         <h5><?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_event_access_heading',
-                            esc_html__( 'Access', 'event_espresso' )
+                            esc_html__('Access', 'event_espresso')
                             ); ?></h5>
                         <span class="drk-grey-text small-text no-bold"> - <?php echo apply_filters(
                             'FHEE__ticket_selector_chart_template__ticket_details_event_access_message',
-                            esc_html__( 'This option allows access to the following dates and times.', 'event_espresso' )
+                            esc_html__('This option allows access to the following dates and times.', 'event_espresso')
                             ); ?></span>
                         <div class="tckt-slctr-tkt-details-tbl-wrap-dv">
                             <table class="tckt-slctr-tkt-details-tbl">
@@ -147,38 +147,38 @@ 
                                         <span class="dashicons dashicons-calendar"></span><span
                                         class="small-text"><?php echo apply_filters(
                                             'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
-                                            esc_html__( 'Date ', 'event_espresso' )
+                                            esc_html__('Date ', 'event_espresso')
                                             ); ?></span>
                                     </th>
                                     <th class="tckt-slctr-tkt-details-time-th <?php echo $chart_column_width; ?>">
                                         <span class="dashicons dashicons-clock"></span><span
-                                        class="small-text"><?php esc_html_e( 'Time ', 'event_espresso' ); ?></span>
+                                        class="small-text"><?php esc_html_e('Time ', 'event_espresso'); ?></span>
                                     </th>
-                                    <?php if ( $show_ticket_sale_columns ) : ?>
+                                    <?php if ($show_ticket_sale_columns) : ?>
                                         <th class="tckt-slctr-tkt-details-this-ticket-sold-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
-                                                sprintf( esc_html__( 'Sold', 'event_espresso' ), '<br/>' )
+                                                sprintf(esc_html__('Sold', 'event_espresso'), '<br/>')
                                                 ); ?></span>
                                         </th>
                                         <th class="tckt-slctr-tkt-details-this-ticket-left-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
-                                                sprintf( esc_html__( 'Remaining', 'event_espresso' ), '<br/>' )
+                                                sprintf(esc_html__('Remaining', 'event_espresso'), '<br/>')
                                                 ); ?></span>
                                         </th>
                                         <th
                                         class="tckt-slctr-tkt-details-total-tickets-sold-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
-                                                sprintf( esc_html__( 'Total%sSold', 'event_espresso' ), '<br/>' )
+                                                sprintf(esc_html__('Total%sSold', 'event_espresso'), '<br/>')
                                                 ); ?></span>
                                         </th>
                                         <th
                                         class="tckt-slctr-tkt-details-total-tickets-left-th ee-fourth-width cntr">
                                             <span class="smaller-text"><?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
-                                                sprintf( esc_html__( 'Total Spaces%sLeft', 'event_espresso' ), '<br/>' )
+                                                sprintf(esc_html__('Total Spaces%sLeft', 'event_espresso'), '<br/>')
                                                 ); ?></span>
                                         </th>
                                     <?php endif; //end $show_ticket_sale_columns conditional ?>
@@ -186,62 +186,62 @@ 
                                 </thead>
                                 <tbody>
                                 <?php
-                                foreach ( $datetimes as $datetime ) {
-                                    if ( $datetime instanceof EE_Datetime ) {
+                                foreach ($datetimes as $datetime) {
+                                    if ($datetime instanceof EE_Datetime) {
                                         ?>
 
                                         <tr>
                                             <td data-th="<?php echo apply_filters(
                                             'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_event_date',
-                                            esc_html__( 'Event Date ', 'event_espresso' )
+                                            esc_html__('Event Date ', 'event_espresso')
                                             ); ?>" class="small-text">
                                                 <?php $datetime_name = $datetime->name(); ?>
-                                                <?php echo ! empty( $datetime_name ) ? '<b>'
+                                                <?php echo ! empty($datetime_name) ? '<b>'
                                                                                        . $datetime_name
                                                                                        . '</b><br/>' : ''; ?>
                                                 <?php echo $datetime->date_range(
                                                 $date_format,
-                                                esc_html__( ' to  ', 'event_espresso' )
+                                                esc_html__(' to  ', 'event_espresso')
                                                 ); ?>
                                             </td>
-                                            <td data-th="<?php esc_html_e( 'Time ', 'event_espresso' ); ?>"
+                                            <td data-th="<?php esc_html_e('Time ', 'event_espresso'); ?>"
                                                 class="cntr small-text">
                                                 <?php echo $datetime->time_range(
                                                 $time_format,
-                                                esc_html__( ' to  ', 'event_espresso' )
+                                                esc_html__(' to  ', 'event_espresso')
                                                 ); ?>
                                             </td>
-                                            <?php if ( $show_ticket_sale_columns ) : ?>
+                                            <?php if ($show_ticket_sale_columns) : ?>
                                                 <td data-th="<?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_sold',
-                                                esc_html__( 'Sold', 'event_espresso' )
+                                                esc_html__('Sold', 'event_espresso')
                                                 ); ?>" class="cntr small-text">
                                                     <?php echo $ticket->sold(); ?>
                                                 </td>
                                                 <td data-th="<?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_this_ticket_left',
-                                                esc_html__( 'Remaining', 'event_espresso' )
+                                                esc_html__('Remaining', 'event_espresso')
                                                 ); ?>" class="cntr small-text">
                                                     <?php echo $remaining === EE_INF
-                                                    ? '<span class="smaller-text">' . esc_html__(
+                                                    ? '<span class="smaller-text">'.esc_html__(
                                                     'unlimited ',
                                                     'event_espresso'
-                                                    ) . '</span>' : $remaining; ?>
+                                                    ).'</span>' : $remaining; ?>
                                                 </td>
                                                 <td data-th="<?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_sold',
-                                                esc_html__( 'Total Sold', 'event_espresso' )
+                                                esc_html__('Total Sold', 'event_espresso')
                                                 ); ?>" class="cntr small-text">
                                                     <?php echo $datetime->sold(); ?>
                                                 </td>
                                                 <?php $tkts_left = $datetime->sold_out()
-                                                ? '<span class="sold-out smaller-text">' . esc_html__(
+                                                ? '<span class="sold-out smaller-text">'.esc_html__(
                                                 'Sold&nbsp;Out',
                                                 'event_espresso'
-                                                ) . '</span>' : $datetime->spaces_remaining(); ?>
+                                                ).'</span>' : $datetime->spaces_remaining(); ?>
                                                 <td data-th="<?php echo apply_filters(
                                                 'FHEE__ticket_selector_chart_template__ticket_details_event_access_table_total_ticket_left',
-                                                esc_html__( 'Total Spaces Left', 'event_espresso' )
+                                                esc_html__('Total Spaces Left', 'event_espresso')
                                                 ); ?>" class="cntr small-text">
                                                     <?php echo $tkts_left === EE_INF ? '<span class="smaller-text">'
                                                                                        . esc_html__(
@@ -266,4 +266,4 @@ 
         </div>
     </td>
 </tr>
-<?php endif;  //end template_settings->show_ticket_details check?>
\ No newline at end of file
+<?php endif; //end template_settings->show_ticket_details check?>
\ No newline at end of file

caffeinated/modules/ticket_selector_caff/EED_Ticket_Selector_Caff.module.php

Indentation +60 added lines, -60 removed lines

@@ -28,12 +28,12 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks() {
-        add_action(
-            'AHEE__ticket_selector_chart_template__ticket_details__after_description',
-            array('EED_Ticket_Selector_Caff', 'ticket_price_details'),
-            10,
-            3
-        );
+		add_action(
+			'AHEE__ticket_selector_chart_template__ticket_details__after_description',
+			array('EED_Ticket_Selector_Caff', 'ticket_price_details'),
+			10,
+			3
+		);
 	}
 
 	/**
@@ -53,14 +53,14 @@ 
 	 * @param \WP $WP
 	 */
 	public function run( $WP ) {
-        $this->set_config();
+		$this->set_config();
 	}
 
 
 
 
 	protected function set_config(){
-        $this->set_config_section( 'template_settings' );
+		$this->set_config_section( 'template_settings' );
 		$this->set_config_class( 'EE_Ticket_Selector_Config' );
 		$this->set_config_name( 'EED_Ticket_Selector' );
 	}
@@ -109,27 +109,27 @@ 
 
 
 
-    /**
-     * @return \EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    public static function _ticket_selector_appearance_settings() {
-        if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
-            \EED_Ticket_Selector::instance()->set_config();
-            \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
-        }
-        // get option for whether to show datetime selector in TS
-	    $show_datetime_selector = \EE_Registry::instance()
-		    ->CFG
-		    ->template_settings
-		    ->EED_Ticket_Selector
-		    ->getShowDatetimeSelector();
-	    // and option for how may datetimes must exist if display is conditional
-	    $datetime_selector_threshold = \EE_Registry::instance()
-		    ->CFG
-		    ->template_settings
-		    ->EED_Ticket_Selector
-		    ->getDatetimeSelectorThreshold();
+	/**
+	 * @return \EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	public static function _ticket_selector_appearance_settings() {
+		if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
+			\EED_Ticket_Selector::instance()->set_config();
+			\EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
+		}
+		// get option for whether to show datetime selector in TS
+		$show_datetime_selector = \EE_Registry::instance()
+			->CFG
+			->template_settings
+			->EED_Ticket_Selector
+			->getShowDatetimeSelector();
+		// and option for how may datetimes must exist if display is conditional
+		$datetime_selector_threshold = \EE_Registry::instance()
+			->CFG
+			->template_settings
+			->EED_Ticket_Selector
+			->getDatetimeSelectorThreshold();
 
 		return new EE_Form_Section_Proper(
 			array(
@@ -171,19 +171,19 @@ 
 								)
 							),
 							'show_datetime_selector' => new EE_Select_Input(
-                                \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false),
+								\EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false),
 								array(
 									'html_label_text' => esc_html__( 'Show Date & Time Filter?', 'event_espresso' ),
 									'html_help_text' => sprintf(
-									    esc_html__(
-									        'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates and times for the available tickets. Ticket options can be unselected, which removes (hides) them from the list of tickets being displayed.%1$sOptions include:%1$s • %2$sdo not show date & time filter%3$s%1$s   this option will NEVER display a date filter, regardless of how many dates exist.%1$s • %2$smaybe show date & time filter%3$s%1$s   this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".',
-                                            'event_espresso'
-                                        ),
-                                        '<br>',
-                                        '<strong>',
-                                        '</strong>'
-
-                                    ),
+										esc_html__(
+											'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates and times for the available tickets. Ticket options can be unselected, which removes (hides) them from the list of tickets being displayed.%1$sOptions include:%1$s &bull; %2$sdo not show date & time filter%3$s%1$s &nbsp; this option will NEVER display a date filter, regardless of how many dates exist.%1$s &bull; %2$smaybe show date & time filter%3$s%1$s &nbsp; this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".',
+											'event_espresso'
+										),
+										'<br>',
+										'<strong>',
+										'</strong>'
+
+									),
 									'default' => ! empty( $show_datetime_selector )
 										? $show_datetime_selector
 										: \EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR,
@@ -191,13 +191,13 @@ 
 								)
 							),
 							'datetime_selector_threshold' => new EE_Select_Input(
-                                array_combine($r = range(1, 10), $r),
+								array_combine($r = range(1, 10), $r),
 								array(
 									'html_label_text' => esc_html__( 'Date & Time Filter Threshold', 'event_espresso' ),
 									'html_help_text' => esc_html__(
-                                        'The number of unique dates an event has to have before conditionally displaying a date & time filter',
-                                        'event_espresso'
-                                    ),
+										'The number of unique dates an event has to have before conditionally displaying a date & time filter',
+										'event_espresso'
+									),
 									'default' => ! empty( $datetime_selector_threshold )
 										? $datetime_selector_threshold
 										: 3,
@@ -223,8 +223,8 @@ 
 	 */
 	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
 		if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
-            \EED_Ticket_Selector::instance()->set_config();
-            $CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
+			\EED_Ticket_Selector::instance()->set_config();
+			$CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
 		}
 		try {
 			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
@@ -246,11 +246,11 @@ 
 					$CFG->EED_Ticket_Selector->show_ticket_details = $valid_data['appearance_settings']['show_ticket_details'];
 					$CFG->EED_Ticket_Selector->show_expired_tickets = $valid_data['appearance_settings']['show_expired_tickets'];
 					$CFG->EED_Ticket_Selector->setShowDatetimeSelector(
-					    $valid_data['appearance_settings']['show_datetime_selector']
-                    );
+						$valid_data['appearance_settings']['show_datetime_selector']
+					);
 					$CFG->EED_Ticket_Selector->setDatetimeSelectorThreshold(
-					    $valid_data['appearance_settings']['datetime_selector_threshold']
-                    );
+						$valid_data['appearance_settings']['datetime_selector_threshold']
+					);
 				} else {
 					if ( $ticket_selector_form->submission_error_message() !== '' ) {
 						EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
@@ -267,17 +267,17 @@ 
 
 
 
-    /**
-     * @param \EE_Ticket $ticket
-     * @param int        $ticket_price
-     * @param bool       $display_ticket_price
-     */
-    public static function ticket_price_details(EE_Ticket $ticket, $ticket_price = 0, $display_ticket_price = false)
-    {
-        require(
-            str_replace('\\', DS, plugin_dir_path(__FILE__))
-            . 'templates' . DS . 'ticket_selector_price_details.template.php'
-        );
+	/**
+	 * @param \EE_Ticket $ticket
+	 * @param int        $ticket_price
+	 * @param bool       $display_ticket_price
+	 */
+	public static function ticket_price_details(EE_Ticket $ticket, $ticket_price = 0, $display_ticket_price = false)
+	{
+		require(
+			str_replace('\\', DS, plugin_dir_path(__FILE__))
+			. 'templates' . DS . 'ticket_selector_price_details.template.php'
+		);
 	}
 
 

Spacing +33 added lines, -33 removed lines

@@ -16,7 +16,7 @@ 
 	 * @return EED_Ticket_Selector_Caff
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -43,26 +43,26 @@ 
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define( 'TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace( '\\', DS, plugin_dir_path( __FILE__ )) . 'templates' . DS );
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Ticket_Selector_Caff', 'template_settings_form' ), 10 );
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Ticket_Selector_Caff', 'update_template_settings' ), 10, 2 );
+		define('TICKET_SELECTOR_CAFF_TEMPLATES_PATH', str_replace('\\', DS, plugin_dir_path(__FILE__)).'templates'.DS);
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Ticket_Selector_Caff', 'template_settings_form'), 10);
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Ticket_Selector_Caff', 'update_template_settings'), 10, 2);
 	}
 
 
 	/**
 	 * @param \WP $WP
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
         $this->set_config();
 	}
 
 
 
 
-	protected function set_config(){
-        $this->set_config_section( 'template_settings' );
-		$this->set_config_class( 'EE_Ticket_Selector_Config' );
-		$this->set_config_name( 'EED_Ticket_Selector' );
+	protected function set_config() {
+        $this->set_config_section('template_settings');
+		$this->set_config_class('EE_Ticket_Selector_Config');
+		$this->set_config_name('EED_Ticket_Selector');
 	}
 
 
@@ -97,8 +97,8 @@ 
 					'FHEE__EED_Ticket_Selector_Caff___ticket_selector_settings_form__form_subsections',
 					array(
 						'appearance_settings_hdr' 	=> new EE_Form_Section_HTML(
-							EEH_HTML::br(2) .
-							EEH_HTML::h2( esc_html__( 'Ticket Selector Template Settings', 'event_espresso' ))
+							EEH_HTML::br(2).
+							EEH_HTML::h2(esc_html__('Ticket Selector Template Settings', 'event_espresso'))
 						),
 						'appearance_settings' 			=> EED_Ticket_Selector_Caff::_ticket_selector_appearance_settings()
 					)
@@ -114,7 +114,7 @@ 
      * @throws \EE_Error
      */
     public static function _ticket_selector_appearance_settings() {
-        if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
+        if ( ! \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
             \EED_Ticket_Selector::instance()->set_config();
             \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
         }
@@ -142,9 +142,9 @@ 
 						array(
 							'show_ticket_details' => new EE_Yes_No_Input(
 								array(
-									'html_label_text' => esc_html__('Show Ticket Details?', 'event_espresso' ),
-									'html_help_text' => esc_html__( 'This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details )
+									'html_label_text' => esc_html__('Show Ticket Details?', 'event_espresso'),
+									'html_help_text' => esc_html__('This lets you choose whether the extra ticket details section is displayed with the ticket selector.', 'event_espresso'),
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details)
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_details
 										: true,
 									'display_html_label_text' => false
@@ -152,9 +152,9 @@ 
 							),
 							'show_ticket_sale_columns' => new EE_Yes_No_Input(
 								array(
-									'html_label_text' => esc_html__('Show Ticket Sale Info?', 'event_espresso' ),
-									'html_help_text' => esc_html__( 'This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'),
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns )
+									'html_label_text' => esc_html__('Show Ticket Sale Info?', 'event_espresso'),
+									'html_help_text' => esc_html__('This lets you indicate whether information about ticket sales is shown with ticket details in the ticket selector.', 'event_espresso'),
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns)
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_ticket_sale_columns
 										: true,
 									'display_html_label_text' => false
@@ -162,9 +162,9 @@ 
 							),
 							'show_expired_tickets' => new EE_Yes_No_Input(
 								array(
-									'html_label_text' => esc_html__( 'Show Expired Tickets?', 'event_espresso' ),
-									'html_help_text' => esc_html__( 'Indicate whether to show expired tickets in the ticket selector', 'event_espresso' ),
-									'default' => isset( EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets )
+									'html_label_text' => esc_html__('Show Expired Tickets?', 'event_espresso'),
+									'html_help_text' => esc_html__('Indicate whether to show expired tickets in the ticket selector', 'event_espresso'),
+									'default' => isset(EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets)
 										? EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->show_expired_tickets
 										: true,
 									'display_html_label_text' => false
@@ -173,7 +173,7 @@ 
 							'show_datetime_selector' => new EE_Select_Input(
                                 \EE_Registry::instance()->CFG->template_settings->EED_Ticket_Selector->getShowDatetimeSelectorOptions(false),
 								array(
-									'html_label_text' => esc_html__( 'Show Date & Time Filter?', 'event_espresso' ),
+									'html_label_text' => esc_html__('Show Date & Time Filter?', 'event_espresso'),
 									'html_help_text' => sprintf(
 									    esc_html__(
 									        'Indicates whether or not to display a dropdown select box above each ticket selector that displays dates and times for the available tickets. Ticket options can be unselected, which removes (hides) them from the list of tickets being displayed.%1$sOptions include:%1$s • %2$sdo not show date & time filter%3$s%1$s   this option will NEVER display a date filter, regardless of how many dates exist.%1$s • %2$smaybe show date & time filter%3$s%1$s   this option will conditionally display the date filter when the number of dates for the event matches the value set for "Date Filter Threshold".',
@@ -184,7 +184,7 @@ 
                                         '</strong>'
 
                                     ),
-									'default' => ! empty( $show_datetime_selector )
+									'default' => ! empty($show_datetime_selector)
 										? $show_datetime_selector
 										: \EE_Ticket_Selector_Config::DO_NOT_SHOW_DATETIME_SELECTOR,
 									'display_html_label_text' => false
@@ -193,12 +193,12 @@ 
 							'datetime_selector_threshold' => new EE_Select_Input(
                                 array_combine($r = range(1, 10), $r),
 								array(
-									'html_label_text' => esc_html__( 'Date & Time Filter Threshold', 'event_espresso' ),
+									'html_label_text' => esc_html__('Date & Time Filter Threshold', 'event_espresso'),
 									'html_help_text' => esc_html__(
                                         'The number of unique dates an event has to have before conditionally displaying a date & time filter',
                                         'event_espresso'
                                     ),
-									'default' => ! empty( $datetime_selector_threshold )
+									'default' => ! empty($datetime_selector_threshold)
 										? $datetime_selector_threshold
 										: 3,
 									'display_html_label_text' => false
@@ -221,8 +221,8 @@ 
 	 * @param array              $REQ incoming request
 	 * @return EE_Template_Config
 	 */
-	public static function update_template_settings( EE_Template_Config $CFG, $REQ ) {
-		if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config ) {
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ) {
+		if ( ! $CFG->EED_Ticket_Selector instanceof EE_Ticket_Selector_Config) {
             \EED_Ticket_Selector::instance()->set_config();
             $CFG->EED_Ticket_Selector = \EED_Ticket_Selector::instance()->config();
 		}
@@ -230,13 +230,13 @@ 
 			$ticket_selector_form = EED_Ticket_Selector_Caff::_ticket_selector_settings_form();
 
 			//check for form submission
-			if ( $ticket_selector_form->was_submitted() ) {
+			if ($ticket_selector_form->was_submitted()) {
 
 				//capture form data
 				$ticket_selector_form->receive_form_submission();
 
 				//validate form data
-				if ( $ticket_selector_form->is_valid() ) {
+				if ($ticket_selector_form->is_valid()) {
 
 					//grab validated data from form
 					$valid_data = $ticket_selector_form->valid_data();
@@ -252,13 +252,13 @@ 
 					    $valid_data['appearance_settings']['datetime_selector_threshold']
                     );
 				} else {
-					if ( $ticket_selector_form->submission_error_message() !== '' ) {
-						EE_Error::add_error( $ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($ticket_selector_form->submission_error_message() !== '') {
+						EE_Error::add_error($ticket_selector_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 
 			}
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 
@@ -276,7 +276,7 @@ 
     {
         require(
             str_replace('\\', DS, plugin_dir_path(__FILE__))
-            . 'templates' . DS . 'ticket_selector_price_details.template.php'
+            . 'templates'.DS.'ticket_selector_price_details.template.php'
         );
 	}
 

caffeinated/modules/ticket_selector_caff/templates/ticket_selector_price_details.template.php

Indentation +15 added lines, -15 removed lines

@@ -7,7 +7,7 @@ 
 if ($display_ticket_price) { ?>
     <section class="tckt-slctr-tkt-price-sctn">
         <h5><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
-                esc_html__('Price', 'event_espresso')); ?></h5>
+				esc_html__('Price', 'event_espresso')); ?></h5>
         <div class="tckt-slctr-tkt-details-tbl-wrap-dv">
             <table class="tckt-slctr-tkt-details-tbl">
                 <thead>
@@ -30,12 +30,12 @@ 
                             class="jst-rght small-text"><?php echo $ticket->base_price()->pretty_price(); ?></td>
                     </tr>
                     <?php
-                    $running_total = $ticket->base_price()->amount();
-                } else {
-                    $running_total = 0;
-                }
-                // now add price modifiers
-                foreach ($ticket->price_modifiers() as $price_mod) { ?>
+					$running_total = $ticket->base_price()->amount();
+				} else {
+					$running_total = 0;
+				}
+				// now add price modifiers
+				foreach ($ticket->price_modifiers() as $price_mod) { ?>
                     <tr>
                         <td data-th="<?php esc_html_e('Name', 'event_espresso'); ?>"
                             class="jst-rght small-text"><?php echo $price_mod->name(); ?></td>
@@ -45,16 +45,16 @@ 
                                 %
                             </td>
                             <?php
-                            $new_sub_total = $running_total * ($price_mod->amount() / 100);
-                            $new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
-                            ?>
+							$new_sub_total = $running_total * ($price_mod->amount() / 100);
+							$new_sub_total = $price_mod->is_discount() ? $new_sub_total * -1 : $new_sub_total;
+							?>
                         <?php } else { ?>
                             <?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1
-                                : $price_mod->amount(); ?>
+								: $price_mod->amount(); ?>
                             <td data-th="<?php esc_html_e('Description', 'event_espresso'); ?>"
                                 class="small-text"><?php echo $price_mod->desc(); ?></td>
                             <?php $new_sub_total = $price_mod->is_discount() ? $price_mod->amount() * -1
-                                : $price_mod->amount(); ?>
+								: $price_mod->amount(); ?>
                         <?php } ?>
                         <td data-th="<?php esc_html_e('Amount', 'event_espresso'); ?>"
                             class="jst-rght small-text"><?php echo EEH_Template::format_currency($new_sub_total); ?></td>
@@ -65,7 +65,7 @@ 
                     <?php //$ticket_subtotal =$ticket->get_ticket_subtotal(); ?>
                     <tr>
                         <td colspan="2" class="jst-rght small-text sbttl"><b><?php esc_html_e('subtotal',
-                                    'event_espresso'); ?></b></td>
+									'event_espresso'); ?></b></td>
                         <td data-th="<?php esc_html_e('subtotal', 'event_espresso'); ?>" class="jst-rght small-text">
                             <b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
                     </tr>
@@ -87,9 +87,9 @@ 
                 <tr>
                     <td colspan="2" class="jst-rght small-text ttl-lbl-td">
                         <b><?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price',
-                                esc_html__('Total', 'event_espresso')); ?></b></td>
+								esc_html__('Total', 'event_espresso')); ?></b></td>
                     <td data-th="<?php echo apply_filters('FHEE__ticket_selector_chart_template__ticket_details_total_price',
-                        esc_html__('Total', 'event_espresso')); ?>" class="jst-rght small-text">
+						esc_html__('Total', 'event_espresso')); ?>" class="jst-rght small-text">
                         <b><?php echo EEH_Template::format_currency($running_total); ?></b></td>
                 </tr>
                 </tbody>

core/EE_Front_Controller.core.php

Indentation +690 added lines, -690 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 /**
@@ -22,695 +22,695 @@ 
 final class EE_Front_Controller
 {
 
-    /**
-     *    $_template_path
-     * @var    string $_template_path
-     * @access    public
-     */
-    private $_template_path;
-
-    /**
-     *    $_template
-     * @var    string $_template
-     * @access    public
-     */
-    private $_template;
-
-    /**
-     * @type  EE_Registry $Registry
-     * @access    protected
-     */
-    protected $Registry;
-
-    /**
-     * @type  EE_Request_Handler $Request_Handler
-     * @access    protected
-     */
-    protected $Request_Handler;
-
-    /**
-     * @type  EE_Module_Request_Router $Module_Request_Router
-     * @access    protected
-     */
-    protected $Module_Request_Router;
-
-
-    /**
-     *    class constructor
-     *    should fire after shortcode, module, addon, or other plugin's default priority init phases have run
-     *
-     * @access    public
-     * @param \EE_Registry              $Registry
-     * @param \EE_Request_Handler       $Request_Handler
-     * @param \EE_Module_Request_Router $Module_Request_Router
-     */
-    public function __construct(
-        EE_Registry $Registry,
-        EE_Request_Handler $Request_Handler,
-        EE_Module_Request_Router $Module_Request_Router
-    ) {
-        $this->Registry              = $Registry;
-        $this->Request_Handler       = $Request_Handler;
-        $this->Module_Request_Router = $Module_Request_Router;
-        // make sure template tags are loaded immediately so that themes don't break
-        add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'load_espresso_template_tags'), 10);
-        // determine how to integrate WP_Query with the EE models
-        add_action('AHEE__EE_System__initialize', array($this, 'employ_CPT_Strategy'));
-        // load other resources and begin to actually run shortcodes and modules
-        add_action('wp_loaded', array($this, 'wp_loaded'), 5);
-        // analyse the incoming WP request
-        add_action('parse_request', array($this, 'get_request'), 1, 1);
-        // process any content shortcodes
-        add_action('parse_request', array($this, '_initialize_shortcodes'), 5);
-        // process request with module factory
-        add_action('pre_get_posts', array($this, 'pre_get_posts'), 10, 1);
-        // before headers sent
-        add_action('wp', array($this, 'wp'), 5);
-        // load css and js
-        add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 1);
-        // header
-        add_action('wp_head', array($this, 'header_meta_tag'), 5);
-        add_action('wp_print_scripts', array($this, 'wp_print_scripts'), 10);
-        add_filter('template_include', array($this, 'template_include'), 1);
-        // display errors
-        add_action('loop_start', array($this, 'display_errors'), 2);
-        // the content
-        // add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 );
-        //exclude our private cpt comments
-        add_filter('comments_clauses', array($this, 'filter_wp_comments'), 10, 1);
-        //make sure any ajax requests will respect the url schema when requests are made against admin-ajax.php (http:// or https://)
-        add_filter('admin_url', array($this, 'maybe_force_admin_ajax_ssl'), 200, 1);
-        // action hook EE
-        do_action('AHEE__EE_Front_Controller__construct__done', $this);
-        // for checking that browser cookies are enabled
-        if (apply_filters('FHEE__EE_Front_Controller____construct__set_test_cookie', true)) {
-            setcookie('ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/');
-        }
-    }
-
-
-    /**
-     * @return EE_Request_Handler
-     */
-    public function Request_Handler()
-    {
-        return $this->Request_Handler;
-    }
-
-
-    /**
-     * @return EE_Module_Request_Router
-     */
-    public function Module_Request_Router()
-    {
-        return $this->Module_Request_Router;
-    }
-
-
-
-
-
-    /***********************************************        INIT ACTION HOOK         ***********************************************/
-
-
-    /**
-     *    load_espresso_template_tags - if current theme is an espresso theme, or uses ee theme template parts, then
-     *    load it's functions.php file ( if not already loaded )
-     *
-     * @return void
-     */
-    public function load_espresso_template_tags()
-    {
-        if (is_readable(EE_PUBLIC . 'template_tags.php')) {
-            require_once(EE_PUBLIC . 'template_tags.php');
-        }
-    }
-
-
-    /**
-     * filter_wp_comments
-     * This simply makes sure that any "private" EE CPTs do not have their comments show up in any wp comment
-     * widgets/queries done on frontend
-     *
-     * @param  array $clauses array of comment clauses setup by WP_Comment_Query
-     * @return array array of comment clauses with modifications.
-     */
-    public function filter_wp_comments($clauses)
-    {
-        global $wpdb;
-        if (strpos($clauses['join'], $wpdb->posts) !== false) {
-            $cpts = EE_Register_CPTs::get_private_CPTs();
-            foreach ($cpts as $cpt => $details) {
-                $clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt);
-            }
-        }
-        return $clauses;
-    }
-
-
-    /**
-     *    employ_CPT_Strategy
-     *
-     * @access    public
-     * @return    void
-     */
-    public function employ_CPT_Strategy()
-    {
-        if (apply_filters('FHEE__EE_Front_Controller__employ_CPT_Strategy', true)) {
-            $this->Registry->load_core('CPT_Strategy');
-        }
-    }
-
-
-    /**
-     * this just makes sure that if the site is using ssl that we force that for any admin ajax calls from frontend
-     *
-     * @param  string $url incoming url
-     * @return string         final assembled url
-     */
-    public function maybe_force_admin_ajax_ssl($url)
-    {
-        if (is_ssl() && preg_match('/admin-ajax.php/', $url)) {
-            $url = str_replace('http://', 'https://', $url);
-        }
-        return $url;
-    }
-
-
-
-
-
-
-    /***********************************************        WP_LOADED ACTION HOOK         ***********************************************/
-
-
-    /**
-     *    wp_loaded - should fire after shortcode, module, addon, or other plugin's have been registered and their
-     *    default priority init phases have run
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp_loaded()
-    {
-    }
-
-
-
-
-
-    /***********************************************        PARSE_REQUEST HOOK         ***********************************************/
-    /**
-     *    _get_request
-     *
-     * @access public
-     * @param WP $WP
-     * @return void
-     */
-    public function get_request(WP $WP)
-    {
-        do_action('AHEE__EE_Front_Controller__get_request__start');
-        $this->Request_Handler->parse_request($WP);
-        do_action('AHEE__EE_Front_Controller__get_request__complete');
-    }
-
-
-    /**
-     *    _initialize_shortcodes - calls init method on shortcodes that have been determined to be in the_content for
-     *    the currently requested page
-     *
-     * @access    public
-     * @param WP $WP
-     * @return    void
-     */
-    public function _initialize_shortcodes(WP $WP)
-    {
-        do_action('AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this);
-        $this->Request_Handler->set_request_vars($WP);
-        // grab post_name from request
-        $current_post  = apply_filters('FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name',
-            $this->Request_Handler->get('post_name'));
-        $show_on_front = get_option('show_on_front');
-        // if it's not set, then check if frontpage is blog
-        if (empty($current_post)) {
-            // yup.. this is the posts page, prepare to load all shortcode modules
-            $current_post = 'posts';
-            // unless..
-            if ($show_on_front === 'page') {
-                // some other page is set as the homepage
-                $page_on_front = get_option('page_on_front');
-                if ($page_on_front) {
-                    // k now we need to find the post_name for this page
-                    global $wpdb;
-                    $page_on_front = $wpdb->get_var(
-                        $wpdb->prepare(
-                            "SELECT post_name from $wpdb->posts WHERE post_type='page' AND post_status='publish' AND ID=%d",
-                            $page_on_front
-                        )
-                    );
-                    // set the current post slug to what it actually is
-                    $current_post = $page_on_front ? $page_on_front : $current_post;
-                }
-            }
-        }
-        // where are posts being displayed ?
-        $page_for_posts = EE_Config::get_page_for_posts();
-        // in case $current_post is hierarchical like: /parent-page/current-page
-        $current_post = basename($current_post);
-        // are we on a category page?
-        $term_exists = is_array(term_exists($current_post, 'category')) || array_key_exists('category_name',
-                $WP->query_vars);
-        // make sure shortcodes are set
-        if (isset($this->Registry->CFG->core->post_shortcodes)) {
-            if ( ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])) {
-                $this->Registry->CFG->core->post_shortcodes[$page_for_posts] = array();
-            }
-            // cycle thru all posts with shortcodes set
-            foreach ($this->Registry->CFG->core->post_shortcodes as $post_name => $post_shortcodes) {
-                // filter shortcodes so
-                $post_shortcodes = apply_filters('FHEE__Front_Controller__initialize_shortcodes__post_shortcodes',
-                    $post_shortcodes);
-                // now cycle thru shortcodes
-                foreach ($post_shortcodes as $shortcode_class => $post_id) {
-                    // are we on this page, or on the blog page, or an EE CPT category page ?
-                    if ($current_post === $post_name || $term_exists) {
-                        // maybe init the shortcode
-                        $this->initialize_shortcode_if_active_on_page(
-                            $shortcode_class,
-                            $current_post,
-                            $page_for_posts,
-                            $post_id,
-                            $term_exists,
-                            $WP
-                        );
-                        // if this is NOT the "Posts page" and we have a valid entry
-                        // for the "Posts page" in our tracked post_shortcodes array
-                        // but the shortcode is not being tracked for this page
-                    } else if (
-                        $post_name !== $page_for_posts
-                        && isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])
-                        && ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts][$shortcode_class])
-                    ) {
-                        // then remove the "fallback" shortcode processor
-                        remove_shortcode($shortcode_class);
-                    }
-                }
-            }
-        }
-        do_action('AHEE__EE_Front_Controller__initialize_shortcodes__end', $this);
-    }
-
-
-    /**
-     * @param string $shortcode_class
-     * @param string $current_post
-     * @param string $page_for_posts
-     * @param int    $post_id
-     * @param bool   $term_exists
-     * @param WP     $WP
-     */
-    protected function initialize_shortcode_if_active_on_page(
-        $shortcode_class,
-        $current_post,
-        $page_for_posts,
-        $post_id,
-        $term_exists,
-        $WP
-    ) {
-        // verify shortcode is in list of registered shortcodes
-        if ( ! isset($this->Registry->shortcodes->{$shortcode_class})) {
-            if ($current_post !== $page_for_posts && current_user_can('edit_post', $post_id)) {
-                EE_Error::add_error(
-                    sprintf(
-                        __(
-                            'The [%s] shortcode has not been properly registered or the corresponding addon/module is not active for some reason. Either fix/remove the shortcode from the post, or activate the addon/module the shortcode is associated with.',
-                            'event_espresso'
-                        ),
-                        $shortcode_class
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                add_filter('FHEE_run_EE_the_content', '__return_true');
-            }
-            add_shortcode($shortcode_class, array('EES_Shortcode', 'invalid_shortcode_processor'));
-            return;
-        }
-        // is this : a shortcodes set exclusively for this post, or for the home page, or a category, or a taxonomy ?
-        if (
-            $term_exists
-            || $current_post === $page_for_posts
-            || isset($this->Registry->CFG->core->post_shortcodes[$current_post])
-        ) {
-            // let's pause to reflect on this...
-            $sc_reflector = new ReflectionClass('EES_' . $shortcode_class);
-            // ensure that class is actually a shortcode
-            if (
-                defined('WP_DEBUG')
-                && WP_DEBUG === true
-                && ! $sc_reflector->isSubclassOf('EES_Shortcode')
-            ) {
-                EE_Error::add_error(
-                    sprintf(
-                        __(
-                            'The requested %s shortcode is not of the class "EES_Shortcode". Please check your files.',
-                            'event_espresso'
-                        ),
-                        $shortcode_class
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                add_filter('FHEE_run_EE_the_content', '__return_true');
-                return;
-            }
-            // and pass the request object to the run method
-            $this->Registry->shortcodes->{$shortcode_class} = $sc_reflector->newInstance();
-            // fire the shortcode class's run method, so that it can activate resources
-            $this->Registry->shortcodes->{$shortcode_class}->run($WP);
-        }
-    }
-
-
-    /**
-     *    pre_get_posts - basically a module factory for instantiating modules and selecting the final view template
-     *
-     * @access    public
-     * @param   WP_Query $WP_Query
-     * @return    void
-     */
-    public function pre_get_posts($WP_Query)
-    {
-        // only load Module_Request_Router if this is the main query
-        if (
-            $this->Module_Request_Router instanceof EE_Module_Request_Router
-            && $WP_Query->is_main_query()
-        ) {
-            // cycle thru module routes
-            while ($route = $this->Module_Request_Router->get_route($WP_Query)) {
-                // determine module and method for route
-                $module = $this->Module_Request_Router->resolve_route($route[0], $route[1]);
-                if ($module instanceof EED_Module) {
-                    // get registered view for route
-                    $this->_template_path = $this->Module_Request_Router->get_view($route);
-                    // grab module name
-                    $module_name = $module->module_name();
-                    // map the module to the module objects
-                    $this->Registry->modules->{$module_name} = $module;
-                }
-            }
-        }
-    }
-
-
-
-
-
-    /***********************************************        WP HOOK         ***********************************************/
-
-
-    /**
-     *    wp - basically last chance to do stuff before headers sent
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp()
-    {
-    }
-
-
-
-    /***********************************************        WP_ENQUEUE_SCRIPTS && WP_HEAD HOOK         ***********************************************/
-
-
-    /**
-     *    wp_enqueue_scripts
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp_enqueue_scripts()
-    {
-
-        // css is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_css', '__return_false' );
-        if (apply_filters('FHEE_load_css', true)) {
-
-            $this->Registry->CFG->template_settings->enable_default_style = true;
-            //Load the ThemeRoller styles if enabled
-            if (isset($this->Registry->CFG->template_settings->enable_default_style) && $this->Registry->CFG->template_settings->enable_default_style) {
-
-                //Load custom style sheet if available
-                if (isset($this->Registry->CFG->template_settings->custom_style_sheet)) {
-                    wp_register_style('espresso_custom_css',
-                        EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->Registry->CFG->template_settings->custom_style_sheet,
-                        EVENT_ESPRESSO_VERSION);
-                    wp_enqueue_style('espresso_custom_css');
-                }
-
-                if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css')) {
-                    wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css',
-                        array('dashicons'), EVENT_ESPRESSO_VERSION);
-                } else {
-                    wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
-                        array('dashicons'), EVENT_ESPRESSO_VERSION);
-                }
-                wp_enqueue_style('espresso_default');
-
-                if (is_readable(get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css')) {
-                    wp_register_style('espresso_style',
-                        get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css',
-                        array('dashicons', 'espresso_default'));
-                } else {
-                    wp_register_style('espresso_style',
-                        EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css',
-                        array('dashicons', 'espresso_default'));
-                }
-
-            }
-
-        }
-
-        // js is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_js', '__return_false' );
-        if (apply_filters('FHEE_load_js', true)) {
-
-            wp_enqueue_script('jquery');
-            //let's make sure that all required scripts have been setup
-            if (function_exists('wp_script_is') && ! wp_script_is('jquery')) {
-                $msg = sprintf(
-                    __('%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.',
-                        'event_espresso'),
-                    '<em><br />',
-                    '</em>'
-                );
-                EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            }
-            // load core js
-            wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'),
-                EVENT_ESPRESSO_VERSION, true);
-            wp_enqueue_script('espresso_core');
-            wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
-
-        }
-
-        //qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-        if (apply_filters('FHEE_load_qtip', false)) {
-            EEH_Qtip_Loader::instance()->register_and_enqueue();
-        }
-
-
-        //accounting.js library
-        // @link http://josscrowcroft.github.io/accounting.js/
-        if (apply_filters('FHEE_load_accounting_js', false)) {
-            $acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js';
-            wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
-                array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, true);
-            wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', true);
-            wp_enqueue_script('ee-accounting');
-
-            $currency_config = array(
-                'currency' => array(
-                    'symbol'    => $this->Registry->CFG->currency->sign,
-                    'format'    => array(
-                        'pos'  => $this->Registry->CFG->currency->sign_b4 ? '%s%v' : '%v%s',
-                        'neg'  => $this->Registry->CFG->currency->sign_b4 ? '- %s%v' : '- %v%s',
-                        'zero' => $this->Registry->CFG->currency->sign_b4 ? '%s--' : '--%s',
-                    ),
-                    'decimal'   => $this->Registry->CFG->currency->dec_mrk,
-                    'thousand'  => $this->Registry->CFG->currency->thsnds,
-                    'precision' => $this->Registry->CFG->currency->dec_plc,
-                ),
-                'number'   => array(
-                    'precision' => 0,
-                    'thousand'  => $this->Registry->CFG->currency->thsnds,
-                    'decimal'   => $this->Registry->CFG->currency->dec_mrk,
-                ),
-            );
-            wp_localize_script('ee-accounting', 'EE_ACCOUNTING_CFG', $currency_config);
-        }
-
-        if ( ! function_exists('wp_head')) {
-            $msg = sprintf(
-                __('%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.',
-                    'event_espresso'),
-                '<em><br />',
-                '</em>'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-        if ( ! function_exists('wp_footer')) {
-            $msg = sprintf(
-                __('%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.',
-                    'event_espresso'),
-                '<em><br />',
-                '</em>'
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-
-    }
-
-
-    /**
-     *    header_meta_tag
-     *
-     * @access    public
-     * @return    void
-     */
-    public function header_meta_tag()
-    {
-        print(
-            apply_filters(
-                'FHEE__EE_Front_Controller__header_meta_tag',
-                '<meta name="generator" content="Event Espresso Version ' . EVENT_ESPRESSO_VERSION . "\" />\n")
-        );
-
-        //let's exclude all event type taxonomy term archive pages from search engine indexing
-        //@see https://events.codebasehq.com/projects/event-espresso/tickets/10249
-        //also exclude all critical pages from indexing
-        if (
-            (
-                is_tax('espresso_event_type')
-                && get_option( 'blog_public' ) !== '0'
-            )
-            || is_page(EE_Registry::instance()->CFG->core->get_critical_pages_array())
-        ) {
-            print(
-                apply_filters(
-                    'FHEE__EE_Front_Controller__header_meta_tag__noindex_for_event_type',
-                    '<meta name="robots" content="noindex,follow" />' . "\n"
-                )
-            );
-        }
-    }
-
-
-
-    /**
-     * wp_print_scripts
-     *
-     * @return void
-     */
-    public function wp_print_scripts()
-    {
-        global $post;
-        if (
-            get_post_type() === 'espresso_events' 
-            && is_singular() 
-            && isset($post->EE_Event)
-            && $post->EE_Event instanceof EE_Event
-        ) {
-            \EEH_Schema::add_json_linked_data_for_event($post->EE_Event);
-        }
-    }
-
-
-
-    /***********************************************        THE_CONTENT FILTER HOOK         ***********************************************/
-
-
-
-    /**
-     *    the_content
-     *
-     * @access    public
-     * @param   $the_content
-     * @return    string
-     */
-    // public function the_content( $the_content ) {
-    // 	// nothing gets loaded at this point unless other systems turn this hookpoint on by using:  add_filter( 'FHEE_run_EE_the_content', '__return_true' );
-    // 	if ( apply_filters( 'FHEE_run_EE_the_content', FALSE ) ) {
-    // 	}
-    // 	return $the_content;
-    // }
-
-
-    /***********************************************        WP_FOOTER         ***********************************************/
-
-
-    /**
-     *    display_errors
-     *
-     * @access    public
-     * @return    string
-     */
-    public function display_errors()
-    {
-        static $shown_already = false;
-        do_action('AHEE__EE_Front_Controller__display_errors__begin');
-        if (
-            ! $shown_already
-            && apply_filters('FHEE__EE_Front_Controller__display_errors', true)
-            && is_main_query()
-            && ! is_feed()
-            && in_the_loop()
-            && $this->Request_Handler->is_espresso_page()
-        ) {
-            echo EE_Error::get_notices();
-            $shown_already = true;
-            EEH_Template::display_template(EE_TEMPLATES . 'espresso-ajax-notices.template.php');
-        }
-        do_action('AHEE__EE_Front_Controller__display_errors__end');
-    }
-
-
-
-
-
-    /***********************************************        UTILITIES         ***********************************************/
-    /**
-     *    template_include
-     *
-     * @access    public
-     * @param   string $template_include_path
-     * @return    string
-     */
-    public function template_include($template_include_path = null)
-    {
-        if ($this->Request_Handler->is_espresso_page()) {
-            $this->_template_path = ! empty($this->_template_path) ? basename($this->_template_path) : basename($template_include_path);
-            $template_path        = EEH_Template::locate_template($this->_template_path, array(), false);
-            $this->_template_path = ! empty($template_path) ? $template_path : $template_include_path;
-            $this->_template      = basename($this->_template_path);
-            return $this->_template_path;
-        }
-        return $template_include_path;
-    }
-
-
-    /**
-     *    get_selected_template
-     *
-     * @access    public
-     * @param bool $with_path
-     * @return    string
-     */
-    public function get_selected_template($with_path = false)
-    {
-        return $with_path ? $this->_template_path : $this->_template;
-    }
+	/**
+	 *    $_template_path
+	 * @var    string $_template_path
+	 * @access    public
+	 */
+	private $_template_path;
+
+	/**
+	 *    $_template
+	 * @var    string $_template
+	 * @access    public
+	 */
+	private $_template;
+
+	/**
+	 * @type  EE_Registry $Registry
+	 * @access    protected
+	 */
+	protected $Registry;
+
+	/**
+	 * @type  EE_Request_Handler $Request_Handler
+	 * @access    protected
+	 */
+	protected $Request_Handler;
+
+	/**
+	 * @type  EE_Module_Request_Router $Module_Request_Router
+	 * @access    protected
+	 */
+	protected $Module_Request_Router;
+
+
+	/**
+	 *    class constructor
+	 *    should fire after shortcode, module, addon, or other plugin's default priority init phases have run
+	 *
+	 * @access    public
+	 * @param \EE_Registry              $Registry
+	 * @param \EE_Request_Handler       $Request_Handler
+	 * @param \EE_Module_Request_Router $Module_Request_Router
+	 */
+	public function __construct(
+		EE_Registry $Registry,
+		EE_Request_Handler $Request_Handler,
+		EE_Module_Request_Router $Module_Request_Router
+	) {
+		$this->Registry              = $Registry;
+		$this->Request_Handler       = $Request_Handler;
+		$this->Module_Request_Router = $Module_Request_Router;
+		// make sure template tags are loaded immediately so that themes don't break
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'load_espresso_template_tags'), 10);
+		// determine how to integrate WP_Query with the EE models
+		add_action('AHEE__EE_System__initialize', array($this, 'employ_CPT_Strategy'));
+		// load other resources and begin to actually run shortcodes and modules
+		add_action('wp_loaded', array($this, 'wp_loaded'), 5);
+		// analyse the incoming WP request
+		add_action('parse_request', array($this, 'get_request'), 1, 1);
+		// process any content shortcodes
+		add_action('parse_request', array($this, '_initialize_shortcodes'), 5);
+		// process request with module factory
+		add_action('pre_get_posts', array($this, 'pre_get_posts'), 10, 1);
+		// before headers sent
+		add_action('wp', array($this, 'wp'), 5);
+		// load css and js
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 1);
+		// header
+		add_action('wp_head', array($this, 'header_meta_tag'), 5);
+		add_action('wp_print_scripts', array($this, 'wp_print_scripts'), 10);
+		add_filter('template_include', array($this, 'template_include'), 1);
+		// display errors
+		add_action('loop_start', array($this, 'display_errors'), 2);
+		// the content
+		// add_filter( 'the_content', array( $this, 'the_content' ), 5, 1 );
+		//exclude our private cpt comments
+		add_filter('comments_clauses', array($this, 'filter_wp_comments'), 10, 1);
+		//make sure any ajax requests will respect the url schema when requests are made against admin-ajax.php (http:// or https://)
+		add_filter('admin_url', array($this, 'maybe_force_admin_ajax_ssl'), 200, 1);
+		// action hook EE
+		do_action('AHEE__EE_Front_Controller__construct__done', $this);
+		// for checking that browser cookies are enabled
+		if (apply_filters('FHEE__EE_Front_Controller____construct__set_test_cookie', true)) {
+			setcookie('ee_cookie_test', uniqid(), time() + 24 * HOUR_IN_SECONDS, '/');
+		}
+	}
+
+
+	/**
+	 * @return EE_Request_Handler
+	 */
+	public function Request_Handler()
+	{
+		return $this->Request_Handler;
+	}
+
+
+	/**
+	 * @return EE_Module_Request_Router
+	 */
+	public function Module_Request_Router()
+	{
+		return $this->Module_Request_Router;
+	}
+
+
+
+
+
+	/***********************************************        INIT ACTION HOOK         ***********************************************/
+
+
+	/**
+	 *    load_espresso_template_tags - if current theme is an espresso theme, or uses ee theme template parts, then
+	 *    load it's functions.php file ( if not already loaded )
+	 *
+	 * @return void
+	 */
+	public function load_espresso_template_tags()
+	{
+		if (is_readable(EE_PUBLIC . 'template_tags.php')) {
+			require_once(EE_PUBLIC . 'template_tags.php');
+		}
+	}
+
+
+	/**
+	 * filter_wp_comments
+	 * This simply makes sure that any "private" EE CPTs do not have their comments show up in any wp comment
+	 * widgets/queries done on frontend
+	 *
+	 * @param  array $clauses array of comment clauses setup by WP_Comment_Query
+	 * @return array array of comment clauses with modifications.
+	 */
+	public function filter_wp_comments($clauses)
+	{
+		global $wpdb;
+		if (strpos($clauses['join'], $wpdb->posts) !== false) {
+			$cpts = EE_Register_CPTs::get_private_CPTs();
+			foreach ($cpts as $cpt => $details) {
+				$clauses['where'] .= $wpdb->prepare(" AND $wpdb->posts.post_type != %s", $cpt);
+			}
+		}
+		return $clauses;
+	}
+
+
+	/**
+	 *    employ_CPT_Strategy
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function employ_CPT_Strategy()
+	{
+		if (apply_filters('FHEE__EE_Front_Controller__employ_CPT_Strategy', true)) {
+			$this->Registry->load_core('CPT_Strategy');
+		}
+	}
+
+
+	/**
+	 * this just makes sure that if the site is using ssl that we force that for any admin ajax calls from frontend
+	 *
+	 * @param  string $url incoming url
+	 * @return string         final assembled url
+	 */
+	public function maybe_force_admin_ajax_ssl($url)
+	{
+		if (is_ssl() && preg_match('/admin-ajax.php/', $url)) {
+			$url = str_replace('http://', 'https://', $url);
+		}
+		return $url;
+	}
+
+
+
+
+
+
+	/***********************************************        WP_LOADED ACTION HOOK         ***********************************************/
+
+
+	/**
+	 *    wp_loaded - should fire after shortcode, module, addon, or other plugin's have been registered and their
+	 *    default priority init phases have run
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp_loaded()
+	{
+	}
+
+
+
+
+
+	/***********************************************        PARSE_REQUEST HOOK         ***********************************************/
+	/**
+	 *    _get_request
+	 *
+	 * @access public
+	 * @param WP $WP
+	 * @return void
+	 */
+	public function get_request(WP $WP)
+	{
+		do_action('AHEE__EE_Front_Controller__get_request__start');
+		$this->Request_Handler->parse_request($WP);
+		do_action('AHEE__EE_Front_Controller__get_request__complete');
+	}
+
+
+	/**
+	 *    _initialize_shortcodes - calls init method on shortcodes that have been determined to be in the_content for
+	 *    the currently requested page
+	 *
+	 * @access    public
+	 * @param WP $WP
+	 * @return    void
+	 */
+	public function _initialize_shortcodes(WP $WP)
+	{
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__begin', $WP, $this);
+		$this->Request_Handler->set_request_vars($WP);
+		// grab post_name from request
+		$current_post  = apply_filters('FHEE__EE_Front_Controller__initialize_shortcodes__current_post_name',
+			$this->Request_Handler->get('post_name'));
+		$show_on_front = get_option('show_on_front');
+		// if it's not set, then check if frontpage is blog
+		if (empty($current_post)) {
+			// yup.. this is the posts page, prepare to load all shortcode modules
+			$current_post = 'posts';
+			// unless..
+			if ($show_on_front === 'page') {
+				// some other page is set as the homepage
+				$page_on_front = get_option('page_on_front');
+				if ($page_on_front) {
+					// k now we need to find the post_name for this page
+					global $wpdb;
+					$page_on_front = $wpdb->get_var(
+						$wpdb->prepare(
+							"SELECT post_name from $wpdb->posts WHERE post_type='page' AND post_status='publish' AND ID=%d",
+							$page_on_front
+						)
+					);
+					// set the current post slug to what it actually is
+					$current_post = $page_on_front ? $page_on_front : $current_post;
+				}
+			}
+		}
+		// where are posts being displayed ?
+		$page_for_posts = EE_Config::get_page_for_posts();
+		// in case $current_post is hierarchical like: /parent-page/current-page
+		$current_post = basename($current_post);
+		// are we on a category page?
+		$term_exists = is_array(term_exists($current_post, 'category')) || array_key_exists('category_name',
+				$WP->query_vars);
+		// make sure shortcodes are set
+		if (isset($this->Registry->CFG->core->post_shortcodes)) {
+			if ( ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])) {
+				$this->Registry->CFG->core->post_shortcodes[$page_for_posts] = array();
+			}
+			// cycle thru all posts with shortcodes set
+			foreach ($this->Registry->CFG->core->post_shortcodes as $post_name => $post_shortcodes) {
+				// filter shortcodes so
+				$post_shortcodes = apply_filters('FHEE__Front_Controller__initialize_shortcodes__post_shortcodes',
+					$post_shortcodes);
+				// now cycle thru shortcodes
+				foreach ($post_shortcodes as $shortcode_class => $post_id) {
+					// are we on this page, or on the blog page, or an EE CPT category page ?
+					if ($current_post === $post_name || $term_exists) {
+						// maybe init the shortcode
+						$this->initialize_shortcode_if_active_on_page(
+							$shortcode_class,
+							$current_post,
+							$page_for_posts,
+							$post_id,
+							$term_exists,
+							$WP
+						);
+						// if this is NOT the "Posts page" and we have a valid entry
+						// for the "Posts page" in our tracked post_shortcodes array
+						// but the shortcode is not being tracked for this page
+					} else if (
+						$post_name !== $page_for_posts
+						&& isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts])
+						&& ! isset($this->Registry->CFG->core->post_shortcodes[$page_for_posts][$shortcode_class])
+					) {
+						// then remove the "fallback" shortcode processor
+						remove_shortcode($shortcode_class);
+					}
+				}
+			}
+		}
+		do_action('AHEE__EE_Front_Controller__initialize_shortcodes__end', $this);
+	}
+
+
+	/**
+	 * @param string $shortcode_class
+	 * @param string $current_post
+	 * @param string $page_for_posts
+	 * @param int    $post_id
+	 * @param bool   $term_exists
+	 * @param WP     $WP
+	 */
+	protected function initialize_shortcode_if_active_on_page(
+		$shortcode_class,
+		$current_post,
+		$page_for_posts,
+		$post_id,
+		$term_exists,
+		$WP
+	) {
+		// verify shortcode is in list of registered shortcodes
+		if ( ! isset($this->Registry->shortcodes->{$shortcode_class})) {
+			if ($current_post !== $page_for_posts && current_user_can('edit_post', $post_id)) {
+				EE_Error::add_error(
+					sprintf(
+						__(
+							'The [%s] shortcode has not been properly registered or the corresponding addon/module is not active for some reason. Either fix/remove the shortcode from the post, or activate the addon/module the shortcode is associated with.',
+							'event_espresso'
+						),
+						$shortcode_class
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				add_filter('FHEE_run_EE_the_content', '__return_true');
+			}
+			add_shortcode($shortcode_class, array('EES_Shortcode', 'invalid_shortcode_processor'));
+			return;
+		}
+		// is this : a shortcodes set exclusively for this post, or for the home page, or a category, or a taxonomy ?
+		if (
+			$term_exists
+			|| $current_post === $page_for_posts
+			|| isset($this->Registry->CFG->core->post_shortcodes[$current_post])
+		) {
+			// let's pause to reflect on this...
+			$sc_reflector = new ReflectionClass('EES_' . $shortcode_class);
+			// ensure that class is actually a shortcode
+			if (
+				defined('WP_DEBUG')
+				&& WP_DEBUG === true
+				&& ! $sc_reflector->isSubclassOf('EES_Shortcode')
+			) {
+				EE_Error::add_error(
+					sprintf(
+						__(
+							'The requested %s shortcode is not of the class "EES_Shortcode". Please check your files.',
+							'event_espresso'
+						),
+						$shortcode_class
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				add_filter('FHEE_run_EE_the_content', '__return_true');
+				return;
+			}
+			// and pass the request object to the run method
+			$this->Registry->shortcodes->{$shortcode_class} = $sc_reflector->newInstance();
+			// fire the shortcode class's run method, so that it can activate resources
+			$this->Registry->shortcodes->{$shortcode_class}->run($WP);
+		}
+	}
+
+
+	/**
+	 *    pre_get_posts - basically a module factory for instantiating modules and selecting the final view template
+	 *
+	 * @access    public
+	 * @param   WP_Query $WP_Query
+	 * @return    void
+	 */
+	public function pre_get_posts($WP_Query)
+	{
+		// only load Module_Request_Router if this is the main query
+		if (
+			$this->Module_Request_Router instanceof EE_Module_Request_Router
+			&& $WP_Query->is_main_query()
+		) {
+			// cycle thru module routes
+			while ($route = $this->Module_Request_Router->get_route($WP_Query)) {
+				// determine module and method for route
+				$module = $this->Module_Request_Router->resolve_route($route[0], $route[1]);
+				if ($module instanceof EED_Module) {
+					// get registered view for route
+					$this->_template_path = $this->Module_Request_Router->get_view($route);
+					// grab module name
+					$module_name = $module->module_name();
+					// map the module to the module objects
+					$this->Registry->modules->{$module_name} = $module;
+				}
+			}
+		}
+	}
+
+
+
+
+
+	/***********************************************        WP HOOK         ***********************************************/
+
+
+	/**
+	 *    wp - basically last chance to do stuff before headers sent
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp()
+	{
+	}
+
+
+
+	/***********************************************        WP_ENQUEUE_SCRIPTS && WP_HEAD HOOK         ***********************************************/
+
+
+	/**
+	 *    wp_enqueue_scripts
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp_enqueue_scripts()
+	{
+
+		// css is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_css', '__return_false' );
+		if (apply_filters('FHEE_load_css', true)) {
+
+			$this->Registry->CFG->template_settings->enable_default_style = true;
+			//Load the ThemeRoller styles if enabled
+			if (isset($this->Registry->CFG->template_settings->enable_default_style) && $this->Registry->CFG->template_settings->enable_default_style) {
+
+				//Load custom style sheet if available
+				if (isset($this->Registry->CFG->template_settings->custom_style_sheet)) {
+					wp_register_style('espresso_custom_css',
+						EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->Registry->CFG->template_settings->custom_style_sheet,
+						EVENT_ESPRESSO_VERSION);
+					wp_enqueue_style('espresso_custom_css');
+				}
+
+				if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css')) {
+					wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css',
+						array('dashicons'), EVENT_ESPRESSO_VERSION);
+				} else {
+					wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+						array('dashicons'), EVENT_ESPRESSO_VERSION);
+				}
+				wp_enqueue_style('espresso_default');
+
+				if (is_readable(get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css')) {
+					wp_register_style('espresso_style',
+						get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css',
+						array('dashicons', 'espresso_default'));
+				} else {
+					wp_register_style('espresso_style',
+						EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css',
+						array('dashicons', 'espresso_default'));
+				}
+
+			}
+
+		}
+
+		// js is turned ON by default, but prior to the wp_enqueue_scripts hook, can be turned OFF  via:  add_filter( 'FHEE_load_js', '__return_false' );
+		if (apply_filters('FHEE_load_js', true)) {
+
+			wp_enqueue_script('jquery');
+			//let's make sure that all required scripts have been setup
+			if (function_exists('wp_script_is') && ! wp_script_is('jquery')) {
+				$msg = sprintf(
+					__('%sJquery is not loaded!%sEvent Espresso is unable to load Jquery due to a conflict with your theme or another plugin.',
+						'event_espresso'),
+					'<em><br />',
+					'</em>'
+				);
+				EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			}
+			// load core js
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'),
+				EVENT_ESPRESSO_VERSION, true);
+			wp_enqueue_script('espresso_core');
+			wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
+
+		}
+
+		//qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
+		if (apply_filters('FHEE_load_qtip', false)) {
+			EEH_Qtip_Loader::instance()->register_and_enqueue();
+		}
+
+
+		//accounting.js library
+		// @link http://josscrowcroft.github.io/accounting.js/
+		if (apply_filters('FHEE_load_accounting_js', false)) {
+			$acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js';
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
+				array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, true);
+			wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', true);
+			wp_enqueue_script('ee-accounting');
+
+			$currency_config = array(
+				'currency' => array(
+					'symbol'    => $this->Registry->CFG->currency->sign,
+					'format'    => array(
+						'pos'  => $this->Registry->CFG->currency->sign_b4 ? '%s%v' : '%v%s',
+						'neg'  => $this->Registry->CFG->currency->sign_b4 ? '- %s%v' : '- %v%s',
+						'zero' => $this->Registry->CFG->currency->sign_b4 ? '%s--' : '--%s',
+					),
+					'decimal'   => $this->Registry->CFG->currency->dec_mrk,
+					'thousand'  => $this->Registry->CFG->currency->thsnds,
+					'precision' => $this->Registry->CFG->currency->dec_plc,
+				),
+				'number'   => array(
+					'precision' => 0,
+					'thousand'  => $this->Registry->CFG->currency->thsnds,
+					'decimal'   => $this->Registry->CFG->currency->dec_mrk,
+				),
+			);
+			wp_localize_script('ee-accounting', 'EE_ACCOUNTING_CFG', $currency_config);
+		}
+
+		if ( ! function_exists('wp_head')) {
+			$msg = sprintf(
+				__('%sMissing wp_head() function.%sThe WordPress function wp_head() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.',
+					'event_espresso'),
+				'<em><br />',
+				'</em>'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+		if ( ! function_exists('wp_footer')) {
+			$msg = sprintf(
+				__('%sMissing wp_footer() function.%sThe WordPress function wp_footer() seems to be missing in your theme. Please contact the theme developer to make sure this is fixed before using Event Espresso.',
+					'event_espresso'),
+				'<em><br />',
+				'</em>'
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+
+	}
+
+
+	/**
+	 *    header_meta_tag
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function header_meta_tag()
+	{
+		print(
+			apply_filters(
+				'FHEE__EE_Front_Controller__header_meta_tag',
+				'<meta name="generator" content="Event Espresso Version ' . EVENT_ESPRESSO_VERSION . "\" />\n")
+		);
+
+		//let's exclude all event type taxonomy term archive pages from search engine indexing
+		//@see https://events.codebasehq.com/projects/event-espresso/tickets/10249
+		//also exclude all critical pages from indexing
+		if (
+			(
+				is_tax('espresso_event_type')
+				&& get_option( 'blog_public' ) !== '0'
+			)
+			|| is_page(EE_Registry::instance()->CFG->core->get_critical_pages_array())
+		) {
+			print(
+				apply_filters(
+					'FHEE__EE_Front_Controller__header_meta_tag__noindex_for_event_type',
+					'<meta name="robots" content="noindex,follow" />' . "\n"
+				)
+			);
+		}
+	}
+
+
+
+	/**
+	 * wp_print_scripts
+	 *
+	 * @return void
+	 */
+	public function wp_print_scripts()
+	{
+		global $post;
+		if (
+			get_post_type() === 'espresso_events' 
+			&& is_singular() 
+			&& isset($post->EE_Event)
+			&& $post->EE_Event instanceof EE_Event
+		) {
+			\EEH_Schema::add_json_linked_data_for_event($post->EE_Event);
+		}
+	}
+
+
+
+	/***********************************************        THE_CONTENT FILTER HOOK         ***********************************************/
+
+
+
+	/**
+	 *    the_content
+	 *
+	 * @access    public
+	 * @param   $the_content
+	 * @return    string
+	 */
+	// public function the_content( $the_content ) {
+	// 	// nothing gets loaded at this point unless other systems turn this hookpoint on by using:  add_filter( 'FHEE_run_EE_the_content', '__return_true' );
+	// 	if ( apply_filters( 'FHEE_run_EE_the_content', FALSE ) ) {
+	// 	}
+	// 	return $the_content;
+	// }
+
+
+	/***********************************************        WP_FOOTER         ***********************************************/
+
+
+	/**
+	 *    display_errors
+	 *
+	 * @access    public
+	 * @return    string
+	 */
+	public function display_errors()
+	{
+		static $shown_already = false;
+		do_action('AHEE__EE_Front_Controller__display_errors__begin');
+		if (
+			! $shown_already
+			&& apply_filters('FHEE__EE_Front_Controller__display_errors', true)
+			&& is_main_query()
+			&& ! is_feed()
+			&& in_the_loop()
+			&& $this->Request_Handler->is_espresso_page()
+		) {
+			echo EE_Error::get_notices();
+			$shown_already = true;
+			EEH_Template::display_template(EE_TEMPLATES . 'espresso-ajax-notices.template.php');
+		}
+		do_action('AHEE__EE_Front_Controller__display_errors__end');
+	}
+
+
+
+
+
+	/***********************************************        UTILITIES         ***********************************************/
+	/**
+	 *    template_include
+	 *
+	 * @access    public
+	 * @param   string $template_include_path
+	 * @return    string
+	 */
+	public function template_include($template_include_path = null)
+	{
+		if ($this->Request_Handler->is_espresso_page()) {
+			$this->_template_path = ! empty($this->_template_path) ? basename($this->_template_path) : basename($template_include_path);
+			$template_path        = EEH_Template::locate_template($this->_template_path, array(), false);
+			$this->_template_path = ! empty($template_path) ? $template_path : $template_include_path;
+			$this->_template      = basename($this->_template_path);
+			return $this->_template_path;
+		}
+		return $template_include_path;
+	}
+
+
+	/**
+	 *    get_selected_template
+	 *
+	 * @access    public
+	 * @param bool $with_path
+	 * @return    string
+	 */
+	public function get_selected_template($with_path = false)
+	{
+		return $with_path ? $this->_template_path : $this->_template;
+	}
 
 
 }

Spacing +17 added lines, -17 removed lines

@@ -141,8 +141,8 @@ 
      */
     public function load_espresso_template_tags()
     {
-        if (is_readable(EE_PUBLIC . 'template_tags.php')) {
-            require_once(EE_PUBLIC . 'template_tags.php');
+        if (is_readable(EE_PUBLIC.'template_tags.php')) {
+            require_once(EE_PUBLIC.'template_tags.php');
         }
     }
 
@@ -364,7 +364,7 @@ 
             || isset($this->Registry->CFG->core->post_shortcodes[$current_post])
         ) {
             // let's pause to reflect on this...
-            $sc_reflector = new ReflectionClass('EES_' . $shortcode_class);
+            $sc_reflector = new ReflectionClass('EES_'.$shortcode_class);
             // ensure that class is actually a shortcode
             if (
                 defined('WP_DEBUG')
@@ -465,27 +465,27 @@ 
                 //Load custom style sheet if available
                 if (isset($this->Registry->CFG->template_settings->custom_style_sheet)) {
                     wp_register_style('espresso_custom_css',
-                        EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->Registry->CFG->template_settings->custom_style_sheet,
+                        EVENT_ESPRESSO_UPLOAD_URL.'css/'.$this->Registry->CFG->template_settings->custom_style_sheet,
                         EVENT_ESPRESSO_VERSION);
                     wp_enqueue_style('espresso_custom_css');
                 }
 
-                if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/style.css')) {
-                    wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css',
+                if (is_readable(EVENT_ESPRESSO_UPLOAD_DIR.'css/style.css')) {
+                    wp_register_style('espresso_default', EVENT_ESPRESSO_UPLOAD_DIR.'css/espresso_default.css',
                         array('dashicons'), EVENT_ESPRESSO_VERSION);
                 } else {
-                    wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+                    wp_register_style('espresso_default', EE_GLOBAL_ASSETS_URL.'css/espresso_default.css',
                         array('dashicons'), EVENT_ESPRESSO_VERSION);
                 }
                 wp_enqueue_style('espresso_default');
 
-                if (is_readable(get_stylesheet_directory() . EE_Config::get_current_theme() . DS . 'style.css')) {
+                if (is_readable(get_stylesheet_directory().EE_Config::get_current_theme().DS.'style.css')) {
                     wp_register_style('espresso_style',
-                        get_stylesheet_directory_uri() . EE_Config::get_current_theme() . DS . 'style.css',
+                        get_stylesheet_directory_uri().EE_Config::get_current_theme().DS.'style.css',
                         array('dashicons', 'espresso_default'));
                 } else {
                     wp_register_style('espresso_style',
-                        EE_TEMPLATES_URL . EE_Config::get_current_theme() . DS . 'style.css',
+                        EE_TEMPLATES_URL.EE_Config::get_current_theme().DS.'style.css',
                         array('dashicons', 'espresso_default'));
                 }
 
@@ -508,7 +508,7 @@ 
                 EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
             }
             // load core js
-            wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'),
+            wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'),
                 EVENT_ESPRESSO_VERSION, true);
             wp_enqueue_script('espresso_core');
             wp_localize_script('espresso_core', 'eei18n', EE_Registry::$i18n_js_strings);
@@ -524,8 +524,8 @@ 
         //accounting.js library
         // @link http://josscrowcroft.github.io/accounting.js/
         if (apply_filters('FHEE_load_accounting_js', false)) {
-            $acct_js = EE_THIRD_PARTY_URL . 'accounting/accounting.js';
-            wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js',
+            $acct_js = EE_THIRD_PARTY_URL.'accounting/accounting.js';
+            wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js',
                 array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, true);
             wp_register_script('ee-accounting-core', $acct_js, array('underscore'), '0.3.2', true);
             wp_enqueue_script('ee-accounting');
@@ -584,7 +584,7 @@ 
         print(
             apply_filters(
                 'FHEE__EE_Front_Controller__header_meta_tag',
-                '<meta name="generator" content="Event Espresso Version ' . EVENT_ESPRESSO_VERSION . "\" />\n")
+                '<meta name="generator" content="Event Espresso Version '.EVENT_ESPRESSO_VERSION."\" />\n")
         );
 
         //let's exclude all event type taxonomy term archive pages from search engine indexing
@@ -593,14 +593,14 @@ 
         if (
             (
                 is_tax('espresso_event_type')
-                && get_option( 'blog_public' ) !== '0'
+                && get_option('blog_public') !== '0'
             )
             || is_page(EE_Registry::instance()->CFG->core->get_critical_pages_array())
         ) {
             print(
                 apply_filters(
                     'FHEE__EE_Front_Controller__header_meta_tag__noindex_for_event_type',
-                    '<meta name="robots" content="noindex,follow" />' . "\n"
+                    '<meta name="robots" content="noindex,follow" />'."\n"
                 )
             );
         }
@@ -670,7 +670,7 @@ 
         ) {
             echo EE_Error::get_notices();
             $shown_already = true;
-            EEH_Template::display_template(EE_TEMPLATES . 'espresso-ajax-notices.template.php');
+            EEH_Template::display_template(EE_TEMPLATES.'espresso-ajax-notices.template.php');
         }
         do_action('AHEE__EE_Front_Controller__display_errors__end');
     }

core/admin/EE_Admin_List_Table.core.php

Spacing +92 added lines, -92 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'NO direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('NO direct script access allowed');
 }
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+if ( ! class_exists('WP_List_Table')) {
+	require_once(ABSPATH.'wp-admin/includes/class-wp-list-table.php');
 }
 
 
@@ -206,16 +206,16 @@ 
 	/**
 	 * @param \EE_Admin_Page $admin_page we use this for obtaining everything we need in the list table
 	 */
-	public function __construct( EE_Admin_Page $admin_page ) {
+	public function __construct(EE_Admin_Page $admin_page) {
 		$this->_admin_page = $admin_page;
 		$this->_req_data = $this->_admin_page->get_request_data();
 		$this->_view = $this->_admin_page->get_view();
-		$this->_views = empty( $this->_views ) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
+		$this->_views = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
 		$this->_current_page = $this->get_pagenum();
-		$this->_screen = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
-		$this->_yes_no = array(  __('No', 'event_espresso'), __('Yes', 'event_espresso'));
+		$this->_screen = $this->_admin_page->get_current_page().'_'.$this->_admin_page->get_current_view();
+		$this->_yes_no = array(__('No', 'event_espresso'), __('Yes', 'event_espresso'));
 
-		$this->_per_page = $this->get_items_per_page( $this->_screen . '_per_page', 10 );
+		$this->_per_page = $this->get_items_per_page($this->_screen.'_per_page', 10);
 
 		$this->_setup_data();
 		$this->_add_view_counts();
@@ -225,7 +225,7 @@ 
 		$this->_set_properties();
 
 		//set primary column
-		add_filter( 'list_table_primary_column', array( $this, 'set_primary_column' ) );
+		add_filter('list_table_primary_column', array($this, 'set_primary_column'));
 
 		//set parent defaults
 		parent::__construct($this->_wp_list_args);
@@ -301,17 +301,17 @@ 
 	 * @return string
 	 */
 	protected function _get_hidden_fields() {
-		$action = isset( $this->_req_data['route'] ) ? $this->_req_data['route'] : '';
-		$action = empty( $action ) && isset( $this->_req_data['action'] ) ? $this->_req_data['action'] : $action;
+		$action = isset($this->_req_data['route']) ? $this->_req_data['route'] : '';
+		$action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
 		//if action is STILL empty, then we set it to default
-		$action = empty( $action ) ? 'default' : $action;
-		$field = '<input type="hidden" name="page" value="' . $this->_req_data['page'] . '" />' . "\n";
-		$field .= '<input type="hidden" name="route" value="'. $action .'" />' . "\n";/**/
-		$field .= '<input type="hidden" name="perpage" value="' . $this->_per_page . '" />' . "\n";
+		$action = empty($action) ? 'default' : $action;
+		$field = '<input type="hidden" name="page" value="'.$this->_req_data['page'].'" />'."\n";
+		$field .= '<input type="hidden" name="route" value="'.$action.'" />'."\n"; /**/
+		$field .= '<input type="hidden" name="perpage" value="'.$this->_per_page.'" />'."\n";
 
 		$bulk_actions = $this->_get_bulk_actions();
-		foreach ( $bulk_actions as $bulk_action => $label ) {
-			$field .= '<input type="hidden" name="' . $bulk_action . '_nonce" value="' . wp_create_nonce  ( $bulk_action . '_nonce' ) . '" />' . "\n";
+		foreach ($bulk_actions as $bulk_action => $label) {
+			$field .= '<input type="hidden" name="'.$bulk_action.'_nonce" value="'.wp_create_nonce($bulk_action.'_nonce').'" />'."\n";
 		}
 
 		return $field;
@@ -341,15 +341,15 @@ 
 		 *
 		 * @var array
 		 */
-		$_sortable = apply_filters( "FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen );
+		$_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen);
 
 		$sortable = array();
-		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) ) {
+		foreach ($_sortable as $id => $data) {
+			if (empty($data)) {
 				continue;
 			}
 			//fix for offset errors with WP_List_Table default get_columninfo()
-			if ( is_array($data) ) {
+			if (is_array($data)) {
 				$_data[0] = key($data);
 				$_data[1] = isset($data[1]) ? $data[1] : false;
 			} else {
@@ -358,14 +358,14 @@ 
 
 			$data = (array) $data;
 
-			if ( !isset( $data[1] ) ) {
+			if ( ! isset($data[1])) {
 				$_data[1] = false;
 			}
 
 			$sortable[$id] = $_data;
 		}
 		$primary = $this->get_primary_column_name();
-		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
+		$this->_column_headers = array($columns, $hidden, $sortable, $primary);
 	}
 
 
@@ -374,8 +374,8 @@ 
 	 * @return string
 	 */
 	protected function get_primary_column_name() {
-		foreach( class_parents( $this ) as $parent ) {
-			if ( $parent === 'WP_List_Table' && method_exists( $parent, 'get_primary_column_name' ) ) {
+		foreach (class_parents($this) as $parent) {
+			if ($parent === 'WP_List_Table' && method_exists($parent, 'get_primary_column_name')) {
 				return parent::get_primary_column_name();
 			}
 		}
@@ -392,10 +392,10 @@ 
 	 * @param string $primary
 	 * @return string
 	 */
-	protected function handle_row_actions( $item, $column_name, $primary ) {
-		foreach( class_parents( $this ) as $parent ) {
-			if ( $parent === 'WP_List_Table' && method_exists( $parent, 'handle_row_actions' ) ) {
-				return parent::handle_row_actions( $item, $column_name, $primary );
+	protected function handle_row_actions($item, $column_name, $primary) {
+		foreach (class_parents($this) as $parent) {
+			if ($parent === 'WP_List_Table' && method_exists($parent, 'handle_row_actions')) {
+				return parent::handle_row_actions($item, $column_name, $primary);
 			}
 		}
 		return '';
@@ -413,11 +413,11 @@ 
 	protected function _get_bulk_actions() {
 		$actions = array();
 		//the _views property should have the bulk_actions, so let's go through and extract them into a properly formatted array for the wp_list_table();
-		foreach ( $this->_views as $view => $args) {
-			if ( $this->_view === $view  && isset( $args['bulk_action']) && is_array($args['bulk_action']) ) {
+		foreach ($this->_views as $view => $args) {
+			if ($this->_view === $view && isset($args['bulk_action']) && is_array($args['bulk_action'])) {
 				//each bulk action will correspond with a admin page route, so we can check whatever the capability is for that page route and skip adding the bulk action if no access for the current logged in user.
-				foreach ( $args['bulk_action'] as $route =>$label ) {
-					if ( $this->_admin_page->check_user_access( $route, true ) ) {
+				foreach ($args['bulk_action'] as $route =>$label) {
+					if ($this->_admin_page->check_user_access($route, true)) {
 						$actions[$route] = $label;
 					}
 				}
@@ -436,18 +436,18 @@ 
 	 */
 	private function _filters() {
 		$classname = get_class($this);
-		$filters = apply_filters( "FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen );
+		$filters = apply_filters("FHEE__{$classname}__filters", (array) $this->_get_table_filters(), $this, $this->_screen);
 
-		if ( empty( $filters )) {
+		if (empty($filters)) {
 			return;
 		}
-		foreach ( $filters as $filter ) {
+		foreach ($filters as $filter) {
 			echo $filter;
 		}
 		//add filter button at end
-		echo '<input type="submit" class="button-secondary" value="' . __('Filter', 'event_espresso') . '" id="post-query-submit" />';
+		echo '<input type="submit" class="button-secondary" value="'.__('Filter', 'event_espresso').'" id="post-query-submit" />';
 		//add reset filters button at end
-		echo '<a class="button button-secondary"  href="' . $this->_admin_page->get_current_page_view_url() . '" style="display:inline-block">' . __('Reset Filters', 'event_espresso') . '</a>';
+		echo '<a class="button button-secondary"  href="'.$this->_admin_page->get_current_page_view_url().'" style="display:inline-block">'.__('Reset Filters', 'event_espresso').'</a>';
 	}
 
 
@@ -461,8 +461,8 @@ 
 	 * @param string $column_name
 	 * @return string
 	 */
-	public function set_primary_column( $column_name ) {
-		return ! empty( $this->_primary_column ) ? $this->_primary_column : $column_name;
+	public function set_primary_column($column_name) {
+		return ! empty($this->_primary_column) ? $this->_primary_column : $column_name;
 	}
 
 
@@ -482,7 +482,7 @@ 
 			array(
 				'total_items' => $total_items,
 				'per_page' => $this->_per_page,
-				'total_pages' => ceil($total_items / $this->_per_page )
+				'total_pages' => ceil($total_items / $this->_per_page)
 			)
 		);
 	}
@@ -496,7 +496,7 @@ 
 	 * @param string        $column_name The column being called.
 	 * @return string html content for the column
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 		/**
 		 * Dynamic hook allowing for adding additional column content in this list table.
 		 * Note that $this->screen->id is in the format
@@ -506,7 +506,7 @@ 
 		 * hook prefix ("event-espresso") will be different.
 		 *
 		 */
-		do_action( 'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id, $item, $this->_screen );
+		do_action('AHEE__EE_Admin_List_Table__column_'.$column_name.'__'.$this->screen->id, $item, $this->_screen);
 	}
 
 
@@ -532,7 +532,7 @@ 
 		 *
 		 * @var array
 		 */
-		$columns = apply_filters( 'FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen );
+		$columns = apply_filters('FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen);
 		return $columns;
 	}
 
@@ -555,18 +555,18 @@ 
 		$views = $this->get_views();
 		$assembled_views = array();
 
-		if ( empty( $views )) {
+		if (empty($views)) {
 			return;
 		}
 		echo "<ul class='subsubsub'>\n";
-		foreach ( $views as $view ) {
-			$count = isset($view['count'] ) && !empty($view['count']) ? absint( $view['count'] )  : 0;
-			if ( isset( $view['slug'], $view['class'], $view['url'], $view['label']) ) {
-				$assembled_views[ $view['slug'] ] = "\t<li class='" . $view['class'] . "'>" . '<a href="' . $view['url'] . '">' . $view['label'] . '</a> <span class="count">(' . $count . ')</span>';
+		foreach ($views as $view) {
+			$count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
+			if (isset($view['slug'], $view['class'], $view['url'], $view['label'])) {
+				$assembled_views[$view['slug']] = "\t<li class='".$view['class']."'>".'<a href="'.$view['url'].'">'.$view['label'].'</a> <span class="count">('.$count.')</span>';
 			}
 		}
 
-		echo ! empty( $assembled_views ) ? implode( " |</li>\n", $assembled_views ) . "</li>\n" : '';
+		echo ! empty($assembled_views) ? implode(" |</li>\n", $assembled_views)."</li>\n" : '';
 		echo "</ul>";
 	}
 
@@ -578,10 +578,10 @@ 
 	 * @access public
 	 * @param EE_Base_Class $item The current item
 	 */
-	public function single_row( $item ) {
-		$row_class = $this->_get_row_class( $item );
-		echo '<tr class="' . esc_attr( $row_class ) . '">';
-		$this->single_row_columns( $item );
+	public function single_row($item) {
+		$row_class = $this->_get_row_class($item);
+		echo '<tr class="'.esc_attr($row_class).'">';
+		$this->single_row_columns($item);
 		echo '</tr>';
 	}
 
@@ -593,13 +593,13 @@ 
 	 * @param  EE_Base_Class $item the current item
 	 * @return string
 	 */
-	protected function _get_row_class( $item ) {
+	protected function _get_row_class($item) {
 		static $row_class = '';
-		$row_class = ( $row_class === '' ? 'alternate' : '' );
+		$row_class = ($row_class === '' ? 'alternate' : '');
 
 		$new_row_class = $row_class;
 
-		if ( !empty($this->_ajax_sorting_callback) ) {
+		if ( ! empty($this->_ajax_sorting_callback)) {
 			$new_row_class .= ' rowsortable';
 		}
 
@@ -631,13 +631,13 @@ 
 	 */
 	public function get_hidden_columns() {
 		$user_id = get_current_user_id();
-		$has_default = get_user_option('default'. $this->screen->id . 'columnshidden', $user_id);
-		if ( empty( $has_default ) && !empty($this->_hidden_columns ) ) {
-			update_user_option($user_id, 'default'.$this->screen->id . 'columnshidden', TRUE);
-			update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, TRUE );
+		$has_default = get_user_option('default'.$this->screen->id.'columnshidden', $user_id);
+		if (empty($has_default) && ! empty($this->_hidden_columns)) {
+			update_user_option($user_id, 'default'.$this->screen->id.'columnshidden', TRUE);
+			update_user_option($user_id, 'manage'.$this->screen->id.'columnshidden', $this->_hidden_columns, TRUE);
 		}
-		$ref = 'manage' . $this->screen->id . 'columnshidden';
-		return (array) get_user_option( $ref, $user_id );
+		$ref = 'manage'.$this->screen->id.'columnshidden';
+		return (array) get_user_option($ref, $user_id);
 	}
 
 
@@ -650,47 +650,47 @@ 
 	 * @since 3.1.0
 	 * @param EE_Base_Class $item The current item
 	 */
-	public function single_row_columns( $item ) {
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+	public function single_row_columns($item) {
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
 		global $wp_version;
-		$use_hidden_class = version_compare( $wp_version, '4.3-RC', '>=' );
+		$use_hidden_class = version_compare($wp_version, '4.3-RC', '>=');
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 
 			/**
 			 * With WordPress version 4.3.RC+ WordPress started using the hidden css class to control whether columns are
 			 * hidden or not instead of using "display:none;".  This bit of code provides backward compat.
 			 */
-			$hidden_class = $use_hidden_class && in_array( $column_name, $hidden ) ? ' hidden' : '';
-			$style = ! $use_hidden_class && in_array( $column_name, $hidden ) ? ' style="display:none;"' : '';
+			$hidden_class = $use_hidden_class && in_array($column_name, $hidden) ? ' hidden' : '';
+			$style = ! $use_hidden_class && in_array($column_name, $hidden) ? ' style="display:none;"' : '';
 
-			$classes = $column_name . ' column-' . $column_name.$hidden_class;
-			if ( $primary === $column_name ) {
+			$classes = $column_name.' column-'.$column_name.$hidden_class;
+			if ($primary === $column_name) {
 				$classes .= ' has-row-actions column-primary';
 			}
 
-			$data = ' data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
+			$data = ' data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
 			$class = "class='$classes'";
 
 			$attributes = "$class$style$data";
 
-			if ( $column_name === 'cb' ) {
+			if ($column_name === 'cb') {
 				echo '<th scope="row" class="check-column">';
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb( $item ), $item, $this );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content', $this->column_cb($item), $item, $this);
 				echo '</th>';
 			}
-			elseif ( method_exists( $this, 'column_' . $column_name ) ) {
+			elseif (method_exists($this, 'column_'.$column_name)) {
 				echo "<td $attributes>";
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content', call_user_func( array( $this, 'column_' . $column_name ), $item ), $item, $this );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_'.$column_name.'__column_content', call_user_func(array($this, 'column_'.$column_name), $item), $item, $this);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 			else {
 				echo "<td $attributes>";
-				echo apply_filters( 'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default( $item, $column_name ), $item, $column_name, $this );
-				echo $this->handle_row_actions( $item, $column_name, $primary );
+				echo apply_filters('FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content', $this->column_default($item, $column_name), $item, $column_name, $this);
+				echo $this->handle_row_actions($item, $column_name, $primary);
 				echo "</td>";
 			}
 		}
@@ -705,15 +705,15 @@ 
 	 * @param string $which
 	 * @throws \EE_Error
 	 */
-	public function extra_tablenav( $which ) {
-		if ( $which === 'top' ) {
+	public function extra_tablenav($which) {
+		if ($which === 'top') {
 			$this->_filters();
 			echo $this->_get_hidden_fields();
 		} else {
 			echo '<div class="list-table-bottom-buttons alignleft actions">';
-			foreach ( $this->_bottom_buttons as $type => $action ){
-				$route = isset( $action['route'] ) ? $action['route'] : '';
-				$extra_request = isset( $action['extra_request'] ) ? $action['extra_request'] : '';
+			foreach ($this->_bottom_buttons as $type => $action) {
+				$route = isset($action['route']) ? $action['route'] : '';
+				$extra_request = isset($action['extra_request']) ? $action['extra_request'] : '';
 				echo $this->_admin_page->get_action_link_or_button(
 					$route,
 					$type,
@@ -723,7 +723,7 @@ 
 					false
 				);
 			}
-			do_action( 'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen );
+			do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen);
 			echo '</div>';
 		}
 		//echo $this->_entries_per_page_dropdown;
@@ -779,11 +779,11 @@ 
 	 *                                                  the actions.
 	 * @return string The assembled action elements container.
 	 */
-	protected function _action_string( $action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '' ) {
+	protected function _action_string($action_items, $item, $action_container = 'ul', $action_class = '', $action_id = '') {
 		$content = '';
-		$action_class = ! empty( $action_class ) ? ' class="' . $action_class . '"' : '';
-		$action_id = ! empty( $action_id ) ? ' id="' . $action_id . '"' : '';
-		$content .= ! empty( $action_container ) ? '<' . $action_container . $action_class . $action_id . '>' : '';
+		$action_class = ! empty($action_class) ? ' class="'.$action_class.'"' : '';
+		$action_id = ! empty($action_id) ? ' id="'.$action_id.'"' : '';
+		$content .= ! empty($action_container) ? '<'.$action_container.$action_class.$action_id.'>' : '';
         try {
             $content .= apply_filters(
                 'FHEE__EE_Admin_List_Table___action_string__action_items',
@@ -793,11 +793,11 @@ 
             );
         } catch (\Exception $e) {
             if (WP_DEBUG) {
-                \EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+                \EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
             }
             $content .= $action_items;
         }
-		$content .= ! empty( $action_container ) ? '</' . $action_container . '>' : '';
+		$content .= ! empty($action_container) ? '</'.$action_container.'>' : '';
 		return $content;
 	}
 }

core/admin/EE_Admin.core.php

Indentation +25 added lines, -25 removed lines

@@ -167,11 +167,11 @@ 
 
 
 	/**
-	* init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
-	*
-	* @access public
-	* @return void
-	*/
+	 * init- should fire after shortcode, module,  addon, other plugin (default priority), and even EE_Front_Controller's init phases have run
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function init() {
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
 		if ( EE_Maintenance_Mode::instance()->models_can_query() ){
@@ -456,11 +456,11 @@ 
 
 
 	/**
-	* admin_init
-	*
-	* @access public
-	* @return void
-	*/
+	 * admin_init
+	 *
+	 * @access public
+	 * @return void
+	 */
 	public function admin_init() {
 
 		/**
@@ -478,11 +478,11 @@ 
 
 		/**
 		 * This code excludes EE critical pages anywhere `wp_dropdown_pages` is used to create a dropdown for selecting
-         * critical pages.  The only place critical pages need included in a generated dropdown is on the "Critical Pages"
-         * tab in the EE General Settings Admin page.
-         * This is for user-proofing.
+		 * critical pages.  The only place critical pages need included in a generated dropdown is on the "Critical Pages"
+		 * tab in the EE General Settings Admin page.
+		 * This is for user-proofing.
 		 */
-        add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) );
+		add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) );
 
 	}
 
@@ -611,24 +611,24 @@ 
 
 
 	/**
-	* 	dismiss_persistent_admin_notice
-	*
-	*	@access 	public
-	* 	@return 		void
-	*/
+	 * 	dismiss_persistent_admin_notice
+	 *
+	 *	@access 	public
+	 * 	@return 		void
+	 */
 	public function dismiss_ee_nag_notice_callback() {
 		EE_Error::dismiss_persistent_admin_notice();
 	}
 
 
 
-    /**
-     * @param array $elements
-     * @return array
-     * @throws \EE_Error
-     */
+	/**
+	 * @param array $elements
+	 * @return array
+	 * @throws \EE_Error
+	 */
 	public function dashboard_glance_items($elements) {
-        $elements = is_array($elements) ? $elements : array($elements);
+		$elements = is_array($elements) ? $elements : array($elements);
 		$events = EEM_Event::instance()->count();
 		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_events'), admin_url('admin.php') );
 		$items['events']['text'] = sprintf( _n( '%s Event', '%s Events', $events ), number_format_i18n( $events ) );

Spacing +141 added lines, -141 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if (  ! self::$_instance instanceof EE_Admin ) {
+		if ( ! self::$_instance instanceof EE_Admin) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -57,30 +57,30 @@ 
 		// define global EE_Admin constants
 		$this->_define_all_constants();
 		// set autoloaders for our admin page classes based on included path information
-		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder( EE_ADMIN );
+		EEH_Autoloader::instance()->register_autoloaders_for_each_file_in_folder(EE_ADMIN);
 		// admin hooks
-		add_filter( 'plugin_action_links', array( $this, 'filter_plugin_actions' ), 10, 2 );
+		add_filter('plugin_action_links', array($this, 'filter_plugin_actions'), 10, 2);
 		// load EE_Request_Handler early
-		add_action( 'AHEE__EE_System__core_loaded_and_ready', array( $this, 'get_request' ));
-		add_action( 'AHEE__EE_System__initialize_last', array( $this, 'init' ));
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'get_request'));
+		add_action('AHEE__EE_System__initialize_last', array($this, 'init'));
 		// post shortcode tracking
 		add_action(
 			'AHEE__EE_System__initialize_last',
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'set_hooks_admin' )
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'set_hooks_admin')
 		);
-		add_action( 'AHEE__EE_Admin_Page__route_admin_request', array( $this, 'route_admin_request' ), 100, 2 );
-		add_action( 'wp_loaded', array( $this, 'wp_loaded' ), 100 );
-		add_action( 'admin_init', array( $this, 'admin_init' ), 100 );
-		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ), 20 );
-		add_action( 'admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_action( 'network_admin_notices', array( $this, 'display_admin_notices' ), 10 );
-		add_filter( 'pre_update_option', array( $this, 'check_for_invalid_datetime_formats' ), 100, 2 );
-		add_filter('admin_footer_text', array( $this, 'espresso_admin_footer' ));
+		add_action('AHEE__EE_Admin_Page__route_admin_request', array($this, 'route_admin_request'), 100, 2);
+		add_action('wp_loaded', array($this, 'wp_loaded'), 100);
+		add_action('admin_init', array($this, 'admin_init'), 100);
+		add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts'), 20);
+		add_action('admin_notices', array($this, 'display_admin_notices'), 10);
+		add_action('network_admin_notices', array($this, 'display_admin_notices'), 10);
+		add_filter('pre_update_option', array($this, 'check_for_invalid_datetime_formats'), 100, 2);
+		add_filter('admin_footer_text', array($this, 'espresso_admin_footer'));
 
 		//reset Environment config (we only do this on admin page loads);
 		EE_Registry::instance()->CFG->environment->recheck_values();
 
-		do_action( 'AHEE__EE_Admin__loaded' );
+		do_action('AHEE__EE_Admin__loaded');
 	}
 
 
@@ -95,11 +95,11 @@ 
 	 * @return void
 	 */
 	private function _define_all_constants() {
-		define( 'EE_ADMIN_URL', EE_PLUGIN_DIR_URL . 'core/admin/' );
-		define( 'EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL . 'admin_pages/' );
-		define( 'EE_ADMIN_TEMPLATE', EE_ADMIN . 'templates' . DS );
-		define( 'WP_ADMIN_PATH', ABSPATH . 'wp-admin/' );
-		define( 'WP_AJAX_URL', admin_url( 'admin-ajax.php' ));
+		define('EE_ADMIN_URL', EE_PLUGIN_DIR_URL.'core/admin/');
+		define('EE_ADMIN_PAGES_URL', EE_PLUGIN_DIR_URL.'admin_pages/');
+		define('EE_ADMIN_TEMPLATE', EE_ADMIN.'templates'.DS);
+		define('WP_ADMIN_PATH', ABSPATH.'wp-admin/');
+		define('WP_AJAX_URL', admin_url('admin-ajax.php'));
 	}
 
 
@@ -112,23 +112,23 @@ 
 	 * @param 	string 	$plugin
 	 * @return 	array
 	 */
-	public function filter_plugin_actions( $links, $plugin ) {
+	public function filter_plugin_actions($links, $plugin) {
 		// set $main_file in stone
 		static $main_file;
 		// if $main_file is not set yet
-		if ( ! $main_file ) {
-			$main_file = plugin_basename( EVENT_ESPRESSO_MAIN_FILE );
+		if ( ! $main_file) {
+			$main_file = plugin_basename(EVENT_ESPRESSO_MAIN_FILE);
 		}
-		 if ( $plugin === $main_file ) {
+		 if ($plugin === $main_file) {
 		 	// compare current plugin to this one
-			if ( EE_Maintenance_Mode::instance()->level() === EE_Maintenance_Mode::level_2_complete_maintenance ) {
-				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">' . __('Maintenance Mode Active', 'event_espresso' ) . '</a>';
-				array_unshift( $links, $maintenance_link );
+			if (EE_Maintenance_Mode::instance()->level() === EE_Maintenance_Mode::level_2_complete_maintenance) {
+				$maintenance_link = '<a href="admin.php?page=espresso_maintenance_settings" title="Event Espresso is in maintenance mode.  Click this link to learn why.">'.__('Maintenance Mode Active', 'event_espresso').'</a>';
+				array_unshift($links, $maintenance_link);
 			} else {
-				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">' . __( 'Settings', 'event_espresso' ) . '</a>';
-				$events_link = '<a href="admin.php?page=espresso_events">' . __( 'Events', 'event_espresso' ) . '</a>';
+				$org_settings_link = '<a href="admin.php?page=espresso_general_settings">'.__('Settings', 'event_espresso').'</a>';
+				$events_link = '<a href="admin.php?page=espresso_events">'.__('Events', 'event_espresso').'</a>';
 				// add before other links
-				array_unshift( $links, $org_settings_link, $events_link );
+				array_unshift($links, $org_settings_link, $events_link);
 			}
 		}
 		return $links;
@@ -143,8 +143,8 @@ 
 	 *	@return void
 	 */
 	public function get_request() {
-		EE_Registry::instance()->load_core( 'Request_Handler' );
-		EE_Registry::instance()->load_core( 'CPT_Strategy' );
+		EE_Registry::instance()->load_core('Request_Handler');
+		EE_Registry::instance()->load_core('CPT_Strategy');
 	}
 
 
@@ -156,11 +156,11 @@ 
 	 * @param array $admin_page_folder_names
 	 * @return array
 	 */
-	public function hide_admin_pages_except_maintenance_mode( $admin_page_folder_names = array() ){
+	public function hide_admin_pages_except_maintenance_mode($admin_page_folder_names = array()) {
 		return array(
-			'maintenance' => EE_ADMIN_PAGES . 'maintenance' . DS,
-			'about' => EE_ADMIN_PAGES . 'about' . DS,
-			'support' => EE_ADMIN_PAGES . 'support' . DS
+			'maintenance' => EE_ADMIN_PAGES.'maintenance'.DS,
+			'about' => EE_ADMIN_PAGES.'about'.DS,
+			'support' => EE_ADMIN_PAGES.'support'.DS
 		);
 	}
 
@@ -174,31 +174,31 @@ 
 	*/
 	public function init() {
 		//only enable most of the EE_Admin IF we're not in full maintenance mode
-		if ( EE_Maintenance_Mode::instance()->models_can_query() ){
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			//ok so we want to enable the entire admin
-			add_action( 'wp_ajax_dismiss_ee_nag_notice', array( $this, 'dismiss_ee_nag_notice_callback' ));
-			add_action( 'admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
-			add_action( 'network_admin_notices', array( $this, 'get_persistent_admin_notices' ), 9 );
+			add_action('wp_ajax_dismiss_ee_nag_notice', array($this, 'dismiss_ee_nag_notice_callback'));
+			add_action('admin_notices', array($this, 'get_persistent_admin_notices'), 9);
+			add_action('network_admin_notices', array($this, 'get_persistent_admin_notices'), 9);
 			//at a glance dashboard widget
-			add_filter( 'dashboard_glance_items', array( $this, 'dashboard_glance_items' ), 10 );
+			add_filter('dashboard_glance_items', array($this, 'dashboard_glance_items'), 10);
 			//filter for get_edit_post_link used on comments for custom post types
-			add_filter( 'get_edit_post_link', array( $this, 'modify_edit_post_link' ), 10, 2 );
+			add_filter('get_edit_post_link', array($this, 'modify_edit_post_link'), 10, 2);
 		}
 		// run the admin page factory but ONLY if we are doing an ee admin ajax request
-		if ( !defined('DOING_AJAX') || EE_ADMIN_AJAX ) {
+		if ( ! defined('DOING_AJAX') || EE_ADMIN_AJAX) {
 			try {
 				//this loads the controller for the admin pages which will setup routing etc
-				EE_Registry::instance()->load_core( 'Admin_Page_Loader' );
-			} catch ( EE_Error $e ) {
+				EE_Registry::instance()->load_core('Admin_Page_Loader');
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
-		add_filter( 'content_save_pre', array( $this, 'its_eSpresso' ), 10, 1 );
+		add_filter('content_save_pre', array($this, 'its_eSpresso'), 10, 1);
 		//make sure our CPTs and custom taxonomy metaboxes get shown for first time users
-		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes' ), 10 );
-		add_action('admin_head', array( $this, 'register_custom_nav_menu_boxes' ), 10 );
+		add_action('admin_head', array($this, 'enable_hidden_ee_nav_menu_metaboxes'), 10);
+		add_action('admin_head', array($this, 'register_custom_nav_menu_boxes'), 10);
 		//exclude EE critical pages from all nav menus and wp_list_pages
-		add_filter('nav_menu_meta_box_object', array( $this, 'remove_pages_from_nav_menu'), 10 );
+		add_filter('nav_menu_meta_box_object', array($this, 'remove_pages_from_nav_menu'), 10);
 	}
 
 
@@ -211,9 +211,9 @@ 
 	 * @param  object $post_type WP post type object
 	 * @return object            WP post type object
 	 */
-	public function remove_pages_from_nav_menu( $post_type ) {
+	public function remove_pages_from_nav_menu($post_type) {
 		//if this isn't the "pages" post type let's get out
-		if ( $post_type->name !== 'page' ) {
+		if ($post_type->name !== 'page') {
 			return $post_type;
 		}
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
@@ -233,28 +233,28 @@ 
 	 */
 	public function enable_hidden_ee_nav_menu_metaboxes() {
 		global $wp_meta_boxes, $pagenow;
-		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php' ) {
+		if ( ! is_array($wp_meta_boxes) || $pagenow !== 'nav-menus.php') {
 			return;
 		}
 		$user = wp_get_current_user();
 		//has this been done yet?
-		if ( get_user_option( 'ee_nav_menu_initialized', $user->ID ) ) {
+		if (get_user_option('ee_nav_menu_initialized', $user->ID)) {
 			return;
 		}
 
-		$hidden_meta_boxes = get_user_option( 'metaboxhidden_nav-menus', $user->ID );
-		$initial_meta_boxes = apply_filters( 'FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array( 'nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page' ) );
+		$hidden_meta_boxes = get_user_option('metaboxhidden_nav-menus', $user->ID);
+		$initial_meta_boxes = apply_filters('FHEE__EE_Admin__enable_hidden_ee_nav_menu_boxes__initial_meta_boxes', array('nav-menu-theme-locations', 'add-page', 'add-custom-links', 'add-category', 'add-espresso_events', 'add-espresso_venues', 'add-espresso_event_categories', 'add-espresso_venue_categories', 'add-post-type-post', 'add-post-type-page'));
 
-		if ( is_array( $hidden_meta_boxes ) ) {
-			foreach ( $hidden_meta_boxes as $key => $meta_box_id ) {
-				if ( in_array( $meta_box_id, $initial_meta_boxes ) ) {
-					unset( $hidden_meta_boxes[ $key ] );
+		if (is_array($hidden_meta_boxes)) {
+			foreach ($hidden_meta_boxes as $key => $meta_box_id) {
+				if (in_array($meta_box_id, $initial_meta_boxes)) {
+					unset($hidden_meta_boxes[$key]);
 				}
 			}
 		}
 
-		update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
-		update_user_option( $user->ID, 'ee_nav_menu_initialized', 1, true );
+		update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
+		update_user_option($user->ID, 'ee_nav_menu_initialized', 1, true);
 	}
 
 
@@ -273,7 +273,7 @@ 
 	 * @return void
 	 */
 	public function register_custom_nav_menu_boxes() {
-		add_meta_box( 'add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array( $this, 'ee_cpt_archive_pages' ), 'nav-menus', 'side', 'core' );
+		add_meta_box('add-extra-nav-menu-pages', __('Event Espresso Pages', 'event_espresso'), array($this, 'ee_cpt_archive_pages'), 'nav-menus', 'side', 'core');
 	}
 
 
@@ -289,16 +289,16 @@ 
 	 *
 	 * @return string  the (maybe) modified link
 	 */
-	public function modify_edit_post_link( $link, $id ) {
-		if ( ! $post = get_post( $id ) ){
+	public function modify_edit_post_link($link, $id) {
+		if ( ! $post = get_post($id)) {
 			return $link;
 		}
-		if ( $post->post_type === 'espresso_attendees' ) {
+		if ($post->post_type === 'espresso_attendees') {
 			$query_args = array(
 				'action' => 'edit_attendee',
 				'post' => $id
 			);
-			return EEH_URL::add_query_args_and_nonce( $query_args, admin_url('admin.php?page=espresso_registrations') );
+			return EEH_URL::add_query_args_and_nonce($query_args, admin_url('admin.php?page=espresso_registrations'));
 		}
 		return $link;
 	}
@@ -310,7 +310,7 @@ 
 		global $nav_menu_selected_id;
 
 		$db_fields = false;
-		$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+		$walker = new Walker_Nav_Menu_Checklist($db_fields);
 		$current_tab = 'event-archives';
 
 		/*if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
@@ -329,9 +329,9 @@ 
 		?>
 		<div id="posttype-extra-nav-menu-pages" class="posttypediv">
 			<ul id="posttype-extra-nav-menu-pages-tabs" class="posttype-tabs add-menu-item-tabs">
-				<li <?php echo ( 'event-archives' === $current_tab ? ' class="tabs"' : '' ); ?>>
-					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ( $nav_menu_selected_id ) {echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args)));} ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
-						<?php _e( 'Event Archive Pages', 'event_espresso' ); ?>
+				<li <?php echo ('event-archives' === $current_tab ? ' class="tabs"' : ''); ?>>
+					<a class="nav-tab-link" data-type="tabs-panel-posttype-extra-nav-menu-pages-event-archives" href="<?php if ($nav_menu_selected_id) {echo esc_url(add_query_arg('extra-nav-menu-pages-tab', 'event-archives', remove_query_arg($removed_args))); } ?>#tabs-panel-posttype-extra-nav-menu-pages-event-archives">
+						<?php _e('Event Archive Pages', 'event_espresso'); ?>
 					</a>
 				</li>
 			<?php /* // temporarily removing but leaving skeleton in place in case we ever decide to add more tabs.
@@ -349,13 +349,13 @@ 
  			<?php */ ?>
 
 			<div id="tabs-panel-posttype-extra-nav-menu-pages-event-archives" class="tabs-panel <?php
-			echo ( 'event-archives' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('event-archives' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 			?>">
 				<ul id="extra-nav-menu-pageschecklist-event-archives" class="categorychecklist form-no-clear">
 					<?php
 					$pages = $this->_get_extra_nav_menu_pages_items();
 					$args['walker'] = $walker;
-					echo walk_nav_menu_tree( array_map( array( $this, '_setup_extra_nav_menu_pages_items' ), $pages), 0, (object) $args );
+					echo walk_nav_menu_tree(array_map(array($this, '_setup_extra_nav_menu_pages_items'), $pages), 0, (object) $args);
 					?>
 				</ul>
 			</div><!-- /.tabs-panel -->
@@ -363,18 +363,18 @@ 
 			<p class="button-controls">
 				<span class="list-controls">
 					<a href="<?php
-						echo esc_url( add_query_arg(
+						echo esc_url(add_query_arg(
 							array(
 								'extra-nav-menu-pages-tab' => 'event-archives',
 								'selectall' => 1,
 							),
-							remove_query_arg( $removed_args )
+							remove_query_arg($removed_args)
 						));
 					?>#posttype-extra-nav-menu-pages>" class="select-all"><?php _e('Select All'); ?></a>
 				</span>
 
 				<span class="add-to-menu">
-					<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( __( 'Add to Menu' ) ); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e( 'submit-posttype-extra-nav-menu-pages' ); ?>" />
+					<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e(__('Add to Menu')); ?>" name="add-post-type-menu-item" id="<?php esc_attr_e('submit-posttype-extra-nav-menu-pages'); ?>" />
 					<span class="spinner"></span>
 				</span>
 			</p>
@@ -395,10 +395,10 @@ 
 	private function _get_extra_nav_menu_pages_items() {
 		$menuitems[] = array(
 			'title' => __('Event List', 'event_espresso'),
-			'url' => get_post_type_archive_link( 'espresso_events' ),
+			'url' => get_post_type_archive_link('espresso_events'),
 			'description' => __('Archive page for all events.', 'event_espresso')
 		);
-		return apply_filters( 'FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems );
+		return apply_filters('FHEE__EE_Admin__get_extra_nav_menu_pages_items', $menuitems);
 	}
 
 
@@ -410,7 +410,7 @@ 
 	 * @param $menu_item_values
 	 * @return stdClass
 	 */
-	private function _setup_extra_nav_menu_pages_items( $menu_item_values ) {
+	private function _setup_extra_nav_menu_pages_items($menu_item_values) {
 		$menu_item = new stdClass();
 		$keys = array(
 			'ID' => 0,
@@ -430,8 +430,8 @@ 
 			'xfn' => ''
 		);
 
-		foreach ( $keys as $key => $value) {
-			$menu_item->{$key} = isset( $menu_item_values[ $key]) ? $menu_item_values[ $key] : $value;
+		foreach ($keys as $key => $value) {
+			$menu_item->{$key} = isset($menu_item_values[$key]) ? $menu_item_values[$key] : $value;
 		}
 		return $menu_item;
 	}
@@ -470,9 +470,9 @@ 
 		 * - check if doing post processing of one of EE CPTs
 		 * - instantiate the corresponding EE CPT model for the post_type being processed.
 		 */
-		if ( isset( $_POST['action'], $_POST['post_type'] ) && $_POST['action'] === 'editpost' ) {
-			EE_Registry::instance()->load_core( 'Register_CPTs' );
-			EE_Register_CPTs::instantiate_cpt_models( $_POST['post_type'] );
+		if (isset($_POST['action'], $_POST['post_type']) && $_POST['action'] === 'editpost') {
+			EE_Registry::instance()->load_core('Register_CPTs');
+			EE_Register_CPTs::instantiate_cpt_models($_POST['post_type']);
 		}
 
 
@@ -482,7 +482,7 @@ 
          * tab in the EE General Settings Admin page.
          * This is for user-proofing.
 		 */
-        add_filter( 'wp_dropdown_pages', array( $this, 'modify_dropdown_pages' ) );
+        add_filter('wp_dropdown_pages', array($this, 'modify_dropdown_pages'));
 
 	}
 
@@ -493,25 +493,25 @@ 
 	 * @param string $output  Current output.
 	 * @return string
 	 */
-	public function modify_dropdown_pages( $output ) {
+	public function modify_dropdown_pages($output) {
 		//get critical pages
 		$critical_pages = EE_Registry::instance()->CFG->core->get_critical_pages_array();
 
 		//split current output by line break for easier parsing.
-		$split_output = explode( "\n", $output );
+		$split_output = explode("\n", $output);
 
 		//loop through to remove any critical pages from the array.
-		foreach ( $critical_pages as $page_id ) {
-			$needle = 'value="' . $page_id . '"';
-			foreach( $split_output as $key => $haystack ) {
-				if( strpos( $haystack, $needle ) !== false ) {
-					unset( $split_output[$key] );
+		foreach ($critical_pages as $page_id) {
+			$needle = 'value="'.$page_id.'"';
+			foreach ($split_output as $key => $haystack) {
+				if (strpos($haystack, $needle) !== false) {
+					unset($split_output[$key]);
 				}
 			}
 		}
 
 		//replace output with the new contents
-		return implode( "\n", $split_output );
+		return implode("\n", $split_output);
 	}
 
 
@@ -525,36 +525,36 @@ 
 	public function enqueue_admin_scripts() {
 		// this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
 		// Note: the intention of this script is to only do TARGETED injections.  I.E, only injecting on certain script calls.
-		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('ee-inject-wp', EE_ADMIN_URL.'assets/ee-cpt-wp-injects.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
 		// register cookie script for future dependencies
-		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE );
+		wp_register_script('jquery-cookie', EE_THIRD_PARTY_URL.'joyride/jquery.cookie.js', array('jquery'), '2.1', TRUE);
 		// jquery_validate loading is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via:  add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		if ( apply_filters( 'FHEE_load_jquery_validate', FALSE ) ) {
+		if (apply_filters('FHEE_load_jquery_validate', FALSE)) {
 			// register jQuery Validate
-			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
+			wp_register_script('jquery-validate', EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js', array('jquery'), '1.15.0', TRUE);
 		}
 		//joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again vai: add_filter('FHEE_load_joyride', '__return_true' );
-		if ( apply_filters( 'FHEE_load_joyride', FALSE ) ) {
+		if (apply_filters('FHEE_load_joyride', FALSE)) {
 			//joyride style
-			wp_register_style('joyride-css', EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css', array(), '2.1');
-			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION );
-			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js', array(), '2.1', TRUE );
+			wp_register_style('joyride-css', EE_THIRD_PARTY_URL.'joyride/joyride-2.1.css', array(), '2.1');
+			wp_register_style('ee-joyride-css', EE_GLOBAL_ASSETS_URL.'css/ee-joyride-styles.css', array('joyride-css'), EVENT_ESPRESSO_VERSION);
+			wp_register_script('joyride-modernizr', EE_THIRD_PARTY_URL.'joyride/modernizr.mq.js', array(), '2.1', TRUE);
 			//joyride JS
-			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE );
+			wp_register_script('jquery-joyride', EE_THIRD_PARTY_URL.'joyride/jquery.joyride-2.1.js', array('jquery-cookie', 'joyride-modernizr'), '2.1', TRUE);
 			// wanna go for a joyride?
 			wp_enqueue_style('ee-joyride-css');
 			wp_enqueue_script('jquery-joyride');
 		}
 		//qtip is turned OFF by default, but prior to the admin_enqueue_scripts hook, can be turned back on again via: add_filter('FHEE_load_qtips', '__return_true' );
-		if ( apply_filters( 'FHEE_load_qtip', FALSE ) ) {
+		if (apply_filters('FHEE_load_qtip', FALSE)) {
 			EEH_Qtip_Loader::instance()->register_and_enqueue();
 		}
 		//accounting.js library
 		// @link http://josscrowcroft.github.io/accounting.js/
-		if ( apply_filters( 'FHEE_load_accounting_js', FALSE ) ) {
-			wp_register_script( 'ee-accounting', EE_GLOBAL_ASSETS_URL . 'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee-accounting-core', EE_THIRD_PARTY_URL . 'accounting/accounting.js', array('underscore'), '0.3.2', TRUE );
-			wp_enqueue_script( 'ee-accounting' );
+		if (apply_filters('FHEE_load_accounting_js', FALSE)) {
+			wp_register_script('ee-accounting', EE_GLOBAL_ASSETS_URL.'scripts/ee-accounting-config.js', array('ee-accounting-core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee-accounting-core', EE_THIRD_PARTY_URL.'accounting/accounting.js', array('underscore'), '0.3.2', TRUE);
+			wp_enqueue_script('ee-accounting');
 			// array of settings to get converted to JSON array via wp_localize_script
 			$currency_config = array(
 				'currency' => array(
@@ -601,11 +601,11 @@ 
 	public function get_persistent_admin_notices() {
 		// http://www.example.com/wp-admin/admin.php?page=espresso_general_settings&action=critical_pages&critical_pages_nonce=2831ce0f30
 		$args = array(
-			'page' => EE_Registry::instance()->REQ->is_set( 'page' ) ? EE_Registry::instance()->REQ->get( 'page' ) : '',
-			'action' => EE_Registry::instance()->REQ->is_set( 'action' ) ? EE_Registry::instance()->REQ->get( 'action' ) : '',
+			'page' => EE_Registry::instance()->REQ->is_set('page') ? EE_Registry::instance()->REQ->get('page') : '',
+			'action' => EE_Registry::instance()->REQ->is_set('action') ? EE_Registry::instance()->REQ->get('action') : '',
 		);
-		$return_url = EE_Admin_Page::add_query_args_and_nonce( $args, EE_ADMIN_URL );
-		echo EE_Error::get_persistent_admin_notices( $return_url );
+		$return_url = EE_Admin_Page::add_query_args_and_nonce($args, EE_ADMIN_URL);
+		echo EE_Error::get_persistent_admin_notices($return_url);
 	}
 
 
@@ -630,24 +630,24 @@ 
 	public function dashboard_glance_items($elements) {
         $elements = is_array($elements) ? $elements : array($elements);
 		$events = EEM_Event::instance()->count();
-		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_events'), admin_url('admin.php') );
-		$items['events']['text'] = sprintf( _n( '%s Event', '%s Events', $events ), number_format_i18n( $events ) );
+		$items['events']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_events'), admin_url('admin.php'));
+		$items['events']['text'] = sprintf(_n('%s Event', '%s Events', $events), number_format_i18n($events));
 		$items['events']['title'] = __('Click to view all Events', 'event_espresso');
 		$registrations = EEM_Registration::instance()->count(
 			array(
 				array(
-					'STS_ID' => array( '!=', EEM_Registration::status_id_incomplete )
+					'STS_ID' => array('!=', EEM_Registration::status_id_incomplete)
 				)
 			)
 		);
-		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce( array('page' => 'espresso_registrations' ), admin_url('admin.php') );
-		$items['registrations']['text'] = sprintf( _n( '%s Registration', '%s Registrations', $registrations ), number_format_i18n($registrations) );
+		$items['registrations']['url'] = EE_Admin_Page::add_query_args_and_nonce(array('page' => 'espresso_registrations'), admin_url('admin.php'));
+		$items['registrations']['text'] = sprintf(_n('%s Registration', '%s Registrations', $registrations), number_format_i18n($registrations));
 		$items['registrations']['title'] = __('Click to view all registrations', 'event_espresso');
 
-		$items = (array) apply_filters( 'FHEE__EE_Admin__dashboard_glance_items__items', $items );
+		$items = (array) apply_filters('FHEE__EE_Admin__dashboard_glance_items__items', $items);
 
-		foreach ( $items as $type => $item_properties ) {
-			$elements[] = sprintf( '<a class="ee-dashboard-link-' . $type . '" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text'] );
+		foreach ($items as $type => $item_properties) {
+			$elements[] = sprintf('<a class="ee-dashboard-link-'.$type.'" href="%s" title="%s">%s</a>', $item_properties['url'], $item_properties['title'], $item_properties['text']);
 		}
 		return $elements;
 	}
@@ -664,31 +664,31 @@ 
 	 * @throws EE_Error
 	 * @return    string
 	 */
-	public function check_for_invalid_datetime_formats( $value, $option ) {
+	public function check_for_invalid_datetime_formats($value, $option) {
 		// check for date_format or time_format
-		switch ( $option ) {
+		switch ($option) {
 			case 'date_format' :
-				$date_time_format = $value . ' ' . get_option('time_format');
+				$date_time_format = $value.' '.get_option('time_format');
 				break;
 			case 'time_format' :
-				$date_time_format = get_option('date_format') . ' ' . $value;
+				$date_time_format = get_option('date_format').' '.$value;
 				break;
 			default :
 				$date_time_format = FALSE;
 		}
 		// do we have a date_time format to check ?
-		if ( $date_time_format ) {
-			$error_msg = EEH_DTT_Helper::validate_format_string( $date_time_format );
+		if ($date_time_format) {
+			$error_msg = EEH_DTT_Helper::validate_format_string($date_time_format);
 
-			if ( is_array( $error_msg ) ) {
-				$msg = '<p>' . sprintf( __( 'The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso' ), date( $date_time_format ) , $date_time_format  ) . '</p><p><ul>';
+			if (is_array($error_msg)) {
+				$msg = '<p>'.sprintf(__('The following date time "%s" ( %s ) is difficult to be properly parsed by PHP for the following reasons:', 'event_espresso'), date($date_time_format), $date_time_format).'</p><p><ul>';
 
 
-				foreach ( $error_msg as $error ) {
-					$msg .= '<li>' . $error . '</li>';
+				foreach ($error_msg as $error) {
+					$msg .= '<li>'.$error.'</li>';
 				}
 
-				$msg .= '</ul></p><p>' . sprintf( __( '%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso' ), '<span style="color:#D54E21;">', '</span>' ) . '</p>';
+				$msg .= '</ul></p><p>'.sprintf(__('%sPlease note that your date and time formats have been reset to "F j, Y" and "g:i a" respectively.%s', 'event_espresso'), '<span style="color:#D54E21;">', '</span>').'</p>';
 
 				// trigger WP settings error
 				add_settings_error(
@@ -698,7 +698,7 @@ 
 				);
 
 				// set format to something valid
-				switch ( $option ) {
+				switch ($option) {
 					case 'date_format' :
 						$value = 'F j, Y';
 						break;
@@ -720,8 +720,8 @@ 
 	 * @param $content
 	 * @return    string
 	 */
-	public function its_eSpresso( $content ) {
-		return str_replace( '[EXPRESSO_', '[ESPRESSO_', $content );
+	public function its_eSpresso($content) {
+		return str_replace('[EXPRESSO_', '[ESPRESSO_', $content);
 	}
 
 
@@ -733,7 +733,7 @@ 
 	 *  @return 	string
 	 */
 	public function espresso_admin_footer() {
-		return \EEH_Template::powered_by_event_espresso( 'aln-cntr', '', array( 'utm_content' => 'admin_footer' ));
+		return \EEH_Template::powered_by_event_espresso('aln-cntr', '', array('utm_content' => 'admin_footer'));
 	}
 
 
@@ -752,12 +752,12 @@ 
 	 * @param array $config
 	 * @return void
 	 */
-	public static function register_ee_admin_page( $page_basename, $page_path, $config = array() ) {
-		EE_Error::doing_it_wrong( __METHOD__, sprintf( __('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3' );
-		if ( class_exists( 'EE_Register_Admin_Page' ) ) {
+	public static function register_ee_admin_page($page_basename, $page_path, $config = array()) {
+		EE_Error::doing_it_wrong(__METHOD__, sprintf(__('Usage is deprecated.  Use EE_Register_Admin_Page::register() for registering the %s admin page.', 'event_espresso'), $page_basename), '4.3');
+		if (class_exists('EE_Register_Admin_Page')) {
 			$config['page_path'] = $page_path;
 		}
-		EE_Register_Admin_Page::register( $page_basename, $config );
+		EE_Register_Admin_Page::register($page_basename, $config);
 
 	}
 
@@ -770,7 +770,7 @@ 
 	 * @param  \WP_Post $post
 	 * @return void
 	 */
-	public static function parse_post_content_on_save( $post_ID, $post ) {
+	public static function parse_post_content_on_save($post_ID, $post) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			__(
@@ -779,7 +779,7 @@ 
 			),
 			'4.8.41'
 		);
-		EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save( $post_ID, $post );
+		EventEspresso\core\admin\PostShortcodeTracking::parse_post_content_on_save($post_ID, $post);
 	}
 
 
@@ -792,7 +792,7 @@ 
 	 * @param  $value
 	 * @return void
 	 */
-	public function reset_page_for_posts_on_change( $option, $old_value, $value ) {
+	public function reset_page_for_posts_on_change($option, $old_value, $value) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			__(
@@ -801,7 +801,7 @@ 
 			),
 			'4.8.41'
 		);
-		EventEspresso\core\admin\PostShortcodeTracking::reset_page_for_posts_on_change( $option, $old_value, $value );
+		EventEspresso\core\admin\PostShortcodeTracking::reset_page_for_posts_on_change($option, $old_value, $value);
 	}
 
 }

core/db_classes/EE_Attendee.class.php

Spacing +16 added lines, -16 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 /**
@@ -33,16 +33,16 @@ 
      */
     protected function __construct($fieldValues = null, $bydb = false, $timezone = null, $date_formats = array())
     {
-        if (! isset($fieldValues['ATT_full_name'])) {
-            $fname                        = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'] . ' ' : '';
+        if ( ! isset($fieldValues['ATT_full_name'])) {
+            $fname                        = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'].' ' : '';
             $lname                        = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
-            $fieldValues['ATT_full_name'] = $fname . $lname;
+            $fieldValues['ATT_full_name'] = $fname.$lname;
         }
-        if (! isset($fieldValues['ATT_slug'])) {
+        if ( ! isset($fieldValues['ATT_slug'])) {
             //			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
             $fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
         }
-        if (! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
+        if ( ! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
             $fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
         }
         parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
@@ -251,7 +251,7 @@ 
      */
     public function full_name($apply_html_entities = false)
     {
-        $full_name = $this->fname() . ' ' . $this->lname();
+        $full_name = $this->fname().' '.$this->lname();
         return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
     }
 
@@ -282,22 +282,22 @@ 
         $initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
         foreach ($initial_address_fields as $address_field_name) {
             $address_fields_value = $this->get($address_field_name);
-            if (! empty($address_fields_value)) {
+            if ( ! empty($address_fields_value)) {
                 $full_address_array[] = $address_fields_value;
             }
         }
         //now handle state and country
         $state_obj = $this->state_obj();
-        if (! empty($state_obj)) {
+        if ( ! empty($state_obj)) {
             $full_address_array[] = $state_obj->name();
         }
         $country_obj = $this->country_obj();
-        if (! empty($country_obj)) {
+        if ( ! empty($country_obj)) {
             $full_address_array[] = $country_obj->name();
         }
         //lastly get the xip
         $zip_value = $this->zip();
-        if (! empty($zip_value)) {
+        if ( ! empty($zip_value)) {
             $full_address_array[] = $zip_value;
         }
         return $full_address_array;
@@ -531,7 +531,7 @@ 
     public function get_most_recent_registration_for_event($event_id)
     {
         return $this->get_first_related('Registration',
-            array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
+            array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC'))); //, '=', 'OBJECT_K' );
     }
 
 
@@ -557,11 +557,11 @@ 
     public function billing_info_for_payment_method($payment_method)
     {
         $pm_type = $payment_method->type_obj();
-        if (! $pm_type instanceof EE_PMT_Base) {
+        if ( ! $pm_type instanceof EE_PMT_Base) {
             return null;
         }
         $billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
-        if (! $billing_info) {
+        if ( ! $billing_info) {
             return null;
         }
         $billing_form = $pm_type->billing_form();
@@ -582,7 +582,7 @@ 
     public function get_billing_info_postmeta_name($payment_method)
     {
         if ($payment_method->type_obj() instanceof EE_PMT_Base) {
-            return 'billing_info_' . $payment_method->type_obj()->system_name();
+            return 'billing_info_'.$payment_method->type_obj()->system_name();
         } else {
             return null;
         }
@@ -599,7 +599,7 @@ 
      */
     public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method)
     {
-        if (! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
+        if ( ! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
             EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
             return false;
         }

Indentation +660 added lines, -660 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -23,665 +23,665 @@ 
 class EE_Attendee extends EE_CPT_Base implements EEI_Contact, EEI_Address, EEI_Admin_Links, EEI_Attendee
 {
 
-    /**
-     * Sets some dynamic defaults
-     *
-     * @param array  $fieldValues
-     * @param bool   $bydb
-     * @param string $timezone
-     * @param array  $date_formats
-     */
-    protected function __construct($fieldValues = null, $bydb = false, $timezone = null, $date_formats = array())
-    {
-        if (! isset($fieldValues['ATT_full_name'])) {
-            $fname                        = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'] . ' ' : '';
-            $lname                        = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
-            $fieldValues['ATT_full_name'] = $fname . $lname;
-        }
-        if (! isset($fieldValues['ATT_slug'])) {
-            //			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
-            $fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
-        }
-        if (! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
-            $fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
-        }
-        parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
-    }
-
-
-    /**
-     * @param array  $props_n_values          incoming values
-     * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
-     *                                        used.)
-     * @param array  $date_formats            incoming date_formats in an array where the first value is the
-     *                                        date_format and the second value is the time format
-     * @return EE_Attendee
-     */
-    public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array())
-    {
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
-        return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
-    }
-
-
-    /**
-     * @param array  $props_n_values  incoming values from the database
-     * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
-     *                                the website will be used.
-     * @return EE_Attendee
-     */
-    public static function new_instance_from_db($props_n_values = array(), $timezone = null)
-    {
-        return new self($props_n_values, true, $timezone);
-    }
-
-
-    /**
-     *        Set Attendee First Name
-     *
-     * @access        public
-     * @param string $fname
-     */
-    public function set_fname($fname = '')
-    {
-        $this->set('ATT_fname', $fname);
-    }
-
-
-    /**
-     *        Set Attendee Last Name
-     *
-     * @access        public
-     * @param string $lname
-     */
-    public function set_lname($lname = '')
-    {
-        $this->set('ATT_lname', $lname);
-    }
-
-
-    /**
-     *        Set Attendee Address
-     *
-     * @access        public
-     * @param string $address
-     */
-    public function set_address($address = '')
-    {
-        $this->set('ATT_address', $address);
-    }
-
-
-    /**
-     *        Set Attendee Address2
-     *
-     * @access        public
-     * @param        string $address2
-     */
-    public function set_address2($address2 = '')
-    {
-        $this->set('ATT_address2', $address2);
-    }
-
-
-    /**
-     *        Set Attendee City
-     *
-     * @access        public
-     * @param        string $city
-     */
-    public function set_city($city = '')
-    {
-        $this->set('ATT_city', $city);
-    }
-
-
-    /**
-     *        Set Attendee State ID
-     *
-     * @access        public
-     * @param        int $STA_ID
-     */
-    public function set_state($STA_ID = 0)
-    {
-        $this->set('STA_ID', $STA_ID);
-    }
-
-
-    /**
-     *        Set Attendee Country ISO Code
-     *
-     * @access        public
-     * @param        string $CNT_ISO
-     */
-    public function set_country($CNT_ISO = '')
-    {
-        $this->set('CNT_ISO', $CNT_ISO);
-    }
-
-
-    /**
-     *        Set Attendee Zip/Postal Code
-     *
-     * @access        public
-     * @param        string $zip
-     */
-    public function set_zip($zip = '')
-    {
-        $this->set('ATT_zip', $zip);
-    }
-
-
-    /**
-     *        Set Attendee Email Address
-     *
-     * @access        public
-     * @param        string $email
-     */
-    public function set_email($email = '')
-    {
-        $this->set('ATT_email', $email);
-    }
-
-
-    /**
-     *        Set Attendee Phone
-     *
-     * @access        public
-     * @param        string $phone
-     */
-    public function set_phone($phone = '')
-    {
-        $this->set('ATT_phone', $phone);
-    }
-
-
-    /**
-     *        set deleted
-     *
-     * @access        public
-     * @param        bool $ATT_deleted
-     */
-    public function set_deleted($ATT_deleted = false)
-    {
-        $this->set('ATT_deleted', $ATT_deleted);
-    }
-
-
-    /**
-     * Returns the value for the post_author id saved with the cpt
-     *
-     * @since 4.5.0
-     * @return int
-     */
-    public function wp_user()
-    {
-        return $this->get('ATT_author');
-    }
-
-
-    /**
-     *        get Attendee First Name
-     *
-     * @access        public
-     * @return string
-     */
-    public function fname()
-    {
-        return $this->get('ATT_fname');
-    }
-
-
-    /**
-     * echoes out the attendee's first name
-     *
-     * @return void
-     */
-    public function e_full_name()
-    {
-        echo $this->full_name();
-    }
-
-
-    /**
-     * Returns the first and last name concatenated together with a space.
-     *
-     * @param bool $apply_html_entities
-     * @return string
-     */
-    public function full_name($apply_html_entities = false)
-    {
-        $full_name = $this->fname() . ' ' . $this->lname();
-        return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
-    }
-
-
-    /**
-     * This returns the value of the `ATT_full_name` field which is usually equivalent to calling `full_name()` unless
-     * the post_title field has been directly modified in the db for the post (espresso_attendees post type) for this
-     * attendee.
-     *
-     * @param bool $apply_html_entities
-     * @return string
-     */
-    public function ATT_full_name($apply_html_entities = false)
-    {
-        return $apply_html_entities
-            ? htmlentities($this->get('ATT_full_name'), ENT_QUOTES, 'UTF-8')
-            : $this->get('ATT_full_name');
-    }
-
-
-    /**
-     *        get Attendee Last Name
-     *
-     * @access        public
-     * @return string
-     */
-    public function lname()
-    {
-        return $this->get('ATT_lname');
-    }
-
-
-    /**
-     * Gets the attendee's full address as an array so client code can decide hwo to display it
-     *
-     * @return array numerically indexed, with each part of the address that is known.
-     * Eg, if the user only responded to state and country,
-     * it would be array(0=>'Alabama',1=>'USA')
-     * @return array
-     */
-    public function full_address_as_array()
-    {
-        $full_address_array     = array();
-        $initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
-        foreach ($initial_address_fields as $address_field_name) {
-            $address_fields_value = $this->get($address_field_name);
-            if (! empty($address_fields_value)) {
-                $full_address_array[] = $address_fields_value;
-            }
-        }
-        //now handle state and country
-        $state_obj = $this->state_obj();
-        if (! empty($state_obj)) {
-            $full_address_array[] = $state_obj->name();
-        }
-        $country_obj = $this->country_obj();
-        if (! empty($country_obj)) {
-            $full_address_array[] = $country_obj->name();
-        }
-        //lastly get the xip
-        $zip_value = $this->zip();
-        if (! empty($zip_value)) {
-            $full_address_array[] = $zip_value;
-        }
-        return $full_address_array;
-    }
-
-
-    /**
-     *        get Attendee Address
-     *
-     * @return string
-     */
-    public function address()
-    {
-        return $this->get('ATT_address');
-    }
-
-
-    /**
-     *        get Attendee Address2
-     *
-     * @return string
-     */
-    public function address2()
-    {
-        return $this->get('ATT_address2');
-    }
-
-
-    /**
-     *        get Attendee City
-     *
-     * @return string
-     */
-    public function city()
-    {
-        return $this->get('ATT_city');
-    }
-
-
-    /**
-     *        get Attendee State ID
-     *
-     * @return string
-     */
-    public function state_ID()
-    {
-        return $this->get('STA_ID');
-    }
-
-
-    /**
-     * @return string
-     */
-    public function state_abbrev()
-    {
-        return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : '';
-    }
-
-
-    /**
-     * Gets the state set to this attendee
-     *
-     * @return EE_State
-     */
-    public function state_obj()
-    {
-        return $this->get_first_related('State');
-    }
-
-
-    /**
-     * Returns the state's name, otherwise 'Unknown'
-     *
-     * @return string
-     */
-    public function state_name()
-    {
-        if ($this->state_obj()) {
-            return $this->state_obj()->name();
-        } else {
-            return '';
-        }
-    }
-
-
-    /**
-     * either displays the state abbreviation or the state name, as determined
-     * by the "FHEE__EEI_Address__state__use_abbreviation" filter.
-     * defaults to abbreviation
-     *
-     * @return string
-     */
-    public function state()
-    {
-        if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
-            return $this->state_abbrev();
-        } else {
-            return $this->state_name();
-        }
-    }
-
-
-    /**
-     *    get Attendee Country ISO Code
-     *
-     * @return string
-     */
-    public function country_ID()
-    {
-        return $this->get('CNT_ISO');
-    }
-
-
-    /**
-     * Gets country set for this attendee
-     *
-     * @return EE_Country
-     */
-    public function country_obj()
-    {
-        return $this->get_first_related('Country');
-    }
-
-
-    /**
-     * Returns the country's name if known, otherwise 'Unknown'
-     *
-     * @return string
-     */
-    public function country_name()
-    {
-        if ($this->country_obj()) {
-            return $this->country_obj()->name();
-        } else {
-            return '';
-        }
-    }
-
-
-    /**
-     * either displays the country ISO2 code or the country name, as determined
-     * by the "FHEE__EEI_Address__country__use_abbreviation" filter.
-     * defaults to abbreviation
-     *
-     * @return string
-     */
-    public function country()
-    {
-        if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
-            return $this->country_ID();
-        } else {
-            return $this->country_name();
-        }
-    }
-
-
-    /**
-     *        get Attendee Zip/Postal Code
-     *
-     * @return string
-     */
-    public function zip()
-    {
-        return $this->get('ATT_zip');
-    }
-
-
-    /**
-     *        get Attendee Email Address
-     *
-     * @return string
-     */
-    public function email()
-    {
-        return $this->get('ATT_email');
-    }
-
-
-    /**
-     *        get Attendee Phone #
-     *
-     * @return string
-     */
-    public function phone()
-    {
-        return $this->get('ATT_phone');
-    }
-
-
-    /**
-     *    get deleted
-     *
-     * @return        bool
-     */
-    public function deleted()
-    {
-        return $this->get('ATT_deleted');
-    }
-
-
-    /**
-     * Gets registrations of this attendee
-     *
-     * @param array $query_params
-     * @return EE_Registration[]
-     */
-    public function get_registrations($query_params = array())
-    {
-        return $this->get_many_related('Registration', $query_params);
-    }
-
-
-    /**
-     * Gets the most recent registration of this attendee
-     *
-     * @return EE_Registration
-     */
-    public function get_most_recent_registration()
-    {
-        return $this->get_first_related('Registration',
-            array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
-    }
-
-
-    /**
-     * Gets the most recent registration for this attend at this event
-     *
-     * @param int $event_id
-     * @return EE_Registration
-     */
-    public function get_most_recent_registration_for_event($event_id)
-    {
-        return $this->get_first_related('Registration',
-            array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
-    }
-
-
-    /**
-     * returns any events attached to this attendee ($_Event property);
-     *
-     * @return array
-     */
-    public function events()
-    {
-        return $this->get_many_related('Event');
-    }
-
-
-    /**
-     * Gets the billing info array where keys match espresso_reg_page_billing_inputs(),
-     * and keys are their cleaned values. @see EE_Attendee::save_and_clean_billing_info_for_payment_method() which was
-     * used to save the billing info
-     *
-     * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
-     * @return EE_Form_Section_Proper|null
-     */
-    public function billing_info_for_payment_method($payment_method)
-    {
-        $pm_type = $payment_method->type_obj();
-        if (! $pm_type instanceof EE_PMT_Base) {
-            return null;
-        }
-        $billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
-        if (! $billing_info) {
-            return null;
-        }
-        $billing_form = $pm_type->billing_form();
-        if ($billing_form instanceof EE_Form_Section_Proper) {
-            $billing_form->receive_form_submission(array($billing_form->name() => $billing_info), false);
-        }
-        return $billing_form;
-    }
-
-
-    /**
-     * Gets the postmeta key that holds this attendee's billing info for the
-     * specified payment method
-     *
-     * @param EE_Payment_Method $payment_method
-     * @return string
-     */
-    public function get_billing_info_postmeta_name($payment_method)
-    {
-        if ($payment_method->type_obj() instanceof EE_PMT_Base) {
-            return 'billing_info_' . $payment_method->type_obj()->system_name();
-        } else {
-            return null;
-        }
-    }
-
-
-    /**
-     * Saves the billing info to the attendee. @see EE_Attendee::billing_info_for_payment_method() which is used to
-     * retrieve it
-     *
-     * @param EE_Billing_Attendee_Info_Form $billing_form
-     * @param EE_Payment_Method             $payment_method
-     * @return boolean
-     */
-    public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method)
-    {
-        if (! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
-            EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
-            return false;
-        }
-        $billing_form->clean_sensitive_data();
-        return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method),
-            $billing_form->input_values(true));
-    }
-
-
-    /**
-     * Return the link to the admin details for the object.
-     *
-     * @return string
-     */
-    public function get_admin_details_link()
-    {
-        return $this->get_admin_edit_link();
-    }
-
-
-    /**
-     * Returns the link to the editor for the object.  Sometimes this is the same as the details.
-     *
-     * @return string
-     */
-    public function get_admin_edit_link()
-    {
-        EE_Registry::instance()->load_helper('URL');
-        return EEH_URL::add_query_args_and_nonce(
-            array(
-                'page'   => 'espresso_registrations',
-                'action' => 'edit_attendee',
-                'post'   => $this->ID(),
-            ),
-            admin_url('admin.php')
-        );
-    }
-
-
-    /**
-     * Returns the link to a settings page for the object.
-     *
-     * @return string
-     */
-    public function get_admin_settings_link()
-    {
-        return $this->get_admin_edit_link();
-    }
-
-
-    /**
-     * Returns the link to the "overview" for the object (typically the "list table" view).
-     *
-     * @return string
-     */
-    public function get_admin_overview_link()
-    {
-        EE_Registry::instance()->load_helper('URL');
-        return EEH_URL::add_query_args_and_nonce(
-            array(
-                'page'   => 'espresso_registrations',
-                'action' => 'contact_list',
-            ),
-            admin_url('admin.php')
-        );
-    }
+	/**
+	 * Sets some dynamic defaults
+	 *
+	 * @param array  $fieldValues
+	 * @param bool   $bydb
+	 * @param string $timezone
+	 * @param array  $date_formats
+	 */
+	protected function __construct($fieldValues = null, $bydb = false, $timezone = null, $date_formats = array())
+	{
+		if (! isset($fieldValues['ATT_full_name'])) {
+			$fname                        = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'] . ' ' : '';
+			$lname                        = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
+			$fieldValues['ATT_full_name'] = $fname . $lname;
+		}
+		if (! isset($fieldValues['ATT_slug'])) {
+			//			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
+			$fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
+		}
+		if (! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
+			$fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
+		}
+		parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
+	}
+
+
+	/**
+	 * @param array  $props_n_values          incoming values
+	 * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
+	 *                                        used.)
+	 * @param array  $date_formats            incoming date_formats in an array where the first value is the
+	 *                                        date_format and the second value is the time format
+	 * @return EE_Attendee
+	 */
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array())
+	{
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
+	}
+
+
+	/**
+	 * @param array  $props_n_values  incoming values from the database
+	 * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
+	 *                                the website will be used.
+	 * @return EE_Attendee
+	 */
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null)
+	{
+		return new self($props_n_values, true, $timezone);
+	}
+
+
+	/**
+	 *        Set Attendee First Name
+	 *
+	 * @access        public
+	 * @param string $fname
+	 */
+	public function set_fname($fname = '')
+	{
+		$this->set('ATT_fname', $fname);
+	}
+
+
+	/**
+	 *        Set Attendee Last Name
+	 *
+	 * @access        public
+	 * @param string $lname
+	 */
+	public function set_lname($lname = '')
+	{
+		$this->set('ATT_lname', $lname);
+	}
+
+
+	/**
+	 *        Set Attendee Address
+	 *
+	 * @access        public
+	 * @param string $address
+	 */
+	public function set_address($address = '')
+	{
+		$this->set('ATT_address', $address);
+	}
+
+
+	/**
+	 *        Set Attendee Address2
+	 *
+	 * @access        public
+	 * @param        string $address2
+	 */
+	public function set_address2($address2 = '')
+	{
+		$this->set('ATT_address2', $address2);
+	}
+
+
+	/**
+	 *        Set Attendee City
+	 *
+	 * @access        public
+	 * @param        string $city
+	 */
+	public function set_city($city = '')
+	{
+		$this->set('ATT_city', $city);
+	}
+
+
+	/**
+	 *        Set Attendee State ID
+	 *
+	 * @access        public
+	 * @param        int $STA_ID
+	 */
+	public function set_state($STA_ID = 0)
+	{
+		$this->set('STA_ID', $STA_ID);
+	}
+
+
+	/**
+	 *        Set Attendee Country ISO Code
+	 *
+	 * @access        public
+	 * @param        string $CNT_ISO
+	 */
+	public function set_country($CNT_ISO = '')
+	{
+		$this->set('CNT_ISO', $CNT_ISO);
+	}
+
+
+	/**
+	 *        Set Attendee Zip/Postal Code
+	 *
+	 * @access        public
+	 * @param        string $zip
+	 */
+	public function set_zip($zip = '')
+	{
+		$this->set('ATT_zip', $zip);
+	}
+
+
+	/**
+	 *        Set Attendee Email Address
+	 *
+	 * @access        public
+	 * @param        string $email
+	 */
+	public function set_email($email = '')
+	{
+		$this->set('ATT_email', $email);
+	}
+
+
+	/**
+	 *        Set Attendee Phone
+	 *
+	 * @access        public
+	 * @param        string $phone
+	 */
+	public function set_phone($phone = '')
+	{
+		$this->set('ATT_phone', $phone);
+	}
+
+
+	/**
+	 *        set deleted
+	 *
+	 * @access        public
+	 * @param        bool $ATT_deleted
+	 */
+	public function set_deleted($ATT_deleted = false)
+	{
+		$this->set('ATT_deleted', $ATT_deleted);
+	}
+
+
+	/**
+	 * Returns the value for the post_author id saved with the cpt
+	 *
+	 * @since 4.5.0
+	 * @return int
+	 */
+	public function wp_user()
+	{
+		return $this->get('ATT_author');
+	}
+
+
+	/**
+	 *        get Attendee First Name
+	 *
+	 * @access        public
+	 * @return string
+	 */
+	public function fname()
+	{
+		return $this->get('ATT_fname');
+	}
+
+
+	/**
+	 * echoes out the attendee's first name
+	 *
+	 * @return void
+	 */
+	public function e_full_name()
+	{
+		echo $this->full_name();
+	}
+
+
+	/**
+	 * Returns the first and last name concatenated together with a space.
+	 *
+	 * @param bool $apply_html_entities
+	 * @return string
+	 */
+	public function full_name($apply_html_entities = false)
+	{
+		$full_name = $this->fname() . ' ' . $this->lname();
+		return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
+	}
+
+
+	/**
+	 * This returns the value of the `ATT_full_name` field which is usually equivalent to calling `full_name()` unless
+	 * the post_title field has been directly modified in the db for the post (espresso_attendees post type) for this
+	 * attendee.
+	 *
+	 * @param bool $apply_html_entities
+	 * @return string
+	 */
+	public function ATT_full_name($apply_html_entities = false)
+	{
+		return $apply_html_entities
+			? htmlentities($this->get('ATT_full_name'), ENT_QUOTES, 'UTF-8')
+			: $this->get('ATT_full_name');
+	}
+
+
+	/**
+	 *        get Attendee Last Name
+	 *
+	 * @access        public
+	 * @return string
+	 */
+	public function lname()
+	{
+		return $this->get('ATT_lname');
+	}
+
+
+	/**
+	 * Gets the attendee's full address as an array so client code can decide hwo to display it
+	 *
+	 * @return array numerically indexed, with each part of the address that is known.
+	 * Eg, if the user only responded to state and country,
+	 * it would be array(0=>'Alabama',1=>'USA')
+	 * @return array
+	 */
+	public function full_address_as_array()
+	{
+		$full_address_array     = array();
+		$initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
+		foreach ($initial_address_fields as $address_field_name) {
+			$address_fields_value = $this->get($address_field_name);
+			if (! empty($address_fields_value)) {
+				$full_address_array[] = $address_fields_value;
+			}
+		}
+		//now handle state and country
+		$state_obj = $this->state_obj();
+		if (! empty($state_obj)) {
+			$full_address_array[] = $state_obj->name();
+		}
+		$country_obj = $this->country_obj();
+		if (! empty($country_obj)) {
+			$full_address_array[] = $country_obj->name();
+		}
+		//lastly get the xip
+		$zip_value = $this->zip();
+		if (! empty($zip_value)) {
+			$full_address_array[] = $zip_value;
+		}
+		return $full_address_array;
+	}
+
+
+	/**
+	 *        get Attendee Address
+	 *
+	 * @return string
+	 */
+	public function address()
+	{
+		return $this->get('ATT_address');
+	}
+
+
+	/**
+	 *        get Attendee Address2
+	 *
+	 * @return string
+	 */
+	public function address2()
+	{
+		return $this->get('ATT_address2');
+	}
+
+
+	/**
+	 *        get Attendee City
+	 *
+	 * @return string
+	 */
+	public function city()
+	{
+		return $this->get('ATT_city');
+	}
+
+
+	/**
+	 *        get Attendee State ID
+	 *
+	 * @return string
+	 */
+	public function state_ID()
+	{
+		return $this->get('STA_ID');
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function state_abbrev()
+	{
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : '';
+	}
+
+
+	/**
+	 * Gets the state set to this attendee
+	 *
+	 * @return EE_State
+	 */
+	public function state_obj()
+	{
+		return $this->get_first_related('State');
+	}
+
+
+	/**
+	 * Returns the state's name, otherwise 'Unknown'
+	 *
+	 * @return string
+	 */
+	public function state_name()
+	{
+		if ($this->state_obj()) {
+			return $this->state_obj()->name();
+		} else {
+			return '';
+		}
+	}
+
+
+	/**
+	 * either displays the state abbreviation or the state name, as determined
+	 * by the "FHEE__EEI_Address__state__use_abbreviation" filter.
+	 * defaults to abbreviation
+	 *
+	 * @return string
+	 */
+	public function state()
+	{
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
+			return $this->state_abbrev();
+		} else {
+			return $this->state_name();
+		}
+	}
+
+
+	/**
+	 *    get Attendee Country ISO Code
+	 *
+	 * @return string
+	 */
+	public function country_ID()
+	{
+		return $this->get('CNT_ISO');
+	}
+
+
+	/**
+	 * Gets country set for this attendee
+	 *
+	 * @return EE_Country
+	 */
+	public function country_obj()
+	{
+		return $this->get_first_related('Country');
+	}
+
+
+	/**
+	 * Returns the country's name if known, otherwise 'Unknown'
+	 *
+	 * @return string
+	 */
+	public function country_name()
+	{
+		if ($this->country_obj()) {
+			return $this->country_obj()->name();
+		} else {
+			return '';
+		}
+	}
+
+
+	/**
+	 * either displays the country ISO2 code or the country name, as determined
+	 * by the "FHEE__EEI_Address__country__use_abbreviation" filter.
+	 * defaults to abbreviation
+	 *
+	 * @return string
+	 */
+	public function country()
+	{
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
+			return $this->country_ID();
+		} else {
+			return $this->country_name();
+		}
+	}
+
+
+	/**
+	 *        get Attendee Zip/Postal Code
+	 *
+	 * @return string
+	 */
+	public function zip()
+	{
+		return $this->get('ATT_zip');
+	}
+
+
+	/**
+	 *        get Attendee Email Address
+	 *
+	 * @return string
+	 */
+	public function email()
+	{
+		return $this->get('ATT_email');
+	}
+
+
+	/**
+	 *        get Attendee Phone #
+	 *
+	 * @return string
+	 */
+	public function phone()
+	{
+		return $this->get('ATT_phone');
+	}
+
+
+	/**
+	 *    get deleted
+	 *
+	 * @return        bool
+	 */
+	public function deleted()
+	{
+		return $this->get('ATT_deleted');
+	}
+
+
+	/**
+	 * Gets registrations of this attendee
+	 *
+	 * @param array $query_params
+	 * @return EE_Registration[]
+	 */
+	public function get_registrations($query_params = array())
+	{
+		return $this->get_many_related('Registration', $query_params);
+	}
+
+
+	/**
+	 * Gets the most recent registration of this attendee
+	 *
+	 * @return EE_Registration
+	 */
+	public function get_most_recent_registration()
+	{
+		return $this->get_first_related('Registration',
+			array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
+	}
+
+
+	/**
+	 * Gets the most recent registration for this attend at this event
+	 *
+	 * @param int $event_id
+	 * @return EE_Registration
+	 */
+	public function get_most_recent_registration_for_event($event_id)
+	{
+		return $this->get_first_related('Registration',
+			array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
+	}
+
+
+	/**
+	 * returns any events attached to this attendee ($_Event property);
+	 *
+	 * @return array
+	 */
+	public function events()
+	{
+		return $this->get_many_related('Event');
+	}
+
+
+	/**
+	 * Gets the billing info array where keys match espresso_reg_page_billing_inputs(),
+	 * and keys are their cleaned values. @see EE_Attendee::save_and_clean_billing_info_for_payment_method() which was
+	 * used to save the billing info
+	 *
+	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
+	 * @return EE_Form_Section_Proper|null
+	 */
+	public function billing_info_for_payment_method($payment_method)
+	{
+		$pm_type = $payment_method->type_obj();
+		if (! $pm_type instanceof EE_PMT_Base) {
+			return null;
+		}
+		$billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
+		if (! $billing_info) {
+			return null;
+		}
+		$billing_form = $pm_type->billing_form();
+		if ($billing_form instanceof EE_Form_Section_Proper) {
+			$billing_form->receive_form_submission(array($billing_form->name() => $billing_info), false);
+		}
+		return $billing_form;
+	}
+
+
+	/**
+	 * Gets the postmeta key that holds this attendee's billing info for the
+	 * specified payment method
+	 *
+	 * @param EE_Payment_Method $payment_method
+	 * @return string
+	 */
+	public function get_billing_info_postmeta_name($payment_method)
+	{
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+			return 'billing_info_' . $payment_method->type_obj()->system_name();
+		} else {
+			return null;
+		}
+	}
+
+
+	/**
+	 * Saves the billing info to the attendee. @see EE_Attendee::billing_info_for_payment_method() which is used to
+	 * retrieve it
+	 *
+	 * @param EE_Billing_Attendee_Info_Form $billing_form
+	 * @param EE_Payment_Method             $payment_method
+	 * @return boolean
+	 */
+	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method)
+	{
+		if (! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
+			EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
+			return false;
+		}
+		$billing_form->clean_sensitive_data();
+		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method),
+			$billing_form->input_values(true));
+	}
+
+
+	/**
+	 * Return the link to the admin details for the object.
+	 *
+	 * @return string
+	 */
+	public function get_admin_details_link()
+	{
+		return $this->get_admin_edit_link();
+	}
+
+
+	/**
+	 * Returns the link to the editor for the object.  Sometimes this is the same as the details.
+	 *
+	 * @return string
+	 */
+	public function get_admin_edit_link()
+	{
+		EE_Registry::instance()->load_helper('URL');
+		return EEH_URL::add_query_args_and_nonce(
+			array(
+				'page'   => 'espresso_registrations',
+				'action' => 'edit_attendee',
+				'post'   => $this->ID(),
+			),
+			admin_url('admin.php')
+		);
+	}
+
+
+	/**
+	 * Returns the link to a settings page for the object.
+	 *
+	 * @return string
+	 */
+	public function get_admin_settings_link()
+	{
+		return $this->get_admin_edit_link();
+	}
+
+
+	/**
+	 * Returns the link to the "overview" for the object (typically the "list table" view).
+	 *
+	 * @return string
+	 */
+	public function get_admin_overview_link()
+	{
+		EE_Registry::instance()->load_helper('URL');
+		return EEH_URL::add_query_args_and_nonce(
+			array(
+				'page'   => 'espresso_registrations',
+				'action' => 'contact_list',
+			),
+			admin_url('admin.php')
+		);
+	}
 
 
 }